public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2019-09-27 22:13:02 +02:00
parent ab77ea0bf2 f9021cc129
commit 217cf982c7
222 changed files with 1897 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/default.nix
+2
View File
@@ -134,5 +134,7 @@ let
mergeAttrsByFuncDefaultsClean mergeAttrBy
fakeSha256 fakeSha512
nixType imap;
inherit (versions)
splitVersion;
});
in lib
lib/tests/misc.nix
+15
View File
@@ -102,6 +102,21 @@ runTests {
expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
};
testSplitVersionSingle = {
expr = versions.splitVersion "1";
expected = [ "1" ];
};
testSplitVersionDouble = {
expr = versions.splitVersion "1.2";
expected = [ "1" "2" ];
};
testSplitVersionTriple = {
expr = versions.splitVersion "1.2.3";
expected = [ "1" "2" "3" ];
};
testIsStorePath = {
expr =
let goodPath =
lib/versions.nix
+7 -5
View File
@@ -1,14 +1,16 @@
/* Version string functions. */
{ lib }:
let
rec {
/* Break a version string into its component parts.
Example:
splitVersion "1.2.3"
=> ["1" "2" "3"]
*/
splitVersion = builtins.splitVersion or (lib.splitString ".");
in
{
/* Get the major version string from a string.
Example:
maintainers/maintainer-list.nix
+5
View File
@@ -2808,6 +2808,11 @@
githubId = 26877687;
name = "Yurii Izorkin";
};
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
githubId = "2570854";
};
jasoncarr = {
email = "jcarr250@gmail.com";
github = "jasoncarr0";
nixos/doc/manual/configuration/wireless.xml
+9 -2
View File
@@ -19,10 +19,17 @@
NixOS lets you specify networks for wpa_supplicant declaratively:
<programlisting>
<xref linkend="opt-networking.wireless.networks"/> = {
echelon = {
echelon = { # SSID with no spaces or special characters
psk = "abcdefgh";
};
"free.wifi" = {};
"echelon's AP" = { # SSID with spaces and/or special characters
psk = "ijklmnop";
};
echelon = { # Hidden SSID
hidden = true;
psk = "qrstuvwx";
};
free.wifi = {}; # Public wireless network
};
</programlisting>
Be aware that keys will be written to the nix store in plaintext! When no
nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+1 -1
View File
@@ -19,7 +19,7 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_rpi;
boot.kernelPackages = pkgs.linuxPackages_rpi1;
sdImage = {
populateFirmwareCommands = let
nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
+31
View File
@@ -0,0 +1,31 @@
# To build, use:
# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage
{ config, lib, pkgs, ... }:
{
imports = [
../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
boot.loader.grub.enable = false;
boot.loader.raspberryPi.enable = true;
boot.loader.raspberryPi.version = 4;
boot.kernelPackages = pkgs.linuxPackages_rpi4;
boot.consoleLogLevel = lib.mkDefault 7;
sdImage = {
firmwareSize = 128;
# This is a hack to avoid replicating config.txt from boot.loader.raspberryPi
populateFirmwareCommands =
"${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware";
# As the boot process is done entirely in the firmware partition.
populateRootCommands = "";
};
# the installation media is also the installation target,
# so we don't want to provide the installation configuration.nix.
installer.cloneConfig = false;
}
nixos/modules/services/misc/nix-optimise.nix
+2 -2
View File
@@ -40,8 +40,8 @@ in
systemd.services.nix-optimise =
{ description = "Nix Store Optimiser";
# No point running it inside a nixos-container. It should be on the host instead.
unitConfig.ConditionVirtualization = "!container";
# No point this if the nix daemon (and thus the nix store) is outside
unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket";
serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";
startAt = optionals cfg.automatic cfg.dates;
};
nixos/modules/services/networking/wpa_supplicant.nix
+12 -2
View File
@@ -103,6 +103,13 @@ in {
description = ''
Set this to <literal>true</literal> if the SSID of the network is hidden.
'';
example = literalExample ''
{ echelon = {
hidden = true;
psk = "abcdefgh";
};
}
'';
};
priority = mkOption {
@@ -146,10 +153,13 @@ in {
'';
default = {};
example = literalExample ''
{ echelon = {
{ echelon = { # SSID with no spaces or special characters
psk = "abcdefgh";
};
"free.wifi" = {};
"echelon's AP" = { # SSID with spaces and/or special characters
psk = "ijklmnop";
};
"free.wifi" = {}; # Public wireless network
}
'';
};
nixos/modules/services/web-servers/apache-httpd/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ let
php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
phpMajorVersion = head (splitString "." php.version);
phpMajorVersion = lib.versions.major (lib.getVersion php);
mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; };
nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
+9 -1
View File
@@ -71,7 +71,7 @@ addEntry() {
local kernel=$(readlink -f $path/kernel)
local initrd=$(readlink -f $path/initrd)
local dtb_path=$(readlink -f $path/kernel-modules/dtbs)
local dtb_path=$(readlink -f $path/dtbs)
if test -n "@copyKernels@"; then
copyToKernelsDir $kernel; kernel=$result
@@ -113,10 +113,18 @@ done
fwdir=@firmware@/share/raspberrypi/boot/
copyForced $fwdir/bootcode.bin $target/bootcode.bin
copyForced $fwdir/fixup.dat $target/fixup.dat
copyForced $fwdir/fixup4.dat $target/fixup4.dat
copyForced $fwdir/fixup4cd.dat $target/fixup4cd.dat
copyForced $fwdir/fixup4db.dat $target/fixup4db.dat
copyForced $fwdir/fixup4x.dat $target/fixup4x.dat
copyForced $fwdir/fixup_cd.dat $target/fixup_cd.dat
copyForced $fwdir/fixup_db.dat $target/fixup_db.dat
copyForced $fwdir/fixup_x.dat $target/fixup_x.dat
copyForced $fwdir/start.elf $target/start.elf
copyForced $fwdir/start4.elf $target/start4.elf
copyForced $fwdir/start4cd.elf $target/start4cd.elf
copyForced $fwdir/start4db.elf $target/start4db.elf
copyForced $fwdir/start4x.elf $target/start4x.elf
copyForced $fwdir/start_cd.elf $target/start_cd.elf
copyForced $fwdir/start_db.elf $target/start_db.elf
copyForced $fwdir/start_x.elf $target/start_x.elf
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+3 -3
View File
@@ -59,7 +59,7 @@ in
version = mkOption {
default = 2;
type = types.enum [ 0 1 2 3 ];
type = types.enum [ 0 1 2 3 4 ];
description = ''
'';
};
@@ -97,8 +97,8 @@ in
config = mkIf cfg.enable {
assertions = singleton {
assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version == 3;
message = "Only Raspberry Pi 3 supports aarch64.";
assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version >= 3;
message = "Only Raspberry Pi >= 3 supports aarch64.";
};
system.build.installBootLoader = builder;
nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
+4 -2
View File
@@ -10,11 +10,13 @@ let
pkgs.ubootRaspberryPi
else if version == 2 then
pkgs.ubootRaspberryPi2
else
else if version == 3 then
if isAarch64 then
pkgs.ubootRaspberryPi3_64bit
else
pkgs.ubootRaspberryPi3_32bit;
pkgs.ubootRaspberryPi3_32bit
else
throw "U-Boot is not yet supported on the raspberry pi 4.";
extlinuxConfBuilder =
import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
nixos/modules/tasks/network-interfaces.nix
+4 -4
View File
@@ -967,9 +967,9 @@ in
"net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
"net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
} // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
(i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true)))
(i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true)))
// listToAttrs (forEach (filter (i: i.preferTempAddress) interfaces)
(i: nameValuePair "net.ipv6.conf.${i.name}.use_tempaddr" 2));
(i: nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" 2));
# Capabilities won't work unless we have at-least a 4.3 Linux
# kernel because we need the ambient capability
@@ -1092,7 +1092,7 @@ in
destination = "/etc/udev/rules.d/98-${name}";
text = ''
# enable and prefer IPv6 privacy addresses by default
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.%k.use_tempaddr=2"
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.coreutils}/bin/echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr"
'';
})
(pkgs.writeTextFile rec {
@@ -1100,7 +1100,7 @@ in
destination = "/etc/udev/rules.d/99-${name}";
text = concatMapStrings (i: ''
# enable IPv6 privacy addresses but prefer EUI-64 addresses for ${i.name}
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${i.name}.use_tempaddr=1"
ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=1"
'') (filter (i: !i.preferTempAddress) interfaces);
})
] ++ lib.optional (cfg.wlanInterfaces != {})
nixos/modules/virtualisation/container-config.nix
+1
View File
@@ -7,6 +7,7 @@ with lib;
config = mkIf config.boot.isContainer {
# Disable some features that are not useful in a container.
nix.optimise.automatic = mkDefault false; # the store is host managed
services.udisks2.enable = mkDefault false;
powerManagement.enable = mkDefault false;
nixos/release.nix
+5
View File
@@ -180,6 +180,11 @@ in rec {
inherit system;
});
sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
module = ./modules/installer/cd-dvd/sd-image-raspberrypi4.nix;
inherit system;
});
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
ova = forMatchingSystems [ "x86_64-linux" ] (system:
pkgs/applications/audio/asunder/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.9.3";
version = "2.9.4";
pname = "asunder";
src = fetchurl {
url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
sha256 = "1bwc9v9l1f3kqjd7wis6g2sv6ibc618ybh0gsb8mkkfhadp68w30";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/applications/audio/fmit/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@ with stdenv.lib;
mkDerivation rec {
pname = "fmit";
version = "1.2.6";
version = "1.2.13";
src = fetchFromGitHub {
owner = "gillesdegottex";
repo = "fmit";
rev = "v${version}";
sha256 = "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz";
sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6";
};
nativeBuildInputs = [ qmake itstool wrapQtAppsHook ];
pkgs/applications/audio/gradio/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
version = "7.2";
version = "7.3";
in stdenv.mkDerivation {
pname = "gradio";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
owner = "haecker-felix";
repo = "gradio";
rev = "v${version}";
sha256 = "0c4vlrfl0ljkiwarpwa8wcfmmihh6a5j4pi4yr0qshyl9xxvxiv3";
sha256 = "00982dynl36lpsrx3mkd2a479zsrc8jvwfb8i7pi6w7fzzd8n8bl";
};
nativeBuildInputs = [
pkgs/applications/blockchains/bitcoin-abc.nix
+2 -2
View File
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.19.4";
version = "0.20.2";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "1z4x25ygcw1pqml2ww02vqrvmihlv4f5gnnn1iyfirrjxgpfaxd7";
sha256 = "1hii6wjz6095jpy5kw7z6i3fn2jf1dvsppf162xx2c08n9vmz3s3";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
pkgs/applications/blockchains/jormungandr/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
rustPlatform.buildRustPackage rec {
pname = "jormungandr";
version = "0.5.0";
version = "0.5.2";
src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6";
sha256 = "0aixz007kc5gisc4hvix3ccmy0r459lczlwmnm2989jcxk3hki3q";
fetchSubmodules = true;
};
pkgs/applications/editors/emacs-modes/elpa-generated.nix
Generated
+11 -11
View File
@@ -636,16 +636,16 @@
license = lib.licenses.free;
};
}) {};
csv-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.8.el";
sha256 = "1ywgc61pnawiwfpjgxavfpfxqd3dm9niq6srbc70pd54ca6yqby6";
url = "https://elpa.gnu.org/packages/csv-mode-1.9.el";
sha256 = "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1";
};
packageRequires = [ emacs ];
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/csv-mode.html";
license = lib.licenses.free;
@@ -720,10 +720,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.19";
version = "0.20";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.19.tar";
sha256 = "0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4";
url = "https://elpa.gnu.org/packages/debbugs-0.20.tar";
sha256 = "03mmb1zvbqlsznl5agq8k3xrlcz310vnsa2zn0y8myanm4ra51zm";
};
packageRequires = [ cl-lib emacs soap-client ];
meta = {
@@ -3327,10 +3327,10 @@
elpaBuild {
pname = "verilog-mode";
ename = "verilog-mode";
version = "2019.6.21.103209889";
version = "2019.9.23.4801067";
src = fetchurl {
url = "https://elpa.gnu.org/packages/verilog-mode-2019.6.21.103209889.el";
sha256 = "0hlcp2jhm30bzx6iabdb31aqv0dmmim30g9z5kqb0hl1bd1dnm9m";
url = "https://elpa.gnu.org/packages/verilog-mode-2019.9.23.4801067.el";
sha256 = "0jaba2cqiiknjqc7qz6047hpjd87hznl6b154ai1900i52kjbs21";
};
packageRequires = [];
meta = {
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+903 -548
View File
File diff suppressed because one or more lines are too long
pkgs/applications/editors/vim/macvim.nix
+3
View File
@@ -106,6 +106,9 @@ stdenv.mkDerivation {
substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include"
substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope
# Work around weird code-signing issue
substituteInPlace src/auto/config.mk --replace "XCODEFLAGS''\t=" "XCODEFLAGS''\t= CODE_SIGN_IDENTITY="
'';
postInstall = ''
pkgs/applications/editors/vim/macvim.patch
+27
View File
@@ -18,6 +18,21 @@ index e519018de..556a4127d 100644
PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim;
PRODUCT_NAME = MacVim;
VERSIONING_SYSTEM = "apple-generic";
diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
index 6f1a06e46..a12e2cea4 100644
--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
+++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
@@ -13,7 +13,9 @@
#import "PSMTabDragAssistant.h"
-@implementation PSMTabBarCell
+@implementation PSMTabBarCell {
+ id _controlView;
+}
#pragma mark -
#pragma mark Creation/Destruction
diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc
index 23a06bf37..dfb10fe94 100644
--- a/src/MacVim/vimrc
@@ -77,6 +92,18 @@ diff --git a/src/auto/configure b/src/auto/configure
index 9e6a82f4a..3c6d1a89b 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4705,10 +4705,8 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
- if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
- macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
+ macosx_deployment_target=${MACOSX_DEPLOYMENT_TARGET:-10.12}
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target"
- fi
fi
@@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; }
for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
pkgs/applications/graphics/avocode/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
version = "3.9.2";
version = "3.9.3";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "18yzw7bss1dkmmd8lxr9x8s46qmpnqci202g16zrp6j9jdj094d3";
sha256 = "1ki2fpn70p1rzf52q8511a90n7y7dqi86fs2a48qhass1abxlpqx";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; [
pkgs/applications/graphics/gthumb/default.nix
+2 -2
View File
@@ -33,11 +33,11 @@
stdenv.mkDerivation rec {
pname = "gthumb";
version = "3.8.0";
version = "3.8.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f";
sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb";
};
nativeBuildInputs = [
pkgs/applications/misc/cura/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
mkDerivation rec {
pname = "cura";
version = "4.2.1";
version = "4.3.0";
src = fetchFromGitHub {
owner = "Ultimaker";
@@ -14,8 +14,8 @@ mkDerivation rec {
materials = fetchFromGitHub {
owner = "Ultimaker";
repo = "fdm_materials";
rev = "4.2.0"; # TODO: change back to `version` after 4.2.1
sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m";
rev = version;
sha256 = "141cv1f2pv2pznhgj32zg8bw3kmw9002g6rx16jq7lhclr0x3xls";
};
buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
pkgs/applications/misc/curaengine/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "curaengine";
version = "4.2.0";
version = "4.3.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd";
sha256 = "074qcaj1v2ri9wppx9lr066nlidkrsp9m1rrrk2hs2b61x0340ff";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/misc/electron-cash/default.nix
+4
View File
@@ -56,6 +56,10 @@ python3Packages.buildPythonApplication rec {
--replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
'';
postFixup = ''
wrapQtApp $out/bin/electron-cash
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/electron-cash help >/dev/null
pkgs/applications/misc/grip/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation rec {
name = "grip-3.3.1";
name = "grip-3.10.2";
src = fetchurl {
url = "mirror://sourceforge/grip/${name}.tar.gz";
sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
sha256 = "1wngrvw0zkrd2xw7c6w0qmq38jxishp5q9xvm6qlycza2czb4p36";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/kitty/default.nix
+2 -2
View File
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.14.3";
version = "0.14.5";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b";
sha256 = "0qx3wj4n3zgjcpd1vjjwdlz8d1vp8bkxihsg2khlla1izandgxxa";
};
buildInputs = [
pkgs/applications/misc/mupdf/default.nix
+1 -2
View File
@@ -9,8 +9,7 @@ let
# OpenJPEG version is hardcoded in package source
openJpegVersion = with stdenv;
lib.concatStringsSep "." (lib.lists.take 2
(lib.splitString "." (lib.getVersion openjpeg)));
lib.versions.majorMinor (lib.getVersion openjpeg);
in stdenv.mkDerivation rec {
pkgs/applications/misc/pastel/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pastel";
version = "0.5.3";
version = "0.6.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "0f54p3pzfp7xrwlqn61l7j41vmgcfph3bhq2khxh5apfwwdx9nng";
sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
};
cargoSha256 = "05yvlm7z3zfn8qd8nb9zpch9xsfzidrpyrgg2vij3h3q095mdm66";
cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
pkgs/applications/misc/toot/default.nix
+3 -3
View File
@@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
version = "0.22.0";
version = "0.24.0";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = version;
sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5";
sha256 = "1szpmkxc1lqfphicfcj0z7b1nq97xmb4ppwf806p8w0fxj1shil3";
};
checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = with python3Packages;
[ requests beautifulsoup4 future wcwidth ];
[ requests beautifulsoup4 future wcwidth urwid ];
checkPhase = ''
py.test
pkgs/applications/misc/workrave/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
in fetchFromGitHub {
sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitString "." version);
"v" + concatStringsSep "_" (splitVersion version);
repo = "workrave";
owner = "rcaelers";
};
pkgs/applications/networking/browsers/vivaldi/default.nix
+2 -2
View File
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "2.8.1664.38-1";
version = "2.8.1664.40-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1znhlwwgq4k0fplr4l8ixgn6g5k26ns77j2dm0pjg3a2jgjq6rdr";
sha256 = "07v7p3r9yc566xkwhiazd80pj2d6rcvs3xnbnwjambi1rajbs5sx";
};
unpackPhase = ''
pkgs/applications/networking/browsers/webmacs/default.nix
+73
View File
@@ -0,0 +1,73 @@
{ lib
, mkDerivationWith
, fetchFromGitHub
, python3Packages
, herbstluftwm
}:
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "webmacs";
version = "0.8";
disabled = python3Packages.isPy27;
src = fetchFromGitHub {
owner = "parkouss";
repo = "webmacs";
rev = version;
fetchSubmodules = true;
sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368";
};
propagatedBuildInputs = with python3Packages; [
pyqtwebengine
setuptools
dateparser
jinja2
pygments
];
dontWrapQtApps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
# See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
# Don't know why they're using CC for g++.
preConfigure = ''
export CC=$CXX
'';
doCheck = false; # test dependencies not packaged up yet
checkInputs = [
python3Packages.pytest
#python3Packages.pytest-xvfb
#python3Packages.pytest-qt
python3Packages.pytestCheckHook
herbstluftwm
# The following are listed in test-requirements.txt but appear not
# to be needed at present:
# python3Packages.pytest-mock
# python3Packages.flake8
];
meta = with lib; {
description = "Keyboard-based web browser with Emacs/conkeror heritage";
longDescription = ''
webmacs is yet another browser for keyboard-based web navigation.
It mainly targets emacs-like navigation, and started as a clone (in terms of
features) of conkeror.
Based on QtWebEngine and Python 3. Fully customizable in Python.
'';
homepage = https://webmacs.readthedocs.io/en/latest/;
changelog = https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md;
license = licenses.gpl3;
maintainers = with maintainers; [ jacg ];
platforms = platforms.all;
};
}
pkgs/applications/networking/cluster/flink/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@ let
sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z";
};
"1.6" = {
flinkVersion = "1.8.1";
sha256 = "1ynxlkdxvrgww9hh7rlkhybrp5vl2slj3pqg2qzc8khpcgqx1h2g";
flinkVersion = "1.9.0";
sha256 = "1dzfcmqz5j4b545wq2q3xb2xkbhqllr04s3av1afv54y61l5y952";
};
};
in
pkgs/applications/networking/cluster/kops/default.nix
+2 -2
View File
@@ -57,7 +57,7 @@ in rec {
};
kops_1_13 = mkKops {
version = "1.13.1";
sha256 = "0knypbrpipxplgdg6r0r6ycsj7w46virmzwn5s4sdim0y8d2ppyb";
version = "1.13.2";
sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
};
}
pkgs/applications/networking/cluster/kubetail/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kubetail";
version = "1.6.9";
version = "1.6.10";
src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
rev = version;
sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr";
sha256 = "0bg872n9fs6pl03rmjny9sgby718yznx9jwi5rx3hi4km3ha9j0b";
};
installPhase = ''
pkgs/applications/networking/cluster/openshift/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ with lib;
let
version = "3.11.0";
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version);
versionMajor = ver 0;
versionMinor = ver 1;
versionPatch = ver 2;
pkgs/applications/networking/flexget/default.nix
+2 -2
View File
@@ -24,11 +24,11 @@ with python'.pkgs;
buildPythonApplication rec {
pname = "FlexGet";
version = "2.21.16";
version = "2.21.19";
src = fetchPypi {
inherit pname version;
sha256 = "1skb73nsg5gqlqqcs64c9kiidd74p3gm0xx93jaky2gagn0jn7rv";
sha256 = "1xkxd5p4ps0dnwns64zzlvs252wx0f9fy5b6000gyql7y5cma3kj";
};
postPatch = ''
pkgs/applications/networking/instant-messengers/baresip/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
version = "0.6.3";
version = "0.6.4";
pname = "baresip";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068";
sha256 = "10bmb7wiqzjdp51kjahmsp7gkvnqp91mfz0nmwgsw1n4pv8hnwb1";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem cairo mpg123
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+2 -2
View File
@@ -58,7 +58,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.27.2"; # Please backport all updates to the stable channel.
version = "1.27.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz";
sha256 = "1c9arwnwa0lirvkwm0rfknabqn5gkznihxl1p2m6j7cs7hwhhsn2";
};
phases = [ "unpackPhase" "installPhase" ];
pkgs/applications/office/gnucash/default.nix
+2 -2
View File
@@ -25,11 +25,11 @@ in
stdenv.mkDerivation rec {
pname = "gnucash";
version = "3.6";
version = "3.7";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi";
sha256 = "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb";
};
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
pkgs/applications/office/homebank/default.nix
+2 -2
View File
@@ -2,10 +2,10 @@
, hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
name = "homebank-5.2.7";
name = "homebank-5.2.8";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
sha256 = "0pzbn0wlppwbap19isbv8vv3cq7xswladhc272ykaya78r1bxvcf";
sha256 = "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
pkgs/applications/office/impressive/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, SDL, ghostscript, pdftk, dejavu_fonts }:
let
version = "0.12.0";
version = "0.12.1";
pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]);
in stdenv.mkDerivation {
# This project was formerly known as KeyJNote.
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx";
sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl";
};
buildInputs = [ makeWrapper pythonEnv ];
pkgs/applications/office/ledger-autosync/default.nix
+2 -2
View File
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "ledger-autosync";
version = "1.0.0";
version = "1.0.1";
# no tests included in PyPI tarball
src = fetchFromGitHub {
owner = "egh";
repo = "ledger-autosync";
rev = "v${version}";
sha256 = "1fn32c02idccdmf9906pxn248qc9basjy2kr2g600806k3qvw84a";
sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q";
};
propagatedBuildInputs = with python3Packages; [
pkgs/applications/radio/flmsg/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
version = "4.0.10";
version = "4.0.14";
pname = "flmsg";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "1vprax1w5wm3v2i4d0mbakrxp7v53m2bm8icsvaji06ixskq7cxf";
sha256 = "0s1prawkpvr7xr7h8w7r0ly90ya3n8h6qsii0x6laqrkgjn9w9iy";
};
buildInputs = [
pkgs/applications/radio/flrig/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
}:
stdenv.mkDerivation rec {
version = "1.3.47";
version = "1.3.48";
pname = "flrig";
src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "1xih3ik5dssa40lx48228pcrds8r7xmd8rmk2fcr1mw6apw6q141";
sha256 = "0f46rmrr8aphj8fsbfa1bywihigzfzyxq9zg66d1laa7d3jsfs9q";
};
buildInputs = [
pkgs/applications/science/chemistry/jmol/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.29.49";
version = "14.29.53";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "19fyr4ldvbd5rbw19hslg9fpwc42wxmyx7r3z78k6dw653vb1ml5";
sha256 = "0wdkiprccgvc5nh6h616l282fbd5mx5z3aiq2y558qa4gn22nqrq";
};
patchPhase = ''
pkgs/applications/science/logic/potassco/clingo.nix
+3 -4
View File
@@ -2,15 +2,14 @@
stdenv.mkDerivation rec {
pname = "clingo";
version = "5.3.0";
version = "5.4.0";
src = fetchzip {
url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv";
sha256 = "0gfqlgwg3qx042w6hdc9qpmr50n4vci3p0ddk28f3kqacf6q9q7m";
};
buildInputs = [];
nativeBuildInputs = [cmake];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
pkgs/applications/science/logic/yices/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# Includes a fix for the embedded soname being libyices.so.2.5, but
# only installing the libyices.so.2.5.x file.
installPhase = let
ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version));
ver_XdotY = stdenv.lib.versions.majorMinor version;
in ''
make install LDCONFIG=true
ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}}
pkgs/applications/science/math/ginac/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:
stdenv.mkDerivation rec {
name = "ginac-1.7.6";
name = "ginac-1.7.7";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "03cq93qjfgxgr7zxadrjfbn43lk5f0x2lmd90ggx10p6jq47157v";
sha256 = "1jsf74cym5v6nq70aij3l7axq8vf7rrc1lnb9siyb9lsfbnnxzqf";
};
propagatedBuildInputs = [ cln ];
pkgs/applications/science/math/nauty/default.nix
-1
View File
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
sandybridge = [ "--disable-clz" ];
ivybridge = [ "--disable-clz" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
buildInputs = [];
installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
pkgs/applications/science/math/sage/sage-src.nix
+7
View File
@@ -109,6 +109,13 @@ stdenv.mkDerivation rec {
# now set the cache dir to be withing the .sage directory. This is not
# strictly necessary, but keeps us from littering in the user's HOME.
./patches/sympow-cache.patch
# https://trac.sagemath.org/ticket/28472
(fetchpatch {
name = "eclib-20190909.patch";
url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d";
sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diff-so-fancy";
version = "1.2.6";
version = "1.2.7";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
sha256 = "1w8x2d83zdhrnydiqq1qjf3j1y4cawdg8p1isj8zqwblnc47ygjm";
sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21";
};
# Perl is needed here for patchShebangs
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+4 -4
View File
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, pythonPackages, gettext, git, qt5 }:
{ stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
let
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify;
in buildPythonApplication rec {
pname = "git-cola";
version = "3.4";
version = "3.5";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
sha256 = "0754d56dprhb1nhb8fwp4my5pyqcgarwzba1l6zx7il87d7vyi5m";
sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i";
};
buildInputs = [ git gettext ];
pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }:
let
version = "0.2.6";
version = "0.3.1";
repo = "git-secret";
in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
inherit repo;
owner = "sobolevn";
rev = "v${version}";
sha256 = "09p4h8mdmk0nzcd1jh1i6n29klz38n5vqqwdyzjkygmr2xqka55b";
sha256 = "0234a2507as242wlybg32f7nd27ffjs50r4p1p95j6vs5s8g413l";
};
buildInputs = [ makeWrapper ];
pkgs/applications/video/clipgrab/default.nix
+2 -2
View File
@@ -5,10 +5,10 @@
mkDerivation rec {
pname = "clipgrab";
version = "3.8.4";
version = "3.8.5";
src = fetchurl {
sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s";
sha256 = "0jfjnzwvz4ynlld0ih7f7d575s5w2dag0hvb02c6qan7xm5jdhv9";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
pkgs/applications/video/peek/default.nix
+50 -17
View File
@@ -1,45 +1,78 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook
, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg
{ stdenv
, fetchFromGitHub
, meson
, ninja
, gettext
, desktop-file-utils
, appstream-glib
, pkgconfig
, txt2man
, gzip
, vala
, wrapGAppsHook
, gsettings-desktop-schemas
, gtk3
, glib
, cairo
, keybinder3
, ffmpeg
, python3
, libxml2
, gst_all_1
, which
, gifski
}:
stdenv.mkDerivation rec {
pname = "peek";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "phw";
repo = pname;
repo = "peek";
rev = version;
sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb";
sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb";
};
preConfigure = ''
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
'';
nativeBuildInputs = [
cmake
appstream-glib
desktop-file-utils
gettext
gzip
meson
ninja
libxml2
pkgconfig
libxml2.bin
txt2man
vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433
python3
vala
wrapGAppsHook
];
buildInputs = [
cairo
glib
gsettings-desktop-schemas
gtk3
gst_all_1.gstreamer
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-ugly
keybinder3
];
enableParallelBuilding = true;
postPatch = ''
patchShebangs build-aux/meson/postinstall.py data/man/build_man.sh
'';
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg gifski ]})
'';
meta = with stdenv.lib; {
homepage = https://github.com/phw/peek;
homepage = https://github.com/phw/peek;
description = "Simple animated GIF screen recorder with an easy to use interface";
license = licenses.gpl3;
maintainers = with maintainers; [ puffnfresh ];
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ puffnfresh worldofpeace ];
platforms = platforms.linux;
};
}
pkgs/applications/video/vlc/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, onlyLibVLC ? false
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
fluidsynth wayland wayland-protocols
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+10 -6
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, zlib, xorg, dbus, virtualbox }:
, zlib, xorg, dbus, virtualbox, dos2unix }:
let
version = virtualbox.version;
xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
xserverVListFunc = builtins.elemAt (stdenv.lib.splitVersion xorg.xorgserver.version);
# Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix>
# as it even fails to build otherwise. Still, override this even here,
@@ -32,9 +32,6 @@ in stdenv.mkDerivation {
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include";
# If you add a patch you probably need this.
#patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ];
hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
@@ -42,11 +39,18 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies;
postPatch = ''
prePatch = ''
substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \
--replace "<ttm/" "<drm/ttm/"
${dos2unix}/bin/dos2unix src/vboxguest-${version}/vboxguest/r0drv/linux/mp-r0drv-linux.c
'';
patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ];
# Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14
# https://www.virtualbox.org/ticket/18911
patches = [ ./kernel-5.3-fix.patch ];
unpackPhase = ''
${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch
+50
View File
@@ -0,0 +1,50 @@
--- a/vboxguest/r0drv/linux/mp-r0drv-linux.c
+++ a/vboxguest/r0drv/linux/mp-r0drv-linux.c
@@ -283,12 +283,15 @@
if (RTCpuSetCount(&OnlineSet) > 1)
{
/* Fire the function on all other CPUs without waiting for completion. */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
+ Assert(!rc); NOREF(rc);
# else
int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
-# endif
Assert(!rc); NOREF(rc);
+# endif
}
#endif
@@ -326,7 +329,6 @@
{
#ifdef CONFIG_SMP
IPRT_LINUX_SAVE_EFL_AC();
- int rc;
RTMPARGS Args;
RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
@@ -337,14 +339,17 @@
Args.cHits = 0;
RTThreadPreemptDisable(&PreemptState);
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
+ Assert(rc == 0); NOREF(rc);
# else /* older kernels */
- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
+ Assert(rc == 0); NOREF(rc);
# endif /* older kernels */
RTThreadPreemptRestore(&PreemptState);
- Assert(rc == 0); NOREF(rc);
IPRT_LINUX_RESTORE_EFL_AC();
#else
RT_NOREF(pfnWorker, pvUser1, pvUser2);
pkgs/applications/window-managers/fvwm/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@ assert gestures -> libstroke != null;
stdenv.mkDerivation rec {
pname = "fvwm";
version = "2.6.8";
version = "2.6.9";
src = fetchurl {
url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv";
sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/applications/window-managers/i3/gaps.nix
+2 -2
View File
@@ -3,12 +3,12 @@
i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}";
version = "4.17";
version = "4.17.1";
releaseDate = "2019-01-27";
src = fetchurl {
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
sha256 = "1vd2xv91xrcr07s2dywq9rvidqqmbs41hlvhcvr1927gz200vgjg";
sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
pkgs/applications/window-managers/qtile/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ python37Packages.buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ];
pythonPath = with python37Packages; [ xcffib cairocffi-xcffib ];
pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools ];
postInstall = ''
wrapProgram $out/bin/qtile \
pkgs/build-support/emacs/wrapper.nix
+91 -88
View File
@@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
*/
{ lib, lndir, makeWrapper, runCommand, stdenv }: self:
{ lib, lndir, makeWrapper, runCommand }: self:
with lib; let inherit (self) emacs; in
@@ -45,105 +45,110 @@ let
else packagesFun;
in
stdenv.mkDerivation {
name = (appendToName "with-packages" emacs).name;
nativeBuildInputs = [ emacs lndir makeWrapper ];
inherit emacs explicitRequires;
runCommand
(appendToName "with-packages" emacs).name
{
nativeBuildInputs = [ emacs lndir makeWrapper ];
inherit emacs explicitRequires;
# Store all paths we want to add to emacs here, so that we only need to add
# one path to the load lists
deps = runCommand "emacs-packages-deps"
{ inherit explicitRequires lndir emacs; }
''
findInputsOld() {
local pkg="$1"; shift
local var="$1"; shift
local propagatedBuildInputsFiles=("$@")
preferLocalBuild = true;
allowSubstitutes = false;
# TODO(@Ericson2314): Restore using associative array once Darwin
# nix-shell doesn't use impure bash. This should replace the O(n)
# case with an O(1) hash map lookup, assuming bash is implemented
# well :D.
local varSlice="$var[*]"
# ''${..-} to hack around old bash empty array problem
case "''${!varSlice-}" in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice
# Store all paths we want to add to emacs here, so that we only need to add
# one path to the load lists
deps = runCommand "emacs-packages-deps"
{ inherit explicitRequires lndir emacs; }
''
findInputsOld() {
local pkg="$1"; shift
local var="$1"; shift
local propagatedBuildInputsFiles=("$@")
eval "$var"'+=("$pkg")'
# TODO(@Ericson2314): Restore using associative array once Darwin
# nix-shell doesn't use impure bash. This should replace the O(n)
# case with an O(1) hash map lookup, assuming bash is implemented
# well :D.
local varSlice="$var[*]"
# ''${..-} to hack around old bash empty array problem
case "''${!varSlice-}" in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice
if ! [ -e "$pkg" ]; then
echo "build input $pkg does not exist" >&2
exit 1
fi
eval "$var"'+=("$pkg")'
local file
for file in "''${propagatedBuildInputsFiles[@]}"; do
file="$pkg/nix-support/$file"
[[ -f "$file" ]] || continue
if ! [ -e "$pkg" ]; then
echo "build input $pkg does not exist" >&2
exit 1
fi
local pkgNext
for pkgNext in $(< "$file"); do
findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}"
done
done
}
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
local file
for file in "''${propagatedBuildInputsFiles[@]}"; do
file="$pkg/nix-support/$file"
[[ -f "$file" ]] || continue
local requires
for pkg in $explicitRequires; do
findInputsOld $pkg requires propagated-user-env-packages
done
# requires now holds all requested packages and their transitive dependencies
local pkgNext
for pkgNext in $(< "$file"); do
findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}"
done
done
}
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
linkPath() {
local pkg=$1
local origin_path=$2
local dest_path=$3
local requires
for pkg in $explicitRequires; do
findInputsOld $pkg requires propagated-user-env-packages
done
# requires now holds all requested packages and their transitive dependencies
# Add the path to the search path list, but only if it exists
if [[ -d "$pkg/$origin_path" ]]; then
$lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
fi
}
linkPath() {
local pkg=$1
local origin_path=$2
local dest_path=$3
linkEmacsPackage() {
linkPath "$1" "bin" "bin"
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
}
# Add the path to the search path list, but only if it exists
if [[ -d "$pkg/$origin_path" ]]; then
$lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
fi
}
# Iterate over the array of inputs (avoiding nix's own interpolation)
for pkg in "''${requires[@]}"; do
linkEmacsPackage $pkg
done
linkEmacsPackage() {
linkPath "$1" "bin" "bin"
linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
}
siteStart="$out/share/emacs/site-lisp/site-start.el"
siteStartByteCompiled="$siteStart"c
subdirs="$out/share/emacs/site-lisp/subdirs.el"
subdirsByteCompiled="$subdirs"c
# Iterate over the array of inputs (avoiding nix's own interpolation)
for pkg in "''${requires[@]}"; do
linkEmacsPackage $pkg
done
# A dependency may have brought the original siteStart or subdirs, delete
# it and create our own
# Begin the new site-start.el by loading the original, which sets some
# NixOS-specific paths. Paths are searched in the reverse of the order
# they are specified in, so user and system profile paths are searched last.
rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
cat >"$siteStart" <<EOF
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
(add-to-list 'load-path "$out/share/emacs/site-lisp")
(add-to-list 'exec-path "$out/bin")
EOF
# Link subdirs.el from the emacs distribution
ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
siteStart="$out/share/emacs/site-lisp/site-start.el"
siteStartByteCompiled="$siteStart"c
subdirs="$out/share/emacs/site-lisp/subdirs.el"
subdirsByteCompiled="$subdirs"c
# Byte-compiling improves start-up time only slightly, but costs nothing.
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
'';
# A dependency may have brought the original siteStart or subdirs, delete
# it and create our own
# Begin the new site-start.el by loading the original, which sets some
# NixOS-specific paths. Paths are searched in the reverse of the order
# they are specified in, so user and system profile paths are searched last.
rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
cat >"$siteStart" <<EOF
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
(add-to-list 'load-path "$out/share/emacs/site-lisp")
(add-to-list 'exec-path "$out/bin")
EOF
# Link subdirs.el from the emacs distribution
ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
phases = [ "installPhase" ];
installPhase = ''
# Byte-compiling improves start-up time only slightly, but costs nothing.
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
'';
inherit (emacs) meta;
}
''
mkdir -p "$out/bin"
# Wrap emacs and friends so they find our site-start.el before the original.
@@ -172,6 +177,4 @@ EOF
for dir in applications icons info man; do
ln -s $emacs/share/$dir $out/share/$dir
done
'';
inherit (emacs) meta;
}
''
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+1 -2
View File
@@ -21,7 +21,7 @@
, workspace_member }:
let version_ = lib.splitString "-" crateVersion;
versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
version = lib.splitString "." (lib.head version_);
version = lib.splitVersion (lib.head version_);
rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
@@ -150,4 +150,3 @@ in ''
fi
runHook postConfigure
''
pkgs/data/fonts/public-sans/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.005";
version = "1.006";
in fetchzip {
name = "public-sans-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/
'';
sha256 = "0s0zgszpi12wanl031gi3j24ci9pkbkhvsxc30skx8s1mj99cd7i";
sha256 = "1x04mpynfhcgiwx68w5sawgn69xld7k65mbq7n5vcgbfzh2sjwhq";
meta = with lib; {
description = "A strong, neutral, principles-driven, open source typeface for text or display";
pkgs/desktops/mate/caja-extensions/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja-extensions";
version = "1.22.0";
version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p";
sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h";
};
nativeBuildInputs = [
pkgs/desktops/mate/caja/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "10b7yjimblymp1fpsrl4jb2k7kbhla2izsj3njfmg2n6fv9fy9iv";
sha256 = "1c5yr4b8pzd7nz7g7ln9jwp4fx6qgq8vgbv4spfryy53il3gv75h";
};
nativeBuildInputs = [
pkgs/desktops/mate/eom/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "eom";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4";
sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l";
};
nativeBuildInputs = [
pkgs/desktops/mate/libmateweather/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmateweather";
version = "1.22.0";
version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a";
sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3";
};
nativeBuildInputs = [ pkgconfig intltool ];
pkgs/desktops/mate/marco/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "marco";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
sha256 = "0faiqj9i1mqqy1v4jdcwy8nsbkkvs0cwd2dqypgscmcqpbq7jf8a";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-applets/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-applets";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx";
sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-calc/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-calc";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld";
sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-control-center/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mate-control-center";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0";
sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-desktop/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-desktop";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0";
sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-icon-theme/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-icon-theme";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k";
sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
pkgs/desktops/mate/mate-indicator-applet/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-indicator-applet";
version = "1.22.0";
version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1";
sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-media/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-media";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2";
sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw";
};
buildInputs = [
pkgs/desktops/mate/mate-menus/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-menus";
version = "1.22.0";
version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c";
sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0";
};
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
pkgs/desktops/mate/mate-notification-daemon/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mate-notification-daemon";
version = "1.22.0";
version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j";
sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-panel/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-panel";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma";
sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-power-manager/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-power-manager";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms";
sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn";
};
buildInputs = [
pkgs/desktops/mate/mate-screensaver/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-screensaver";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc";
sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-session-manager/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mate-session-manager";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig";
sha256 = "1v0a9jbsmf9axfqm2cnsqp5ihwffw7rl0z77dyw0m4j2pmyb0558";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-settings-daemon/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mate-settings-daemon";
version = "1.22.0";
version = "1.22.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym";
sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-system-monitor/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-system-monitor";
version = "1.22.1";
version = "1.22.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm";
sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1";
};
nativeBuildInputs = [
pkgs/desktops/mate/mate-user-guide/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-user-guide";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h";
sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs";
};
nativeBuildInputs = [ itstool intltool libxml2 ];
pkgs/desktops/xfce4-14/tumbler/default.nix
+5
View File
@@ -27,4 +27,9 @@ mkXfceDerivation {
libgsf
poppler # technically the glib binding
];
# WrapGAppsHook won't touch this binary automatically, so we wrap manually.
postFixup = ''
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
'';
}
pkgs/development/compilers/closure/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "closure-compiler";
version = "20190215";
version = "20190909";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "16rpl7x90ganpxlz6v9292cwx7dnkhklqx1nn161yj7ypf9bzd4k";
sha256 = "0km45pz19dz1hi8vjj290hyxdhr379iixmml0rs8crr4gvs3685w";
};
sourceRoot = ".";
pkgs/development/compilers/cudatoolkit/default.nix
+1 -3
View File
@@ -180,9 +180,7 @@ let
'';
passthru = {
cc = gcc;
majorVersion =
let versionParts = lib.splitString "." version;
in "${lib.elemAt versionParts 0}.${lib.elemAt versionParts 1}";
majorVersion = lib.versions.majorMinor version;
};
meta = with stdenv.lib; {
pkgs/development/compilers/ghc/head.nix
+6 -6
View File
@@ -27,7 +27,7 @@
, # Whetherto build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "8.9.20190601"
, version ? "8.9.20190924"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -89,8 +89,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
rev = "795986aaf33e2ffc233836b86a92a77366c91db2";
sha256 = "0a111x6c53r07q5qdg6c8mnydqp0wh4mpxmw7ga4x5wlap8i0bji";
};
enableParallelBuilding = true;
@@ -183,7 +183,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
bootPkgs.ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
# For building runtime libs
@@ -224,14 +224,14 @@ stdenv.mkDerivation (rec {
inherit enableShared;
# Our Cabal compiler name
haskellCompilerName = "ghc-8.7";
haskellCompilerName = "ghc-${version}";
};
meta = {
homepage = http://haskell.org/ghc;
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
inherit (bootPkgs.ghc.meta) license platforms;
inherit (ghc.meta) license platforms;
};
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
pkgs/development/compilers/jsonnet/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jsonnet";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "google";
repo = "jsonnet";
sha256 = "1fibr1kysbxcf8jp2a4xvs3n7i8d9k2430agxzc9mdyqrh79zlxk";
sha256 = "012zapx0xvlkl2y7dljpdn18gymnmzc4mma2yagf9pxnr286lwrf";
};
enableParallelBuilding = true;
pkgs/development/compilers/kotlin/default.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
version = "1.3.41";
version = "1.3.50";
in stdenv.mkDerivation {
inherit version;
pname = "kotlin";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "0ch1fynqjfsb7jklw3pa6fygrgnl8nz4x4v0id06wq4md23bcjn4";
sha256 = "1v66pnk810agf26khwdv7l8jpc11x6na5fyqxs9jvxdpls8l0hk9";
};
propagatedBuildInputs = [ jre ] ;
pkgs/development/compilers/llvm/3.9/llvm.nix
+1 -1
View File
@@ -22,7 +22,7 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries;
let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." version; in
let parts = splitVersion version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in
pkgs/development/compilers/llvm/4/llvm.nix
+1 -1
View File
@@ -19,7 +19,7 @@
let
# Used when creating a versioned symlinks of libLLVM.dylib
versionSuffixes = with stdenv.lib;
let parts = splitString "." release_version; in
let parts = splitVersion release_version; in
imap (i: _: concatStringsSep "." (take i parts)) parts;
in

Some files were not shown because too many files have changed in this diff Show More