From 76cc15a3640940aa5866a3fc573e8089f6b336c9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Oct 2018 13:19:52 +0200 Subject: [PATCH 001/230] nixos-option: don't abort with shell failures if options are not existant `nixos-option` basically handles two cases: the given option is either a valid option defined using `mkOption` or an attribute set which contains a set of options. If none of the above cases is valid, `$1` is invalid. Unfortunatley the script interpreted invalid options as an attribute set which rendered shell failures when trying to evaluate the arguments. First of all, `if names=$(attrNames ...)` resulted in `` as `attrNames` simply evaluated `builtins.attrNames $result` which results in a non-applied function with `$result` being empty. Trying to map over this string using `nixMap` while applying `escapeQuotes` causes the bash error as `eval echo ""` is invalid syntax. Explicitly checking if `$result' contains a value (do we have an attribute set?) and otherwise returning a warning and asking if $option exists fixes the problem. Fixes #48060 --- nixos/modules/installer/tools/nixos-option.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 327e3e6989f..76db778da27 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -314,13 +314,13 @@ else # echo 1>&2 "Warning: This value is not an option." result=$(evalCfg "") - if names=$(attrNames "$result" 2> /dev/null); then + if [ ! -z "$result" ]; then + names=$(attrNames "$result" 2> /dev/null) echo 1>&2 "This attribute set contains:" escapeQuotes () { eval echo "$1"; } nixMap escapeQuotes "$names" else - echo 1>&2 "An error occurred while looking for attribute names." - echo $result + echo 1>&2 "An error occurred while looking for attribute names. Are you sure that \`$option' exists?" fi fi From ea90e519a20df55f1842d0ce37a8db0c69412bad Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sat, 24 Nov 2018 18:54:47 +0100 Subject: [PATCH 002/230] Remane test-eval-release.sh to eval-release.sh Since this script can also be used for non testing purposes. --- maintainers/scripts/{test-eval-release.sh => eval-release.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename maintainers/scripts/{test-eval-release.sh => eval-release.sh} (100%) diff --git a/maintainers/scripts/test-eval-release.sh b/maintainers/scripts/eval-release.sh similarity index 100% rename from maintainers/scripts/test-eval-release.sh rename to maintainers/scripts/eval-release.sh From 221762cc5deec1879a84ce11bb1176091e54da27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 17:07:10 -0800 Subject: [PATCH 003/230] ansible-lint: 3.4.23 -> 3.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python2.7-ansible-lint/versions --- pkgs/development/tools/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index 5433725b305..12eee5f8086 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { pname = "ansible-lint"; - version = "3.4.23"; + version = "3.5.1"; src = fetchFromGitHub { owner = "willthames"; repo = "ansible-lint"; rev = "v${version}"; - sha256 = "0cnfgxh5m7alzm811hc95jigbca5vc1pf8fjazmsakmhdjyfbpb7"; + sha256 = "09qixiaqhm6dbl74s1rwxbsg31nr6jjsvr4fxfnxl9ccbxcrpzn2"; }; propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; From 1ecbc12cb8c84d4a708d99065af21dcc35e7aac7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 20:23:22 -0800 Subject: [PATCH 004/230] osl: 1.9.10 -> 1.10.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openshadinglanguage/versions --- pkgs/development/compilers/osl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 7a4928d2662..ddfd5d0a3fd 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.9.10"; + version = "1.10.2"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.9.10"; - sha256 = "1iaw3pgh0h53gxk3bl148n1lfr54cx2yv0gnx2rjp2m5599acbz4"; + rev = "Release-1.10.2"; + sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; From 5b8d77d826642a70e95bf764b437a7b335434e38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 20:38:50 -0800 Subject: [PATCH 005/230] openfortivpn: 1.7.1 -> 1.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/openfortivpn/versions --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 5512db9fe76..07ebaa072ea 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.7.1"; + version = "1.8.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "01nsgmmh72qk0aq2zdjh8qqn256mmvz1w2gl0wi7g29d82y2hdfm"; + sha256 = "1p7zfysqvivca565ifb5anla3rgqavq2npavj1vlmhipa01080lk"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 3b2506b04857a5bfc825a46f5ee15d0132056e65 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 23 Dec 2018 21:43:28 +0100 Subject: [PATCH 006/230] rmlint: 2.6.1 -> 2.8.0 The recipe now uses the default scons build phases. --- pkgs/tools/misc/rmlint/blkid-hack.patch | 18 ++++++++++++++++++ pkgs/tools/misc/rmlint/default.nix | 15 ++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 pkgs/tools/misc/rmlint/blkid-hack.patch diff --git a/pkgs/tools/misc/rmlint/blkid-hack.patch b/pkgs/tools/misc/rmlint/blkid-hack.patch new file mode 100644 index 00000000000..d712f7daa27 --- /dev/null +++ b/pkgs/tools/misc/rmlint/blkid-hack.patch @@ -0,0 +1,18 @@ +# HACK: For some reason the file blkid/blkid.h is not found during build. +# I assueme it is due to the fact that -I [...]util-linux-2.33-dev/include/blkid +# is added during the build and not just -I [...]util-linux-2.33-dev/include +# For the time being this patch is the only way I could find to fix the build. + +diff --git a/lib/utilities.c b/lib/utilities.c +index e768fa41..1f96fd68 100644 +--- a/lib/utilities.c ++++ b/lib/utilities.c +@@ -76,7 +76,7 @@ + #endif + + #if HAVE_BLKID +-#include ++#include + #endif + + #if HAVE_JSON_GLIB diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 640e641dd47..b97c4ac13f7 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,23 +4,24 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.6.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8"; + sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz"; }; - configurePhase = "scons config"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; + patches = [ + ./blkid-hack.patch + ]; - buildPhase = "scons"; + nativeBuildInputs = [ pkgconfig sphinx ]; + buildInputs = [ gettext glib json-glib libelf scons utillinux ]; - installPhase = "scons --prefix=$out install"; + prefixKey = "--prefix="; meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; From e7ad1fb97770cee7189e86e3e40ae39afbac162a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 Dec 2018 22:41:09 +0100 Subject: [PATCH 007/230] rmlint: fix build without patch --- pkgs/tools/misc/rmlint/blkid-hack.patch | 18 ------------------ pkgs/tools/misc/rmlint/default.nix | 15 +++++++++------ 2 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 pkgs/tools/misc/rmlint/blkid-hack.patch diff --git a/pkgs/tools/misc/rmlint/blkid-hack.patch b/pkgs/tools/misc/rmlint/blkid-hack.patch deleted file mode 100644 index d712f7daa27..00000000000 --- a/pkgs/tools/misc/rmlint/blkid-hack.patch +++ /dev/null @@ -1,18 +0,0 @@ -# HACK: For some reason the file blkid/blkid.h is not found during build. -# I assueme it is due to the fact that -I [...]util-linux-2.33-dev/include/blkid -# is added during the build and not just -I [...]util-linux-2.33-dev/include -# For the time being this patch is the only way I could find to fix the build. - -diff --git a/lib/utilities.c b/lib/utilities.c -index e768fa41..1f96fd68 100644 ---- a/lib/utilities.c -+++ b/lib/utilities.c -@@ -76,7 +76,7 @@ - #endif - - #if HAVE_BLKID --#include -+#include - #endif - - #if HAVE_JSON_GLIB diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index b97c4ac13f7..320edd83021 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, - gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: +{ stdenv, fetchFromGitHub +, gettext, pkgconfig, scons +, glib, json-glib, libelf, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,13 +14,15 @@ stdenv.mkDerivation rec { sha256 = "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz"; }; + CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; - patches = [ - ./blkid-hack.patch + nativeBuildInputs = [ + pkgconfig sphinx gettext scons ]; - nativeBuildInputs = [ pkgconfig sphinx ]; - buildInputs = [ gettext glib json-glib libelf scons utillinux ]; + buildInputs = [ + glib json-glib libelf utillinux + ]; prefixKey = "--prefix="; From e279767d6927d2077255db3bf39c40030ba3791e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 6 Jan 2019 15:40:11 +0100 Subject: [PATCH 008/230] doc: don't overwrite makeFlagsArray in the example Arrays like these should be appended to instead of overwritten in almost every case to avoid loosing the existing flags. --- doc/stdenv.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 564471bbbbc..ac0d84b90f9 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1279,7 +1279,9 @@ makeFlags = [ "PREFIX=$(out)" ]; make. You must use this instead of makeFlags if the arguments contain spaces, e.g. -makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +preBuild = '' + makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +''; Note that shell arrays cannot be passed through environment variables, so you cannot set makeFlagsArray in a derivation From 7f76246bef806b551bb3e74adbd0197544fd3444 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 6 Jan 2019 11:30:36 -0500 Subject: [PATCH 009/230] pythonPackages.libtmux: enable darwin build --- pkgs/development/python-modules/libtmux/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 417baed9560..43b75b30f5a 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { description = "Scripting library for tmux"; homepage = https://libtmux.readthedocs.io/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } - From 560548298b901881186e38c303384a254284844f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 6 Jan 2019 11:33:25 -0500 Subject: [PATCH 010/230] pythonPackages.kaptan: 0.5.10 -> 0.5.11 --- pkgs/development/python-modules/kaptan/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 425a3b29f13..455f90a0164 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -6,20 +6,22 @@ buildPythonPackage rec { pname = "kaptan"; - version = "0.5.10"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "44df200d030975650a3a832c13b48cafdeb1a237b23de181d6a2346107e39da3"; + sha256 = "8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207"; }; propagatedBuildInputs = [ pyyaml ]; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { description = "Configuration manager for python applications"; - homepage = https://emre.github.io/kaptan/; + homepage = https://kaptan.readthedocs.io/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; From 154ace0538c538584ad567b5a4c7df6180836807 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 6 Jan 2019 11:34:05 -0500 Subject: [PATCH 011/230] tmuxp: 1.4.2 -> 1.5.0a1 --- pkgs/tools/misc/tmuxp/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index fe31d324087..c4cedf42650 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.4.2"; + version = "1.5.0a1"; src = fetchPypi { inherit pname version; - sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm"; + sha256 = "88b6ece3ff59a0882b5c5bff169cc4c1d688161fe61e5553b0a0802ff64b6da8"; }; postPatch = '' @@ -29,9 +29,8 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Manage tmux workspaces from JSON and YAML"; - homepage = http://tmuxp.readthedocs.io; + homepage = https://tmuxp.git-pull.com/; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ jgeerds ]; }; } From 6eea9ac8683a393f55d270490c91a6f0c2af4fc0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Jan 2019 19:26:08 +0100 Subject: [PATCH 012/230] linux: add feature flag to indicate support for 32bit emulation Motivated by the need to warn users trying to build configurations that depend on being able to run 32bit apps on 64bit kernels. --- pkgs/os-specific/linux/kernel/generic.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e424dff596d..a731ec3388f 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -62,6 +62,7 @@ let netfilterRPFilter = true; grsecurity = false; xen_dom0 = false; + ia32Emulation = true; } // features) kernelPatches; intermediateNixConfig = import ./common-config.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d00a87c336..24fcbfda44b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14825,6 +14825,7 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { + features.ia32Emulation = false; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; inherit (kernel) version; From ab070d1b0b424a49322d70a75b21c4f21e10637a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Jan 2019 19:28:35 +0100 Subject: [PATCH 013/230] nixos/opengl: assert 32bit emu support if 32bit support is enabled See https://github.com/NixOS/nixpkgs/issues/51097 --- nixos/modules/hardware/opengl.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 48e0072e089..6b7b8069fd4 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -124,10 +124,14 @@ in config = mkIf cfg.enable { - assertions = lib.singleton { - assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; - message = "Option driSupport32Bit only makes sense on a 64-bit system."; - }; + assertions = [ + { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; + message = "Option driSupport32Bit only makes sense on a 64-bit system."; + } + { assertion = cfg.driSupport32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false); + message = "Option driSupport32Bit requires a kernel that supports 32bit emulation"; + } + ]; systemd.tmpfiles.rules = [ "L+ /run/opengl-driver - - - - ${package}" From fd5a88687c8a0e032d9c8f5000d12d0e31994193 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 9 Jan 2019 11:30:19 -0500 Subject: [PATCH 014/230] nixos/httpd: add options sslCiphers & sslProtocols --- .../web-servers/apache-httpd/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 73607c6f9a3..2d6ed853074 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -187,8 +187,8 @@ let SSLRandomSeed startup builtin SSLRandomSeed connect builtin - SSLProtocol All -SSLv2 -SSLv3 - SSLCipherSuite HIGH:!aNULL:!MD5:!EXP + SSLProtocol ${mainCfg.sslProtocols} + SSLCipherSuite ${mainCfg.sslCiphers} SSLHonorCipherOrder on ''; @@ -630,6 +630,19 @@ in description = "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited"; }; + + sslCiphers = mkOption { + type = types.str; + default = "HIGH:!aNULL:!MD5:!EXP"; + description = "Cipher Suite available for negotiation in SSL proxy handshake."; + }; + + sslProtocols = mkOption { + type = types.str; + default = "All -SSLv2 -SSLv3"; + example = "All -SSLv2 -SSLv3 -TLSv1"; + description = "Allowed SSL/TLS protocol versions."; + }; } # Include the options shared between the main server and virtual hosts. From c6b162bfd03fd028fe8019a4f6c09d91f7f95316 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 10 Jan 2019 11:40:00 +0300 Subject: [PATCH 015/230] parity-beta: 2.2.5 -> 2.2.6 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 46985fd065e..636e63ed4af 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.2.5"; - sha256 = "0q9vgwc0jlja73r4na7yil624iagq1607ac47wh8a7xgfjmjjai1"; - cargoSha256 = "0ibdmyh1jvfq51vhwn4riyhilqwhf71hjd4vyj525smn95p75b14"; + version = "2.2.6"; + sha256 = "1zbkbj8njawqsqfd5bp64p1wm6paa7y3nkdxggj6ap6dbg6549v0"; + cargoSha256 = "1izwqg87qxhmmkd49m0k09i7r05sfcb18m5jbpvggjzp57ips09r"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 18387c4be2a4042279ec72087f788e591ec22d01 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Thu, 10 Jan 2019 11:40:47 +0300 Subject: [PATCH 016/230] parity: 2.1.10 -> 2.1.11 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 81923849094..284926e2f61 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.1.10"; - sha256 = "1l4yl8i24q8v4hzljzai37f587x8m3cz3byzifhvq3bjky7p8h80"; - cargoSha256 = "04pni9cmz8nhlqznwafz9d81006808kh24aqnb8rjdcr84d11zis"; + version = "2.1.11"; + sha256 = "0s0vig9pcz9iw774drfanb6hwnx97wm5fgn4hf5pydwb4jws1qrf"; + cargoSha256 = "1nx6aiq4888d75xfzx9q7ih5jgidjaq1i63bvvgxqyldxq0hjrma"; in import ./parity.nix { inherit version sha256 cargoSha256; } From e680dd42b4002a2049de82dbfdadfe686724936f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 11 Jan 2019 12:00:27 +0300 Subject: [PATCH 017/230] ejabberd: 18.06 -> 18.12.1 --- pkgs/servers/xmpp/ejabberd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1436af024cd..8339460276c 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.06"; + version = "18.12.1"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "1c4h6qrckihm8v4vm52h31j5dxg7247vk374rwz41idfb25vx7dc"; + sha256 = "0mqzbjzcf0aqjzds6pxl1zy1ajn3f8c94dn47xf2i9qid0bsydgx"; }; nativeBuildInputs = [ fakegit ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1bk3yd10cq6vlgmh2qawl82m29yi5zcbsdlz17xyy76sg2ka622a"; + outputHash = "1ihg5jbvilfxacsw885ywgyf74r9hm8gcn17mrgbv6y7fcvcgcsr"; }; configureFlags = From f84e353831a3d951d63b0a3409ef262c206133e2 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Fri, 11 Jan 2019 16:12:22 +0100 Subject: [PATCH 018/230] synergy: fix compilation on macOS cf-private is needed to build on macOS --- pkgs/applications/misc/synergy/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfc..25855c2a613 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper -, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver, cf-private , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl openssl ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ApplicationServices Carbon Cocoa CoreServices ScreenSaver cf-private ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f2ed083a28..7a4baaf3c4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19495,6 +19495,7 @@ in syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; synergy = callPackage ../applications/misc/synergy { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; }; From e0511ba0e43fc0614fc9e9bbcdfa43eb8e932d0c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 11 Jan 2019 21:32:41 +0300 Subject: [PATCH 019/230] ps_mem: 3.9 -> 3.12 --- pkgs/tools/system/ps_mem/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index bbac78f4864..3e7bb301a6b 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchFromGitHub }: let - version = "3.9"; + version = "3.12"; pname = "ps_mem"; in pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; @@ -9,8 +9,8 @@ in pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pixelb"; repo = "${pname}"; - rev = "f0891def54f1edb78a70006603d2b025236b830f"; - sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif"; + rev = "v${version}"; + sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph"; }; meta = with stdenv.lib; { From 1f18bb67b7c426f1c770ef15c4ed38c627c9e777 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 11 Jan 2019 21:41:54 +0300 Subject: [PATCH 020/230] kmsxx: 2018-09-10 -> 2018-10-23 --- pkgs/development/libraries/kmsxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d270e2f0678..d3733ea5f72 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "kmsxx"; - version = "2018-09-10"; + version = "2018-10-23"; name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "524176c33ee2b79f78d454fa621e0d32e7e72488"; - sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8"; + rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5"; + sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf"; }; enableParallelBuilding = true; From 9ee99d9f8ffd4cff7db4ee2a79a19aabcbdec2f8 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 11 Jan 2019 22:31:36 +0300 Subject: [PATCH 021/230] qdirstat: 1.4 -> 1.5 --- pkgs/applications/misc/qdirstat/default.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index ab9029512a2..abf4bb05462 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages }: let - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation rec { name = "qdirstat-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh"; + sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc"; }; nativeBuildInputs = [ qmake makeWrapper ]; @@ -20,18 +20,9 @@ in stdenv.mkDerivation rec { preBuild = '' substituteInPlace scripts/scripts.pro \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /usr/bin $out/bin - substituteInPlace src/src.pro \ - --replace /usr/bin $out/bin \ - --replace /usr/share $out/share - for i in doc/doc.pro doc/stats/stats.pro - do - substituteInPlace $i \ - --replace /usr/share $out/share - done + --replace /bin/true ${coreutils}/bin/true - for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp + for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open @@ -45,6 +36,9 @@ in stdenv.mkDerivation rec { substituteInPlace src/StdCleanup.cpp \ --replace /bin/bash ${bash}/bin/bash ''; + postPatch = '' + export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" + ''; postInstall = '' wrapProgram $out/bin/qdirstat-cache-writer \ From ab7065ba409bbe01b84cf755a3476f26c79a2e67 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 00:40:29 +0300 Subject: [PATCH 022/230] mytetra: 1.43.27 -> 1.44.55 --- pkgs/applications/office/mytetra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 5dae3c9f85c..a7887357cd3 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let - version = "1.43.27"; + version = "1.44.55"; in stdenv.mkDerivation rec { name = "mytetra-${version}"; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; - sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h"; + sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; }; nativeBuildInputs = [ qmake makeWrapper ]; @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; preBuild = '' - substituteInPlace mytetra.pro \ + substituteInPlace app/app.pro \ --replace /usr/local/bin $out/bin \ --replace /usr/share $out/share - substituteInPlace src/views/mainWindow/MainWindow.cpp \ + substituteInPlace app/src/views/mainWindow/MainWindow.cpp \ --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" ''; From 7ef94bee72f19f4eec17d0dd35df89d66b047042 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 00:55:41 +0300 Subject: [PATCH 023/230] vk-messenger: 3.9.0 -> 4.0.1 --- .../networking/instant-messengers/vk-messenger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 5642d254295..b992263e215 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -2,17 +2,17 @@ , xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }: let - version = "3.9.0"; + version = "4.0.1"; in stdenv.mkDerivation { name = "vk-messenger-${version}"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3"; + sha256 = "0mgppa9qnhix64zp40dc05yc9klsc7qiwcgw7pwq2wm7m3fz3nm8"; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9"; + sha256 = "0ra0y4dfx4gfa1r3lm6v42j7c9pf7a8vh12kxv3wkg3pvijwgdsm"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); From e107569b6f299f1ee5795c5a311051f83acb6e7a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 01:17:46 +0300 Subject: [PATCH 024/230] franz: 4.0.4 -> 5.0.0-beta.19 --- .../instant-messengers/franz/default.nix | 48 +++++++------------ 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 4b8670f23d4..d33761ba772 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,60 +1,44 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook -, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg +, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else "ia32"; - - version = "4.0.4"; - - desktopItem = makeDesktopItem rec { - name = "Franz"; - exec = name; - icon = "franz"; - desktopName = name; - genericName = "Franz messenger"; - categories = "Network;"; - }; + version = "5.0.0-beta.19"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { - url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz"; - sha256 = if bits == "x64" then - "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else - "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; + url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; + sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy"; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ]; buildInputs = (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; - unpackPhase = '' - tar xzf $src - ''; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out/bin $out/opt/franz - cp -r * $out/opt/franz - ln -s $out/opt/franz/Franz $out/bin + mkdir -p $out/bin + cp -r opt $out + ln -s $out/opt/Franz/franz $out/bin # provide desktop item and icon - mkdir -p $out/share/applications $out/share/pixmaps - ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + cp -r usr/share $out + substituteInPlace $out/share/applications/franz.desktop \ + --replace Exec=\"/opt/Franz/franz\" Exec=franz ''; postFixup = '' - wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { @@ -62,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = ["x86_64-linux"]; hydraPlatforms = []; }; } From e0b64f5cedbb0e860c0084b12381c3534d60ccba Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 01:20:25 +0300 Subject: [PATCH 025/230] vkquake: 1.00.0 -> 1.01.0 --- pkgs/games/quakespasm/vulkan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 6f69c646950..4cd073869dc 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "vkquake-${version}"; - majorVersion = "1.00"; + majorVersion = "1.01"; version = "${majorVersion}.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "1h7ac5bh6h6cpvkx5bvp17lv5m24hmdykcdppkivblikpxhml70s"; + sha256 = "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39"; }; sourceRoot = "source/Quake"; From 00349e3fdad9b7feb0e836e96c3d6fb1e0d4557e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 01:27:52 +0300 Subject: [PATCH 026/230] openjk: 2017-08-11 -> 2018-09-17 --- pkgs/games/openjk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index fd662fe9743..a03599b5089 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -20,13 +20,13 @@ let categories = "Game;"; }; in stdenv.mkDerivation rec { - name = "OpenJK-2017-08-11"; + name = "OpenJK-2018-09-17"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "a0828f06e0181c62e110f2f78d30acb5036b4113"; - sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m"; + rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f"; + sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk"; }; dontAddPrefix = true; From 6b79f059b2ec1d19833f03b4d7e1a33ffa475b8a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 13 Jan 2019 17:19:29 +0300 Subject: [PATCH 027/230] openmw-tes3mp: 0.6.0 -> 0.7.0-alpha --- pkgs/games/openmw/tes3mp.nix | 62 +++++++++++++++--------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index aba92ac087e..a3ad0e637e5 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,73 +1,59 @@ { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }: +, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }: let - mygui_ = mygui.override { - inherit stdenv; - }; - terra_ = symlinkJoin { - name = "terra"; - paths = [ terra.static terra.dev ]; - }; + version = "0.7.0-alpha"; TES3MP = fetchFromGitHub { owner = "TES3MP"; repo = "openmw-tes3mp"; - rev = "f61664ff6d521e10db761a550c97c6edce8f0046"; - sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb"; + rev = version; + sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q"; }; CallFF = fetchFromGitHub { owner = "Koncord"; repo = "CallFF"; - rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9"; - sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57"; + rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b"; + sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm"; }; - RakNet = fetchFromGitHub { + CrabNet = fetchFromGitHub { owner = "TES3MP"; - repo = "RakNet"; - rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba"; - sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q"; + repo = "CrabNet"; + rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567"; + sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0"; }; - PluginExamples = fetchFromGitHub { + CoreScripts = fetchFromGitHub { owner = "TES3MP"; - repo = "PluginExamples"; - rev = "213e72f315a8029eec71437e56de0eaeba5b3670"; - sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b"; + repo = "CoreScripts"; + rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea"; + sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg"; }; fakegit = writeScriptBin "git" '' #! ${stdenv.shell} - if [ "$*" = "rev-list --tags --max-count=1" ] || - [ "$*" = "rev-parse HEAD" ]; then - echo "${TES3MP.rev}" - else - exit 1 - fi ''; in stdenv.mkDerivation rec { - version = "0.6.0"; + inherit version; name = "tes3mp-${version}"; src = fetchFromGitHub { owner = "GrimKriegor"; repo = "TES3MP-deploy"; - rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45"; - sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6"; + rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325"; + sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn"; }; dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake makeWrapper fakegit ]; - buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt - ncurses libGL ]; + buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt + ncurses libGL luajit ]; buildPhase = '' mkdir dependencies keepers cp --no-preserve=mode -r ${TES3MP} code - mkdir code/.git cp --no-preserve=mode -r ${CallFF} dependencies/callff - cp --no-preserve=mode -r ${RakNet} dependencies/raknet - cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples - ln -s ${terra_} dependencies/terra + cp --no-preserve=mode -r ${CrabNet} dependencies/raknet + cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts substituteInPlace tes3mp-deploy.sh \ --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out" @@ -86,6 +72,8 @@ in stdenv.mkDerivation rec { mv build/resources $prefix/build mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw mv keepers $prefix + mv build/tes3mp-credits.md $prefix/build + mv -f $prefix/keepers/version $prefix/build/resources for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh do @@ -100,8 +88,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tes3mp-server \ --run "mkdir -p ~/.config/openmw" \ --run "cd ~/.config/openmw" \ - --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \ - --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg" + --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \ + --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" ''; meta = with stdenv.lib; { From f2b9162167f471914c90159a1171e8c79f122fd8 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 10:52:37 +0300 Subject: [PATCH 028/230] openmpt123: 0.2.7025-beta20.1 -> 0.4.1 --- .../applications/audio/openmpt123/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5d13aa7daf4..af859702292 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }: +{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +, usePulseAudio ? false, libpulseaudio }: let - version = "0.2.7025-beta20.1"; + version = "0.4.1"; in stdenv.mkDerivation rec { name = "openmpt123-${version}"; + src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; - sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4"; }; + + enableParallelBuilding = true; + doCheck = true; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 flac libsndfile ]; - makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] - ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; - installFlags = "PREFIX=\${out}"; + buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] + ++ stdenv.lib.optional usePulseAudio libpulseaudio; + + configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ]; meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; homepage = https://lib.openmpt.org/libopenmpt/; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2933ea5a8e9..3a0039a3dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18680,7 +18680,9 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - openmpt123 = callPackage ../applications/audio/openmpt123 {}; + openmpt123 = callPackage ../applications/audio/openmpt123 { + usePulseAudio = config.pulseaudio or false; + }; opusfile = callPackage ../applications/audio/opusfile { }; From 995833de0e2808ced68ac3b7286430afa037d9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sun, 6 Jan 2019 23:35:55 +0100 Subject: [PATCH 029/230] medfile: 3.3.1 -> 4.0.0 --- pkgs/development/libraries/medfile/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 5a29a9219fb..8f0a6317a25 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "medfile-${version}"; - version = "3.3.1"; + version = "4.0.0"; src = fetchurl { url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz"; - sha256 = "1215sal10xp6xirgggdszay2bmx0sxhn9pgh7x0wg2w32gw1wqyx"; + sha256 = "017h9p0x533fm4gn6pwc8kmp72rvqmcn6vznx72nkkl2b05yjx54"; }; - buildInputs = [ cmake hdf5 ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 ]; checkPhase = "make test"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ca24a99c18..4dbb1642edb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3787,9 +3787,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - medfile = callPackage ../development/libraries/medfile { - hdf5 = hdf5_1_8; - }; + medfile = callPackage ../development/libraries/medfile { }; memtester = callPackage ../tools/system/memtester { }; From 1a5d0a9e202bbf75c24560a9136431303e34127b Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 16 Jan 2019 12:36:42 +0300 Subject: [PATCH 030/230] parity-beta: 2.2.6 -> 2.3.0 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 636e63ed4af..f49d1902edc 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.2.6"; - sha256 = "1zbkbj8njawqsqfd5bp64p1wm6paa7y3nkdxggj6ap6dbg6549v0"; - cargoSha256 = "1izwqg87qxhmmkd49m0k09i7r05sfcb18m5jbpvggjzp57ips09r"; + version = "2.3.0"; + sha256 = "0v79nz19riaga6iwj6m59fq8adm5llrkq61xizriz30rw8rkk04z"; + cargoSha256 = "01vdrfqh2nlghbgnbb7qmrazsjmynrb9542qrgchxq589wasb4j2"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 90a4773987032a90ae9b7090060ab313eac77b21 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 16 Jan 2019 12:37:25 +0300 Subject: [PATCH 031/230] parity: 2.1.11 -> 2.2.7 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 284926e2f61..de43450a41c 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.1.11"; - sha256 = "0s0vig9pcz9iw774drfanb6hwnx97wm5fgn4hf5pydwb4jws1qrf"; - cargoSha256 = "1nx6aiq4888d75xfzx9q7ih5jgidjaq1i63bvvgxqyldxq0hjrma"; + version = "2.2.7"; + sha256 = "0bxq4z84vsb8hmbscr41xiw11m9xg6if231v76c2dmkbyqgpqy8p"; + cargoSha256 = "1izwqg87qxhmmkd49m0k09i7r05sfcb18m5jbpvggjzp57ips09r"; in import ./parity.nix { inherit version sha256 cargoSha256; } From 52d0548a6fb92f8db3c14b30142f4e4a3909a19d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jan 2019 10:26:46 -0800 Subject: [PATCH 032/230] python37Packages.owslib: 0.17.0 -> 0.17.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-owslib/versions --- pkgs/development/python-modules/owslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 7331511568f..22b9360a56a 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1px2nmbpbpp556kjq0ym0a7j24nbvs4w829727b2gr4a4ff86hxc"; + sha256 = "19dm6dxj9hsiq0bnb4d6ms3sh2hcss9d9fhpjgkwxzrw9mlzvrxj"; }; buildInputs = [ pytest ]; From 78395c8a0684c535a12b9d63b1b887aae7984361 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jan 2019 16:13:10 -0800 Subject: [PATCH 033/230] python37Packages.elasticsearch-dsl: 6.2.1 -> 6.3.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-elasticsearch-dsl/versions --- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 94d47073764..805bacbd716 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "6.2.1"; + version = "6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0f0w23kzyym0fkzisdkcl4xpnm8fsi97v1kskyvfrhj3mxy179fh"; + sha256 = "1gh8a0shqi105k325hgwb9avrpdjh0mc6mxwfg9ba7g6lssb702z"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] From 3195488024f1cc4fc24b9764666f171523079016 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 03:53:38 -0800 Subject: [PATCH 034/230] mbuffer: 20181119 -> 20190113 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mbuffer/versions --- pkgs/tools/misc/mbuffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 67640cf30ab..e39a514bcb8 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20181119"; + version = "20190113"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1pysnvq03g3w4npw15cykgd0n7nj7lmv655szav4802pz1dgywj7"; + sha256 = "07rgv98ys3bd0q35ivxjrgrhq199z19lj14jafzq96gcwspy8783"; }; buildInputs = [ openssl ]; From 658c1cb18b507d0474f5ee535f6e99268521316c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 17 Jan 2019 10:15:04 -0200 Subject: [PATCH 035/230] xkbmon: 0.2 -> 0.3 --- pkgs/applications/misc/xkbmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index aa741a5c94f..4fa1c833df5 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xkbmon-${version}"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "xkbmon"; repo = "xkbmon"; rev = version; - sha256 = "1x2xwak0yp0xkl63jzz3k1pf074mh9yxgppwwm96ms3zaslq44yp"; + sha256 = "03v8f6fijgwagjphyj8w7lgh5hlc8jk0j2n45n7fm0xwy82cxxx9"; }; buildInputs = [ libX11 ]; From 4a6883c1f1cc0eeda579a6d8adc74177f9aa6140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 04:26:47 -0800 Subject: [PATCH 036/230] libqmatrixclient: 0.4.1 -> 0.4.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libqmatrixclient/versions --- pkgs/development/libraries/libqmatrixclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index db9c2946935..160ce9fcabf 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.4.1"; + version = "0.4.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns"; + sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid"; }; buildInputs = [ qtbase ]; From 8d8a7210e480ac122d55a7d36879b8f41ea6fc80 Mon Sep 17 00:00:00 2001 From: danbst Date: Fri, 28 Dec 2018 00:00:48 +0200 Subject: [PATCH 037/230] zramSwap: allow configure compression algorithm + cleanups - add `zramSwap.algorithm` option, which allows to change compressor declaratively. zstd as default - add `zramSwap.swapDevices` option, which allows to define how many zram devices will be used as swap. Rest devices can be managed freely - simpler floating calculations - fix udev race condition - some documentation changes - replaced `/sys/block/zram*` handling with `zramctl`, because I had occasional "Device is busy" error (looks like zram has to be configured in predefined order) - added `memoryPercent` and `algorithm` as restart triggers. I think, it was a bug that changing `memoryPercent` in configuration wasn't applied immediately. - removed a bind to .swap device. While it looks natural (when swap device goes off, so should zram device), it wasn't implemented properly. This caused problems with swapon/swapoff: ``` $ cat /proc/swaps Filename Type Size Used Priority /dev/zram0 partition 8166024 0 -2 /var/swapfile file 5119996 5120 1 $ sudo swapoff -a $ sudo swapon -a swapon: /dev/zram0: read swap header failed $ cat /proc/swaps Filename Type Size Used Priority /var/swapfile file 5119996 0 1 ``` --- nixos/doc/manual/release-notes/rl-1903.xml | 15 ++++ nixos/modules/config/zram.nix | 81 ++++++++++++++++++---- 2 files changed, 81 insertions(+), 15 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 89d9f48aedd..da3b75cf614 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -408,6 +408,21 @@ from nixpkgs due to the lack of maintainers. + + + It is possible now to uze ZRAM devices as general purpose ephemeral block devices, + not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, + but is still possible by setting zramSwap.swapDevices explicitly. + + + Default algorithm for ZRAM swap was changed to zstd. + + + Changes to ZRAM algorithm are applied during nixos-rebuild switch, + so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, + use nixos-rebuild boot; reboot. + + diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index c1748812821..f8ff926cd56 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -6,10 +6,27 @@ let cfg = config.zramSwap; - devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1)); + # don't set swapDevices as mkDefault, so we can detect user had read our warning + # (see below) and made an action (or not) + devicesCount = if cfg.swapDevices != null then cfg.swapDevices else cfg.numDevices; + + devices = map (nr: "zram${toString nr}") (range 0 (devicesCount - 1)); modprobe = "${pkgs.kmod}/bin/modprobe"; + warnings = + assert cfg.swapDevices != null -> cfg.numDevices >= cfg.swapDevices; + flatten [ + (optional (cfg.numDevices > 1 && cfg.swapDevices == null) '' + Using several small zram devices as swap is no better than using one large. + Set either zramSwap.numDevices = 1 or explicitly set zramSwap.swapDevices. + + Previously multiple zram devices were used to enable multithreaded + compression. Linux supports multithreaded compression for 1 device + since 3.15. See https://lkml.org/lkml/2014/2/28/404 for details. + '') + ]; + in { @@ -24,9 +41,11 @@ in default = false; type = types.bool; description = '' - Enable in-memory compressed swap space provided by the zram kernel - module. - See https://www.kernel.org/doc/Documentation/blockdev/zram.txt + Enable in-memory compressed devices and swap space provided by the zram + kernel module. + See + https://www.kernel.org/doc/Documentation/blockdev/zram.txt + . ''; }; @@ -34,7 +53,19 @@ in default = 1; type = types.int; description = '' - Number of zram swap devices to create. + Number of zram devices to create. See also + zramSwap.swapDevices + ''; + }; + + swapDevices = mkOption { + default = null; + example = 1; + type = with types; nullOr int; + description = '' + Number of zram devices to be used as swap. Must be + <= zramSwap.numDevices. + Default is same as zramSwap.numDevices, recommended is 1. ''; }; @@ -44,7 +75,8 @@ in description = '' Maximum amount of memory that can be used by the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total - RAM. + RAM. Run zramctl to check how good memory is + compressed. ''; }; @@ -58,12 +90,26 @@ in ''; }; + algorithm = mkOption { + default = "zstd"; + example = "lzo"; + type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; + description = '' + Compression algorithm. lzo has good compression, + but is slow. lz4 has bad compression, but is fast. + zstd is both good compression and fast. + You can check what other algorithms are supported by your zram device with + cat /sys/class/block/zram*/comp_algorithm + ''; + }; }; }; config = mkIf cfg.enable { + inherit warnings; + system.requiredKernelConfig = with config.lib.kernelConfig; [ (isModule "ZRAM") ]; @@ -85,7 +131,6 @@ in createZramInitService = dev: nameValuePair "zram-init-${dev}" { description = "Init swap on zram-based device ${dev}"; - bindsTo = [ "dev-${dev}.swap" ]; after = [ "dev-${dev}.device" "zram-reloader.service" ]; requires = [ "dev-${dev}.device" "zram-reloader.service" ]; before = [ "dev-${dev}.swap" ]; @@ -96,14 +141,14 @@ in ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; }; script = '' - set -u - set -o pipefail - - # Calculate memory to use for zram - totalmem=$(${pkgs.gnugrep}/bin/grep 'MemTotal: ' /proc/meminfo | ${pkgs.gawk}/bin/awk '{print $2}') - mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024)) + set -euo pipefail - echo $mem > /sys/class/block/${dev}/disksize + # Calculate memory to use for zram + mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / { + print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024) + }' /proc/meminfo) + + ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev} ${pkgs.utillinux}/sbin/mkswap /dev/${dev} ''; restartIfChanged = false; @@ -111,6 +156,8 @@ in in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader" { description = "Reload zram kernel module when number of devices changes"; + wants = [ "systemd-udevd.service" ]; + after = [ "systemd-udevd.service" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -118,7 +165,11 @@ in ExecStart = "${modprobe} zram"; ExecStop = "${modprobe} -r zram"; }; - restartTriggers = [ cfg.numDevices ]; + restartTriggers = [ + cfg.numDevices + cfg.algorithm + cfg.memoryPercent + ]; restartIfChanged = true; })]); From 33367049be9dfd0c26935cd515ea300a821fe0ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 09:40:39 -0800 Subject: [PATCH 038/230] grpc: 1.17.2 -> 1.18.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grpc/versions --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index e81989c2093..3b4cc86aaaa 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.17.2"; + version = "1.18.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g"; + sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; From 34a764ce87340d0008cf5a06978e73ec7a794334 Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 17 Jan 2019 21:18:45 +0200 Subject: [PATCH 039/230] zramSwap: remove basic.target for zram devices This creates a dependency cycle when used with boot.tmpOnTmpfs: basic.target <- tmp.mount <- swap.target <- zram-init-dev0 <- basic.target This same fix is done already for tmp.mount Fixes https://github.com/NixOS/nixpkgs/issues/47474 --- nixos/modules/config/zram.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index f8ff926cd56..925d945c081 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -135,6 +135,7 @@ in requires = [ "dev-${dev}.device" "zram-reloader.service" ]; before = [ "dev-${dev}.swap" ]; requiredBy = [ "dev-${dev}.swap" ]; + unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -158,6 +159,7 @@ in description = "Reload zram kernel module when number of devices changes"; wants = [ "systemd-udevd.service" ]; after = [ "systemd-udevd.service" ]; + unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From 152da059db1f431785e4b6a23ac2bd8608fd3ae4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 15:53:50 -0800 Subject: [PATCH 040/230] dbeaver: 5.3.0 -> 5.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dbeaver-ce/versions --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e90fccefb06..de42f2d9657 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.3.0"; + version = "5.3.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1gn52bffjn2fw9yhi1rv4iy9dfdn5qxc51gv6qri5g0c8pblvh7m"; + sha256 = "05ra1bicah588q5n114vd9jqk9qdjix7b0zv5z83cagksb3n52rc"; }; installPhase = '' From 950d5a6d2ce1518540141a2e629fd3a700aabdfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 17:44:23 -0800 Subject: [PATCH 041/230] acpica-tools: 20181213 -> 20190108 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/acpica-tools/versions --- pkgs/tools/system/acpica-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index beb2e75b08b..4f48266cc1a 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20181213"; + version = "20190108"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; }; NIX_CFLAGS_COMPILE = "-O3"; From e144945662d262b043b85d116bd9f613fef185d7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 17 Jan 2019 22:07:00 -0500 Subject: [PATCH 042/230] deja-dup: 38.1 -> 38.3, cleanup This includes: - fetch source from gitlab - pname-version stuff - change homepage - correct license See: https://gitlab.gnome.org/World/deja-dup/blob/master/meson.build#L21 --- pkgs/applications/backup/deja-dup/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 43cc171e05f..7876ebc244b 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext +{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext , gnome3, libnotify, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror @@ -6,12 +6,15 @@ }: stdenv.mkDerivation rec { - name = "deja-dup-${version}"; - version = "38.1"; + pname = "deja-dup"; + version = "38.3"; - src = fetchurl { - url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "0wm7z72qbsljzsysxg8h5sbpg56ignn9mp8v3xynn12dv3gv6rba"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + sha256 = "1bnvmdlm67k1b6115x75j3nl92x5yl4psq5pna2w6cg9npxdd3fa"; }; patches = [ @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; nativeBuildInputs = [ @@ -57,9 +60,9 @@ stdenv.mkDerivation rec { of backing up the Right Way (encrypted, off-site, and regular) \ and uses duplicity as the backend. ''; - homepage = https://launchpad.net/deja-dup; - license = with licenses; gpl3; + homepage = https://wiki.gnome.org/Apps/DejaDup; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar joncojonathan ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } From b2efe0ff6223f42d97aa836ad7e3f7873483cb39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jan 2019 20:56:23 -0800 Subject: [PATCH 043/230] autoconf-archive: 2018.03.13 -> 2019.01.06 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/autoconf-archive/versions --- pkgs/development/tools/misc/autoconf-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index d051e1d5759..d7cea5c3d4e 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2018.03.13"; + version = "2019.01.06"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0ng1lvpijf3kv7w7nb1shqs23vp0398yicyvkf9lsk56kw6zjxb1"; + sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p"; }; buildInputs = [ xz ]; From bc312dc7ee644ebad2ea7aacdc1249851ecd759e Mon Sep 17 00:00:00 2001 From: wedens Date: Fri, 18 Jan 2019 21:32:33 +0700 Subject: [PATCH 044/230] font-manager: 0.7.3.1 -> 0.7.4.1 --- pkgs/applications/misc/font-manager/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 998074e8aa0..eaaac003598 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, - librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection + pkgconfig, file, libxml2, json-glib , sqlite, itstool, + librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection, + which }: stdenv.mkDerivation rec { name = "font-manager-${version}"; - version = "0.7.3.1"; + version = "0.7.4.1"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0i65br0bk3r6x8wcl8jhc0v0agl0k6fy5g60ss1bnw4md7ldpgyi"; - }; + sha256 = "1zy419zzc95h4gxvl88acqjbwlnmwybj23rx3vkc62j3v3w4nlay"; + }; nativeBuildInputs = [ pkgconfig automake autoconf libtool file - intltool + which itstool vala gnome3.yelp-tools @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.libgee gnome3.defaultIconTheme ]; @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-file-roller" "--disable-pycompile" ]; From fb4bccd6cd8a1cf8b2dad554f664cca10d0100b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Jan 2019 11:32:58 -0800 Subject: [PATCH 045/230] python37Packages.jellyfish: 0.6.1 -> 0.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-jellyfish/versions Jellyfish >= 0.7 only supports Python 3. --- pkgs/development/python-modules/jellyfish/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index c18b6c5cac4..5daa3c21496 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , pytest , unicodecsv }: buildPythonPackage rec { pname = "jellyfish"; - version = "0.6.1"; + version = "0.7.1"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5104e45a2b804b48a46a92a5e6d6e86830fe60ae83b1da32c867402c8f4c2094"; + sha256 = "1hd1xzw22g1cp2dpf5bbpg8a7iac2v9hw0xrj5n5j83inh5n99br"; }; checkInputs = [ pytest unicodecsv ]; From 3cc341d6f272f713513753b1f6ec16af3d452c29 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Sat, 19 Jan 2019 02:45:57 +0100 Subject: [PATCH 046/230] slic3r-prusa3d: Create desktop file --- pkgs/applications/misc/slic3r/prusa3d.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 680703737c2..ddf8cf18fc7 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl, gtest, nlopt, pcre, xorg }: + glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -112,6 +112,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/var cp -r ../resources/icons/* $out/bin/var/ cp -r ../resources $out/bin/ + + + mkdir -p "$out/share/pixmaps/" + ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; src = fetchFromGitHub { @@ -121,6 +127,16 @@ stdenv.mkDerivation rec { rev = "version_${version}"; }; + desktopItem = makeDesktopItem { + name = "slic3r-Prusa-Edition"; + exec = "slic3r-prusa3d"; + icon = "slic3r-prusa"; + comment = "G-code generator for 3D printers"; + desktopName = "Slic3r Prusa Edition"; + genericName = "3D printer tool"; + categories = "Application;Development;"; + }; + meta = with stdenv.lib; { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; From 1af4f366ca0bb3860a18b8435dad8a23d5ea7b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 19 Jan 2019 10:33:20 +0000 Subject: [PATCH 047/230] nixos/postgresqlBackup: add backupAll option For large setups it is useful to list all databases explicit (for example if temporary databases are also present) and store them in extra files. For smaller setups it is more convenient to just backup all databases at once, because it is easy to forget to update configuration when adding/renaming databases. pg_dumpall also has the advantage that it backups users/passwords. As a result the module becomes easier to use because it is sufficient in the default case to just set one option (services.postgresqlBackup.enable). --- .../services/backup/postgresql-backup.nix | 51 +++++++++++++++---- nixos/tests/postgresql.nix | 27 +++++++--- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index f9f9568faa5..11efa47ec5b 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -6,11 +6,11 @@ let cfg = config.services.postgresqlBackup; - postgresqlBackupService = db : + postgresqlBackupService = db: dumpCmd: { enable = true; - description = "Backup of database ${db}"; + description = "Backup of ${db} database(s)"; requires = [ "postgresql.service" ]; @@ -26,7 +26,7 @@ let ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz fi - ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \ + ${dumpCmd} | \ ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz ''; @@ -42,9 +42,7 @@ let in { options = { - services.postgresqlBackup = { - enable = mkOption { default = false; description = '' @@ -61,6 +59,19 @@ in { ''; }; + backupAll = mkOption { + default = cfg.databases == []; + defaultText = "services.postgresqlBackup.databases == []"; + type = lib.types.bool; + description = '' + Backup all databases using pg_dumpall. + This option is mutual exclusive to + services.postgresqlBackup.databases. + The resulting backup dump will have the name all.sql.gz. + This option is the default if no databases are specified. + ''; + }; + databases = mkOption { default = []; description = '' @@ -79,18 +90,36 @@ in { type = types.string; default = "-Cbo"; description = '' - Command line options for pg_dump. + Command line options for pg_dump. This options is not used + if config.services.postgresqlBackup.backupAll is enabled. + Note that config.services.postgresqlBackup.backupAll is also active, + when no databases where specified. ''; }; }; }; - config = mkIf config.services.postgresqlBackup.enable { - - systemd.services = listToAttrs (map (db : { + config = mkMerge [ + { + assertions = [{ + assertion = cfg.backupAll -> cfg.databases == []; + message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases"; + }]; + } + (mkIf (cfg.enable && cfg.backupAll) { + systemd.services.postgresqlBackup = + postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall"; + }) + (mkIf (cfg.enable && !cfg.backupAll) { + systemd.services = listToAttrs (map (db: + let + cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}"; + in { name = "postgresqlBackup-${db}"; - value = postgresqlBackupService db; } ) cfg.databases); - }; + value = postgresqlBackupService db cmd; + }) cfg.databases); + }) + ]; } diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 1d434b62a5c..975ba7f488e 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -21,7 +21,7 @@ let CREATE TABLE xmltest ( doc xml ); INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled ''; - make-postgresql-test = postgresql-name: postgresql-package: makeTest { + make-postgresql-test = postgresql-name: postgresql-package: backup-all: makeTest { name = postgresql-name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ zagy ]; @@ -29,14 +29,17 @@ let machine = {...}: { - services.postgresql.package=postgresql-package; + services.postgresql.package = postgresql-package; services.postgresql.enable = true; services.postgresqlBackup.enable = true; - services.postgresqlBackup.databases = [ "postgres" ]; + services.postgresqlBackup.databases = optional (!backup-all) "postgres"; }; - testScript = '' + testScript = let + backupName = if backup-all then "all" else "postgres"; + backupService = if backup-all then "postgresqlBackup" else "postgresqlBackup-postgres"; + in '' sub check_count { my ($select, $nlines) = @_; return 'test $(sudo -u postgres psql postgres -tAc "' . $select . '"|wc -l) -eq ' . $nlines; @@ -56,12 +59,20 @@ let $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1)); # Check backup service - $machine->succeed("systemctl start postgresqlBackup-postgres.service"); - $machine->succeed("zcat /var/backup/postgresql/postgres.sql.gz | grep 'ok'"); - $machine->succeed("stat -c '%a' /var/backup/postgresql/postgres.sql.gz | grep 600"); + $machine->succeed("systemctl start ${backupService}.service"); + $machine->succeed("zcat /var/backup/postgresql/${backupName}.sql.gz | grep 'ok'"); + $machine->succeed("stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600"); $machine->shutdown; ''; }; in - mapAttrs' (p-name: p-package: {name=p-name; value=make-postgresql-test p-name p-package;}) postgresql-versions + (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // ( + # just pick one version for the dump all test + let + first = head (attrNames postgresql-versions); + name = "${first}-backup-all"; + in { + ${name} = make-postgresql-test name postgresql-versions.${first} true; + } + ) From baa4b0ca57bcafce50930cf5e03a472b89f5f8de Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 19 Jan 2019 13:51:21 -0500 Subject: [PATCH 048/230] font-manager: switch to meson --- .../font-manager/correct-post-install.patch | 13 ++++++++ .../misc/font-manager/default.nix | 33 ++++++++++--------- 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/misc/font-manager/correct-post-install.patch diff --git a/pkgs/applications/misc/font-manager/correct-post-install.patch b/pkgs/applications/misc/font-manager/correct-post-install.patch new file mode 100644 index 00000000000..47e9800d265 --- /dev/null +++ b/pkgs/applications/misc/font-manager/correct-post-install.patch @@ -0,0 +1,13 @@ +diff --git a/meson_post_install.py b/meson_post_install.py +index 8d00e70..c28d19e 100644 +--- a/meson_post_install.py ++++ b/meson_post_install.py +@@ -7,7 +7,7 @@ prefix = environ['MESON_INSTALL_PREFIX'] + data_dir = path.join(prefix, 'share') + schema_dir = path.join(data_dir, 'glib-2.0', 'schemas') + +-if not environ['DESTDIR']: ++if not environ.get('DESTDIR'): + print('Compiling gsettings schemas...') + call(['glib-compile-schemas', schema_dir]) + print('Updating desktop database...') diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index eaaac003598..7eb698321c5 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, libxml2, json-glib , sqlite, itstool, - librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection, - which +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, + pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, + vala, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { - name = "font-manager-${version}"; + pname = "font-manager"; version = "0.7.4.1"; src = fetchFromGitHub { @@ -17,10 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - automake autoconf libtool - file - which + meson + ninja + gettext + python3 itstool + desktop-file-utils vala gnome3.yelp-tools wrapGAppsHook @@ -37,17 +38,17 @@ stdenv.mkDerivation rec { gnome3.defaultIconTheme ]; - enableParallelBuilding = true; + patches = [ ./correct-post-install.patch ]; - preConfigure = '' - NOCONFIGURE=true ./autogen.sh - substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" - ''; - - configureFlags = [ - "--disable-pycompile" + mesonFlags = [ + "-Ddisable_pycompile=true" ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + meta = { homepage = https://fontmanager.github.io/; description = "Simple font management for GTK+ desktop environments"; From ba7266c62947752b5c391d58b5e0e03c09be75b0 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 20 Jan 2019 00:58:57 +0100 Subject: [PATCH 049/230] go: patch missing mimetype database --- pkgs/development/compilers/go/1.11.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index ab4c7e6ae63..ae682f8b8f8 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +, mailcap , buildPackages, targetPackages }: let @@ -56,6 +57,10 @@ stdenv.mkDerivation rec { substituteInPlace misc/cgo/testcarchive/carchive_test.go \ --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + # Patch the mimetype database location which is missing on NixOS. + substituteInPlace src/mime/type_unix.go \ + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' + # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) rm src/net/{listen,parse}_test.go From 469ecc709854bb1fd8ff2a68dbc429647ff66f88 Mon Sep 17 00:00:00 2001 From: Viktor Kleen Date: Sat, 19 Jan 2019 17:56:28 -0800 Subject: [PATCH 050/230] llvm: support PowerPC --- pkgs/development/compilers/llvm/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/common.nix b/pkgs/development/compilers/llvm/common.nix index 27f48ff3f11..df0cd29ad5b 100644 --- a/pkgs/development/compilers/llvm/common.nix +++ b/pkgs/development/compilers/llvm/common.nix @@ -12,6 +12,8 @@ rec { "ARM" else if platform.parsed.cpu.family == "mips" then "Mips" + else if platform.parsed.cpu.family == "power" then + "PowerPC" else throw "Unsupported system"; From 72d6aaede64eab585cfe9af7cd8f053b7f8e3456 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 20 Jan 2019 08:47:27 +0100 Subject: [PATCH 051/230] linux-steam-integration: Clean up the derivation a bit --- .../games/linux-steam-integration/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 3b0aca6df28..29029880253 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -1,17 +1,12 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, - gcc_multi, libressl }: + gcc_multi, libressl, gnome3, steam }: let version = "0.7.2"; - steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam"; - zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity"; in stdenv.mkDerivation rec { name = "linux-steam-integration-${version}"; - nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; - buildInputs = [ gtk libressl ]; - src = fetchFromGitHub { owner = "solus-project"; repo = "linux-steam-integration"; @@ -20,15 +15,18 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; + buildInputs = [ gtk libressl ]; + # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c # Patch path to lsi-steam in lsi-steam.desktop # Patch path to zenity in lsi.c postPatch = '' - sed -i -e "s|/usr/|$out/|g" src/shim/shim.c - sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop - sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c - sed -i -e "s|Name=Linux Steam Integration|Name=Linux Steam Integration Settings|" data/lsi-settings.desktop.in - + substituteInPlace src/shim/shim.c --replace "/usr/" $out + substituteInPlace data/lsi-steam.desktop --replace "/usr/" $out + substituteInPlace src/lsi/lsi.c --replace zenity ${gnome3.zenity}/bin/zenity + substituteInPlace data/lsi-settings.desktop.in \ + --replace "Name=Linux Steam Integration" "Name=Linux Steam Integration Settings" ''; configurePhase = '' @@ -36,7 +34,7 @@ in stdenv.mkDerivation rec { meson build \ -Dwith-shim=co-exist \ -Dwith-frontend=true \ - -Dwith-steam-binary=${steamBinPath} \ + -Dwith-steam-binary=${steam}/bin/steam \ -Dwith-new-libcxx-abi=true \ -Dwith-libressl-mode=native \ --prefix / \ From 409b540d6be990760b758c3727ed1ca6b7ac5031 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 20 Jan 2019 08:48:02 +0100 Subject: [PATCH 052/230] linux-steam-integration: 0.7.2 -> 0.7.3 Release notes: https://github.com/clearlinux/linux-steam-integration/releases/tag/v0.7.3 The same person (Ikey) who developed Linux Steam Integration have left the Solus project where it was developed and works on Clearlinux now instead, which seems to have picked up this project and made the first release for a really long time. --- pkgs/games/linux-steam-integration/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 29029880253..edc73eeac92 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -2,16 +2,16 @@ gcc_multi, libressl, gnome3, steam }: let - version = "0.7.2"; + version = "0.7.3"; in stdenv.mkDerivation rec { name = "linux-steam-integration-${version}"; src = fetchFromGitHub { - owner = "solus-project"; + owner = "clearlinux"; repo = "linux-steam-integration"; rev = "v${version}"; - sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6"; + sha256 = "0brv3swx8h170ycxksb31sf5jvj85csfpx7gjlf6yrfz7jw2j6vp"; fetchSubmodules = true; }; @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { various workarounds to get games working, and fixes long standing bugs in both games and the client ''; - homepage = https://github.com/solus-project/linux-steam-integration; + homepage = https://github.com/clearlinux/linux-steam-integration; license = licenses.lgpl21; maintainers = [ maintainers.etu ]; platforms = [ "x86_64-linux" ]; From 1506f0f8cd1e84cc671ff8428d6b5f50434a9aa2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 19 Jan 2019 00:18:04 -0600 Subject: [PATCH 053/230] ispc: 1.9.2 -> 1.10.0 --- pkgs/development/compilers/ispc/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index a5d6247ffdc..2657ee6633b 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -3,7 +3,7 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n }: stdenv.mkDerivation rec { - version = "1.9.2"; + version = "1.10.0"; rev = "v${version}"; inherit testedTargets; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry"; + sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b"; }; # there are missing dependencies in the Makefile, causing sporadic build failures @@ -32,14 +32,7 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; - patches = [ - (fetchpatch { - url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch; - sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s"; - }) - ]; - - postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; + postPatch = "sed -i -e 's,/bin/,,g' -e 's/-lcurses/-lncurses/g' Makefile"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real # errors From 28b45f6e657dc1402d3c94dce3f643939aa099f8 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 20 Jan 2019 19:10:14 +0900 Subject: [PATCH 054/230] gocryptfs: 1.5 -> 1.6.1 --- pkgs/tools/filesystems/gocryptfs/default.nix | 4 +- pkgs/tools/filesystems/gocryptfs/deps.nix | 107 +++++++++++++++---- 2 files changed, 87 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 75f5e9ffe11..d923dba0bc0 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, openssl, pandoc, pkgconfig }: let - version = "v1.5"; + version = "v1.6.1"; goFuseVersion = with stdenv.lib; substring 0 7 (head (filter ( d: d.goPackagePath == "github.com/hanwen/go-fuse" ) (import ./deps.nix))).fetch.rev; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "rfjakob"; repo = "gocryptfs"; rev = version; - sha256 = "0s5smjc7n9088n8a2mv7cy3cx31ci13i1i8fhg1vslc17a15qs2d"; + sha256 = "0aqbl25g48b4jp6l09k6kic6w3p0q7d9ip2wvrcvh8lhnrbdkhzd"; }; postPatch = "rm -r tests"; diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix index cb5aec527f2..2589b41a0a5 100644 --- a/pkgs/tools/filesystems/gocryptfs/deps.nix +++ b/pkgs/tools/filesystems/gocryptfs/deps.nix @@ -1,66 +1,129 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/hanwen/go-fuse"; + goPackagePath = "github.com/conejoninja/hid"; fetch = { type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "291273cb8ce0f139636a6fd7414be3c7e2de6288"; - sha256 = "1djfl6mni8k4wllhwcr6qwyg1nh6wykdalvdl6gpc1rwrjj9c6xi"; + url = "https://github.com/conejoninja/hid"; + rev = "3a959b87ebefc18767a31fa567eea402eb37239e"; + sha256 = "1i1x7fhs3g9a48h2wxjczshx7gzmj9p6pd71l22ky998zgjadlim"; }; } { - goPackagePath = "github.com/jacobsa/crypto"; + goPackagePath = "github.com/conejoninja/tesoro"; + fetch = { + type = "git"; + url = "https://github.com/conejoninja/tesoro"; + rev = "e0e839b6a6f14bce56d1bfac9a86311a1646a6a3"; + sha256 = "19q1ibj6l6pk2a3iwcyrj60sscvkqw450psd9zdflvb293cjsx8v"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "95c6370914ac7822973d1893680e878e156f8d70"; + sha256 = "1h701c1hxrw7ljh7kc0rjx18bfw2mzdbpmqqilb5wb0ngpdjpqxp"; + }; + } + { + goPackagePath = "github.com/jacobsa/crypto"; fetch = { type = "git"; url = "https://github.com/jacobsa/crypto"; - rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; + rev = "c73681c634de898c869684602cf0c0d2ce938c4d"; sha256 = "02jbiy6szshbzcmp4j3gpc577hrhikxqvm4kzxixp27k9f2cx5si"; }; } { - goPackagePath = "github.com/pkg/xattr"; + goPackagePath = "github.com/pkg/xattr"; fetch = { type = "git"; url = "https://github.com/pkg/xattr"; - rev = "d15dbc2bb0b5da267362b5e066e2c44c1fcff6c7"; - sha256 = "1vab8mpk2x4vbhx0kd0i0kn6sf7z5ivilcmdklyizzcfcwghh17g"; + rev = "f5b647e257e19d63831e7c7adb95dfb79d9ff4d9"; + sha256 = "0cqxibbfllhs6ffxq65gn08088g7g7aw752p9g3vbnj35jk2p8i9"; }; } { - goPackagePath = "github.com/rfjakob/eme"; + goPackagePath = "github.com/rfjakob/eme"; fetch = { type = "git"; url = "https://github.com/rfjakob/eme"; - rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; + rev = "2222dbd4ba467ab3fc7e8af41562fcfe69c0d770"; sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "github.com/trezor/trezord-go"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + url = "https://github.com/trezor/trezord-go"; + rev = "bae9c40e5d71c459bde056d42d4b19ab318c90c2"; + sha256 = "12j7b4vjs8n68214zrh5ivpqm3fcifk27bj6rszd9x2839nk3hy8"; }; } { - goPackagePath = "golang.org/x/sync"; + goPackagePath = "github.com/xaionaro-go/cryptoWallet"; + fetch = { + type = "git"; + url = "https://github.com/xaionaro-go/cryptoWallet"; + rev = "47f9f6877e4324a8bc47fc5661c32d2fe6d29586"; + sha256 = "14h2vnl2jm2wj10znizdf2f0mxsk27rsjskjw5qffy8nf5a0i3i6"; + }; + } + { + goPackagePath = "github.com/zserge/hid"; + fetch = { + type = "git"; + url = "https://github.com/zserge/hid"; + rev = "c86e7adeabafd6fcb3371ad64d6ed366b04d55db"; + sha256 = "1y2zqndq6mafgsdai5gnkw4g8dzl9vmjcxq0i8xspaj4dmck19c4"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + }; + } + { + goPackagePath = "golang.org/x/sync"; fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "151529c776cdc58ddbe7963ba9af779f3577b419"; - sha256 = "149yfzs4k8vxhjr8f832drndir2k5ha0ggs2dw2fd6xvxf698bcx"; + rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; + sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; }; } -] + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } +] \ No newline at end of file From 61a7313d7ab5c994f95ac03c1c4ad22e69ecb1ed Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sun, 20 Jan 2019 13:23:46 +0100 Subject: [PATCH 055/230] mdl: init at 0.5.0 --- .../development/tools/misc/mdl/.bundle/config | 3 ++ pkgs/development/tools/misc/mdl/Gemfile | 3 ++ pkgs/development/tools/misc/mdl/Gemfile.lock | 21 +++++++++ pkgs/development/tools/misc/mdl/default.nix | 15 +++++++ pkgs/development/tools/misc/mdl/gemset.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 88 insertions(+) create mode 100644 pkgs/development/tools/misc/mdl/.bundle/config create mode 100644 pkgs/development/tools/misc/mdl/Gemfile create mode 100644 pkgs/development/tools/misc/mdl/Gemfile.lock create mode 100644 pkgs/development/tools/misc/mdl/default.nix create mode 100644 pkgs/development/tools/misc/mdl/gemset.nix diff --git a/pkgs/development/tools/misc/mdl/.bundle/config b/pkgs/development/tools/misc/mdl/.bundle/config new file mode 100644 index 00000000000..d28c8337bc4 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/.bundle/config @@ -0,0 +1,3 @@ +--- +BUNDLE_PATH: "vendor/bundle" +BUNDLE_CACHE_ALL: "true" diff --git a/pkgs/development/tools/misc/mdl/Gemfile b/pkgs/development/tools/misc/mdl/Gemfile new file mode 100644 index 00000000000..15b33c53a65 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "mdl" diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock new file mode 100644 index 00000000000..aabcd784d86 --- /dev/null +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -0,0 +1,21 @@ +GEM + remote: https://rubygems.org/ + specs: + kramdown (1.17.0) + mdl (0.5.0) + kramdown (~> 1.12, >= 1.12.0) + mixlib-cli (~> 1.7, >= 1.7.0) + mixlib-config (~> 2.2, >= 2.2.1) + mixlib-cli (1.7.0) + mixlib-config (2.2.18) + tomlrb + tomlrb (1.2.8) + +PLATFORMS + ruby + +DEPENDENCIES + mdl + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/development/tools/misc/mdl/default.nix new file mode 100644 index 00000000000..a3c361efc9d --- /dev/null +++ b/pkgs/development/tools/misc/mdl/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv { + inherit ruby; + pname = "mdl"; + gemdir = ./.; + + meta = with lib; { + description = "A tool to check markdown files and flag style issues"; + homepage = https://github.com/markdownlint/markdownlint; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix new file mode 100644 index 00000000000..54994f3da6a --- /dev/null +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -0,0 +1,44 @@ +{ + kramdown = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; + mdl = { + dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + type = "gem"; + }; + version = "0.5.0"; + }; + mixlib-cli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + type = "gem"; + }; + version = "1.7.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + type = "gem"; + }; + version = "2.2.18"; + }; + tomlrb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + type = "gem"; + }; + version = "1.2.8"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25c0457c247..2d922e39320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8870,6 +8870,8 @@ in mbed-cli = callPackage ../development/tools/mbed-cli { }; + mdl = callPackage ../development/tools/misc/mdl { }; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; From 25acd14ddfde6d0298a579583de40b8d5e80bc3b Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sat, 19 Jan 2019 14:01:21 +0100 Subject: [PATCH 056/230] msmtp: Configure sysconfdir to point to /etc The current build lets the SYSCONFDIR of msmtp point to the nix store /nix/.../msmtp-1.81/etc, which is not very useful. This change will allow for system wide configuration to be placed in /etc instead. --- pkgs/applications/networking/msmtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index a9c828a3fb1..34b6116df78 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = - stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' install -d $out/share/doc/${pname}/scripts From f538be5e181c80c93fee1f1c5cf7d658f6ec2efd Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 20 Jan 2019 22:25:19 +0300 Subject: [PATCH 057/230] lego: 1.2.1 -> 2.0.1 --- pkgs/tools/admin/lego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4805a94e7e9..e1964b2f161 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "lego-${version}"; - version = "1.2.1"; + version = "2.0.1"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "xenolf"; repo = "lego"; - sha256 = "1b2cv78v54afflz3gfyidkwzq7r2h5j45rmz0ybps03pr0hs4gk3"; + sha256 = "17q5j2zxc2c0xw8pfhnls67dmwrkicjmd2jdyim3fhi5cgxl9h93"; }; goPackagePath = "github.com/xenolf/lego"; From 77e6dcb338da4fdc813739eafe6394c41a6f31ec Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 20 Jan 2019 21:14:30 -0500 Subject: [PATCH 058/230] arrow-cpp, pythonPackages.pyarrow: 0.11.0 -> 0.12.0 --- .../libraries/arrow-cpp/default.nix | 15 +++---- .../arrow-cpp/double-conversion_cmake.patch | 43 ------------------- .../libraries/arrow-cpp/zstd136.patch | 17 -------- .../python-modules/pyarrow/default.nix | 11 +++-- 4 files changed, 13 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch delete mode 100644 pkgs/development/libraries/arrow-cpp/zstd136.patch diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 811dfc47194..cff960b29a7 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -11,27 +11,21 @@ in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q"; + sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; }; sourceRoot = "apache-arrow-${version}/cpp"; patches = [ - # fix ARROW-3467 - ./double-conversion_cmake.patch - # patch to fix python-test ./darwin.patch - - # facebook/zstd#1385 - ./zstd136.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' @@ -58,6 +52,7 @@ stdenv.mkDerivation rec { ZSTD_HOME = zstd; cmakeFlags = [ + "-DARROW_BUILD_TESTS=ON" "-DARROW_PYTHON=ON" "-DARROW_PARQUET=ON" ]; diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch deleted file mode 100644 index 336fdde9e8f..00000000000 --- a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ endif(UNIX) - set(ARROW_LINK_LIBS) - - # Libraries to link statically with libarrow.so --set(ARROW_STATIC_LINK_LIBS double-conversion) -+set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET}) - - if (ARROW_WITH_BROTLI) - SET(ARROW_STATIC_LINK_LIBS -@@ -694,7 +694,7 @@ else () - set(ARROW_MIN_TEST_LIBS - arrow_shared - ${ARROW_LINK_LIBS} -- double-conversion -+ ${DOUBLE_CONVERSION_TARGET} - ${BOOST_SYSTEM_LIBRARY} - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_REGEX_LIBRARY} -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") - set(DOUBLE_CONVERSION_VENDORED 1) - else() - find_package(double-conversion REQUIRED) -+ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion) - set(DOUBLE_CONVERSION_VENDORED 0) - endif() - - include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) --ADD_THIRDPARTY_LIB(double-conversion -- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) - - if (DOUBLE_CONVERSION_VENDORED) -+ ADD_THIRDPARTY_LIB(double-conversion -+ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) -+ set(DOUBLE_CONVERSION_TARGET double-conversion) - add_dependencies(arrow_dependencies double-conversion_ep) - endif() - diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch deleted file mode 100644 index 1bdeecaef99..00000000000 --- a/pkgs/development/libraries/arrow-cpp/zstd136.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/arrow/util/compression_zstd.cc -+++ b/src/arrow/util/compression_zstd.cc -@@ -35,8 +35,13 @@ namespace util { - - Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len, - uint8_t* output_buffer) { -+ void *safe_output_buffer = static_cast(output_buffer); -+ int dummy {}; -+ if ((output_len == 0) && (output_buffer == NULL)) { -+ safe_output_buffer = static_cast(&dummy); -+ } - int64_t decompressed_size = -- ZSTD_decompress(output_buffer, static_cast(output_len), input, -+ ZSTD_decompress(safe_output_buffer, static_cast(output_len), input, - static_cast(input_len)); - if (decompressed_size != output_len) { - return Status::IOError("Corrupt ZSTD compressed data."); diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index d588ebb12e4..a66d8f7a025 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,10 +13,15 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest ]; + checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" + + # for some reason cmake won't set -std=c++11 for clang + "-DPYARROW_CXXFLAGS=-std=c++11" + ]; preCheck = '' rm pyarrow/tests/test_jvm.py From 777b0f89fd9d5db29f992626a3961738f2ffef07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Jan 2019 11:28:32 +0000 Subject: [PATCH 059/230] telegraf: 1.7.0 -> 1.9.2 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +- .../monitoring/telegraf/deps-1.7.0.nix | 894 ------------- .../monitoring/telegraf/deps-1.9.2.nix | 1146 +++++++++++++++++ 3 files changed, 1150 insertions(+), 896 deletions(-) delete mode 100644 pkgs/servers/monitoring/telegraf/deps-1.7.0.nix create mode 100644 pkgs/servers/monitoring/telegraf/deps-1.9.2.nix diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 99380fbae9c..c6c52bcbda5 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.7.0"; + version = "1.9.2"; goPackagePath = "github.com/influxdata/telegraf"; excludedPackages = "test"; + subPackages = [ "cmd/telegraf" ]; + src = fetchFromGitHub { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1jinvncbn1srfmclhys6khvaczawy243vgmj2gsgm9szrnrf7klv"; + sha256 = "1416nx7mxa0b3bmnkarksicgvw6wja6s8xrf22yzak38qmmrpz2m"; }; buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix deleted file mode 100644 index 57a5ffd21b0..00000000000 --- a/pkgs/servers/monitoring/telegraf/deps-1.7.0.nix +++ /dev/null @@ -1,894 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "code.cloudfoundry.org/clock"; - fetch = { - type = "git"; - url = "https://github.com/cloudfoundry/clock"; - rev = "e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71"; - sha256 = "1mwckqpg9qi5macfbx7lpc5frbd0dz8bzq78dl570j9j2aqp9hkf"; - }; - } - { - goPackagePath = "collectd.org"; - fetch = { - type = "git"; - url = "https://github.com/collectd/go-collectd"; - rev = "2ce144541b8903101fb8f1483cc0497a68798122"; - sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; - }; - } - { - goPackagePath = "github.com/Microsoft/ApplicationInsights-Go"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/ApplicationInsights-Go"; - rev = "3612f58550c1de70f1a110c78c830e55f29aa65d"; - sha256 = "11znwr0787171yv80r5jmdks6i0i3rwa03ir1kapm0ycwr8h4nvy"; - }; - } - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "3b1b38866a79f06deddf0487d5c27ba0697ccd65"; - sha256 = "02qwlqd1kdgwlv39fimpbzjhgw8shzkkad82kfwdy8lppscb20br"; - }; - } - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d"; - sha256 = "08kr7zvdgwv8vsakjzq1bla6cc6dlxlg1brlga69y69xw7cz5l9p"; - }; - } - { - goPackagePath = "github.com/aerospike/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/aerospike/aerospike-client-go"; - rev = "95e1ad7791bdbca44707fedbb29be42024900d9c"; - sha256 = "034pirm1dzdblwadcd829qk2jqkr8hg9gpfph8ax7z0b3h2ah8xf"; - }; - } - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985"; - sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192"; - }; - } - { - goPackagePath = "github.com/apache/thrift"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift"; - rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"; - sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "783273d703149aaeb9897cf58613d5af48861c25"; - sha256 = "1ci4kh35zdh5gyjhci5gi324iqcq04nb3qh89h9w6spwqb91w0ln"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; - sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/bsm/sarama-cluster"; - fetch = { - type = "git"; - url = "https://github.com/bsm/sarama-cluster"; - rev = "abf039439f66c1ce78017f560b490612552f6472"; - sha256 = "16013ac7jv72mdiv84vhk4av1vb5q8xq3fhv253fz2a17h9ld78q"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; - sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; - }; - } - { - goPackagePath = "github.com/couchbase/go-couchbase"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/go-couchbase"; - rev = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28"; - sha256 = "0h59zzxcz3i8nd4ln89fi946ii8kscnqam67h3mxvjwvpnmcax9k"; - }; - } - { - goPackagePath = "github.com/couchbase/gomemcached"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/gomemcached"; - rev = "4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29"; - sha256 = "12h0wsimwmr0f398538g9ngasik4gisnac9vpn0ldy8hqdpa334d"; - }; - } - { - goPackagePath = "github.com/couchbase/goutils"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/goutils"; - rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6"; - sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; - sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "749f6afb4572201e3c37325d0ffedb6f32be8950"; - sha256 = "05jn2wvikyw0pbmi74w5axr0zgxn5y3ynn9rhsq87rmwqj7raxhd"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "f5ec1e2936dcbe7b5001c2b817188b095c700c27"; - sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; - sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; - sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; - }; - } - { - goPackagePath = "github.com/eapache/go-xerial-snappy"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-xerial-snappy"; - rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c"; - sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; - sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; - }; - } - { - goPackagePath = "github.com/eclipse/paho.mqtt.golang"; - fetch = { - type = "git"; - url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "aff15770515e3c57fc6109da73d42b0d46f7f483"; - sha256 = "1blfvrp1d5jqxxqdw7xd0ns1qiml45k0nch9jwpi0ddg7hckii2d"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "9144852efba7c4daf409943ee90767da62d55438"; - sha256 = "08jvki9id1wdca0j6kqb4fmipwvgmakg9yfavnbpyn3vsbx9vpbp"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "73b70592cdaa9e6abdfcfbf97b4a90d80728c836"; - sha256 = "0b6xwajnk65bdq98czv137gvypwnznkjnm2ksnxm87nyj2vyddm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; - sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a"; - sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; - sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "7db9049039a047d955fe8c19b83c8ff5abd765c7"; - sha256 = "09l3sc9z2fqnj5b040q320gwb4gqig6lnysxcayhwckrdp5bm8hs"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "53c1911da2b537f792e7cafcb446b05ffe33b996"; - sha256 = "10cvljpjgvkq1zqj82hr46dnddfcpmm18wabbv4pkxjrmvb9xkf7"; - }; - } - { - goPackagePath = "github.com/hailocab/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/hailocab/go-hostpool"; - rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; - sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "5174058f0d2bda63fa5198ab96c33d9a909c58ed"; - sha256 = "0xm3gl8i7pgsbsc2397bwh9hp2dwnk4cmw5y05acqn3zpyp84sbv"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"; - sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "984a73625de3138f44deb38d00878fab39eb6447"; - sha256 = "1sk9sw7q9knp7yi4r5kcr8cgyi9jzvgb0kzbwa38p8h3w394izkk"; - }; - } - { - goPackagePath = "github.com/influxdata/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/go-syslog"; - rev = "eecd51df3ad85464a2bab9b7d3a45bc1e299059e"; - sha256 = "0zw8wswr3afb48mi510mql58gz818dp0mzq3vllqqhrz3x8w580r"; - }; - } - { - goPackagePath = "github.com/influxdata/tail"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/tail"; - rev = "c43482518d410361b6c383d7aebce33d0471d7bc"; - sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b"; - }; - } - { - goPackagePath = "github.com/influxdata/toml"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/toml"; - rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; - sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; - }; - } - { - goPackagePath = "github.com/influxdata/wlog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/wlog"; - rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; - sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; - }; - } - { - goPackagePath = "github.com/jackc/pgx"; - fetch = { - type = "git"; - url = "https://github.com/jackc/pgx"; - rev = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917"; - sha256 = "1n9cbdwzpagnrisxwq0frqdnkmyfg2qlxsr890527d32633hp0h2"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; - sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; - sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; - }; - } - { - goPackagePath = "github.com/kardianos/service"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/service"; - rev = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893"; - sha256 = "1cgqg6zbwwsn6lz2ms094q4w37x84vd9ixs50wsh3037q4sfhyll"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142"; - sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "99f84ae56e75126dd77e5de4fae2ea034a468ca1"; - sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; - }; - } - { - goPackagePath = "github.com/multiplay/go-ts3"; - fetch = { - type = "git"; - url = "https://github.com/multiplay/go-ts3"; - rev = "07477f49b8dfa3ada231afc7b7b17617d42afe8e"; - sha256 = "1z2cfqhm6g48vzscargw6vl9idfppdcm3wq1xfwy73l1s77q4n9n"; - }; - } - { - goPackagePath = "github.com/naoina/go-stringutil"; - fetch = { - type = "git"; - url = "https://github.com/naoina/go-stringutil"; - rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; - sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; - }; - } - { - goPackagePath = "github.com/nats-io/gnatsd"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/gnatsd"; - rev = "393bbb7c031433e68707c8810fda0bfcfbe6ab9b"; - sha256 = "1hnn4p24gm90siixdvj97csrxnr78svxmypglcjska474adhhnzz"; - }; - } - { - goPackagePath = "github.com/nats-io/go-nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/go-nats"; - rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898"; - sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "289cccf02c178dc782430d534e3c1f5b72af807f"; - sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4"; - }; - } - { - goPackagePath = "github.com/nsqio/go-nsq"; - fetch = { - type = "git"; - url = "https://github.com/nsqio/go-nsq"; - rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"; - sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "c9281466c8b2f606084ac71339773efd177436e7"; - sha256 = "1djdazssy27xn91pjhx3dgb0f11bnlzzbwkh7f8zwnpz011anasi"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; - sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go-opentracing"; - rev = "1cafbdfde94fbf2b373534764e0863aa3bd0bf7b"; - sha256 = "1vpl3mpvhljzpnll67ip3m9aazy3dvgi57n7w3pn8kg3b7kr4rwj"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df"; - sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj"; - }; - } - { - goPackagePath = "github.com/pierrec/xxHash"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/xxHash"; - rev = "5a004441f897722c627870a981d02b29924215fa"; - sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c317fb74746eac4fc65fe3909195f4cf67c5562a"; - sha256 = "1c3rqwkajkmhk5wh6agc5jnjbbfvpfxbiy8cprpw89khch428khp"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "dd2f054febf4a6c00f2343686efb775948a8bff4"; - sha256 = "0rhbgj51r105ax544mfg6wp4rsqpzn3776z1k82b21xwb3b51zr1"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1878d9fbb537119d24b21ca07effd591627cd160"; - sha256 = "0jqn5l31szmc0dv5invp5mdhndx3fcsda7zpy49zd7k95c1y20m7"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"; - sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "1d7be4effb13d2d908342d349d71a284a7542693"; - sha256 = "002s19109spms9ndfwykf3ryy3fnk7b56frxlqmmv37mlqgrd5v9"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; - sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3"; - sha256 = "0rzfwhvwh58w1isr6jxq222xih578dsscdsfbh6bg1bxgbkz0x1m"; - }; - } - { - goPackagePath = "github.com/soniah/gosnmp"; - fetch = { - type = "git"; - url = "https://github.com/soniah/gosnmp"; - rev = "f15472a4cd6f6ea7929e4c7d9f163c49f059924f"; - sha256 = "1blhxq9sayfg7zih5rj0dg2qj9h10m6sbri57hxya9iz3jfgcx11"; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "63795daa9a446c920826655f26ba31c81c860fd6"; - sha256 = "1v6xwskb4dqyy2q1r7k12f9wky7v6cfb4f1mx94sr3qvx37zg2yj"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "facf9a85c22f48d2f52f2380e4efce1768749a89"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; - sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "0623bd8fbdbf97cc62b98d15108832851a658e59"; - sha256 = "0g6rhilcmqpdvjdds7ykzhrlsjx234chf73l8sjah0rsd03207k0"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "173748da739a410c5b0b813b956f89ff94730b4c"; - sha256 = "0a4hp323gnjam3nfxfljq7d24m7rgk5vxbscjmi3ik3ph78r5avg"; - }; - } - { - goPackagePath = "github.com/vjeantet/grok"; - fetch = { - type = "git"; - url = "https://github.com/vjeantet/grok"; - rev = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe"; - sha256 = "09p70h5inycwrw3dmn6c7lhx4m11fvw7449wzq1k5w2jcws7amd5"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kafka"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kafka"; - rev = "bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee"; - sha256 = "0x86gnkpsr6gsc6mk2312ay8yqrzscvvdra2knhvwgaws6rzvj2l"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kazoo-go"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kazoo-go"; - rev = "968957352185472eacb69215fa3dbfcfdbac1096"; - sha256 = "07q37lmlc3vx620bklp93r368r73kgm2s9x7qcgcxk9701lqq7dc"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "66c871e454fcf10251c61bf8eff02d0978cae75a"; - sha256 = "1srcibhsl29cy8qih132iqigl4ss303nfmglrgc583nj9kz9sf8j"; - }; - } - { - goPackagePath = "github.com/zensqlmonitor/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/zensqlmonitor/go-mssqldb"; - rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363"; - sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "dc137beb6cce2043eb6b5f223ab8bf51c32459f4"; - sha256 = "0kia3rd0g0vkb9pf102kbg1agr1xq27bi2shkpxy9l718yvy9jwd"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "a337091b0525af65de94df2eb7e98bd9962dcbe2"; - sha256 = "11a6a3ah1f3jj6530q4hjqf79bv9fy62s5wgxpp28g8b3vlxxsyp"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "739734461d1c916b6c72a63d7efda2b27edb369f"; - sha256 = "0b0yh28ap1q0b8myg0gw4p9d6m71ry0d3n4hiycvd8sgk327379a"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "506f9d5c962f284575e88337e7d9296d27e729d3"; - sha256 = "1ghx5vv4zlkjzlx2gslvcwpvxjggpl6wz5n49nqxiz777psx218s"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "11c7f9e547da6db876260ce49ea7536985904c9b"; - sha256 = "1qdda2b31qhli71xc2rscm7hf219gr2mals3n24kgv9svmw1cxkq"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "de2209a968d48e8970546c8a710189f7461370f7"; - sha256 = "0jby05p1qhm4gik0ya9n14vhf9x83mxysd917k53x59jrwrkh9gr"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "4e86f4367175e39f69d9358a5f17b4dda270378d"; - sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"; - }; - } - { - goPackagePath = "gopkg.in/fatih/pool.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/fatih/pool.v2"; - rev = "6e328e67893eb46323ad06f0e92cb9536babbabc"; - sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb"; - sha256 = "0912q06l6mrrrc7jj7hlrsbglklxyp67z1vnmvmcm04ck6hx8dlm"; - }; - } - { - goPackagePath = "gopkg.in/gorethink/gorethink.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/gorethink/gorethink.v3"; - rev = "7ab832f7b65573104a555d84a27992ae9ea1f659"; - sha256 = "1pri52ac45aqf5a2kmsd4mfhyfbkd1snkjbvanrdgipikysxi696"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; - sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; - sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://gopkg.in/olivere/elastic.v5"; - rev = "3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26"; - sha256 = "1zkwprs68q1r7pigb59n8zbw8610z9r1pi6r0s28kzdgiv30sfdm"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6"; - sha256 = "1ddwvmsfijgl09pbqrcx73fy5kh8y3888dd29lh7i50ds5a088cx"; - }; - } -] diff --git a/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix new file mode 100644 index 00000000000..f65115a8622 --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix @@ -0,0 +1,1146 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "c728a003b238b26cef9ab6753a5dc424b331c3ad"; + sha256 = "010bxkx0gkbsn7xi6632xp2nq0577zx7imw16irxv8hzvq49q38i"; + }; + } + { + goPackagePath = "code.cloudfoundry.org/clock"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/clock"; + rev = "02e53af36e6c978af692887ed449b74026d76fec"; + sha256 = "0bpfxf21flb9lqwjr95skaw58zajb54s62g3h68lcxxcp4gfdba4"; + }; + } + { + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd"; + rev = "2ce144541b8903101fb8f1483cc0497a68798122"; + sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver"; + rev = "2b93072101d466aa4120b3c23c2e1b08af01541c"; + sha256 = "0qhxpfmzn5jsh1qrq7w2zkg87xvalqam2ciq65qfq38mfkssda3v"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "1f7cd6cfe0adea687ad44a512dfe76140f804318"; + sha256 = "0sh7c8lgjjwpaw6rka0j5wlg9dsz0swz4h7lc2xnzfv2wvgzliv8"; + }; + } + { + goPackagePath = "github.com/Microsoft/ApplicationInsights-Go"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/ApplicationInsights-Go"; + rev = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"; + sha256 = "0lr7cq5ghphm94y13injczg2fzxljql0xlw5sj61hfba50lvmbs5"; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "a6d595ae73cf27a1b8fc32930668708f45ce1c85"; + sha256 = "1plx73f1hm6czcdwcw2sl9xqyq3dnsrd92m2y2yzhcy5y369dijj"; + }; + } + { + goPackagePath = "github.com/Shopify/sarama"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/sarama"; + rev = "a6144ae922fd99dd0ea5046c8137acfb7fab0914"; + sha256 = "13x23kmjg7milzc34a0acll5b6q6yh9jfh7qjh6zran1inp9lnba"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/aerospike/aerospike-client-go"; + fetch = { + type = "git"; + url = "https://github.com/aerospike/aerospike-client-go"; + rev = "1dc8cf203d24cd454e71ce40ab4cd0bf3112df90"; + sha256 = "0mzw88fdggmrab6yavq702lq2x2k785gy6ag5ryl5n5k6bqnlp13"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + { + goPackagePath = "github.com/apache/thrift"; + fetch = { + type = "git"; + url = "https://github.com/apache/thrift"; + rev = "f2867c24984aa53edec54a138c03db934221bdea"; + sha256 = "1k72gjsxa2xzwn5rikc5pm5n025bkr3hl2nhv0x65i7rp3bda2qb"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "bf8067ceb6e7f51e150c218972dccfeeed892b85"; + sha256 = "0kxw0blzxr5vc5c0il7hh178vv86ib7af3j9pnzsfzhm3byw0ccx"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/bsm/sarama-cluster"; + fetch = { + type = "git"; + url = "https://github.com/bsm/sarama-cluster"; + rev = "cf455bc755fe41ac9bb2861e7a961833d9c2ecc3"; + sha256 = "000rklq9jx66bbbdklsvm7l9fd9r8d6k3qxx18xfjklblk1v9y19"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "2ea60e5f094469f9e65adb9cd103795b73ae743e"; + sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + }; + } + { + goPackagePath = "github.com/couchbase/go-couchbase"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/go-couchbase"; + rev = "16db1f1fe037412f12738fa4d8448c549c4edd77"; + sha256 = "0ivlzin23a3s9jj8764mr9rwy3hw5bd97gfv0zc2vzdd3psi28g2"; + }; + } + { + goPackagePath = "github.com/couchbase/gomemcached"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/gomemcached"; + rev = "0da75df145308b9a4e6704d762ca9d9b77752efc"; + sha256 = "0sscy1n3vpi1gcpzw2vh8a7mnvg8nlxc37b6580k6h7xbpx1mq9z"; + }; + } + { + goPackagePath = "github.com/couchbase/goutils"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/goutils"; + rev = "e865a1461c8ac0032bd37e2d4dab3289faea3873"; + sha256 = "1306m4gbm555akni5rwwgafkq7j1ps8k40lfrvib5jv5pgdygrcd"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "1eb28afdf9b6e56cf673badd47545f844fe81103"; + sha256 = "1p2x2k7azbp4cwdjn1nv0zzaf0fvxaysnjrlyxskqlm2cq5vp5ab"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dimchansky/utfbom"; + fetch = { + type = "git"; + url = "https://github.com/dimchansky/utfbom"; + rev = "6c6132ff69f0f6c088739067407b5d32c52e1d0f"; + sha256 = "01qbwnglc019303qbr9x85d36svd0hrwd1qrld77fgw45ml6b2ib"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"; + sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "ed7b6428c133e7c59404251a09b7d6b02fa83cc2"; + sha256 = "0da19ndf29jsy3w0ddw05hnw8m5hmrr9p70g02z3icjydl387mrs"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; + sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; + sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; + }; + } + { + goPackagePath = "github.com/docker/libnetwork"; + fetch = { + type = "git"; + url = "https://github.com/docker/libnetwork"; + rev = "d7b61745d16675c9f548b19f06fda80d422a74f0"; + sha256 = "1mbdhgy14gl8263cynfv210ag6gm6i6yply9i022ib3y2s5ffxhd"; + }; + } + { + goPackagePath = "github.com/eapache/go-resiliency"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-resiliency"; + rev = "ea41b0fad31007accc7f806884dcdf3da98b79ce"; + sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx"; + }; + } + { + goPackagePath = "github.com/eapache/go-xerial-snappy"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-xerial-snappy"; + rev = "040cc1a32f578808623071247fdbd5cc43f37f5f"; + sha256 = "1y3gs5ghf8wza8k85hcy98g9ygcfb6k3zhiac4nnyrahwckf5whz"; + }; + } + { + goPackagePath = "github.com/eapache/queue"; + fetch = { + type = "git"; + url = "https://github.com/eapache/queue"; + rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; + sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; + }; + } + { + goPackagePath = "github.com/eclipse/paho.mqtt.golang"; + fetch = { + type = "git"; + url = "https://github.com/eclipse/paho.mqtt.golang"; + rev = "36d01c2b4cbeb3d2a12063e4880ce30800af9560"; + sha256 = "1vgxdv4f1g92jx5sj143y3jc18sfd712il4rbaxckgrpsb7gq8ch"; + }; + } + { + goPackagePath = "github.com/ericchiang/k8s"; + fetch = { + type = "git"; + url = "https://github.com/ericchiang/k8s"; + rev = "d1bbc0cffaf9849ddcae7b9efffae33e2dd52e9a"; + sha256 = "1qv7iggr4144g4bwqm1slnnjp6zs2dh370p4yfqp7id3sxk3893n"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "358ee7663966325963d4e8b2e1fbd570c5195153"; + sha256 = "1zr51xaka7px1pmfndm12fvg6a3cr24kg77j28zczbfcc6h339gy"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + goPackagePath = "github.com/go-redis/redis"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "83fb42932f6145ce52df09860384a4653d2d332a"; + sha256 = "0zrp1w6jcbnhk8q5fl3fm11j9s4yjyks2hzi6kwjhngzhjmdn1sh"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "d523deb1b23d913de5bdada721a6071e71283618"; + sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; + sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f"; + sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/hailocab/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/hailocab/go-hostpool"; + rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; + sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; + }; + } + { + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "39f93f011e591c842acc8053a7f5972aa6e592fd"; + sha256 = "0l255iy37m3mycdzk90629n8zjvi3cj8k2sxpm40h2r539ayawly"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; + sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + }; + } + { + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "d6574a5bb1226678d7010325fb6c985db20ee458"; + sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; + }; + } + { + goPackagePath = "github.com/influxdata/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/go-syslog"; + rev = "0cd00a9f0a5e5607d5ef9a294c260f77a74e3b5a"; + sha256 = "0a8xbghb1s59viiqs8s8vd4ydqrf7z7nh020si4aqwmsm9gchkzz"; + }; + } + { + goPackagePath = "github.com/influxdata/tail"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/tail"; + rev = "c43482518d410361b6c383d7aebce33d0471d7bc"; + sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b"; + }; + } + { + goPackagePath = "github.com/influxdata/toml"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/toml"; + rev = "2a2e3012f7cfbef64091cc79776311e65dfa211b"; + sha256 = "1dyzsg79rgl5bcvq7i7cnwhxr7racyhfhmqdq2701zgv77v3rab3"; + }; + } + { + goPackagePath = "github.com/influxdata/wlog"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/wlog"; + rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; + sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; + }; + } + { + goPackagePath = "github.com/jackc/pgx"; + fetch = { + type = "git"; + url = "https://github.com/jackc/pgx"; + rev = "89f1e6ac7276b61d885db5e5aed6fcbedd1c7e31"; + sha256 = "0qln29f443m9sw6yf0xy8m45wag9jg87hbwiplb511d5783l7jwk"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/kardianos/service"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/service"; + rev = "615a14ed75099c9eaac6949e22ac2341bf9d3197"; + sha256 = "149hwk6nils3vff38znc89vzdnhppp227i7ds14hy1nighjwr77c"; + }; + } + { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "95032a82bc518f77982ea72343cc1ade730072f0"; + sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/leodido/ragel-machinery"; + fetch = { + type = "git"; + url = "https://github.com/leodido/ragel-machinery"; + rev = "299bdde78165d4ca4bc7d064d8d6a4f39ac6de8c"; + sha256 = "0ir7gf9a9p99pgsz3b5qijhkz41xqk4axlbx0cl4w2rwv2spvyw5"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "efc7eb8984d6655c26b5c9d2e65c024e5767c37c"; + sha256 = "02wzdl0hxkqvim1ymnp7s0d0ysw0ba2mdsrkhi7k93zs2wf1wswd"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"; + sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + }; + } + { + goPackagePath = "github.com/multiplay/go-ts3"; + fetch = { + type = "git"; + url = "https://github.com/multiplay/go-ts3"; + rev = "d0d44555495c8776880a17e439399e715a4ef319"; + sha256 = "04n2rkbbgs09m47w24i9x7ah2a3mdwq378ayhsizyzjv3a0xhd9b"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/nats-io/gnatsd"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/gnatsd"; + rev = "6608e9ac3be979dcb0614b772cc86a87b71acaa3"; + sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; + }; + } + { + goPackagePath = "github.com/nats-io/go-nats"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/go-nats"; + rev = "062418ea1c2181f52dc0f954f6204370519a868b"; + sha256 = "1sccsfvfhwaqpkr4j3c1sa1jkjwqhkhr35br3iaw2qzlidhdypml"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "289cccf02c178dc782430d534e3c1f5b72af807f"; + sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4"; + }; + } + { + goPackagePath = "github.com/nsqio/go-nsq"; + fetch = { + type = "git"; + url = "https://github.com/nsqio/go-nsq"; + rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"; + sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x"; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "d60099175f88c47cd379c4738d158884749ed235"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + }; + } + { + goPackagePath = "github.com/opentracing-contrib/go-observer"; + fetch = { + type = "git"; + url = "https://github.com/opentracing-contrib/go-observer"; + rev = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"; + sha256 = "1q7z458m2vh3bzml4x9vm2paffqn1jcgiydbisl0zg2asfniq7k3"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"; + sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + }; + } + { + goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; + fetch = { + type = "git"; + url = "https://github.com/openzipkin/zipkin-go-opentracing"; + rev = "26cf9707480e6b90e5eff22cf0bbf05319154232"; + sha256 = "1yiyqh0k72985hxwc7hh639cyyg7igkx9bg9923x4knq635m2f32"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "1958fd8fff7f115e79725b1288e0b878b3e06b00"; + sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; + sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; + sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "e2704e165165ec55d062f5919b4b29494e9fa790"; + sha256 = "1yvvwqyfdnnjgnc3j4y0g1b897ad0wwlgn6x4dx83s20ax2lyz2q"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"; + sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "8048a2e9c5773235122027dd585cf821b2af1249"; + sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29"; + }; + } + { + goPackagePath = "github.com/shirou/w32"; + fetch = { + type = "git"; + url = "https://github.com/shirou/w32"; + rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; + sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; + sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + }; + } + { + goPackagePath = "github.com/soniah/gosnmp"; + fetch = { + type = "git"; + url = "https://github.com/soniah/gosnmp"; + rev = "96b86229e9b3ffb4b954144cdc7f98fe3ee1003f"; + sha256 = "06al7bwl4hy8mc9l6q366sbpibad4n93xhdmifz133h6q9608djf"; + }; + } + { + goPackagePath = "github.com/streadway/amqp"; + fetch = { + type = "git"; + url = "https://github.com/streadway/amqp"; + rev = "e5adc2ada8b8efff032bf61173a233d143e9318e"; + sha256 = "0qc5h9h1fcyblpiprbijrlc92fdbbnzf87648k20afgfjv8kciab"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/tidwall/gjson"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/gjson"; + rev = "f123b340873a0084cb27267eddd8ff615115fbff"; + sha256 = "1axph65dv3l0mmr2iis4r5jk2qy5ffdvh4gdxz4pv92jyincf5fj"; + }; + } + { + goPackagePath = "github.com/tidwall/match"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/match"; + rev = "1731857f09b1f38450e2c12409748407822dc6be"; + sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "b2de5d10e38ecce8607e6b438b6d174f389a004e"; + sha256 = "06kic677b2q752sgvk3lyjfh8gmq7bpfl38h8k1jsz92fav1y8gl"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128ccc8e51e9a6bd2b551020a27180abd"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "github.com/vjeantet/grok"; + fetch = { + type = "git"; + url = "https://github.com/vjeantet/grok"; + rev = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"; + sha256 = "172j83ndkmh5dhglgskpsg5csz31ah5mnprqhcra5x7dczc2f8hv"; + }; + } + { + goPackagePath = "github.com/vmware/govmomi"; + fetch = { + type = "git"; + url = "https://github.com/vmware/govmomi"; + rev = "e3a01f9611c32b2362366434bcd671516e78955d"; + sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; + }; + } + { + goPackagePath = "github.com/wvanbergen/kafka"; + fetch = { + type = "git"; + url = "https://github.com/wvanbergen/kafka"; + rev = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"; + sha256 = "1m712xywbx6nja2rbmrphwxbwfzkhadq139k5d19m8964695sp10"; + }; + } + { + goPackagePath = "github.com/wvanbergen/kazoo-go"; + fetch = { + type = "git"; + url = "https://github.com/wvanbergen/kazoo-go"; + rev = "f72d8611297a7cf105da904c04198ad701a60101"; + sha256 = "05yx57kbjm9v54j46zi2c21zb3d239lzv996b2qqxpkfbqadqyxm"; + }; + } + { + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "46796da1b0b4794e1e341883a399f12cc7574b55"; + sha256 = "0yq5ks1smqx0kgmwyl6xxd2mn9bvdi8qz7di4xs0xy5cs7f2zanw"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "79993219becaa7e29e3b60cb67f5b8e82dee11d6"; + sha256 = "0y2jzm1b5dw8x5s9fjy2aj1gd0wwkhl71wj3ysby86g60ja5lp1z"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; + sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; + sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; + sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "19ff8768a5c0b8e46ea281065664787eefc24121"; + sha256 = "0b34xb74pnwawlf911w6f0dhb95i8vi20i799asnvrmyn1lm2ldk"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "fedd2861243fd1a8152376292b921b394c7bef7e"; + sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; + sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; + sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; + }; + } + { + goPackagePath = "gopkg.in/fatih/pool.v2"; + fetch = { + type = "git"; + url = "https://github.com/fatih/pool"; + rev = "010e0b745d12eaf8426c95f9c3924d81dd0b668f"; + sha256 = "0dxsq7058w47d6ynbwjlfgnwcf5bf1q7m23dsgljd01sd8ilrq9x"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/gorethink/gorethink.v3"; + fetch = { + type = "git"; + url = "https://github.com/gorethink/gorethink"; + rev = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"; + sha256 = "1k4flhx93jbrcsi8k35dcdm7rcq3r8i8my4h8zhf5y9ayhcyph1m"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-ldap/ldap"; + rev = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"; + sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-mgo/mgo"; + rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v5"; + fetch = { + type = "git"; + url = "https://github.com/olivere/elastic"; + rev = "52741dc2ce53629cbe1e673869040d886cba2cd5"; + sha256 = "11dgj31jxmp9fdnnwzzwg08p3iwrbnd63kyf6drvlw4qsgslk4lh"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-tomb/tomb"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] From ecd1129dee9add903e3fdc50fb208374c1434e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Jan 2019 11:30:11 +0000 Subject: [PATCH 060/230] nixos/telegraf: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/telegraf.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/tests/telegraf.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9ee8ac2995b..8c2df2435a7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -200,6 +200,7 @@ in syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; taskserver = handleTest ./taskserver.nix {}; + telegraf = handleTest ./telegraf.nix {}; tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix new file mode 100644 index 00000000000..6776f8d8c37 --- /dev/null +++ b/nixos/tests/telegraf.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "telegraf"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + machine = { ... }: { + services.telegraf.enable = true; + services.telegraf.extraConfig = { + agent.interval = "1s"; + agent.flush_interval = "1s"; + inputs.exec = { + commands = [ + "${pkgs.runtimeShell} -c 'echo example,tag=a i=42i'" + ]; + timeout = "5s"; + data_format = "influx"; + }; + outputs.file.files = ["/tmp/metrics.out"]; + outputs.file.data_format = "influx"; + }; + }; + + testScript = '' + startAll; + + $machine->waitForUnit("telegraf.service"); + $machine->waitUntilSucceeds("grep -q example /tmp/metrics.out"); + ''; +}) From 736fe5ae59b3c5c11a36985756873732fb3e4d1f Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 20 Jan 2019 19:20:30 -0500 Subject: [PATCH 061/230] elm: fix UnsafePath error downloading dependencies --- pkgs/development/compilers/elm/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index aa8d9da9faa..bfaf24cd987 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -14,6 +14,12 @@ let elmPackages = (import ./packages/elm-srcs.nix); versionsDat = ./versions.dat; }; + patches = [ + (fetchpatch { + url = "https://github.com/elm/compiler/pull/1886/commits/39d86a735e28da514be185d4c3256142c37c2a8a.patch"; + sha256 = "0nni5qx1523rjz1ja42z6z9pijxvi3fgbw1dhq5qi11mh1nb9ay7"; + }) + ]; buildTools = drv.buildTools or [] ++ [ makeWrapper ]; jailbreak = true; postInstall = '' From 24fb891bbac40969a6724f94d1f17a83cea5bbba Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 21 Jan 2019 08:43:38 -0600 Subject: [PATCH 062/230] go: 1.9.5 -> 1.9.7 https://golang.org/doc/devel/release.html#go1.9.minor --- pkgs/development/compilers/go/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index d6ae163813f..15325b9d5c8 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.5"; + version = "1.9.7"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; + sha256 = "16bvpw0kkd2vv4d83m8xnbq3f1hfy642p7lfvk64h5h1663vpc2v"; }; # perl is used for testing go vet From 07104e5d696fbfb15d5cca0e0df3e98f07276603 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 21 Jan 2019 03:38:27 -0600 Subject: [PATCH 063/230] plasma-5: 5.14.4 -> 5.14.5 https://www.kde.org/announcements/plasma-5.14.5.php --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 57b11f970f2..814795499a9 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 9fc1c7b6a9a..0842034f0d8 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/bluedevil-5.14.4.tar.xz"; - sha256 = "04c7nwlmwkdmqjxxy9wz2sdb9nx40vzln150iyw6bpw8vix5wwkv"; - name = "bluedevil-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz"; + sha256 = "1khqw11apvcf5g5m9z111rvk4scxh3z3yhcpwqws1h0s5c5lr7z7"; + name = "bluedevil-5.14.5.tar.xz"; }; }; breeze = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-5.14.4.tar.xz"; - sha256 = "0xdnfnvkzy96wn4y670wq1xq4jla8pqr2pwy4z4flhck61a0s7nf"; - name = "breeze-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/breeze-5.14.5.tar.xz"; + sha256 = "15hphz2mm2m3j0a0hwj7m65rggyaxdxy08yqs73bg3yg67n6x3p7"; + name = "breeze-5.14.5.tar.xz"; }; }; breeze-grub = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-grub-5.14.4.tar.xz"; - sha256 = "1q21frlacgjyl5r6x32ihzsy25rihdpc18hg0qdcar1zq5hmk7b1"; - name = "breeze-grub-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/breeze-grub-5.14.5.tar.xz"; + sha256 = "0bkaaxfl1ds58qcdrxswaacir7wcc65a960lwdkmpdl16g9f4gix"; + name = "breeze-grub-5.14.5.tar.xz"; }; }; breeze-gtk = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-gtk-5.14.4.tar.xz"; - sha256 = "0aqj4ap1j9pajk211pbx7a692gm89kjdfh3lpbrrsi1bnq1rcq94"; - name = "breeze-gtk-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz"; + sha256 = "0bysq83xbqmhb4wld51zd6lllr66b8w7pinizc99k8z1yz5jdb0m"; + name = "breeze-gtk-5.14.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-plymouth-5.14.4.tar.xz"; - sha256 = "1q9z5d96rrm8m3kjg3vi82az7a4c7h5n4mj736867nbcy4slqwk7"; - name = "breeze-plymouth-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/breeze-plymouth-5.14.5.tar.xz"; + sha256 = "1rbdpz9vlami7217v3dk8ljz0fgjz9zi1l0gwkhslayz5sybld96"; + name = "breeze-plymouth-5.14.5.tar.xz"; }; }; discover = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/discover-5.14.4.tar.xz"; - sha256 = "0pivys2ygpzyi3ykyqslnh1c429f722mk5raa4h4krl8aa5cwwni"; - name = "discover-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/discover-5.14.5.tar.xz"; + sha256 = "0gxhl2cv5yz3jw8fp8g8idi1k5hlhnvwbnvvg0dgnlzz6jb1s8dd"; + name = "discover-5.14.5.tar.xz"; }; }; drkonqi = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/drkonqi-5.14.4.tar.xz"; - sha256 = "1fyz5wxmilar01x94i46mzfg5nvkqanx2xsw8bwkzqmnd8ndmnmi"; - name = "drkonqi-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz"; + sha256 = "0xgym368f9r21wjh9fpv16m90dcj87g9p5df850fnn2k5n8x38z8"; + name = "drkonqi-5.14.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kactivitymanagerd-5.14.4.tar.xz"; - sha256 = "1ahfsqqgwlcsfy5d86i35kz8m90iarldnmlhsqw2bqk9al0qnsgm"; - name = "kactivitymanagerd-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz"; + sha256 = "0zms9npis0rklnbz93c69h4yg7dkrmfkzvzsfvkg90w37ap3vyl7"; + name = "kactivitymanagerd-5.14.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kde-cli-tools-5.14.4.tar.xz"; - sha256 = "11gkplnn95c78rdr0qs2hr08qv6scplsrff2nrz0n3g8sdplz2yy"; - name = "kde-cli-tools-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz"; + sha256 = "01mrnjqla4q07cnb1p51nq2pvj9vaamic3dsyj3b7hqky9fna9ln"; + name = "kde-cli-tools-5.14.5.tar.xz"; }; }; kdecoration = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kdecoration-5.14.4.tar.xz"; - sha256 = "10nqshn8jj5dvrmdzn2x62lpa99d3q9wq7pv9q7lkbianlic3zzk"; - name = "kdecoration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz"; + sha256 = "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in"; + name = "kdecoration-5.14.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kde-gtk-config-5.14.4.tar.xz"; - sha256 = "1dmx9pd404jy03k7wgh0xjdpxn2nmz8mbg6ysjvw1z89ggm4dxy8"; - name = "kde-gtk-config-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz"; + sha256 = "12467wkjh2nmcf6r7n8qin1rryd39g0dg7gn43sdg6vdwpyl2kdm"; + name = "kde-gtk-config-5.14.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kdeplasma-addons-5.14.4.tar.xz"; - sha256 = "0sdrkjsh4a4i7iv49m9s8rjp40bzarq8i3w4c64w6446jz66g4j9"; - name = "kdeplasma-addons-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz"; + sha256 = "18sph3719d9pq2j5k7swiv9xbrpj659a3q66zvhz3dmh11y73f0m"; + name = "kdeplasma-addons-5.14.5.tar.xz"; }; }; kgamma5 = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kgamma5-5.14.4.tar.xz"; - sha256 = "028alj0768pc2zb7h613vcxs8zsqgd6nn4lpni4c8l25n5wzyd11"; - name = "kgamma5-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz"; + sha256 = "17smrdwyalknb3f6ckqs7kglfpqwajbiyd212wlsmqbva4by0fy0"; + name = "kgamma5-5.14.5.tar.xz"; }; }; khotkeys = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/khotkeys-5.14.4.tar.xz"; - sha256 = "033syji5mwd0il6d71p3r2dgqvs3lb5ybxkjb4m54sffbb0glrx2"; - name = "khotkeys-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz"; + sha256 = "0572jpgbhacx4gy40m594rbnxy3zaq5w3lcrfd8i2750ljswcq24"; + name = "khotkeys-5.14.5.tar.xz"; }; }; kinfocenter = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kinfocenter-5.14.4.tar.xz"; - sha256 = "1nh9dg37dnl2b11l400dswaf8qf8qspck0pdr7svrncv2yn3zirc"; - name = "kinfocenter-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz"; + sha256 = "1z1i9g923cbdni5gfa6dpv46z1p2v40rfcvhy7i9h5nf49aw2rnc"; + name = "kinfocenter-5.14.5.tar.xz"; }; }; kmenuedit = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kmenuedit-5.14.4.tar.xz"; - sha256 = "09lafgcxv2v745m04ljgsqgflw3j3ydx17974c1c7qfgr255994g"; - name = "kmenuedit-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz"; + sha256 = "1aa4a35s5h44fc88hmmfdpzy26zc47h9n448cd4vbm4bm411551d"; + name = "kmenuedit-5.14.5.tar.xz"; }; }; kscreen = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kscreen-5.14.4.tar.xz"; - sha256 = "1cqlhi4r1qli2izrj64x07cwz1k0qxclr0ckgkfx2lzdgp00gc96"; - name = "kscreen-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz"; + sha256 = "1nb1ysgcx49galbf16mxbawybfik92bpr9vbwgg5ycsdx1f9q8yi"; + name = "kscreen-5.14.5.tar.xz"; }; }; kscreenlocker = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kscreenlocker-5.14.4.tar.xz"; - sha256 = "1fpknd22d1lr63d203k1m7w09d2dxg80a5r83jhxs439y9winwz2"; - name = "kscreenlocker-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kscreenlocker-5.14.5.tar.xz"; + sha256 = "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m"; + name = "kscreenlocker-5.14.5.tar.xz"; }; }; ksshaskpass = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/ksshaskpass-5.14.4.tar.xz"; - sha256 = "1cj6w9kqjg7qxq7xdn227xy6wnmpv72s08wdphhpv1lhpafgf0pm"; - name = "ksshaskpass-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz"; + sha256 = "0skr247k4ky7lpbdwlmkrnr3mj1pa6pxl96pyxwsw7za784qg6dj"; + name = "ksshaskpass-5.14.5.tar.xz"; }; }; ksysguard = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/ksysguard-5.14.4.tar.xz"; - sha256 = "0gqji22k1pvs89zr6f5y71v2rma3p2ypp9ld449jn6rlizyfski1"; - name = "ksysguard-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz"; + sha256 = "0ybxh6ll080rkrrr4b5ydl06x8zi97702661cajvbv00lhq4vp8b"; + name = "ksysguard-5.14.5.tar.xz"; }; }; kwallet-pam = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwallet-pam-5.14.4.tar.xz"; - sha256 = "15656m50xly9x7j2min813pr5lk7ymyb82is2s1lmfggrxghqjiq"; - name = "kwallet-pam-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz"; + sha256 = "1mkjjc88kqf5x313nifla9pzrgzqm4v92150dbs1f89bsn673pk8"; + name = "kwallet-pam-5.14.5.tar.xz"; }; }; kwayland-integration = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwayland-integration-5.14.4.tar.xz"; - sha256 = "02w048f366mikpbqmjpliyrali7gd2flfjbv9nfgzhld9ixx1wwq"; - name = "kwayland-integration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz"; + sha256 = "0rd0xhb53iixv9i8x0gh3rr1082lj7zdymsqdmi7sfgb66g8c03l"; + name = "kwayland-integration-5.14.5.tar.xz"; }; }; kwin = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwin-5.14.4.tar.xz"; - sha256 = "0g9j394q7a2fk6wb2np7rjr1icdz9sr6iqjsicr881j088vxsini"; - name = "kwin-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kwin-5.14.5.tar.xz"; + sha256 = "0ifdlnzw3ydrbidzk256vks66d1rxyilhqi09csygx17jqk7szj4"; + name = "kwin-5.14.5.tar.xz"; }; }; kwrited = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwrited-5.14.4.tar.xz"; - sha256 = "1c8zwvc672a1z4dj8qq1wma5a8lm0kvyxki4kacx7n9xfrh54njv"; - name = "kwrited-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz"; + sha256 = "0115qscr8a54h7h8w4xw4fjzp7qipyw3d3jswhii7axnzp6q6qnh"; + name = "kwrited-5.14.5.tar.xz"; }; }; libkscreen = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/libkscreen-5.14.4.tar.xz"; - sha256 = "1n56fb6sxjyh73lb17s44yjlfhyqx2n3q320vncjx2jxxh0an80z"; - name = "libkscreen-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/libkscreen-5.14.5.tar.xz"; + sha256 = "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y"; + name = "libkscreen-5.14.5.tar.xz"; }; }; libksysguard = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/libksysguard-5.14.4.tar.xz"; - sha256 = "1nflk9vr2s2mc8ddl0rjvvh9iks4vwvf8ahlskqc068xm8ja0cr2"; - name = "libksysguard-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz"; + sha256 = "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya"; + name = "libksysguard-5.14.5.tar.xz"; }; }; milou = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/milou-5.14.4.tar.xz"; - sha256 = "1dkkr5zinia1zy439rm1sdz6r8hix1l4w8bw9rwwbk6yydvp2mkf"; - name = "milou-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/milou-5.14.5.tar.xz"; + sha256 = "1776441mhmwcvrzmdqg531md79azbkbhng51kyq6i9cvkhxyf583"; + name = "milou-5.14.5.tar.xz"; }; }; oxygen = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/oxygen-5.14.4.tar.xz"; - sha256 = "1rdxisnrmyywbanvchs57fr37d3ilakg83b78v8z6ji0jiy1wk0z"; - name = "oxygen-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz"; + sha256 = "0h70k7af69zdky0g6napd1kdnvbxhnw3nrwr9jqv1fq5762xnkk8"; + name = "oxygen-5.14.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-browser-integration-5.14.4.tar.xz"; - sha256 = "0gwdi6mqfmv7hpdbhklxcxy07awvm9k22vj4wmzca3h7k334l35m"; - name = "plasma-browser-integration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz"; + sha256 = "1260h5sh0gkbkhcj17ss0n0y48i1pxh3f4p5dcbgbz775g1dhi2s"; + name = "plasma-browser-integration-5.14.5.tar.xz"; }; }; plasma-desktop = { - version = "5.14.4.1"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-desktop-5.14.4.1.tar.xz"; - sha256 = "0qcmqm9dag6xjfdn5zlbcpksbc70z3bwpc0dg5s315bdv2jha8c4"; - name = "plasma-desktop-5.14.4.1.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz"; + sha256 = "0pr07p36jrpvkk4fp14fb4minnwj5gnmvdg9jf7bi8sjjz6jpnnl"; + name = "plasma-desktop-5.14.5.tar.xz"; }; }; plasma-integration = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-integration-5.14.4.tar.xz"; - sha256 = "0jjfb0gx51zglcn59xzz8306zm55b6nsd057vkwddinq5qi3x938"; - name = "plasma-integration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz"; + sha256 = "15nhrliri4cjx712f1rxbq2f87lj4wxsqgbhw9p02z12h3n9z3ds"; + name = "plasma-integration-5.14.5.tar.xz"; }; }; plasma-nm = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-nm-5.14.4.tar.xz"; - sha256 = "14jjaaaqbsqgzzfpz7nqk7sw1jy4dc6sxrgz46hrdf0n04ga9kxk"; - name = "plasma-nm-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz"; + sha256 = "1hf98c9llcff0h2w4l45nw0vysxvnanf7hczhj93z4562qrafxm2"; + name = "plasma-nm-5.14.5.tar.xz"; }; }; plasma-pa = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-pa-5.14.4.tar.xz"; - sha256 = "18mc1aagz4b3lmv1dmabqnc4xr64j9is597lqpjc0c28gm0rnqp3"; - name = "plasma-pa-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz"; + sha256 = "0z74qg7m4y1ifzni1877hiil3rn6ad3x4fvgv4bib4jhg7ckaiqg"; + name = "plasma-pa-5.14.5.tar.xz"; }; }; plasma-sdk = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-sdk-5.14.4.tar.xz"; - sha256 = "1mg1229xcv0zjx85a0418ypv38q0q87xxcmmzjdqgxmhk6dx5dys"; - name = "plasma-sdk-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz"; + sha256 = "0v90nk6yhrapdszh8sd3m0wffkjgnrhdy1sz1vl9s0ab5sdpmxr1"; + name = "plasma-sdk-5.14.5.tar.xz"; }; }; plasma-tests = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-tests-5.14.4.tar.xz"; - sha256 = "17imxri9n4hv27z0d7nbwvdgvc45ql224aj1gcpxmrn4p4zfc8w7"; - name = "plasma-tests-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-tests-5.14.5.tar.xz"; + sha256 = "03h889xn6i067d1sdymn6fgj8xik3pa75lljl8kj3vl6bks24jyh"; + name = "plasma-tests-5.14.5.tar.xz"; }; }; plasma-vault = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-vault-5.14.4.tar.xz"; - sha256 = "1fwa8w95n3d25mk823q1dzyhari4fzwnnx6jwny0spcqyhzr4xcr"; - name = "plasma-vault-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz"; + sha256 = "17r44n0mkcwc2fkjf397ks8xv82m59gvnawbj9713c5l31ln5mi3"; + name = "plasma-vault-5.14.5.tar.xz"; }; }; plasma-workspace = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz"; - sha256 = "0dmgk26wcs69py9qd6q3hg8npkbkk25fl5l6nl88x0jh9mqiyff5"; - name = "plasma-workspace-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz"; + sha256 = "14d3wnsm4bi1izx5qlpk0mnqmxwx18bqypa3wwmhn1535kfz8glh"; + name = "plasma-workspace-5.14.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-wallpapers-5.14.4.tar.xz"; - sha256 = "1kvc0v0rjixkf4zfr9gcpmyrs62xpccv96fyw534xiw4w5pr73i6"; - name = "plasma-workspace-wallpapers-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz"; + sha256 = "17q0685i4267ihlrii3b8764ak458kzs0inqfcj9x25m338xz19q"; + name = "plasma-workspace-wallpapers-5.14.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plymouth-kcm-5.14.4.tar.xz"; - sha256 = "02c7s9js3943by7s0d3lalamliq98jm26syafmn6q1wz0msza40x"; - name = "plymouth-kcm-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz"; + sha256 = "1cwmkprhc4496x4a38l2x7hnifnp4daw8g1gic0ik2sm0a6xn77k"; + name = "plymouth-kcm-5.14.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.14.4"; + version = "1-5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/polkit-kde-agent-1-5.14.4.tar.xz"; - sha256 = "1pvyxjg1p510v6ahrab017s2sqfq3zld0xjf2yh30x55hz6pvnmb"; - name = "polkit-kde-agent-1-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz"; + sha256 = "1lzw4zq2ysnva5g1v85k9k6yck30wfgcy0sn1ncxy183vm36b2ag"; + name = "polkit-kde-agent-1-5.14.5.tar.xz"; }; }; powerdevil = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/powerdevil-5.14.4.tar.xz"; - sha256 = "04qyz7jncnyj65rpdriaylarsnimqhk1va98im50bsdyiya5hj33"; - name = "powerdevil-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz"; + sha256 = "0rdrj6k7bb1cisz1g8akxxn68c8rj0zddim1afvcq1iqr727wqj5"; + name = "powerdevil-5.14.5.tar.xz"; }; }; sddm-kcm = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/sddm-kcm-5.14.4.tar.xz"; - sha256 = "03xisf0z88385zfixmah09ry53cayc4kqjn92zlqnfrc9pqnmgcz"; - name = "sddm-kcm-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz"; + sha256 = "0aix2grc2h2w8qxcbdwxhvq09ispblnisl017bvb19apkvs0w8m1"; + name = "sddm-kcm-5.14.5.tar.xz"; }; }; systemsettings = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/systemsettings-5.14.4.tar.xz"; - sha256 = "0glyk9798kaps0fdmclchb6phpr0p315n7w9c9p8ww4b8kj4jyly"; - name = "systemsettings-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz"; + sha256 = "1q1ih74vkdhss64ayc3qmbrw4hhvfl3axlkhh63rky09qn83x9zw"; + name = "systemsettings-5.14.5.tar.xz"; }; }; user-manager = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/user-manager-5.14.4.tar.xz"; - sha256 = "110w6n8k1zjbillcmbqy3vc43lznimns60pwh84js8mgqrjx7psb"; - name = "user-manager-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz"; + sha256 = "0aw2s029547rzx3xg9nib5w30d25978fpv7xyshxmp3z8rmzgcjv"; + name = "user-manager-5.14.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.14.4"; + version = "5.14.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/xdg-desktop-portal-kde-5.14.4.tar.xz"; - sha256 = "1p2h7rqgvwzlfk9jjhsifjcdl81d72d1d7zmgxy9alc4cqnlmbih"; - name = "xdg-desktop-portal-kde-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.14.5/xdg-desktop-portal-kde-5.14.5.tar.xz"; + sha256 = "0h6hdk9fkf98jfjaza773k37369ayvwmwrgxn6al2pma6n07vddq"; + name = "xdg-desktop-portal-kde-5.14.5.tar.xz"; }; }; } From 8e2a1ce484619a164cd06f98f3291ef542140022 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 21 Jan 2019 03:39:05 -0600 Subject: [PATCH 064/230] kde-frameworks: 5.53 -> 5.54 https://www.kde.org/announcements/kde-frameworks-5.54.0.php --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 632 +++++++++--------- 2 files changed, 317 insertions(+), 317 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9822bf4f725..ce41ffa4929 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.53/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 4b5cc3a3752..5421a1edd31 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/attica-5.53.0.tar.xz"; - sha256 = "0qn2x5551zv8547v20wcjhf123c4432651rdxz25p398wsm9ixlg"; - name = "attica-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/attica-5.54.0.tar.xz"; + sha256 = "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln"; + name = "attica-5.54.0.tar.xz"; }; }; baloo = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/baloo-5.53.0.tar.xz"; - sha256 = "1jvxx7ggraaciw5i6vwda2jh41gqvjy19bjkcqwrmg59ggwzc1g8"; - name = "baloo-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/baloo-5.54.0.tar.xz"; + sha256 = "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c"; + name = "baloo-5.54.0.tar.xz"; }; }; bluez-qt = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/bluez-qt-5.53.0.tar.xz"; - sha256 = "11i3xjaxqvczh8hky71jq20g2k4ipl0sxnaw8f1xix6h0v79m810"; - name = "bluez-qt-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz"; + sha256 = "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v"; + name = "bluez-qt-5.54.0.tar.xz"; }; }; breeze-icons = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz"; - sha256 = "1612kr0mrns3w5pydvfvcjdpfcvyw35bnzm44y286n99213w3cdf"; - name = "breeze-icons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz"; + sha256 = "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy"; + name = "breeze-icons-5.54.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/extra-cmake-modules-5.53.0.tar.xz"; - sha256 = "07dllz7r00jm7n37wnz6zvjin304affaj69d8ji4v2wxhkxpg89d"; - name = "extra-cmake-modules-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz"; + sha256 = "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi"; + name = "extra-cmake-modules-5.54.0.tar.xz"; }; }; frameworkintegration = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/frameworkintegration-5.53.0.tar.xz"; - sha256 = "0a5szgknj96mphiczddl0l4c79ajszhyy3f19rqacj1z1kwrx9pj"; - name = "frameworkintegration-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz"; + sha256 = "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d"; + name = "frameworkintegration-5.54.0.tar.xz"; }; }; kactivities = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kactivities-5.53.0.tar.xz"; - sha256 = "1pjfh8ii4y9kpjr12z3zs9hmc8n5r0phkp40dclsrjsdpm9n8bf6"; - name = "kactivities-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kactivities-5.54.0.tar.xz"; + sha256 = "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil"; + name = "kactivities-5.54.0.tar.xz"; }; }; kactivities-stats = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kactivities-stats-5.53.0.tar.xz"; - sha256 = "0bd6km50h0jlpi8z1dhh9jvx2wqgh3sa473n7bsyd2dgzyibs52n"; - name = "kactivities-stats-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz"; + sha256 = "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d"; + name = "kactivities-stats-5.54.0.tar.xz"; }; }; kapidox = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kapidox-5.53.0.tar.xz"; - sha256 = "1snsql5scq6licrlqf9w77085s4992f1ij6w7rwj8d5x4cyxc9ca"; - name = "kapidox-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kapidox-5.54.0.tar.xz"; + sha256 = "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c"; + name = "kapidox-5.54.0.tar.xz"; }; }; karchive = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/karchive-5.53.0.tar.xz"; - sha256 = "0jbr19azrkxywf9dwrfdw5qi47g7h5m92m4f93skccr11a1m0hvr"; - name = "karchive-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/karchive-5.54.0.tar.xz"; + sha256 = "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g"; + name = "karchive-5.54.0.tar.xz"; }; }; kauth = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kauth-5.53.0.tar.xz"; - sha256 = "0c41azn8c6wr5rc7f0v1bxvka9i4z3c346814mlim3i62842fz3b"; - name = "kauth-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kauth-5.54.0.tar.xz"; + sha256 = "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h"; + name = "kauth-5.54.0.tar.xz"; }; }; kbookmarks = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kbookmarks-5.53.0.tar.xz"; - sha256 = "1mrzbwsirma1bzazamilh3r5a04m6x5902gjs1sd7bc0ijs85dr9"; - name = "kbookmarks-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz"; + sha256 = "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw"; + name = "kbookmarks-5.54.0.tar.xz"; }; }; kcmutils = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcmutils-5.53.0.tar.xz"; - sha256 = "0xsg50pywawzzw2fb0bhhmjp2z3w4572knfq8s4jki3iidixp3kv"; - name = "kcmutils-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz"; + sha256 = "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh"; + name = "kcmutils-5.54.0.tar.xz"; }; }; kcodecs = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcodecs-5.53.0.tar.xz"; - sha256 = "0wmilqkcw1dvvrw56r8virp7zscy0g04ry8j7h812nfzhfz9z4vs"; - name = "kcodecs-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz"; + sha256 = "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc"; + name = "kcodecs-5.54.0.tar.xz"; }; }; kcompletion = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcompletion-5.53.0.tar.xz"; - sha256 = "00df0pa28glf4w5zyjmnzasbip1q2cyyyply1f6k0xpfg0qwgxf9"; - name = "kcompletion-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz"; + sha256 = "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460"; + name = "kcompletion-5.54.0.tar.xz"; }; }; kconfig = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kconfig-5.53.0.tar.xz"; - sha256 = "0xyxycpbi680sfrfzdzhwi95dqd4xsc42zxn5clzvfbgapbw2db7"; - name = "kconfig-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kconfig-5.54.0.tar.xz"; + sha256 = "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7"; + name = "kconfig-5.54.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kconfigwidgets-5.53.0.tar.xz"; - sha256 = "0bpylj1faki7f55cf82ljmgll17vz1irqna1i9rzkbb28kvqf2kv"; - name = "kconfigwidgets-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz"; + sha256 = "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31"; + name = "kconfigwidgets-5.54.0.tar.xz"; }; }; kcoreaddons = { - version = "5.53.1"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcoreaddons-5.53.1.tar.xz"; - sha256 = "18rhih779sxrlvg8sxyw31v3h58arvk2vsmvr0bmpnrnnfwv3vak"; - name = "kcoreaddons-5.53.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz"; + sha256 = "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79"; + name = "kcoreaddons-5.54.0.tar.xz"; }; }; kcrash = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcrash-5.53.0.tar.xz"; - sha256 = "1nnfn71kl97d5ywg2xjacr48mh9khrgszm9cifdn2jdk6vxssmlb"; - name = "kcrash-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kcrash-5.54.0.tar.xz"; + sha256 = "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7"; + name = "kcrash-5.54.0.tar.xz"; }; }; kdbusaddons = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdbusaddons-5.53.0.tar.xz"; - sha256 = "05zf41m3j4ckjk68dqv2rw8abg22x6m6bwiwp8rm6ac1p33hqayh"; - name = "kdbusaddons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz"; + sha256 = "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf"; + name = "kdbusaddons-5.54.0.tar.xz"; }; }; kdeclarative = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdeclarative-5.53.0.tar.xz"; - sha256 = "0c7sxz733c9gfarjbrphrvn5v9bkx1i7vhn97xp7b3w22892ab7w"; - name = "kdeclarative-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz"; + sha256 = "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0"; + name = "kdeclarative-5.54.0.tar.xz"; }; }; kded = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kded-5.53.0.tar.xz"; - sha256 = "18yh27ddp4aldpmkflj9q6anrpnzawhn7nrykvayxxbgmdg4gn48"; - name = "kded-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kded-5.54.0.tar.xz"; + sha256 = "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn"; + name = "kded-5.54.0.tar.xz"; }; }; kdelibs4support = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kdelibs4support-5.53.0.tar.xz"; - sha256 = "1ai1k1m08zq04rxi5px1agmqzmv59lic7qqiqg4iwnm5i8q2z2i0"; - name = "kdelibs4support-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz"; + sha256 = "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm"; + name = "kdelibs4support-5.54.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdesignerplugin-5.53.0.tar.xz"; - sha256 = "1m0ysmpysjpmnmmmyp5xkfzygi1w0dnn7j707c6nj31y2s7078q6"; - name = "kdesignerplugin-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz"; + sha256 = "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga"; + name = "kdesignerplugin-5.54.0.tar.xz"; }; }; kdesu = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdesu-5.53.0.tar.xz"; - sha256 = "18kd19y95gllyarjlm0768s3b9q67ia6dajdw89rrk1qgvbw42xy"; - name = "kdesu-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdesu-5.54.0.tar.xz"; + sha256 = "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar"; + name = "kdesu-5.54.0.tar.xz"; }; }; kdewebkit = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdewebkit-5.53.0.tar.xz"; - sha256 = "1x5b85lr6ck2vklj641ra6sx1fvz2daiy8vsgpziii0752a0ayf2"; - name = "kdewebkit-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz"; + sha256 = "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf"; + name = "kdewebkit-5.54.0.tar.xz"; }; }; kdnssd = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdnssd-5.53.0.tar.xz"; - sha256 = "0hghpamkxwjvfh87y2qcy20bmxvglzwrzmfg26hycmxgj0l3frhb"; - name = "kdnssd-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz"; + sha256 = "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7"; + name = "kdnssd-5.54.0.tar.xz"; }; }; kdoctools = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdoctools-5.53.0.tar.xz"; - sha256 = "0kjijwc66rg737z6z8c275wfb2gn7xgslgmrys5dxaqqzrinbn1j"; - name = "kdoctools-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz"; + sha256 = "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6"; + name = "kdoctools-5.54.0.tar.xz"; }; }; kemoticons = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kemoticons-5.53.0.tar.xz"; - sha256 = "0x9jrc5pswmcj36qs3283c5bz63sbgr87m7dn9ykas7a50xgyv0w"; - name = "kemoticons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz"; + sha256 = "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v"; + name = "kemoticons-5.54.0.tar.xz"; }; }; kfilemetadata = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz"; - sha256 = "18wgzhg146iscg7nm7xabmzsw73x0by2imkh6wgky87nwry7020s"; - name = "kfilemetadata-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz"; + sha256 = "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab"; + name = "kfilemetadata-5.54.0.tar.xz"; }; }; kglobalaccel = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kglobalaccel-5.53.0.tar.xz"; - sha256 = "1h60kl309pz4i6jr6a444d14i2dzqhjapga837my2mylsdjj3wqi"; - name = "kglobalaccel-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz"; + sha256 = "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1"; + name = "kglobalaccel-5.54.0.tar.xz"; }; }; kguiaddons = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kguiaddons-5.53.0.tar.xz"; - sha256 = "1kj1jvq7lqlnr00fmlfrj7vkvlwav7b5r4bpifysx1l4285y5y76"; - name = "kguiaddons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz"; + sha256 = "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935"; + name = "kguiaddons-5.54.0.tar.xz"; }; }; kholidays = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kholidays-5.53.0.tar.xz"; - sha256 = "1zn581ibv4wg5c4q97l40wdpj18p5kwxk4zxl3cl4l445ivv04p5"; - name = "kholidays-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kholidays-5.54.0.tar.xz"; + sha256 = "1xp6mpnhlqkfl3pdaj6nq9sqy30z5wm6gms0ycy33n4ly2s8wb1y"; + name = "kholidays-5.54.0.tar.xz"; }; }; khtml = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/khtml-5.53.0.tar.xz"; - sha256 = "07cmpqk92z4b631q6ngg7sdw4p56r11mdqf2fvbcwmqksx6b11fy"; - name = "khtml-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz"; + sha256 = "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da"; + name = "khtml-5.54.0.tar.xz"; }; }; ki18n = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/ki18n-5.53.0.tar.xz"; - sha256 = "052c7rvqqb2hx9wn91sdp4wcz5vdym5iszb1vnpr9wdc3psqq41x"; - name = "ki18n-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/ki18n-5.54.0.tar.xz"; + sha256 = "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3"; + name = "ki18n-5.54.0.tar.xz"; }; }; kiconthemes = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kiconthemes-5.53.0.tar.xz"; - sha256 = "1h54mqda05x4p1kplhxnqa488pvqn354qnk1qg2l851lh69ail9q"; - name = "kiconthemes-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz"; + sha256 = "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g"; + name = "kiconthemes-5.54.0.tar.xz"; }; }; kidletime = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kidletime-5.53.0.tar.xz"; - sha256 = "04jbig9mf45mzajwgi66vz3b2zqg4p1gca1jkcl4yk6a4csg43ri"; - name = "kidletime-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kidletime-5.54.0.tar.xz"; + sha256 = "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm"; + name = "kidletime-5.54.0.tar.xz"; }; }; kimageformats = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kimageformats-5.53.0.tar.xz"; - sha256 = "0b59sa5x58mxzkv9h9xxfzb89k27cpyqzfgf4kl7zbxklxxszafj"; - name = "kimageformats-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz"; + sha256 = "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15"; + name = "kimageformats-5.54.0.tar.xz"; }; }; kinit = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kinit-5.53.0.tar.xz"; - sha256 = "14dd165al0gn1y3jhlk3jgz3px8rcccn3hp5isywa2xxzl7v5raw"; - name = "kinit-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kinit-5.54.0.tar.xz"; + sha256 = "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9"; + name = "kinit-5.54.0.tar.xz"; }; }; kio = { - version = "5.53.0"; + version = "5.54.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kio-5.53.0.tar.xz"; - sha256 = "1hr4875v1ph8jbsqbyrhk5vxa908kv7xic7ymk9rmaqrkc0dy83k"; - name = "kio-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kio-5.54.1.tar.xz"; + sha256 = "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp"; + name = "kio-5.54.1.tar.xz"; }; }; kirigami2 = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kirigami2-5.53.0.tar.xz"; - sha256 = "0avr7slzww3fpdyczi0y3djvrccs3jq2jyq82r02xfw8mwb93zii"; - name = "kirigami2-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz"; + sha256 = "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2"; + name = "kirigami2-5.54.0.tar.xz"; }; }; kitemmodels = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kitemmodels-5.53.0.tar.xz"; - sha256 = "1gkw57fgm6dcy9jssaq9d1mkgd1g6jxk2aqpf4lq1nvqkr7jqzbl"; - name = "kitemmodels-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz"; + sha256 = "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760"; + name = "kitemmodels-5.54.0.tar.xz"; }; }; kitemviews = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kitemviews-5.53.0.tar.xz"; - sha256 = "0r60mp90k7psa9maz3dhhq3npbl95cckvmk51fpljcb8c3rpjymq"; - name = "kitemviews-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz"; + sha256 = "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk"; + name = "kitemviews-5.54.0.tar.xz"; }; }; kjobwidgets = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kjobwidgets-5.53.0.tar.xz"; - sha256 = "161wq1s1a1cb5a47wswg6g6qrmczgzwikp1cjsgxfykpgrxkp620"; - name = "kjobwidgets-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz"; + sha256 = "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq"; + name = "kjobwidgets-5.54.0.tar.xz"; }; }; kjs = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kjs-5.53.0.tar.xz"; - sha256 = "1jic7xyfmd829i82kbjin2xf9f3cir2s9v04r7ri7bq6gi2iw4c9"; - name = "kjs-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz"; + sha256 = "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy"; + name = "kjs-5.54.0.tar.xz"; }; }; kjsembed = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kjsembed-5.53.0.tar.xz"; - sha256 = "0j3jzn7qwh9sw9gxk1f435vijkrgnzpsqx3a4yx7w3n93h96h36r"; - name = "kjsembed-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz"; + sha256 = "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8"; + name = "kjsembed-5.54.0.tar.xz"; }; }; kmediaplayer = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kmediaplayer-5.53.0.tar.xz"; - sha256 = "1r6cl6paap7hmpqr05mj8qxcb2sa16kdc0zqj8g6gqb32xj6wk0k"; - name = "kmediaplayer-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz"; + sha256 = "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf"; + name = "kmediaplayer-5.54.0.tar.xz"; }; }; knewstuff = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/knewstuff-5.53.0.tar.xz"; - sha256 = "0d5yszf6fj8qjmr50jfa9f34xcn9k8n4bj4c3h635ccwb7l3i6q3"; - name = "knewstuff-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz"; + sha256 = "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3"; + name = "knewstuff-5.54.0.tar.xz"; }; }; knotifications = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/knotifications-5.53.0.tar.xz"; - sha256 = "0fbjg48ck6mr98gl3075vf9mn8fwdrsz0jm9hbnzr2vn9yrg57nz"; - name = "knotifications-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/knotifications-5.54.0.tar.xz"; + sha256 = "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn"; + name = "knotifications-5.54.0.tar.xz"; }; }; knotifyconfig = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/knotifyconfig-5.53.0.tar.xz"; - sha256 = "1f3hq2l8fkff4dnkf6klj60jv946yfaw84i50q192blwqfkij896"; - name = "knotifyconfig-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz"; + sha256 = "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if"; + name = "knotifyconfig-5.54.0.tar.xz"; }; }; kpackage = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kpackage-5.53.0.tar.xz"; - sha256 = "1gllbi7y4svlkwhvp0sh3bdhiah2f55spg7wh149sqwmnmvj09ra"; - name = "kpackage-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kpackage-5.54.0.tar.xz"; + sha256 = "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb"; + name = "kpackage-5.54.0.tar.xz"; }; }; kparts = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kparts-5.53.0.tar.xz"; - sha256 = "0cfzbf706dn4kjz8mz53b1a0dzk0f540n0j144x4701c4gfajnim"; - name = "kparts-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kparts-5.54.0.tar.xz"; + sha256 = "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6"; + name = "kparts-5.54.0.tar.xz"; }; }; kpeople = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kpeople-5.53.0.tar.xz"; - sha256 = "1bsnj5r47azl889izxdlwcbfrfmg921cpapicn7klynmsw58lpdg"; - name = "kpeople-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kpeople-5.54.0.tar.xz"; + sha256 = "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx"; + name = "kpeople-5.54.0.tar.xz"; }; }; kplotting = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kplotting-5.53.0.tar.xz"; - sha256 = "0cnnzyybzsrdrnhhcc47i6jakhrixdxakfv2ib0fpsiif3fn3jpx"; - name = "kplotting-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kplotting-5.54.0.tar.xz"; + sha256 = "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9"; + name = "kplotting-5.54.0.tar.xz"; }; }; kpty = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kpty-5.53.0.tar.xz"; - sha256 = "01qy5pvd5j014zh455sh0qb8x0g1yc60bbdqh34nk84s8mx3mz9z"; - name = "kpty-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kpty-5.54.0.tar.xz"; + sha256 = "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3"; + name = "kpty-5.54.0.tar.xz"; }; }; kross = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kross-5.53.0.tar.xz"; - sha256 = "1q69pppmnxmjfmi73ks6mrkib76nhhffn0c3j93qq7cq3ingjzjy"; - name = "kross-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz"; + sha256 = "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd"; + name = "kross-5.54.0.tar.xz"; }; }; krunner = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/krunner-5.53.0.tar.xz"; - sha256 = "09n824q8k1ihfgz6yzb5xv99p241733574yhhv1y47cyrp7d904l"; - name = "krunner-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/krunner-5.54.0.tar.xz"; + sha256 = "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v"; + name = "krunner-5.54.0.tar.xz"; }; }; kservice = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kservice-5.53.0.tar.xz"; - sha256 = "06b35zynmlhidgzxp7mqv20fcw6wvdsszfam1phv7wji1xhhpnk2"; - name = "kservice-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kservice-5.54.0.tar.xz"; + sha256 = "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx"; + name = "kservice-5.54.0.tar.xz"; }; }; ktexteditor = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/ktexteditor-5.53.0.tar.xz"; - sha256 = "1hcn4dk6gw96aknh6dn9yi1fwq7s90kjmcvn3wgf4ig1408q6b7g"; - name = "ktexteditor-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz"; + sha256 = "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy"; + name = "ktexteditor-5.54.0.tar.xz"; }; }; ktextwidgets = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/ktextwidgets-5.53.0.tar.xz"; - sha256 = "025z1x7mp7wdm62h6igbsvb99l09jsdzna4m30h586h7rhn8kvdc"; - name = "ktextwidgets-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz"; + sha256 = "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5"; + name = "ktextwidgets-5.54.0.tar.xz"; }; }; kunitconversion = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kunitconversion-5.53.0.tar.xz"; - sha256 = "1yr6dfcqabkv2r7p9f814hd1x8c1bfy2k2f83zj4qlahzb91mw6v"; - name = "kunitconversion-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz"; + sha256 = "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h"; + name = "kunitconversion-5.54.0.tar.xz"; }; }; kwallet = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwallet-5.53.0.tar.xz"; - sha256 = "135vc52zx0ikb684z6ds2hlr39vj2z8g2rp9f51py52pf7fxkwc0"; - name = "kwallet-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kwallet-5.54.0.tar.xz"; + sha256 = "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2"; + name = "kwallet-5.54.0.tar.xz"; }; }; kwayland = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwayland-5.53.0.tar.xz"; - sha256 = "0k6j8w3ccx9kkqnp757z2g5y4jcl2y2ppvx8vvl7z97jjn66563h"; - name = "kwayland-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kwayland-5.54.0.tar.xz"; + sha256 = "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf"; + name = "kwayland-5.54.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwidgetsaddons-5.53.0.tar.xz"; - sha256 = "1k9y3gcpzgdzd4ps8m4gx3wz166k0jqzccn8z8p2jr2nfjdwp4mc"; - name = "kwidgetsaddons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz"; + sha256 = "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh"; + name = "kwidgetsaddons-5.54.0.tar.xz"; }; }; kwindowsystem = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwindowsystem-5.53.0.tar.xz"; - sha256 = "1z89b3my3wsncbq16bqsncbf9grji77sb0j17lj7w5hm36d01clz"; - name = "kwindowsystem-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz"; + sha256 = "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb"; + name = "kwindowsystem-5.54.0.tar.xz"; }; }; kxmlgui = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kxmlgui-5.53.0.tar.xz"; - sha256 = "1acppl4wzqrpa8iys8z2qqxrw4xy61q02vybn0ysspa0yrdxga9f"; - name = "kxmlgui-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz"; + sha256 = "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7"; + name = "kxmlgui-5.54.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kxmlrpcclient-5.53.0.tar.xz"; - sha256 = "07ns1fj5vq0fzqhrrmbm7cjnnzkl1jlgcf1lv3kfik1y13fd9zkd"; - name = "kxmlrpcclient-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz"; + sha256 = "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6"; + name = "kxmlrpcclient-5.54.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/modemmanager-qt-5.53.0.tar.xz"; - sha256 = "1lgvj086k21sm6b0pf9k51zv4fy5i4wlnsjwv2zfvapdrndl8kdp"; - name = "modemmanager-qt-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz"; + sha256 = "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350"; + name = "modemmanager-qt-5.54.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/networkmanager-qt-5.53.0.tar.xz"; - sha256 = "11vqmx11lgyagbq9zvaw4s9k7wyyyigpd8d0i3w49h34nyv0p5yi"; - name = "networkmanager-qt-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz"; + sha256 = "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y"; + name = "networkmanager-qt-5.54.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/oxygen-icons5-5.53.0.tar.xz"; - sha256 = "13pcvzskng2mc8cwwhmq6p428nc9qzllxykx95z2s2k3b8nh726m"; - name = "oxygen-icons5-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz"; + sha256 = "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46"; + name = "oxygen-icons5-5.54.0.tar.xz"; }; }; plasma-framework = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/plasma-framework-5.53.0.tar.xz"; - sha256 = "0swyn04w61dvdkmb2fahb6k93vlggh7xv4k2yygshqrkmwk6ilym"; - name = "plasma-framework-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz"; + sha256 = "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj"; + name = "plasma-framework-5.54.0.tar.xz"; }; }; prison = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/prison-5.53.0.tar.xz"; - sha256 = "0ydm36jkwc2x53kf5n0xswh72g2cixd5444xfrhcwiyq905z3db1"; - name = "prison-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/prison-5.54.0.tar.xz"; + sha256 = "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb"; + name = "prison-5.54.0.tar.xz"; }; }; purpose = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/purpose-5.53.0.tar.xz"; - sha256 = "1y6v51p9j9gm9pad38h6dqxav4m7ryxp4h35qjz46wisacgvpfkf"; - name = "purpose-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/purpose-5.54.0.tar.xz"; + sha256 = "07rz8bqwvlz5g914q4vxdcdmrja5hxa29iazxz8nr171xnpg9x0w"; + name = "purpose-5.54.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/qqc2-desktop-style-5.53.0.tar.xz"; - sha256 = "1f17f3mqwzn5s0a08xh68dmvzkvn2g8ah7810hd25l2hvmkfvm04"; - name = "qqc2-desktop-style-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz"; + sha256 = "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8"; + name = "qqc2-desktop-style-5.54.0.tar.xz"; }; }; solid = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/solid-5.53.0.tar.xz"; - sha256 = "1x9qc8vm16vlqws9jb2pynw705mx6xvbb617lkdwdb60fzlrjkln"; - name = "solid-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/solid-5.54.0.tar.xz"; + sha256 = "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9"; + name = "solid-5.54.0.tar.xz"; }; }; sonnet = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/sonnet-5.53.0.tar.xz"; - sha256 = "0jk8kcsdzjg7x37cw95n3wdnjg403x3plzw0zwa3r3xkg8vlqv18"; - name = "sonnet-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/sonnet-5.54.0.tar.xz"; + sha256 = "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz"; + name = "sonnet-5.54.0.tar.xz"; }; }; syndication = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/syndication-5.53.0.tar.xz"; - sha256 = "0znj8rgdh14ci3nx1h7s9v8kl208z8zlcq3c99bh216rznxvzr6b"; - name = "syndication-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/syndication-5.54.0.tar.xz"; + sha256 = "0zj8nv0hj5sf79v3clg2bqhs3m8hi1pzjar1cq6hkxprymw0hzx8"; + name = "syndication-5.54.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/syntax-highlighting-5.53.0.tar.xz"; - sha256 = "1ar50an84pcb090zh50ni2d3ck6dxvbij9d6qa091hd66rwm2cda"; - name = "syntax-highlighting-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz"; + sha256 = "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl"; + name = "syntax-highlighting-5.54.0.tar.xz"; }; }; threadweaver = { - version = "5.53.0"; + version = "5.54.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/threadweaver-5.53.0.tar.xz"; - sha256 = "0wlpbnan5g2nhs0fc9l3p0c1gcs9ak7m83hfcibg7vsq9kqvcs6p"; - name = "threadweaver-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz"; + sha256 = "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp"; + name = "threadweaver-5.54.0.tar.xz"; }; }; } From cc5b55f9442272df32196945ec2c1eb9d24719f7 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 19 Jan 2019 14:47:18 +0000 Subject: [PATCH 065/230] rust: 1.31.0 -> 1.32.0 --- pkgs/development/compilers/rust/bootstrap.nix | 16 ++++++++-------- pkgs/development/compilers/rust/cargo.nix | 4 ++-- pkgs/development/compilers/rust/default.nix | 11 +++-------- .../rust/patches/disable-test-inherit-env.patch | 10 ---------- pkgs/development/compilers/rust/rustc.nix | 8 ++------ 5 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 9528d798618..ddef4adf0a0 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.30.1"; + version = "1.31.1"; - # fetch hashes by running `print-hashes.sh 1.30.0` + # fetch hashes by running `print-hashes.sh 1.31.1` hashes = { - i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf"; - x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e"; - armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b"; - aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874"; - i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083"; - x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94"; + i686-unknown-linux-gnu = "1e77e5e8c745320faad9ce6f319a77b4a2e75d972eb68a195acd081ad910ab6d"; + x86_64-unknown-linux-gnu = "a64685535d0c457f49a8712a096a5c21564cd66fd2f7da739487f028192ebe3c"; + armv7-unknown-linux-gnueabihf = "11c717b781a7af5bdc829894139f8f45d4c12a061f7f9e39481f21426a04eb21"; + aarch64-unknown-linux-gnu = "29a7c6eb536fefd0ca459e48dfaea006aa8bff8a87aa82a9b7d483487033632a"; + i686-apple-darwin = "46566dc25fcbd8badc9950b8c9f9b0faeca065b5a09cd96258e4f4b10d686aed"; + x86_64-apple-darwin = "8398b1b303bdf0e7605d08b87070a514a4f588797c6fb3593718cb9cec233ad6"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 02ea7ebbbfb..a7e2a40597b 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { inherit version src patches; # the rust source tarball already has all the dependencies vendored, no need to fetch them again - cargoVendorDir = "src/vendor"; - preBuild = "cd src; pushd tools/cargo"; + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/cargo"; postBuild = "popd"; passthru.rustc = rustc; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 1f24157eea4..9640cd9b577 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.31.0"; - cargoVersion = "1.31.0"; + version = "1.32.0"; + cargoVersion = "1.32.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs"; + sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; }; in rec { rustc = callPackage ./rustc.nix { @@ -22,11 +22,6 @@ in rec { # Re-evaluate if this we need to disable this one #./patches/stdsimd-disable-doctest.patch - - # Fails on hydra - not locally; the exact reason is unknown. - # Comments in the test suggest that some non-reproducible environment - # variables such $RANDOM can make it fail. - ./patches/disable-test-inherit-env.patch ]; withBundledLLVM = false; diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch deleted file mode 100644 index fcb75ed098e..00000000000 --- a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100 -+++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100 -@@ -1745,6 +1745,7 @@ - } - - #[test] -+ #[ignore] - fn test_inherit_env() { - use env; - diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 3ec08a82d01..ed61554d448 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, targetPackages, removeReferencesTo , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version , withBundledLLVM ? false @@ -20,8 +20,6 @@ let llvmShared = llvm.override { enableSharedLibraries = true; }; - prefixedJemalloc = jemalloc.override { stripPrefix = false; }; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); in @@ -62,7 +60,6 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" "--enable-vendor" - "--jemalloc-root=${prefixedJemalloc}/lib" "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] ++ optional (targets != []) "--target=${target}"; @@ -85,7 +82,6 @@ stdenv.mkDerivation { patchShebangs src/etc ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} - rm -rf src/jemalloc # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -97,7 +93,7 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/39522 echo removing gdb-version-sensitive tests... find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete - rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs} + rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums.rs,generic-enum-with-different-disr-sizes.rs} # Useful debugging parameter # export VERBOSE=1 From c340704bd3a7784e2d5dd806ee528a243dea9172 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Tue, 22 Jan 2019 08:06:36 +0000 Subject: [PATCH 066/230] llvm7: backport patches, fix building rust crates with lto See: https://github.com/rust-lang/rust/issues/57762 --- pkgs/development/compilers/llvm/7/llvm.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 0eb946a0a83..533333d4972 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -53,6 +53,15 @@ in stdenv.mkDerivation (rec { url = "https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/raw/5a7d283d4e00bc4822c7b0226e593c344c8f6050/debian/patches/pr39427-misscompile.diff"; sha256 = "03mpydsaw0xvcp7kb4sgjzcl5v22620r5z78kv3mz5wp7sn76fg5"; }) + # backport, fix building rust crates with lto + (fetchpatch { + url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch"; + sha256 = "0p81gkhc1xhcx0hmnkwyhrn8x8l8fd24xgaj1whni29yga466dwc"; + }) + (fetchpatch { + url = "https://github.com/llvm-mirror/llvm/commit/cc1f2a595ead516812a6c50398f0f3480ebe031f.patch"; + sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8"; + }) ]; postPatch = optionalString stdenv.isDarwin '' From 3db7afdf4009f2ed2a834c96644da0decdfe2334 Mon Sep 17 00:00:00 2001 From: Niklas Thorne Date: Tue, 22 Jan 2019 09:09:58 +0100 Subject: [PATCH 067/230] uftrace: 0.9.1 -> 0.9.2 Udated to latest released version. --- pkgs/development/tools/uftrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 7d5569b4376..cb10a252d12 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "uftrace-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "1jb4dp6crvfzxzmi5iflc7p13b7p2v1djyj6smbf9ns4wr515y6b"; + sha256 = "0s7yfnf7kcqlfw3zzv4y8akkd12f8di69c4sranympnl7z5srfam"; }; postUnpack = '' From 7298764b9fa833c0d5c4ed0a8819582e55aa6e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 11:24:35 +0100 Subject: [PATCH 068/230] python.pkgs.pygame-git: remove It is broken and no longer used. --- .../development/python-modules/pygame/git.nix | 47 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 49 deletions(-) delete mode 100644 pkgs/development/python-modules/pygame/git.nix diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix deleted file mode 100644 index 1d8ba697f38..00000000000 --- a/pkgs/development/python-modules/pygame/git.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, fetchFromBitbucket, buildPythonPackage, python, smpeg, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi -}: - -buildPythonPackage rec { - pname = "pygame"; - version = "2016-05-17"; - name = pname + "-" + version; - - src = fetchFromBitbucket { - owner = "pygame"; - repo = "pygame"; - rev = "575c7a74d85a37db7c645421c02cf0b6b78a889f"; - sha256 = "1i5xqmw93kfidcji2wacgkm5y4mcnbksy8iimih0729k19rbhznc"; - }; - - buildInputs = [ - SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg - smpeg portmidi libX11 - ]; - - # Tests fail because of no audio device and display. - doCheck = false; - - preConfigure = '' - sed \ - -e "s/^origincdirs = .*/origincdirs = []/" \ - -e "s/^origlibdirs = .*/origlibdirs = []/" \ - -i config_unix.py - ${lib.concatMapStrings (dep: '' - sed \ - -e "/^origincdirs =/aorigincdirs += ['${lib.getDev dep}/include']" \ - -e "/^origlibdirs =/aoriglibdirs += ['${lib.getLib dep}/lib']" \ - -i config_unix.py - '') buildInputs - } - LOCALBASE=/ ${python.interpreter} config.py - ''; - - meta = with stdenv.lib; { - description = "Python library for games"; - homepage = http://www.pygame.org/; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f2cd76f5bf..22b927513c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -584,8 +584,6 @@ in { pygame = callPackage ../development/python-modules/pygame { }; - pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; pygdbmi = callPackage ../development/python-modules/pygdbmi { }; From d53cee4b0be27e1b7fd369bde6b2156ca4f141c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 11:59:03 +0100 Subject: [PATCH 069/230] python.pkgs.pymongo: improve expression --- pkgs/development/python-modules/pymongo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 392a0ec580f..792b8b1bd5b 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pymongo"; version = "3.7.2"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "8c74e2a9b594f7962c62cef7680a4cb92a96b4e6e3c2f970790da67cc0213a7e"; }; + # Tests call a running mongodb instance doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; - description = "Python driver for MongoDB "; + description = "Python driver for MongoDB"; }; } From 5bee7acfe4141f370499ff592f0ab958df55cab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 11:33:55 +0100 Subject: [PATCH 070/230] dd-agent: override python packages inside expression --- pkgs/tools/networking/dd-agent/5.nix | 83 ++++++++++++++++------------ 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index d3c4a2af765..02bdb3e2a46 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -1,30 +1,41 @@ -{ stdenv, fetchFromGitHub, pythonPackages +{ stdenv, fetchFromGitHub, python , unzip, makeWrapper }: let - inherit (pythonPackages) python; - docker_1_10 = pythonPackages.buildPythonPackage rec { - name = "docker-${version}"; - version = "1.10.6"; + python' = python.override { + packageOverrides = self: super: { + docker = self.buildPythonPackage rec { + name = "docker-${version}"; + version = "1.10.6"; - src = fetchFromGitHub { - owner = "docker"; - repo = "docker-py"; - rev = version; - sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m"; + src = fetchFromGitHub { + owner = "docker"; + repo = "docker-py"; + rev = version; + sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m"; + }; + + propagatedBuildInputs = with self; [ + six + requests + websocket_client + ipaddress + backports_ssl_match_hostname + docker_pycreds + uptime + ]; + + # due to flake8 + doCheck = false; + }; + + pymongo = super.pymongo.overridePythonAttrs (oldAttrs: rec { + version = "2.9.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70"; + }; + }); }; - - propagatedBuildInputs = with pythonPackages; [ - six - requests - websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds - uptime - ]; - - # due to flake8 - doCheck = false; }; in stdenv.mkDerivation rec { @@ -41,21 +52,21 @@ in stdenv.mkDerivation rec { patches = [ ./40103-iostat-fix.patch ]; buildInputs = [ - python unzip makeWrapper - pythonPackages.requests - pythonPackages.psycopg2 - pythonPackages.psutil - pythonPackages.ntplib - pythonPackages.simplejson - pythonPackages.pyyaml - pythonPackages.pymongo_2_9_1 - pythonPackages.python-etcd - pythonPackages.consul - docker_1_10 - ]; - propagatedBuildInputs = with pythonPackages; [ python tornado ]; + ] ++ (with python'.pkgs; [ + requests + psycopg2 + psutil + ntplib + simplejson + pyyaml + pymongo + python-etcd + consul + docker + ]); + propagatedBuildInputs = with python'.pkgs; [ python tornado ]; buildCommand = '' mkdir -p $out/bin From bf3f26a0ebce19a34d942252a5c4883e8d20bdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 12:05:10 +0100 Subject: [PATCH 071/230] python.pkgs.pymongo_2_9_1: remove It is no longer used. --- .../python-modules/pymongo/2_9_1.nix | 24 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/python-modules/pymongo/2_9_1.nix diff --git a/pkgs/development/python-modules/pymongo/2_9_1.nix b/pkgs/development/python-modules/pymongo/2_9_1.nix deleted file mode 100644 index 8e0b0858754..00000000000 --- a/pkgs/development/python-modules/pymongo/2_9_1.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "pymongo"; - version = "2.9.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70"; - }; - - # Tests call a running mongodb instance - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/mongodb/mongo-python-driver; - license = licenses.asl20; - description = "Python driver for MongoDB "; - }; - -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22b927513c4..9f30e68331a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3787,8 +3787,6 @@ in { pymongo = callPackage ../development/python-modules/pymongo {}; - pymongo_2_9_1 = callPackage ../development/python-modules/pymongo/2_9_1.nix { }; - pyperclip = callPackage ../development/python-modules/pyperclip { }; pysqlite = callPackage ../development/python-modules/pysqlite { }; From abf05bd7d10540a32597c30955f60cbaca27e57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 12:13:06 +0100 Subject: [PATCH 072/230] python.pkgs.pants: remove A deprecation warning was removed in 427e749217c487b76cb9bbede9b8d63e54333a39. However, nixpkgs.tarball does evaluate without it now. --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f30e68331a..d5dba6f0175 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1979,9 +1979,6 @@ in { pamela = callPackage ../development/python-modules/pamela { }; - # These used to be here but were moved to all-packages, but I'll leave them around for a while. - pants = pkgs.pants; - paperspace = callPackage ../development/python-modules/paperspace { }; paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; From 8c57113e143d406af1fe7d97865b9ae84a6f8e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 12:30:45 +0100 Subject: [PATCH 073/230] python.pkgs.argparse: remove argparse is part of stdlib in 2.7 and 3.2+ --- pkgs/applications/misc/jrnl/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 1 - pkgs/development/python-modules/csvkit/default.nix | 4 ++-- pkgs/development/python-modules/mrbob/default.nix | 4 ++-- pkgs/development/python-modules/numba/default.nix | 3 +-- pkgs/development/python-modules/obfsproxy/default.nix | 3 +-- pkgs/development/python-modules/pastescript/default.nix | 3 +-- pkgs/development/python-modules/pyutil/default.nix | 3 +-- pkgs/development/python-modules/remotecv/default.nix | 4 ++-- pkgs/development/python-modules/robomachine/default.nix | 4 ++-- pkgs/development/python-modules/stevedore/default.nix | 4 ++-- pkgs/development/python-modules/worldengine/default.nix | 3 +-- pkgs/development/tools/build-managers/alibuild/default.nix | 3 --- pkgs/development/tools/jira_cli/default.nix | 2 +- pkgs/tools/filesystems/ceph/generic.nix | 1 - pkgs/tools/networking/gmvault/default.nix | 3 +-- pkgs/tools/networking/pykms/default.nix | 2 +- pkgs/top-level/python-packages.nix | 3 --- 18 files changed, 19 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 30e36c3dcf0..3260f6a5069 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz six tzlocal keyring argparse dateutil + pytz six tzlocal keyring dateutil parsedatetime pycrypto ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index bac0eaaaba6..d6e05056e1c 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -34,7 +34,6 @@ in with python.pkgs; buildPythonApplication rec { atomicwrites configobj vobject - argparse ruamel_yaml ruamel_base unidecode diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index 7fbdaa8909d..48f932086cc 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage, isPy3k , agate, agate-excel, agate-dbf, agate-sql, six -, argparse, ordereddict, simplejson +, ordereddict, simplejson , glibcLocales, nose, mock, unittest2 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate agate-excel agate-dbf agate-sql six ] ++ lib.optionals (!isPy3k) [ - argparse ordereddict simplejson + ordereddict simplejson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index 6dbfa1fae60..388e0148d0a 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, jinja2, six , fetchPypi }: @@ -18,7 +18,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" nosetests ''; - propagatedBuildInputs = [ argparse jinja2 six ]; + propagatedBuildInputs = [ jinja2 six ]; meta = with stdenv.lib; { homepage = https://github.com/domenkozar/mr.bob; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c183442e0e9..41aa7f7a0c8 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -7,7 +7,6 @@ , isPy3k , numpy , llvmlite -, argparse , funcsigs , singledispatch , libcxx @@ -24,7 +23,7 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite argparse] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; # Copy test script into $out and run the test suite. checkPhase = '' diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 2f435201d21..8abd3f22ea3 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchgit , pyptlib -, argparse , twisted , pycrypto , pyyaml @@ -23,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "argparse" "" ''; - propagatedBuildInputs = [ pyptlib argparse twisted pycrypto pyyaml ]; + propagatedBuildInputs = [ pyptlib twisted pycrypto pyyaml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 3507729ee94..ac85b4be120 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -6,7 +6,6 @@ , paste , PasteDeploy , cheetah -, argparse }: buildPythonPackage rec { @@ -19,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ six paste PasteDeploy cheetah argparse ]; + propagatedBuildInputs = [ six paste PasteDeploy cheetah ]; doCheck = false; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 13ea7b75ae3..b7c38c51265 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -5,7 +5,6 @@ , setuptoolsTrial , simplejson , zbase32 -, argparse , twisted , isPyPy }: @@ -20,7 +19,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ argparse twisted ]; + propagatedBuildInputs = [ twisted ]; # Tests fail because they try to write new code into the twisted # package, apparently some kind of plugin. diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 2102cf06425..a4d1dcc485e 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, argparse, pyres, nose +{ stdenv, buildPythonPackage, fetchFromGitHub, pillow, pyres, nose , preggy, numpy, yanc, nose-focus, mock, opencv }: buildPythonPackage rec { pname = "remotecv"; version = "2.2.2"; - propagatedBuildInputs = [ pillow argparse pyres ]; + propagatedBuildInputs = [ pillow pyres ]; checkInputs = [ nose preggy numpy yanc nose-focus mock opencv ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index f29cafb7aee..58a767432a2 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }: +{ stdenv, fetchPypi, buildPythonPackage, pyparsing, robotframework, allpairspy }: buildPythonPackage rec { pname = "RoboMachine"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; - propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ]; + propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; # Remove Windows .bat files postInstall = '' diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 8027688c9ea..4e607799d22 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }: +{ stdenv, buildPythonPackage, fetchPypi, pbr, six }: buildPythonPackage rec { pname = "stevedore"; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - propagatedBuildInputs = [ pbr six argparse ]; + propagatedBuildInputs = [ pbr six ]; meta = with stdenv.lib; { description = "Manage dynamic plugins for Python applications"; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 0a49c256640..cdb60946079 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -7,7 +7,6 @@ , pyplatec , protobuf , purepng -, argparse , h5py , gdal }: @@ -35,7 +34,7 @@ buildPythonPackage rec { ''; buildInputs = [ nose ]; - propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng argparse h5py gdal ]; + propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; prePatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index eb805dcce7a..68f00be342c 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -9,12 +9,9 @@ python.pkgs.buildPythonApplication rec { sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; }; - argparse = null; - doCheck = false; propagatedBuildInputs = [ python.pkgs.requests - python.pkgs.argparse python.pkgs.pyyaml ]; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 02ea20d8bad..8722d49eb32 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -19,7 +19,7 @@ in checkInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; propagatedBuildInputs = with python3Packages; [ - argparse ordereddict requests six suds-jurko termcolor keyring + ordereddict requests six suds-jurko termcolor keyring jira keyrings-alt ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index c4856d92529..1c774751f27 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -83,7 +83,6 @@ let ceph-python-env = python2Packages.python.withPackages (ps: [ ps.sphinx ps.flask - ps.argparse ps.cython ps.setuptools ps.pip diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 06eb196c7a7..e94c3e4330f 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -12,8 +12,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook - argparse chardet ]; + propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook chardet ]; startScript = ./gmvault.py; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 676f1d04855..15ac5bceea3 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -40,7 +40,7 @@ in buildPythonApplication rec { sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4"; }; - propagatedBuildInputs = [ argparse pytz ]; + propagatedBuildInputs = [ pytz ]; prePatch = '' siteDir=$out/${python.sitePackages} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5dba6f0175..bcdf66e5096 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -941,9 +941,6 @@ in { atomicwrites = callPackage ../development/python-modules/atomicwrites { }; - # argparse is part of stdlib in 2.7 and 3.2+ - argparse = null; - astroid = if isPy3k then callPackage ../development/python-modules/astroid { } else callPackage ../development/python-modules/astroid/1.6.nix { }; From bf0a0d424bb8089c7335bd410080dc6ada02c26a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 Jan 2019 06:05:56 -0600 Subject: [PATCH 074/230] binutils: patches from upstream to unbreak linking musl https://sourceware.org/bugzilla/show_bug.cgi?id=23428 --- ...OPERTY_X86_ISA_1_USED-note-if-needed.patch | 567 +++++++++++++++ ...operly-add-X86_ISA_1_NEEDED-property.patch | 169 +++++ ...ly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch | 644 ++++++++++++++++++ .../tools/misc/binutils/default.nix | 6 + 4 files changed, 1386 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch create mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch create mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch new file mode 100644 index 00000000000..2245d6696b2 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch @@ -0,0 +1,567 @@ +From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Fri, 20 Jul 2018 09:18:47 -0700 +Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed + +When -z separate-code, which is enabled by default for Linux/x86, is +used to create executable, ld won't place any data in the code-only +PT_LOAD segment. If there are no data sections placed before the +code-only PT_LOAD segment, the program headers won't be mapped into +any PT_LOAD segment. When the executable tries to access it (based +on the program header address passed in AT_PHDR), it will lead to +segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if +there may be no data sections before the text section so that the +first PT_LOAD segment won't be code-only and will contain the program +header. + +Testcases are adjusted to either pass "-z noseparate-code" to ld or +discard the .note.gnu.property section. A Linux/x86 run-time test is +added. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the + separate code program header is needed, make sure that the first + read-only PT_LOAD segment has no code by adding a + GNU_PROPERTY_X86_ISA_1_USED note. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/linux-x86.S: New file. + * testsuite/ld-elf/linux-x86.exp: Likewise. + * testsuite/ld-elf/pr23428.c: Likewise. + * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld + for Linux/x86 targets. + * testsuite/ld-i386/abs-iamcu.d: Likewise. + * testsuite/ld-i386/abs.d: Likewise. + * testsuite/ld-i386/pr12718.d: Likewise. + * testsuite/ld-i386/pr12921.d: Likewise. + * testsuite/ld-x86-64/abs-k1om.d: Likewise. + * testsuite/ld-x86-64/abs-l1om.d: Likewise. + * testsuite/ld-x86-64/abs.d: Likewise. + * testsuite/ld-x86-64/pr12718.d: Likewise. + * testsuite/ld-x86-64/pr12921.d: Likewise. + * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property + section. + * testsuite/ld-scripts/print-memory-usage.t: Likewise. + * testsuite/ld-scripts/size-2.t: Likewise. + * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld + to create executable if language is "asm". + +(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) +--- + bfd/ChangeLog | 8 +++ + bfd/elfxx-x86.c | 60 ++++++++++++++----- + ld/ChangeLog | 24 ++++++++ + ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ + ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ + ld/testsuite/ld-elf/sec64k.exp | 2 + + ld/testsuite/ld-i386/abs-iamcu.d | 2 +- + ld/testsuite/ld-i386/abs.d | 2 +- + ld/testsuite/ld-i386/pr12718.d | 2 +- + ld/testsuite/ld-i386/pr12921.d | 2 +- + ld/testsuite/ld-linkonce/zeroeh.ld | 1 + + ld/testsuite/ld-scripts/print-memory-usage.t | 2 + + ld/testsuite/ld-scripts/size-2.t | 1 + + ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- + ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- + ld/testsuite/ld-x86-64/abs.d | 2 +- + ld/testsuite/ld-x86-64/pr12718.d | 2 +- + ld/testsuite/ld-x86-64/pr12921.d | 2 +- + ld/testsuite/lib/ld-lib.exp | 5 +- + 20 files changed, 248 insertions(+), 25 deletions(-) + create mode 100644 ld/testsuite/ld-elf/linux-x86.S + create mode 100644 ld/testsuite/ld-elf/linux-x86.exp + create mode 100644 ld/testsuite/ld-elf/pr23428.c + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 1c1174aef8..d3831b7a65 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,11 @@ ++2018-07-23 H.J. Lu ++ ++ PR ld/23428 ++ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the ++ separate code program header is needed, make sure that the first ++ read-only PT_LOAD segment has no code by adding a ++ GNU_PROPERTY_X86_ISA_1_USED note. ++ + 2018-07-18 Nick Clifton + + * development.sh: Set to true. +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index a2497aab86..2e4ff88f1f 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties + const struct elf_backend_data *bed; + unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; + unsigned int got_align; ++ bfd_boolean has_text = FALSE; + + features = 0; + if (info->ibt) +@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties + if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour + && bfd_count_sections (pbfd) != 0) + { ++ if (!has_text) ++ { ++ /* Check if there is no non-empty text section. */ ++ sec = bfd_get_section_by_name (pbfd, ".text"); ++ if (sec != NULL && sec->size != 0) ++ has_text = TRUE; ++ } ++ + ebfd = pbfd; + + if (elf_properties (pbfd) != NULL) + break; + } + +- if (ebfd != NULL && features) ++ bed = get_elf_backend_data (info->output_bfd); ++ ++ htab = elf_x86_hash_table (info, bed->target_id); ++ if (htab == NULL) ++ return pbfd; ++ ++ if (ebfd != NULL) + { +- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and +- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_FEATURE_1_AND, +- 4); +- prop->u.number |= features; +- prop->pr_kind = property_number; ++ prop = NULL; ++ if (features) ++ { ++ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and ++ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_FEATURE_1_AND, ++ 4); ++ prop->u.number |= features; ++ prop->pr_kind = property_number; ++ } ++ else if (has_text ++ && elf_properties (ebfd) == NULL ++ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL ++ && !htab->elf.dynamic_sections_created ++ && !info->traditional_format ++ && (info->output_bfd->flags & D_PAGED) != 0 ++ && info->separate_code) ++ { ++ /* If the separate code program header is needed, make sure ++ that the first read-only PT_LOAD segment has no code by ++ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_USED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + + /* Create the GNU property note section if needed. */ +- if (pbfd == NULL) ++ if (prop != NULL && pbfd == NULL) + { + sec = bfd_make_section_with_flags (ebfd, + NOTE_GNU_PROPERTY_SECTION_NAME, +@@ -2581,12 +2617,6 @@ error_alignment: + + pbfd = _bfd_elf_link_setup_gnu_properties (info); + +- bed = get_elf_backend_data (info->output_bfd); +- +- htab = elf_x86_hash_table (info, bed->target_id); +- if (htab == NULL) +- return pbfd; +- + htab->r_info = init_table->r_info; + htab->r_sym = init_table->r_sym; + +diff --git a/ld/ChangeLog b/ld/ChangeLog +index c07e442c84..cfadbd43a1 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,27 @@ ++2018-07-23 H.J. Lu ++ ++ PR ld/23428 ++ * testsuite/ld-elf/linux-x86.S: New file. ++ * testsuite/ld-elf/linux-x86.exp: Likewise. ++ * testsuite/ld-elf/pr23428.c: Likewise. ++ * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld ++ for Linux/x86 targets. ++ * testsuite/ld-i386/abs-iamcu.d: Likewise. ++ * testsuite/ld-i386/abs.d: Likewise. ++ * testsuite/ld-i386/pr12718.d: Likewise. ++ * testsuite/ld-i386/pr12921.d: Likewise. ++ * testsuite/ld-x86-64/abs-k1om.d: Likewise. ++ * testsuite/ld-x86-64/abs-l1om.d: Likewise. ++ * testsuite/ld-x86-64/abs.d: Likewise. ++ * testsuite/ld-x86-64/pr12718.d: Likewise. ++ * testsuite/ld-x86-64/pr12921.d: Likewise. ++ * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property ++ section. ++ * testsuite/ld-scripts/print-memory-usage.t: Likewise. ++ * testsuite/ld-scripts/size-2.t: Likewise. ++ * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to ++ create executable if language is "asm". ++ + 2018-07-18 Nick Clifton + + 2.31.1 Release point. +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +new file mode 100644 +index 0000000000..bdf40c6e01 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -0,0 +1,63 @@ ++ .text ++ .globl _start ++ .type _start,@function ++ .p2align 4 ++_start: ++ xorl %ebp, %ebp ++#ifdef __LP64__ ++ popq %rdi ++ movq %rsp, %rsi ++ andq $~15, %rsp ++#elif defined __x86_64__ ++ mov (%rsp),%edi ++ addl $4,%esp ++ movl %esp, %esi ++ andl $~15, %esp ++#else ++ popl %esi ++ movl %esp, %ecx ++ andl $~15, %esp ++ ++ subl $8,%esp ++ pushl %ecx ++ pushl %esi ++#endif ++ ++ call main ++ ++ hlt ++ ++ .type syscall, @function ++ .globl syscall ++ .p2align 4 ++syscall: ++#ifdef __x86_64__ ++ movq %rdi, %rax /* Syscall number -> rax. */ ++ movq %rsi, %rdi /* shift arg1 - arg5. */ ++ movq %rdx, %rsi ++ movq %rcx, %rdx ++ movq %r8, %r10 ++ movq %r9, %r8 ++ movq 8(%rsp),%r9 /* arg6 is on the stack. */ ++ syscall /* Do the system call. */ ++#else ++ push %ebp ++ push %edi ++ push %esi ++ push %ebx ++ mov 0x2c(%esp),%ebp ++ mov 0x28(%esp),%edi ++ mov 0x24(%esp),%esi ++ mov 0x20(%esp),%edx ++ mov 0x1c(%esp),%ecx ++ mov 0x18(%esp),%ebx ++ mov 0x14(%esp),%eax ++ int $0x80 ++ pop %ebx ++ pop %esi ++ pop %edi ++ pop %ebp ++#endif ++ ret /* Return to caller. */ ++ .size syscall, .-syscall ++ .section .note.GNU-stack,"",@progbits +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +new file mode 100644 +index 0000000000..36217c6fb4 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -0,0 +1,46 @@ ++# Expect script for simple native Linux/x86 tests. ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# ++# This file is part of the GNU Binutils. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++# MA 02110-1301, USA. ++# ++ ++# Test very simple native Linux/x86 programs with linux-x86.S. ++if { ![isnative] || [which $CC] == 0 \ ++ || (![istarget "i?86-*-linux*"] \ ++ && ![istarget "x86_64-*-linux*"] \ ++ && ![istarget "amd64-*-linux*"]) } { ++ return ++} ++ ++# Add $PLT_CFLAGS if PLT is expected. ++global PLT_CFLAGS ++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. ++global NOPIE_CFLAGS NOPIE_LDFLAGS ++ ++run_ld_link_exec_tests [list \ ++ [list \ ++ "Run PR ld/23428 test" \ ++ "--no-dynamic-linker -z separate-code" \ ++ "" \ ++ { linux-x86.S pr23428.c } \ ++ "pr23428" \ ++ "pass.out" \ ++ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ ++ "asm" \ ++ ] \ ++] +diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c +new file mode 100644 +index 0000000000..3631ed7926 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr23428.c +@@ -0,0 +1,43 @@ ++#include ++#include ++#include ++ ++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) ++ ++int ++main (int argc, char **argv) ++{ ++ char **ev = &argv[argc + 1]; ++ char **evp = ev; ++ ElfW(auxv_t) *av; ++ const ElfW(Phdr) *phdr = NULL; ++ size_t phnum = 0; ++ size_t loadnum = 0; ++ int fd = STDOUT_FILENO; ++ size_t i; ++ ++ while (*evp++ != NULL) ++ ; ++ ++ av = (ElfW(auxv_t) *) evp; ++ ++ for (; av->a_type != AT_NULL; ++av) ++ switch (av->a_type) ++ { ++ case AT_PHDR: ++ phdr = (const void *) av->a_un.a_val; ++ break; ++ case AT_PHNUM: ++ phnum = av->a_un.a_val; ++ break; ++ } ++ ++ for (i = 0; i < phnum; i++, phdr++) ++ if (phdr->p_type == PT_LOAD) ++ loadnum++; ++ ++ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); ++ ++ syscall (SYS_exit, !loadnum); ++ return 0; ++} +diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp +index b58139e9dd..3909c0eaa1 100644 +--- a/ld/testsuite/ld-elf/sec64k.exp ++++ b/ld/testsuite/ld-elf/sec64k.exp +@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] + foreach sfile $sfiles { puts $ofd "#source: $sfile" } + if { [istarget spu*-*-*] } { + puts $ofd "#ld: --local-store 0:0" ++ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { ++ puts $ofd "#ld: -z noseparate-code" + } else { + puts $ofd "#ld:" + } +diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d +index ac9beff2e5..aba7d6b03f 100644 +--- a/ld/testsuite/ld-i386/abs-iamcu.d ++++ b/ld/testsuite/ld-i386/abs-iamcu.d +@@ -2,7 +2,7 @@ + #source: abs.s + #source: zero.s + #as: --32 -march=iamcu +-#ld: -m elf_iamcu ++#ld: -m elf_iamcu -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d +index e660aca524..191ee4456a 100644 +--- a/ld/testsuite/ld-i386/abs.d ++++ b/ld/testsuite/ld-i386/abs.d +@@ -2,7 +2,7 @@ + #as: --32 + #source: abs.s + #source: zero.s +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d +index ec51540a42..7eba52d95e 100644 +--- a/ld/testsuite/ld-i386/pr12718.d ++++ b/ld/testsuite/ld-i386/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d +index e49079b3c8..ea2da3eb51 100644 +--- a/ld/testsuite/ld-i386/pr12921.d ++++ b/ld/testsuite/ld-i386/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld +index b22eaa12c9..f89855a08f 100644 +--- a/ld/testsuite/ld-linkonce/zeroeh.ld ++++ b/ld/testsuite/ld-linkonce/zeroeh.ld +@@ -2,4 +2,5 @@ SECTIONS { + .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } + .gcc_except_table 0x2000 : { *(.gcc_except_table) } + .eh_frame 0x4000 : { *(.eh_frame) } ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t +index 5ff057a5e3..6eda1d2dc4 100644 +--- a/ld/testsuite/ld-scripts/print-memory-usage.t ++++ b/ld/testsuite/ld-scripts/print-memory-usage.t +@@ -11,4 +11,6 @@ SECTIONS + *(.data) + *(.rw) + } ++ ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t +index 723863995e..c3c4eddab4 100644 +--- a/ld/testsuite/ld-scripts/size-2.t ++++ b/ld/testsuite/ld-scripts/size-2.t +@@ -18,4 +18,5 @@ SECTIONS + LONG (SIZEOF (.tdata)) + LONG (SIZEOF (.tbss)) + } :image ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d +index 2c26639fc0..6b0fde0eed 100644 +--- a/ld/testsuite/ld-x86-64/abs-k1om.d ++++ b/ld/testsuite/ld-x86-64/abs-k1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=k1om +-#ld: -m elf_k1om ++#ld: -m elf_k1om -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d +index 1fb96d44b7..f87869f9d0 100644 +--- a/ld/testsuite/ld-x86-64/abs-l1om.d ++++ b/ld/testsuite/ld-x86-64/abs-l1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=l1om +-#ld: -m elf_l1om ++#ld: -m elf_l1om -z noseparate-code + #objdump: -rs -j .text + #target: x86_64-*-linux* + +diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d +index b24b018639..d99ab4685d 100644 +--- a/ld/testsuite/ld-x86-64/abs.d ++++ b/ld/testsuite/ld-x86-64/abs.d +@@ -1,7 +1,7 @@ + #name: Absolute non-overflowing relocs + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s +-#ld: ++#ld: -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d +index 07d17325d0..2c503ffbaa 100644 +--- a/ld/testsuite/ld-x86-64/pr12718.d ++++ b/ld/testsuite/ld-x86-64/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d +index 6fe6abee09..1162d55818 100644 +--- a/ld/testsuite/ld-x86-64/pr12921.d ++++ b/ld/testsuite/ld-x86-64/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp +index cfbefe9028..1095091882 100644 +--- a/ld/testsuite/lib/ld-lib.exp ++++ b/ld/testsuite/lib/ld-lib.exp +@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { + continue + } + +- if { [ string match "c++" $lang ] } { ++ if { [ string match "asm" $lang ] } { ++ set link_proc ld_link ++ set link_cmd $ld ++ } elseif { [ string match "c++" $lang ] } { + set link_proc ld_link + set link_cmd $CXX + } else { +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch new file mode 100644 index 00000000000..4aac2141fe2 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch @@ -0,0 +1,169 @@ +From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Sat, 11 Aug 2018 06:41:33 -0700 +Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property + +Existing properties may be removed during property merging. We avoid +adding X86_ISA_1_NEEDED property only if existing properties won't be +removed. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't + add X86_ISA_1_NEEDED property only if existing properties won't + be removed. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/dummy.s: New file. + * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. + * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. + +(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) +--- + bfd/ChangeLog | 7 +++++++ + bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ + ld/ChangeLog | 7 +++++++ + ld/testsuite/ld-elf/dummy.s | 1 + + ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 2 +- + 6 files changed, 66 insertions(+), 7 deletions(-) + create mode 100644 ld/testsuite/ld-elf/dummy.s + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index e184eb322a..7364bed2b5 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,10 @@ ++2018-08-12 H.J. Lu ++ ++ PR ld/23428 ++ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't ++ add X86_ISA_1_NEEDED property only if existing properties won't ++ be removed. ++ + 2018-08-10 H.J. Lu + + PR ld/23486 +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ccfd25815..2d8f7b640b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties + prop->pr_kind = property_number; + } + else if (has_text +- && elf_properties (ebfd) == NULL + && elf_tdata (info->output_bfd)->o->build_id.sec == NULL + && !htab->elf.dynamic_sections_created + && !info->traditional_format +@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by + adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_NEEDED, +- 4); +- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; +- prop->pr_kind = property_number; ++ elf_property_list *list; ++ bfd_boolean need_property = TRUE; ++ ++ for (list = elf_properties (ebfd); list; list = list->next) ++ switch (list->property.pr_type) ++ { ++ case GNU_PROPERTY_STACK_SIZE: ++ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: ++ case GNU_PROPERTY_X86_ISA_1_NEEDED: ++ /* These properties won't be removed during merging. */ ++ need_property = FALSE; ++ break; ++ } ++ ++ if (need_property) ++ { ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + } + + /* Create the GNU property note section if needed. */ +diff --git a/ld/ChangeLog b/ld/ChangeLog +index f62106b731..b814d6730d 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,10 @@ ++2018-08-12 H.J. Lu ++ ++ PR ld/23428 ++ * testsuite/ld-elf/dummy.s: New file. ++ * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. ++ * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. ++ + 2018-08-10 H.J. Lu + + PR ld/23486 +diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s +new file mode 100644 +index 0000000000..403f98000d +--- /dev/null ++++ b/ld/testsuite/ld-elf/dummy.s +@@ -0,0 +1 @@ ++# Dummy +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +index bdf40c6e01..d94abc1106 100644 +--- a/ld/testsuite/ld-elf/linux-x86.S ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -61,3 +61,31 @@ syscall: + ret /* Return to caller. */ + .size syscall, .-syscall + .section .note.GNU-stack,"",@progbits ++ ++ .section ".note.gnu.property", "a" ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++ .long 1f - 0f /* name length */ ++ .long 5f - 2f /* data length */ ++ .long 5 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++2: .long 0xc0000002 /* pr_type. */ ++ .long 4f - 3f /* pr_datasz. */ ++3: ++ .long 0x2 ++4: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++5: +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +index 36217c6fb4..f6f5a80853 100644 +--- a/ld/testsuite/ld-elf/linux-x86.exp ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ + "Run PR ld/23428 test" \ + "--no-dynamic-linker -z separate-code" \ + "" \ +- { linux-x86.S pr23428.c } \ ++ { linux-x86.S pr23428.c dummy.s } \ + "pr23428" \ + "pass.out" \ + "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch new file mode 100644 index 00000000000..d6304a00f17 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch @@ -0,0 +1,644 @@ +From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 8 Aug 2018 06:09:15 -0700 +Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. +If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the +corresponding x86 instruction set isn’t used. When merging properties +from 2 input files and one input file doesn't have the +GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have +it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED +property if an input file doesn't have it. + +This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the +GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA +requirement. + +bfd/ + + PR ld/23486 + * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove + GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. + (_bfd_x86_elf_link_setup_gnu_properties): Adding the + GNU_PROPERTY_X86_ISA_1_NEEDED, instead of + GNU_PROPERTY_X86_ISA_1_USED, property. + +ld/ + + PR ld/23486 + * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + * testsuite/ld-i386/pr23486a.d: New file. + * testsuite/ld-i386/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486a.d: Likewise. + * testsuite/ld-x86-64/pr23486a.s: Likewise. + * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486b.s: Likewise. + * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". + * testsuite/ld-i386/property-4.r: Likewise. + * testsuite/ld-i386/property-5.r: Likewise. + * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. + * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. + * testsuite/ld-x86-64/property-3.r: Likewise. + * testsuite/ld-x86-64/property-4.r: Likewise. + * testsuite/ld-x86-64/property-5.r: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. + +(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) +--- + bfd/ChangeLog | 9 ++++++ + bfd/elfxx-x86.c | 25 ++++++++++++--- + ld/ChangeLog | 32 +++++++++++++++++++ + ld/testsuite/ld-i386/i386.exp | 2 ++ + ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ + ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ + ld/testsuite/ld-i386/property-3.r | 1 - + ld/testsuite/ld-i386/property-4.r | 1 - + ld/testsuite/ld-i386/property-5.r | 1 - + ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++- + ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++- + ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++- + ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++- + ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++ + ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++ + ld/testsuite/ld-x86-64/property-3.r | 1 - + ld/testsuite/ld-x86-64/property-4.r | 1 - + ld/testsuite/ld-x86-64/property-5.r | 1 - + .../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++- + .../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++- + .../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++- + .../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++- + ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ + 31 files changed, 211 insertions(+), 47 deletions(-) + create mode 100644 ld/testsuite/ld-i386/pr23486a.d + create mode 100644 ld/testsuite/ld-i386/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s + create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 8d25c6992b..e184eb322a 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,12 @@ ++2018-08-10 H.J. Lu ++ ++ PR ld/23486 ++ * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove ++ GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. ++ (_bfd_x86_elf_link_setup_gnu_properties): Adding the ++ GNU_PROPERTY_X86_ISA_1_NEEDED, instead of ++ GNU_PROPERTY_X86_ISA_1_USED, property. ++ + 2018-08-07 Alan Modra + + * elf64-ppc.c (ppc64_elf_relocate_section): Don't skip first +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 2e4ff88f1f..7ccfd25815 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + switch (pr_type) + { + case GNU_PROPERTY_X86_ISA_1_USED: ++ if (aprop == NULL || bprop == NULL) ++ { ++ /* Only one of APROP and BPROP can be NULL. */ ++ if (aprop != NULL) ++ { ++ /* Remove this property since the other input file doesn't ++ have it. */ ++ aprop->pr_kind = property_remove; ++ updated = TRUE; ++ } ++ break; ++ } ++ goto or_property; ++ + case GNU_PROPERTY_X86_ISA_1_NEEDED: + if (aprop != NULL && bprop != NULL) + { ++or_property: + number = aprop->u.number; + aprop->u.number = number | bprop->u.number; +- /* Remove the property if ISA bits are empty. */ ++ /* Remove the property if all bits are empty. */ + if (aprop->u.number == 0) + { + aprop->pr_kind = property_remove; +@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + { + if (aprop->u.number == 0) + { +- /* Remove APROP if ISA bits are empty. */ ++ /* Remove APROP if all bits are empty. */ + aprop->pr_kind = property_remove; + updated = TRUE; + } + } + else + { +- /* Return TRUE if APROP is NULL and ISA bits of BPROP ++ /* Return TRUE if APROP is NULL and all bits of BPROP + aren't empty to indicate that BPROP should be added + to ABFD. */ + updated = bprop->u.number != 0; +@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties + { + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by +- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ + prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_USED, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, + 4); + prop->u.number = GNU_PROPERTY_X86_ISA_1_486; + prop->pr_kind = property_number; +diff --git a/ld/ChangeLog b/ld/ChangeLog +index ef694e8980..f62106b731 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,35 @@ ++2018-08-10 H.J. Lu ++ ++ PR ld/23486 ++ * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. ++ * testsuite/ld-x86-64/x86-64.exp: Likewise. ++ * testsuite/ld-i386/pr23486a.d: New file. ++ * testsuite/ld-i386/pr23486b.d: Likewise. ++ * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. ++ * testsuite/ld-x86-64/pr23486a.d: Likewise. ++ * testsuite/ld-x86-64/pr23486a.s: Likewise. ++ * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. ++ * testsuite/ld-x86-64/pr23486b.d: Likewise. ++ * testsuite/ld-x86-64/pr23486b.s: Likewise. ++ * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". ++ * testsuite/ld-i386/property-4.r: Likewise. ++ * testsuite/ld-i386/property-5.r: Likewise. ++ * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. ++ * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. ++ * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. ++ * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. ++ * testsuite/ld-x86-64/property-3.r: Likewise. ++ * testsuite/ld-x86-64/property-4.r: Likewise. ++ * testsuite/ld-x86-64/property-5.r: Likewise. ++ * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. ++ * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. ++ + 2018-08-10 H.J. Lu + + * testsuite/ld-x86-64/property-x86-3.s: Use ".p2align 2" to +diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp +index 6d794fe653..78dad02579 100644 +--- a/ld/testsuite/ld-i386/i386.exp ++++ b/ld/testsuite/ld-i386/i386.exp +@@ -462,6 +462,8 @@ run_dump_test "pr23189" + run_dump_test "pr23194" + run_dump_test "pr23372a" + run_dump_test "pr23372b" ++run_dump_test "pr23486a" ++run_dump_test "pr23486b" + + if { !([istarget "i?86-*-linux*"] + || [istarget "i?86-*-gnu*"] +diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d +new file mode 100644 +index 0000000000..41a6dcf7d5 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486a.s ++#source: ../ld-x86-64/pr23486b.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d +new file mode 100644 +index 0000000000..08019b7274 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486b.s ++#source: ../ld-x86-64/pr23486a.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r +index 0ed91f5922..d03203c1e5 100644 +--- a/ld/testsuite/ld-i386/property-3.r ++++ b/ld/testsuite/ld-i386/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r +index cb2bc15d9a..da295eb6c7 100644 +--- a/ld/testsuite/ld-i386/property-4.r ++++ b/ld/testsuite/ld-i386/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r +index 552965058c..e4141594b3 100644 +--- a/ld/testsuite/ld-i386/property-5.r ++++ b/ld/testsuite/ld-i386/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d +index 4bb35b00fb..0aedea1614 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d +index 418d58a8f7..bd69ac6478 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d +index e261038f60..76d2a39f2c 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d +index 25f3d2361e..e770ecffa5 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d +new file mode 100644 +index 0000000000..6d9fa68cdb +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d +new file mode 100644 +index 0000000000..dc2b7bf760 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s +new file mode 100644 +index 0000000000..a07d0c7ced +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_USED */ ++ .long 0xc0000000 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0xa ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d +new file mode 100644 +index 0000000000..0445e69d82 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486b.s ++#source: pr23486a.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d +new file mode 100644 +index 0000000000..dc2b7bf760 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s +new file mode 100644 +index 0000000000..c5167eeb65 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ ++ .long 0xc0000001 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0x3 ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r +index 0ed91f5922..d03203c1e5 100644 +--- a/ld/testsuite/ld-x86-64/property-3.r ++++ b/ld/testsuite/ld-x86-64/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r +index cb2bc15d9a..da295eb6c7 100644 +--- a/ld/testsuite/ld-x86-64/property-4.r ++++ b/ld/testsuite/ld-x86-64/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r +index 552965058c..e4141594b3 100644 +--- a/ld/testsuite/ld-x86-64/property-5.r ++++ b/ld/testsuite/ld-x86-64/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +index 011426f5a4..4cec728dc7 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +index 1b4229a037..a8df49a351 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +index 290ed6abf1..c112626711 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +index 1142e03272..f10dffdc2c 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +index 819542d181..0147a3c7b6 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +index 4c5d0e0a18..1f8c2dc929 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +index ba181e0bc5..7ca2539ca5 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +index 5216f385dd..f66a40e449 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp +index 6edb9e86f4..ae21e554ad 100644 +--- a/ld/testsuite/ld-x86-64/x86-64.exp ++++ b/ld/testsuite/ld-x86-64/x86-64.exp +@@ -403,6 +403,10 @@ run_dump_test "pr23372a" + run_dump_test "pr23372a-x32" + run_dump_test "pr23372b" + run_dump_test "pr23372b-x32" ++run_dump_test "pr23486a" ++run_dump_test "pr23486a-x32" ++run_dump_test "pr23486b" ++run_dump_test "pr23486b-x32" + + if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { + return +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9b8ca3012cd..66b1541d463 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch + + # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 + # un-break features so linking against musl doesn't produce crash-only binaries + ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch + ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch + ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; From aee77e66bb17673d97727c03ea4f5a14fab3d106 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 Jan 2019 06:11:11 -0600 Subject: [PATCH 075/230] binutils: drop changelog portions of patches, so they apply --- ...OPERTY_X86_ISA_1_USED-note-if-needed.patch | 50 --------------- ...operly-add-X86_ISA_1_NEEDED-property.patch | 32 ---------- ...ly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch | 61 ------------------- 3 files changed, 143 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch index 2245d6696b2..5a047b0f070 100644 --- a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch @@ -52,9 +52,7 @@ ld/ (cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) --- - bfd/ChangeLog | 8 +++ bfd/elfxx-x86.c | 60 ++++++++++++++----- - ld/ChangeLog | 24 ++++++++ ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ @@ -77,22 +75,6 @@ ld/ create mode 100644 ld/testsuite/ld-elf/linux-x86.exp create mode 100644 ld/testsuite/ld-elf/pr23428.c -diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index 1c1174aef8..d3831b7a65 100644 ---- a/bfd/ChangeLog -+++ b/bfd/ChangeLog -@@ -1,3 +1,11 @@ -+2018-07-23 H.J. Lu -+ -+ PR ld/23428 -+ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the -+ separate code program header is needed, make sure that the first -+ read-only PT_LOAD segment has no code by adding a -+ GNU_PROPERTY_X86_ISA_1_USED note. -+ - 2018-07-18 Nick Clifton - - * development.sh: Set to true. diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index a2497aab86..2e4ff88f1f 100644 --- a/bfd/elfxx-x86.c @@ -187,38 +169,6 @@ index a2497aab86..2e4ff88f1f 100644 htab->r_info = init_table->r_info; htab->r_sym = init_table->r_sym; -diff --git a/ld/ChangeLog b/ld/ChangeLog -index c07e442c84..cfadbd43a1 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,27 @@ -+2018-07-23 H.J. Lu -+ -+ PR ld/23428 -+ * testsuite/ld-elf/linux-x86.S: New file. -+ * testsuite/ld-elf/linux-x86.exp: Likewise. -+ * testsuite/ld-elf/pr23428.c: Likewise. -+ * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld -+ for Linux/x86 targets. -+ * testsuite/ld-i386/abs-iamcu.d: Likewise. -+ * testsuite/ld-i386/abs.d: Likewise. -+ * testsuite/ld-i386/pr12718.d: Likewise. -+ * testsuite/ld-i386/pr12921.d: Likewise. -+ * testsuite/ld-x86-64/abs-k1om.d: Likewise. -+ * testsuite/ld-x86-64/abs-l1om.d: Likewise. -+ * testsuite/ld-x86-64/abs.d: Likewise. -+ * testsuite/ld-x86-64/pr12718.d: Likewise. -+ * testsuite/ld-x86-64/pr12921.d: Likewise. -+ * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property -+ section. -+ * testsuite/ld-scripts/print-memory-usage.t: Likewise. -+ * testsuite/ld-scripts/size-2.t: Likewise. -+ * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to -+ create executable if language is "asm". -+ - 2018-07-18 Nick Clifton - - 2.31.1 Release point. diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S new file mode 100644 index 0000000000..bdf40c6e01 diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch index 4aac2141fe2..ca50d9a57cd 100644 --- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch @@ -23,30 +23,13 @@ ld/ (cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) --- - bfd/ChangeLog | 7 +++++++ bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ - ld/ChangeLog | 7 +++++++ ld/testsuite/ld-elf/dummy.s | 1 + ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ ld/testsuite/ld-elf/linux-x86.exp | 2 +- 6 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 ld/testsuite/ld-elf/dummy.s -diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index e184eb322a..7364bed2b5 100644 ---- a/bfd/ChangeLog -+++ b/bfd/ChangeLog -@@ -1,3 +1,10 @@ -+2018-08-12 H.J. Lu -+ -+ PR ld/23428 -+ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't -+ add X86_ISA_1_NEEDED property only if existing properties won't -+ be removed. -+ - 2018-08-10 H.J. Lu - - PR ld/23486 diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 7ccfd25815..2d8f7b640b 100644 --- a/bfd/elfxx-x86.c @@ -93,21 +76,6 @@ index 7ccfd25815..2d8f7b640b 100644 } /* Create the GNU property note section if needed. */ -diff --git a/ld/ChangeLog b/ld/ChangeLog -index f62106b731..b814d6730d 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,10 @@ -+2018-08-12 H.J. Lu -+ -+ PR ld/23428 -+ * testsuite/ld-elf/dummy.s: New file. -+ * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. -+ * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. -+ - 2018-08-10 H.J. Lu - - PR ld/23486 diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s new file mode 100644 index 0000000000..403f98000d diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch index d6304a00f17..866d6db8ce2 100644 --- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch @@ -61,9 +61,7 @@ ld/ (cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) --- - bfd/ChangeLog | 9 ++++++ bfd/elfxx-x86.c | 25 ++++++++++++--- - ld/ChangeLog | 32 +++++++++++++++++++ ld/testsuite/ld-i386/i386.exp | 2 ++ ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ @@ -102,25 +100,6 @@ ld/ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s -diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index 8d25c6992b..e184eb322a 100644 ---- a/bfd/ChangeLog -+++ b/bfd/ChangeLog -@@ -1,3 +1,12 @@ -+2018-08-10 H.J. Lu -+ -+ PR ld/23486 -+ * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove -+ GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. -+ (_bfd_x86_elf_link_setup_gnu_properties): Adding the -+ GNU_PROPERTY_X86_ISA_1_NEEDED, instead of -+ GNU_PROPERTY_X86_ISA_1_USED, property. -+ - 2018-08-07 Alan Modra - - * elf64-ppc.c (ppc64_elf_relocate_section): Don't skip first -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 2e4ff88f1f..7ccfd25815 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, @@ -181,46 +160,6 @@ index 2e4ff88f1f..7ccfd25815 100644 4); prop->u.number = GNU_PROPERTY_X86_ISA_1_486; prop->pr_kind = property_number; -diff --git a/ld/ChangeLog b/ld/ChangeLog -index ef694e8980..f62106b731 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,35 @@ -+2018-08-10 H.J. Lu -+ -+ PR ld/23486 -+ * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. -+ * testsuite/ld-x86-64/x86-64.exp: Likewise. -+ * testsuite/ld-i386/pr23486a.d: New file. -+ * testsuite/ld-i386/pr23486b.d: Likewise. -+ * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. -+ * testsuite/ld-x86-64/pr23486a.d: Likewise. -+ * testsuite/ld-x86-64/pr23486a.s: Likewise. -+ * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. -+ * testsuite/ld-x86-64/pr23486b.d: Likewise. -+ * testsuite/ld-x86-64/pr23486b.s: Likewise. -+ * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". -+ * testsuite/ld-i386/property-4.r: Likewise. -+ * testsuite/ld-i386/property-5.r: Likewise. -+ * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. -+ * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. -+ * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. -+ * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. -+ * testsuite/ld-x86-64/property-3.r: Likewise. -+ * testsuite/ld-x86-64/property-4.r: Likewise. -+ * testsuite/ld-x86-64/property-5.r: Likewise. -+ * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. -+ * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. -+ - 2018-08-10 H.J. Lu - - * testsuite/ld-x86-64/property-x86-3.s: Use ".p2align 2" to diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 6d794fe653..78dad02579 100644 --- a/ld/testsuite/ld-i386/i386.exp From cd836b57ecc113fce7c3c0351b2ba741f76b86da Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 Jan 2019 06:13:01 -0600 Subject: [PATCH 076/230] binutils: and apply in right order --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 66b1541d463..4e2f26fd691 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 # un-break features so linking against musl doesn't produce crash-only binaries ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch - ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch + ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; From 67ca543f7f3b61aa17aaf7cea9aa0af5867937f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Tue, 22 Jan 2019 14:00:34 +0100 Subject: [PATCH 077/230] maintainers/maintainer-list.nix: add PGP/GPG fingerprint --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f09dcf2d3af..0b48415d063 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4183,6 +4183,10 @@ email = "sebastien.maret@icloud.com"; github = "smaret"; name = "Sébastien Maret"; + keys = [{ + longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; + fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; + }]; }; smironov = { email = "grrwlf@gmail.com"; From 8d179817f95d3151dbc4458e6e283e232f4fd013 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 22 Jan 2019 14:25:40 +0100 Subject: [PATCH 078/230] maintainers/maintainer-list: Add my GPG/PGP key --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f09dcf2d3af..27a3d491873 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1456,6 +1456,10 @@ email = "elis@hirwing.se"; github = "etu"; name = "Elis Hirwing"; + keys = [{ + longkeyid = "rsa4096/0xD57EFA625C9A925F"; + fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; + }]; }; evck = { email = "eric@evenchick.com"; From 096ea6d24f067c98e460264bbb450f756896b26a Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 19 Jan 2019 17:30:14 +0800 Subject: [PATCH 079/230] proot: 20171015 -> 20181214 Proot now includes a fix for the seccomp bug on recent kernels --- pkgs/tools/system/proot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 63e135075b9..5cea514c606 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -49,8 +49,8 @@ }) ]; } else { - version = "5.1.0.20171015"; - sha256 = "0jam87msh5jx8vpb19n6xwxw1xlig5amdcqif7gn2rc8nhswpxif"; - rev = "0bf2ee17daafeeadfed079cec97fe1ac781e696a"; + version = "5.1.0.20181214"; + sha256 = "07g1gfyjq7rypjdwxw495sk8k1y2i3y3nsm1rh9kgx3z47z28aah"; + rev = "11972c0dab34e088c55c16a94d26c399ca7a26d8"; patches = []; }) From 79c0d1a9082962a9823201e52c47d453a7bf02dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 15:30:07 +0100 Subject: [PATCH 080/230] python.pkgs.3to2: remove alias --- pkgs/data/fonts/rictydiminished-with-firacode/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 45618972c34..10d4678de05 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { fontforge (pythonFull.withPackages (ps: [ ps.jinja2 - ps."3to2" + ps.py3to2 ps.fonttools ])) ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcdf66e5096..82ac9fdfae3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -143,8 +143,6 @@ in { acoustics = callPackage ../development/python-modules/acoustics { }; py3to2 = callPackage ../development/python-modules/3to2 { }; - # Left for backwards compatibility - "3to2" = self.py3to2; absl-py = callPackage ../development/python-modules/absl-py { }; From a9a28e9236ac66ed1867127fa8edc7f544694bf6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 22 Jan 2019 16:16:59 +0100 Subject: [PATCH 081/230] pythonPackages.pywal: fix expression --- pkgs/development/python-modules/pywal/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 00691e65225..7f908c943ae 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, imagemagick, feh }: +{ lib, buildPythonPackage, fetchPypi, imagemagick, feh, isPy3k }: -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { pname = "pywal"; version = "3.2.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; }; @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { ./feh.patch ]; + # Invalid syntax + disabled = !isPy3k; + postPatch = '' substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh" From e5f2cf4af1d7fafcb2162da912e8490b63bdd25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 15:57:35 +0100 Subject: [PATCH 082/230] python.pkgs.python-utils: use fetchPypi --- .../python-modules/python-utils/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index b7744ce79c3..7e330302de8 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,15 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: buildPythonPackage rec { pname = "python-utils"; version = "2.3.0"; - name = pname + "-" + version; - src = fetchFromGitHub { - owner = "WoLpH"; - repo = "python-utils"; - rev = "v${version}"; - sha256 = "14gyphcqwa77wfbnrzj363v3fdkxy08378lgd7l3jqnpvr8pfp5c"; + src = fetchPypi { + inherit pname version; + sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; }; checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; From d56611b25b9ac76f00c66987874db187dfa10f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 16:02:12 +0100 Subject: [PATCH 083/230] python.pkgs.python-utils: run tests --- .../python-modules/python-utils/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 7e330302de8..7aa77654006 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -9,18 +9,15 @@ buildPythonPackage rec { sha256 = "34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3"; }; - checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; - postPatch = '' - # pytest-runner is only actually required in checkPhase - substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "" + rm -r tests/__pycache__ + rm tests/*.pyc ''; - # Tests failing - doCheck = false; + checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; checkPhase = '' - py.test + py.test tests ''; propagatedBuildInputs = [ six ]; From 667230441802bcbf278eaf928df28643fbb91ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Jan 2019 15:53:25 +0100 Subject: [PATCH 084/230] python.pkgs.progressbar2: 3.12.0 -> 3.39.2 --- .../python-modules/progressbar2/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 18fb14c3aa9..362e73c0d71 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,39 +1,38 @@ { stdenv , python , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytest , python-utils , sphinx -, coverage -, execnet , flake8 , pytestpep8 , pytestflakes , pytestcov , pytestcache -, pep8 , pytestrunner +, freezegun }: buildPythonPackage rec { pname = "progressbar2"; - version = "3.12.0"; + version = "3.39.2"; - # Use source from GitHub, PyPI is missing tests - # https://github.com/WoLpH/python-progressbar/issues/151 - src = fetchFromGitHub { - owner = "WoLpH"; - repo = "python-progressbar"; - rev = "v${version}"; - sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f"; + src = fetchPypi { + inherit pname version; + sha256 = "6eb5135b987caca4212d2c7abc2923d4ad5ba18bb34ccbe7044b3628f52efc2c"; }; + postPatch = '' + rm -r tests/__pycache__ + rm tests/*.pyc + ''; + propagatedBuildInputs = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ - pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov - pytestcache pep8 + pytest sphinx flake8 pytestpep8 pytestflakes pytestcov + pytestcache freezegun ]; # ignore tests on the nix wrapped setup.py and don't flake .eggs directory checkPhase = '' From 2707a6d4811d782c17227ca372ca6d116d5a5ee3 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 22 Jan 2019 09:55:38 -0500 Subject: [PATCH 085/230] efitools: init at 1.9.2 --- pkgs/tools/security/efitools/default.nix | 39 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/efitools/default.nix diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix new file mode 100644 index 00000000000..1d983cb8599 --- /dev/null +++ b/pkgs/tools/security/efitools/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, +help2man, fetchgit }: +stdenv.mkDerivation rec { + name = "efitools-${version}"; + version = "1.9.2"; + + buildInputs = [ + gnu-efi + openssl + sbsigntool + ]; + + nativeBuildInputs = [ + perl + perlPackages.FileSlurp + help2man + ]; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; + rev = "v${version}"; + sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"; + }; + + postPatch = '' + sed -i -e 's#/usr/include/efi#${gnu-efi}/include/efi/#g' Make.rules + sed -i -e 's#/usr/lib64/gnuefi#${gnu-efi}/lib/#g' Make.rules + sed -i -e 's#$(DESTDIR)/usr#$(out)#g' Make.rules + patchShebangs . + ''; + + meta = with stdenv.lib; { + description = "Tools for manipulating UEFI secure boot platforms"; + homepage = "https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"; + license = licenses.gpl2; + maintainers = [ maintainers.grahamc ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 772b85a892a..c0279954cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3154,6 +3154,8 @@ in gx = callPackage ../tools/package-management/gx { }; gx-go = callPackage ../tools/package-management/gx/go { }; + efitools = callPackage ../tools/security/efitools { }; + sbsigntool = callPackage ../tools/security/sbsigntool { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; From ebb370f6800c4d595fccbe1cbbf327407182bb62 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 22 Jan 2019 16:50:30 +0100 Subject: [PATCH 086/230] z3-tptp: init Z3 ships a TPTP-supporting wrapper as an example; allow building it --- pkgs/applications/science/logic/z3/tptp.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/science/logic/z3/tptp.nix diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix new file mode 100644 index 00000000000..34449542abb --- /dev/null +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -0,0 +1,31 @@ +{stdenv, z3, cmake}: +stdenv.mkDerivation rec { + pname = "z3-tptp"; + version = z3.version; + + src = z3.src; + + sourceRoot = "source/examples/tptp"; + + nativeBuildInputs = [cmake]; + buildInputs = [z3]; + + preConfigure = '' + echo 'set(Z3_LIBRARIES "-lz3")' >> CMakeLists.new + cat CMakeLists.txt | grep -E 'add_executable|project|link_libraries' >> CMakeLists.new + mv CMakeLists.new CMakeLists.txt + ''; + + installPhase = '' + mkdir -p "$out/bin" + cp "z3_tptp5" "$out/bin/" + ln -s "z3_tptp5" "$out/bin/z3-tptp" + ''; + + meta = { + inherit version; + inherit (z3.meta) license homepage platforms; + description = ''TPTP wrapper for Z3 prover''; + maintainers = [stdenv.lib.maintainers.raskin]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0279954cb2..35d986a10d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21949,6 +21949,7 @@ in }; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; + z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; tlaplus = callPackage ../applications/science/logic/tlaplus {}; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { From 6fefd37f63d38b49d0c353f633986a3b3e632919 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Mon, 21 Jan 2019 12:42:36 +0100 Subject: [PATCH 087/230] pythonPackages.aiohttp-socks: init at 0.2.2 Co-authored-by: nyanloutre --- .../python-modules/aiohttp-socks/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/aiohttp-socks/default.nix diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix new file mode 100644 index 00000000000..f898c9313e1 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: + +buildPythonPackage rec { + pname = "aiohttp-socks"; + version = "0.2.2"; + + src = fetchPypi { + inherit version; + pname = "aiohttp_socks"; + sha256 = "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Checks needs internet access + doCheck = false; + + disabled = pythonOlder "3.5.3"; + + meta = { + description = "SOCKS proxy connector for aiohttp"; + license = lib.licenses.asl20; + homepage = https://github.com/romis2012/aiohttp-socks; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc754da826..629a4c55ad9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -822,6 +822,8 @@ in { aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; ajpy = callPackage ../development/python-modules/ajpy { }; From 4b7600185ca3470e3bc1875e2ba8b23fc6f10741 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Mon, 21 Jan 2019 12:46:37 +0100 Subject: [PATCH 088/230] pythonPackages.aiorpcx: init at 0.10.2 Co-authored-by: nyanloutre --- .../python-modules/aiorpcx/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/aiorpcx/default.nix diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix new file mode 100644 index 00000000000..1c5d651264e --- /dev/null +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, attrs }: + +buildPythonPackage rec { + pname = "aiorpcx"; + version = "0.10.2"; + + src = fetchPypi { + inherit version; + pname = "aiorpcX"; + sha256 = "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj"; + }; + + propagatedBuildInputs = [ attrs ]; + + disabled = pythonOlder "3.6"; + + # Checks needs internet access + doCheck = false; + + meta = { + description = "Transport, protocol and framing-independent async RPC client and server implementation"; + license = lib.licenses.mit; + homepage = https://github.com/kyuupichan/aiorpcX; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 629a4c55ad9..83e625c1e1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -826,6 +826,8 @@ in { aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster {}; From ee0e99851f78903e7f6d251bf0571ab8289d5161 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Mon, 21 Jan 2019 12:47:05 +0100 Subject: [PATCH 089/230] electrum: 3.2.4 -> 3.3.2 Co-authored-by: nyanloutre --- pkgs/applications/misc/electrum/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4ca82f1adc3..ebce76fcbe9 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -13,15 +13,18 @@ let in python3Packages.buildPythonApplication rec { - name = "electrum-${version}"; - version = "3.2.4"; + pname = "electrum"; + version = "3.3.2"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0nwipn1alk3r54zpsv2bdwsqxw4f08bxnfmygnwakfkiaifmmhxg"; + sha256 = "0vgfdhwvrrl6dr4rd4hhxr8304bxm00sh7fw4nalm4hf7gfsbcji"; }; propagatedBuildInputs = with python3Packages; [ + aiorpcx + aiohttp + aiohttp-socks dnspython ecdsa jsonrpclib-pelix From 3c38d22596eb16444c487338285e9c979a643402 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 22 Jan 2019 15:36:08 +0100 Subject: [PATCH 090/230] electrum: enable tests --- pkgs/applications/misc/electrum/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ebce76fcbe9..c6f83104fb1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar }: +{ stdenv, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let qdarkstyle = python3Packages.buildPythonPackage rec { @@ -16,9 +16,11 @@ python3Packages.buildPythonApplication rec { pname = "electrum"; version = "3.3.2"; - src = fetchurl { - url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0vgfdhwvrrl6dr4rd4hhxr8304bxm00sh7fw4nalm4hf7gfsbcji"; + src = fetchFromGitHub { + owner = "spesmilo"; + repo = "electrum"; + rev = version; + sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; }; propagatedBuildInputs = with python3Packages; [ @@ -39,7 +41,6 @@ python3Packages.buildPythonApplication rec { qrcode requests tlslite-ng - typing # plugins keepkey @@ -56,6 +57,7 @@ python3Packages.buildPythonApplication rec { # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py + substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; postInstall = '' @@ -68,10 +70,10 @@ python3Packages.buildPythonApplication rec { --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; - doCheck = false; + checkInputs = with python3Packages; [ pytest ]; - doInstallCheck = true; - installCheckPhase = '' + checkPhase = '' + py.test electrum/tests $out/bin/electrum help >/dev/null ''; From 786ac26b860c934fc69f5c29cfbe7f234e73c879 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Tue, 22 Jan 2019 17:18:51 +0100 Subject: [PATCH 091/230] packer: 1.3.1 -> 1.3.3 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 25ec443be42..5e54a8b3705 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.3.1"; + version = "1.3.3"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0aif4ilzfv8qyqk4mn525r38xw2w34ryknzd2vrg6mcjcarm8myq"; + sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; }; meta = with stdenv.lib; { From 51d88f7d20ea6f992934927539bd3caea28bcec6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 22 Jan 2019 11:31:46 -0500 Subject: [PATCH 092/230] libglade: fix on darwin Based on discussion in https://github.com/Homebrew/legacy-homebrew/issues/11961 Closes #54448 Closes #54321 --- pkgs/desktops/gnome-2/platform/libglade/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 956fec1ddf1..1f4af86ffeb 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -13,5 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk python gettext ]; + NIX_LDFLAGS = "-lgmodule-2.0"; + propagatedBuildInputs = [ libxml2 ]; } From 93a62e93947c813e4bfc1ebc373e515e0a6c05fd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 22 Jan 2019 12:16:47 -0500 Subject: [PATCH 093/230] proot: change github owner to 'proot-me', add veprbl to maintainers --- pkgs/tools/system/proot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5cea514c606..1d72429323d 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -8,7 +8,7 @@ src = fetchFromGitHub { inherit rev sha256; repo = "proot"; - owner = "cedric-vincent"; + owner = "proot-me"; }; buildInputs = [ talloc ]; @@ -35,7 +35,7 @@ description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim makefu ]; + maintainers = with maintainers; [ ianwookim makefu veprbl ]; }; }) (if stdenv.isAarch64 then rec { From 8844f09d53a780938dfa2ae7f43b47813538169d Mon Sep 17 00:00:00 2001 From: Robert Irelan Date: Wed, 16 Jan 2019 14:07:30 -0800 Subject: [PATCH 094/230] xrdp: fix clipboard for non-ASCII characters Without this line, attempting to copy and paste non-ASCII characters will result in error messages like the following (and pasting from the server to the client will not work): ``` CLIPBOARD clipboard_send_data_response_for_text: 823 : ERROR: clipboard_send_data_response_for_text: bad string ``` --- nixos/modules/services/networking/xrdp.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 9ed3025e47d..a1c5d879f3c 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -26,6 +26,12 @@ let substituteInPlace $out/sesman.ini \ --replace LogFile=xrdp-sesman.log LogFile=/dev/null \ --replace EnableSyslog=1 EnableSyslog=0 + + # Ensure that clipboard works for non-ASCII characters + sed -i -e '/.*SessionVariables.*/ a\ + LANG=${config.i18n.defaultLocale}\ + LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive + ' $out/sesman.ini ''; in { From 73b317d923ba1f7b35c06b2b7bf1036395a0b93f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 22 Jan 2019 22:15:41 +0300 Subject: [PATCH 095/230] datadog-agent: 6.8.3 -> 6.9.0 --- pkgs/tools/networking/dd-agent/6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix index a4a3cc86f97..16955f9c4f1 100644 --- a/pkgs/tools/networking/dd-agent/6.nix +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -6,14 +6,14 @@ let in buildGoPackage rec { name = "datadog-agent-${version}"; - version = "6.8.3"; + version = "6.9.0"; owner = "DataDog"; repo = "datadog-agent"; src = fetchFromGitHub { inherit owner repo; rev = "${version}"; - sha256 = "18kk3f10pbcxplshxzbblga6bqlkk5mgy536yy27j463l4xps92q"; + sha256 = "1ddzml9ip5nm5z6cmnsrqxlmcr8411qlyr05hky7yn1dacin9ifw"; }; subPackages = [ From 1066a1ae53da16fc679b6ddae4fc0986d33c4be1 Mon Sep 17 00:00:00 2001 From: Gerd Flaig Date: Sat, 19 Jan 2019 22:08:15 +0100 Subject: [PATCH 096/230] picocom: Enable on Darwin Sets package platform to Unix and adds IOKit dependency on Darwin. --- pkgs/tools/misc/picocom/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index bb66b97039d..c49695fd9ad 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }: +{ stdenv, fetchFromGitHub, makeWrapper, lrzsz, IOKit }: + +assert stdenv.isDarwin -> IOKit != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "picocom-${version}"; @@ -11,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] + ++ optionals stdenv.isDarwin [ IOKit ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 @@ -26,6 +31,6 @@ stdenv.mkDerivation rec { description = "Minimal dumb-terminal emulation program"; homepage = https://github.com/npat-efault/picocom/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35d986a10d4..80e9680cb1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18821,7 +18821,9 @@ in picard = callPackage ../applications/audio/picard { }; - picocom = callPackage ../tools/misc/picocom { }; + picocom = callPackage ../tools/misc/picocom { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if config.pidgin.openssl or true then openssl else null; From 25cd44063fd1e4cfe7e44300441a2bd0a254cd48 Mon Sep 17 00:00:00 2001 From: Philip Patsch Date: Tue, 22 Jan 2019 16:42:41 +0100 Subject: [PATCH 097/230] bazel: add python to the runtime closure --- pkgs/development/tools/build-managers/bazel/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index b1bb5708d44..29ab94b56d9 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -125,9 +125,11 @@ stdenv.mkDerivation rec { genericPatches = '' # Substitute python's stub shebang to plain python path. (see TODO add pr URL) + # See also `postFixup` where python is added to $out/nix-support substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ --replace "/usr/bin/env python" "${python}/bin/python" \ --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ + # substituteInPlace is rather slow, so prefilter the files with grep grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! @@ -262,7 +264,10 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + echo "${python}" >> $out/nix-support/depends ''; dontStrip = true; From 88fa235e637bc4af9568329a4b298e58535a165d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 22 Jan 2019 16:47:17 +0100 Subject: [PATCH 098/230] bazel: camel-case python_bin_path --- pkgs/development/tools/build-managers/bazel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 29ab94b56d9..ad3ba03af70 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # additional tests that check bazel’s functionality passthru.tests = { - python_bin_path = callPackage ./python-bin-path-test.nix {}; + pythonBinPath = callPackage ./python-bin-path-test.nix {}; }; name = "bazel-${version}"; From b52549325311f75d2fe478bd4223e92c7edb3473 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 22 Jan 2019 22:31:52 +0100 Subject: [PATCH 099/230] nextcloud-client: fix qt error at startup The QT_PLUGIN_PATH couldn't find the needed xcb plugin. See also #51044 --- pkgs/applications/networking/nextcloud-client/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7ece1375793..624c5472ddc 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { $out/share/applications/nextcloud.desktop wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; meta = with stdenv.lib; { From 1b3affcbaa8e31af0bfe1be280f91ac3e384d96f Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 21 Jan 2019 23:07:38 +0100 Subject: [PATCH 100/230] miniflux: 2.0.13 -> 2.0.14 --- pkgs/servers/miniflux/default.nix | 15 ++--- pkgs/servers/miniflux/deps.nix | 94 +++++++++++++++++++++++++------ 2 files changed, 83 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 5000e4c396c..9e24ffe6313 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,21 +1,18 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -}: +{ stdenv , buildGoPackage , fetchFromGitHub }: buildGoPackage rec { pname = "miniflux"; - version = "2.0.13"; + version = "2.0.14"; goPackagePath = "miniflux.app"; src = fetchFromGitHub { owner = "miniflux"; repo = "miniflux"; - rev = "refs/tags/${version}"; - sha256 = "16c9jszrz3153kr0xyj7na09hpqvnjsrmsbic7qkp5a9aa839b9s"; + rev = version; + sha256 = "1wd52zk7i07k0b5rlwqd4qszq42shdb4ss8871jqlf9zlbq85a0v"; }; - + goDeps = ./deps.nix; doCheck = true; @@ -32,7 +29,7 @@ buildGoPackage rec { description = "Minimalist and opinionated feed reader"; homepage = https://miniflux.app/; license = licenses.asl20; - maintainers = with maintainers; [ benpye ]; + maintainers = with maintainers; [ rvolosatovs benpye ]; }; } diff --git a/pkgs/servers/miniflux/deps.nix b/pkgs/servers/miniflux/deps.nix index 4ef30bec3b8..2c87fb942e4 100644 --- a/pkgs/servers/miniflux/deps.nix +++ b/pkgs/servers/miniflux/deps.nix @@ -6,8 +6,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.4.1"; - sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + rev = "v1.5.0"; + sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; }; } @@ -21,6 +21,36 @@ }; } + { + goPackagePath = "github.com/cheekybits/is"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/is"; + rev = "68e9c0620927"; + sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"; + }; + } + + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { goPackagePath = "github.com/golang/protobuf"; fetch = { @@ -62,22 +92,52 @@ } { - goPackagePath = "github.com/tdewolff/minify"; + goPackagePath = "github.com/matryer/try"; fetch = { type = "git"; - url = "https://github.com/tdewolff/minify"; - rev = "v2.3.5"; - sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; + url = "https://github.com/matryer/try"; + rev = "9ac251b645a2"; + sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9"; }; } { - goPackagePath = "github.com/tdewolff/parse"; + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + + { + goPackagePath = "github.com/tdewolff/minify/v2"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/minify"; + rev = "v2.3.8"; + sha256 = "1f179di7nlmybmgmm7sadqi60zwfizlbbj0ws5k8gcswkwwr7zzx"; + }; + } + + { + goPackagePath = "github.com/tdewolff/parse/v2"; fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "v2.3.3"; - sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; + rev = "v2.3.5"; + sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz"; + }; + } + + { + goPackagePath = "github.com/tdewolff/test"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/test"; + rev = "v1.0.0"; + sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } @@ -86,8 +146,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "614d502a4dac"; - sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; }; } @@ -96,8 +156,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "8a410e7b638d"; - sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny"; + rev = "610586996380"; + sha256 = "1sqwmvf70rq1j65lv5jzyiy7gd53l37dxlnjf2xj6p2i4fcwkk4z"; }; } @@ -106,8 +166,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + rev = "d668ce993890"; + sha256 = "17m8d02fazil0dwvk33vpwvsb91asgbmmpqy05751csrfqhhdqna"; }; } @@ -126,8 +186,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4910a1d54f87"; - sha256 = "0p2pp6mny34gjcvylx3ddzdaxn7hv008hppsr11w1bvyzj7s27by"; + rev = "ad97f365e150"; + sha256 = "0s0wymq1zv5ffrnngnzk9qk83sscq3wazm17rrqb96brs2r047mk"; }; } From 8a2aef753db847ad1f696bf8af5c800f59044356 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 23 Jan 2019 01:13:09 -0500 Subject: [PATCH 101/230] krita: 4.1.5 -> 4.1.7.101 --- pkgs/applications/graphics/krita/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ce2bdcbd298..c9fdbd255d4 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,13 +8,21 @@ , python3 }: +let + +major = "4.1"; +minor = "7"; +patch = "101"; + +in + mkDerivation rec { name = "krita-${version}"; - version = "4.1.5"; + version = "${major}.${minor}.${patch}"; src = fetchurl { - url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"; + url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; + sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 85fe73a5736ada164b7180835ea1087e0b31cfe2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 19 Jan 2019 06:44:47 +0000 Subject: [PATCH 102/230] coqPackages.flocq: 2.6.0 -> {2.6.1, 3.0.0} --- .../development/coq-modules/flocq/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index ff7385a9222..6c0be377bc0 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,17 +1,31 @@ -{stdenv, bash, which, autoconf, automake, fetchurl, coq}: +{ stdenv, bash, which, autoconf, automake, fetchurl, coq }: + +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "3.0.0"; + uid = "37477"; + sha256 = "1h05ji5cmyqyv2i1l83xgkm7vfvcnl8r1dzvbp5yncm1jr9kf6nn"; + } else { + version = "2.6.1"; + uid = "37454"; + sha256 = "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin"; + } +; in stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; - version = "2.6.0"; + inherit (params) version; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37054/flocq-2.6.0.tar.gz; - sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; + url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/flocq-${version}.tar.gz"; + inherit (params) sha256; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ]; - propagatedBuildInputs = [ coq ]; + nativeBuildInputs = [ bash which autoconf automake ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ + ocaml camlp5 + ]); buildPhase = '' ${bash}/bin/bash autogen.sh @@ -31,4 +45,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; } From 8c645b4b8a54f902137e702f6f5f24c969c3505a Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Wed, 23 Jan 2019 20:31:44 +1100 Subject: [PATCH 103/230] pythonPackages.asciimatics: init at 1.10.0 (#54404) --- .../python-modules/asciimatics/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/asciimatics/default.nix diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix new file mode 100644 index 00000000000..d83e2fdbf44 --- /dev/null +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pyfiglet +, pillow +, wcwidth +, future +, mock +, nose +}: + +buildPythonPackage rec { + pname = "asciimatics"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9101b0b6885542f324980bbe13a772475cd6a12678f601228eaaea412db919ab"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pyfiglet + pillow + wcwidth + future + ]; + + checkInputs = [ + mock + nose + ]; + + # tests require a pty emulator + # which is too complicated to setup here + doCheck = false; + + meta = with lib; { + description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform"; + homepage = https://github.com/peterbrittain/asciimatics; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b88ac1c5cf2..d0e571686ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -174,6 +174,8 @@ in { asana = callPackage ../development/python-modules/asana { }; + asciimatics = callPackage ../development/python-modules/asciimatics { }; + ase = callPackage ../development/python-modules/ase { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; From 2a858b3f76620eb07230067f919ebf941e680e9a Mon Sep 17 00:00:00 2001 From: Vladimir Mosienko Date: Fri, 18 Jan 2019 11:39:42 +0500 Subject: [PATCH 104/230] teamviewer: 13.1.3026 -> 14.1.3399 --- pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index e4715cce8e1..9bfaad8a5bc 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "13.1.3026"; + version = "14.1.3399"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; - sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; + url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; + sha256 = "166ndijis2i3afz3l6nsnrdhs56v33w5cnjd0m7giqj0fbq43ws5"; }; unpackPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e9680cb1b..b3a93d88c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5742,7 +5742,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt56.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; From 04f025a8d4d123084eef91c9bae8e5314d85fcbb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Jan 2019 10:56:10 +0100 Subject: [PATCH 105/230] cyrus-sasl: Fix broken download site --- pkgs/development/libraries/cyrus-sasl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 27a8b7b1119..7b130d48928 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { version = "2.1.27"; src = fetchurl { - url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz"; + urls = + [ "http://www.cyrusimap.org/releases/${name}.tar.gz" + "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; From bdb81a8d29334416d74e0f60940ea58917047c64 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 23 Dec 2018 22:50:58 +0100 Subject: [PATCH 106/230] pythonPackages: trezor: 0.10.2 -> 0.11.1 --- .../python-modules/trezor/default.nix | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 878de187519..7808eb35932 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,27 +1,48 @@ -{ lib, fetchPypi, buildPythonPackage, - protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k +{ lib, fetchPypi, buildPythonPackage, isPy3k, python, pytest +, typing-extensions +, protobuf +, hidapi +, ecdsa +, mnemonic +, requests +, pyblake2 +, click +, construct +, libusb1 +, rlp }: buildPythonPackage rec { pname = "trezor"; - version = "0.10.2"; + version = "0.11.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d"; + sha256 = "6043f321d856e1b45b9df0c37810264f08d065bb56cd999f61a05fe2906e9e18"; }; - propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 rlp ]; + propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; - # There are no actual tests: "ImportError: No module named tests" - doCheck = false; + # build requires UTF-8 locale + LANG = "en_US.UTF-8"; + + checkInputs = [ + pytest + ]; + + # disable test_tx_api.py as it requires being online + checkPhase = '' + runHook preCheck + ${python.interpreter} -m pytest --pyarg trezorlib.tests.unit_tests --ignore trezorlib/tests/unit_tests/test_tx_api.py + runHook postCheck + ''; meta = { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = https://github.com/trezor/python-trezor; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np ]; + maintainers = with lib.maintainers; [ np prusnak ]; }; } From 3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 23 Jan 2019 20:52:02 +0900 Subject: [PATCH 107/230] adoptopenjdk: 11.0.1 -> 11.0.2 (x86_64-linux only) --- .../adoptopenjdk-bin/generate-sources.py | 10 +--- .../adoptopenjdk-bin/jdk-darwin-base.nix | 9 +-- .../adoptopenjdk-bin/jdk-linux-base.nix | 8 ++- .../compilers/adoptopenjdk-bin/sources.json | 56 ++++++++++--------- 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 66e1abd05e9..40b690048eb 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -38,21 +38,15 @@ def generate_sources(release, assets): type_map = out.setdefault(asset["os"], {}) impl_map = type_map.setdefault(asset["binary_type"], {}) arch_map = impl_map.setdefault(asset["openjdk_impl"], { - "version": version, - "build": build, "packageType": asset["binary_type"], "vmType": asset["openjdk_impl"], }) - if arch_map["version"] != version or arch_map["build"] != build: - print("error: architectures have different latest versions ({}+{} vs {}+{})".format( - arch_map["version"], arch_map["build"], version, build - ), file=sys.stderr) - sys.exit(1) - arch_map[arch_to_nixos[asset["architecture"]]] = { "url": asset["binary_link"], "sha256": get_sha256(asset["checksum_link"]), + "version": version, + "build": build, } return out diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 958f36d3928..7b16d6ad9db 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -5,13 +5,14 @@ sourcePerArch: , fetchurl }: -let result = stdenv.mkDerivation rec { +let cpuName = stdenv.hostPlatform.parsed.cpu.name; + result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 531cf3a8051..8c6db5ecd8c 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -42,15 +42,17 @@ let xorg.libXrender stdenv.cc.cc ]); + + cpuName = stdenv.hostPlatform.parsed.cpu.name; in let result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; nativeBuildInputs = [ file ]; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index bacb468c0ec..391ea9abca9 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,52 +4,56 @@ "jdk": { "hotspot": { "aarch64": { + "build": "13", "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz", + "version": "11.0.1" }, - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "hotspot", "x86_64": { - "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz" + "build": "7", + "sha256": "d89304a971e5186e80b6a48a9415e49583b7a5a9315ba5552d373be7782fc528", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz", + "version": "11.0.2" } }, "openj9": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "openj9", "x86_64": { + "build": "13", "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz", + "version": "11.0.1" } } }, "jre": { "hotspot": { "aarch64": { + "build": "28", "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz", + "version": "11" }, - "build": "28", "packageType": "jre", - "version": "11", "vmType": "hotspot", "x86_64": { - "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz" + "build": "7", + "sha256": "59c34373eec16b53798aedac73776b19e43f396fdff8a2879e66dc4b0cfd73cc", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_7.tar.gz", + "version": "11.0.2" } }, "openj9": { - "build": "28", "packageType": "jre", - "version": "11", "vmType": "openj9", "x86_64": { + "build": "28", "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz", + "version": "11" } } } @@ -57,35 +61,35 @@ "mac": { "jdk": { "hotspot": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "hotspot", "x86_64": { + "build": "13", "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz", + "version": "11.0.1" } }, "openj9": { - "build": "13", "packageType": "jdk", - "version": "11.0.1", "vmType": "openj9", "x86_64": { - "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + "build": "13", + "sha256": "b8960753a66190fa81982682357a2449b4183f3e23c20a5e3b4cf01e2989846b", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz", + "version": "11.0.1" } } }, "jre": { "hotspot": { - "build": "28", "packageType": "jre", - "version": "11", "vmType": "hotspot", "x86_64": { + "build": "28", "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz" + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz", + "version": "11" } } } From 04d21ab8998c763da6aad7d3fe851b313f0332f1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 23 Jan 2019 11:53:36 +0000 Subject: [PATCH 108/230] docker-machine: 0.14.0 -> 0.16.1 (#54487) --- .../networking/cluster/docker-machine/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index d67d9d5851c..876630c559a 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.14.0"; + version = "0.16.1"; goPackagePath = "github.com/docker/machine"; @@ -11,16 +11,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff"; + sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy"; }; postInstall = '' - mkdir -p $bin/share/bash-completion/completions/ - cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ - ''; + mkdir -p \ + $bin/share/bash-completion/completions/ \ + $bin/share/zsh/site-functions/ - postFixup = '' - mv $bin/bin/cmd $bin/bin/docker-machine + cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ + cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/ ''; meta = with stdenv.lib; { From 5f0a4ee69fb9d4b0960651eef9c6edae1de03d3b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 23 Jan 2019 07:10:18 -0500 Subject: [PATCH 109/230] linux: 4.14.94 -> 4.14.95 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index efcf6c0d5bf..883c9868b05 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.94"; + version = "4.14.95"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1w933hd1ffd62znsha5z9qgjpsnh03f3r01f4b69l814n25m2a77"; + sha256 = "1r2qrgwp3dfsrqshp765jjfh3frdhn9pkwml7h7544m3zkijjryf"; }; } // (args.argsOverride or {})) From 1b8beae40b224dadf6e7b80aa0b832c7263b45e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 23 Jan 2019 07:10:27 -0500 Subject: [PATCH 110/230] linux: 4.19.16 -> 4.19.17 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index fc51cb2bf69..08cee977da5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.16"; + version = "4.19.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; + sha256 = "0nfb5ipr6ay7ymvjm0nbk7mwxsvyyv43nl1lcg6jq99dgahr4bc7"; }; } // (args.argsOverride or {})) From 6da5e2d45f7d87ec056ed8a60901c39e0da8d48a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 23 Jan 2019 07:10:35 -0500 Subject: [PATCH 111/230] linux: 4.20.3 -> 4.20.4 --- pkgs/os-specific/linux/kernel/linux-4.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index f7636ae02d5..6d267d09892 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.3"; + version = "4.20.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ibz33xgmvyvaql2jbl9kagv13nar9pjar7pawxyga04hh9bvhdr"; + sha256 = "1l9lzpn5hp4y8xvc039xjc6ah8h4fb9db6337a0s754gzgmdfzyx"; }; } // (args.argsOverride or {})) From 8ee43e01fad4dc7578a99e8db0a02a5d62054f82 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 23 Jan 2019 07:10:45 -0500 Subject: [PATCH 112/230] linux: 4.9.151 -> 4.9.152 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 09f6ccc1325..0ce7536f860 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.151"; + version = "4.9.152"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p22xla6yq1zwhypfh1zkp0n12wjz5m806lmv8scwkbyh2amb5hm"; + sha256 = "0fcff0v488x0rylscl061dj8ylriwxg6hlg8mzppxx4sq22ppr4h"; }; } // (args.argsOverride or {})) From 5237df5186a78bf3d2be326177694ccf80a66cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Jan 2019 14:03:24 +0100 Subject: [PATCH 113/230] knot-dns: 2.7.5 -> 2.7.6 Maintenance update, nothing really important, probably. https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.7.6 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index c2b63184bec..659f8d5dea4 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.7.5"; + version = "2.7.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "7d70d6d8f708285517d1d7c4ff2e5ddfd119cd2962c7a8d3f50a4c695209a086"; + sha256 = "a1cb1877f04f7c2549c977c2658cfafd07c7e0e924f8e8aa8d4ae4b707f697a2"; }; outputs = [ "bin" "out" "dev" ]; From b4cd25c2439b1b900b2dd4ab5d0c3243b101ed87 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 23 Jan 2019 14:27:42 +0100 Subject: [PATCH 114/230] gns3Packages.{server,gui}{Stable,Preview}: 2.1.11 -> 2.1.12 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 3343141801e..368b3cd2ee6 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.11"; + stableVersion = "2.1.12"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1skcb47r0wvv7l7z487b2165pwvc397b23abfq24kw79806vknzn"; - serverSrcHash = "09j2nafxvgc6plk7s3qwv5qc0cc2bi41h4fhg8g7c85ixfx5yz8a"; + guiSrcHash = "19kk1nc8h6ljczhizkgszw6xma31p0fmh6vkygpmrfwb8975d1s6"; + serverSrcHash = "1rs3l33jf33y02xri0b7chy02cjzd8v7l20ccjw2in8mw08mpc99"; in { guiStable = mkGui { stable = true; From c4811263c88c014b0790d03660aa605c7be1b961 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Wed, 23 Jan 2019 15:07:06 +0100 Subject: [PATCH 115/230] phpPackges.php-cs-fixer: 2.13.1 -> 2.14.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a8344428f87..da301df65cb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -297,11 +297,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.13.1"; + version = "2.14.0"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "0yy9q140jd63h9qz5jvplh7ls3j7y1hf25dkxk0h4mx9cbxdzkq4"; + sha256 = "0ap5bhm1h2ldyzlch7bz5n3jj2bpm4wd6bzw51g414pk9vksswc1"; }; phases = [ "installPhase" ]; From 32e7f391fc254444289564fa00a3ee436bc9e8e9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 22 Jan 2019 01:28:50 +0100 Subject: [PATCH 116/230] scons: 3.0.3 -> 3.0.4 Announcement: https://scons.org/scons-304-is-available.html Changelog: https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.4/src/CHANGES.txt There where no regressions and no deprecations in this release (at least it does not break any additional builds in nixpkgs). --- pkgs/development/tools/build-managers/scons/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index d9bfb40b46e..f4c7e2f2171 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -7,8 +7,8 @@ in { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; - scons_3_0_3 = mkScons { - version = "3.0.3"; - sha256 = "1wwn0534d83ryfxjihvqk2ncj8wh5210pi3jxjd2cvjqa9mpkv6q"; + scons_latest = mkScons { + version = "3.0.4"; + sha256 = "1jzvcbn77ayibd7zhzs7vz316f34mxb8akfrxccjni6i09mpv96n"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65dfadb826..df30eb35e43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9083,7 +9083,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; sconsPackages = callPackage ../development/tools/build-managers/scons { }; - scons = sconsPackages.scons_3_0_3; + scons = sconsPackages.scons_latest; mill = callPackage ../development/tools/build-managers/mill { }; From 6418e349710762b834d91d56da8fc5d8eae04f51 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 23 Jan 2019 13:32:09 -0500 Subject: [PATCH 117/230] nix-universal-prefetch: init at 0.2.0 (#53436) --- .../nix-universal-prefetch/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/package-management/nix-universal-prefetch/default.nix diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix new file mode 100644 index 00000000000..a4e43f14967 --- /dev/null +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitHub +, ruby +}: + +# No gems used, so mkDerivation is fine. +stdenv.mkDerivation rec { + pname = "nix-universal-prefetch"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "samueldr"; + repo = "nix-universal-prefetch"; + rev = "v${version}"; + sha256 = "1id9iaibrm2d3fa9dkcxnb3sd0j1vh502181gdd199a1cfsmzh1i"; + }; + + installPhase = '' + mkdir -pv $out/bin + cp nix-universal-prefetch $out/bin/nix-universal-prefetch + substituteInPlace "$out/bin/nix-universal-prefetch" \ + --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby" + ''; + + meta = with stdenv.lib; { + description = "Uses nixpkgs fetchers to figure out hashes"; + homepage = https://github.com/samueldr/nix-universal-prefetch; + license = licenses.mit; + maintainers = with maintainers; [ samueldr ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85d742b5c3..474778afa5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22689,6 +22689,8 @@ in nix-top = callPackage ../tools/package-management/nix-top { }; + nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { }; + nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + (lib.optionalString (! lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) From 666870d81320f2f733af28d97a860888a27039f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Jan 2019 21:01:59 +0100 Subject: [PATCH 118/230] jemalloc nitpick: better semantics for stripPrefix --- pkgs/development/libraries/jemalloc/common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 6e83b9637c1..487af4ae97a 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -4,8 +4,8 @@ # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. # Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. Ignored on non OSX. -, stripPrefix ? true +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin , disableInitExecTls ? false }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # see the comment on stripPrefix configureFlags = [] - ++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ] - ++ optional disableInitExecTls [ "--disable-initial-exec-tls" ] + ++ optional stripPrefix "--with-jemalloc-prefix=" + ++ optional disableInitExecTls "--disable-initial-exec-tls" ; doCheck = true; From f561acc48ebde1c29e870ad15f0fba6ad8a8a3ae Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 23 Jan 2019 21:16:17 +0100 Subject: [PATCH 119/230] scons.src: Update the hash (tarball was modified) Unfortunately the tarball was modified for the official release and "nix-store -r --check $(nix-instantiate -A scons.src)" did not catch this (not sure why ATM). Thanks @pbogdan for noticing this :) --- pkgs/development/tools/build-managers/scons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index f4c7e2f2171..2d0bf244370 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -9,6 +9,6 @@ in { }; scons_latest = mkScons { version = "3.0.4"; - sha256 = "1jzvcbn77ayibd7zhzs7vz316f34mxb8akfrxccjni6i09mpv96n"; + sha256 = "06lv3pmdz5l23rx3kqsi1k712bdl36i942hgbjh209s94mpb7f72"; }; } From 63ed962e4b6c37065e83721744128729633586e1 Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Wed, 23 Jan 2019 21:29:02 +0100 Subject: [PATCH 120/230] nixos/restic: change type of timerConfig option to attrsOf unitOption This is needed for correctly passing the option to "systemd.timer" --- nixos/modules/services/backup/restic.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 6ece5a9b5ad..7e8e91e4b9c 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -1,6 +1,11 @@ { config, lib, pkgs, ... }: with lib; + +let + # Type for a valid systemd unit option. Needed for correctly passing "timerConfig" to "systemd.timers" + unitOption = (import ../../system/boot/systemd-unit-options.nix { inherit config lib; }).unitOption; +in { options.services.restic.backups = mkOption { description = '' @@ -47,7 +52,7 @@ with lib; }; timerConfig = mkOption { - type = types.attrsOf types.str; + type = types.attrsOf unitOption; default = { OnCalendar = "daily"; }; From d9332f2a7159a6cbdcd63c8d4c739982ce850a0c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 23 Jan 2019 16:35:11 -0500 Subject: [PATCH 121/230] unixtools.utillinux: add column requested on IRC --- pkgs/os-specific/bsd/netbsd/default.nix | 6 ++++++ pkgs/top-level/unix-tools.nix | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index c53b7e50b9f..d7f7c64fc2d 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -548,6 +548,12 @@ let NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; + column = netBSDDerivation { + path = "usr.bin/column"; + version = "8.0"; + sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; + }; + }; in nbPackages diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index bc166382a60..7d498606833 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -55,6 +55,10 @@ let linux = pkgs.utillinux; darwin = pkgs.darwin.text_cmds; }; + column = { + linux = pkgs.utillinux; + darwin = pkgs.netbsd.column; + }; eject = { linux = pkgs.utillinux; }; @@ -182,7 +186,7 @@ let compat = with bins; lib.mapAttrs makeCompat { procps = [ ps sysctl top watch ]; utillinux = [ fsck fdisk getopt hexdump mount - script umount whereis write col ]; + script umount whereis write col column ]; nettools = [ arp hostname ifconfig netstat route ]; }; in bins // compat From 8347722775062719dd0557b349fdba5c62add25d Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 18 Jan 2019 17:39:44 +0100 Subject: [PATCH 122/230] nixos/plex: allow access to hardware acceleration libraries CUDA and OpenCL libraries are located in /run/opengldriver/lib and Plex can make use of them if available. --- nixos/modules/services/misc/plex.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 8fe5879c276..e4810ce9f87 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -145,7 +145,7 @@ in PLEX_MEDIA_SERVER_HOME="${cfg.package}/usr/lib/plexmediaserver"; PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6"; PLEX_MEDIA_SERVER_TMPDIR="/tmp"; - LD_LIBRARY_PATH="${cfg.package}/usr/lib/plexmediaserver"; + LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver"; LC_ALL="en_US.UTF-8"; LANG="en_US.UTF-8"; }; From ca72dbd125701b348e819da027aaad35f611f725 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 15 Jan 2019 15:01:23 +0100 Subject: [PATCH 123/230] nixos/prometheus-dovecot-exporter: enhance `socketPath` documentation In Dovecot 2.3[1] the stats module changed and now the UNIX socket provided by Dovecot by default isn't compatible anymore with the exporter[2]. By enabling the `old-stats` plugin in Dovecot this issue can be solved which should be documented in this module. [1] https://wiki2.dovecot.org/Upgrading/2.3 [2] https://github.com/kumina/dovecot_exporter/issues/8 --- .../prometheus/exporters/dovecot.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index 4ca6d4e5f8b..c47e87a3dc3 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -18,12 +18,34 @@ in socketPath = mkOption { type = types.path; default = "/var/run/dovecot/stats"; - example = "/var/run/dovecot2/stats"; + example = "/var/run/dovecot2/old-stats"; description = '' Path under which the stats socket is placed. The user/group under which the exporter runs, should be able to access the socket in order to scrape the metrics successfully. + + Please keep in mind that the stats module has changed in + Dovecot 2.3+ which + is not compatible with this exporter. + + The following extra config has to be passed to Dovecot to ensure that recent versions + work with this exporter: + + { + = true; + = "/var/run/dovecot2/old-stats"; + = ''' + mail_plugins = $mail_plugins old_stats + service old-stats { + unix_listener old-stats { + user = nobody + group = nobody + } + } + '''; + } + ''; }; scopes = mkOption { From f88f64365906e6c9aca5174a78046be47f8822e5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 23 Jan 2019 23:58:29 +0100 Subject: [PATCH 124/230] python37Packages.cryptography: Add meta-attributes --- .../python-modules/cryptography/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 603f92336c0..ab4aa8e89fd 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -66,4 +66,18 @@ buildPythonPackage rec { # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; + + meta = with stdenv.lib; { + description = "A package which provides cryptographic recipes and primitives"; + longDescription = '' + Cryptography includes both high level recipes and low level interfaces to + common cryptographic algorithms such as symmetric ciphers, message + digests, and key derivation functions. + Our goal is for it to be your "cryptographic standard library". It + supports Python 2.7, Python 3.4+, and PyPy 5.3+. + ''; + homepage = https://github.com/pyca/cryptography; + license = with licenses; [ asl20 bsd3 psfl ]; + maintainers = with maintainers; [ primeos ]; + }; } From a66ef3aa3d6cbc900528f5163b3115576546ef56 Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Wed, 23 Jan 2019 15:47:55 -0800 Subject: [PATCH 125/230] Add options to build disk image function (#50239) * add options to build disk image function * Revert suffix changes --- nixos/lib/make-disk-image.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 6fec322f909..5e86ea479d5 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -27,6 +27,9 @@ , # The root file system type. fsType ? "ext4" +, # Filesystem label + label ? "nixos" + , # The initial NixOS configuration file to be copied to # /etc/nixos/configuration.nix. configFile ? null @@ -134,9 +137,9 @@ let format' = format; in let # Get start & length of the root partition in sectors to $START and $SECTORS. eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) - mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K '' else '' - mkfs.${fsType} -F -L nixos $diskImage + mkfs.${fsType} -F -L ${label} $diskImage ''} root="$PWD/root" From a866551226a255207ee0cf39827086dbb732f0db Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Thu, 24 Jan 2019 02:37:29 +0200 Subject: [PATCH 126/230] nixos-option: prune backtick from output It doesn't work good with double-click selection in terminal (it gets into selection buffer of some terminals) --- nixos/modules/installer/tools/nixos-option.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 76db778da27..4560e9c7403 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -320,7 +320,7 @@ else escapeQuotes () { eval echo "$1"; } nixMap escapeQuotes "$names" else - echo 1>&2 "An error occurred while looking for attribute names. Are you sure that \`$option' exists?" + echo 1>&2 "An error occurred while looking for attribute names. Are you sure that '$option' exists?" fi fi From ba8b4121f5ec808e0b276a8a1473f7988ccc2d8d Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Wed, 23 Jan 2019 18:19:46 -0700 Subject: [PATCH 127/230] maintainers/maintainer-list: add PGP fingerprint --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 520ab24117a..038be8137b4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4381,6 +4381,10 @@ email = "me@tadeo.ca"; github = "tadeokondrak"; name = "Tadeo Kondrak"; + keys = [{ + longkeyid = "ed25519/0xFBE607FCC49516D3"; + fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; + }]; }; tadfisher = { email = "tadfisher@gmail.com"; From b76961124d938dae59e4c9db90832b87ccb1b42b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 18 Jan 2019 15:55:07 +0000 Subject: [PATCH 128/230] coq_8_9: 8.9+beta1 -> 8.9.0 --- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 5fab9788a94..0a4e1dddcae 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -25,7 +25,7 @@ let "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; - "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8"; + "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; }."${version}"; coq-version = builtins.substring 0 3 version; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 4c7361d3517..591c9db9d12 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -88,7 +88,7 @@ in rec { version = "8.8.2"; }; coq_8_9 = callPackage ../applications/science/logic/coq { - version = "8.9+beta1"; + version = "8.9.0"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; From e138c1e4e88ffe1058268d5891802447e0b525e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 10:09:20 +0100 Subject: [PATCH 129/230] python.pkgs.GitPython: use patch to specify path to git --- .../python-modules/GitPython/default.nix | 13 ++++++++----- .../GitPython/hardcode-git-path.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/GitPython/hardcode-git-path.patch diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index aef59ba2ab9..2e011906dc3 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, git, gitdb2, mock, nose, ddt }: +{ lib, buildPythonPackage, fetchPypi, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { version = "2.1.11"; @@ -9,13 +9,16 @@ buildPythonPackage rec { sha256 = "8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8"; }; + patches = [ + (substituteAll { + src = ./hardcode-git-path.patch; + inherit git; + }) + ]; + checkInputs = [ mock nose ddt ]; propagatedBuildInputs = [ gitdb2 ]; - postPatch = '' - sed -i "s|^refresh()$|refresh(path='${git}/bin/git')|" git/__init__.py - ''; - # Tests require a git repo doCheck = false; diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch new file mode 100644 index 00000000000..93747995992 --- /dev/null +++ b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch @@ -0,0 +1,13 @@ +diff --git a/git/cmd.py b/git/cmd.py +index a4faefe..51ad442 100644 +--- a/git/cmd.py ++++ b/git/cmd.py +@@ -175,7 +175,7 @@ class Git(LazyMixin): + + # CONFIGURATION + +- git_exec_name = "git" # default that should work on linux and windows ++ git_exec_name = "@git@/bin/git" + + # Enables debugging of GitPython's git commands + GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) From ee82616089ff920792b6c265068902c4fa3d4f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Jan 2019 10:27:11 +0100 Subject: [PATCH 130/230] python.pkgs.GitPython: move ddt to propagatedBuildInputs It is listed in requirements.txt, not test-requirements.txt. --- pkgs/development/python-modules/GitPython/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 2e011906dc3..24fe4a2458d 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, git, gitdb2, mock, nose, ddt }: +{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { version = "2.1.11"; @@ -16,8 +16,8 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock nose ddt ]; - propagatedBuildInputs = [ gitdb2 ]; + checkInputs = [ nose ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ gitdb2 ddt ]; # Tests require a git repo doCheck = false; From d60be08baeb4de34e57f47244e32fa9042f3e663 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 24 Jan 2019 11:15:13 +0100 Subject: [PATCH 131/230] sonarr: 2.0.0.5252 -> 2.0.0.5301 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 1b4bad093c4..7405f716933 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5252"; + version = "2.0.0.5301"; src = fetchurl { url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0rs6sw2yjnhv3v3qbnalz445cilppw91zxxkj93dbp5vdlinw3fp"; + sha256 = "16jjxs0gj5jdy0r4ynhck36b2balphqj24n2gfabrlgxsc6g20jv"; }; buildInputs = [ From 79e699096d949d50d70e266b6964f9200f236b82 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 24 Jan 2019 11:57:32 +0100 Subject: [PATCH 132/230] pythonPackages.cryptography_vectors: Add meta-attributes --- .../cryptography_vectors/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index bcb60eb0d8d..6fc4d5a69ef 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -1,6 +1,4 @@ -{ buildPythonPackage -, fetchPypi -}: +{ buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { # also bump cryptography @@ -14,4 +12,12 @@ buildPythonPackage rec { # No tests included doCheck = false; -} \ No newline at end of file + + meta = with lib; { + description = "Test vectors for the cryptography package"; + homepage = https://cryptography.io/en/latest/development/test-vectors/; + # Source: https://github.com/pyca/cryptography/tree/master/vectors; + license = with licenses; [ asl20 bsd3 ]; + maintainers = with maintainers; [ primeos ]; + }; +} From be89ca5564979200609025f7c2e56ed120bc0e00 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 24 Jan 2019 12:27:17 +0100 Subject: [PATCH 133/230] maintainers/maintainer-list.nix: Add my OpenPGP keys --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 520ab24117a..89b321f6b63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3604,6 +3604,14 @@ email = "dev.primeos@gmail.com"; github = "primeos"; name = "Michael Weiss"; + keys = [ + { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only + fingerprint = "86A7 4A55 07D0 58D1 322E 37FD 1308 26A6 C2A3 89FD"; + } + { longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc. + fingerprint = "AF85 991C C950 49A2 4205 1933 BCA9 943D D1DF 4C04"; + } + ]; }; Profpatsch = { email = "mail@profpatsch.de"; From 4ecd09ecb803e3459c1ab09220b5a63c9f411847 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 23 Jan 2019 09:38:33 -0500 Subject: [PATCH 134/230] pythonPackages.faker: 1.0.1 -> 1.0.2 Fixes tests for at least Python 3.6 --- pkgs/development/python-modules/faker/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9a46d9611e0..548c7a59bc6 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "067mdy9p1vbkypr3vazmrb0sga6maqbk542hr7hmzcb5lp3dr8sj"; + sha256 = "0v1pjzn9z20ckgv3kji7c8nwcsm7670z4i43ic9skjrdbcqylwfq"; }; buildInputs = [ pytestrunner ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { ] ++ lib.optional (pythonOlder "3.3") ipaddress; postPatch = '' + find tests -type d -name "__pycache__" | xargs rm -r substituteInPlace setup.py --replace "pytest>=3.8.0,<3.9" "pytest" ''; From d4957cc98ea62b0fe4edf7973dd7f0b4c0225139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 Jan 2019 13:11:44 +0000 Subject: [PATCH 135/230] nix-review: 1.0.4 -> 1.0.5 --- pkgs/tools/package-management/nix-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 1e10ea087d1..a57056569c0 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "0mlcr4iscw43m04sby1m4i58fqv5c1qq1vkbgg2wgr0rpr0rf0ik"; + sha256 = "13dv2zpnhf218hfmixsgsbvy9zgrp7b0d125hvq8sk5x57f6114q"; }; makeWrapperArgs = [ From 04ee7db38b34d5ca4f016cadb4aa67107924ed96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 Jan 2019 14:26:41 +0000 Subject: [PATCH 136/230] maintainers: add gpg key for mic92 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 520ab24117a..159c8467258 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2886,6 +2886,11 @@ email = "joerg@thalheim.io"; github = "mic92"; name = "Jörg Thalheim"; + keys = [{ + # compare with https://keybase.io/Mic92 + longkeyid = "rsa4096/0x003F2096411B5F92"; + fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; + }]; }; michaelpj = { email = "michaelpj@gmail.com"; From 11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jan 2019 16:01:49 +0100 Subject: [PATCH 137/230] Fix copy-tarballs.pl --- maintainers/scripts/copy-tarballs.pl | 10 +++++----- maintainers/scripts/find-tarballs.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 31e6045fb64..59696a4432d 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -101,8 +101,8 @@ sub uploadFile { my ($name, $dest) = @_; #print STDERR "linking $name to $dest...\n"; $bucket->add_key($name, "", { - 'x-amz-website-redirect-location' => "/" . $dest, - 'x-amz-acl' => "public-read" + 'x-amz-website-redirect-location' => "/" . $dest, + 'x-amz-acl' => "public-read" }) or die "failed to create redirect from $name to $dest\n"; $cache{$name} = 1; @@ -116,8 +116,8 @@ sub uploadFile { # Upload the file as sha512/. print STDERR "uploading $fn to $mainKey...\n"; $bucket->add_key_filename($mainKey, $fn, { - 'x-amz-meta-original-name' => $name, - 'x-amz-acl' => "public-read" + 'x-amz-meta-original-name' => $name, + 'x-amz-acl' => "public-read" }) or die "failed to upload $fn to $mainKey\n"; $cache{$mainKey} = 1; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index bd6afda900c..52cce909918 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -31,7 +31,7 @@ let if !canEval x then [] else if isDerivation x then optional (canEval x.drvPath) x else if isList x then concatLists (map derivationsIn' x) - else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x) + else if isAttrs x then concatLists (mapAttrsToList (n: v: addErrorContext "while finding tarballs in '${n}':" (derivationsIn' v)) x) else [ ]; keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; From 399761ea0a9cf1f32556e5cf55e613d319761a45 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 24 Jan 2019 17:20:49 +0100 Subject: [PATCH 138/230] gpgme: Update the URL for fix-key-expiry.patch The old URL was gone, see: https://github.com/NixOS/nixpkgs/pull/53693#pullrequestreview-195177688 Thanks @volth :) --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0e4ef72b8aa..fc98af8b2ca 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "fix-key-expiry.patch"; - url = "https://files.gnupg.net/file/data/fehgbjmataj5tc2pnfhj/PHID-FILE-aqck6l4elhw53tjanrie/file"; - sha256 = "1h80m045gy7r0g7dzzlfpql6p065x88p274ij9jnf7d4lwwgrf1a"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; + sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; }) ]; From 9a1b53304a39bb48481b2882c3954a7f5ea5d20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 31 Oct 2018 00:02:27 +0100 Subject: [PATCH 139/230] nixos/mysql: Support bootstrapping a Galera cluster The default galera_new_cluster script tries to set this environment variable using systemctl set-environment which doesn't work if the variable is not being used in the unit file ;) --- nixos/modules/services/databases/mysql.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 1ba878957ed..8e7945cfdb5 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -274,7 +274,8 @@ in serviceConfig = { Type = if hasNotify then "notify" else "simple"; RuntimeDirectory = "mysqld"; - ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions}"; + # The last two environment variables are used for starting Galera clusters + ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION"; }; postStart = '' From a3d97176d2f7cfb4f76ab450a433817ed099ec78 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 24 Jan 2019 17:44:16 +0100 Subject: [PATCH 140/230] teamspeak_server: 3.5.0 -> 3.5.1 --- .../networking/instant-messengers/teamspeak/server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 41e7db569c4..fdb3326803c 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.5.0"; + version = "3.5.1"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "0zk7rbi6mvs2nnsjhv4aizl5ydiyr46ng2i3lr8r78gyb88nxmcv" - else "0nahsmcnykgchgv50jb22fin74sab1zl8gy6m6s8mjk570qlvzzm"; + then "0ygb867ff2fvi9n9hgs4hldpg4y012w4i1d9cx4f5mpli1xim6da" + else "0g1cixsldpdbfzg2vain7h3hr5j3xjdngjw66r0aqnzbx743gjzj"; }; buildInputs = [ makeWrapper ]; From c5f0dbb660fc30adcd2f804f3257b57dac063649 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 24 Jan 2019 18:30:35 +0100 Subject: [PATCH 141/230] rustc: mark compileprocess as timeconsuming --- pkgs/development/compilers/rust/rustc.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 3ec08a82d01..1c82e71dd1d 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -166,6 +166,8 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/30181 # enableParallelBuilding = false; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with stdenv.lib; { homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; From f826944d7754da8c3dd34cdce2aa041b14728e71 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 24 Jan 2019 21:37:54 +0100 Subject: [PATCH 142/230] zsh: 5.6.2 -> 5.7 --- pkgs/shells/zsh/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index bebf219d9b2..46d8375fb6b 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, fetchpatch }: let - version = "5.6.2"; + version = "5.7"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "05014rg6hkwiv1p56iij8wn2rghmwjxs5qsj3d3xigbwaikk55wq"; + sha256 = "0pgisyi82pg5mycx1k7vfx9hwzl6zq00r5s9v91lg4gqisvlvagh"; }; in @@ -15,18 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5"; + sha256 = "04ynid3ggvy6i5c26bk52mq6x5vyrdwgryid9hggmnb1nf8b41vq"; }; - patches = [ - (fetchpatch { - name = "search-xdg-data-dirs.patch"; - url = https://github.com/zsh-users/zsh/commit/624219e0e4cbfdfb286e707bd2853f2d7b6a4a7d.patch; - sha256 = "0i0g7dc0px57vpklm1f4w20vyc92nv15y09r5clvib2kjkxjy2cf"; - excludes = [ "ChangeLog" ]; - }) - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ From 99a746b5b2e31af2bb3b74274bc7bb9fd4dff553 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 24 Jan 2019 22:00:12 +0100 Subject: [PATCH 143/230] calibre: 3.37.0 -> 3.38.1 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 9b1c99c3eed..cd3ee82aceb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.37.0"; + version = "3.38.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "12si7jag5ildy08h0nfs4rfpn417i82valxbk2wjkypp226gqi05"; + sha256 = "07fvpnabk17sfg81xn0bsnw36k45hawwz0fcz5cmp5qydm85ncv0"; }; patches = [ From b5a42132d57f26b954d4c6d42f07fcb60dbff799 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 24 Jan 2019 22:03:05 +0100 Subject: [PATCH 144/230] autossh: 1.4f -> 1.5.g --- pkgs/tools/networking/autossh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 452837ef2e4..a123e551a90 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { - name = "autossh-1.4f"; + name = "autossh-1.4g"; src = fetchurl { url = "http://www.harding.motd.ca/autossh/${name}.tgz"; - sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1"; + sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; }; buildInputs = [ openssh ]; From 8dff3214b7e08b5addaa5898d3dabbd8f24dfdcb Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 24 Jan 2019 22:24:57 +0100 Subject: [PATCH 145/230] tmsu: 0.7.1 -> 0.7.4 --- pkgs/tools/filesystems/tmsu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 3c6dd2648ef..fef1d0699e7 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.7.1"; + version = "0.7.4"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "0d1sryq80chb9vrf9z0lfx4xb3sdkg01f9hqf3bb9c89vm6v2lwg"; + sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq"; }; buildInputs = [ go fuse ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { patchShebangs tests/. export GOPATH=$PWD + export GOCACHE=$TMPDIR/go-cache ''; installPhase = '' From 3fe937275d3ce05a8ec420d51437f8c246f09f4c Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 24 Jan 2019 21:35:15 +0000 Subject: [PATCH 146/230] cargo-web: 0.6.15 -> 0.6.23 --- pkgs/development/tools/cargo-web/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index e350e475f73..1feaf2c79a9 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform +{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform , CoreServices, Security }: rustPlatform.buildRustPackage rec { name = "cargo-web-${version}"; - version = "0.6.15"; + version = "0.6.23"; src = fetchFromGitHub { owner = "koute"; repo = "cargo-web"; rev = version; - sha256 = "076g7cd9v53vi8xvd4kfsiyzw1m2hhd1lwlwcv2dx2s5vlw4dxzh"; + sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; }; - cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si"; + cargoSha256 = "16wzgyn3k0yn70y0ciliyx1sjgppmkv9b4bn9p4x0qi6l0ah7fdp"; - nativeBuildInputs = [ openssl pkgconfig ]; + nativeBuildInputs = [ openssl perl pkgconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; meta = with stdenv.lib; { From 464cbda38611fa33e00c4994c4b50d74b2cf028c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 24 Jan 2019 23:16:31 +0100 Subject: [PATCH 147/230] pythonPackages.python-gnupg: 0.4.3 -> 0.4.4 Fixes CVE-2019-6690: https://blog.hackeriet.no/cve-2019-6690-python-gnupg-vulnerability/ --- pkgs/development/python-modules/python-gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 86e58d489a6..8bba1dda99f 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.3"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "2d158dfc6b54927752b945ebe57e6a0c45da27747fa3b9ae66eccc0d2147ac0d"; + sha256 = "45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e"; }; propagatedBuildInputs = [ gnupg1 ]; From 026ec75df522411cf963ba56d619d0072c645557 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 24 Jan 2019 23:18:00 +0100 Subject: [PATCH 148/230] pythonPackages.python-gnupg: remove name, remove propagatedBuildInputs --- pkgs/development/python-modules/python-gnupg/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 8bba1dda99f..1ecf5fe1061 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,7 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, gnupg1 }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "python-gnupg"; version = "0.4.4"; @@ -10,8 +9,6 @@ buildPythonPackage rec { sha256 = "45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e"; }; - propagatedBuildInputs = [ gnupg1 ]; - # Let's make the library default to our gpg binary patchPhase = '' substituteInPlace gnupg.py \ From bae9fd59a945357f7712a63c0a09b72d4ed44e6e Mon Sep 17 00:00:00 2001 From: Niclas <33751841+buffet@users.noreply.github.com> Date: Thu, 24 Jan 2019 23:33:09 +0100 Subject: [PATCH 149/230] grim: init at 1.0 (#54498) --- pkgs/tools/graphics/grim/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/graphics/grim/default.nix diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix new file mode 100644 index 00000000000..fcb2b4ba327 --- /dev/null +++ b/pkgs/tools/graphics/grim/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }: + +stdenv.mkDerivation rec { + name = "grim-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = "grim"; + rev = "v${version}"; + sha256 = "1mpmxkzssgzqh9z263y8vk40dayw32kah66sb8ja7yw22rm7f4zf"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + cairo + libjpeg + wayland + wayland-protocols + ]; + + meta = with stdenv.lib; { + description = "Grab images from a Wayland compositor"; + homepage = https://github.com/emersion/grim; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 556dfcf0c04..7ff80a526e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1493,6 +1493,8 @@ in pythonPackages = python3Packages; }; + grim = callPackage ../tools/graphics/grim { }; + gringo = callPackage ../tools/misc/gringo { }; grobi = callPackage ../tools/X11/grobi { }; From 2b8ca280202c26a71db608a5f8db4545f5b8e937 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 25 Jan 2019 10:19:12 +0900 Subject: [PATCH 150/230] nvtop: 0.2.2 -> 1.0.0 --- pkgs/tools/system/nvtop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 0b4a33e4385..19581c82c78 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvtop-${version}"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "0gampikzmd1l0vdhvarl0hckl6kmjh2rwcllpg6rrm2p75njw7hv"; + sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; cmakeFlags = [ From cb14f1404a4d44c97f8c3003f075ae6a21cc9e63 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 24 Jan 2019 22:44:10 -0500 Subject: [PATCH 151/230] =?UTF-8?q?fetchFromGitLab:=20replace=20=E2=80=98.?= =?UTF-8?q?=E2=80=99=20with=20=E2=80=98%2E=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason gitlab does not recognize the . correctly. Fixes #53280 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ff80a526e4..efe9dbd2e62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -320,7 +320,7 @@ in ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${group}%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${lib.replaceStrings ["."] ["%2E"] group}%2F"}${lib.replaceStrings ["."] ["%2E"] owner}%2F${lib.replaceStrings ["."] ["%2E"] repo}/repository/archive.tar.gz?sha=${rev}"; meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/"; } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; From 1f433e51b63dc56bf5920cc84338ee3a9d8a80ea Mon Sep 17 00:00:00 2001 From: Yucheng Zhang Date: Fri, 25 Jan 2019 12:08:40 +0800 Subject: [PATCH 152/230] opam: 2.0.0 -> 2.0.2 --- pkgs/development/tools/ocaml/opam/default.nix | 44 +++++++++++-------- .../tools/ocaml/opam/opam-mccs-darwin.patch | 18 -------- .../tools/ocaml/opam/opam-pull-3487.patch | 23 ---------- pkgs/development/tools/ocaml/opam/opam.nix.pl | 3 +- 4 files changed, 27 insertions(+), 61 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch delete mode 100644 pkgs/development/tools/ocaml/opam/opam-pull-3487.patch diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 8e89dd3fadd..b3e9e71ebc0 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -11,8 +11,8 @@ let sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; cppo = fetchurl { - url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz"; - sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7"; + url = "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"; + sha256 = "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf"; }; cudf = fetchurl { url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; @@ -22,42 +22,46 @@ let url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; + dune-local = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/1.2.1/dune-1.2.1.tbz"; + sha256 = "00c5dbm4hkdapc2i7pg07b2lj8sv6ly38qr7zid58cdmbmzq21z9"; + }; extlib = fetchurl { url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; - jbuilder = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz"; - sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10"; - }; mccs = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz"; - sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4"; + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+9.tar.gz"; + sha256 = "0gf86c65jdxxcwd96kcmrqxrmnnzc0570gb9ad6c57rl3fyy8yhv"; }; ocamlgraph = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; }; opam-file-format = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz"; - sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb"; + url = "https://github.com/ocaml/opam-file-format/archive/2.0.0.tar.gz"; + sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; }; re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz"; - sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr"; + url = "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz"; + sha256 = "0qkv42a4hpqpxvqa4kdkkcbhbg7aym9kv4mqgm3m51vxbd0pq0lv"; }; result = fetchurl { url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; }; + seq = fetchurl { + url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; + sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; + }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.0.zip"; - sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8"; + url = "https://github.com/ocaml/opam/archive/2.0.2.zip"; + sha256 = "0hxf0ns3si03rl7dxix7i30limbl50ffyvdyk9bqqms4ir8dcza6"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.0"; + version = "2.0.2"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -68,16 +72,17 @@ in stdenv.mkDerivation rec { ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz + ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz - ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz + ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz ''; - patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ]; + patches = [ ./opam-shebangs.patch ]; preConfigure = '' substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" @@ -98,7 +103,8 @@ in stdenv.mkDerivation rec { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store $out/bin/opam-installer --prefix=$installer opam-installer.install ''; @@ -111,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch +# Generated by: ./opam.nix.pl -v 2.0.2 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch deleted file mode 100644 index 501242c40a0..00000000000 --- a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch -new file mode 100644 -index 00000000..157e2094 ---- /dev/null -+++ b/src_ext/patches/mccs/build-on-darwin.patch -@@ -0,0 +1,12 @@ -+diff --git a/src/context_flags.ml b/src/context_flags.ml -+index 7470030..6e07370 100644 -+--- a/src/context_flags.ml -++++ b/src/context_flags.ml -+@@ -24,6 +24,7 @@ let ifc c x = if c then x else [] -+ -+ let cxxflags = -+ let flags = -++ (ifc (Config.system = "macosx") ["-x"; "c++"]) @ -+ (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @ -+ (ifc useGLPK ["-DUSEGLPK"]) @ -+ (ifc useCOIN ["-DUSECOIN"]) @ diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch deleted file mode 100644 index e047c8298bc..00000000000 --- a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh -index 6f5d7dbea..3e1a3e1b4 100755 ---- a/src/state/shellscripts/bwrap.sh -+++ b/src/state/shellscripts/bwrap.sh -@@ -1,4 +1,6 @@ --#!/bin/bash -ue -+#!/usr/bin/env bash -+ -+set -ue - - if ! command -v bwrap >/dev/null; then - echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2 -@@ -11,7 +13,9 @@ fi - - ARGS=(--unshare-net --new-session) - ARGS=("${ARGS[@]}" --proc /proc --dev /dev) --ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var) -+ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp) -+ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp) -+ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var) - - add_mounts() { - case "$1" in diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 1862add452d..537997eb8a4 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -113,7 +113,8 @@ print <<'EOF'; mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store $out/bin/opam-installer --prefix=$installer opam-installer.install ''; From 8be2345baf4ae0ba6681061ec0766e83dcac6282 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 24 Jan 2019 23:08:16 +0100 Subject: [PATCH 153/230] nixos/sonarr: Add test for sonarr to ensure startup --- nixos/tests/all-tests.nix | 1 + nixos/tests/sonarr.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/tests/sonarr.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8c2df2435a7..7555fabf858 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -194,6 +194,7 @@ in smokeping = handleTest ./smokeping.nix {}; snapper = handleTest ./snapper.nix {}; solr = handleTest ./solr.nix {}; + sonarr = handleTest ./sonarr.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; diff --git a/nixos/tests/sonarr.nix b/nixos/tests/sonarr.nix new file mode 100644 index 00000000000..3d5c3b19b6e --- /dev/null +++ b/nixos/tests/sonarr.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "sonarr"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.sonarr.enable = true; }; + + testScript = '' + $machine->waitForUnit('sonarr.service'); + $machine->waitForOpenPort('8989'); + $machine->succeed("curl --fail http://localhost:8989/"); + ''; +}) From ddcb2c473d41ebc78e00eb61458b5ead9bd187ca Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 24 Jan 2019 23:09:21 +0100 Subject: [PATCH 154/230] nixos/radarr: Add test for radarr to ensure startup --- nixos/tests/all-tests.nix | 1 + nixos/tests/radarr.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/tests/radarr.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7555fabf858..d679c4e6e06 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -178,6 +178,7 @@ in quagga = handleTest ./quagga.nix {}; quake3 = handleTest ./quake3.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; + radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; redmine = handleTest ./redmine.nix {}; roundcube = handleTest ./roundcube.nix {}; diff --git a/nixos/tests/radarr.nix b/nixos/tests/radarr.nix new file mode 100644 index 00000000000..6b9a909e44b --- /dev/null +++ b/nixos/tests/radarr.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "radarr"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.radarr.enable = true; }; + + testScript = '' + $machine->waitForUnit('radarr.service'); + $machine->waitForOpenPort('7878'); + $machine->succeed("curl --fail http://localhost:7878/"); + ''; +}) From eb356ef3f890065b7ce650c41988870b83b36a6c Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 24 Jan 2019 23:09:42 +0100 Subject: [PATCH 155/230] nixos/lidarr: Add test for lidarr to ensure startup --- nixos/tests/all-tests.nix | 1 + nixos/tests/lidarr.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/tests/lidarr.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d679c4e6e06..4a7235b748b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -120,6 +120,7 @@ in latestKernel.login = handleTest ./login.nix { latestKernel = true; }; ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; + lidarr = handleTest ./lidarr.nix {}; #lightdm = handleTest ./lightdm.nix {}; login = handleTest ./login.nix {}; #logstash = handleTest ./logstash.nix {}; diff --git a/nixos/tests/lidarr.nix b/nixos/tests/lidarr.nix new file mode 100644 index 00000000000..58bf82503f8 --- /dev/null +++ b/nixos/tests/lidarr.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "lidarr"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.lidarr.enable = true; }; + + testScript = '' + $machine->waitForUnit('lidarr.service'); + $machine->waitForOpenPort('8686'); + $machine->succeed("curl --fail http://localhost:8686/"); + ''; +}) From 3df02c6c03f88bf1db14950feccb79300712fe41 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 25 Jan 2019 07:09:36 +0100 Subject: [PATCH 156/230] nixos/jackett: Add test for jackett to ensure startup --- nixos/tests/all-tests.nix | 1 + nixos/tests/jackett.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/tests/jackett.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4a7235b748b..7bc2f3076f1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -107,6 +107,7 @@ in initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; ipv6 = handleTest ./ipv6.nix {}; + jackett = handleTest ./jackett.nix {}; jenkins = handleTest ./jenkins.nix {}; #kafka = handleTest ./kafka.nix {}; # broken since openjdk: 8u181 -> 8u192 kerberos = handleTest ./kerberos/default.nix {}; diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix new file mode 100644 index 00000000000..399a0c27232 --- /dev/null +++ b/nixos/tests/jackett.nix @@ -0,0 +1,18 @@ +import ./make-test.nix ({ lib, ... }: + +with lib; + +rec { + name = "jackett"; + meta.maintainers = with maintainers; [ etu ]; + + nodes.machine = + { pkgs, ... }: + { services.jackett.enable = true; }; + + testScript = '' + $machine->waitForUnit('jackett.service'); + $machine->waitForOpenPort('9117'); + $machine->succeed("curl --fail http://localhost:9117/"); + ''; +}) From 2a096ce8b2d299d536d03681b7e7a029abdef6fc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 25 Jan 2019 10:49:42 +0100 Subject: [PATCH 157/230] androidStudioPackages.beta: 3.4.0.10 -> 3.4.0.11 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 125538e54cf..515654e7507 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw"; }; betaVersion = { - version = "3.4.0.10"; # "Android Studio 3.4 Beta 1" - build = "183.5217543"; - sha256Hash = "0yd9l4py82i3gl1nvfwlhfx12hzf1mih8ylgdl3r85hhlqs7w2dm"; + version = "3.4.0.11"; # "Android Studio 3.4 Beta 2" + build = "183.5240537"; + sha256Hash = "0mv7ayqjkw97jzdifw1cdvjhnzygzkd2a9rc0h99fclhf2nii5yr"; }; latestVersion = { # canary & dev version = "3.5.0.0"; # "Android Studio 3.5 Canary 1" From 19a5fa9323019b62c430d25af2203208b6e4aeb7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 25 Jan 2019 10:54:19 +0100 Subject: [PATCH 158/230] androidStudioPackages.{dev,canary}: 3.5.0.0 -> 3.5.0.1 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 515654e7507..4b53774662f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0mv7ayqjkw97jzdifw1cdvjhnzygzkd2a9rc0h99fclhf2nii5yr"; }; latestVersion = { # canary & dev - version = "3.5.0.0"; # "Android Studio 3.5 Canary 1" - build = "183.5215047"; - sha256Hash = "1f7lllj85fia02hgy4ksbqh80sdcml16fv1g892jc6lwykjrdw5y"; + version = "3.5.0.1"; # "Android Studio 3.5 Canary 2" + build = "183.5240547"; + sha256Hash = "0z52ig9v2w9i6bqiqpdvgcr6g6sgl8p5317jamg72d5csm9hgfx3"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): From f2977752c4870e881443038a71cfed1cf67f2440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Fri, 25 Jan 2019 11:24:54 +0100 Subject: [PATCH 159/230] kops: 1.10.0 -> 1.11.0 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6ffe40d6a3d..c9edaae1e53 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.10.0"; + version = "1.11.0"; goPackagePath = "k8s.io/kops"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp"; + sha256 = "1z67jl66g79q6v5kjy9qxx2xp656ybv5hrc10h3wmzy0b0n30s4n"; }; buildInputs = [go-bindata]; From bd898975e92002b458c4683c6abbc3e0abab7a7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 24 Jan 2019 10:47:05 +0100 Subject: [PATCH 160/230] LTS Haskell 13.4 --- .../configuration-hackage2nix.yaml | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 632f75d7b83..5a2399caeca 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.3 + # LTS Haskell 13.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -346,7 +346,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 - Cabal ==2.4.1.0 - - cabal2spec ==2.2.2 + - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 - cache ==0.1.1.1 @@ -567,7 +567,7 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10 - - dejafu ==1.11.0.4 + - dejafu ==1.11.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 @@ -832,7 +832,7 @@ default-package-overrides: - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - githash ==0.1.3.1 - - github-release ==1.2.3 + - github-release ==1.2.4 - github-types ==0.2.1 - github-webhooks ==0.10.0 - gitrev ==1.3.1 @@ -882,12 +882,13 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - hapistrano ==0.3.9.0 - happy ==1.19.9 + - hasbolt ==0.1.3.2 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.3.1 - - haskeline ==0.7.4.3 + - haskeline ==0.7.5.0 - haskell-gi ==0.21.5 - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 @@ -905,7 +906,7 @@ default-package-overrides: - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5 + - hasql-pool ==0.5.0.1 - hasql-transaction ==0.7 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 @@ -921,6 +922,7 @@ default-package-overrides: - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 + - hedn ==0.2.0.0 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.3 @@ -1003,7 +1005,7 @@ default-package-overrides: - hspec-leancheck ==0.0.3 - hspec-megaparsec ==2.0.0 - hspec-meta ==2.6.0 - - hspec-need-env ==0.1.0.2 + - hspec-need-env ==0.1.0.3 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.5.2 - hspec-wai ==0.9.2 @@ -1147,7 +1149,7 @@ default-package-overrides: - js-jquery ==3.3.1 - json ==0.9.3 - json-alt ==1.0.0 - - json-feed ==1.0.5 + - json-feed ==1.0.6 - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - json-rpc-generic ==0.2.1.5 @@ -1173,7 +1175,7 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.7 + - lackey ==1.0.8 - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 @@ -1192,7 +1194,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lca ==0.3.1 - leancheck ==0.8.0 - - leancheck-instances ==0.0.1 + - leancheck-instances ==0.0.2 - leapseconds-announced ==2017.1.0.1 - lens ==4.17 - lens-action ==0.2.3 @@ -1226,7 +1228,7 @@ default-package-overrides: - List ==0.6.2 - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.2 + - list-t ==1.0.3 - ListTree ==0.2.3 - llvm-hs-pure ==7.0.0 - lmdb ==0.2.5 @@ -1372,7 +1374,7 @@ default-package-overrides: - mwc-probability ==2.0.4 - mwc-probability-transition ==0.4 - mwc-random ==0.14.0.0 - - mysql ==0.1.6 + - mysql ==0.1.7 - mysql-haskell ==0.8.4.1 - mysql-haskell-nem ==0.1.0.0 - mysql-simple ==0.4.5 @@ -1452,7 +1454,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.2.2 - - OpenGLRaw ==3.3.1.0 + - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.1.0 - openssl-streams ==1.2.1.3 @@ -1512,7 +1514,7 @@ default-package-overrides: - persist ==0.1.1.1 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.9.0 + - persistent ==2.9.1 - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.1 @@ -1559,6 +1561,7 @@ default-package-overrides: - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 - postgresql-simple ==0.6 + - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 - postgresql-transactional ==1.1.1 @@ -1620,7 +1623,7 @@ default-package-overrides: - pusher-http-haskell ==1.5.1.7 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qnap-decrypt ==0.3.3 + - qnap-decrypt ==0.3.4 - quadratic-irrational ==0.0.6 - QuasiText ==0.1.2.6 - quickbench ==1.0 @@ -1650,8 +1653,8 @@ default-package-overrides: - rank2classes ==1.2 - Rasterific ==0.7.4.2 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.7 - - ratel-wai ==1.0.4 + - ratel ==1.0.8 + - ratel-wai ==1.0.5 - rattletrap ==6.0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1731,7 +1734,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - - salak ==0.1.6 + - salak ==0.1.7 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1739,7 +1742,7 @@ default-package-overrides: - sampling ==0.3.3 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.4.6 + - sbp ==2.4.7 - sbv ==7.13 - scalpel ==0.5.1 - scalpel-core ==0.5.1 @@ -1772,7 +1775,7 @@ default-package-overrides: - servant-auth ==0.3.2.0 - servant-auth-client ==0.3.3.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.2.0 + - servant-auth-server ==0.4.3.0 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.8 - servant-cassava ==0.10 @@ -1816,7 +1819,7 @@ default-package-overrides: - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 - - shelly ==1.8.1 + - shelly ==1.8.0 - shikensu ==0.3.11 - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 @@ -1829,7 +1832,7 @@ default-package-overrides: - simple-log ==0.9.10 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.27 - - simple-vec3 ==0.4.0.9 + - simple-vec3 ==0.4.0.10 - since ==0.0.0 - singleton-bool ==0.1.4 - singleton-nats ==0.4.2 @@ -1876,6 +1879,7 @@ default-package-overrides: - sql-words ==0.1.6.2 - srcloc ==0.5.1.2 - stache ==2.0.1 + - stack2nix ==0.2.2 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 @@ -1919,7 +1923,7 @@ default-package-overrides: - string-qq ==0.0.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.0 - - strive ==5.0.7 + - strive ==5.0.8 - structs ==0.1.1 - stylish-haskell ==0.9.2.1 - summoner ==1.2.0 @@ -1954,7 +1958,7 @@ default-package-overrides: - tao ==1.0.0 - tao-example ==1.0.0 - tar ==0.5.1.0 - - tar-conduit ==0.3.1 + - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2 - tasty-ant-xml ==1.1.5 @@ -2077,7 +2081,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.13 - - typed-process ==0.2.3.0 + - typed-process ==0.2.4.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2281,8 +2285,8 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.6 - - yam-datasource ==0.5.6 + - yam ==0.5.11 + - yam-datasource ==0.5.11 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2308,7 +2312,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.5.1 + - yesod-test ==1.6.6 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 From 83e3d9ffb97507fbbf60c0a87b3e308669a89a86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 24 Jan 2019 18:16:43 +0100 Subject: [PATCH 161/230] haskell-HaTeX: enable hydra builds again --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5a2399caeca..b35f03a9634 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5447,7 +5447,6 @@ dont-distribute-packages: hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaTeX: [ i686-linux, x86_64-linux, x86_64-darwin ] hats: [ i686-linux, x86_64-linux, x86_64-darwin ] hatt: [ i686-linux, x86_64-linux, x86_64-darwin ] haven: [ i686-linux, x86_64-linux, x86_64-darwin ] From 6ca4fdcf872f810839a40ff286858b249b96f879 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2019 02:30:43 +0100 Subject: [PATCH 162/230] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.13-1-gda47f40 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/72a2d5c004264016a508a1155c48a881f375e9ff. --- .../haskell-modules/hackage-packages.nix | 1927 +++++++++++------ 1 file changed, 1252 insertions(+), 675 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7726c623e75..16a413a03f1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8927,7 +8927,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -9181,17 +9180,17 @@ self: { }) {}; "HasCacBDD" = callPackage - ({ mkDerivation, base, Cabal, CacBDD, directory, process + ({ mkDerivation, base, Cabal, CacBDD, directory, hspec, process , QuickCheck }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.0"; - sha256 = "1dp4glfvd3ihaq2k3y40h7yz29c5lh76mjdzjcqb0ixvkh13d7dy"; + version = "0.1.0.1"; + sha256 = "0mvhhwgz2k46d2adrrs5bhc4x2yx3zr5fwi2nnxzrjhm1ki9b8zb"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell bindings for CacBDD"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -9977,6 +9976,23 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.16"; + sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; + revision = "1"; + editedCabalFile = "0hc113g6jp7ci5gxx2chhp1h64nzx47c4ahwisyqgs3f6prm6dqr"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -13855,22 +13871,6 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, libGL - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.3.1.0"; - sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ libGL ]; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "OpenGLRaw_3_3_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: @@ -13884,7 +13884,6 @@ self: { librarySystemDepends = [ libGL ]; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage @@ -22075,6 +22074,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-gadt-th" = callPackage + ({ mkDerivation, aeson, base, dependent-sum, template-haskell }: + mkDerivation { + pname = "aeson-gadt-th"; + version = "0.1.1.0"; + sha256 = "1s3458ijiigkf1id53w24p1q71flpcd7acnqj4zb03fw6qm60f1v"; + libraryHaskellDepends = [ + aeson base dependent-sum template-haskell + ]; + description = "Derivation of Aeson instances for GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-generic-compat" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -22482,18 +22494,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, bytestring, foldl - , json-pointer, json-pointer-aeson, mtl-prelude, scientific, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, foldl, json-pointer + , json-pointer-aeson, mtl, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.12.4"; - sha256 = "0ya2gbyf2gg1psbmm1cz7qbv9m9kp3lls9rzzkmadhxnqr1wfn2f"; + version = "0.13"; + sha256 = "0iindqkzlfjdhns7nj8dpmsiq91pm19nd8cr3if1qf0zvjj0nx5q"; libraryHaskellDepends = [ - aeson base-prelude bytestring foldl json-pointer json-pointer-aeson - mtl-prelude scientific text transformers unordered-containers - vector + aeson base bytestring foldl json-pointer json-pointer-aeson mtl + scientific text transformers unordered-containers vector ]; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -31402,6 +31413,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "automata" = callPackage + ({ mkDerivation, base, bytestring, containers, contiguous + , enum-types, HUnit, leancheck, leancheck-enum-instances, primitive + , primitive-containers, QuickCheck, quickcheck-classes + , quickcheck-enum-instances, semirings, tasty, tasty-hunit + , tasty-leancheck, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "automata"; + version = "0.1.0.0"; + sha256 = "1xb0rqnkykazg7m50dsxa5pxfd2096wmqbwli01j7wxw8lrqcy9i"; + libraryHaskellDepends = [ + base bytestring containers contiguous primitive + primitive-containers semirings transformers + ]; + testHaskellDepends = [ + base containers enum-types HUnit leancheck leancheck-enum-instances + primitive QuickCheck quickcheck-classes quickcheck-enum-instances + tasty tasty-hunit tasty-leancheck tasty-quickcheck + ]; + description = "automata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "automitive-cse" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , quickcheck-simple @@ -36741,8 +36776,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.0.0"; - sha256 = "11f1lf19a78795id30hdxa6h52jwcmjq4jbmm1qaw6lgjfkzfg6a"; + version = "0.1.0.1"; + sha256 = "1xnv6zg9rc8klsjvaqf524pvplhizydjdrfybxnfjsi4d3kp612g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37788,8 +37823,8 @@ self: { }: mkDerivation { pname = "blas-carray"; - version = "0.0.1.1"; - sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; + version = "0.1.0.1"; + sha256 = "1aqphwgzcryzfzjzsv6ph4kcmswqd7mgs65dj8lsjzkhfc6izggl"; libraryHaskellDepends = [ base blas-ffi carray netlib-carray netlib-ffi storable-complex transformers @@ -37799,6 +37834,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-comfort-array" = callPackage + ({ mkDerivation, base, blas-ffi, comfort-array + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "blas-comfort-array"; + version = "0.0.0.1"; + sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + libraryHaskellDepends = [ + base blas-ffi comfort-array netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran BLAS via comfort-array"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blas-ffi" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { @@ -39451,8 +39502,8 @@ self: { ({ mkDerivation, base, directory, process }: mkDerivation { pname = "brainfuck-monad"; - version = "0.5.0"; - sha256 = "0dr371scgb6hc43vdj2fbic9z1aw4bfhnc910y22a9y26kcldp2g"; + version = "0.5.1"; + sha256 = "1y0dz80q2rniz23b0m2dircyl244id9888pblaqj8d4zcapsnsww"; libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; @@ -39598,6 +39649,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-filetree" = callPackage + ({ mkDerivation, base, brick, comonad, containers, directory + , directory-tree, filepath, free, vector, vty + }: + mkDerivation { + pname = "brick-filetree"; + version = "0.1.0.2"; + sha256 = "0ppc2y407db7kx8hzrjbx3qhd4w39d5p4zra3bxsc99ny9aqbrmk"; + libraryHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + testHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty @@ -42507,26 +42577,6 @@ self: { }) {}; "cabal2spec" = callPackage - ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty - , tasty-golden, time - }: - mkDerivation { - pname = "cabal2spec"; - version = "2.2.2"; - sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal filepath time ]; - executableHaskellDepends = [ - base Cabal filepath optparse-applicative - ]; - testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; - description = "Convert Cabal files into rpm spec files"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "cabal2spec_2_2_2_1" = callPackage ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty , tasty-golden, time }: @@ -42543,7 +42593,6 @@ self: { testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; description = "Convert Cabal files into rpm spec files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -48582,6 +48631,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "clumpiness_0_17_0_2" = callPackage + ({ mkDerivation, base, containers, tree-fun }: + mkDerivation { + pname = "clumpiness"; + version = "0.17.0.2"; + sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc"; + libraryHaskellDepends = [ base containers tree-fun ]; + description = "Calculate the clumpiness of leaf properties in a tree"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cluss" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -50141,8 +50202,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.2"; - sha256 = "0h8qn36ivxd2bc7cmqgyfa54jlwcfwr3rwpfp02p0yxqb4q03z45"; + version = "0.3"; + sha256 = "0vwp11vcw6h9shrafqgpiqbdm2ni9ad18z2r644hspxcrs24r4d6"; libraryHaskellDepends = [ base deepseq guarded-allocation non-empty primitive QuickCheck storable-record transformers utility-ht @@ -52737,6 +52798,8 @@ self: { pname = "connection"; version = "0.2.8"; sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; + revision = "1"; + editedCabalFile = "15qdwqqjv60w14m319a58yjmhzr39dydsnk6r26ydkwxwh23rk73"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -53024,12 +53087,19 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, base, constraints, template-haskell }: + ({ mkDerivation, aeson, base, constraints, markdown-unlit + , template-haskell + }: mkDerivation { pname = "constraints-extras"; - version = "0.2.1.0"; - sha256 = "17rz4j5xgh4qn8ngd4b2814zdp1c59mcksg9jxbln6nvzvw7q0ng"; + version = "0.2.3.0"; + sha256 = "09qa30zgh6w7k5nl1gvr18nhl5cfnnrzzlmafn9hvp8hms6837ic"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; + executableHaskellDepends = [ + aeson base constraints markdown-unlit + ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59396,6 +59466,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-ref_0_0_2" = callPackage + ({ mkDerivation, base, data-accessor, stm, transformers }: + mkDerivation { + pname = "data-ref"; + version = "0.0.2"; + sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v"; + libraryHaskellDepends = [ base data-accessor stm transformers ]; + description = "Unify STRef and IORef in plain Haskell 98"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-reify" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -60323,6 +60405,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_3" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.3"; + sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -61498,8 +61608,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.4"; - sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg"; + version = "1.11.0.5"; + sha256 = "18pcjk60r1q798qba285g20fh8v5q2qphgpx3r0a0yy7p1qnjwv2"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -62036,8 +62146,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.4"; - sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis"; + version = "2.6.5"; + sha256 = "1rfh7pahrksjzypdkrs8wcijybdwnv2wlkiqax7svn11wgnym3c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62219,7 +62329,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deriving-compat_0_5_3" = callPackage + "deriving-compat_0_5_4" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -62227,8 +62337,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5.3"; - sha256 = "1mybgiy6g2ja4qbmc7m3ajy8wzaycq95xlfihi5ynmzlbrjy96sc"; + version = "0.5.4"; + sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -68082,8 +68192,8 @@ self: { }: mkDerivation { pname = "dynamic-graphs"; - version = "0.1.0.2"; - sha256 = "0fy64gfkg6vhhyzay0wh2dis423j8xbcdjzfl06h8hbrb0gb8p7r"; + version = "0.1.0.3"; + sha256 = "1zwrvpg8nxc4lx3mc5jaj1fcbg1hhk4b52ng4qh5r57xkhqj6xg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68092,8 +68202,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers deepseq hashable mwc-random - primitive QuickCheck test-framework test-framework-quickcheck2 - test-framework-th text unordered-containers + primitive QuickCheck semigroups test-framework + test-framework-quickcheck2 test-framework-th text + unordered-containers ]; benchmarkHaskellDepends = [ base criterion primitive ]; description = "Dynamic graph algorithms"; @@ -73765,25 +73876,26 @@ self: { "expresso" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , haskeline, mtl, parsec, tasty, tasty-hunit, template-haskell - , terminfo, text, unordered-containers, wl-pprint + , text, unordered-containers, wl-pprint }: mkDerivation { pname = "expresso"; - version = "0.1.1.0"; - sha256 = "1c0mibbgwdxz36qr02nc31mpg6d3l9mgjfqwy174ib2kv3wndivh"; + version = "0.1.2.0"; + sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - template-haskell terminfo text unordered-containers wl-pprint + template-haskell text unordered-containers wl-pprint ]; executableHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - terminfo text unordered-containers wl-pprint + text unordered-containers wl-pprint ]; testHaskellDepends = [ base containers directory filepath hashable haskeline mtl parsec - tasty tasty-hunit terminfo text unordered-containers wl-pprint + tasty tasty-hunit text unordered-containers wl-pprint ]; description = "A simple expressions language based on row types"; license = stdenv.lib.licenses.bsd3; @@ -74290,8 +74402,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "0.1.0.3"; - sha256 = "1kmp5xgsj5yv4h9q3h1r73z6pb9cj6kb4i458rb322l6w88ci0rf"; + version = "0.1.1.0"; + sha256 = "0wg4jhilnyqxs6kqikbli1ia6xl4hi4hipdc1pp1f2d2gxgg0afb"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -74884,8 +74996,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.1"; - sha256 = "05z8dyw1yf2bh42mrrk1d9rxqdz1p6gn8sjnpk66s2k76xrg4vm2"; + version = "0.24.0.2"; + sha256 = "00qm6n8ali6inqmm64mrcz414iwiin8zwpavq5w1hnrmvzlbazg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75440,6 +75552,8 @@ self: { pname = "feed"; version = "1.0.1.0"; sha256 = "076krkyvbh24s50chdw3nz6w2svwchys65ppjzlm8gy42ddhbgc7"; + revision = "1"; + editedCabalFile = "10xjd3syr70g3blnjy7xvd6s21y68vxsi69f6bmizpsylbfb0245"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -76569,8 +76683,8 @@ self: { }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.3.1"; - sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; + version = "0.2.3.2"; + sha256 = "1qid4dinkydpikw1a7q4zj3cx3bh7mzz7bfd8l1mz7fykdi8lwac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81053,6 +81167,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "function-builder" = callPackage + ({ mkDerivation, base, tagged }: + mkDerivation { + pname = "function-builder"; + version = "0.1.0.4"; + sha256 = "1iiz1fx8m152wg55k6vgv8sf3zf9wvc9zmx2wca8yc38bki43h61"; + libraryHaskellDepends = [ base tagged ]; + description = "Create poly variadic functions for monoidal results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -86465,8 +86590,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20181211"; - sha256 = "05zvi2z4fs2sprzgm31m6y1rhvwkhmjilvmgvyajzs12vzsaik6x"; + version = "7.20190122"; + sha256 = "0z5a5sskmjmayh1w9m48v7b81s1ybcglglry2jy1awdbn2l4mxk5"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" @@ -86982,29 +87107,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; - version = "1.2.3"; - sha256 = "14jb82gybm2zwri05bqxsibwr29lhghcaj3n0171nbndqs0dyl0y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_2_4" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers, uri-templater @@ -87025,7 +87127,6 @@ self: { ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -87875,8 +87976,8 @@ self: { pname = "glirc"; version = "2.29"; sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; - revision = "1"; - editedCabalFile = "0kjari98vcx5d1nfvxk8f6nx557hpy6njw7fj5p1lfdals81qifz"; + revision = "2"; + editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -91981,15 +92082,23 @@ self: { }) {}; "grids" = callPackage - ({ mkDerivation, adjunctions, base, distributive, finite-typelits - , vector + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , gauge, hspec, singletons, vector }: mkDerivation { pname = "grids"; - version = "0.2.0.0"; - sha256 = "05fq06x85dvdqn9360y139i9al1bdlcs0ybf790fqw8rqwznzxn4"; + version = "0.3.0.0"; + sha256 = "01i6izwlgkv4pc6sfywn8fg2s01x15q0lwxag3kzzhb63nm20kli"; libraryHaskellDepends = [ - adjunctions base distributive finite-typelits vector + adjunctions base comonad deepseq distributive singletons vector + ]; + testHaskellDepends = [ + adjunctions base comonad deepseq distributive hspec singletons + vector + ]; + benchmarkHaskellDepends = [ + adjunctions base comonad deepseq distributive gauge singletons + vector ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -93112,6 +93221,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "guarded-allocation_0_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "guarded-allocation"; + version = "0.0.1"; + sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c"; + libraryHaskellDepends = [ base ]; + description = "Memory allocation with added stress tests and integrity checks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: mkDerivation { @@ -95681,8 +95802,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "0.4.1"; - sha256 = "1mnf196wyj8jsypwdci7mrx6dl3qzfhwz34p4y5lc4rkif003xf9"; + version = "0.4.2"; + sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -96451,6 +96572,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_9_1" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, QuickCheck, silently, stm, temporary, time + , transformers, typed-process, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.9.1"; + sha256 = "0s2xhisyjx3d9rgzqcc09l2x3a8fkc5d7rdcrrcrgwz6vxcdv0pv"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base filepath formatting gitrev mtl path process stm time + transformers typed-process + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process QuickCheck + silently temporary + ]; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -101925,17 +102076,6 @@ self: { }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, resource-pool, time }: - mkDerivation { - pname = "hasql-pool"; - version = "0.5"; - sha256 = "0bsxh9yf5p2iknrnssrif563n42ih14cj95qmy9z2lz2kbycscrs"; - libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; - description = "A pool of connections for Hasql"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql-pool_0_5_0_1" = callPackage ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; @@ -101945,7 +102085,6 @@ self: { testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-postgres" = callPackage @@ -105023,8 +105162,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.21"; - sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd"; + version = "0.24"; + sha256 = "0bzhswisrmlw8ajl6mr13vr3a7l0vywl394aihrc0xs6vwgyflh0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106246,8 +106385,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.2.1.0"; - sha256 = "1vgvpa9il2pmcwjq0nnq93ppbanrs5yaxdcs9skbwz1r6gx0k64y"; + version = "0.2.2.0"; + sha256 = "0c0lv9vr8srb6bipjx70m7p5mr91hfhnymv8brwj6hllq4cp576m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107955,8 +108094,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.12"; - sha256 = "1d3gbvjs7zg9n4fbj2b3c5wn5xf2idygx9cqjdbmgndk3jic9rbx"; + version = "2.1.13"; + sha256 = "1ac553qf1pc093hrc3kf8yik68619683pazmlm8r2jqqq502fgxc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108621,8 +108760,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.1"; - sha256 = "150aqwg7n9i5hsdlxxbsynaxn3shgnx20drax16z5785rz0bbrjx"; + version = "0.3.0.2"; + sha256 = "1rwxp4gjk2z8k42k7l1g3sy07jl2rhc7xgypjripb3chmfkp6zvn"; libraryHaskellDepends = [ base boxes comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat @@ -109812,8 +109951,8 @@ self: { pname = "hookup"; version = "0.2.2"; sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "3"; - editedCabalFile = "0fmnfnlcc5jg0na2723ibh26sch190s62d52g14gffh9fsl9icgy"; + revision = "4"; + editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -113077,6 +113216,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsdev_0_3_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec + , base, bytestring, Cabal, containers, cpphs, data-default, deepseq + , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc + , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names + , haskell-src-exts, hdocs, hformat, hlint, hspec, http-client, lens + , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl + , network, network-uri, optparse-applicative, process + , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm + , syb, template-haskell, text, text-region, time, transformers + , transformers-base, uniplate, unix, unordered-containers, vector + }: + mkDerivation { + pname = "hsdev"; + version = "0.3.3.0"; + sha256 = "17pylby88xmr8hibhpiyygzdnjwznh1zss4969z6w2dk2489lkrz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array async attoparsec base bytestring Cabal + containers cpphs data-default deepseq direct-sqlite directory + exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api + haddock-library haskell-names haskell-src-exts hdocs hformat hlint + http-client lens lifted-base mmorph monad-control monad-loops mtl + network network-uri optparse-applicative process regex-pcre-builtin + scientific simple-log sqlite-simple stm syb template-haskell text + text-region time transformers transformers-base uniplate unix + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers deepseq directory + exceptions filepath monad-loops mtl network optparse-applicative + process text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson async base containers data-default deepseq directory filepath + hformat hspec lens lens-aeson mtl text + ]; + description = "Haskell development library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsdif" = callPackage ({ mkDerivation, base, bytestring, hosc }: mkDerivation { @@ -113111,6 +113293,8 @@ self: { pname = "hsdns"; version = "1.7.1"; sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; + revision = "1"; + editedCabalFile = "0w4hrmj7ph5dgarl82xpa0g77ncjdqk0wc9wp771pry98xxihzl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; @@ -113120,6 +113304,22 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; + "hsdns_1_8" = callPackage + ({ mkDerivation, adns, base, containers, network }: + mkDerivation { + pname = "hsdns"; + version = "1.8"; + sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers network ]; + librarySystemDepends = [ adns ]; + description = "Asynchronous DNS Resolver"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {inherit (pkgs) adns;}; + "hsdns-cache" = callPackage ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time , unordered-containers @@ -114528,20 +114728,6 @@ self: { }) {}; "hspec-need-env" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-expectations - , setenv, transformers - }: - mkDerivation { - pname = "hspec-need-env"; - version = "0.1.0.2"; - sha256 = "0393l0faajrdfckjgclrhpvm79r0mhba8jrrsvr4rj5ifajmrfns"; - libraryHaskellDepends = [ base hspec-core hspec-expectations ]; - testHaskellDepends = [ base hspec hspec-core setenv transformers ]; - description = "Read environment variables for hspec tests"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-need-env_0_1_0_3" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-expectations , setenv, transformers }: @@ -114553,7 +114739,6 @@ self: { testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-pg-transact" = callPackage @@ -115639,6 +115824,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsyslog_5_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hsyslog"; + version = "5.0.2"; + sha256 = "1kkypn0dd92aqv8dr112bhkr9k9r9mchnyyvy41kvhj2zg447v1y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + description = "FFI interface to syslog(3) from POSIX.1-2001"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hsyslog-tcp" = callPackage ({ mkDerivation, base, bytestring, hsyslog, hsyslog-udp, network , text, time @@ -117652,6 +117852,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "human-readable-duration_0_2_1_3" = callPackage + ({ mkDerivation, base, criterion, doctest, Glob }: + mkDerivation { + pname = "human-readable-duration"; + version = "0.2.1.3"; + sha256 = "1zq85v9knc73ck9lqrn4k0w121ifpjg7j053qmhgam0605j89236"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Provide duration helper"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "human-text" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -122376,6 +122590,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_6_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, QuickCheck, scientific + , tagged, template-haskell, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.6.1.2"; + sha256 = "1bzy78amw6k02bi2fjm2i8vah9lwxpy2fdlq35gdsffhwrif29mg"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -124220,6 +124459,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ipynb" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring + , bytestring, containers, directory, filepath, microlens + , microlens-aeson, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "ipynb"; + version = "0.1"; + sha256 = "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-diff base base64-bytestring bytestring directory + filepath microlens microlens-aeson tasty tasty-hunit text + unordered-containers vector + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, directory, filepath, memory, mtl, process, temporary @@ -126923,25 +127185,6 @@ self: { }) {}; "json-feed" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; - version = "1.0.5"; - sha256 = "17y8hnqp4ahg7cx6fwfd4y65pz16py1avhfkn4fcfjs06xv465qs"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = stdenv.lib.licenses.mit; - }) {}; - - "json-feed_1_0_6" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , mime-types, network-uri, tagsoup, text, time }: @@ -126958,7 +127201,6 @@ self: { ]; description = "JSON Feed"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -127022,12 +127264,14 @@ self: { }) {}; "json-pointer" = callPackage - ({ mkDerivation, attoparsec, base-prelude, text }: + ({ mkDerivation, attoparsec, base, base-prelude, text }: mkDerivation { pname = "json-pointer"; - version = "0.1.2.1"; - sha256 = "1anij6svbkygz9qyssqhz9vyj43gyhsvrypb6fzjl4k5ss7aibq0"; - libraryHaskellDepends = [ attoparsec base-prelude text ]; + version = "0.1.2.2"; + sha256 = "0cwk5jxg528dipfdhrmmjpz950pfpaykncvw16rajvf35wvcnk9x"; + revision = "1"; + editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn"; + libraryHaskellDepends = [ attoparsec base base-prelude text ]; description = "JSON Pointer parsing and interpretation utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -130079,18 +130323,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; - version = "1.0.7"; - sha256 = "0n90m4dsqfp4x4bckwxasg2cmjrzxp2szrlqf43pmp2dsc8g0646"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_1_0_8" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; @@ -130100,7 +130332,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lacroix" = callPackage @@ -132077,14 +132308,15 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms - , comfort-array, deepseq, fixed-length, guarded-allocation - , lapack-ffi, lazyio, netlib-ffi, non-empty, QuickCheck, semigroups - , tfp, transformers, utility-ht + , comfort-array, data-ref, deepseq, fixed-length + , guarded-allocation, lapack-ffi, lazyio, netlib-ffi, non-empty + , QuickCheck, quickcheck-transformer, random, semigroups, tfp + , transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.2"; - sha256 = "173yjhf2drabx13rw7kzs6wp40pg2r5yibr7psgdyidx7543svvy"; + version = "0.2.1"; + sha256 = "1m6n36cjk69maqrb2alya8ki2kndvpfjn2nyb8p4k5333x4ka6xm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132093,8 +132325,9 @@ self: { transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms comfort-array netlib-ffi non-empty QuickCheck - semigroups tfp transformers utility-ht + base ChasingBottoms comfort-array data-ref netlib-ffi non-empty + QuickCheck quickcheck-transformer random semigroups tfp + transformers unique-logic-tf utility-ht ]; description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; @@ -132107,8 +132340,8 @@ self: { }: mkDerivation { pname = "lapack-carray"; - version = "0.0.2.1"; - sha256 = "0rhzs27m634vy7g7k1ls8wyfh3q983fq6959y1vn1g3af1f27yqx"; + version = "0.0.3"; + sha256 = "1l4dwkdk6m5ran92j7k9yxqin1spgx8sg0bi2kfn1pcs6jzgn3si"; libraryHaskellDepends = [ base carray lapack-ffi netlib-carray netlib-ffi storable-complex transformers @@ -132117,6 +132350,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lapack-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, lapack-ffi + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-comfort-array"; + version = "0.0"; + sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + libraryHaskellDepends = [ + base comfort-array lapack-ffi netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran LAPACK via comfort-array"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lapack-ffi" = callPackage ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { @@ -132151,6 +132400,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lapack-ffi-tools_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers + , explicit-exception, filepath, non-empty, optparse-applicative + , parsec, pathtype, transformers, unordered-containers, utility-ht + , vector + }: + mkDerivation { + pname = "lapack-ffi-tools"; + version = "0.1.2"; + sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring cassava containers explicit-exception filepath + non-empty optparse-applicative parsec pathtype transformers + unordered-containers utility-ht vector + ]; + description = "Generator for Haskell interface to Fortran LAPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, deepseq, hashable @@ -132915,18 +133187,6 @@ self: { }) {}; "leancheck-instances" = callPackage - ({ mkDerivation, base, bytestring, leancheck, nats, text }: - mkDerivation { - pname = "leancheck-instances"; - version = "0.0.1"; - sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq"; - libraryHaskellDepends = [ base bytestring leancheck nats text ]; - testHaskellDepends = [ base bytestring leancheck nats text ]; - description = "Common LeanCheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck-instances_0_0_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, leancheck , nats, text, time }: @@ -132942,6 +133202,24 @@ self: { ]; description = "Common LeanCheck instances"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "leancheck-instances_0_0_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, leancheck + , nats, text, time + }: + mkDerivation { + pname = "leancheck-instances"; + version = "0.0.3"; + sha256 = "1h6aw2fvdcjaz9r90l3c9znykn0y9gvg74ycvkrqw823sd9ywwd6"; + libraryHaskellDepends = [ + array base bytestring containers leancheck nats text time + ]; + testHaskellDepends = [ + base bytestring containers leancheck nats text + ]; + description = "Common LeanCheck instances"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -136232,8 +136510,10 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.2"; - sha256 = "08wjng9d1sqjqc6pgq2lh84gcaabqmrslm3slc0rvaxh1lvasv6s"; + version = "1.0.3"; + sha256 = "1kkiyfz7ra3i7jah1z347aq534isz7w8ancbhv6if905ybd3bhvf"; + revision = "1"; + editedCabalFile = "0f476hjzg99c51ac7ncl2w7lv8dakqwscqd7lx9n5cv3sclr38y5"; libraryHaskellDepends = [ base mmorph monad-control mtl transformers transformers-base ]; @@ -137549,10 +137829,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.0"; - sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; - revision = "1"; - editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d"; + version = "0.10.0.1"; + sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -141214,6 +141492,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_2_7_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, data-default-class + , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions + , vector + }: + mkDerivation { + pname = "massiv"; + version = "0.2.7.0"; + sha256 = "080pdghb6yf08addkysdpgdgzf60lc90z580vk2igjfc23w9xwc7"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq ghc-prim primitive + vector + ]; + testHaskellDepends = [ + base bytestring data-default deepseq hspec QuickCheck + safe-exceptions vector + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector @@ -144750,6 +145050,8 @@ self: { pname = "miss"; version = "0"; sha256 = "1xcbjmv2fyjffn1j2xhn0glvxdb2cqd8frvc9yr1pgz6874sv60w"; + revision = "1"; + editedCabalFile = "0m4dvn39917fxmgd2ahigz70qqy4ccfsi4n0885v82kiqwgmvxxq"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers cryptohash-sha1 deepseq digest exceptions filesystem-abstractions @@ -145355,8 +145657,8 @@ self: { }: mkDerivation { pname = "modularity"; - version = "0.2.0.3"; - sha256 = "1w1w9fcsh758wnnq3i1c4bklpg5m622lh3qybddacs65gvih64sy"; + version = "0.2.1.0"; + sha256 = "1xs9hdxsdpylhq3dzmyxfycwyqzy3v1zz48gvzpfcamfivxxpdph"; libraryHaskellDepends = [ base eigen hmatrix sparse-linear-algebra spectral-clustering vector ]; @@ -145729,16 +146031,18 @@ self: { }) {}; "monad-dijkstra" = callPackage - ({ mkDerivation, base, free, hlint, mtl, psqueues, tasty - , tasty-hspec, transformers + ({ mkDerivation, base, containers, free, hlint, mtl, psqueues + , tasty, tasty-hspec, transformers }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.1.1"; - sha256 = "0j29ffim7hwvj791na92yrbgly1frn0qvcpyc1z29837kawap190"; - libraryHaskellDepends = [ base free mtl psqueues transformers ]; + version = "0.1.1.2"; + sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; + libraryHaskellDepends = [ + base containers free mtl psqueues transformers + ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; - description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm"; + description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146610,10 +146914,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.8"; - sha256 = "1y414xfaavp63w5za4jby4cnaqwivkvkxxknb488z1k040kiisv1"; - revision = "1"; - editedCabalFile = "1mnzhliilvhsynv5h7rqchngvf8by1z33j4lj8zqqzl1xdmy2knx"; + version = "3.9"; + sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -147871,21 +148173,21 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, criterion - , monad-loops, openmpi, packman, store + ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion + , monad-loops, openmpi, store }: mkDerivation { pname = "mpi-hs"; - version = "0.4.1.0"; - sha256 = "0bf0ghzvakww5slvfd3fq0sa0972i6y60lg6ibby49nslfkl52wd"; + version = "0.5.1.1"; + sha256 = "0vvbvck5hd3ca1l1bdcnkkb5p2xf9gj9ljf8v130x0fx3zhxjp13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring monad-loops packman store + base binary bytestring cereal monad-loops store ]; librarySystemDepends = [ openmpi ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base binary ]; testHaskellDepends = [ base monad-loops ]; benchmarkHaskellDepends = [ base criterion ]; description = "MPI bindings for Haskell"; @@ -150062,21 +150364,6 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql - }: - mkDerivation { - pname = "mysql"; - version = "0.1.6"; - sha256 = "1vlr4z3ng8sibb7g8363xlhff3811z8b5nmm0ljai6r5r5hrym4y"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; - testHaskellDepends = [ base bytestring hspec ]; - description = "A low-level MySQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; - - "mysql_0_1_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql }: mkDerivation { @@ -150089,7 +150376,6 @@ self: { testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage @@ -150133,6 +150419,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mysql-haskell_0_8_4_2" = callPackage + ({ mkDerivation, base, binary, binary-ieee754, binary-parsers + , blaze-textual, bytestring, bytestring-lexing, cryptonite + , io-streams, memory, monad-loops, network, scientific, tasty + , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams + , word24 + }: + mkDerivation { + pname = "mysql-haskell"; + version = "0.8.4.2"; + sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz"; + libraryHaskellDepends = [ + base binary binary-ieee754 binary-parsers blaze-textual bytestring + bytestring-lexing cryptonite io-streams memory monad-loops network + scientific tcp-streams text time tls vector wire-streams word24 + ]; + testHaskellDepends = [ + base bytestring io-streams tasty tasty-hunit text time vector + ]; + description = "pure haskell MySQL driver"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-haskell-nem" = callPackage ({ mkDerivation, base, bytestring, io-streams, mysql-haskell , scientific, text, time @@ -151652,16 +151962,31 @@ self: { }) {}; "netlib-carray" = callPackage - ({ mkDerivation, base, carray, netlib-ffi, transformers }: + ({ mkDerivation, array, base, carray, netlib-ffi, transformers }: mkDerivation { pname = "netlib-carray"; - version = "0.0.1.1"; - sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; - libraryHaskellDepends = [ base carray netlib-ffi transformers ]; + version = "0.1"; + sha256 = "0rh4m4xxwm8n0577khqa2cx74hnwmgz94phq2rwhsdppg6dd2xx5"; + libraryHaskellDepends = [ + array base carray netlib-ffi transformers + ]; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-comfort-array"; + version = "0.0"; + sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + libraryHaskellDepends = [ + base comfort-array netlib-ffi transformers + ]; + description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "netlib-ffi" = callPackage ({ mkDerivation, base, guarded-allocation, storable-complex , transformers @@ -158403,8 +158728,8 @@ self: { pname = "ottparse-pretty"; version = "0.1.2.6"; sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; - revision = "2"; - editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx"; + revision = "3"; + editedCabalFile = "0g17l53dp1vcn2yzv37yvph9r4jsw4lgwip4l3h038r9g940lwjc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161087,8 +161412,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.1.2"; - sha256 = "0lvgb0jl0bfzjqpap3gxlhn0mhbwbd15h33l1idpghxqpmzgvczy"; + version = "0.8.2.0"; + sha256 = "04cvvff88ga3s22rcsjiyifdggjqpymfkbbcay7ibjhmiqwhisfq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162195,23 +162520,19 @@ self: { "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest - , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc - , parsec, semigroups, text, time, unordered-containers, vector, xml - , yaml + , edit-distance, filepath, hashable, hsass, mtl, pandoc, parsec + , semigroups, text, time, unordered-containers, vector, xml, yaml }: mkDerivation { pname = "pencil"; - version = "0.1.2"; - sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; - isLibrary = true; - isExecutable = true; + version = "0.1.3"; + sha256 = "0kga9i19qxp6g51dyavnybfs6znsija87hxsfrxblsyi4gqs9hbp"; libraryHaskellDepends = [ - base data-default directory edit-distance feed filepath hashable - hsass mtl pandoc parsec semigroups text time unordered-containers - vector xml yaml + base data-default directory edit-distance filepath hashable hsass + mtl pandoc parsec semigroups text time unordered-containers vector + xml yaml ]; - executableHaskellDepends = [ base text unordered-containers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest text unordered-containers ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -162722,39 +163043,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , fast-logger, hspec, http-api-data, monad-control, monad-logger - , mtl, old-locale, path-pieces, resource-pool, resourcet - , scientific, silently, tagged, template-haskell, text, time - , transformers, unliftio-core, unordered-containers, vector, void - }: - mkDerivation { - pname = "persistent"; - version = "2.9.0"; - sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7"; - revision = "2"; - editedCabalFile = "1szx008irw7w2h9qz443mml06sg6w9vazbxxyi67d91hyjlgca2j"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers fast-logger http-api-data - monad-logger mtl old-locale path-pieces resource-pool resourcet - scientific silently tagged template-haskell text time transformers - unliftio-core unordered-containers vector void - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data monad-control - monad-logger mtl old-locale path-pieces resource-pool resourcet - scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_9_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , fast-logger, hspec, http-api-data, monad-control, monad-logger @@ -162784,7 +163072,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -168408,8 +168695,8 @@ self: { }: mkDerivation { pname = "postmaster"; - version = "0.3.2"; - sha256 = "1l1hq77qxi1f9nv7bxgkfvcm50p61svqvn9f59aq3b9zj2vikmf6"; + version = "0.3.3"; + sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168439,8 +168726,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.1.4"; - sha256 = "1y5shvgnc2p70nqh6rgh9hrq3x98l9bh2mqm6rhv4xl1mzrva25l"; + version = "2.1.4.1"; + sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -168502,8 +168789,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.3.4"; - sha256 = "0ldgypdw4xk8r1p8g3vgl7ci3vdbfwv773zi1aqczskhsvwz0s97"; + version = "2.3.4.1"; + sha256 = "0mg8hd85xim33jv1abzgjfcy85mmrrvs30gpvspdci5d7xghqrmv"; libraryHaskellDepends = [ acquire attoparsec base bytestring deepseq deferred-folds directory foldl hashable primitive profunctors ptr scanner stm stm-chans text @@ -168986,6 +169273,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "prefetch" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "prefetch"; + version = "0.1.0.0"; + sha256 = "0qc4khx92xqjzq8pp5agxzh9l1l79np32s7af1kffpvffz4r5rpn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + description = "Prefetch stdin even before stdout is ready"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prefix-expression" = callPackage ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { @@ -169520,6 +169820,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-types_0_3_0_1" = callPackage + ({ mkDerivation, base, hspec, mtl, tagged }: + mkDerivation { + pname = "pretty-types"; + version = "0.3.0.1"; + sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv"; + libraryHaskellDepends = [ base mtl tagged ]; + testHaskellDepends = [ base hspec tagged ]; + description = "A small pretty printing DSL for complex types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyFunctionComposing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170929,8 +171242,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.2.0.1"; - sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0"; + version = "0.2.1.1"; + sha256 = "0cl1d4d4jgkqk37q2n3n7xqmd847srd6sqikciz4b8cfp57lw8m7"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -170962,8 +171275,8 @@ self: { ({ mkDerivation, base, fgl, graphviz, mtl, prolog, text }: mkDerivation { pname = "prolog-graph-lib"; - version = "0.2.0.1"; - sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr"; + version = "0.2.1.1"; + sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr"; libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; @@ -171002,8 +171315,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.0"; - sha256 = "0kpzfmdibpp08rhc8v92nizi8hbb9dm7ysqd0wclx9s5273zqxal"; + version = "2.1.1"; + sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-types network-uri text transformers wai warp @@ -173330,37 +173643,6 @@ self: { }) {}; "qnap-decrypt" = callPackage - ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit - , conduit-extra, crypto-api, directory, filepath, hspec, HUnit - , optparse-applicative, streaming-commons, tagged, temporary - , utf8-string - }: - mkDerivation { - pname = "qnap-decrypt"; - version = "0.3.3"; - sha256 = "0gwnpyzyrfw6i8a5arm8q6psjhwa8kl8n94wcglsnl59k1iadfb6"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory streaming-commons tagged utf8-string - ]; - executableHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory filepath optparse-applicative - streaming-commons tagged utf8-string - ]; - testHaskellDepends = [ - base binary bytestring cipher-aes128 conduit conduit-extra - crypto-api directory filepath hspec HUnit streaming-commons tagged - temporary utf8-string - ]; - description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "qnap-decrypt_0_3_4" = callPackage ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit , conduit-extra, crypto-api, directory, filepath, hspec, HUnit , optparse-applicative, streaming-commons, tagged, temporary @@ -173389,7 +173671,6 @@ self: { ]; description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qq-literals" = callPackage @@ -174395,6 +174676,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-transformer" = callPackage + ({ mkDerivation, base, QuickCheck, random, transformers }: + mkDerivation { + pname = "quickcheck-transformer"; + version = "0.3"; + sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + libraryHaskellDepends = [ base QuickCheck random transformers ]; + description = "A GenT monad transformer for QuickCheck library"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -174933,8 +175225,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.6.0.0"; - sha256 = "02jvlbj3w5ww59ms37l24crr8vib7ghzr9y79bip3p4mhpi4c32l"; + version = "0.6.0.1"; + sha256 = "19c2bv0iq4j0709rf9k9jk5q2s756bvjnr1gy630mcgp92rg8d9j"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -176077,27 +176369,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "1.0.7"; - sha256 = "1kp6f45wn3a7wnsvj08a3b0kp5wwprw4rjrrqqd22yr9mpwx2z7w"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types text uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_1_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, hspec, http-client, http-client-tls , http-types, text, uuid @@ -176116,25 +176387,9 @@ self: { ]; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "1.0.4"; - sha256 = "1cri461f40xa43kwg3wq5k98irfqypsi97xdk9n60yqhc8msca4m"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_1_0_5" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -176147,7 +176402,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-systems" = callPackage @@ -177309,13 +177563,17 @@ self: { }) {}; "record-encode" = callPackage - ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: + ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck + , vector + }: mkDerivation { pname = "record-encode"; - version = "0.2.2"; - sha256 = "1wdrvj2ilf5kqchfcfd3pnqgprc86fri7ajc5r0xqf6zc61s1fgk"; + version = "0.2.3"; + sha256 = "0xljdy3wfyirs3zwc1ij19w9520bc1n56cdigngfb9hs497d6jh3"; libraryHaskellDepends = [ base generics-sop vector ]; - testHaskellDepends = [ base generics-sop hspec QuickCheck vector ]; + testHaskellDepends = [ + base doctest generics-sop hspec QuickCheck vector + ]; description = "Generic encoding of records"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -177521,8 +177779,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "1.0.0.2"; - sha256 = "107b4mc0q0wwmdhyx7d6ks5d28w8rq896vpwjpg23grkd1c18lzy"; + version = "1.1.0.0"; + sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -179071,6 +179329,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "registry_0_1_2_3" = callPackage + ({ mkDerivation, async, base, containers, exceptions, hashable + , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , protolude, random, resourcet, semigroupoids, semigroups, tasty + , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base + }: + mkDerivation { + pname = "registry"; + version = "0.1.2.3"; + sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions hashable hedgehog hedgehog-corpus + io-memoize MonadRandom mtl protolude random resourcet semigroupoids + semigroups tasty tasty-discover tasty-hedgehog tasty-th text + transformers-base + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -180239,8 +180523,8 @@ self: { pname = "req"; version = "1.2.1"; sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; - revision = "2"; - editedCabalFile = "19zayp5lvg2ahjrpxikhhq61w5nlzfp144333vxk03w345akmmrk"; + revision = "3"; + editedCabalFile = "1sbm2rk2q56gma2wja47q1rc8a2pizl8487g5z4fy1zynxm5inyj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -180360,8 +180644,8 @@ self: { }: mkDerivation { pname = "require"; - version = "0.4.1"; - sha256 = "0x7scxpb0mydfssgm9ih9if8lqh0yws2hlm3rl54i02xxaxgdvwz"; + version = "0.4.2"; + sha256 = "03dhj1j9gp6mmgaxxkd1bf2i6hw78ql2qpi0qrdmx5dinclkidk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184267,42 +184551,43 @@ self: { "salak" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , filepath, hspec, QuickCheck, scientific, text + , filepath, hspec, mtl, QuickCheck, scientific, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "salak"; - version = "0.1.6"; - sha256 = "1l9nl9a7xs833w4d6i2bjka7h597ddvfk6g203pa6n13nl90f9cc"; - libraryHaskellDepends = [ - aeson base directory filepath scientific text unordered-containers - vector yaml - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck scientific text unordered-containers vector yaml - ]; - description = "Configuration Loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "salak_0_2_2" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, hspec, mtl - , QuickCheck, scientific, text, transformers, unordered-containers - , vector, yaml - }: - mkDerivation { - pname = "salak"; - version = "0.2.2"; - sha256 = "0vnsfa4c2aa8439q7ijv7mz020hmz2w72g6lynr06hxzfl96zsgn"; + version = "0.1.7"; + sha256 = "1r937yil04n28dxggwp12kzs40nvmfrhcm1m77cg9k244ka415k6"; libraryHaskellDepends = [ aeson base directory filepath mtl scientific text transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base directory filepath hspec mtl QuickCheck scientific text + aeson aeson-pretty base bytestring directory filepath hspec mtl + QuickCheck scientific text transformers unordered-containers vector + yaml + ]; + description = "Configuration Loader"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "salak_0_2_3" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen + , mtl, QuickCheck, scientific, stm, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "salak"; + version = "0.2.3"; + sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5"; + libraryHaskellDepends = [ + aeson base directory filepath menshen mtl scientific stm text transformers unordered-containers vector yaml ]; + testHaskellDepends = [ + aeson base directory filepath hspec menshen mtl QuickCheck + scientific stm text transformers unordered-containers vector yaml + ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -184880,32 +185165,6 @@ self: { }) {}; "sbp" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.4.6"; - sha256 = "1f0smglnxblywzf553xhmzd2jyg67w14ylyc05hj6dx3fr3xls4m"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet time yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_4_7" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops @@ -184929,7 +185188,6 @@ self: { testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -188073,38 +188331,6 @@ self: { }) {}; "servant-auth-server" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, bytestring-conversion, case-insensitive, cookie - , crypto-api, data-default-class, entropy, hspec, hspec-discover - , http-api-data, http-client, http-types, jose, lens, lens-aeson - , markdown-unlit, monad-time, mtl, QuickCheck, servant - , servant-auth, servant-server, tagged, text, time, transformers - , unordered-containers, wai, warp, wreq - }: - mkDerivation { - pname = "servant-auth-server"; - version = "0.4.2.0"; - sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap"; - revision = "3"; - editedCabalFile = "1zjxqlfyw3wwlyq2faiq9gqhfixn2mvfsv8dapalxs9fph7a2nzj"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data http-types jose lens - monad-time mtl servant servant-auth servant-server tagged text time - unordered-containers wai - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth - servant-server time transformers wai warp wreq - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "servant-server/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-auth-server_0_4_3_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, cookie, data-default-class, entropy , hspec, hspec-discover, http-client, http-types, jose, lens @@ -188130,7 +188356,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-swagger" = callPackage @@ -188951,6 +189176,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-kotlin_0_1_1_6" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.1.6"; + sha256 = "0v16y6f956yf64npq8fm1q6j1q8yygci3amsxyvrggs1rdd8hi31"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp @@ -191674,6 +191925,37 @@ self: { }) {}; "shelly" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.8.0"; + sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; + revision = "1"; + editedCabalFile = "17achybammxg5i7zcmwlfcb7xk77q3lfvck3gqa9ljfb6ksgrxb7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shelly_1_8_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process @@ -191702,6 +191984,7 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -191745,10 +192028,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.1.0.0"; - sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518"; - revision = "1"; - editedCabalFile = "10h2hz3fda9zg6zpkmmjjfxjghs7g0cj3r85vifp0za9ap41ph3k"; + version = "0.2.0.0"; + sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192749,6 +193030,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-log_0_9_11" = callPackage + ({ mkDerivation, async, base, base-unicode-symbols, containers + , data-default, deepseq, directory, exceptions, filepath, hformat + , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore + , text, time, transformers + }: + mkDerivation { + pname = "simple-log"; + version = "0.9.11"; + sha256 = "1mqibcpcnwc0hqbcbvl32vv4458n02f2k2bnparh8ajm5n9h0cjk"; + libraryHaskellDepends = [ + async base base-unicode-symbols containers data-default deepseq + directory exceptions filepath hformat microlens microlens-platform + mmorph mtl SafeSemaphore text time transformers + ]; + testHaskellDepends = [ base hspec microlens-platform text ]; + description = "Simple log for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-log-syslog" = callPackage ({ mkDerivation, base, hsyslog, simple-log, text }: mkDerivation { @@ -192957,6 +193259,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-sendfile_0_2_28" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, hspec, HUnit, network, process, resourcet, unix + }: + mkDerivation { + pname = "simple-sendfile"; + version = "0.2.28"; + sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059"; + libraryHaskellDepends = [ base bytestring network unix ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec HUnit network + process resourcet unix + ]; + description = "Cross platform library for the sendfile system call"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-server" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , hashtables, network, time, unbounded-delays @@ -193145,24 +193465,6 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-driver-gen - , QuickCheck, tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "simple-vec3"; - version = "0.4.0.9"; - sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz"; - libraryHaskellDepends = [ base QuickCheck vector ]; - testHaskellDepends = [ - base doctest doctest-driver-gen tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Three-dimensional vectors of doubles with basic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "simple-vec3_0_4_0_10" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: @@ -197701,8 +198003,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.2.1.2"; - sha256 = "11xylsi8gjshcs539y55gh23hf4b031ssnfjhpbajwjrmagynjnn"; + version = "0.2.2.3"; + sha256 = "017pf2sqw2p1ipflamlwsgkqsk83qm0y7sw672nkg4zvyck1arwc"; libraryHaskellDepends = [ base clustering eigen hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -199493,7 +199795,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Convert stack.yaml files into Nix build instructions."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage" = callPackage @@ -200310,6 +200611,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "static-text_0_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen + , markdown-unlit, tasty, tasty-hunit, template-haskell, text + , vector + }: + mkDerivation { + pname = "static-text"; + version = "0.2.0.4"; + sha256 = "19d43v2cp6wg861lc6rvimzqq20via6fvradysapmilq7svs5kq7"; + libraryHaskellDepends = [ + base bytestring template-haskell text vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-driver-gen markdown-unlit tasty + tasty-hunit template-haskell + ]; + testToolDepends = [ markdown-unlit ]; + description = "Lists, Texts, ByteStrings and Vectors of statically known length"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "staticanalysis" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -202953,29 +203276,6 @@ self: { }) {}; "strive" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "strive"; - version = "5.0.7"; - sha256 = "0hxy5znrfcls6bd8hjil97mya3w8zkppfd4jrz0ayz7zidbws5kg"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - testHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types markdown-unlit template-haskell text - time transformers - ]; - testToolDepends = [ markdown-unlit ]; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strive_5_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit , template-haskell, text, time, transformers @@ -202996,7 +203296,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strptime" = callPackage @@ -206808,31 +207107,6 @@ self: { }) {}; "tar-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, containers, criterion, deepseq, directory - , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh - }: - mkDerivation { - pname = "tar-conduit"; - version = "0.3.1"; - sha256 = "15w1qs276x2j13s3dg5a0d8jjcs3rf8hhnfa2m6p8jm7kjirvahm"; - libraryHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - safe-exceptions text unix - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators conduit-extra - containers deepseq directory filepath hspec QuickCheck weigh - ]; - benchmarkHaskellDepends = [ - base bytestring conduit conduit-combinators containers criterion - deepseq directory filepath hspec - ]; - description = "Extract and create tar files using conduit for streaming"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tar-conduit_0_3_2" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, containers, criterion, deepseq, directory , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh @@ -206855,7 +207129,6 @@ self: { ]; description = "Extract and create tar files using conduit for streaming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tardis" = callPackage @@ -207749,6 +208022,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tcp-streams_1_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , HUnit, io-streams, network, pem, test-framework + , test-framework-hunit, tls, x509, x509-store, x509-system + }: + mkDerivation { + pname = "tcp-streams"; + version = "1.0.1.1"; + sha256 = "1dz21ycm06d9mwc6dbjr8ansl212ril3i5jl73yzkdi9ngj16qqa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring data-default-class io-streams network pem tls x509 + x509-store x509-system + ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network test-framework + test-framework-hunit + ]; + description = "One stop solution for tcp client and server with tls support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tcp-streams-openssl" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system , HUnit, io-streams, network, tcp-streams, test-framework @@ -208772,6 +209068,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "terminal" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, prettyprinter + , stm, tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "terminal"; + version = "0.1.0.0"; + sha256 = "15km89sb94aqnyjvl1i63nqchqszd9hpa46sxrv2wbbn1dajcfbx"; + libraryHaskellDepends = [ + async base bytestring exceptions prettyprinter stm text + transformers + ]; + testHaskellDepends = [ + async base bytestring exceptions prettyprinter stm tasty + tasty-hunit tasty-quickcheck text transformers + ]; + description = "Portable terminal interaction library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terminal-progress-bar" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, terminal-size , test-framework, test-framework-hunit, text, time @@ -208791,6 +209107,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-punch" = callPackage + ({ mkDerivation, ansi-terminal, base, filepath, QuickCheck, text + , time + }: + mkDerivation { + pname = "terminal-punch"; + version = "0.1.1"; + sha256 = "11z6jb130300yjkrl511960anjac9ncc3g1yj6jqpah6j2imsa8s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base filepath text time + ]; + testHaskellDepends = [ base QuickCheck time ]; + description = "Simple terminal-based time tracker"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terminal-size" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -211614,25 +211948,24 @@ self: { "thrift" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network - , network-uri, QuickCheck, split, text, unordered-containers - , vector + , bytestring, containers, ghc-prim, hashable, hspec, hspec-core + , HTTP, network, network-uri, QuickCheck, split, text + , unordered-containers, vector }: mkDerivation { pname = "thrift"; - version = "0.10.0"; - sha256 = "01vxik64gnsnm0y9mh82dv48f711231dhc4kksdmgs7f352fc1k7"; + version = "0.12.0"; + sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers - ghc-prim hashable HTTP network network-uri QuickCheck split text - unordered-containers vector + ghc-prim hashable hspec-core HTTP network network-uri QuickCheck + split text unordered-containers vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck unordered-containers ]; description = "Haskell bindings for the Apache Thrift RPC system"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.asl20; }) {}; "thrist" = callPackage @@ -212931,8 +213264,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.2"; - sha256 = "1pid79ar85ajs6gi5d8smqn9ivfr8y50qys1n5zq68kpx2gmf3lq"; + version = "1.9.5"; + sha256 = "1z7yvp0c10gkxljg6lkn26niigx0wkdmzs7pqjd666lgzk0ji5hy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213584,14 +213917,30 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "tokenizer-monad"; - version = "0.2.1.0"; - sha256 = "1lvj9z7q3xnizd6v2sb8bqbl31w5jbrnf9xvc76awvy9lsdl3awz"; + version = "0.2.2.0"; + sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn"; libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tokenizer-streaming" = callPackage + ({ mkDerivation, base, bytestring, mtl, streaming + , streaming-bytestring, streaming-commons, text, tokenizer-monad + }: + mkDerivation { + pname = "tokenizer-streaming"; + version = "0.1.0.1"; + sha256 = "0ml4fby87z1fgk2v3if3z6bf1h9gsdcjgmq6lr77qsri2yfcscla"; + libraryHaskellDepends = [ + base bytestring mtl streaming streaming-bytestring + streaming-commons text tokenizer-monad + ]; + description = "A variant of tokenizer-monad that supports streaming"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tokstyle" = callPackage ({ mkDerivation, array, base, deepseq, filepath, language-c }: mkDerivation { @@ -213735,6 +214084,8 @@ self: { pname = "tomland"; version = "1.0.0"; sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; + revision = "1"; + editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213791,8 +214142,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.0.0"; - sha256 = "18ziyj0d4xfhbwk7z84drhqgngmy71gmdv2jma8ikfjlahs6mf5b"; + version = "0.1.1.0"; + sha256 = "0hilycd6m32jv3gbsq6j182mc3igcxnhsfqzn6sj5zbip0kx17h7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217383,6 +217734,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-spec_0_4_0_0" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "type-spec"; + version = "0.4.0.0"; + sha256 = "0z94hgvmnpcv9va7spdkmbxz99ri1skdq3kwxbid77cpyh95xsxq"; + libraryHaskellDepends = [ base pretty ]; + testHaskellDepends = [ base ]; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -217496,6 +217860,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-admin" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, data-default-class + , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session + , heterocephalus, http-api-data, http-types, lucid, monad-control + , mtl, persistable-record, relational-query, relational-query-HDBC + , relational-record, template-haskell, text, time, transformers + , transformers-base, unordered-containers, utf8-string, wai + , wai-extra, warp, yaml + }: + mkDerivation { + pname = "typed-admin"; + version = "0.1.0.0"; + sha256 = "146dkmcrq1rsw7mpdyxa9vhnsr8rfgqz88r10f60chn1m7yhlk7q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup bytestring data-default-class exceptions + generic-lens HDBC HDBC-postgresql HDBC-session heterocephalus + http-api-data http-types lucid monad-control mtl persistable-record + relational-query relational-query-HDBC relational-record + template-haskell text time transformers transformers-base + unordered-containers utf8-string wai wai-extra warp yaml + ]; + description = "Admin console framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typed-duration" = callPackage ({ mkDerivation, base, lifted-base, monad-control , transformers-base @@ -217512,25 +217903,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.3.0"; - sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0"; - libraryHaskellDepends = [ - async base bytestring process stm transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers - ]; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_2_4_0" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers }: @@ -217547,7 +217919,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -217792,6 +218163,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typerep-map_0_3_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat + , hedgehog, primitive, QuickCheck, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, vector + }: + mkDerivation { + pname = "typerep-map"; + version = "0.3.1"; + sha256 = "1ycyk47h578vf4kpf1y708zg9cc6i028jv1fdaw3zy59wrbl8y74"; + revision = "2"; + editedCabalFile = "0zcvg2kr3kcnhxdndw6fcjdd1421ncglr34mc8d9sw1hjjcb5w38"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover + tasty-hedgehog tasty-hspec + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq dependent-map dependent-sum + ghc-typelits-knownnat + ]; + doHaddock = false; + description = "Efficient implementation of a dependent map with types as keys"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -217874,8 +218275,8 @@ self: { }: mkDerivation { pname = "typograffiti"; - version = "0.1.0.0"; - sha256 = "0wd7p6hyn0v8rkvcpbqyjarhv47hi1r3fjzmrldfkylfwnhzj0lf"; + version = "0.1.0.2"; + sha256 = "1i7my9vqkabwxsj6hp9alvlpb483vs07f07662i707kpqf5pryrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217890,7 +218291,7 @@ self: { base bytestring containers freetype2 gl linear mtl pretty-show stm template-haskell vector ]; - description = "Display TTF fonts in OpenGL. Includes caching for fast rendering."; + description = "Just let me draw nice text already"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -219200,8 +219601,8 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.5.0.2"; - sha256 = "0rf2z02r4nk5z9f6937g25brvq391qy8a63mawnkk8hidq8af09j"; + version = "0.5.1"; + sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -219717,6 +220118,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-time_0_4_5" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover + , old-locale, old-time, QuickCheck, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.4.5"; + sha256 = "1bwg132x2613k93wxka17461fc72wrjy5vmgcyami0nn5b30ay7y"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring hspec old-locale old-time QuickCheck time + ]; + testToolDepends = [ hspec-discover ]; + description = "Unix time parser/formatter and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -222815,6 +223234,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_16" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.16"; + sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -224163,6 +224594,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai_3_2_2" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover + , http-types, network, text, transformers, vault + }: + mkDerivation { + pname = "wai"; + version = "3.2.2"; + sha256 = "1qbzq4k8b23pg1knw5y99rdvkfywnncwqkfrkp2w7g6p054xar1a"; + libraryHaskellDepends = [ + base bytestring http-types network text transformers vault + ]; + testHaskellDepends = [ base bytestring hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Web Application Interface"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-accept-language" = callPackage ({ mkDerivation, base, bytestring, file-embed, http-types, text , wai, wai-app-static, wai-extra, warp, word8 @@ -224421,6 +224870,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_25" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.25"; + sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute network old-locale + resourcet streaming-commons text time transformers unix unix-compat + vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -225924,6 +226403,8 @@ self: { pname = "warp"; version = "3.2.25"; sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy"; + revision = "1"; + editedCabalFile = "0q0l9s1c9m20g7j6lgrj7d3l0awr3hc35bvm95an61hg18cilngj"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -225946,6 +226427,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_26" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, doctest + , gauge, ghc-prim, hashable, hspec, http-client, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.26"; + sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory doctest ghc-prim hashable + hspec http-client http-date http-types http2 HUnit iproute + lifted-base network process QuickCheck silently simple-sendfile stm + streaming-commons text time transformers unix unix-compat vault wai + word8 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network unix unix-compat + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -226652,6 +227168,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "web3_0_8_3_1" = callPackage + ({ mkDerivation, aeson, async, base, basement, bytestring, cereal + , cryptonite, data-default, exceptions, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations, http-client + , http-client-tls, machines, memory, microlens, microlens-aeson + , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random + , relapse, split, stm, tagged, template-haskell, text, time + , transformers, uuid-types, vinyl + }: + mkDerivation { + pname = "web3"; + version = "0.8.3.1"; + sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; + libraryHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec relapse tagged template-haskell text transformers uuid-types + vinyl + ]; + testHaskellDepends = [ + aeson async base basement bytestring cereal cryptonite data-default + exceptions generics-sop hspec hspec-contrib hspec-discover + hspec-expectations http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec random relapse split stm tagged template-haskell text time + transformers uuid-types vinyl + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum API for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -228901,6 +229451,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq_0_5_3_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, case-insensitive, containers + , cryptonite, directory, doctest, exceptions, filepath, ghc-prim + , hashable, http-client, http-client-tls, http-types, HUnit, lens + , lens-aeson, memory, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq"; + version = "0.5.3.2"; + sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring + bytestring case-insensitive containers cryptonite exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson memory mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -231882,36 +232471,6 @@ self: { }) {}; "yam" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-types, lens, monad-logger - , mtl, mwc-random, QuickCheck, reflection, salak, scientific - , servant-server, servant-swagger, servant-swagger-ui, swagger2 - , text, time, unliftio-core, unordered-containers, vault, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.6"; - sha256 = "0b1rk9iydrkaa15w5m1iqi2527gw7s3nvjvqcdzql7jqsgaa3d52"; - libraryHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - http-types lens monad-logger mtl mwc-random reflection salak - scientific servant-server servant-swagger servant-swagger-ui - swagger2 text time unliftio-core unordered-containers vault wai - warp - ]; - testHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - hspec http-types lens monad-logger mtl mwc-random QuickCheck - reflection salak scientific servant-server servant-swagger - servant-swagger-ui swagger2 text time unliftio-core - unordered-containers vault wai warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam_0_5_11" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , data-default, fast-logger, hspec, http-client, http-types, lens , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak @@ -231982,21 +232541,6 @@ self: { }) {}; "yam-datasource" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; - version = "0.5.6"; - sha256 = "1yjl7ggyd12vgsv40kmabik2pdd7jyf4x94zgvvckm5ra44fpvyz"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yam-datasource_0_5_11" = callPackage ({ mkDerivation, base, conduit, persistent, resource-pool , resourcet, unliftio-core, yam }: @@ -232009,7 +232553,6 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-job" = callPackage @@ -233573,6 +234116,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_10_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, rio, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.10.1"; + sha256 = "0xkfzdy1r07w7xqai4r5b96rrk51gr5ndwrf20nhdnjjms4928li"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types monad-logger mtl + parsec path-pieces primitive random resourcet rio shakespeare + template-haskell text time transformers unix-compat unliftio + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -233853,6 +234433,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_6_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, text, time, transformers, wai + , xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.4"; + sha256 = "0iqcrbmwhgfk78qi2n1n3i39izqr7km4i8fa1zmvplqkcbyi149c"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare text time + transformers wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { @@ -234759,31 +235362,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, network, pretty-show - , semigroups, text, time, transformers, unliftio, wai, wai-extra - , xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.5.1"; - sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_6" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, network, pretty-show @@ -234806,7 +235384,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage From 10a474e74d592065660cb5885720437c5dd7b13c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 24 Jan 2019 10:45:36 +0100 Subject: [PATCH 163/230] git-annex: update sha256 hash for new version 7.20190122 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 769c2d7bf0e..bff993a0e69 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0wczijw80pw31k6h3a65m76aq9i02aarr2zxl7k5m7p0l6rn82vd"; + sha256 = "0vww2qf94a6dg46mynkgpk0lh3x12vvfby3flqymi4wfrx1fif1k"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From e51f959fc769dd83c320d823f75ec306f7992497 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 24 Jan 2019 18:15:52 +0100 Subject: [PATCH 164/230] git-annex: drop obsolete patches --- .../configuration-ghc-8.6.x.nix | 3 - .../git-annex-fix-ghc-8.6.x-build.patch | 91 ------------------- 2 files changed, 94 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bb49a31c0ee..979e89655ac 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -68,7 +68,4 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; - # Fix build with ghc 8.6.x. - git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch; - } diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch deleted file mode 100644 index 46d7afada4a..00000000000 --- a/pkgs/development/haskell-modules/patches/git-annex-fix-ghc-8.6.x-build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 2e0e557e7512ddd0376f179e82c811d8b4cce401 Mon Sep 17 00:00:00 2001 -From: Joey Hess -Date: Sat, 5 Jan 2019 11:54:06 -0400 -Subject: [PATCH] Support being built with ghc 8.0.1 (MonadFail) - -Tested on an older ghc by enabling MonadFailDesugaring globally. - -In TransferQueue, the lack of a MonadFail for STM exposed what would -normally be a bug in the pattern matching, although in this case an -earlier check that the queue was not empty avoided a pattern match -failure. ---- - Annex.hs | 2 ++ - Assistant/Monad.hs | 2 ++ - Assistant/TransferQueue.hs | 21 +++++++++++---------- - CHANGELOG | 1 + - 4 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/Annex.hs b/Annex.hs -index 0a0368d36..af0ede1f4 100644 ---- a/Annex.hs -+++ b/Annex.hs -@@ -74,6 +74,7 @@ import "mtl" Control.Monad.Reader - import Control.Concurrent - import Control.Concurrent.Async - import Control.Concurrent.STM -+import qualified Control.Monad.Fail as Fail - import qualified Control.Concurrent.SSem as SSem - import qualified Data.Map.Strict as M - import qualified Data.Set as S -@@ -93,6 +94,7 @@ newtype Annex a = Annex { runAnnex :: ReaderT (MVar AnnexState) IO a } - MonadCatch, - MonadThrow, - MonadMask, -+ Fail.MonadFail, - Functor, - Applicative - ) -diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs -index 403ee16a8..ef2ee6012 100644 ---- a/Assistant/Monad.hs -+++ b/Assistant/Monad.hs -@@ -27,6 +27,7 @@ module Assistant.Monad ( - - import "mtl" Control.Monad.Reader - import System.Log.Logger -+import qualified Control.Monad.Fail as Fail - - import Annex.Common - import Assistant.Types.ThreadedMonad -@@ -49,6 +50,7 @@ newtype Assistant a = Assistant { mkAssistant :: ReaderT AssistantData IO a } - Monad, - MonadIO, - MonadReader AssistantData, -+ Fail.MonadFail, - Functor, - Applicative - ) -diff --git a/Assistant/TransferQueue.hs b/Assistant/TransferQueue.hs -index 6a4473262..7c0ab80d0 100644 ---- a/Assistant/TransferQueue.hs -+++ b/Assistant/TransferQueue.hs -@@ -191,17 +191,18 @@ getNextTransfer acceptable = do - sz <- readTVar (queuesize q) - if sz < 1 - then retry -- blocks until queuesize changes -- else do -- (r@(t,info):rest) <- readTList (queuelist q) -- void $ modifyTVar' (queuesize q) pred -- setTList (queuelist q) rest -- if acceptable info -- then do -- adjustTransfersSTM dstatus $ -- M.insert t info -- return $ Just r -- else return Nothing -+ else readTList (queuelist q) >>= \case -+ [] -> retry -- blocks until something is queued -+ (r@(t,info):rest) -> do -+ void $ modifyTVar' (queuesize q) pred -+ setTList (queuelist q) rest -+ if acceptable info -+ then do -+ adjustTransfersSTM dstatus $ -+ M.insert t info -+ return $ Just r -+ else return Nothing - - {- Moves transfers matching a condition from the queue, to the - - currentTransfers map. -} - From f5d69f88b72b03e0ce6130480e10905a38b80a13 Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Fri, 25 Jan 2019 12:20:31 +0100 Subject: [PATCH 165/230] gitea: 1.6.4 -> 1.7.0 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f5e586ec2ba..689cf8d8de9 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "09h8nbzsxm34rlfnvbsf4cs02igids806927xpxf7g563cdapcnl"; + sha256 = "1mbr7pnzn8x05wc288855vqaf86qk2f1py5zh8s63l048bn0fld6"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' From 1f8c96054ee971397ffd4727930a9252552ac9bd Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sat, 24 Nov 2018 18:56:37 +0100 Subject: [PATCH 166/230] eval-release.sh: increase nix-instantiate heap size to 2GB Otherwise, nix-instantiate fails with Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS --- maintainers/scripts/eval-release.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/scripts/eval-release.sh b/maintainers/scripts/eval-release.sh index 9ef531319e4..e0dfaf1de74 100755 --- a/maintainers/scripts/eval-release.sh +++ b/maintainers/scripts/eval-release.sh @@ -4,4 +4,8 @@ if [[ -z "$VERBOSE" ]]; then echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" fi unset HOME NIXPKGS_CONFIG # Force empty config + +# With the default heap size (380MB), nix-instantiate fails: +# Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS +export GC_INITIAL_HEAP_SIZE=${GC_INITIAL_HEAP_SIZE:-2000000000} # 2GB nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null From 487a43324e4fffacb18f82252045c9fe23a37a97 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 25 Jan 2019 07:31:45 -0600 Subject: [PATCH 167/230] docker: 18.09.0 -> 18.09.1 https://github.com/docker/docker-ce/releases/tag/v18.09.1 --- .../applications/virtualization/docker/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 28c43debcab..f616ca42983 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -199,13 +199,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = dockerGen rec { - version = "18.09.0"; - rev = "4d60db472b2bde6931072ca6467f2667c2590dff"; # git commit - sha256 = "0py944f5k71c1cf6ci96vnqk43d5979w7r82cngaxk1g6za6k5yj"; - runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; - runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; - containerdRev = "468a545b9edcd5932818eb9de8e72413e616e86e"; - containerdSha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v"; + version = "18.09.1"; + rev = "4c52b901c6cb019f7552cd93055f9688c6538be4"; # git commit + sha256 = "0q2789afx07pkisgp9iqrbac5k7xca54w1an4mf5mw34xn8yc4xc"; + runcRev = "96ec2177ae841256168fcf76954f7177af9446eb"; + runcSha256 = "1qr9msx6vs37jr0rk3r8x2q51fsk50c78a3999kd0snjy9bxmfhd"; + containerdRev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce"; + containerdSha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; From db7ccd440efa85fb2a7a428075c0d2848e432a1e Mon Sep 17 00:00:00 2001 From: Brenton Horne Date: Thu, 24 Jan 2019 22:16:03 +1000 Subject: [PATCH 168/230] googleearth: adding application launcher and icons I am adding an application launcher, and icons for the googleearth package. They are essentially just those in opt/ with the only adjustment being to make the launcher execute the correct executable file. --- pkgs/applications/misc/googleearth/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 96f8cb11614..0fccf83acf7 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -79,6 +79,15 @@ stdenv.mkDerivation rec { for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done + + # Add desktop config file and icons + mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} + ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop + sed -i -e "s|Exec=.*|Exec=$out/bin/googleearth|g" $out/opt/google/earth/free/google-earth.desktop + for size in 16 22 24 32 48 64 128 256; do + ln -s $out/opt/google/earth/free/product_logo_"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/google-earth.png + done + ln -s $out/opt/google/earth/free/product_logo_256.png $out/share/pixmaps/google-earth.png ''; checkPhase = '' From 094655161200179abe49a626146e0371e3361c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Jan 2019 16:09:55 +0100 Subject: [PATCH 169/230] dnsperf: 2.1.0.0 -> 2.2.0 I tested performance with resperf for a while. --- pkgs/tools/networking/dnsperf/default.nix | 41 ++++++++++++----------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 4dba5814045..77e61aaf347 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,37 +1,40 @@ -{ stdenv, fetchurl, bind, libseccomp, zlib, openssl, libcap }: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook +, bind, libseccomp, zlib, openssl, libcap +}: stdenv.mkDerivation rec { name = "dnsperf-${version}"; - version = "2.1.0.0"; + version = "2.2.0"; # The same as the initial commit of the new GitHub repo (only readme changed). - src = fetchurl { - url = "ftp://ftp.nominum.com/pub/nominum/dnsperf/${version}/" - + "dnsperf-src-${version}-1.tar.gz"; - sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4"; + src = fetchFromGitHub { + owner = "DNS-OARC"; + repo = "dnsperf"; + rev = "v${version}"; + sha256 = "1acbpgk1d7hjs48j3w6xkmyf9xlxhqskjy50a16f9dvjwvvxp84b"; }; - # Almost the same as https://github.com/DNS-OARC/dnsperf/pull/12 - postPatch = '' - find . -name '*.h' -o -name '*.c' | xargs sed \ - -e 's/\/bool/g' -e 's/\/true/g' -e 's/\/false/g' \ - -e 's/\/PRIu64/g' -e 's/\//g' \ - -i -- - ''; - outputs = [ "out" "man" "doc" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bind zlib openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ]; - postInstall = '' - mkdir -p "$out/share/doc/" - cp -r ./doc "$out/share/doc/dnsperf" + # For now, keep including the old PDFs as well. + # https://github.com/DNS-OARC/dnsperf/issues/27 + postInstall = let + src-doc = fetchurl { + url = "ftp://ftp.nominum.com/pub/nominum/dnsperf/2.1.0.0/" + + "dnsperf-src-2.1.0.0-1.tar.gz"; + sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4"; + }; + in '' + tar xf '${src-doc}' + cp ./dnsperf-src-*/doc/*.pdf "$doc/share/doc/dnsperf/" ''; meta = with stdenv.lib; { - outputsToInstall = outputs; # The man pages and PDFs are likely useful to most. + outputsToInstall = outputs; # The man pages and docs are likely useful to most. description = "Tools for DNS benchmaring"; homepage = "https://github.com/DNS-OARC/dnsperf"; From 51a2a08d6ea9bb6eb16957599758397364d65710 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 25 Jan 2019 15:23:23 +0000 Subject: [PATCH 170/230] mathematica: 11.2.0 -> 11.3.0 Note that this only affects the English version, as I do not have access to the hash for the Japanese version. --- pkgs/applications/science/math/mathematica/l10ns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 2158021c754..065360a112d 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -5,10 +5,10 @@ with lib; l10ns = flip map [ { - version = "11.2.0"; + version = "11.3.0"; lang = "en"; language = "English"; - sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; + sha256 = "0fcfe208c1eac8448e7be3af0bdb84370b17bd9c5d066c013928c8ee95aed10e"; } { version = "11.2.0"; From 4094d4c5b1cf1df9af20f29aa26082c5a9d03b66 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 25 Jan 2019 10:31:02 -0500 Subject: [PATCH 171/230] pythonPackages.fuzzywuzzy: init at 0.17.0 --- .../python-modules/fuzzywuzzy/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/fuzzywuzzy/default.nix diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix new file mode 100644 index 00000000000..7091799deca --- /dev/null +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: + +buildPythonPackage rec { + pname = "fuzzywuzzy"; + version = "0.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62"; + }; + + propagatedBuildInputs = [ python-Levenshtein ]; + checkInputs = [ pycodestyle hypothesis pytest ]; + + meta = with stdenv.lib; { + description = "Fuzzy string matching for Python"; + homepage = https://github.com/seatgeek/fuzzywuzzy; + license = licenses.gpl2; + maintainers = with maintainers; [ earvstedt ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0e571686ea..46f5e6c7f10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -378,6 +378,8 @@ in { fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; }; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + genanki = callPackage ../development/python-modules/genanki { }; gidgethub = callPackage ../development/python-modules/gidgethub { }; From cf5487c3c6a533639084c3e6a67b5ba5453fcd84 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 25 Jan 2019 16:50:47 +0000 Subject: [PATCH 172/230] maintainers.qyliss: (me) add OpenPGP keys --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d6b6e9597c..ca1e3a2fafa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3685,6 +3685,10 @@ email = "hi@alyssa.is"; github = "alyssais"; name = "Alyssa Ross"; + keys = [{ + longkeyid = "rsa4096/736CCDF9EF51BD97"; + fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; + }]; }; ragge = { email = "r.dahlen@gmail.com"; From f061a74303082ff2fe1db14251f80500be0b2488 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 25 Jan 2019 16:51:21 +0000 Subject: [PATCH 173/230] maintainers: fix typo --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ca1e3a2fafa..fed2cacbddf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21,7 +21,7 @@ - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/`), - `keys` is a list of your PGP/GPG key IDs and fingerprints. - `handle == github` is strongly preffered whenever `github` is an acceptable attribute name and is short and convenient. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. Add PGP/GPG keys only if you actually use them to sign commits and/or mail. From 33036ac5d489125f9b97a5dc8d860b105db540d0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 25 Sep 2018 13:46:36 +0100 Subject: [PATCH 174/230] nix: move perl-bindings inside common function It looks like originally not all Nix packages had perl bindings, but now that they do, it seems pretty redundant to add them seperately for each package. --- pkgs/tools/package-management/nix/default.nix | 230 +++++++++--------- 1 file changed, 114 insertions(+), 116 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 995f123b81d..d86dfa31619 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -13,153 +13,154 @@ let sh = busybox-sandbox-shell; - common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { - inherit name src; - version = lib.getVersion name; + common = { name, suffix ? "", src, fromGit ? false }: + let nix = stdenv.mkDerivation rec { + inherit name src; + version = lib.getVersion name; - is20 = lib.versionAtLeast version "2.0pre"; + is20 = lib.versionAtLeast version "2.0pre"; - VERSION_SUFFIX = lib.optionalString fromGit suffix; + VERSION_SUFFIX = lib.optionalString fromGit suffix; - outputs = [ "out" "dev" "man" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; - nativeBuildInputs = - [ pkgconfig ] - ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; + nativeBuildInputs = + [ pkgconfig ] + ++ lib.optionals (!is20) [ curl perl ] + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns ]; - buildInputs = [ curl openssl sqlite xz bzip2 ] - ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is20 [ brotli boost editline ] - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional (withAWS && is20) - ((aws-sdk-cpp.override { - apis = ["s3" "transfer"]; - customMemoryManagement = false; - }).overrideDerivation (args: { - patches = args.patches or [] ++ [(fetchpatch { - url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; - sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; - })]; - })); + buildInputs = [ curl openssl sqlite xz bzip2 ] + ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium + ++ lib.optionals is20 [ brotli boost editline ] + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional (withAWS && is20) + ((aws-sdk-cpp.override { + apis = ["s3" "transfer"]; + customMemoryManagement = false; + }).overrideDerivation (args: { + patches = args.patches or [] ++ [(fetchpatch { + url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; + sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; + })]; + })); - propagatedBuildInputs = [ boehmgc ]; + propagatedBuildInputs = [ boehmgc ]; - # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; + # Seems to be required when using std::atomic with 64-bit types + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; - preConfigure = - # Copy libboost_context so we don't get all of Boost in our closure. - # https://github.com/NixOS/nixpkgs/issues/45462 - if is20 then '' - mkdir -p $out/lib - cp ${boost}/lib/libboost_context* $out/lib - '' else '' - configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + if is20 then '' + mkdir -p $out/lib + cp ${boost}/lib/libboost_context* $out/lib + '' else '' + configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") + ''; + + configureFlags = + [ "--with-store-dir=${storeDir}" + "--localstatedir=${stateDir}" + "--sysconfdir=${confDir}" + "--disable-init-state" + "--enable-gc" + ] + ++ lib.optionals (!is20) [ + "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" + ] ++ lib.optionals (is20 && stdenv.isLinux) [ + "--with-sandbox-shell=${sh}/bin/busybox" + ] + ++ lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system + ) ''--with-system=${stdenv.hostPlatform.nix.system}'' + # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 + ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; + + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + + doInstallCheck = true; # not cross + + # socket path becomes too long otherwise + preInstallCheck = lib.optional stdenv.isDarwin '' + export TMPDIR=$NIX_BUILD_TOP ''; - configureFlags = - [ "--with-store-dir=${storeDir}" - "--localstatedir=${stateDir}" - "--sysconfdir=${confDir}" - "--disable-init-state" - "--enable-gc" - ] - ++ lib.optionals (!is20) [ - "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" - "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" - ] ++ lib.optionals (is20 && stdenv.isLinux) [ - "--with-sandbox-shell=${sh}/bin/busybox" - ] - ++ lib.optional ( - stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system - ) ''--with-system=${stdenv.hostPlatform.nix.system}'' - # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; + separateDebugInfo = stdenv.isLinux; - makeFlags = "profiledir=$(out)/etc/profile.d"; + enableParallelBuilding = true; - installFlags = "sysconfdir=$(out)/etc"; + meta = { + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; + homepage = https://nixos.org/; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + outputsToInstall = [ "out" "man" ]; + }; - doInstallCheck = true; # not cross + passthru = { + inherit fromGit; - # socket path becomes too long otherwise - preInstallCheck = lib.optional stdenv.isDarwin '' - export TMPDIR=$NIX_BUILD_TOP - ''; + perl-bindings = stdenv.mkDerivation { + name = "nix-perl-${version}"; - separateDebugInfo = stdenv.isLinux; + inherit src; - enableParallelBuilding = true; + postUnpack = "sourceRoot=$sourceRoot/perl"; - meta = { - description = "Powerful package manager that makes package management reliable and reproducible"; - longDescription = '' - Nix is a powerful package manager for Linux and other Unix systems that - makes package management reliable and reproducible. It provides atomic - upgrades and rollbacks, side-by-side installation of multiple versions of - a package, multi-user package management and easy setup of build - environments. - ''; - homepage = https://nixos.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; - outputsToInstall = [ "out" "man" ]; + # This is not cross-compile safe, don't have time to fix right now + # but noting for future travellers. + nativeBuildInputs = + [ perl pkgconfig curl nix libsodium ] + ++ lib.optionals fromGit [ autoreconfHook autoconf-archive ] + ++ lib.optional is20 boost; + + configureFlags = + [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" + ]; + + preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + preBuild = "unset NIX_INDENT_MAKE"; + }; + }; }; - - passthru = { inherit fromGit; }; - }; - - perl-bindings = { nix, needsBoost ? false }: stdenv.mkDerivation { - name = "nix-perl-" + nix.version; - - inherit (nix) src; - - postUnpack = "sourceRoot=$sourceRoot/perl"; - - # This is not cross-compile safe, don't have time to fix right now - # but noting for future travellers. - nativeBuildInputs = - [ perl pkgconfig curl nix libsodium ] - ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ] - ++ lib.optional needsBoost boost; - - configureFlags = - [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" - ]; - - preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - preBuild = "unset NIX_INDENT_MAKE"; - }; + in nix; in rec { nix = nixStable; - nix1 = (common rec { + nix1 = common rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; - }) // { perl-bindings = nix1; }; + }; - nixStable = (common rec { + nixStable = common rec { name = "nix-2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; }; - }) // { perl-bindings = perl-bindings { - nix = nixStable; - needsBoost = true; - }; }; + }; - nixUnstable = (lib.lowPrio (common rec { + nixUnstable = lib.lowPrio (common rec { name = "nix-2.2${suffix}"; suffix = "pre6600_85488a93"; src = fetchFromGitHub { @@ -169,9 +170,6 @@ in rec { sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm"; }; fromGit = true; - })) // { perl-bindings = perl-bindings { - nix = nixUnstable; - needsBoost = true; - }; }; + }); } From 6d94f6ea1a0a4f701a123253b189f5087b4ccd45 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 25 Jan 2019 17:04:54 +0000 Subject: [PATCH 175/230] liferea: 1.12.4 -> 1.12.6 --- .../networking/newsreaders/liferea/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7f7b03f71d2..0cfcf6408ba 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -4,15 +4,13 @@ , gobject-introspection, glib-networking, hicolor-icon-theme }: -let +stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.12.6"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}b.tar.bz2"; + sha256 = "sha256:03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; From 72dba7b70dee162a08f8a5d023ee1ec02dad1f20 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 25 Jan 2019 14:00:47 -0500 Subject: [PATCH 176/230] lollypop: 0.9.909 -> 0.9.914 --- pkgs/applications/audio/lollypop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 5bc6e717465..51c5cdad69d 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.909"; + version = "0.9.914"; format = "other"; doCheck = false; @@ -14,10 +14,10 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "19d82dy0wprabg5kzcgs3ydmp9iz3h437n55cnlp20mbpya09k7n"; + sha256 = "0nkwic6mq4fs467c696m5w0wqrii5rzvf2il6vkw861my1bl9wzj"; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ appstream-glib desktop-file-utils gobject-introspection From b6e72bfc0770af2b09f46c651bb3f6669a9ac66a Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 25 Jan 2019 22:12:08 +0300 Subject: [PATCH 177/230] toggldesktop: bump qt-oauth-lib (see #53676) --- pkgs/applications/misc/toggldesktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index bc36ffa5e10..b268bdd0962 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco -, qtbase, qtwebkit, qtx11extras, sqlite }: +, qtbase, qtwebengine, qtx11extras, sqlite }: let name = "toggldesktop-${version}"; @@ -39,15 +39,15 @@ let qt-oauth-lib = stdenv.mkDerivation rec { name = "qt-oauth-lib-${version}"; - version = "20180521.233208"; + version = "20190125.190943"; src = fetchzip { url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; - sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebkit ]; + buildInputs = [ qtbase qtwebengine ]; }; poco-pc = writeText "poco.pc" '' @@ -100,7 +100,7 @@ let libtoggl qxtglobalshortcut qtbase - qtwebkit + qtwebengine qt-oauth-lib qtx11extras libX11 From 2edd1c8fe04e7449c99c9822b5e8ec83719b56b6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 25 Jan 2019 14:32:07 -0500 Subject: [PATCH 178/230] bat: don't install shell completions Currently having the shell completions makes it impossible to complete filenames. Upstream Issue: https://github.com/sharkdp/bat/issues/372 --- pkgs/tools/misc/bat/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b4913970715..4da8527208e 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -22,13 +22,6 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 - - install -Dm644 target/release/build/bat-*/out/_bat \ - "$out/share/zsh/site-functions/_bat" - install -Dm644 target/release/build/bat-*/out/bat.bash \ - "$out/share/bash-completions/completions/bat.bash" - install -Dm644 target/release/build/bat-*/out/bat.fish \ - "$out/share/fish/vendor_completions.d/bat.fish" ''; meta = with stdenv.lib; { From d4224f05074b6b8b44fd9bd68e12d4f55341b872 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 25 Jan 2019 14:42:52 -0500 Subject: [PATCH 179/230] tilix: 1.8.5 -> 1.8.9, cleanup Decided to be more juidical than #53532 as switching to meson isn't currently working out. --- pkgs/applications/misc/tilix/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index eb7a8e41d4b..ab6ef329470 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus , gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret -, perlPackages, wrapGAppsHook, xdg_utils }: +, glib, perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { - name = "tilix-${version}"; - version = "1.8.5"; + pname = "tilix"; + version = "1.8.9"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; - sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7"; + rev = version; + sha256 = "1l1ib3g01mxiywbwjxc2522qgjy3ymjzy8bxl42k0hprpp95rw9d"; }; nativeBuildInputs = [ @@ -25,22 +25,20 @@ stdenv.mkDerivation rec { ) ''; - postInstall = with gnome3; '' + postInstall = '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - - wrapProgram $out/bin/tilix \ - --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; - preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH ":" "${libsecret}/lib") + substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop ''; meta = with stdenv.lib; { - description = "Tiling terminal emulator following the Gnome Human Interface Guidelines."; + description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = https://gnunn1.github.io/tilix-web; license = licenses.mpl20; maintainers = with maintainers; [ midchildan ]; From fdf77854b4174c4d1a342ca7ccf9ff065690ca18 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Mon, 31 Dec 2018 14:47:57 +0100 Subject: [PATCH 180/230] vimPlugins.sved: init --- pkgs/misc/vim-plugins/generated.nix | 10 +++++++++ pkgs/misc/vim-plugins/overrides.nix | 30 ++++++++++++++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 41 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c18ce070c1c..7582acee97c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1607,6 +1607,16 @@ let }; }; + sved = buildVimPluginFrom2Nix { + name = "sved-2019-01-25"; + src = fetchFromGitHub { + owner = "peder2tm"; + repo = "sved"; + rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; + sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; + }; + }; + swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; version = "2018-09-12"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 9a29ba82dae..c9785b66fbb 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -4,6 +4,7 @@ , xkb-switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake +, gobject-introspection, glib, wrapGAppsHook , substituteAll , languagetool , Cocoa, CoreFoundation, CoreServices @@ -172,6 +173,35 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + sved = let + # we put the script in its own derivation to benefit the magic of wrapGAppsHook + svedbackend = stdenv.mkDerivation { + name = "svedbackend-${super.sved.name}"; + inherit (super.sved) src; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ + gobject-introspection + glib + (python3.withPackages(ps: with ps; [ pygobject3 pynvim dbus-python ])) + ]; + preferLocalBuild = true; + installPhase = '' + install -Dt $out/bin ftplugin/evinceSync.py + ''; + }; + in + super.sved.overrideAttrs(old: { + preferLocalBuild = true; + postPatch = '' + rm ftplugin/evinceSync.py + ln -s ${svedbackend}/bin/evinceSync.py ftplugin/evinceSync.py + ''; + meta = { + description = "synctex support between vim/neovim and evince"; + }; + }); + + vimshell-vim = super.vimshell-vim.overrideAttrs(old: { dependencies = with super; [ vimproc-vim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 262a3277887..d154b54f3c1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -221,6 +221,7 @@ osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim +peder2tm/sved peterhoeg/vim-qml phanviet/vim-monokai-pro plasticboy/vim-markdown From b9a9f28dadfb23e99ec9f1333e969af631ce7376 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 25 Jan 2019 22:20:12 +0100 Subject: [PATCH 181/230] neovim: remove spurious references to compilation flags --- pkgs/applications/editors/neovim/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a3580b1afa7..2cd1b277377 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -46,6 +46,13 @@ let lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ]; + # nvim --version output retains compilation flags and references to build tools + postPatch = '' + substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; + ''; + # check that the above patching actually works + disallowedReferences = [ stdenv.cc ]; + cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" "-DGPERF_PRG=${gperf}/bin/gperf" From 5f106e8aae930c7f48a50cf20c1c92d80ca733c8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 25 Jan 2019 16:36:28 -0500 Subject: [PATCH 182/230] darwin.xcode: update hashes --- pkgs/os-specific/darwin/xcode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 369529d7167..62785f34fe8 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -45,6 +45,7 @@ in lib.makeExtensible (self: { xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; - xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; + xcode_9_4 = requireXcode "9.4" "132l92c702lm8yrc62w4b8n2iap1qzqvklqzi39x9832ajysn6vw"; + xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v"; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "8.2")}"; }) From 0590170c799d5f2b67d674c64dc48052f1bcd882 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Tue, 8 Jan 2019 23:29:04 +0200 Subject: [PATCH 183/230] gitkraken: 4.1.1 -> 4.2.0 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dfc2484b1a5..087ffe89419 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "188k6vaafv6szzhslsfabnnn68ispsv54d98rcm3m0bmp8kg5p7f"; + sha256 = "1r1pamwg830a18928jjfajcq2yiqvadbdvklh89dpdqk2529yha0"; }; libPath = makeLibraryPath [ From db3b270f79dfd4cf30d3ae59cd7174b62a9d06a8 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Sat, 26 Jan 2019 01:06:26 +0200 Subject: [PATCH 184/230] gitkraken: 4.2.0 -> 4.2.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 087ffe89419..664ef62be54 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1r1pamwg830a18928jjfajcq2yiqvadbdvklh89dpdqk2529yha0"; + sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg"; }; libPath = makeLibraryPath [ From 9310fc3e1345d35afec56e2ba3261f5f627576c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 26 Jan 2019 00:27:40 +0100 Subject: [PATCH 185/230] EmptyEpsilon: 2018.11.16 -> 2019.01.19 --- pkgs/games/empty-epsilon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 04810f792e3..cb46b8d9ba2 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -2,9 +2,9 @@ let - major = "2018"; - minor = "11"; - patch = "16"; + major = "2019"; + minor = "01"; + patch = "19"; version = "${major}.${minor}.${patch}"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "0848rxa9xwbz573b5r5qc5bpcf6pipis4gkkszfgkj1zmdhyib6b"; + sha256 = "082v27w3n4jdm4a5884607rwsw4s00cnpqmh7bsdg9q3l29jpygn"; }; nativeBuildInputs = [ cmake ]; From 74fa1860ddb6e64029b565e38f3b51bec0439a67 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 26 Jan 2019 00:15:05 +0000 Subject: [PATCH 186/230] ranger: fix build on Darwin --- pkgs/applications/misc/ranger/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 5417a135dda..7527fe963ab 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -16,6 +16,8 @@ python3Packages.buildPythonApplication rec { sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; + LC_ALL = "en_US.UTF-8"; + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ]; From b3c5e9ac1ea20a3b21568c618b7699571d9122f4 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 26 Jan 2019 00:31:32 +0000 Subject: [PATCH 187/230] nixos/collectd: restart on failure `collectd' might fail because of a failure in any of numerous plugins. For example `virt' plugin sometimes fails if `collectd' is started before `libvirtd' --- nixos/modules/services/monitoring/collectd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 6606980cdad..45e3312c0f4 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -88,6 +88,8 @@ in { ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f"; User = cfg.user; PermissionsStartOnly = true; + Restart = "on-failure"; + RestartSec = 3; }; preStart = '' From 24d5e30b5fcbcd27121047ed210f506273755832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 26 Jan 2019 03:08:23 +0100 Subject: [PATCH 188/230] nixos/prosody: add ExecReload Add an ExecReload command to the prosody service, to allow reloading prosody by sending SIGHUP to the main process, for example to update certificates without restarting the server. This is exactly how the `prosodyctl` tool does it. Note: Currently there is a bug which prevents mod_http from reloading the certificates properly: https://issues.prosody.im/1216. --- nixos/modules/services/networking/prosody.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 25b7d6dbeba..de316e5f466 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -513,6 +513,7 @@ in RuntimeDirectory = [ "prosody" ]; PIDFile = "/run/prosody/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; From c3e995fa737e4cb70b779130036a73e68dd52968 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 25 Jan 2019 22:27:26 -0500 Subject: [PATCH 189/230] i3lock-fancy: 2017-12-14 -> 2018-11-25 --- .../window-managers/i3/lock-fancy.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index e28a9cf75be..a0e46c108b7 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,31 +3,32 @@ }: stdenv.mkDerivation rec { - rev = "3734fba160166006521e513f5734eb76ac6aa48f"; - name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}"; + rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; + name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl"; + sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; patchPhase = '' - sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock - sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock - sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock - sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock - sed -i -e "s| awk | ${gawk}/bin/awk |" lock - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" lock - sed -i -e 's|icon="$scriptpath/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock - sed -i -e 's|icon="$scriptpath/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' lock - sed -i -e "s|getopt |${getopt}/bin/getopt |" lock - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock + sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy + sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy + sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy + sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy + sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy + sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy + sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy + sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" i3lock-fancy + rm Makefile ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons - cp lock $out/bin/i3lock-fancy + cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { From 9e3db4df2c434ce5390c7dde47f2b606e724cbbd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 25 Jan 2019 22:56:55 -0500 Subject: [PATCH 190/230] toluapp: Fix includes for newer Lua versions See https://github.com/LuaDist/toluapp/pull/2 --- pkgs/development/tools/toluapp/default.nix | 2 +- pkgs/development/tools/toluapp/headers.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/toluapp/headers.patch diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5ad9a7c58ef..90d36c71caa 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ lua ]; - patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + patches = [ ./environ-and-linux-is-kinda-posix.patch ./headers.patch ]; preConfigure = '' substituteInPlace config_posix.py \ diff --git a/pkgs/development/tools/toluapp/headers.patch b/pkgs/development/tools/toluapp/headers.patch new file mode 100644 index 00000000000..59a47bb989a --- /dev/null +++ b/pkgs/development/tools/toluapp/headers.patch @@ -0,0 +1,15 @@ +diff --git a/include/tolua++.h b/include/tolua++.h +index ed53449..f57d56d 100644 +--- a/include/tolua++.h ++++ b/include/tolua++.h +@@ -43,8 +43,8 @@ extern "C" { + + typedef int lua_Object; + +-#include "lua.h" +-#include "lauxlib.h" ++#include ++#include + + struct tolua_Error + { From 3da56c78446ac56939ff45c7a91ee7801a987ddd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 25 Jan 2019 22:57:53 -0500 Subject: [PATCH 191/230] conky: 1.11.1 -> 1.11.2 --- pkgs/os-specific/linux/conky/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 654e565140d..9519e72e91c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -51,7 +51,7 @@ assert luaImlib2Support -> luaSupport && imlib2Support assert luaCairoSupport -> luaSupport && toluapp != null && cairo != null; assert luaCairoSupport || luaImlib2Support - -> lua.luaversion == "5.1"; + -> lua.luaversion == "5.3"; assert wirelessSupport -> wirelesstools != null; assert nvidiaSupport -> libXNVCtrl != null; @@ -66,13 +66,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "00ghxzg78mp7w2y9cxhsdmkab2n7vfg76p6zihiglb2x3h2gjm5x"; + sha256 = "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"; }; postPatch = '' @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { # Drop examples, since they contain non-ASCII characters that break docbook2x :( sed -i 's/ Example: .*$//' doc/config_settings.xml - substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" + substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" ''; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7990344674..8709e4d90f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14340,7 +14340,7 @@ in cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ - lua = lua5_1; # conky can use 5.2, but toluapp can not + lua = lua5_3_compat; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; pulseSupport = config.pulseaudio or false; } // config.conky or {}); From 0b0958314a5c0897b8ae54397a6b3ed19a3d6a63 Mon Sep 17 00:00:00 2001 From: Marica Odagaki Date: Fri, 25 Jan 2019 20:18:33 -0800 Subject: [PATCH 192/230] gem-config: add semian Note: on macOS, it works without this config. Testing on Ubuntu/Debian with the parent sha will produce an error about extconf.rb failing to find openssl/sha.h. --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cde0b90d6fe..724435c01ca 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -358,6 +358,10 @@ in ''; } else {}; + semian = attrs: { + buildInputs = [ openssl ]; + }; + sequel_pg = attrs: { buildInputs = [ postgresql ]; }; From 249eccb2761c2ba1038dd22a72cd176fc6cb5d44 Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Sat, 26 Jan 2019 15:36:42 +1100 Subject: [PATCH 193/230] kubecfg: 0.6.0 -> 0.9.1 (#54597) --- pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 73a28325f52..1e16cf1afca 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.6.0"; in +let version = "0.9.1"; in buildGoPackage { name = "kubecfg-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "ksonnet"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf"; + sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi"; }; goPackagePath = "github.com/ksonnet/kubecfg"; From d61fc6c02a7d3819d81f51c9c8a142e8f3ba4f3d Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sat, 26 Jan 2019 11:15:40 +0200 Subject: [PATCH 194/230] watchexec: 1.9.0 -> 1.10.0 --- pkgs/tools/misc/watchexec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index dd3eddf7395..61f1752823d 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "watchexec"; repo = "watchexec"; rev = version; - sha256 = "0zp5s2dy5zbar0virvy1izjpvvgwbz7rvjmcy6bph6rb5c4bhm70"; + sha256 = "15fnf3r4pvl9gyvq0fy0l7p8xjaz44z9g4dzkn1l0fdhldib6z1c"; }; - cargoSha256 = "1li84kq9myaw0zwx69y72f3lx01s7i9p8yays4rwvl1ymr614y1l"; + cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; From b5c1deca8ade2771851598b460a9c0e9fc0500fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 26 Jan 2019 10:01:09 +0000 Subject: [PATCH 195/230] treewide: remove wkennington as maintainer He prefers to contribute to his own nixpkgs fork triton. Since he is still marked as maintainer in many packages this leaves the wrong impression he still maintains those. --- maintainers/maintainer-list.nix | 5 ----- nixos/tests/bittorrent.nix | 2 +- nixos/tests/installer.nix | 2 +- nixos/tests/mongodb.nix | 2 +- nixos/tests/nat.nix | 2 +- nixos/tests/networking.nix | 3 --- nixos/tests/nfs.nix | 2 +- nixos/tests/virtualbox.nix | 2 +- pkgs/applications/display-managers/lightdm/default.nix | 2 +- pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 2 +- pkgs/applications/graphics/ImageMagick/7.0.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 2 +- pkgs/applications/networking/mumble/default.nix | 2 +- pkgs/applications/networking/remote/freerdp/default.nix | 2 +- pkgs/applications/window-managers/weston/default.nix | 1 - pkgs/data/misc/cacert/default.nix | 2 +- pkgs/development/compilers/go/1.4.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 2 +- pkgs/development/compilers/rust/rustc.nix | 2 +- pkgs/development/interpreters/tcl/generic.nix | 2 +- pkgs/development/libraries/boost/generic.nix | 2 +- pkgs/development/libraries/check/default.nix | 1 - pkgs/development/libraries/ctl/default.nix | 1 - pkgs/development/libraries/czmq/3.x.nix | 1 - pkgs/development/libraries/czmq/4.x.nix | 1 - pkgs/development/libraries/dclxvi/default.nix | 1 - pkgs/development/libraries/fcgi/default.nix | 1 - pkgs/development/libraries/glog/default.nix | 1 - pkgs/development/libraries/gnutls/generic.nix | 2 +- pkgs/development/libraries/gperftools/default.nix | 2 +- pkgs/development/libraries/gss/default.nix | 2 +- pkgs/development/libraries/hidapi/default.nix | 1 - pkgs/development/libraries/hiredis/default.nix | 1 - pkgs/development/libraries/idnkit/default.nix | 1 - pkgs/development/libraries/ilmbase/default.nix | 1 - pkgs/development/libraries/jansson/default.nix | 1 - pkgs/development/libraries/jbigkit/default.nix | 1 - pkgs/development/libraries/jemalloc/common.nix | 1 - pkgs/development/libraries/kerberos/heimdal.nix | 3 +-- pkgs/development/libraries/kerberos/krb5.nix | 1 - pkgs/development/libraries/kinetic-cpp-client/default.nix | 1 - pkgs/development/libraries/kyotocabinet/default.nix | 1 - pkgs/development/libraries/ldb/default.nix | 1 - pkgs/development/libraries/leveldb/default.nix | 1 - pkgs/development/libraries/libasyncns/default.nix | 1 - pkgs/development/libraries/libclc/default.nix | 1 - pkgs/development/libraries/libdbi-drivers/default.nix | 3 +-- pkgs/development/libraries/libdbi/default.nix | 1 - pkgs/development/libraries/libestr/default.nix | 1 - pkgs/development/libraries/libevent/default.nix | 1 - pkgs/development/libraries/libfpx/default.nix | 1 - pkgs/development/libraries/libgcrypt/1.5.nix | 1 - pkgs/development/libraries/libgcrypt/default.nix | 2 +- pkgs/development/libraries/libibmad/default.nix | 1 - pkgs/development/libraries/libibumad/default.nix | 1 - pkgs/development/libraries/libical/default.nix | 1 - pkgs/development/libraries/libiec61883/default.nix | 1 - pkgs/development/libraries/libinput/default.nix | 2 +- pkgs/development/libraries/libksba/default.nix | 1 - pkgs/development/libraries/libksi/default.nix | 1 - pkgs/development/libraries/liblogging/default.nix | 1 - pkgs/development/libraries/liblognorm/default.nix | 1 - pkgs/development/libraries/libmbim/default.nix | 1 - pkgs/development/libraries/libmongo-client/default.nix | 1 - pkgs/development/libraries/libnet/default.nix | 1 - pkgs/development/libraries/libnftnl/default.nix | 2 +- pkgs/development/libraries/libomxil-bellagio/default.nix | 1 - pkgs/development/libraries/libopus/default.nix | 1 - pkgs/development/libraries/libotr/default.nix | 1 - pkgs/development/libraries/libqb/default.nix | 1 - pkgs/development/libraries/libqmi/default.nix | 1 - pkgs/development/libraries/libraw1394/default.nix | 1 - pkgs/development/libraries/librelp/default.nix | 1 - pkgs/development/libraries/libressl/default.nix | 2 +- pkgs/development/libraries/librsync/default.nix | 1 - pkgs/development/libraries/libsamplerate/default.nix | 2 +- pkgs/development/libraries/libseccomp/default.nix | 2 +- pkgs/development/libraries/libsodium/default.nix | 2 +- pkgs/development/libraries/libstatgrab/default.nix | 1 - pkgs/development/libraries/libtasn1/default.nix | 1 - pkgs/development/libraries/libtheora/default.nix | 2 +- pkgs/development/libraries/libu2f-host/default.nix | 1 - pkgs/development/libraries/libxmlxx/default.nix | 2 +- pkgs/development/libraries/libyaml/default.nix | 1 - pkgs/development/libraries/libykneomgr/default.nix | 1 - pkgs/development/libraries/libyubikey/default.nix | 1 - pkgs/development/libraries/mbedtls/1.3.nix | 2 +- pkgs/development/libraries/mbedtls/default.nix | 2 +- pkgs/development/libraries/msgpack/generic.nix | 2 +- pkgs/development/libraries/mtdev/default.nix | 3 +-- pkgs/development/libraries/ncurses/default.nix | 1 - pkgs/development/libraries/nettle/generic.nix | 1 - pkgs/development/libraries/nghttp2/default.nix | 1 - pkgs/development/libraries/nss_wrapper/default.nix | 1 - pkgs/development/libraries/ntdb/default.nix | 1 - pkgs/development/libraries/openct/default.nix | 5 ++--- pkgs/development/libraries/openexr/default.nix | 1 - pkgs/development/libraries/p11-kit/default.nix | 1 - pkgs/development/libraries/protobufc/generic.nix | 1 - pkgs/development/libraries/rabbitmq-c/default.nix | 1 - pkgs/development/libraries/rdkafka/default.nix | 2 +- pkgs/development/libraries/resolv_wrapper/default.nix | 1 - pkgs/development/libraries/rocksdb/default.nix | 2 +- pkgs/development/libraries/sbc/default.nix | 1 - pkgs/development/libraries/snappy/default.nix | 1 - pkgs/development/libraries/socket_wrapper/default.nix | 1 - pkgs/development/libraries/speex/default.nix | 1 - pkgs/development/libraries/speexdsp/default.nix | 1 - pkgs/development/libraries/svrcore/default.nix | 1 - pkgs/development/libraries/talloc/default.nix | 1 - pkgs/development/libraries/tdb/default.nix | 1 - pkgs/development/libraries/tevent/default.nix | 1 - pkgs/development/libraries/tk/generic.nix | 2 +- pkgs/development/libraries/uid_wrapper/default.nix | 1 - pkgs/development/libraries/wayland/1.9.nix | 2 +- pkgs/development/libraries/wayland/default.nix | 2 +- .../libraries/webrtc-audio-processing/default.nix | 1 - pkgs/development/libraries/wiredtiger/default.nix | 1 - pkgs/development/libraries/zeromq/3.x.nix | 1 - pkgs/development/libraries/zeromq/4.x.nix | 2 +- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- pkgs/development/tools/misc/swig/3.x.nix | 1 - pkgs/misc/gnuk/generic.nix | 1 - pkgs/misc/jackaudio/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 5 ++--- pkgs/os-specific/linux/cgmanager/default.nix | 1 - pkgs/os-specific/linux/edac-utils/default.nix | 1 - pkgs/os-specific/linux/ffado/default.nix | 2 +- pkgs/os-specific/linux/hostapd/default.nix | 2 +- pkgs/os-specific/linux/iproute/default.nix | 2 +- pkgs/os-specific/linux/ipset/default.nix | 1 - pkgs/os-specific/linux/libcap-ng/default.nix | 1 - pkgs/os-specific/linux/lxc/default.nix | 2 +- pkgs/os-specific/linux/microcode/amd.nix | 1 - pkgs/os-specific/linux/microcode/intel.nix | 1 - pkgs/os-specific/linux/mstpd/default.nix | 1 - pkgs/os-specific/linux/nftables/default.nix | 1 - pkgs/os-specific/linux/numactl/default.nix | 1 - pkgs/os-specific/linux/pam_krb5/default.nix | 1 - pkgs/os-specific/linux/spl/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 +- pkgs/os-specific/linux/zfs/default.nix | 2 +- pkgs/servers/corosync/default.nix | 2 +- pkgs/servers/gpm/default.nix | 2 +- pkgs/servers/ldap/389/default.nix | 1 - pkgs/servers/monitoring/net-snmp/default.nix | 1 - pkgs/servers/nosql/mongodb/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/servers/samba/4.x.nix | 1 - pkgs/servers/shishi/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/servers/sql/pgpool/default.nix | 1 - pkgs/servers/unifi/default.nix | 1 - pkgs/tools/backup/bareos/default.nix | 1 - pkgs/tools/filesystems/btrfs-progs/default.nix | 2 +- pkgs/tools/filesystems/ceph/generic.nix | 2 +- pkgs/tools/misc/bandwidth/default.nix | 1 - pkgs/tools/misc/expect/default.nix | 1 - pkgs/tools/misc/mstflint/default.nix | 1 - pkgs/tools/misc/ttylog/default.nix | 1 - pkgs/tools/misc/yubico-piv-tool/default.nix | 1 - pkgs/tools/misc/yubikey-personalization-gui/default.nix | 3 +-- pkgs/tools/misc/yubikey-personalization/default.nix | 1 - pkgs/tools/networking/dhcp/default.nix | 1 - pkgs/tools/networking/iperf/3.nix | 4 ++-- pkgs/tools/networking/keepalived/default.nix | 1 - pkgs/tools/networking/ndisc6/default.nix | 2 +- pkgs/tools/networking/openntpd/default.nix | 1 - pkgs/tools/networking/radvd/default.nix | 2 +- pkgs/tools/networking/tinc/pre.nix | 2 +- pkgs/tools/security/ccid/default.nix | 1 - pkgs/tools/security/gnupg/22.nix | 2 +- pkgs/tools/security/opensc/default.nix | 1 - pkgs/tools/security/pcsclite/default.nix | 1 - pkgs/tools/system/rsyslog/default.nix | 1 - 176 files changed, 71 insertions(+), 191 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fed2cacbddf..78f3ec0288a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4908,11 +4908,6 @@ github = "wjlroe"; name = "William Roe"; }; - wkennington = { - email = "william@wkennington.com"; - github = "wkennington"; - name = "William A. Kennington III"; - }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 8977be9b859..27871f72b4e 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -23,7 +23,7 @@ in { name = "bittorrent"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow rob wkennington bobvanderlinden ]; + maintainers = [ domenkozar eelco chaoflow rob bobvanderlinden ]; }; nodes = diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c8edaaba158..2553a0d116a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -200,7 +200,7 @@ let name = "installer-" + name; meta = with pkgs.stdenv.lib.maintainers; { # put global maintainers here, individuals go into makeInstallerTest fkt call - maintainers = [ wkennington ] ++ (meta.maintainers or []); + maintainers = (meta.maintainers or []); }; nodes = { diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 2f380ff543e..c9439b65292 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : let in { name = "mongodb"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bluescreen303 offline wkennington cstrahan rvl ]; + maintainers = [ bluescreen303 offline cstrahan rvl ]; }; nodes = { diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 04b4f0f045f..34229e91311 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow rob wkennington ]; + maintainers = [ eelco chaoflow rob ]; }; nodes = diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index e689eadf1dd..ed9f287d558 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -606,7 +606,4 @@ let in mapAttrs (const (attrs: makeTest (attrs // { name = "${attrs.name}-Networking-${if networkd then "Networkd" else "Scripted"}"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ wkennington ]; - }; }))) testCases diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 0ef44f1a489..ce171701893 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -20,7 +20,7 @@ in { name = "nfs"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow wkennington ]; + maintainers = [ eelco chaoflow ]; }; nodes = diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 385e2939fe3..84d5f3e1530 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -379,7 +379,7 @@ let ''; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig wkennington cdepillabout ]; + maintainers = [ aszlig cdepillabout ]; }; }; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 36928a29897..a965ff4c8bb 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager."; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington worldofpeace ]; + maintainers = with maintainers; [ ocharles worldofpeace ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 51cb28d02d2..a3e9554789c 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington ]; + maintainers = with maintainers; [ ocharles ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 10cc55d3d2b..669c7c8f961 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - maintainers = with maintainers; [ the-kenny wkennington ]; + maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 5220fdf8981..79149dc83cf 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ the-kenny wkennington ]; + maintainers = with maintainers; [ the-kenny ]; license = licenses.asl20; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fbd326919f3..edcf154dc77 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = https://www.bitlbee.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ wkennington pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d0a690496e2..2d008492050 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = https://mumble.info; license = licenses.bsd3; - maintainers = with maintainers; [ jgeerds wkennington ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 6512792dd2b..425a064fa96 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.freerdp.com/; license = licenses.asl20; - maintainers = with maintainers; [ wkennington peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 541c7b539bb..b9d16db5792 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index aa6a42badb7..a99df2e7bd6 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = https://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 40fd3f15786..95312f9e1ea 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; + maintainers = with maintainers; [ cstrahan ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index d6ae163813f..799e047a60e 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej wkennington ]; + maintainers = with maintainers; [ cstrahan orivej ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1c82e71dd1d..c6350e42bc2 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; broken = broken; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 011b3a125ef..11c02acf1de 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ wkennington vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; passthru = rec { diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3e488acee74..dd383bd0123 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation { platforms = (platforms.unix ++ platforms.windows); badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"; - maintainers = with maintainers; [ peti wkennington ]; + maintainers = with maintainers; [ peti ]; }; preConfigure = '' diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index ddaf022edfd..ae8b6ca18df 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index a4f49dea59a..ac6c9657dde 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { homepage = http://ampasctl.sourceforge.net; license = "A.M.P.A.S"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; passthru.source = source; diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index 9c9d8513422..d418b879d1d 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 67e005943fa..32bce3ba4b3 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -17,6 +17,5 @@ stdenv.mkDerivation rec { description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 1f8f9a4e69c..cd78d6d8a6a 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/agl/dclxvi; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.x86_64; license = licenses.publicDomain; }; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 63adb5afd1c..de78647dc48 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { homepage = http://www.fastcgi.com/; license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index b030eab7c3a..791588942ba 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 05243824142..7dc45edd636 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { homepage = https://www.gnu.org/software/gnutls/; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ eelco wkennington fpletz ]; + maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index de71704cff8..44339c3dfed 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; - maintainers = with maintainers; [ vcunat wkennington ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 9f3bb3c7ead..a9ee776d441 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/gss/; description = "Generic Security Service"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg wkennington ]; + maintainers = with maintainers; [ bjg ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 51c369f7c2d..05e180161c0 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 0f68d7df298..13f7c421906 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 442da700f34..d4ebb5534d9 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 98370f52e18..42cf7780262 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index bdb8f3b76ae..25b55f00311 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 321ebb46e46..2b2f75abfd1 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 487af4ae97a..c14ac7c65ab 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 5b92458d89e..fc3a8d64a47 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { postUnpack = '' sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common - sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac + sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac ''; preConfigure = '' @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "heimdal"; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 50a669b053f..6ff6bb95591 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { homepage = http://web.mit.edu/kerberos/; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "krb5"; diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 445f65b9202..2e4a4d54dd4 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { description = "Code for producing C and C++ kinetic clients"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 5ca68b4361a..897f33953af 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 10441b9b871..5566b1f4f0e 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { description = "A LDAP-like embedded database"; homepage = https://ldb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index c459a4048e4..b18af4cf834 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation rec { description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index bafcc5210b3..f7805c9f375 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index a83a3c672c0..78f5e9d233c 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation { description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 2a03efd632f..99cd636b03b 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -52,12 +52,11 @@ stdenv.mkDerivation rec { # Remove the unneeded var/lib directories rm -rf $out/var ''; - + meta = { homepage = http://libdbi-drivers.sourceforge.net/; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 4f6b9dd099d..b242bd8613e 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index df67b849cd3..33d835d6919 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index d1b4e06dbc1..39d2c29b012 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -68,6 +68,5 @@ stdenv.mkDerivation rec { homepage = http://libevent.org/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 28e1ad895b4..f4863eb33f2 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "A library for manipulating FlashPIX images"; license = "Flashpix"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 4139af2eac2..2ccdd14874a 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 173dc1f722b..4d8a7eac27c 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.wkennington maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 970cb8a530f..00bd7e6eeea 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -14,6 +14,5 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index a7950de3aef..689e9a0be5d 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -12,6 +12,5 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 9d892069b26..8ca3dd72754 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 2ad59e698d0..4c0119f473c 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { homepage = http://www.linux1394.org; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a1563420630..43d40b4a2a0 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/libinput; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel wkennington ]; + maintainers = with maintainers; [ codyopel ]; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index d48d89235d8..c83a3e40df2 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index a3c809c3bd6..92e7d26f5af 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index dd852e1de85..d0aaebadbaa 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Lightweight signal-safe logging library"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index 60a38915630..b03ab0e3fab 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index d0784097779..17632c678c4 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index 343622e8d5c..30cb8c9df2f 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { description = "An alternative C driver for MongoDB"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index f642ad5ccfa..ba116e20177 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index ff729f586f4..f94af349842 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/libnftnl; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 68302acac29..d53b1dc0830 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 30fa7d749a1..4369169014c 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 9be217a800d..080a1945215 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { repositories.git = git://git.code.sf.net/p/otr/libotr; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index c19dc73abfa..25b088f99ec 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec{ description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 5bfa1427ab6..99383fe6450 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 39d5c64f64f..a99e4d22077 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 284b95b8a2b..011de93e668 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "A reliable logging library"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 631580aa7d1..11ed2eb0044 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -29,7 +29,7 @@ let homepage = "https://www.libressl.org"; license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ]; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; + maintainers = with maintainers; [ thoughtpolice fpletz globin ]; }; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index afb83051b21..e4e96df86c1 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 6dff8ebc8a1..b23bff415a2 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; license = licenses.bsd2; - maintainers = with maintainers; [ lovek323 wkennington ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index c8d9e21366d..1f188f98f03 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; badPlatforms = platforms.riscv; - maintainers = with maintainers; [ thoughtpolice wkennington ]; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index f2f8aed065f..fbff51b5ffb 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A modern and easy-to-use crypto library"; homepage = http://doc.libsodium.org/; license = licenses.isc; - maintainers = with maintainers; [ raskin wkennington ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index fb7b3be6b69..8896447590b 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 341e2cd1c77..30240038843 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { portable, and only require an ANSI C89 platform. ''; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index b5ab9d310da..81bd35ff293 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; - maintainers = with maintainers; [ spwhitt wkennington ]; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 675ca1cd220..a622f45ca5b 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 226fe5be536..07ed1cba8be 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ phreedom wkennington ]; + maintainers = with maintainers; [ phreedom ]; }; } diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 671c077b034..c1f34bd3398 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation { description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index ba179e54fe0..be493828486 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 5b10e62deee..010eecb0fa9 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { homepage = http://opensource.yubico.com/yubico-c/; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index 5748d340244..8b8d8cd0be8 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and SSL/TLS library, aka polarssl"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 9193f0eba1d..b5bfb4af0bd 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index de277329961..29ec205d7a1 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "MessagePack implementation for C and C++"; homepage = https://msgpack.org; license = licenses.asl20; - maintainers = with maintainers; [ redbaron wkennington ]; + maintainers = with maintainers; [ redbaron ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 0e1327e9e76..e999ea73ae2 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -16,10 +16,9 @@ stdenv.mkDerivation rec { kernel MT events to the slotted type B protocol. The events put into mtdev may be from any MT device, specifically type A without contact tracking, type A with contact tracking, or type B with contact tracking. - See the kernel documentation for further details. + See the kernel documentation for further details. ''; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index f5995a8f480..ef3ff13bac6 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -165,7 +165,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.wkennington ]; }; passthru = { diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 2ef367b6c53..d78a31d65cd 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (rec { homepage = http://www.lysator.liu.se/~nisse/nettle/; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index ae9c329775c..fdc21b26271 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 5fc57a2ef67..e165f037be6 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index a70cba625a8..a310d2f2780 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { description = "The not-so trivial database"; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index bddb0e1479e..5ad7eecace1 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openct-${version}"; version = "0.6.20"; - + src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am ''; - + configureFlags = [ "--enable-api-doc" "--enable-usb" @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/openct/; license = licenses.lgpl21; description = "Drivers for several smart card readers"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index bb9d163dc4a..b575fa0ef08 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index b4bdd200211..e70d20dd93d 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index ce0b2506c57..e0c5d4db930 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 2a0125de01f..286c5c868df 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/alanxz/rabbitmq-c; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 61c52de80b7..d7967d40979 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/edenhill/librdkafka; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ boothead wkennington ]; + maintainers = with maintainers; [ boothead ]; }; } diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index fff1d649836..e221c82edec 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 786fce0fb63..4e51051dfe0 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.x86_64; - maintainers = with maintainers; [ adev wkennington ]; + maintainers = with maintainers; [ adev ]; }; } diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index b9830b65ffb..ce8db3ee9ea 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { homepage = http://www.bluez.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 8f37302cec5..32c93b192ef 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 6cb420d9a0b..4dd09776f34 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 1321a558d5e..7bf3a5faa7d 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index c7f8787c1fd..16be9fa1e3b 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index f1ae1ea5db0..2e6e2d3fbbf 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Secure PIN handling using NSS crypto"; license = licenses.mpl11; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 74558760935..1fbbecf71a6 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { description = "Hierarchical pool based memory allocator with destructors"; homepage = https://tdb.samba.org/; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d2ff7c5efd3..21f062998b4 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ''; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index e43c6268424..9f94f4f7217 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { description = "An event system based on the talloc memory management library"; homepage = https://tevent.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 34024b23e27..b3cc2b7506b 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 vrthra wkennington ]; + maintainers = with maintainers; [ lovek323 vrthra ]; }; } diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index ccd876dfefb..bd9fb796247 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 750a786c3fc..3fda417d8e1 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel wkennington ]; + maintainers = with lib.maintainers; [ codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c694cc7b445..25cbde63129 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel wkennington ]; + maintainers = with lib.maintainers; [ codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 96e7b4c4a20..b22d339617c 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 56068c435d8..c45f521dcbb 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { description = ""; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; - maintainers = with maintainers; [ wkennington ]; broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9. }; } diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 009826eef47..2fcf8bd9179 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index ab0482559a4..bc130af4c6a 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 9464ad463f6..693c791875b 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 136ea9c9062..903693b9280 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 80a4518f3f7..e592b945a40 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { homepage = http://www.fsij.org/pages/gnuk; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = with platforms; linux; }; } diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index d264b7f3279..a47c2018444 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = http://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ goibhniu wkennington ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 2e349cf691c..8c9838ccec5 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; - + configureFlags = [ (stdenv.lib.enableFeature (optLibffado != null) "firewire") ]; @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; - + meta = with stdenv.lib; { description = "JACK audio connection kit"; homepage = http://jackaudio.org; license = "GPL"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix index e46aecbd414..9acb011b463 100644 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "A central privileged daemon that manages all your cgroups"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 0f8826ecf8d..eabd0848553 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation { description = "Handles the reporting of hardware-related memory errors"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 761ca564584..027706c25b7 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = http://www.ffado.org; description = "FireWire audio drivers"; license = licenses.gpl3; - maintainers = with maintainers; [ goibhniu wkennington ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 8ae082ba9d4..3a6e0a08103 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { repositories.git = git://w1.fi/hostap.git; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom wkennington ]; + maintainers = with maintainers; [ phreedom ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4fd2b2a9124..c324e1e27e9 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ eelco wkennington fpletz ]; + maintainers = with maintainers; [ eelco fpletz ]; }; } diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index e64840ac369..0ae971b6a69 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Administration tool for IP sets"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index e530850221c..838f5c1e8c0 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { homepage = https://people.redhat.com/sgrubb/libcap-ng/; platforms = platforms.linux; license = licenses.lgpl21; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3af8ceab80e..9aae9c6013a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington globin fpletz ]; + maintainers = with maintainers; [ globin fpletz ]; }; } diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index bd4b3d9377f..34f19db524c 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "AMD Processor microcode patch"; homepage = http://www.amd64.org/support/microcode.html; license = licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 8362392e0bf..cbcab06f56a 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.intel.com/; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index e9d654add49..ea5790b495b 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation { homepage = https://sourceforge.net/projects/mstpd/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 468bfd135e7..b4878ff4eac 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/nftables; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 3c02cf2bb88..3bdb9886d39 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/numactl/numactl; license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index dd3957d3618..3b23c286e19 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 42e193a21ad..d8714d9c172 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { homepage = http://zfsonlinux.org/; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; }; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 733da0d8989..176eef3b861 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { homepage = http://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; - maintainers = with maintainers; [ marcweber wkennington ]; + maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 07bfc080864..822361ece15 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -149,7 +149,7 @@ let homepage = http://zfsonlinux.org/; license = licenses.cddl; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; + maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; }; }; in { diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index d1dd7c05929..faa9976bed8 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington montag451 ]; + maintainers = with maintainers; [ montag451 ]; }; } diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 7636dca15d8..3cd36858204 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { description = "A daemon that provides mouse support on the Linux console"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.cygwin; - maintainers = with maintainers; [ eelco wkennington ]; + maintainers = with maintainers; [ eelco ]; }; } diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 4276a51715a..3afbfbbd224 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index b228d690101..0e964c25f6a 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -57,6 +57,5 @@ stdenv.mkDerivation rec { homepage = http://net-snmp.sourceforge.net/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 55b4b641d15..b1d9154a747 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { homepage = http://www.mongodb.org; license = licenses.agpl3; - maintainers = with maintainers; [ bluescreen303 offline wkennington cstrahan ]; + maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ab0839de961..a913643df08 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 wkennington ]; + maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; longDescription = '' diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 38f13fcd1fa..3d421e7a6ec 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 6c4e515d422..060b58d18b1 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/shishi/; description = "An implementation of the Kerberos 5 network security system"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg lovek323 wkennington ]; + maintainers = with maintainers; [ bjg lovek323 ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6415fc95437..767565dd582 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -90,7 +90,7 @@ common = rec { # attributes common to both builds description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; license = licenses.gpl2; - maintainers = with maintainers; [ thoughtpolice wkennington ]; + maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.all; }; }; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 781d25490d2..3fedf3fa804 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index fd1787d4c99..525543fa44e 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -35,7 +35,6 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; }; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 9d82777da81..5cf675a9af1 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 8f3d41e8f4e..b507271057e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; license = licenses.gpl2; - maintainers = with maintainers; [ raskin wkennington ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 1c774751f27..cb17a10cb73 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation { homepage = https://ceph.com/; description = "Distributed storage system"; license = licenses.lgpl21; - maintainers = with maintainers; [ adev ak wkennington ]; + maintainers = with maintainers; [ adev ak ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index e50faaca899..4f90c0f03e9 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index ed210783db1..bb701f187fa 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation rec { homepage = http://expect.sourceforge.net/; license = "Expect"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 748c0917def..f3cd1c6e527 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index 3baafa29677..fda9dc506e2 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index ab9eb5d001b..c214598ce1b 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { certificates, and create certificate requests, and other operations. A shared library and a command-line tool is included. ''; - maintainers = with maintainers; [ wkennington ]; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index d507816dbd3..405ff745baa 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ yubikey-personalization qtbase libyubikey ]; - + installPhase = '' mkdir -p $out/bin cp build/release/yubikey-personalization-gui $out/bin @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 48827ec0aae..43814a3f613 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 6c7f335891f..41074e3dad6 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -72,6 +72,5 @@ stdenv.mkDerivation rec { homepage = http://www.isc.org/products/DHCP/; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 86ee7578bb6..93af044a125 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://software.es.net/iperf/; + homepage = http://software.es.net/iperf/; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = "as-is"; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 185e8636681..d38ff60f706 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 619cdac9266..4dbc455103c 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.remlab.net/ndisc6/; description = "A small collection of useful tools for IPv6 networking"; - maintainers = with maintainers; [ eelco wkennington ]; + maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index a540120de2f..019806fcd57 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 9ebce846e41..b8fa92e3202 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "IPv6 Router Advertisement Daemon"; platforms = platforms.linux; license = licenses.bsdOriginal; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 0cc1fb99455..4c3c428d3f0 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage="http://www.tinc-vpn.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington fpletz lassulus ]; + maintainers = with maintainers; [ fpletz lassulus ]; }; } diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 67252453743..c5a0de0c75f 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "ccid drivers for pcsclite"; homepage = https://ccid.apdu.fr/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index b6de575edb9..ad4eae9578c 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { frontend applications and libraries are available. Version 2 of GnuPG also provides support for S/MIME. ''; - maintainers = with maintainers; [ wkennington peti fpletz vrthra ]; + maintainers = with maintainers; [ peti fpletz vrthra ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index c23827842f2..7d709712fc8 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { description = "Set of libraries and utilities to access smart cards"; homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 95f9bf16eba..66a5615ee13 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = https://pcsclite.apdu.fr/; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 91923e7e59b..0ce6cb12a63 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -110,6 +110,5 @@ stdenv.mkDerivation rec { description = "Enhanced syslog implementation"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } From 4506266b4ab52e06ee95449e70b73694d118966a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jan 2019 10:49:29 +0100 Subject: [PATCH 196/230] platformio: 3.6.2 -> 3.6.4 --- pkgs/development/arduino/platformio/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index bf0dd5229c6..a4d5b338242 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -44,14 +44,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "3.6.2"; + version = "3.6.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1558adr73d7mgp0z92q9vzbgarddimadyk4467z8i3yp4g8k5irk"; + sha256 = "1c1y099xvpdh35n8fln642psa4xsaaqly2i2jgkvhrb9yl77x5aj"; }; propagatedBuildInputs = [ From 9aedca3da1d422dd2bdd06d5649bebfacbffd7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 25 Jan 2019 23:19:39 -0200 Subject: [PATCH 197/230] numix-icon-theme-circle: 18.09.19 -> 19.01.24 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index ebda6d4428c..4ad03627870 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "18.09.19"; - - package-name = "numix-icon-theme-circle"; - - name = "${package-name}-${version}"; + pname = "numix-icon-theme-circle"; + version = "19.01.24"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = version; - sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq"; + sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; From 409f9d13cc07f4dae05bba21d3ac45232d7fd6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 25 Jan 2019 23:20:06 -0200 Subject: [PATCH 198/230] numix-icon-theme-square: 18.09.19 -> 19.01.24 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 03c1ba0f827..967c629324c 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "numix-icon-theme-square"; - version = "18.09.19"; + pname = "numix-icon-theme-square"; + version = "19.01.24"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = version; - sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1"; + sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; From 92a44bd1008cb3adb79f8e4cd427a65c438fa730 Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Fri, 25 Jan 2019 14:47:18 +0100 Subject: [PATCH 199/230] jackett: 0.10.622 -> 0.10.660 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index edd4921e77d..064cbb407be 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.622"; + version = "0.10.660"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0q9p6wd3br10ym3y013bmkw9z1859h92w2f6xj4h5dkzwg5h4fs1"; + sha256 = "04dh3cdd0k0xjrhifshniwnkhwddis6y7z6az1fg9gzm3ivwyyi7"; }; buildInputs = [ makeWrapper ]; From 2c226107cb544c1f9baf08f9cfa149023cda78e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Jan 2019 14:12:33 +0100 Subject: [PATCH 200/230] systemd-cryptsetup-generator: fixup linkage It got broken by 74a64a8a6 #53483. But IMO it's *this* expression that was written in a too fragile way. --- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 703d13126a3..2ff0e4cd38f 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -14,12 +14,13 @@ systemd.overrideAttrs (p: { # As ninja install is not used here, the rpath needs to be manually fixed. # Otherwise the resulting binary doesn't properly link against systemd-shared.so postFixup = '' - sharedLib=libsystemd-shared-${p.version}.so for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + (patchelf --print-needed $prog | grep 'libsystemd-shared-.*\.so' > /dev/null) && ( patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog ) || true done + # test it's OK + "$out"/lib/systemd/systemd-cryptsetup ''; installPhase = '' From 3e0088e68f6185dce82539eb038ff10dd0c33c33 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Sat, 26 Jan 2019 14:50:46 +0100 Subject: [PATCH 201/230] pythonPackages.limitlessled: init at 1.1.3 --- .../python-modules/limitlessled/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/limitlessled/default.nix diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix new file mode 100644 index 00000000000..c2029aa6d6b --- /dev/null +++ b/pkgs/development/python-modules/limitlessled/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "limitlessled"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pd71wxqjvznx10brsj1sgy3420bz7awbzk9jlj422rrdxql754j"; + }; + + meta = with lib; { + description = "Control LimitlessLED products"; + homepage = https://github.com/happyleavesaoc/python-limitlessled/; + license = licenses.mit; + maintainers = with maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46f5e6c7f10..05618cc5fb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -440,6 +440,8 @@ in { libmr = callPackage ../development/python-modules/libmr { }; + limitlessled = callPackage ../development/python-modules/limitlessled { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; logster = callPackage ../development/python-modules/logster { }; From 675ebc55595676b158ac6ce9f9d67bfcf9861993 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 26 Jan 2019 11:25:20 -0300 Subject: [PATCH 202/230] elvish: a small fixup (#54531) * Elvish: a small fixup Fixing version variable in order to properly download the source code. Also, some minor stylistical modifications and additions. * elvish: use pname * Update pkgs/shells/elvish/default.nix Use `pname` instead of `name`. Co-Authored-By: AndersonTorres --- pkgs/shells/elvish/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 0b7b934646e..80b0f386051 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "elvish-${version}"; + pname = "elvish"; version = "0.12"; goPackagePath = "github.com/elves/elvish"; @@ -12,17 +12,22 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - repo = "elvish"; owner = "elves"; - rev = version; + repo = pname; + rev = "v${version}"; sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp"; }; meta = with stdenv.lib; { - description = "A friendly and expressive Unix shell"; + description = "A friendly and expressive command shell"; + longDescription = '' + Elvish is a friendly interactive shell and an expressive programming + language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0 + status, it is already suitable for most daily interactive use. + ''; homepage = https://elv.sh/; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ vrthra AndersonTorres ]; platforms = with platforms; linux ++ darwin; }; From 7a511ded73cae1a63f1db279a4cf8ad0686b6339 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 26 Jan 2019 14:05:57 +0100 Subject: [PATCH 203/230] notmuch-bower: 0.9 -> 0.10 --- .../networking/mailreaders/notmuch-bower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 84466f7cd3d..e2b56f3b8af 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "notmuch-bower-${version}"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0f8djiclq4rz9isbx18bpzymbvb2q0spvjp982b149hr1my6klaf"; + sha256 = "0jpaxlfxz7mj76z3cyj8sq053p0mkp46kaw05nimzwaq5yx923fv"; }; nativeBuildInputs = [ gawk mercury pandoc ]; From ca5004e26cb312bb8576a14788d073ee5db768b4 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 26 Jan 2019 14:10:33 +0100 Subject: [PATCH 204/230] maintainers/maintainers-list: add erictapen's PGP key --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fed2cacbddf..a56c8819ddd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1427,6 +1427,10 @@ email = "justin.humm@posteo.de"; github = "erictapen"; name = "Justin Humm"; + keys = [{ + longkeyid = "rsa4096/0x438871E000AA178E"; + fingerprint = "984E 4BAD 9127 4D0E AE47 FF03 4388 71E0 00AA 178E"; + }]; }; erikryb = { email = "erik.rybakken@math.ntnu.no"; From b1ddb5fcbd53a4bc245f849f430f93328353ba43 Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Sat, 26 Jan 2019 12:45:52 +1100 Subject: [PATCH 205/230] Version 0.3.0 --- pkgs/tools/admin/amazon-ecr-credential-helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 33b83bdb558..02386a135f1 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "amazon-ecr-credential-helper-${version}"; - version = "0.1.0"; + version = "0.3.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "0mpwm21fphg117ryxda7696s8bnvi4bbc8rvi4zp2m1rhl04j2yy"; + sha256 = "06pcwgahcbi13ca5rs6giwdw3w364lbvmzcs4ka82igvcffxjvnd"; }; meta = with lib; { From 0a27d6dddb70a3fee157a5bb96e761d0d6c8af82 Mon Sep 17 00:00:00 2001 From: Eamonn Coughlan Date: Sat, 26 Jan 2019 17:07:38 +0100 Subject: [PATCH 206/230] openfortivpn: fix pppd location after 0.8.0 upgrade --- pkgs/tools/networking/openfortivpn/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 07ebaa072ea..b95c3aed8e6 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -20,9 +20,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; - preConfigure = '' - substituteInPlace src/tunnel.c --replace "/usr/sbin/pppd" "${ppp}/bin/pppd" - ''; + configureFlags = [ "--with-pppd=${ppp}/bin/pppd" ]; enableParallelBuilding = true; From dd5fab287eb18a3b179748a4e89614807085b28c Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 26 Jan 2019 16:58:16 +0100 Subject: [PATCH 207/230] virt-viewer: Fix USB redirection --- pkgs/applications/virtualization/virt-viewer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index cbdecb32288..746c45beccf 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + # Required for USB redirection PolicyKit rules file + propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; From 7ea948f912efda9b85b3f6ed1ad9810ff995b298 Mon Sep 17 00:00:00 2001 From: Sergei Khoma Date: Sat, 26 Jan 2019 19:26:17 +0200 Subject: [PATCH 208/230] pnpm: fix build error "unsupported URL Type link" --- pkgs/development/node-packages/default-v10.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 64122a43527..56312f198e0 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -70,6 +70,11 @@ nodePackages // { pnpm = nodePackages.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; + + preRebuild = '' + sed 's/"link:/"file:/g' --in-place package.json + ''; + postInstall = let pnpmLibPath = stdenv.lib.makeBinPath [ nodejs.passthru.python From 8e985dced0d6a621856fcd44dee9c33b9e100801 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sat, 26 Jan 2019 19:46:57 +0200 Subject: [PATCH 209/230] postgresql: reorganize package and its extensions (#54319) * postgresql: reorganize package and it's extensions Extracts some useful parts of https://github.com/NixOS/nixpkgs/pull/38698, in particular, it's vision that postgresql plugins should be namespaced. --- nixos/tests/postgresql.nix | 4 +- pkgs/servers/sql/postgresql/default.nix | 84 +++++++++++++++++++----- pkgs/servers/sql/postgresql/packages.nix | 30 +++++++++ pkgs/top-level/aliases.nix | 14 ++++ pkgs/top-level/all-packages.nix | 9 +-- 5 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/packages.nix diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 975ba7f488e..9e1f4f235af 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -7,7 +7,7 @@ with import ../lib/testing.nix { inherit system pkgs; }; with pkgs.lib; let - postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { }; + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs pkgs; test-sql = pkgs.writeText "postgresql-test" '' CREATE EXTENSION pgcrypto; -- just to check if lib loading works CREATE TABLE sth ( @@ -29,8 +29,8 @@ let machine = {...}: { - services.postgresql.package = postgresql-package; services.postgresql.enable = true; + services.postgresql.package = postgresql-package; services.postgresqlBackup.enable = true; services.postgresqlBackup.databases = optional (!backup-all) "postgres"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2b22c36e829..0624998e5de 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd, icu, pkgconfig }: - let - common = { version, sha256, psqlSchema }: + generic = + # dependencies + { stdenv, lib, fetchurl, makeWrapper + , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid + , pkgconfig, libxml2, tzdata + + # for postgreql.pkgs + , this, self, newScope, buildEnv + + # source specification + , version, sha256, psqlSchema + }: let atLeast = lib.versionAtLeast version; - - # Build with ICU by default on versions that support it icuEnabled = atLeast "10"; - in stdenv.mkDerivation (rec { + + in stdenv.mkDerivation rec { name = "postgresql-${version}"; inherit version; @@ -97,50 +105,94 @@ let disallowedReferences = [ stdenv.cc ]; passthru = { - inherit readline psqlSchema; + inherit readline psqlSchema version; + + pkgs = let + scope = { postgresql = this; }; + newSelf = self // scope; + newSuper = { callPackage = newScope (scope // this.pkgs); }; + in import ./packages.nix newSelf newSuper; + + withPackages = postgresqlWithPackages { + inherit makeWrapper buildEnv; + postgresql = this; + } + this.pkgs; }; meta = with lib; { homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles thoughtpolice ]; + maintainers = with maintainers; [ ocharles thoughtpolice danbst ]; platforms = platforms.unix; knownVulnerabilities = optional (!atLeast "9.4") "PostgreSQL versions older than 9.4 are not maintained anymore!"; }; - }); + }; -in { + postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { + name = "postgresql-and-plugins-${postgresql.version}"; + paths = f pkgs ++ [ + postgresql + postgresql.lib + postgresql.man # in case user installs this into environment + ]; + buildInputs = [ makeWrapper ]; - postgresql_9_4 = common { + # We include /bin to ensure the $out/bin directory is created, which is + # needed because we'll be removing the files from that directory in postBuild + # below. See #22653 + pathsToLink = ["/" "/bin"]; + + postBuild = '' + mkdir -p $out/bin + rm $out/bin/{pg_config,postgres,pg_ctl} + cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl} + wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib + ''; + }; + +in self: super: { + + postgresql_9_4 = super.callPackage generic { version = "9.4.20"; psqlSchema = "9.4"; sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; + this = self.postgresql_9_4; + inherit self; }; - postgresql_9_5 = common { + postgresql_9_5 = super.callPackage generic { version = "9.5.15"; psqlSchema = "9.5"; sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; + this = self.postgresql_9_5; + inherit self; }; - postgresql_9_6 = common { + postgresql_9_6 = super.callPackage generic { version = "9.6.11"; psqlSchema = "9.6"; sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; + this = self.postgresql_9_6; + inherit self; }; - postgresql_10 = common { + postgresql_10 = super.callPackage generic { version = "10.6"; psqlSchema = "10.0"; sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; + this = self.postgresql_10; + inherit self; }; - postgresql_11 = common { + postgresql_11 = super.callPackage generic { version = "11.1"; psqlSchema = "11.1"; sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; + this = self.postgresql_11; + inherit self; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix new file mode 100644 index 00000000000..ba3da25bc16 --- /dev/null +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -0,0 +1,30 @@ +self: super: { + + pg_repack = super.callPackage ./ext/pg_repack.nix { }; + + pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; + + pgroonga = super.callPackage ./ext/pgroonga.nix { }; + + plv8 = super.callPackage ./ext/plv8.nix { + v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { + python = self.python2; + }; + }; + + pgjwt = super.callPackage ./ext/pgjwt.nix { }; + + cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { }; + + pg_hll = super.callPackage ./ext/pg_hll.nix { }; + + pg_cron = super.callPackage ./ext/pg_cron.nix { }; + + pg_topn = super.callPackage ./ext/pg_topn.nix { }; + + pgtap = super.callPackage ./ext/pgtap.nix { }; + + timescaledb = super.callPackage ./ext/timescaledb.nix { }; + + tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; +} \ No newline at end of file diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e13e9adfa16..fcabdf7c69a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -240,6 +240,20 @@ mapAliases ({ postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; + # postgresql plugins + pgjwt = postgresqlPackages.pgjwt; + pg_repack = postgresqlPackages.pg_repack; + pgroonga = postgresqlPackages.pgroonga; + pg_similarity = postgresqlPackages.pg_similarity; + pgtap = postgresqlPackages.pgtap; + plv8 = postgresqlPackages.plv8; + timescaledb = postgresqlPackages.timescaledb; + tsearch_extras = postgresqlPackages.tsearch_extras; + cstore_fdw = postgresqlPackages.cstore_fdw; + pg_hll = postgresqlPackages.pg_hll; + pg_cron = postgresqlPackages.pg_cron; + pg_topn = postgresqlPackages.pg_topn; + # end procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8709e4d90f2..44d513dca69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13949,14 +13949,15 @@ in timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; - postgresql = postgresql_9_6; - - inherit (callPackages ../servers/sql/postgresql { }) + inherit (import ../servers/sql/postgresql pkgs super) postgresql_9_4 postgresql_9_5 postgresql_9_6 postgresql_10 - postgresql_11; + postgresql_11 + ; + postgresql = postgresql_9_6.override { this = postgresql; }; + postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; From 4fb8bc8238aa0366d78bae6095676ef7e08c17b2 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Sat, 26 Jan 2019 21:15:43 +0200 Subject: [PATCH 210/230] postgresql: cleanup postgis (#54396) postgis: cleanup Another part of https://github.com/NixOS/nixpkgs/pull/38698, though I did cleanup even more. Moving docs to separate output should save another 30MB. I did pin poppler to 0.61 just to be sure GDAL doesn't break again next time poppler changes internal APIs. --- nixos/tests/postgis.nix | 5 +- .../sql/postgresql/ext/postgis.nix} | 82 +++++-------------- pkgs/servers/sql/postgresql/packages.nix | 7 ++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 34 insertions(+), 63 deletions(-) rename pkgs/{development/libraries/postgis/default.nix => servers/sql/postgresql/ext/postgis.nix} (52%) diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 49be0672a8e..294eb50b5fe 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -12,7 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : { services.postgresql = let mypg = pkgs.postgresql_11; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; + extraPlugins = with mypg.pkgs; [ + postgis + ]; }; }; }; @@ -22,5 +24,6 @@ import ./make-test.nix ({ pkgs, ...} : { $master->waitForUnit("postgresql"); $master->sleep(10); # Hopefully this is long enough!! $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'"); + $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'"); ''; }) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix similarity index 52% rename from pkgs/development/libraries/postgis/default.nix rename to pkgs/servers/sql/postgresql/ext/postgis.nix index be7fc6f8c17..d78707fc65f 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -10,79 +10,27 @@ , pkgconfig , file }: - - /* - - ### NixOS - usage: - ================== - - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ]; - - - ### important Postgis implementation details: - ============================================= - - Postgis provides a shared library implementing many operations. They are - exposed to the Postgres SQL interpreter by special SQL queries eg: - - CREATE FUNCTION [...] - AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); - - where liblwgeom is the shared library. - Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. - - Thus if you want to use postgresql dumps which were created by non NixOS - systems you have to adopt the library path. - - - ### TODO: - ========= - the bin commands to have gtk gui: - */ - - -let - version = "2.5.1"; - sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "postgis-${version}"; + version = "2.5.1"; + + outputs = [ "out" "doc" ]; src = fetchurl { - url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; - inherit sha256; + url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; + sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; }; - # don't pass these vars to the builder - removeAttrs = ["sql_comments" "sql_srcs"]; - - preInstall = '' - mkdir -p $out/bin - ''; - - # create aliases for all commands adding version information - postInstall = '' - sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done - - cp -r doc $out - ''; - buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; - - sql_comments = "postgis_comments.sql"; - - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - dontDisableStatic = true; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" ''; postConfigure = '' @@ -95,6 +43,20 @@ in stdenv.mkDerivation rec { "raster/scripts/python/Makefile"; ''; + preInstall = '' + mkdir -p $out/bin + ''; + + # create aliases for all commands adding version information + postInstall = '' + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done + + mkdir -p $doc/share/doc/postgis + mv doc/* $doc/share/doc/postgis/ + ''; + meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; homepage = http://postgis.refractions.net; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index ba3da25bc16..a1ca71d2c8c 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -1,5 +1,12 @@ self: super: { + postgis = super.callPackage ./ext/postgis.nix { + gdal = self.gdal.override { + postgresql = self.postgresql; + poppler = self.poppler_0_61; + }; + }; + pg_repack = super.callPackage ./ext/pg_repack.nix { }; pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fcabdf7c69a..18be4e6e459 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -253,6 +253,7 @@ mapAliases ({ pg_hll = postgresqlPackages.pg_hll; pg_cron = postgresqlPackages.pg_cron; pg_topn = postgresqlPackages.pg_topn; + postgis = postgresqlPackages.postgis; # end procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44d513dca69..13bbf85b3e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12088,8 +12088,6 @@ in buildPythonApplication click future six; }; - postgis = callPackage ../development/libraries/postgis { }; - protobuf = protobuf3_6; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; From 9130c1d592b74d52165b953f95ff8f6d1027632b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 26 Jan 2019 21:35:18 +0100 Subject: [PATCH 211/230] androidsdk: fix missing fontconfig library reference when tools version 26.1.x is used --- pkgs/development/mobile/androidenv/tools/26.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix index ed1dfe3d263..0234c9f3d04 100644 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -4,7 +4,7 @@ deployAndroidPackage { name = "androidsdk"; inherit os package; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' From dea84cac63ce8a63580009b8640369d41f89e17f Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Sat, 26 Jan 2019 22:49:59 +0200 Subject: [PATCH 212/230] sxiv: 24 -> 25 --- pkgs/applications/graphics/sxiv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 7f118b6adc9..acbbf73465d 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sxiv-${version}"; - version = "24"; + pname = "sxiv"; + version = "25"; src = fetchFromGitHub { owner = "muennich"; - repo = "sxiv"; + repo = pname; rev = "v${version}"; - sha256 = "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d"; + sha256 = "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp"; }; postUnpack = '' From d3199ddaa780d8a3db6f0786c31f1c4319900685 Mon Sep 17 00:00:00 2001 From: Robin Palotai Date: Tue, 22 Jan 2019 11:13:47 +0100 Subject: [PATCH 213/230] Add gzip and gnutar to default bazel-bash tools. These are often used by rules, mostly due to Bazel's one-output rule. --- pkgs/development/tools/build-managers/bazel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index ad3ba03af70..62356a4987c 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils -, which, python, perl, gawk, gnused, gnugrep, findutils +, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils # Apple dependencies , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation # Allow to independently override the jdks used to build and run respectively @@ -23,7 +23,8 @@ let for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done ''; - defaultShellPath = lib.makeBinPath [ bash coreutils findutils gawk gnugrep gnused which unzip ]; + defaultShellPath = lib.makeBinPath + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ]; in stdenv.mkDerivation rec { From 566539ff551fa84602be519c217af94a413c956d Mon Sep 17 00:00:00 2001 From: Robin Palotai Date: Tue, 22 Jan 2019 13:27:19 +0100 Subject: [PATCH 214/230] Add test and docs. --- .../build-managers/bazel/bash-tools-test.nix | 42 +++++++++++++++++++ .../tools/build-managers/bazel/default.nix | 34 ++++++++++++++- .../bazel/python-bin-path-test.nix | 6 ++- 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bazel/bash-tools-test.nix diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix new file mode 100644 index 00000000000..3bbab475c57 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix @@ -0,0 +1,42 @@ +{ stdenv, writeText, runCommandCC, bazel }: + +# Tests that certain executables are available in bazel-executed bash shells. + +let + WORKSPACE = writeText "WORKSPACE" '' + workspace(name = "our_workspace") + ''; + + fileIn = writeText "input.txt" '' + one + two + three + ''; + + fileBUILD = writeText "BUILD" '' + genrule( + name = "tool_usage", + srcs = [ ":input.txt" ], + outs = [ "output.txt" ], + cmd = "cat $(location :input.txt) | gzip - | gunzip - | awk '/t/' > $@", + ) + ''; + + runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script; + + workspaceDir = runLocal "our_workspace" '' + mkdir $out + cp ${WORKSPACE} $out/WORKSPACE + cp ${fileIn} $out/input.txt + cp ${fileBUILD} $out/BUILD + ''; + + testBazel = runLocal "bazel-test-bash-tools" '' + export HOME=$(mktemp -d) + cp -r ${workspaceDir} wd && chmod +w wd && cd wd + ${bazel}/bin/bazel build :tool_usage + cp bazel-genfiles/output.txt $out + echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK" + ''; + +in testBazel diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 62356a4987c..15ef2abd094 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -24,6 +24,33 @@ let ''; defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ]; in @@ -39,9 +66,14 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; - # additional tests that check bazel’s functionality + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. passthru.tests = { pythonBinPath = callPackage ./python-bin-path-test.nix {}; + bashTools = callPackage ./bash-tools-test.nix {}; }; name = "bazel-${version}"; diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 478ba8eaa71..54ae154a620 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -42,8 +42,10 @@ let testBazel = runLocal "bazel-test-builtin-rules" '' export HOME=$(mktemp -d) - cp -r ${workspaceDir}/* . - ${bazel}/bin/bazel --output_base=/tmp/bazel-tests/wd\ + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + ${bazel}/bin/bazel \ test \ --test_output=errors \ --host_javabase='@local_jdk//:jdk' \ From 287e92ad47be3946bb8ab6888fed54f61b36e3ba Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 26 Jan 2019 23:15:01 +0100 Subject: [PATCH 215/230] androidenv: Remove unused patch --- .../make_standalone_toolchain.py_18b.patch | 98 ------------------- 1 file changed, 98 deletions(-) delete mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch deleted file mode 100644 index 1f6bfac5b80..00000000000 --- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_18b.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py -index b8172b28..95daa6a6 100755 ---- a/build/tools/make_standalone_toolchain.py -+++ b/build/tools/make_standalone_toolchain.py -@@ -353,7 +353,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - platforms_path, host_tag): - """Create a standalone toolchain.""" - copy_directory_contents(gcc_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(clang_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - triple = get_triple(arch) - make_clang_scripts( - install_path, triple, api, host_tag.startswith('windows')) -@@ -365,9 +367,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_headers = os.path.join(install_sysroot, 'usr/include') - os.makedirs(os.path.dirname(install_headers)) - shutil.copytree(headers, install_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents(arch_headers, os.path.join(install_headers)) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for lib_suffix in ('', '64'): - lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix)) -@@ -375,20 +379,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_sysroot, 'usr/lib{}'.format(lib_suffix)) - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - static_lib_path = os.path.join(sysroot, 'usr/lib', triple) - static_lib_install = os.path.join(install_sysroot, 'usr/lib') - if arch == 'x86_64': - static_lib_install += '64' - copy_directory_contents(static_lib_path, static_lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) - copy_directory_contents(prebuilt_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - gdbserver_path = os.path.join( - NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') - gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') - shutil.copytree(gdbserver_path, gdbserver_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) -@@ -401,6 +409,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') - support_dir = os.path.join(NDK_DIR, 'sources/android/support') - copy_directory_contents(os.path.join(libcxx_dir, 'include'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - if api < 21: - # For any libc header that is in libandroid_support, we actually have -@@ -412,11 +421,13 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - copy_directory_contents( - os.path.join(support_dir, 'include'), - os.path.join(install_path, 'sysroot/usr/local/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # I have no idea why we need this, but the old one does it too. - copy_directory_contents( - os.path.join(libcxxabi_dir, 'include'), - os.path.join(install_path, 'include/llvm-libc++abi/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -426,20 +437,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - shutil.copy2( - os.path.join(libcxxabi_dir, 'include', header), - os.path.join(cxx_headers, header)) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for abi in get_abis(arch): - src_libdir = get_src_libdir(libcxx_dir, abi) - dest_libdir = get_dest_libdir(install_path, triple, abi) - copy_libcxx_libs(src_libdir, dest_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - thumb_libdir = os.path.join(dest_libdir, 'thumb') - copy_libcxx_libs(src_libdir, thumb_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # Not needed for every STL, but the old one does this. Keep it for the sake - # of diff. Done at the end so copytree works. - cxx_target_headers = os.path.join(cxx_headers, triple) - if not os.path.exists(cxx_target_headers): - os.makedirs(cxx_target_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - - def parse_args(): From 41e6eeab514a19e9ac16c5eb52358f844c0e442a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 26 Jan 2019 22:42:18 +0000 Subject: [PATCH 216/230] bino3d: init at 1.6.7 --- pkgs/applications/video/bino3d/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/video/bino3d/default.nix diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix new file mode 100644 index 00000000000..d98b3979660 --- /dev/null +++ b/pkgs/applications/video/bino3d/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: + +stdenv.mkDerivation rec { + name = "bino-${version}"; + version = "1.6.7"; + + src = fetchurl { + url = "https://bino3d.org/releases/${name}.tar.xz"; + sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ ffmpeg glew libass openal qtbase ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Stereoscopic 3D and multi-display video player"; + homepage = https://bino3d.org/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1296f97792..fc0f95507f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16264,6 +16264,11 @@ in bibletime = callPackage ../applications/misc/bibletime { }; + bino3d = libsForQt5.callPackage ../applications/video/bino3d { + ffmpeg = ffmpeg_4; + glew = glew110; + }; + bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; }; bitkeeper = callPackage ../applications/version-management/bitkeeper { From 2004af94f73886e7a802963da9e07dbccce1f7ed Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 18 Jan 2019 12:01:14 +1300 Subject: [PATCH 217/230] asciiquarium: init at 1.1 --- .../misc/asciiquarium/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/asciiquarium/default.nix diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix new file mode 100644 index 00000000000..912f18890b5 --- /dev/null +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, perlPackages }: + +let version = "1.1"; +in stdenv.mkDerivation { + name = "asciiquarium-${version}"; + src = fetchurl { + url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"; + sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; + + installPhase = '' + mkdir -p $out/bin + cp asciiquarium $out/bin + chmod +x $out/bin/asciiquarium + wrapProgram $out/bin/asciiquarium \ + --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.TermAnimation ] } + ''; + + meta = with stdenv.lib; { + description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; + homepage = https://robobunny.com/projects/asciiquarium/html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.utdemir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35e8b7a60b..4609657bd2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -595,6 +595,8 @@ in asciinema = callPackage ../tools/misc/asciinema {}; + asciiquarium = callPackage ../applications/misc/asciiquarium {}; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; gsl = gsl_1; From cc74c0399ecee6291b25084c17a5e355671263d9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 27 Jan 2019 01:56:56 +0100 Subject: [PATCH 218/230] leo3: init at 1.2 --- .../science/logic/leo3/binary.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/science/logic/leo3/binary.nix diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix new file mode 100644 index 00000000000..a3834dc70b6 --- /dev/null +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, openjdk}: +stdenv.mkDerivation rec { + pname = "leo3"; + version = "1.2"; + + jar = fetchurl { + url = "https://github.com/leoprover/Leo-III/releases/download/v${version}/leo3.jar"; + sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; + }; + + phases=["installPhase" "fixupPhase"]; + + installPhase = '' + mkdir -p "$out"/{bin,lib/java/leo3} + cp "${jar}" "$out/lib/java/leo3/leo3.jar" + echo "#!${stdenv.shell}" > "$out/bin/leo3" + echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" + chmod a+x "$out/bin/leo3" + ''; + + meta = { + inherit version; + description = "An automated theorem prover for classical higher-order logic with choice"; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://page.mi.fu-berlin.de/lex/leo3/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22b41d9468e..18325912609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21893,6 +21893,8 @@ in leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; + leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {}; + logisim = callPackage ../applications/science/logic/logisim {}; ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; From 319ebef3a361a914fc2e3b90bc9ff66ed8d2e107 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 26 Jan 2019 20:36:42 -0500 Subject: [PATCH 219/230] Revert "Merge pull request #36948 from dtzWill/fix/glibc-libgcc_s" This reverts commit 80ff19a45f40ddb3a3c55dbd929295fcb946eabb, reversing changes made to 43e867a226a8dc5c9c968aeae1c526697c71cd32. --- pkgs/development/libraries/glibc/default.nix | 16 ++++ pkgs/top-level/all-packages.nix | 86 +++++++++++++------- 2 files changed, 74 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index a5422b4c837..e46985d3fca 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -39,6 +39,22 @@ callPackage ./common.nix { inherit stdenv; } { # limit rebuilds by only disabling pie w/musl ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; + # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for + # any program we run, because the gcc will have been placed at a new + # store path than that determined when built (as a source for the + # bootstrap-tools tarball) + # Building from a proper gcc staying in the path where it was installed, + # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # any special hack. + preInstall = '' + if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then + mkdir -p $out/lib + cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + # the .so It used to be a symlink, but now it is a script + cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + fi + ''; + postInstall = '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 860db43fce6..e4ecba9d702 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7336,51 +7336,67 @@ in llvmPackages = recurseIntoAttrs llvmPackages_5; - llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { + llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; + }); - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 { + llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_37.tools; targetLlvmLibraries = targetPackages.llvmPackages_37.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; + }); - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 { + llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_38.tools; targetLlvmLibraries = targetPackages.llvmPackages_38.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; + }); - llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 { + llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_39.tools; targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; + }); - llvmPackages_4 = callPackage ../development/compilers/llvm/4 { + llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_4.tools; targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; + }); - llvmPackages_5 = callPackage ../development/compilers/llvm/5 { + llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); - llvmPackages_6 = callPackage ../development/compilers/llvm/6 { + llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 { + llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); llvmPackages_latest = llvmPackages_7; @@ -7499,10 +7515,12 @@ in }; # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust { + rust = callPackage ../development/compilers/rust ({ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm = llvm_7; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); inherit (rust) cargo rustc; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; @@ -8131,9 +8149,11 @@ in spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { + spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey = spidermonkey_38; @@ -10364,18 +10384,28 @@ in hyperscan = callPackage ../development/libraries/hyperscan { }; - icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) { + icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; - }; - icu59 = callPackage ../development/libraries/icu/59.nix { + } // + (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu59 = callPackage ../development/libraries/icu/59.nix ({ nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - }; - icu60 = callPackage ../development/libraries/icu/60.nix { + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - }; - icu63 = callPackage ../development/libraries/icu/63.nix { + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu = icu59; id3lib = callPackage ../development/libraries/id3lib { }; From 329913f7339df9657c2c728c1c0a3009f860d9f5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 26 Jan 2019 21:09:37 -0500 Subject: [PATCH 220/230] setup.sh: put SHELL in flagsArray MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want to modify makeFlags, that is given to us by our environment. Adding to it could lead to duplicates after repeated use. Fixes #27533 --- pkgs/stdenv/generic/setup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 03fa589138d..0f63693e09e 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1012,13 +1012,11 @@ buildPhase() { else foundMakefile=1 - # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 - makeFlags="SHELL=$SHELL $makeFlags" - # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) @@ -1057,6 +1055,7 @@ checkPhase() { # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} ${checkTarget} @@ -1082,6 +1081,7 @@ installPhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} ${installTargets:-install} @@ -1189,6 +1189,7 @@ installCheckPhase() { # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} ${installCheckTarget:-installcheck} From 43c6a830412a19601a42e2dffeafd825e48bdf09 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 26 Jan 2019 22:12:41 -0500 Subject: [PATCH 221/230] conky: journal support --- pkgs/os-specific/linux/conky/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 9519e72e91c..3d7fb43bbd1 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -33,6 +33,7 @@ , rssSupport ? curlSupport , weatherMetarSupport ? curlSupport , weatherXoapSupport ? curlSupport +, journalSupport ? true, systemd ? null , libxml2 ? null }: @@ -61,6 +62,7 @@ assert curlSupport -> curl != null; assert rssSupport -> curlSupport && libxml2 != null; assert weatherMetarSupport -> curlSupport; assert weatherXoapSupport -> curlSupport && libxml2 != null; +assert journalSupport -> systemd != null; with stdenv.lib; @@ -103,6 +105,7 @@ stdenv.mkDerivation rec { ++ optional weatherXoapSupport libxml2 ++ optional nvidiaSupport libXNVCtrl ++ optional pulseSupport libpulseaudio + ++ optional journalSupport systemd ; cmakeFlags = [] @@ -123,6 +126,7 @@ stdenv.mkDerivation rec { ++ optional wirelessSupport "-DBUILD_WLAN=ON" ++ optional nvidiaSupport "-DBUILD_NVIDIA=ON" ++ optional pulseSupport "-DBUILD_PULSEAUDIO=ON" + ++ optional journalSupport "-DBUILD_JOURNAL=ON" ; # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`: From 77550df8e68b5034d6a434c709be69adee1940cc Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 26 Jan 2019 10:17:57 -0500 Subject: [PATCH 222/230] cc-wrapper: add libcxx for libcxxClang clang needs to find headers + libraries for compiling with libc++. We need to add a libcxx argument to cc-wrapper. This means you do not have to pass in c++ headers directly. This resolves the last case remaining of #30670. Darwin clang++ now works properly. Fixes #30670 --- pkgs/build-support/cc-wrapper/default.nix | 14 +++++++++----- pkgs/development/compilers/llvm/5/default.nix | 1 + pkgs/development/compilers/llvm/6/default.nix | 1 + pkgs/development/compilers/llvm/7/default.nix | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 47c992d1f6b..75a05d5277b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -13,6 +13,7 @@ , extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} +, libcxx ? null }: with stdenvNoCC.lib; @@ -44,8 +45,11 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; + default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then + "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" + else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then + "-isystem ${libcxx}/include/c++/v1" + else ""; # The "infix salt" is a arbitrary string added in the middle of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used @@ -256,9 +260,9 @@ stdenv.mkDerivation { echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags - '' - - + optionalString propagateDoc '' + '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' + echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags + '' + optionalString propagateDoc '' ## ## Man page and info support ## diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 68ee80fa7a6..6807240df81 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 5ee551f6b6b..ae51c19ec72 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 47c6e9e383f..3f1192d9626 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi From 4866cbe3418a56e46e0378db50ce764a35679faa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Jan 2019 20:41:29 -0800 Subject: [PATCH 223/230] tortoisehg: 4.8.1 -> 4.8.2 (#54651) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tortoisehg/versions --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index b7334ebbe5e..dc458eba167 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "10s7v7mi438b8lh3rpd6da9lkwgaflpi6a0inkd8bl4b4ya38vc6"; + sha256 = "02av8k241rn7b68g4kl22s7jqmlq545caah1a5rvbgy41y7zzjvh"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; From 5eca7642ade3e7f23180283c416fc311b9493cb4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 25 Jan 2019 19:25:54 -0600 Subject: [PATCH 224/230] gnutls: 3.6.5 -> 3.6.6 "bug fix release on the stable branch" https://lists.gnupg.org/pipermail/gnutls-help/2019-January/004484.html --- pkgs/development/libraries/gnutls/3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index 4ec93cf26a8..e0085483592 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0ddvg97dyrh8dkffv1mdc0knxx5my3qdbzv97s4a6jggmk9wwgh7"; # 3.6.5 + sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; # 3.6.6 }; # Skip some tests: From 4fe53f33a659b549712f2a687ee3aaea0ee813d2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 27 Jan 2019 14:59:58 -0600 Subject: [PATCH 225/230] gnutls: drop comment, no longer needed --- pkgs/development/libraries/gnutls/3.6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index e0085483592..513f20fd835 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; # 3.6.6 + sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; }; # Skip some tests: From 5aaf597df38b323f85784203195413d0056e6a2e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 27 Jan 2019 14:01:42 -0600 Subject: [PATCH 226/230] meson: 0.49.0 -> 0.49.1 https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ https://github.com/mesonbuild/meson/milestone/33 --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 96e04407325..3651884253a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: python3Packages.buildPythonApplication rec { - version = "0.49.0"; + version = "0.49.1"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0895igla1qav8k250z2qv03a0fg491wzzkfpbk50wwq848vmbkd0"; + sha256 = "05wr4kn88aqq2cbzqx59zj56410c9d42wracb4cjs70mvq0lp50s"; }; postFixup = '' From 9172c1eee2e376ef9070d1db0586471c52397242 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 31 Oct 2018 14:26:54 -0500 Subject: [PATCH 227/230] setup.sh: avoid running the same hook twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In strictDeps=false, we don’t want the same package hook to be run twice, otherwise we get duplicates in some flags. Fixes #41340 --- pkgs/stdenv/generic/setup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 8af369b1d17..7e55f0db2aa 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -562,6 +562,10 @@ _addToEnv() { (( "$depHostOffset" <= "$depTargetOffset" )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" if [[ -z "${strictDeps-}" ]]; then + + # Keep track of which packages we have visited before. + local visitedPkgs="" + # Apply environment hooks to all packages during native # compilation to ease the transition. # @@ -574,7 +578,11 @@ _addToEnv() { ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} do + if [[ "$visitedPkgs" = *"$pkg"* ]]; then + continue + fi runHook "${!hookRef}" "$pkg" + visitedPkgs+=" $pkg" done else local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]" From 61bcf59e1dccb06547216ecb150151a0c82bcb11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 17:32:40 -0800 Subject: [PATCH 228/230] apacheHttpd: 2.4.37 -> 2.4.38 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apache-httpd/versions --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bf82e916590..64e57f64236 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.37"; + version = "2.4.38"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l"; + sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx"; }; # FIXME: -dev depends on -doc From aa9821bbb9ce1085205eeb01bcfe3529617ed712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2019 12:36:06 +0100 Subject: [PATCH 229/230] glibc: fix build with newer bison Fixes https://github.com/NixOS/nixpkgs/issues/54870 --- pkgs/development/libraries/glibc/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 7e99a0c18d7..d8cc00738a9 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -105,6 +105,9 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + + # bison 3.3 is too strict + sed 's/^BISONFLAGS = --yacc /BISONFLAGS = --yacc -Wno-error=yacc /g' -i intl/Makefile ''; configureFlags = From c4720cb200bfa611dc1800aa046c9cb7f1e6c0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2019 12:37:56 +0100 Subject: [PATCH 230/230] swig3, libapparmor: switch to bison2 To fix build after https://github.com/NixOS/nixpkgs/pull/54635 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eeab1784f99..a313bb0e18f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9174,7 +9174,9 @@ in swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; - swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; + swig3 = callPackage ../development/tools/misc/swig/3.x.nix { + bison = bison2; + }; swig = swig3; swigWithJava = swig; @@ -14282,7 +14284,7 @@ in iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) + inherit (callPackages ../os-specific/linux/apparmor { python = python3; bison = bison2; }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches;