From 54816ec9590193e01208a4a20d617ff049877101 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sat, 16 Nov 2019 13:52:14 +0100 Subject: [PATCH 01/58] weechatScripts: recurseIntoAttrs --- 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 914c4a013656..d7cd322e0825 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21762,7 +21762,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); + weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; From 8aab081504b8671067c0a70330e279176d787952 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 4 May 2020 14:22:33 +0200 Subject: [PATCH 02/58] tor: fix cross compiling --- pkgs/tools/security/tor/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 215ab63328fc..e6cd74eda4b1 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; + # cross compiles correctly but needs the following + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--disable-tool-name-check"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' From e72b2beab026f1e9908cab53f2773a61256e4a72 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 18:23:44 -0400 Subject: [PATCH 03/58] vtk: unbreak on OS X --- pkgs/development/libraries/vtk/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 6a7e26c753cd..1cc706f4eb73 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfea73736d6e..f6782e376999 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14844,7 +14844,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { - stdenv = gcc8Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration From 404834334bbe8af992b8d39cf6d9d767f8cf463e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 13:28:48 -0400 Subject: [PATCH 04/58] itk: 5.0.1 -> 5.1.0 --- pkgs/development/libraries/itk/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index d745ff438cee..6c0298c0f71c 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper +, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1"; + sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; }; cmakeFlags = [ @@ -23,12 +24,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + nativeBuildInputs = [ cmake xz makeWrapper ]; + buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + + postInstall = '' + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = "http://www.itk.org/"; + homepage = "https://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6782e376999..7bec4f99b53d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12285,7 +12285,7 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { - stdenv = gcc8Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; jasper = callPackage ../development/libraries/jasper { }; From 20cf206a099ad7aa3ed02b0f39f53195223bf282 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 14:42:17 -0400 Subject: [PATCH 05/58] simpleitk: itk -> itk4 - simpleitk 1.2.4 is incompatible with ITK 5.1, so this can be reverted when 2.x is released. --- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index d6708b0dfed8..445a8bc5f21d 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }: +{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git swig ]; - buildInputs = [ lua itk ]; + buildInputs = [ lua itk4 ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bec4f99b53d..58f7ecf4e7a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14413,7 +14413,10 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + simpleitk = callPackage ../development/libraries/simpleitk { + lua = lua51Packages.lua; + stdenv = gcc8Stdenv; + }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; From 6f1430a8021274aa4ec4c7b52c3457e37574c094 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 15:03:38 -0400 Subject: [PATCH 06/58] ezminc: switch from itk5 to itk4 branch - itk5 branch currently lacks support for itk 5.1 --- pkgs/applications/science/biology/EZminc/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 978615fa4592..7502a4ffd2ab 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; - name = "${pname}-unstable-2019-07-25"; + name = "${pname}-unstable-2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf"; - sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b"; + rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51"; + sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEZMINC_BUILD_TOOLS=TRUE" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f7ecf4e7a4..32c7c926b324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24322,7 +24322,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { }; + ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; exonerate = callPackage ../applications/science/biology/exonerate { }; From 5caa76705bd839fb6733f64740dec95d7b2fefc5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 15:04:43 -0400 Subject: [PATCH 07/58] elastix: update for ITK 5.1.0 - fetch patches to build elastix 5.0 with ITK 5.1 - update 'platforms': builds on Darwin, fails on aarch64 --- .../science/biology/elastix/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index e5565aae29b1..4d98b12928f5 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python3 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: stdenv.mkDerivation rec { pname = "elastix"; @@ -11,10 +11,24 @@ stdenv.mkDerivation rec { sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; + patches = [ + (fetchpatch { + name = "itk-5.1-compat.patch"; + url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; + sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; + }) + (fetchpatch { + name = "fix-osx-build.patch"; + url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; + sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + }) + ]; + + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; - doCheck = true; + doCheck = !stdenv.isDarwin; # usual dynamic linker issues preCheck = " export LD_LIBRARY_PATH=$(pwd)/bin @@ -24,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 license = licenses.asl20; }; } From 88246c57fc15a8b26c3f368f7cb1888a1900a46a Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Thu, 23 Jan 2020 11:20:58 +0100 Subject: [PATCH 08/58] pxlib: init at 0.6.8 --- pkgs/development/libraries/pxlib/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/pxlib/default.nix diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix new file mode 100644 index 000000000000..2624c718d274 --- /dev/null +++ b/pkgs/development/libraries/pxlib/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + pname = "pxlib"; + version = "0.6.8"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + description = "Library to read and write Paradox files"; + homepage = "http://pxlib.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bbc121b7ac0..e665dc3362bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25878,6 +25878,8 @@ in kcli = callPackage ../development/tools/kcli {}; + pxlib = callPackage ../development/libraries/pxlib {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; From 9356945f912dfa605ae72e908968d5fa8d7dade6 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Thu, 23 Jan 2020 11:21:16 +0100 Subject: [PATCH 09/58] pxview: init at 0.2.5 --- pkgs/development/tools/pxview/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/pxview/default.nix diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix new file mode 100644 index 000000000000..6b11071b6fa3 --- /dev/null +++ b/pkgs/development/tools/pxview/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: + +stdenv.mkDerivation rec { + pname = "pxview"; + version = "0.2.5"; + src = fetchurl { + url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz"; + sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139"; + }; + + buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = [ "--with-pxlib=${pxlib.out}" ]; + + # https://sourceforge.net/p/pxlib/bugs/12/ + LDFLAGS = "-lm"; + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Program to convert Paradox databases"; + homepage = "http://pxlib.sourceforge.net/pxview/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665dc3362bd..0bd81a79b757 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25880,6 +25880,8 @@ in pxlib = callPackage ../development/libraries/pxlib {}; + pxview = callPackage ../development/tools/pxview {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; From 8b418f717bcba80212f30d0c5e16667eadcbdf52 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 01:48:36 +0000 Subject: [PATCH 10/58] mksh: 58 -> 59 --- pkgs/shells/mksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index b2f50c62dc48..682d88dbfbd5 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "58"; + version = "59"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0"; + sha256 = "1flhsdfksvv9gmfkgjwgdia1irv53g9abmq3y22s5a5ycyx2hajr"; }; dontConfigure = true; From c13df548a3d962d9810134c2d2f940a241de1418 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 6 May 2020 21:34:19 +0100 Subject: [PATCH 11/58] php: override outputsToInstall when using withExtensions At the moment, using .withExtensions on a PHP derivation will produce something which can't be used inside an environment.systemPackages array, because outputsToInstall refers to an output which doesn't exist on the final derivation. Instead, override it back to just containing the single output "out". --- pkgs/development/interpreters/php/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e0aea60e2939..ac0ab2196afa 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -113,7 +113,9 @@ let unwrapped = php; tests = nixosTests.php; inherit (php-packages) packages extensions; - inherit (php) meta; + meta = php.meta // { + outputsToInstall = [ "out" ]; + }; }; paths = [ php ]; postBuild = '' From 9bc0b630ab82804cdff12b919ad982773f7ffbed Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:24:29 -0400 Subject: [PATCH 12/58] zabbix: replace download source from sourceforge to zabbix.com --- pkgs/servers/monitoring/zabbix/agent.nix | 2 +- pkgs/servers/monitoring/zabbix/proxy.nix | 2 +- pkgs/servers/monitoring/zabbix/server.nix | 2 +- pkgs/servers/monitoring/zabbix/web.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 09f43c755f16..f112598da6a5 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 697492d96277..b8f8ca33b0e7 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 4046cc7d8bb5..25b7325bba22 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index c4cf5d044dae..ca48a72d9fe8 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; From c2d3f26d1fdf782495627fe89321125c16b3036d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:25:38 -0400 Subject: [PATCH 13/58] zabbix: 3.0.30 -> 3.0.31 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2b7fb972c90a..360bc2495720 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -10,7 +10,7 @@ generic: { }; v30 = generic { - version = "3.0.30"; - sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07"; + version = "3.0.31"; + sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm"; }; } From 99b63a7784f8f89324b62b6575dd98f50464fcc9 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:26:11 -0400 Subject: [PATCH 14/58] zabbix: 4.0.19 -> 4.0.20 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 360bc2495720..50b85d9927d8 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,8 +5,8 @@ generic: { }; v40 = generic { - version = "4.0.19"; - sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr"; + version = "4.0.20"; + sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; }; v30 = generic { From b828ef33aeab79dc70ab9d07304c792ba2880aec Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:26:47 -0400 Subject: [PATCH 15/58] zabbix: 4.4.7 -> 4.4.8 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 50b85d9927d8..c75df46cf047 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v44 = generic { - version = "4.4.7"; - sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9"; + version = "4.4.8"; + sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; }; v40 = generic { From c33e8c498698566df32ba2bcf224634d28325610 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 7 May 2020 14:39:42 -0500 Subject: [PATCH 16/58] =?UTF-8?q?nixos/gdk-pixbuf.nix:=20don=E2=80=99t=20s?= =?UTF-8?q?et=20GDK=5FPIXBUF=5FMODULE=5FFILE=20in=20cross?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 6c5983a291530f040deb97881e80cca373a5b29e, this should not be necessary for gdk-pixbuf to work correctly. --- nixos/modules/services/x11/gdk-pixbuf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index e6a24a2f1a30..3fd6fed91e13 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -37,7 +37,7 @@ in # If there is any package configured in modulePackages, we generate the # loaders.cache based on that and set the environment variable # GDK_PIXBUF_MODULE_FILE to point to it. - config = mkIf (cfg.modulePackages != [] || pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) { + config = mkIf (cfg.modulePackages != []) { environment.variables = { GDK_PIXBUF_MODULE_FILE = "${loadersCache}"; }; From da59984d367f499a00b8533e795cd958cb7c5002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 8 May 2020 07:49:35 +0200 Subject: [PATCH 17/58] gcc10, gfortran10, gnat10: init at 10.1.0 Everything is copied as-is from 9 (except version and hash). Some platform-specific patches might not apply anymore; I'm lazily leaving that for the community to fix. --- pkgs/development/compilers/gcc/10/default.nix | 285 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 32 ++ 2 files changed, 317 insertions(+) create mode 100644 pkgs/development/compilers/gcc/10/default.nix diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix new file mode 100644 index 000000000000..5e0a25ea60bd --- /dev/null +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -0,0 +1,285 @@ +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langAda ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, enableLTO ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, threadsCross ? null # for MinGW +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform == stdenv.buildPlatform + && stdenv.targetPlatform == stdenv.hostPlatform +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; +assert langAda -> gnatboot != null; + +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + +with stdenv.lib; +with builtins; + +let majorVersion = "10"; + version = "${majorVersion}.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; + }); + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + +in + +stdenv.mkDerivation ({ + pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + inherit version; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else "") + + stdenv.lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) + ; + + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = import ../common/pre-configure.nix { + inherit (stdenv) lib; + inherit version hostPlatform gnatboot langAda langGo; + }; + + dontDisableStatic = true; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + configureFlags = import ../common/configure-flags.nix { + inherit + stdenv + targetPackages + crossStageStatic libcCross + version + + gmp mpfr libmpc libelf isl + + enableLTO + enableMultilib + enablePlugin + enableShared + + langC + langCC + langFortran + langAda + langGo + langObjC + langObjCpp + ; + }; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (targetPlatform == hostPlatform && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = optional stripped "install-strip"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; + + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = "https://gcc.gnu.org/"; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ synthetica ]; + + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ + stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d0bd9b06e0f..9e762f261999 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8191,6 +8191,7 @@ in gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; + gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -8358,6 +8359,20 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + enableLTO = !stdenv.isi686; + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { @@ -8408,6 +8423,14 @@ in profiledCompiler = false; }); + gfortran10 = wrapCC (gcc10.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -8440,6 +8463,15 @@ in gnatboot = gnat6; }); + gnat10 = wrapCC (gcc10.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; From 7fe539f79900efb6b8b6265ade11fdab460ca1da Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 8 May 2020 14:15:41 +0200 Subject: [PATCH 18/58] nixos/resolved: Include dbus alias of resolved unit This will make dbus socket activation for it work When `systemd-resolved` is restarted; this would lead to unavailability of DNS lookups. You're supposed to use DBUS socket activation to buffer resolved requests; such that restarts happen without downtime --- nixos/modules/system/boot/resolved.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index b7aaef575ac1..7ad643130a85 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -144,6 +144,7 @@ in systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" + "dbus-org.freedesktop.resolve1.service" ]; systemd.services.systemd-resolved = { From 3dbb32f6265bfacea10059500b9ae2ad1db80058 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 8 May 2020 17:10:26 +0200 Subject: [PATCH 19/58] open-watcom-bin: fix EOVERFLOW on stat() calls We've already worked around failing stat() calls in the installer by running it in qemu-user. Turns out on some systems this workaround is also needed to run `wlib', the archiver of the Open Watcom toolchain. This issue manifested itself in broken VirtualBox builds due to /build/virtualbox/out/linux.amd64/dbgopt/obj/VBoxPcBios32/pci32.obj not being found by `wlib'. We now just wrap all binaries in qemu-user to avoid this. --- .../compilers/open-watcom-bin/default.nix | 79 ++++++++++++++++--- 1 file changed, 67 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix index 0cd80b6e1df3..a9c6b221065c 100644 --- a/pkgs/development/compilers/open-watcom-bin/default.nix +++ b/pkgs/development/compilers/open-watcom-bin/default.nix @@ -1,15 +1,62 @@ -{ stdenvNoCC, fetchurl, qemu, expect, writeScript, ncurses }: +{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: let - # We execute the installer in qemu-user, because otherwise the - # installer fails to open itself due to a failed stat() call. This - # seems like an incompatibility of new Linux kernels to run this - # ancient binary. - performInstall = writeScript "perform-ow-install" '' + # We execute all OpenWatcom binaries in qemu-user, because otherwise + # some binaries (most notably the installer itself and wlib) fail to + # use the stat() systemcall. The failure mode is that it returns + # EOVERFLOW for completely legitimate requests. This seems like an + # incompatibility of new Linux kernels to run this ancient binary. + wrapLegacyBinary = writeScript "wrapLegacyBinary" '' + #!${bash}/bin/bash + + set -eu + + if [ $# -ne 2 ]; then + echo "Usage: $0 unwrapped-binary wrapped-binary" + exit 1 + fi + + IN="$(${coreutils}/bin/realpath $1)" + OUT="$2" + ARGV0="$(basename $2)" + + cat > "$OUT" < Date: Sat, 9 May 2020 04:54:15 +0000 Subject: [PATCH 20/58] python27Packages.eve: 1.0 -> 1.1 --- .../python-modules/eve/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index a8ac610855d5..7a74de03d522 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,13 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, events -, pymongo, simplejson, cerberus, werkzeug }: +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +, events +, pymongo +, simplejson +, cerberus +, setuptools +}: buildPythonPackage rec { pname = "Eve"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e"; + sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv"; }; propagatedBuildInputs = [ @@ -16,13 +24,10 @@ buildPythonPackage rec { flask pymongo simplejson - werkzeug + setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "werkzeug==0.15.4" "werkzeug" - ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance doCheck = false; From bab9c16aa29691379d33ae4b7c0604a78aa0428a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 06:08:58 +0000 Subject: [PATCH 21/58] python27Packages.flask_wtf: 0.14.2 -> 0.14.3 --- pkgs/development/python-modules/flask-wtf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 962555d492dd..060f592b2cff 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-WTF"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x"; + sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl"; }; propagatedBuildInputs = [ flask wtforms nose ]; From 206690308bf8f39cbfbdd326be861d7673e41657 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 May 2020 04:20:00 -0500 Subject: [PATCH 22/58] recursive: 1.047 -> 1.051 --- pkgs/data/fonts/recursive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 015b084aed77..210858c5aed5 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.047"; + version = "1.051"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0v50m6hiv19f7i4idi987j1six6493y6hj3r9djifg075v9adxx9"; + sha256 = "1cqlljbzvrxamswcqx8jbr61q4kji7yil5ic1mh60x4yfsk9x5wn"; meta = with lib; { homepage = "https://recursive.design/"; From 209432351eb313fcd89d2aa2625f2fc85a3172e6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 May 2020 04:20:00 -0500 Subject: [PATCH 23/58] git-lfs: 2.10.0 -> 2.11.0 Changelog: https://github.com/git-lfs/git-lfs/releases/tag/v2.11.0 --- pkgs/applications/version-management/git-lfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index cdd7cd01d066..80f236559f9e 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; + sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; }; goPackagePath = "github.com/git-lfs/git-lfs"; From 887295fd2d8c4da06acdaa185cbb3cc214d83285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 9 May 2020 10:25:07 +0100 Subject: [PATCH 24/58] treewide: remove the-kenny from maintainers @the-kenny did a good job in the past and is set as maintainer in many package, however since 2017-2018 he stopped contributing. To create less confusion in pull requests when people try to request his feedback, I removed him as maintainer from all packages. --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/audio/audacity/default.nix | 1 - pkgs/applications/audio/streamripper/default.nix | 1 - pkgs/applications/editors/emacs/25.nix | 2 +- pkgs/applications/editors/emacs/default.nix | 2 +- pkgs/applications/graphics/ImageMagick/7.0.nix | 1 - pkgs/applications/graphics/ImageMagick/default.nix | 1 - pkgs/applications/graphics/digikam/default.nix | 1 - pkgs/applications/graphics/openscad/default.nix | 3 +-- pkgs/applications/graphics/rawtherapee/default.nix | 2 +- pkgs/applications/misc/cura/stable.nix | 3 +-- pkgs/applications/misc/curaengine/stable.nix | 1 - pkgs/applications/misc/direwolf/default.nix | 1 - pkgs/applications/misc/slic3r/default.nix | 2 +- pkgs/applications/networking/dropbox/cli.nix | 1 - pkgs/applications/networking/irc/weechat/default.nix | 2 +- pkgs/applications/networking/mailreaders/mutt/default.nix | 2 +- .../applications/networking/mailreaders/notmuch/default.nix | 2 +- pkgs/applications/office/ledger/default.nix | 2 +- pkgs/applications/radio/chirp/default.nix | 1 - pkgs/applications/radio/gnuradio/osmosdr.nix | 2 +- pkgs/applications/radio/gqrx/default.nix | 2 +- pkgs/applications/radio/hackrf/default.nix | 2 +- pkgs/applications/radio/multimon-ng/default.nix | 1 - .../version-management/git-and-tools/git/default.nix | 2 +- .../version-management/git-and-tools/hub/default.nix | 2 +- .../version-management/git-and-tools/stgit/default.nix | 1 - .../version-management/git-and-tools/svn2git/default.nix | 2 -- pkgs/applications/window-managers/herbstluftwm/default.nix | 1 - pkgs/applications/window-managers/stumpwm/default.nix | 1 - pkgs/development/arduino/ino/default.nix | 2 +- pkgs/development/compilers/avra/default.nix | 1 - pkgs/development/compilers/chicken/4/chicken.nix | 2 +- pkgs/development/compilers/chicken/4/egg2nix.nix | 2 +- pkgs/development/compilers/chicken/5/chicken.nix | 2 +- pkgs/development/compilers/chicken/5/egg2nix.nix | 2 +- pkgs/development/compilers/gforth/default.nix | 1 - pkgs/development/compilers/gnu-cobol/default.nix | 2 +- pkgs/development/interpreters/elixir/generic-builder.nix | 2 +- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- pkgs/development/interpreters/scheme48/default.nix | 1 - pkgs/development/python-modules/podcats/default.nix | 1 - pkgs/development/python-modules/todoist/default.nix | 1 - pkgs/development/tools/build-managers/leiningen/default.nix | 1 - pkgs/development/tools/build-managers/rebar/default.nix | 1 - pkgs/development/tools/misc/dfu-programmer/default.nix | 1 - pkgs/development/tools/misc/stm32flash/default.nix | 2 +- pkgs/development/tools/misc/teensy-loader-cli/default.nix | 1 - pkgs/development/tools/ws/default.nix | 1 - pkgs/games/anki/default.nix | 2 +- pkgs/games/crrcsim/default.nix | 2 +- pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 2 +- pkgs/games/dwarf-fortress/game.nix | 2 +- pkgs/games/flightgear/default.nix | 2 +- pkgs/games/openttd/default.nix | 2 +- pkgs/misc/emulators/wine/winetricks.nix | 1 - pkgs/os-specific/linux/ldm/default.nix | 1 - pkgs/os-specific/linux/usermount/default.nix | 1 - pkgs/servers/http/gatling/default.nix | 1 - pkgs/servers/http/yaws/default.nix | 2 +- pkgs/tools/backup/btrbk/default.nix | 2 +- pkgs/tools/backup/httrack/default.nix | 1 - pkgs/tools/backup/rdiff-backup/default.nix | 1 - pkgs/tools/graphics/pngcheck/default.nix | 1 - pkgs/tools/graphics/pngcrush/default.nix | 1 - pkgs/tools/misc/stow/default.nix | 2 -- pkgs/tools/networking/fping/default.nix | 1 - pkgs/tools/networking/isync/default.nix | 2 -- pkgs/tools/networking/mu/default.nix | 2 +- pkgs/tools/security/pass/default.nix | 2 +- pkgs/tools/security/pass/extensions/import.nix | 2 +- pkgs/tools/security/pass/extensions/tomb.nix | 2 +- pkgs/tools/security/pass/extensions/update.nix | 2 +- pkgs/tools/security/pass/rofi-pass.nix | 1 - 74 files changed, 37 insertions(+), 84 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ed92fb88a1fc..ad59286e0902 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7624,12 +7624,6 @@ githubId = 1141680; name = "Thane Gill"; }; - the-kenny = { - email = "moritz@tarn-vedra.de"; - github = "the-kenny"; - githubId = 31167; - name = "Moritz Ulrich"; - }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a1f4b9ad950a..f1e652cbcad5 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 55ed40c2fb8d..1411fe59b30f 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { homepage = "http://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index 1ee2f5d4fe7c..5bc29a046bc5 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 224fe9074500..2d48da0eb281 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ]; + maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index c07c3957254b..f2542301119e 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,5 @@ stdenv.mkDerivation { 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 ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 57ce02bb6610..0ded57b1a72c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation { 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 ]; license = licenses.asl20; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 50162166013e..63b8d7b3f609 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -126,7 +126,6 @@ mkDerivation rec { description = "Photo Management Program"; license = licenses.gpl2; homepage = "https://www.digikam.org"; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 95af658ddd36..62e9fa06abc8 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -80,7 +80,6 @@ mkDerivation rec { homepage = "http://openscad.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; - [ bjornfor raskin the-kenny gebner ]; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin gebner ]; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 812c26f56e59..4371bc5838ed 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming mahe ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 1191be09f76e..87d2aba891b6 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configurePhase = ""; buildPhase = ""; - + patches = [ ./numpy-cast.patch ]; installPhase = '' @@ -69,6 +69,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/daid/Cura"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index d353fff87efe..394a94f19ab8 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation { homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 038df41875f5..623e6dc0fbef 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 25019f76545e..912deee4cb1b 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://slic3r.org/"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor the-kenny ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 12865bd6ca7f..5ff47f4859aa 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation { homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 4538edd2e760..a05ec290629f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -78,7 +78,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index e1eb8863a084..736d7530be1e 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { homepage = "http://www.mutt.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index f6bf60166caf..26f47dba4617 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ flokli puckipedia the-kenny ]; + maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 05fb05924067..6ac092f27e2b 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = with maintainers; [ the-kenny jwiegley ]; + maintainers = with maintainers; [ jwiegley ]; }; } diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 898244970c89..848e0ca3c01e 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -20,6 +20,5 @@ python2.pkgs.buildPythonApplication rec { homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 1078cf4df684..ad54fc8d7c4f 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor the-kenny ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index f1a71804e3ff..33b858799e2a 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -43,6 +43,6 @@ mkDerivation rec { # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; platforms = platforms.linux; # should work on Darwin / macOS too - maintainers = with maintainers; [ bjornfor the-kenny fpletz ]; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 9569dd89797c..dfd7fabcc6e0 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ sjmackenzie the-kenny ]; + maintainers = with maintainers; [ sjmackenzie ]; }; } diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index de6b8504091d..e275db4ad919 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation { homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8b8dbef12ab4..9c1a01f42ae8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -343,6 +343,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ]; + maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 9dbb497c8c9e..22ffd442fdc9 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; homepage = "https://hub.github.com/"; - maintainers = with maintainers; [ the-kenny globin ]; + maintainers = with maintainers; [ globin ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index d356991815e7..2cd4adce9397 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation { description = "A patch manager implemented on top of Git"; homepage = "http://procode.org/stgit/"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 1683a9bea137..b61ae80bbee1 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation { homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.the-kenny ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 47541a3fdb57..7dc715e126cd 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://herbstluftwm.org/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 3ee50bf16ec8..b059423c23c4 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation { description = "A tiling window manager for X11"; homepage = "https://github.com/stumpwm/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; broken = true; # 2018-04-11 }; diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 0e36c22872e3..c51d3f89d070 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -40,7 +40,7 @@ python2Packages.buildPythonApplication rec { description = "Command line toolkit for working with Arduino hardware"; homepage = "http://inotool.org/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ antono ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index 55ed48e118e8..56bf3e657bec 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = "http://avra.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index be7a4530419d..11f4eaada604 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index db91b1648afc..977f34692f90 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -22,6 +22,6 @@ eggDerivation { homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 00d359c96d02..f07b63ea26f4 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 7c73e37272de..0c18b8db2ded 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -24,6 +24,6 @@ eggDerivation { homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index c90666d3dbe3..d2a2a7a85e3c 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation { homepage = "https://www.gnu.org/software/gforth/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index c5e42c3afe8a..146af98093d0 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "An open-source COBOL compiler"; homepage = "https://sourceforge.net/projects/open-cobol/"; license = licenses.gpl3; - maintainers = with maintainers; [ ericsagnes the-kenny ]; + maintainers = with maintainers; [ ericsagnes ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b46b71485c82..54b046beaab2 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -73,6 +73,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ]; + maintainers = with maintainers; [ havvy couchemar ankhers filalex77 ]; }; }) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 883fa87cbd4b..f80e1f344f7f 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -122,7 +122,7 @@ in stdenv.mkDerivation ({ ''; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; + maintainers = with maintainers; [ sjmackenzie couchemar gleber ]; license = licenses.asl20; } // meta); } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 32dd28bcb205..5a1e3f265b24 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation { meta = { homepage = "http://s48.org/"; description = "Scheme 48"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 127cf47251ba..48504c8a3ee2 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Application that generates RSS feeds for podcast episodes from local audio files"; homepage = "https://github.com/jakubroztocil/podcats"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index ecf9aa91b417..f420cbaee974 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -16,6 +16,5 @@ buildPythonPackage rec { description = "The official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 07a95539f8d6..713f499ce2b2 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -48,6 +48,5 @@ stdenv.mkDerivation rec { description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 39366c7a9cac..1c5996c6b1cf 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index a474ccc7e594..1aaf113d0b95 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = "http://dfu-programmer.sourceforge.net/"; - maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index a67430d52a1a..0c2cb96a9d6c 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/stm32flash/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms - maintainers = with maintainers; [ the-kenny elitak ]; + maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 62c480707cdd..40f3921ec705 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = "https://www.pjrc.com/teensy/"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 661865ee74ec..952538956485 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; license = licenses.mit; - maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c1ba8851f5c4..1548a9de63af 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -195,6 +195,6 @@ buildPythonApplication rec { license = licenses.agpl3Plus; broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ]; + maintainers = with maintainers; [ oxij Profpatsch enzime ]; }; } diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 75ff970a16a8..e57d6bcab066 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A model-airplane flight simulator"; - maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 4485b3ae784a..f5c093e1f16c 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar bendlas numinit jonringer ]; + maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; license = licenses.mit; platforms = platforms.unix; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 20fbd9fa18b2..9200d01aa985 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { inherit homepage; license = licenses.unfreeRedistributable; platforms = attrNames platforms; - maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit shazow ]; + maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ]; }; } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index d3c3271710a0..c16c33666f31 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight simulator"; - maintainers = with maintainers; [ raskin the-kenny ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 2e115775d00e..43376322cc77 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.openttd.org/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming the-kenny fpletz ]; + maintainers = with maintainers; [ jcumming fpletz ]; }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 444ef29b7843..ab183dfd38ee 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; homepage = "https://github.com/Winetricks/winetricks"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 603d2855f566..bbc341caf11f 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 4acf1e3faa1c..85f769d9dbae 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation { description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index bf69d902aa58..9157c09cbebd 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = "http://www.fefe.de/gatling/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 301aec5c34be..1d57a951dc7b 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://yaws.hyber.org"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu the-kenny ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ca043692788b..0c528bcea1ec 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ asymmetric the-kenny ]; + maintainers = with maintainers; [ asymmetric ]; inherit version; }; } diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 6e2b92e81288..9a77153e2ff3 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { description = "Easy-to-use offline browser / website mirroring utility"; homepage = "http://www.httrack.com"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index a23be69f4cf7..707ba8a9885b 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -19,6 +19,5 @@ python2Packages.buildPythonApplication { homepage = "http://rdiff-backup.nongnu.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 085b6ae4a951..ba5082ac3048 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Verifies the integrity of PNG, JNG and MNG files"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 67d3eb15ba12..5bc52b92f0d2 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index d5cd4ef32ef4..80741f0543ce 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/stow/"; - - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 6d74cd2c78ca..6a63a2047b23 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; - maintainers = with maintainers; [ the-kenny ]; license = licenses.bsd0; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 0373b05ede06..9b45f268da7f 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://isync.sourceforge.net/"; description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; - - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 79c314f9860a..611e848b9af0 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - maintainers = with maintainers; [ antono the-kenny peterhoeg ]; + maintainers = with maintainers; [ antono peterhoeg ]; platforms = platforms.mesaPlatforms; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 46dfafa81519..76b90d5b8858 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index c2fc2cff8815..cc5f0c94e119 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { description = "Pass extension for importing data from existing password managers"; homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index f5b61207de66..43c74a9029b3 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Pass extension that keeps the password store encrypted inside a tomb"; homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index 5bc88d394e75..b2f331f13757 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Pass extension that provides an easy flow for updating passwords"; homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 7daf42ab6c79..b3c086488629 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = "https://github.com/carnager/rofi-pass"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; From 33932b6f833834becd1eac0364710bcdaf36d5d4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 9 May 2020 11:59:13 +0200 Subject: [PATCH 25/58] tbe: fix build --- pkgs/games/the-butterfly-effect/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index d5f44daf156a..14d51ee87bd1 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: +{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tbe"; version = "0.9.3.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bcca103db40..7b087787e4a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23848,7 +23848,7 @@ in lua = lua5_1; }; - tbe = callPackage ../games/the-butterfly-effect { }; + tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; teetertorture = callPackage ../games/teetertorture { }; From 256cb06d87bd4a4448523549c4c577dc605e61ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 9 May 2020 07:28:28 -0300 Subject: [PATCH 26/58] matcha-theme: change name to matcha-gtk-theme Upstream renamed the git repository. --- pkgs/data/themes/matcha/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index d45c759f8808..c3980bc3ca7a 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - pname = "matcha"; + pname = "matcha-gtk-theme"; version = "2020-04-08"; src = fetchFromGitHub { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A stylish Design theme for GTK based desktop environments"; + description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c4e6f9d4237..5767878dc659 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -275,6 +275,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d339da1e81f9..91f4678ae55f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17990,7 +17990,7 @@ in manrope = callPackage ../data/fonts/manrope { }; - matcha = callPackage ../data/themes/matcha { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; From f4be6782957249589f6bd6bd9bab5119d5412580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 9 May 2020 07:30:17 -0300 Subject: [PATCH 27/58] matcha-gtk-theme: 2020-04-08 -> 2020-05-09 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index c3980bc3ca7a..e54d2354139a 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-04-08"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0gmdscw9gv19k80ciai6zziih2nccr5snz5na48gr4k5rhq9mzqx"; + sha256 = "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww"; }; buildInputs = [ gdk-pixbuf librsvg ]; From cfe68f2b68b7a7c2e5347c496b6963af30d18d3f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 9 May 2020 13:23:59 +0200 Subject: [PATCH 28/58] giada: 0.16.1 -> 0.16.2.2 + use system catch and nlohmann_json --- pkgs/applications/audio/giada/default.nix | 41 ++++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index eff1d6411a15..fcf4d0b86520 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -1,23 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, - fltk, jansson, rtmidi, libsamplerate, libsndfile, - jack2, alsaLib, libpulseaudio, - libXpm, libXinerama, libXcursor }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, fltk +, jansson +, rtmidi +, libsamplerate +, libsndfile +, jack2 +, alsaLib +, libpulseaudio +, libXpm +, libXinerama +, libXcursor +, catch2 +, nlohmann_json +}: stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.1"; + version = "0.16.2.2"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1"; + sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; }; - configureFlags = [ "--target=linux" ]; + configureFlags = [ + "--target=linux" + "--enable-system-catch" + ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ fltk libsndfile @@ -30,9 +48,16 @@ stdenv.mkDerivation rec { libpulseaudio libXinerama libXcursor + catch2 + nlohmann_json ]; - meta = with lib; { + postPatch = '' + sed -i 's:"deps/json/single_include/nlohmann/json\.hpp"::' \ + src/core/{conf,init,midiMapConf,patch}.cpp + ''; + + meta = with stdenv.lib; { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; From 8f50661336df1681de0cec534462d7b5cc4de026 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 May 2020 22:22:22 -0500 Subject: [PATCH 29/58] lxd: 4.0.1 -> 4.1 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index a3c94d74897d..f270576e684a 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "lxd"; - version = "4.0.1"; + version = "4.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; + sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; }; postPatch = '' From c22237d8949da77fee1eb8d902c14cf5d2b9b330 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 8 May 2020 23:26:56 +0200 Subject: [PATCH 30/58] mupdf: add MIME types to .desktop Closes https://github.com/NixOS/nixpkgs/issues/53856 --- pkgs/applications/misc/mupdf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a3067bc4af86..34ada062c717 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -74,6 +74,7 @@ in stdenv.mkDerivation rec { Comment=PDF viewer Exec=$bin/bin/mupdf-x11 %f Terminal=false + MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip EOF ''; From 9e0ab6dcb3a8ef4c57043785e290c4ecb4b6d9f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 12:46:09 +0000 Subject: [PATCH 31/58] python27Packages.pyroute2: 0.5.11 -> 0.5.12 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 5a49fa10fbf4..0a28ef6369bc 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; + sha256 = "1lry042qsamdzyw6zpmdld0v14g6cl05jsr9qdb7h5wnahf80mq1"; }; # requires root priviledges From c35d8c94d74eec03c47b5e2d629d12354e965d40 Mon Sep 17 00:00:00 2001 From: Roman Firment Date: Tue, 5 May 2020 13:08:37 +0200 Subject: [PATCH 32/58] gnomeExtensions.window-is-ready-remover unstable-2020-03-25 -> 1.02 Also add license. --- .../extensions/window-is-ready-remover/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix index 3ddd5c102835..15871e661c12 100644 --- a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-is-ready-remover"; - version = "unstable-2020-03-25"; + version = "1.02"; src = fetchFromGitHub { owner = "nunofarruca"; repo = "WindowIsReady_Remover"; - rev = "a9f9b3a060a6ba8eec71332f39dc2569b6e93761"; - sha256 = "0l6cg9kz2plbvsqhgwfajknzw9yv3mg9gxdbsk147gbh2arnp6v3"; + rev = "v${version}"; + sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; }; uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME Shell extension removing window is ready notification"; homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; - license = licenses.unfree; + license = licenses.asl20; }; } From 5e16e668f5999cb95ecd46e0f86dc0061f1f6ea9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 9 May 2020 22:13:06 +0800 Subject: [PATCH 33/58] firecracker: 0.20.0 -> 0.21.1 --- .../virtualization/firecracker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index cb8cc7ee1de2..79d1b606bcba 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.20.0"; + version = "0.21.1"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "073pp4q5dnyr126k8k7qdkqclqx18hj12app4gj2is0413gia8z9"; - aarch64-linux = "1w5f522imq5dnjrdidnrq7jlwcdrsiz32shv9bh66dhy336sd8qw"; + x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb"; + aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0falk6y9y0pimgav1yg6ydn6wsslz0my01qd9by8ipk3f3776531"; - aarch64-linux = "1j4x4p4zz1ydvpzbbmxszyqv28qbl4v3hiwdj2f67f1jn1cv9l7z"; + x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk"; + aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk"; }; in From 3458035bdf254a4bf4050e013af00d69752e70f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 1 May 2020 22:21:28 +0100 Subject: [PATCH 34/58] maintainers: add cyplo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ad59286e0902..1fff2727848a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1662,6 +1662,12 @@ } ]; }; + cyplo = { + email = "nixos@cyplo.dev"; + github = "cyplo"; + githubId = 217899; + name = "Cyryl Płotnicki"; + }; d-goldin = { email = "dgoldin+github@protonmail.ch"; github = "d-goldin"; From 69c6d18ae4e71537649a83ac41ca66864f257ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 1 May 2020 22:21:28 +0100 Subject: [PATCH 35/58] genpass: init at 0.4.1 --- pkgs/tools/security/genpass/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/genpass/default.nix diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix new file mode 100644 index 000000000000..ee3eebac991b --- /dev/null +++ b/pkgs/tools/security/genpass/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "genpass"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "cyplo"; + repo = pname; + rev = "v${version}"; + sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini"; + }; + + cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; + + meta = with stdenv.lib; { + description = "A simple yet robust commandline random password generator."; + homepage = "https://github.com/cyplo/genpass"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6802d642cab..38a9d613f5a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -930,6 +930,8 @@ in fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; + genpass = callPackage ../tools/security/genpass { }; + genymotion = callPackage ../development/mobile/genymotion { }; gaia = callPackage ../development/libraries/gaia { }; From a68a408a7ff80ef8e573d6b922ee824f68122292 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 1 May 2020 12:00:00 +0000 Subject: [PATCH 36/58] multibootusb: patchelf syslinux, add missing dependencies --- .../misc/multibootusb/default.nix | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 5225f88094fd..8f90c7a581d0 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,5 @@ -{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, +{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, + coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the @@ -19,17 +20,30 @@ python36Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook + autoPatchelfHook + unzip + zip + ]; + + runTimeDeps = [ + coreutils + gnugrep + which + parted + utillinux + qemu + p7zip + gnused + mtools + procps + e2fsprogs + gptfdisk ]; buildInputs = [ libxcb - mtools - p7zip - parted - procps python36Packages.python qt5.full - utillinux ]; src = fetchFromGitHub { @@ -52,6 +66,20 @@ python36Packages.buildPythonApplication rec { python36Packages.six ]; + # multibootusb ships zips with various versions of syslinux, we need to patchelf them + postPatch = '' + for zip in $(find . -name "*.zip"); do + zip=$(readlink -f $zip) + target="$(mktemp -d)" + pushd $target + unzip $zip + rm $zip + autoPatchelf . + zip -r $zip * + popd + done + ''; + postInstall = '' # This script doesn't work and it doesn't add much anyway rm $out/bin/multibootusb-pkexec @@ -69,6 +97,9 @@ python36Packages.buildPythonApplication rec { # Then, add the installed scripts/ directory to the python path --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" + # Add some runtime dependencies + --prefix "PATH" ":" "${stdenv.lib.makeBinPath runTimeDeps}" + # Finally, move to directory that contains data --run "cd $out/share/${pname}" ) From 5317280aded8b5e6ffbd3fef74503237a3c7f2cb Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 9 May 2020 15:17:42 +0200 Subject: [PATCH 37/58] ipfs: 0.5.0 -> 0.5.1 https://github.com/ipfs/go-ipfs/releases/tag/v0.5.1 --- pkgs/applications/networking/ipfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index cd96e5a0547e..1f8838e4c29b 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "ipfs"; - version = "0.5.0"; + version = "0.5.1"; rev = "v${version}"; src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "0dbyvs49wyqj46c8hvz0fr4vpgfrdj1h8blniwzjf0jabgvw8nik"; + sha256 = "11l55hlbixv1i25d3n216pkrwgcgac99fa88lyy3dailvminqxw7"; }; postPatch = '' @@ -23,7 +23,7 @@ buildGoModule rec { passthru.tests.ipfs = nixosTests.ipfs; - modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8"; + modSha256 = "13mpva3r6r2amw08g0bdggbxn933jjimngkvzgq1q5dksp4mivfk"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; From 8277fb4d76a155fb2744d38e743aab850d40ee75 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 27 Apr 2020 23:56:08 +0200 Subject: [PATCH 38/58] bitcoin: 0.19.0.1 -> 0.19.1 --- pkgs/applications/blockchains/bitcoin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 15094a1eee40..450102da66f3 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -5,7 +5,7 @@ with stdenv.lib; let - version = "0.19.0.1"; + version = "0.19.1"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284"; + sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0"; }; nativeBuildInputs = @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = "http://www.bitcoin.org/"; + homepage = "https://bitcoin.org/"; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; From c0f434fcc8c2c37719a622ada98158977665f4e8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 May 2020 12:58:00 -0400 Subject: [PATCH 39/58] doc: update python manual to reference python 3.8 instead of 3.5 Improvement suggested in #87094 --- doc/languages-frameworks/python.section.md | 72 +++++++++++----------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index e6f0b64fa9cc..734e51b38656 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -9,7 +9,7 @@ Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python` refers to the default interpreter, which is currently CPython 2.7. It is also possible to refer to -specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to +specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to the default PyPy interpreter. Python is used a lot, and in different ways. This affects also how it is @@ -25,10 +25,10 @@ however, are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Python libraries for this specific interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`. +is `python.pkgs.toolz`, and the CPython 3.8 version is `python38.pkgs.toolz`. The main package set contains aliases to these package sets, e.g. -`pythonPackages` refers to `python.pkgs` and `python35Packages` to -`python35.pkgs`. +`pythonPackages` refers to `python.pkgs` and `python38Packages` to +`python38.pkgs`. #### Installing Python and packages @@ -50,7 +50,7 @@ to create an environment with `python.buildEnv` or `python.withPackages` where the interpreter and other executables are able to find each other and all of the modules. -In the following examples we create an environment with Python 3.5, `numpy` and +In the following examples we create an environment with Python 3.8, `numpy` and `toolz`. As you may imagine, there is one limitation here, and that's that you can install only one environment at a time. You will notice the complaints about collisions when you try to install a second environment. @@ -61,7 +61,7 @@ Create a file, e.g. `build.nix`, with the following expression ```nix with import {}; -python35.withPackages (ps: with ps; [ numpy toolz ]) +python38.withPackages (ps: with ps; [ numpy toolz ]) ``` and install it in your profile with ```shell @@ -79,7 +79,7 @@ Nixpkgs set, e.g. using `config.nix`, { # ... packageOverrides = pkgs: with pkgs; { - myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]); + myEnv = python38.withPackages (ps: with ps; [ numpy toolz ]); }; } ``` @@ -101,7 +101,7 @@ environment system-wide. { # ... environment.systemPackages = with pkgs; [ - (python35.withPackages(ps: with ps; [ numpy toolz ])) + (python38.withPackages(ps: with ps; [ numpy toolz ])) ]; } ``` @@ -118,7 +118,7 @@ recommended method is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g. ```sh -$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])' +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' ``` opens a shell from which you can launch the interpreter @@ -131,7 +131,7 @@ The other method, which is not recommended, does not create an environment and requires you to list the packages directly, ```sh -$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz +$ nix-shell -p python38.pkgs.numpy python38.pkgs.toolz ``` Again, it is possible to launch the interpreter from the shell. The Python @@ -140,14 +140,14 @@ that specific interpreter. ##### Load environment from `.nix` expression As explained in the Nix manual, `nix-shell` can also load an -expression from a `.nix` file. Say we want to have Python 3.5, `numpy` +expression from a `.nix` file. Say we want to have Python 3.8, `numpy` and `toolz`, like before, in an environment. Consider a `shell.nix` file with ```nix with import {}; -(python35.withPackages (ps: [ps.numpy ps.toolz])).env +(python38.withPackages (ps: [ps.numpy ps.toolz])).env ``` Executing `nix-shell` gives you again a Nix shell from which you can run Python. @@ -158,7 +158,7 @@ What's happening here? imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.5 environment with the `withPackages` function. +2. Then we create a Python 3.8 environment with the `withPackages` function. 3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` @@ -170,7 +170,7 @@ To combine this with `mkShell` you can: with import {}; let - pythonEnv = python35.withPackages (ps: [ + pythonEnv = python38.withPackages (ps: [ ps.numpy ps.toolz ]); @@ -188,13 +188,13 @@ option, with which you can execute a command in the `nix-shell`. We can e.g. directly open a Python shell ```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" +$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3" ``` or run a script ```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" +$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3 myscript.py" ``` ##### `nix-shell` as shebang @@ -231,11 +231,11 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; doCheck = false; @@ -260,8 +260,8 @@ information. The output of the function is a derivation. An expression for `toolz` can be found in the Nixpkgs repository. As explained in the introduction of this Python section, a derivation of `toolz` is available -for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz` -derivation corresponding to the CPython 3.5 interpreter. +for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz` +derivation corresponding to the CPython 3.8 interpreter. The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, you will want to test a Nix expression outside of the Nixpkgs tree. @@ -273,13 +273,13 @@ and adds it along with a `numpy` package to a Python environment. with import {}; ( let - my_toolz = python35.pkgs.buildPythonPackage rec { + my_toolz = python38.pkgs.buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; - src = python35.pkgs.fetchPypi { + src = python38.pkgs.fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; doCheck = false; @@ -290,12 +290,12 @@ with import {}; }; }; - in python35.withPackages (ps: [ps.numpy my_toolz]) + in python38.withPackages (ps: [ps.numpy my_toolz]) ).env ``` Executing `nix-shell` will result in an environment in which you can use -Python 3.5 and the `toolz` package. As you can see we had to explicitly mention +Python 3.8 and the `toolz` package. As you can see we had to explicitly mention for which Python version we want to build a package. So, what did we do here? Well, we took the Nix expression that we used earlier @@ -435,7 +435,7 @@ If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` is a local source, and if the local source has a `setup.py`, then development mode is activated. -In the following example we create a simple environment that has a Python 3.5 +In the following example we create a simple environment that has a Python 3.8 version of our package in it, as well as its dependencies and other packages we like to have in the environment, all specified with `propagatedBuildInputs`. Indeed, we can just add any package we like to have in our environment to @@ -443,7 +443,7 @@ Indeed, we can just add any package we like to have in our environment to ```nix with import {}; -with python35Packages; +with python38Packages; buildPythonPackage rec { name = "mypackage"; @@ -505,9 +505,9 @@ with import {}; ( let toolz = callPackage /path/to/toolz/release.nix { - buildPythonPackage = python35Packages.buildPythonPackage; + buildPythonPackage = python38Packages.buildPythonPackage; }; - in python35.withPackages (ps: [ ps.numpy toolz ]) + in python38.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -515,8 +515,8 @@ Important to remember is that the Python version for which the package is made depends on the `python` derivation that is passed to `buildPythonPackage`. Nix tries to automatically pass arguments when possible, which is why generally you don't explicitly define which `python` derivation should be used. In the above -example we use `buildPythonPackage` that is part of the set `python35Packages`, -and in this case the `python35` interpreter is automatically used. +example we use `buildPythonPackage` that is part of the set `python38Packages`, +and in this case the `python38` interpreter is automatically used. ## Reference @@ -662,7 +662,7 @@ following are specific to `buildPythonPackage`: variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this - defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications + defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). @@ -960,7 +960,7 @@ has security implications and is relevant for those using Python in a When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` -and [PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). +and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. @@ -1014,7 +1014,7 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; - in pkgs.python35.override {inherit packageOverrides;}; + in pkgs.python38.override {inherit packageOverrides;}; in python.withPackages(ps: [ps.pandas])).env ``` @@ -1036,7 +1036,7 @@ with import {}; packageOverrides = self: super: { scipy = super.scipy_0_17; }; - in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) + in (pkgs.python38.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) ).env ``` From d0c3e7bedb390d79291f23685355bcaf1fcd152f Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 9 May 2020 18:22:20 +0300 Subject: [PATCH 40/58] maintainers/scripts/build.nix: script to build all maintainer packages --- maintainers/scripts/build.nix | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 maintainers/scripts/build.nix diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix new file mode 100644 index 000000000000..c70993cf138c --- /dev/null +++ b/maintainers/scripts/build.nix @@ -0,0 +1,43 @@ +{ maintainer }: + +# based on update.nix +# nix-build build.nix --argstr maintainer + +let + pkgs = import ./../../default.nix {}; + maintainer_ = pkgs.lib.maintainers.${maintainer}; + packagesWith = cond: return: set: + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval + ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [ (return name pkg) ] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + then packagesWith cond return pkg + else [ ] + ); + in + if result.success then result.value + else [ ] + ) + set + ) + ); +in +packagesWith + (name: pkg: + ( + if builtins.hasAttr "maintainers" pkg.meta + then ( + if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer_ pkg.meta.maintainers + else maintainer_ == pkg.meta.maintainers + ) + else false + ) + ) + (name: pkg: pkg) + pkgs From eb1214997912f8a3026abd6a0a1d0b78e44aa83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 30 Aug 2018 11:09:58 +0200 Subject: [PATCH 41/58] gnomeExtensions: add 'uuid' attr to all extensions Some already have it, this adds it to the rest. With all extensions having an 'uuid' attr we can do cool things like declaratively enable extensions on NixOS. --- pkgs/desktops/gnome-3/extensions/arc-menu/default.nix | 2 ++ pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 2 ++ pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 2 ++ pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 2 ++ pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix | 2 ++ .../gnome-3/extensions/pidgin-im-integration/default.nix | 2 ++ pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix | 2 ++ 7 files changed, 14 insertions(+) diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index db1741e72bb5..7bd31f587f67 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + uuid = "arc-menu@linxgem33.com"; + meta = with stdenv.lib; { description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 3784f1099001..5a546bd15794 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + uuid = "dash-to-dock@micxgx.gmail.com"; + meta = with stdenv.lib; { description = "A dock for the Gnome Shell"; homepage = "https://micheleg.github.io/dash-to-dock/"; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 84662505a374..e97b34460d07 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + uuid = "dash-to-panel@jderose9.github.com"; + meta = with stdenv.lib; { description = "An icon taskbar for Gnome Shell"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index baaca39a4c4f..db113924ae60 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -73,6 +73,8 @@ stdenv.mkDerivation rec { done ''; + uuid = "gsconnect@andyholmes.github.io"; + meta = with stdenv.lib; { description = "KDE Connect implementation for Gnome Shell"; homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index c876b22c12c1..25ef7ddf8279 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + uuid = "no-title-bar@franglais125.gmail.com"; + meta = with stdenv.lib; { description = "Integrates maximized windows with the top panel"; homepage = "https://github.com/franglais125/no-title-bar"; diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index dbc65044c1bc..e13941ee0455 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" ''; + uuid = "pidgin@muffinmad"; + meta = with stdenv.lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 6a1c87abf93d..860a77d2856b 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + uuid = "TopIcons@phocean.net"; + meta = with stdenv.lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; license = licenses.gpl2; From cc245fdcd5bc663609df74a0a5099b652be53176 Mon Sep 17 00:00:00 2001 From: Sam Stites Date: Tue, 17 Dec 2019 12:55:43 -0500 Subject: [PATCH 42/58] pytorch: 1.2.0 -> 1.4.1 Co-authored-by: Benjamin Hipple --- .../python-modules/pytorch/default.nix | 99 +++++++++++++------ 1 file changed, 67 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a0a4aadfe58b..0400a4773ebc 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder, +{ stdenv, fetchurl, fetchgit, fetchpatch, buildPythonPackage, python, pythonOlder, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, - mklSupport ? false, mkl ? null, + mklDnnSupport ? true, useSystemNccl ? true, openMPISupport ? false, openmpi ? null, - buildNamedTensor ? false, buildBinaries ? false, + buildDocs ? false, cudaArchList ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, + fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil, linkFarm, symlinkJoin, + # virtual pkg that consistently instantiates blas across nixpkgs + # See https://github.com/NixOS/nixpkgs/pull/83888 + blas, + # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, # dependencies for torch.utils.tensorboard - tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard, + pillow, six, future, tensorflow-tensorboard, protobuf, utillinux, which, isPy3k }: assert !openMPISupport || openmpi != null; -assert !tensorboardSupport || tensorflow-tensorboard != null; # assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || cudatoolkit != null; @@ -28,17 +31,11 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; let hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; matchesCudatoolkit = hasDependency cudatoolkit; - matchesMkl = hasDependency mkl; in # confirm that cudatoolkits are sync'd across dependencies assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; assert !cudaSupport || matchesCudatoolkit magma; -# confirm that mkl is sync'd across dependencies -assert !mklSupport || mkl != null; -assert !(mklSupport && cudaSupport) || matchesMkl magma; -assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl); - let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -108,7 +105,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.2.0"; + version = "1.4.1"; pname = "pytorch"; disabled = !isPy3k; @@ -122,11 +119,9 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz"; + sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms"; }; - dontUseCmakeConfigure = true; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -134,6 +129,36 @@ in buildPythonPackage rec { export CUDNN_INCLUDE_DIR=${cudnn}/include ''; + patches = [ + # Prevents a race condition which would be introduced by pull 30333. + # See https://github.com/pytorch/pytorch/issues/32277 + # Can be removed >1.5.0. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch"; + sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2"; + }) + + # Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang. + # See https://github.com/pytorch/pytorch/issues/32277 + # Can be removed >1.5.0. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch"; + sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q"; + }) + ]; + + # Use pytorch's custom configurations + dontUseCmakeConfigure = true; + + BUILD_NAMEDTENSOR = true; + BUILD_DOCS = buildDocs; + USE_MKLDNN = mklDnnSupport; + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ${python.interpreter} setup.py build --cmake-only + ${cmake}/bin/cmake build + ''; + preFixup = '' function join_by { local IFS="$1"; shift; echo "$*"; } function strip2 { @@ -149,14 +174,14 @@ in buildPythonPackage rec { done ''; + # Override the (weirdly) wrong version set by default. See # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038 # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267 PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature - USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL + USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) @@ -165,7 +190,7 @@ in buildPythonPackage rec { # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 - NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ]; + NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ cmake @@ -174,9 +199,8 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ - numpy.blas - ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] + buildInputs = [ blas ] + ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ @@ -184,23 +208,34 @@ in buildPythonPackage rec { click numpy pyyaml - ] ++ lib.optionals openMPISupport [ openmpi ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard]; + # the following are required for tensorboard support + pillow six future tensorflow-tensorboard protobuf + ] ++ lib.optionals openMPISupport [ openmpi ]; - checkInputs = [ hypothesis ninja ]; + checkInputs = [ hypothesis ninja psutil ]; doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing - checkPhase = "${cudaStubEnv}python test/run_test.py" - + " --exclude utils" # utils requires git, which is not allowed in the check phase + checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ + # MKL 2019.5-only workaround. See: https://github.com/NixOS/nixpkgs/issues/75611 + (optionalString (blas.implementation == "mkl" && majorMinor blas.version == "2019.5") "KMP_INIT_AT_FORK=FALSE ") + cudaStubEnv + "${python.interpreter} test/run_test.py" + "--exclude" + (concatStringsSep " " [ + "utils" # utils requires git, which is not allowed in the check phase - # Other tests which have been disabled in previous nix derivations of pytorch. - # --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions - ; + # "dataloader" # psutils correctly finds and triggers multiprocessing, but is too sandboxed to run -- resulting in numerous errors + # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build + + # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins + (optionalString (majorMinor version == "1.3" ) "tensorboard") + ]) + ]; postInstall = '' mkdir $dev cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include + cp -r $out/${python.sitePackages}/torch/share $dev/share ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' @@ -233,6 +268,6 @@ in buildPythonPackage rec { homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds + maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds }; } From fb5bb25c10bed6dd577c5b1118429bbda4aa8554 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 2 May 2020 20:40:27 -0400 Subject: [PATCH 43/58] python3Packages.pytorch: fixup builds with MKL - Pass `blas.provider` into `buildInputs`, so that CMake can find the actual `mkl` for inspection of its cmake files and headers. - Add `USE_MKL` correctly when the blas provider is `mkl`. - Use the MKLDNN and MKLDNN_CBLAS flags by default, since `mkldnn` is FOSS and always available.. - Remove a patch for MKL 2019, since we've moved to 2020. - Add a pythonImportsCheck for "torch" as a basic sanity-check - Removed some unused variables at the top of the file --- .../python-modules/pytorch/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 0400a4773ebc..749a2c080962 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, buildPythonPackage, python, pythonOlder, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, mklDnnSupport ? true, useSystemNccl ? true, openMPISupport ? false, openmpi ? null, - buildBinaries ? false, buildDocs ? false, cudaArchList ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil, + numpy, pyyaml, cffi, click, typing, cmake, dnnl, hypothesis, numactl, psutil, linkFarm, symlinkJoin, # virtual pkg that consistently instantiates blas across nixpkgs @@ -152,7 +151,15 @@ in buildPythonPackage rec { BUILD_NAMEDTENSOR = true; BUILD_DOCS = buildDocs; + + USE_MKL = blas.implementation == "mkl"; + + # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note + # that this was renamed to dnnl and then renamed again to oneDNN upstream, but + # pytorch still calls it by the old name mkldnn. USE_MKLDNN = mklDnnSupport; + USE_MKLDNN_CBLAS = mklDnnSupport; + preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ${python.interpreter} setup.py build --cmake-only @@ -174,7 +181,6 @@ in buildPythonPackage rec { done ''; - # Override the (weirdly) wrong version set by default. See # https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038 # https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267 @@ -199,7 +205,7 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ blas ] + buildInputs = [ blas blas.provider dnnl ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; @@ -214,10 +220,13 @@ in buildPythonPackage rec { checkInputs = [ hypothesis ninja psutil ]; - doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing + # Tests take a long time and may be flaky, so just sanity-check imports + doCheck = false; + pythonImportsCheck = [ + "torch" + ]; + checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ - # MKL 2019.5-only workaround. See: https://github.com/NixOS/nixpkgs/issues/75611 - (optionalString (blas.implementation == "mkl" && majorMinor blas.version == "2019.5") "KMP_INIT_AT_FORK=FALSE ") cudaStubEnv "${python.interpreter} test/run_test.py" "--exclude" From 47105a1689b06f89461e2d2379fd83e5e6849cb9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 May 2020 12:50:17 -0400 Subject: [PATCH 44/58] python3Packages.ignite: 0.2.1 -> 0.3.0 --- .../python-modules/ignite/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index cd682072707d..785ec5814918 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest +, matplotlib , mock , pytorch , pynvml @@ -11,24 +12,24 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm"; + sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x"; }; - checkInputs = [ pytest mock ]; - - checkPhase = '' - pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/ - ''; - # these packages are not currently in nixpkgs - + checkInputs = [ pytest matplotlib mock ]; propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. + checkPhase = '' + pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/ + ''; + meta = with lib; { description = "High-level training library for PyTorch"; homepage = "https://pytorch.org/ignite"; From 8325e0db1161507b2bffe629547dc3aac3526b5b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 9 May 2020 20:05:01 +0200 Subject: [PATCH 45/58] Revert "nixos/resolved: Include dbus alias of resolved unit" This reverts commit 7fe539f79900efb6b8b6265ade11fdab460ca1da. --- nixos/modules/system/boot/resolved.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 7ad643130a85..b7aaef575ac1 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -144,7 +144,6 @@ in systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" - "dbus-org.freedesktop.resolve1.service" ]; systemd.services.systemd-resolved = { From 2be47f021aa0625b674669df11b9990147e9014b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 9 May 2020 20:32:35 +0200 Subject: [PATCH 46/58] glusterfs: fix snapshots --- pkgs/tools/filesystems/glusterfs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index fa7574767d88..e64069af2aef 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -73,6 +73,12 @@ stdenv.mkDerivation postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ + --replace '/sbin/' '${lvm2}/bin/' + substituteInPlace libglusterfs/src/glusterfs/compat.h \ + --replace '/bin/umount' '${utillinux}/bin/umount' + substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ + --replace '/bin/mount' '${utillinux}/bin/mount' ''; # Note that the VERSION file is something that is present in release tarballs From faa621ce76b68a1496812ca0b1b6b6dd19982c52 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 9 May 2020 20:34:23 +0200 Subject: [PATCH 47/58] glusterfs: fix indentation --- pkgs/tools/filesystems/glusterfs/default.nix | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index e64069af2aef..f02fec85a5b1 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -81,17 +81,17 @@ stdenv.mkDerivation --replace '/bin/mount' '${utillinux}/bin/mount' ''; - # Note that the VERSION file is something that is present in release tarballs - # but not in git tags (at least not as of writing in v3.10.1). - # That's why we have to create it. - # Without this, gluster (at least 3.10.1) will fail very late and cryptically, - # for example when setting up geo-replication, with a message like - # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. - # What happens here is that the gverify.sh script tries to compare the versions, - # but fails when the version is empty. - # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 - preConfigure = '' - echo "v${s.version}" > VERSION + # Note that the VERSION file is something that is present in release tarballs + # but not in git tags (at least not as of writing in v3.10.1). + # That's why we have to create it. + # Without this, gluster (at least 3.10.1) will fail very late and cryptically, + # for example when setting up geo-replication, with a message like + # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. + # What happens here is that the gverify.sh script tries to compare the versions, + # but fails when the version is empty. + # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 + preConfigure = '' + echo "v${s.version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python ''; From ecef2975e3420b560b017c8b856313df6556e556 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 May 2020 14:45:49 -0400 Subject: [PATCH 48/58] python3Packages.pytorch: reference dnnl by new name oneDNN --- pkgs/development/python-modules/pytorch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 749a2c080962..2318738411f4 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -4,7 +4,7 @@ openMPISupport ? false, openmpi ? null, buildDocs ? false, cudaArchList ? null, - numpy, pyyaml, cffi, click, typing, cmake, dnnl, hypothesis, numactl, psutil, + numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, linkFarm, symlinkJoin, # virtual pkg that consistently instantiates blas across nixpkgs @@ -205,7 +205,7 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ blas blas.provider dnnl ] + buildInputs = [ blas blas.provider oneDNN ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; From 24fcef1b9eca0861d4575f649306429ae3279412 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 May 2020 17:20:06 +0000 Subject: [PATCH 49/58] cgit: 1.2.1 -> 1.2.3 cgit now supports lzip and zstd compression. --- .../git-and-tools/cgit/default.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 121a6cf64ea1..8debc642b457 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,35 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , coreutils, gnused, groff, docutils -, gzip, bzip2, xz +, gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown }: stdenv.mkDerivation rec { pname = "cgit"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz"; - sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; + sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz"; - sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; + url = "mirror://kernel/software/scm/git/git-2.25.1.tar.xz"; + sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - patches = [ - (fetchpatch { - name = "prevent-dos-limit-path-length.patch"; - url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a"; - sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j"; - }) - ]; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit @@ -39,7 +31,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"lzip"|"${lzip}/bin/lzip"|' \ -e 's|"xz"|"${xz.bin}/bin/xz"|' \ + -e 's|"zstd"|"${zstd}/bin/zstd"|' \ -i ui-snapshot.c substituteInPlace filters/html-converters/man2html \ From 8772cee9f9cfdd3be6bd483c7ed7e1720dfea04a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 May 2020 16:20:00 -0500 Subject: [PATCH 50/58] ripgrep: 12.0.1 -> 12.1.0 Changelog: https://github.com/BurntSushi/ripgrep/releases/tag/12.1.0 --- pkgs/tools/text/ripgrep/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 9eba451c54a3..ab589eb87fc1 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,9 +1,7 @@ { stdenv , fetchFromGitHub , rustPlatform -, asciidoc -, docbook_xsl -, libxslt +, asciidoctor , installShellFiles , Security , withPCRE2 ? true @@ -12,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.0.1"; + version = "12.1.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0"; + sha256 = "1vgkk78c25ia9y4q5psrh7xrlbfdn7dz7bc20kci40n8zr0vjwww"; }; - cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y"; + cargoSha256 = "143lnf4yah9ik7v8rphv7gbvr2ckhjpmy8zfgqml1n3fqxiqvxnb"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ]; buildInputs = (stdenv.lib.optional withPCRE2 pcre2) ++ (stdenv.lib.optional stdenv.isDarwin Security); From c3e2f987796e805ade33f53fc24dc0dab2e66dc9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 May 2020 18:02:20 -0400 Subject: [PATCH 51/58] doc: use idiomatic overlay names in the python manual example An overlay by any other name would function just as well, but we generally use `self: super:` for the regular overlays, and `python-self: python-super`. --- doc/languages-frameworks/python.section.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 734e51b38656..00d5d0ff04cf 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1049,12 +1049,12 @@ If you want the whole of Nixpkgs to use your modifications, then you can use ```nix let pkgs = import {}; - newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { - python27 = let - packageOverrides = self: super: { - numpy = super.numpy_1_10; + newpkgs = import pkgs.path { overlays = [ (self: super: { + python38 = let + packageOverrides = python-self: python-super: { + numpy = python-super.numpy_1_18.3; }; - in pkgssuper.python27.override {inherit packageOverrides;}; + in super.python38.override {inherit packageOverrides;}; } ) ]; }; in newpkgs.inkscape ``` From fd0a0394107d39ab593c870e9d2096edbda61861 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 May 2020 01:02:37 +0200 Subject: [PATCH 52/58] wdisplays: 2020-03-15 -> 1.0 https://github.com/cyclopsian/wdisplays/releases/tag/1.0 --- pkgs/tools/graphics/wdisplays/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 60e6b56b2e4b..0993a39983ed 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: -stdenv.mkDerivation { - pname = "wdisplays-unstable"; - version = "2020-03-15"; + +stdenv.mkDerivation rec { + pname = "wdisplays"; + version = "1.0"; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -10,8 +11,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cyclopsian"; repo = "wdisplays"; - rev = "0faafdc04d7dd47d3a4e385f348cb9d267f2e60d"; - sha256 = "1y3bzh4mi6d67n6v0i8j5snpaikpbyr89acayr4m6bx85qnrq4g2"; + rev = version; + sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; }; meta = let inherit (stdenv) lib; in { From 9a8e600be46dafa803fda6adf4bcb6547fda54b1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 May 2020 01:03:16 +0200 Subject: [PATCH 53/58] wireguard-go: 0.0.20200121 -> 0.0.20200320 https://git.zx2c4.com/wireguard-go/tag/?h=v0.0.20200320 --- pkgs/tools/networking/wireguard-go/default.nix | 4 ++-- pkgs/tools/networking/wireguard-go/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 1fa8bac33e29..41946b88471d 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20200121"; + version = "0.0.20200320"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9"; + sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"; }; patches = [ ./0001-Fix-darwin-build.patch ]; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index b1a92582b7c7..859b8572f82e 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c178f38b412c"; - sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7"; + rev = "5c8b2ff67527"; + sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v"; }; } { From f887d09c89d1b7873c083b5c3b94b634b2560297 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 May 2020 01:04:05 +0200 Subject: [PATCH 54/58] linuxPackages.wireguard: 1.0.20200429 -> 1.0.20200506 https://lists.zx2c4.com/pipermail/wireguard/2020-May/005408.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 63487733605a..c68dfd5fc5e0 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200429"; + version = "1.0.20200506"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd"; + sha256 = "05dphmcxm3lg860r5bj1b995avh43d1pap8p18p4ig4kv2r2g9nq"; }; hardeningDisable = [ "pic" ]; From 54677515aa5ba70233136ad7499db3f471bafcb4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 May 2020 02:50:41 +0200 Subject: [PATCH 55/58] gitea: 1.11.4 -> 1.11.5 https://github.com/go-gitea/gitea/releases/tag/v1.11.5 Also applying the patch which fixes the wiki-pages, closes #87115. --- .../version-management/gitea/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index b18ac2510161..34a3d804707e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,6 @@ { stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam +, fetchpatch , sqliteSupport ? true , pamSupport ? true }: @@ -8,11 +9,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.11.4"; + version = "1.11.5"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "18k6kcdq0ijpzgay2aq1w95qkgfvrn1dgh4cxyj9c4i0pwb3ar7f"; + sha256 = "0iqxwg53wjwi4vpq2h6fwmniazsi4cf68fcjrs459qbz4d6x8xa9"; }; unpackPhase = '' @@ -22,7 +23,13 @@ buildGoPackage rec { sourceRoot = "source"; - patches = [ ./static-root-path.patch ]; + patches = [ + ./static-root-path.patch + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; + sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; + }) + ]; postPatch = '' patchShebangs . From 4d2bcaed5ceabb09a82dc18edae127d3c8bd1d18 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 10 May 2020 11:24:03 +1000 Subject: [PATCH 56/58] containerd: use installShellFiles --- .../virtualization/containerd/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 86f4a7f099f5..4210994f4352 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }: +{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }: with lib; @@ -18,7 +18,7 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man utillinux ]; + nativeBuildInputs = [ go-md2man installShellFiles utillinux ]; buildInputs = [ btrfs-progs ]; @@ -39,14 +39,7 @@ buildGoPackage rec { done make man - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manFile in man/*; do - manName="$(basename "$manFile")" # "docker-build.1" - number="$(echo $manName | rev | cut -d'.' -f1 | rev)" - mkdir -p "$manRoot/man$number" - gzip -c "$manFile" > "$manRoot/man$number/$manName.gz" - done + installManPage man/*.[1-9] ''; meta = { From 764dd5c875fa225b554e613aaca7fb93c1920a0d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 10 May 2020 11:24:03 +1000 Subject: [PATCH 57/58] docker: use installShellFiles --- .../virtualization/docker/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f1b3475d9bca..f7c49526fb1f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -78,7 +78,7 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ installShellFiles pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ @@ -147,9 +147,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # completion (cli) - install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + installShellCompletion --bash ./components/cli/contrib/completion/bash/docker + installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish + installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) # Generate man pages from cobra commands @@ -163,16 +163,7 @@ rec { echo "Generate legacy manpages" ./man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in ./man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" - done - done + installManPage man/*/*.[1-9] ''; preFixup = '' From 3a79753662d89b206054c47b0430d8d589e96d2f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 10 May 2020 11:24:04 +1000 Subject: [PATCH 58/58] runc: update installManPages --- pkgs/applications/virtualization/runc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index b29b1f97d21b..95db2a1d9e9a 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -39,7 +39,7 @@ buildGoPackage rec { installPhase = '' install -Dm755 runc $out/bin/runc - installManPage man/*/* + installManPage man/*/*.[1-9] ''; meta = with lib; {