From 3939b8132f5fb954a34934dc3b950bc8a9025335 Mon Sep 17 00:00:00 2001 From: Artur Taranchiev Date: Thu, 7 Jan 2021 23:03:28 +0300 Subject: [PATCH 01/30] enpass: fix for KDE --- pkgs/tools/security/enpass/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index be2e5b06246..da4da9b6531 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -79,7 +79,9 @@ let # lsof must be in PATH for proper operation wrapProgram $out/bin/Enpass \ --set LD_LIBRARY_PATH "${libPath}" \ - --prefix PATH : ${lsof}/bin + --prefix PATH : ${lsof}/bin \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH ''; }; updater = { From 1924bb8b148458d7252bd72d46bf3c1839c35079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 24 Jan 2021 05:14:01 +0100 Subject: [PATCH 02/30] python3.pkgs.pynndescent: init at 0.5.1 --- .../python-modules/pynndescent/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/pynndescent/default.nix diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix new file mode 100644 index 00000000000..fd0aa18de14 --- /dev/null +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, nose +, scikitlearn +, scipy +, numba +, llvmlite +, joblib +}: + +buildPythonPackage rec { + pname = "pynndescent"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe"; + }; + + patches = [ + # fixes tests, included in next version + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch"; + sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s="; + }) + ]; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + scikitlearn + scipy + numba + llvmlite + joblib + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Nearest Neighbor Descent"; + homepage = "https://github.com/lmcinnes/pynndescent"; + license = licenses.bsd2; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 070e855b0c4..20ce58f5bc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4849,6 +4849,8 @@ in { pkuseg = callPackage ../development/python-modules/pkuseg { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; + pysbd = callPackage ../development/python-modules/pysbd { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; From a1e458ccdbb22cdd1333de0d1a9c5e84df3659c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 24 Jan 2021 05:14:28 +0100 Subject: [PATCH 03/30] python3.pkgs.umap-learn: 0.4.5 -> 0.5.0 --- .../python-modules/umap-learn/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index f471fbef4c8..b9abe2bb768 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -6,22 +6,25 @@ , scikitlearn , scipy , numba +, pynndescent +, tensorflow , pytestCheckHook }: buildPythonPackage rec { pname = "umap-learn"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "080by8h4rxr5ijx8vp8kn952chiqz029j26c04k4js4g9s7201bq"; + sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM="; }; checkInputs = [ nose + tensorflow pytestCheckHook ]; @@ -30,8 +33,13 @@ buildPythonPackage rec { scikitlearn scipy numba + pynndescent ]; + preCheck = '' + export HOME=$TMPDIR + ''; + disabledTests = [ # Plot functionality requires additional packages. # These test also fail with 'RuntimeError: cannot cache function' error. From be4763a696daf2fcb75b91aa4b8533257e466579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 23 Oct 2020 12:50:29 +0200 Subject: [PATCH 04/30] openjdk15-bootstrap: fix i686 build --- pkgs/development/compilers/openjdk/12.nix | 7 ++++++- pkgs/development/compilers/openjdk/13.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 0b3a4db6c48..f1c6d8493eb 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk11 +, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -44,6 +44,11 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + # Fix gnumake 4.3 incompatibility + (fetchpatch { + url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; + sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 7c6fe633c49..05e367e6314 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap +, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -44,6 +44,11 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + # Fix gnumake 4.3 incompatibility + (fetchpatch { + url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; + sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71ec34213a3..1b9ce5bbdde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10140,6 +10140,7 @@ in headless = true; inherit (gnome2) GConf gnome_vfs; openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; From b454af298d0511f43564c5ba2c2b9576bffc025a Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 7 Aug 2018 18:34:38 +0200 Subject: [PATCH 05/30] Revert "Remove types.functionTo." This reverts commit 4ff1ab5a56f1280d2de319ad4eb4b2796e07ed35. We need this to type options like: services.xserver.windowManager.xmonad.extraPackages that specify functions that take an attribute set containing packages / plugins and return a list containing a selection of the values in this set. The reason we need a dedicated type for this is to have the correct merge behaviour. Without the functionTo type merging multiple function option definitions results in an evaluation error. The functionTo type merges definitions by returning a new function that applies the functions of all the definitions to the given input and merges the result. (cherry picked from commit 7ed41ff5e7e633dd64866398ee497ac02736a3a5) --- lib/types.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index ee891f8231b..0810a43ed0e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -453,6 +453,16 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + functionTo = elemType: mkOptionType { + name = "function that evaluates to a(n) ${elemType.name}"; + check = isFunction; + merge = loc: defs: + fnArgs: elemType.merge loc (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs); + getSubOptions = elemType.getSubOptions; + getSubModules = elemType.getSubModules; + substSubModules = m: functionTo (elemType.substSubModules m); + }; + # A submodule (like typed attribute set). See NixOS manual. submodule = modules: submoduleWith { shorthandOnlyDefinesConfig = true; From 43243539b33d8fb0b2d14a3f9b79d6b641b74e2c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 7 Aug 2018 18:44:58 +0200 Subject: [PATCH 06/30] lib/tests/modules: add a test for the functionTo type (cherry picked from commit 478af112e83df806bd8a51174834d2a130fbdeb9) --- lib/tests/modules.sh | 3 +++ lib/tests/modules/functionTo.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 lib/tests/modules/functionTo.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 309c5311361..2d3a696e980 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -262,6 +262,9 @@ checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix +# Check the merge behaviour of the functionTo type. +checkConfigOutput "a b" config.result ./functionTo.nix + cat < Date: Tue, 7 Aug 2018 18:53:56 +0200 Subject: [PATCH 07/30] nixos: use functionTo to prevent evaluation errors while merging Without this patch merging options like services.xserver.windowManager.xmonad.extraPackages results in the evaluation error: error: value is a list while a set was expected, at nixpkgs/lib/options.nix:77:23 With this patch we get the desired merging behaviour that just concatenates the resulting package lists. (cherry picked from commit 6e99f9fdecb1f28308c8e0aed0fc851737354864) Co-Authored-By: Silvan Mosberger --- nixos/modules/services/development/hoogle.nix | 1 + nixos/modules/services/misc/gitit.nix | 1 + nixos/modules/services/misc/ihaskell.nix | 1 + nixos/modules/services/misc/octoprint.nix | 1 + nixos/modules/services/monitoring/netdata.nix | 1 + nixos/modules/services/networking/supybot.nix | 1 + nixos/modules/services/x11/window-managers/exwm.nix | 1 + nixos/modules/services/x11/window-managers/xmonad.nix | 1 + 8 files changed, 8 insertions(+) diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index a661e3acae3..6d6c88b9b2a 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -25,6 +25,7 @@ in { }; packages = mkOption { + type = types.functionTo (types.listOf types.package); default = hp: []; defaultText = "hp: []"; example = "hp: with hp; [ text lens ]"; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 1ec030549f9..f09565283f3 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -42,6 +42,7 @@ let }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 684a242d738..c7332b87803 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -21,6 +21,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' haskellPackages: [ diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index a69e6507305..5a64946f9f6 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -66,6 +66,7 @@ in }; plugins = mkOption { + type = types.functionTo (types.listOf types.package); default = plugins: []; defaultText = "plugins: []"; example = literalExample "plugins: with plugins; [ themeify stlviewer ]"; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index db51fdbd2c6..d5b679097b3 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -77,6 +77,7 @@ in { ''; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = ps: []; defaultText = "ps: []"; example = literalExample '' diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 864c3319c54..332c3ced06f 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -64,6 +64,7 @@ in }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = p: []; description = '' Extra Python packages available to supybot plugins. The diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 3e97d28d83b..0743f35c1d3 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -37,6 +37,7 @@ in description = "Enable an uncustomised exwm configuration."; }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; example = literalExample '' epkgs: [ diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 2bb4827be9d..fe8ed381251 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -53,6 +53,7 @@ in { }; extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); default = self: []; defaultText = "self: []"; example = literalExample '' From 3012c1c8844294c61f3cb68729d6f8c3a5849af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 24 Jan 2021 21:20:00 +0000 Subject: [PATCH 08/30] Update pkgs/development/python-modules/pynndescent/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/pynndescent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index fd0aa18de14..aab8f4e743a 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; patches = [ - # fixes tests, included in next version + # fixes tests, included in 0.5.2 (fetchpatch { url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch"; sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s="; From 500908d7f0c3a03dde2544973fe1d482d5329ca2 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 24 Jan 2021 12:44:42 +0100 Subject: [PATCH 09/30] zen-kernels: 5.10.9 -> 5.10.10 lqx2's parent is the same commit as zen1's --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 6 +++--- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 35df8e99ddc..31e8f762e1c 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.10.9"; - suffix = "lqx1"; + version = "5.10.10"; + suffix = "lqx2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1j0rz4j1br7kzg9zb5l2xz60ccr4iwjndxq3f4gml8s3fb4cpp6f"; + sha256 = "1cjgx9qjfkiaalqkcdmibsrq2frwd621rwcg6w05ms4w9lnwi3af"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index aa73e7b8a3e..1f39d3511c5 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.9"; + version = "5.10.10"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0p7w2ib8aac0cx16fksr8870kmijw86hbzdkjsq1ww07ifnb4qir"; + sha256 = "0jsi2q8k1w5zs5l6z1brm2mxpl9arv6n6linc8yj6xc75nydw6w4"; }; extraMeta = { From 65525be83b51880d486f18d4a7139fd0752357ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Tue, 26 Jan 2021 20:26:28 +0100 Subject: [PATCH 10/30] openjfx15: enable i686-linux build --- pkgs/development/compilers/openjdk/openjfx/15.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 21801b8ba3a..f9059ae2fc4 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -65,9 +65,7 @@ let # Downloaded AWT jars differ by platform. outputHash = { x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - # The build-time dependencies don't currently build for i686, so no - # reason to fetch this one correctly either... - i686-linux = "0000000000000000000000000000000000000000000000000000"; + i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx"; }.${stdenv.system} or (throw "Unsupported platform"); }; From 308ee1ca1158f60816df4db3f24c4a5c3b809ead Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 26 Jan 2021 21:57:03 +0100 Subject: [PATCH 11/30] libxc: 4.3.4 -> 5.1.0 --- pkgs/development/libraries/libxc/default.nix | 25 +++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index d26518c7de9..0a93babb459 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "4.3.4"; + version = "5.1.0"; in stdenv.mkDerivation { pname = "libxc"; inherit version; - src = fetchurl { - url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; + + src = fetchFromGitLab { + owner = "libxc"; + repo = "libxc"; + rev = version; + sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7"; }; buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl cmake ]; preConfigure = '' patchShebangs ./ ''; - configureFlags = [ "--enable-shared" ]; + cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd) + ''; doCheck = true; enableParallelBuilding = true; meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = "https://octopus-code.org/wiki/Libxc"; - license = licenses.lgpl3; + homepage = "https://www.tddft.org/programs/Libxc/"; + license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; }; From 88afccf4ff2d81d3e1bb7c426a49e5d6d375d26b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 26 Jan 2021 22:00:29 +0100 Subject: [PATCH 12/30] varnish60: 6.0.5 -> 6.0.7 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index db426f399f8..eee2eb825e8 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -41,8 +41,8 @@ let in { varnish60 = common { - version = "6.0.5"; - sha256 = "11aw202s7zdp5qp66hii5nhgm2jk0d86pila7gqrnjgc7x8fs8a0"; + version = "6.0.7"; + sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; varnish62 = common { version = "6.2.2"; From bfc2799d5138dd69f05e3f9c6275e785874a268d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 26 Jan 2021 22:02:57 +0100 Subject: [PATCH 13/30] varnish62: 6.2.2 -> 6.2.3 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index eee2eb825e8..d7ac051c4e9 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -45,8 +45,8 @@ in sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a"; }; varnish62 = common { - version = "6.2.2"; - sha256 = "10s3qdvb95pkwp3wxndrigb892h0109yqr8dw4smrhfi0knhnfk5"; + version = "6.2.3"; + sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; }; varnish63 = common { version = "6.3.1"; From 9a6fb4d89587ad9ecba9c0bd3b0107a5c23bc823 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 26 Jan 2021 22:05:16 +0100 Subject: [PATCH 14/30] varnish63: 6.3.1 -> 6.3.2 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index d7ac051c4e9..1fbb36257d2 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -49,7 +49,7 @@ in sha256 = "02b6pqh5j1d4n362n42q42bfjzjrngd6x49b13q7wzsy6igd1jsy"; }; varnish63 = common { - version = "6.3.1"; - sha256 = "0xa14pd68zpi5hxcax3arl14rcmh5d1cdwa8gv4l5f23mmynr8ni"; + version = "6.3.2"; + sha256 = "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8"; }; } From e9101d4a3bc90dfaaa076d8ec00e5ed68e518f60 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 26 Jan 2021 02:02:12 +0100 Subject: [PATCH 15/30] lib/types: Improved functionTo merging Now type checks the resulting function values and allows mkMerge and co. Also indicates that the type check is done in the function body Co-Authored-By: Robert Hensing --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 0810a43ed0e..77245158d9f 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -457,7 +457,7 @@ rec { name = "function that evaluates to a(n) ${elemType.name}"; check = isFunction; merge = loc: defs: - fnArgs: elemType.merge loc (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs); + fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: functionTo (elemType.substSubModules m); From c2f3556dc75ee09890c2cfc867cdb10df23accf6 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 26 Jan 2021 22:30:07 +0100 Subject: [PATCH 16/30] lib/tests: More functionTo tests --- lib/tests/modules.sh | 8 +++-- lib/tests/modules/functionTo.nix | 29 ------------------- lib/tests/modules/functionTo/list-order.nix | 25 ++++++++++++++++ .../modules/functionTo/merging-attrs.nix | 27 +++++++++++++++++ lib/tests/modules/functionTo/merging-list.nix | 24 +++++++++++++++ lib/tests/modules/functionTo/trivial.nix | 17 +++++++++++ lib/tests/modules/functionTo/wrong-type.nix | 18 ++++++++++++ 7 files changed, 117 insertions(+), 31 deletions(-) delete mode 100644 lib/tests/modules/functionTo.nix create mode 100644 lib/tests/modules/functionTo/list-order.nix create mode 100644 lib/tests/modules/functionTo/merging-attrs.nix create mode 100644 lib/tests/modules/functionTo/merging-list.nix create mode 100644 lib/tests/modules/functionTo/trivial.nix create mode 100644 lib/tests/modules/functionTo/wrong-type.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2d3a696e980..f843d303e44 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -262,8 +262,12 @@ checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix -# Check the merge behaviour of the functionTo type. -checkConfigOutput "a b" config.result ./functionTo.nix +## types.functionTo +checkConfigOutput "input is input" config.result ./functionTo/trivial.nix +checkConfigOutput "a b" config.result ./functionTo/merging-list.nix +checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix +checkConfigOutput "b a" config.result ./functionTo/list-order.nix +checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix cat < Date: Tue, 26 Jan 2021 20:48:56 -0600 Subject: [PATCH 17/30] factorio-experimental, factorio-demo-experimental, factorio-headless-experimental: 1.1.16 -> 1.1.19 --- pkgs/games/factorio/versions.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 24bd47cc423..bf55185f349 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.16.tar.xz", + "name": "factorio_alpha_x64-1.1.19.tar.xz", "needsAuth": true, - "sha256": "000n19mm7xc1qvc93kakvayjd0j749hv5nrdmsp7vdixcd773vjn", + "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.16/alpha/linux64", - "version": "1.1.16" + "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", + "version": "1.1.19" }, "stable": { "name": "factorio_alpha_x64-1.0.0.tar.xz", @@ -20,12 +20,12 @@ }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.16.tar.xz", + "name": "factorio_demo_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "11nkpx8f3a30i06q7iqds12fiy1q67h64vh72y8x5l4mjg16j1js", + "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.16/demo/linux64", - "version": "1.1.16" + "url": "https://factorio.com/get-download/1.1.19/demo/linux64", + "version": "1.1.19" }, "stable": { "name": "factorio_demo_x64-1.0.0.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.16.tar.xz", + "name": "factorio_headless_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "02w92sgw4i3k1zywdg30mkr7nfylynsdn7sz5jzslyp0mkglrixi", + "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.16/headless/linux64", - "version": "1.1.16" + "url": "https://factorio.com/get-download/1.1.19/headless/linux64", + "version": "1.1.19" }, "stable": { "name": "factorio_headless_x64-1.0.0.tar.xz", From a5fa85129b9b509f9e8ddfb624fff26c8020ca43 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Tue, 26 Jan 2021 20:49:28 -0600 Subject: [PATCH 18/30] factorio, factorio-demo, factorio-headless: 1.0.0 -> 1.1.19 --- pkgs/games/factorio/versions.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index bf55185f349..4208df3acd0 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.19" }, "stable": { - "name": "factorio_alpha_x64-1.0.0.tar.xz", + "name": "factorio_alpha_x64-1.1.19.tar.xz", "needsAuth": true, - "sha256": "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464", + "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/alpha/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", + "version": "1.1.19" } }, "demo": { @@ -28,12 +28,12 @@ "version": "1.1.19" }, "stable": { - "name": "factorio_demo_x64-1.0.0.tar.xz", + "name": "factorio_demo_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/demo/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/demo/linux64", + "version": "1.1.19" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.19" }, "stable": { - "name": "factorio_headless_x64-1.0.0.tar.xz", + "name": "factorio_headless_x64-1.1.19.tar.xz", "needsAuth": false, - "sha256": "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1", + "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.0.0/headless/linux64", - "version": "1.0.0" + "url": "https://factorio.com/get-download/1.1.19/headless/linux64", + "version": "1.1.19" } } } From 3bbad8b041ce225eeb84b335c1cd1305b8c6f693 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 12:44:43 +0700 Subject: [PATCH 19/30] treewide: remove inherited stdenv.lib --- pkgs/applications/editors/vim/macvim-configurable.nix | 3 +-- pkgs/applications/gis/grass/default.nix | 4 +--- pkgs/applications/misc/electrum/default.nix | 2 +- pkgs/applications/networking/irc/quassel/default.nix | 1 - .../networking/remote/citrix-workspace/generic.nix | 4 +--- pkgs/applications/science/logic/coq/default.nix | 3 ++- pkgs/applications/video/epgstation/default.nix | 2 +- pkgs/development/compilers/gcc/10/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- pkgs/development/compilers/gcc/8/default.nix | 2 +- pkgs/development/compilers/gcc/9/default.nix | 2 +- pkgs/development/compilers/gcc/common/configure-flags.nix | 3 +-- .../development/compilers/gcc/common/extra-target-flags.nix | 4 ++-- pkgs/development/libraries/gpgme/default.nix | 3 +-- pkgs/development/libraries/libsnark/default.nix | 3 +-- pkgs/development/libraries/qt-5/5.12/default.nix | 2 +- pkgs/development/libraries/qt-5/5.14/default.nix | 6 +++--- pkgs/development/libraries/qt-5/5.15/default.nix | 6 +++--- pkgs/development/tools/profiling/systemtap/default.nix | 3 +-- pkgs/development/web/nodejs/nodejs.nix | 2 +- pkgs/games/ue4/default.nix | 3 +-- pkgs/servers/monitoring/prometheus/smokeping-prober.nix | 1 - pkgs/servers/x11/xorg/overrides.nix | 4 ++-- pkgs/tools/graphics/wdisplays/default.nix | 4 ++-- pkgs/tools/misc/byobu/default.nix | 1 - pkgs/tools/misc/staruml/default.nix | 1 - pkgs/tools/misc/yubikey-manager-qt/default.nix | 5 ++--- pkgs/tools/networking/s6-networking/default.nix | 3 +-- pkgs/tools/security/tor/default.nix | 2 +- 32 files changed, 37 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 087a375c50c..6ea6b6c6094 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: +{ lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let macvim = callPackage ./macvim.nix { inherit stdenv; }; @@ -12,7 +12,6 @@ let # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let - inherit (stdenv) lib; doConfig = config: let vimrcConfig = config // { # always source the bundled system vimrc diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 65f42d7c53f..ef7458d7394 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw +{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: -let inherit (stdenv) lib; in - stdenv.mkDerivation rec { name = "grass"; version = "7.6.1"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 5a3e6265c25..273077b3bda 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -125,7 +125,7 @@ python3.pkgs.buildPythonApplication { ''; passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit writeScript common-updater-scripts diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 842e160677e..b72e28929e3 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -20,7 +20,6 @@ }: let - inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index c0dc438daac..0437a108d89 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more +{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more , file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 @@ -11,8 +11,6 @@ }: let - inherit (stdenv) lib; - openssl' = symlinkJoin { name = "openssl-backwards-compat"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a2ff8382947..66abfaebeef 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -13,7 +13,8 @@ , csdp ? null , version, coq-version ? null, }@args: -let lib = import ../../../../build-support/coq/extra-lib.nix {inherit (stdenv) lib;}; in +let lib' = lib; in +let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in with builtins; with lib; let release = { diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 53a3535fde4..f1f89b10907 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -91,7 +91,7 @@ let # NOTE: this may take a while since it has to update all packages in # nixpkgs.nodePackages passthru.updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit (src.meta) homepage; inherit pname diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index cbc4e0e09e9..ad945f21346 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -245,7 +245,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 69fdeefe87a..6a2121a8298 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -271,7 +271,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 4c0a144f14d..709288559d1 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -284,7 +284,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 7d4cc2a3ea1..4cd9d24aa58 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -303,7 +303,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 051307e4842..aac43a3564a 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -255,7 +255,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 6a072267019..9fced5d94ae 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -240,7 +240,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; + inherit lib stdenv crossStageStatic libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index ea5172184cc..5e8e8fd6c6b 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -259,7 +259,7 @@ stdenv.mkDerivation ({ inherit (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic langD libcCross threadsCross; + inherit lib stdenv crossStageStatic langD libcCross threadsCross; }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 3f1866713e6..4bdec26fd99 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -39,8 +39,7 @@ assert langJava -> lib.versionOlder version "7"; let inherit (stdenv) - buildPlatform hostPlatform targetPlatform - lib; + buildPlatform hostPlatform targetPlatform; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index 6ced56cedc0..ad4ab6bcb4b 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -1,7 +1,7 @@ -{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: +{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }: let - inherit (stdenv) lib hostPlatform targetPlatform; + inherit (stdenv) hostPlatform targetPlatform; in { diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 5b24955af43..51b259a3ca8 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan , file, which, ncurses , texinfo @@ -8,7 +8,6 @@ }: let - inherit (stdenv) lib; inherit (stdenv.hostPlatform) system; in diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 3864a99f5e9..c3e6d0e049e 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; - inherit (stdenv) lib; in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; version = lib.substring 0 8 rev; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index cf5a0de11ad..320d30214d4 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -124,7 +124,7 @@ let # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 7139a3b7354..14b99fab4e2 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -123,12 +123,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -140,7 +140,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index a3a0496f160..6b7f21c86e9 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -103,12 +103,12 @@ let import ../qtModule.nix { inherit perl; - inherit (stdenv) lib; + inherit lib; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + { inherit lib; inherit debug; wrapQtAppsHook = null; } stdenvActual.mkDerivation; } { inherit self srcs patches; }; @@ -120,7 +120,7 @@ let mkDerivationWith = import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; mkDerivation = mkDerivationWith stdenvActual.mkDerivation; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index c978d8bd96a..c5d65a8239e 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, pkg-config, gettext, runCommand, makeWrapper +{ lib, fetchgit, pkg-config, gettext, runCommand, makeWrapper , elfutils, kernel, gnumake, python2, python2Packages }: @@ -10,7 +10,6 @@ let version = "4.1"; inherit (kernel) stdenv; - inherit (stdenv) lib; ## stap binaries stapBuild = stdenv.mkDerivation { diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 1af4024400a..68232088fa9 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -132,7 +132,7 @@ in passthru.updateScript = import ./update.nix { inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; - inherit (stdenv) lib; + inherit lib; inherit majorVersion; }; diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 73b1cb38ca3..95f0d64f197 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -1,8 +1,7 @@ -{ stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, +{ lib, stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, xorg, xdg-user-dirs }: let - inherit (stdenv) lib; deps = import ./cdn-deps.nix { inherit fetchurl; }; linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash: let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash)); diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index f440be3f57a..b1c3bc6999f 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,7 +1,6 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: let - inherit (stdenv) lib; baseVersion = "0.3.1"; commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; in diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ddd05150806..54082ce8126 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,5 +1,5 @@ { abiCompat ? null, - stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, + lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, gettext, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, @@ -9,7 +9,7 @@ }: let - inherit (stdenv) lib isDarwin; + inherit (stdenv) isDarwin; inherit (lib) overrideDerivation; malloc0ReturnsNullCrossFlag = lib.optional diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index cbcacfab3a8..2640769d186 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook , fetchpatch }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - meta = let inherit (stdenv) lib; in { + meta = with lib; { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/cyclopsian/wdisplays"; maintainers = with lib.maintainers; [ lheckemann ma27 ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 2008cf7b207..c647d3b3902 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -3,7 +3,6 @@ , gettext, vim, bc, screen }: let - inherit (stdenv) lib; pythonEnv = python3.withPackages (ps: with ps; [ snack ]); in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index b6a78f85a35..db3a065fdf4 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -4,7 +4,6 @@ , libXdamage, expat }: let - inherit (stdenv) lib; LD_LIBRARY_PATH = lib.makeLibraryPath [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; in diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index fd6610a1973..0f81f132abd 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , wrapQtAppsHook , pcsclite @@ -16,8 +17,6 @@ , yubikey-personalization }: -let inherit (stdenv) lib; in - stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; version = "1.1.5"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 3f10b850ca7..e7dd075df13 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages +{ lib, stdenv, skawarePackages # Whether to build the TLS/SSL tools and what library to use # acceptable values: "libressl", false @@ -8,7 +8,6 @@ with skawarePackages; let - inherit (stdenv) lib; sslSupportEnabled = sslSupport != false; sslLibs = { libressl = libressl; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index b4adbfe8c64..ca68f8b71fc 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { passthru = { tests.tor = nixosTests.tor; updateScript = import ./update.nix { - inherit (stdenv) lib; + inherit lib; inherit writeScript common-updater-scripts From 02ee14b9d54d31351689084c47f9a048a41f27b4 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 12:50:30 +0700 Subject: [PATCH 20/30] treewide: stdenvNoCC.lib -> lib --- pkgs/build-support/fetchgit/default.nix | 8 ++++---- pkgs/build-support/fetchhg/default.nix | 4 ++-- pkgs/build-support/fetchmtn/default.nix | 4 ++-- pkgs/build-support/fetchrepoproject/default.nix | 4 ++-- pkgs/build-support/fetchs3/default.nix | 4 ++-- pkgs/build-support/fetchsvn/default.nix | 8 ++++---- pkgs/build-support/kernel/make-initrd.nix | 2 +- .../development/compilers/chicken/4/fetchegg/default.nix | 4 ++-- .../development/compilers/chicken/5/fetchegg/default.nix | 4 ++-- pkgs/development/compilers/open-watcom-bin/default.nix | 4 ++-- pkgs/development/libraries/relibc/default.nix | 8 ++++---- pkgs/development/libraries/science/math/mkl/default.nix | 9 +++++---- pkgs/development/misc/msp430/gcc-support.nix | 4 ++-- 13 files changed, 34 insertions(+), 33 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 5f5ded128de..df97ef1492d 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,6 @@ -{stdenvNoCC, git, git-lfs, cacert}: let +{lib, stdenvNoCC, git, git-lfs, cacert}: let urlToName = url: rev: let - inherit (stdenvNoCC.lib) removeSuffix splitString last; + inherit (lib) removeSuffix splitString last; base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. nativeBuildInputs = [ git ] - ++ stdenvNoCC.lib.optionals fetchLFS [ git-lfs ]; + ++ lib.optionals fetchLFS [ git-lfs ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation { GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 41eff1f9c0c..15309d0a195 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, mercurial }: +{ lib, stdenvNoCC, mercurial }: { name ? null , url , rev ? null @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; nativeBuildInputs = [mercurial]; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; subrepoClause = if fetchSubrepos then "S" else ""; diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index b5da0f80a31..4aa134242aa 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -1,5 +1,5 @@ # You can specify some extra mirrors and a cache DB via options -{stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: +{lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: # dbs is a list of strings # each is an url for sync @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { dbs = defaultDBMirrors ++ dbs; inherit branch cacheDB name selector; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index 8144ed038bd..69b1bd1aef7 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, gitRepo, cacert, copyPathsToStore }: +{ lib, stdenvNoCC, gitRepo, cacert, copyPathsToStore }: { name, manifest, rev ? "HEAD", sha256 # Optional parameters: @@ -9,7 +9,7 @@ assert repoRepoRev != "" -> repoRepoURL != ""; assert createMirror -> !useArchive; -with stdenvNoCC.lib; +with lib; let extraRepoInitFlags = [ diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index 3dbde203374..8c551c20aa0 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, runCommand, awscli }: +{ lib, stdenvNoCC, runCommand, awscli }: { s3url , name ? builtins.baseNameOf s3url @@ -16,7 +16,7 @@ let AWS_SESSION_TOKEN = session_token; }; - credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials); + credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); in runCommand name ({ nativeBuildInputs = [ awscli ]; diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 06f0ea0a3d1..82dececc124 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, buildPackages +{ lib, stdenvNoCC, buildPackages , subversion, glibcLocales, sshSupport ? true, openssh ? null }: @@ -10,7 +10,7 @@ assert sshSupport -> openssh != null; let - repoName = with stdenvNoCC.lib; + repoName = with lib; let fst = head; snd = l: head (tail l); @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; nativeBuildInputs = [ subversion glibcLocales ] - ++ stdenvNoCC.lib.optional sshSupport openssh; + ++ lib.optional sshSupport openssh; SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; @@ -49,6 +49,6 @@ stdenvNoCC.mkDerivation { inherit url rev ignoreExternals ignoreKeywords; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; } diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 9af40d33242..83d3bb65bae 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -83,7 +83,7 @@ in stdenvNoCC.mkDerivation rec { builder = ./make-initrd.sh; nativeBuildInputs = [ perl cpio ] - ++ stdenvNoCC.lib.optional makeUInitrd ubootTools; + ++ lib.optional makeUInitrd ubootTools; compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; diff --git a/pkgs/development/compilers/chicken/4/fetchegg/default.nix b/pkgs/development/compilers/chicken/4/fetchegg/default.nix index d4d33a5593c..23c5760b4bc 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/default.nix +++ b/pkgs/development/compilers/chicken/4/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html -{ stdenvNoCC, chicken }: +{ lib, stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then @@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation { eggName = name; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/development/compilers/chicken/5/fetchegg/default.nix b/pkgs/development/compilers/chicken/5/fetchegg/default.nix index 24bfbd7a30f..08d23cbaa61 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/default.nix +++ b/pkgs/development/compilers/chicken/5/fetchegg/default.nix @@ -1,7 +1,7 @@ # Fetches a chicken egg from henrietta using `chicken-install -r' # See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html -{ stdenvNoCC, chicken }: +{ lib, stdenvNoCC, chicken }: { name, version, md5 ? "", sha256 ? "" }: if md5 != "" then @@ -20,6 +20,6 @@ stdenvNoCC.mkDerivation { eggName = name; - impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix index a9c6b221065..9a1066dd3c2 100644 --- a/pkgs/development/compilers/open-watcom-bin/default.nix +++ b/pkgs/development/compilers/open-watcom-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: +{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: let @@ -112,7 +112,7 @@ stdenvNoCC.mkDerivation rec { done ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "A C/C++ Compiler (binary distribution)"; homepage = "http://www.openwatcom.org/"; license = licenses.watcom; diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index cedffcaaef9..5f27f902fa9 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, buildPackages, makeRustPlatform }: +{ lib, stdenvNoCC, buildPackages, makeRustPlatform }: let - rpath = stdenvNoCC.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ buildPackages.stdenv.cc.libc "$out" ]; @@ -30,7 +30,7 @@ let "{}" \; ''; - meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux; + meta.platforms = with lib; platforms.redox ++ platforms.linux; }; redoxRustPlatform = buildPackages.makeRustPlatform { @@ -68,7 +68,7 @@ redoxRustPlatform.buildRustPackage rec { cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; - meta = with stdenvNoCC.lib; { + meta = with lib; { homepage = "https://gitlab.redox-os.org/redox-os/relibc"; description = "C Library in Rust for Redox and Linux"; license = licenses.mit; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index b631def3bb2..34fea3162a9 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , callPackage , stdenvNoCC , fetchurl @@ -135,7 +136,7 @@ in stdenvNoCC.mkDerivation { ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} - '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" @@ -145,7 +146,7 @@ in stdenvNoCC.mkDerivation { # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool # explicitly and ignore the error. - postFixup = stdenvNoCC.lib.optionalString stdenvNoCC.isDarwin '' + postFixup = lib.optionalString stdenvNoCC.isDarwin '' for f in $out/lib/*.dylib; do install_name_tool -id $out/lib/$(basename $f) $f || true done @@ -160,7 +161,7 @@ in stdenvNoCC.mkDerivation { passthru.tests.pkg-config = callPackage ./test { }; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = "Intel Math Kernel Library"; longDescription = '' Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/development/misc/msp430/gcc-support.nix index e9ed959c2fd..fa143173c70 100644 --- a/pkgs/development/misc/msp430/gcc-support.nix +++ b/pkgs/development/misc/msp430/gcc-support.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let mspgccVersion = "6_1_1_0"; @@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation rec { touch $out/lib/lib ''; - meta = with stdenvNoCC.lib; { + meta = with lib; { description = '' Development headers and linker scripts for TI MSP430 microcontrollers ''; From 36c91cea1dbe396b92b20bdab3d0d7ad2f294eeb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 12:59:00 +0700 Subject: [PATCH 21/30] treewide: stdenv.lib -> lib --- nixos/tests/vault-postgresql.nix | 2 +- pkgs/build-support/templaterpm/nix-template-rpm.py | 10 +++++----- pkgs/development/libraries/gcc/libgcc/default.nix | 4 ++-- pkgs/development/lisp-modules/asdf/2.26.nix | 10 +++++----- pkgs/development/lisp-modules/asdf/3.1.nix | 10 +++++----- pkgs/development/lisp-modules/asdf/default.nix | 10 +++++----- pkgs/development/lisp-modules/clwrapper/default.nix | 4 ++-- pkgs/development/lisp-modules/define-package.nix | 4 ++-- pkgs/development/lisp-modules/lisp-packages.nix | 4 ++-- pkgs/development/lisp-modules/quicklisp-to-nix.nix | 4 ++-- pkgs/stdenv/adapters.nix | 2 +- pkgs/tools/security/proxmark3/proxmark3-rrg.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix index daa71976338..a563aead22a 100644 --- a/nixos/tests/vault-postgresql.nix +++ b/nixos/tests/vault-postgresql.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "vault-postgresql"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 roberth ]; }; machine = { lib, pkgs, ... }: { diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py index f39595f8977..db8c0f2064c 100755 --- a/pkgs/build-support/templaterpm/nix-template-rpm.py +++ b/pkgs/build-support/templaterpm/nix-template-rpm.py @@ -229,26 +229,26 @@ class SPECTemplate(object): @property def meta(self): - out = ' meta = {\n' + out = ' meta = with lib; {\n' out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n' out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n' - out += ' license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' + out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n' - out += ' maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n' + out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n' out += ' };\n' out += '}\n' return out def __str__(self): - head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' + head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head += 'stdenv.mkDerivation {\n' body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] return head + '\n'.join(body) def getTemplate(self): - head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' + head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' head += 'let\n' head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n' head += 'in\n\n' diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index f579da5f1d6..ab62fdf3fa2 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoLibs, buildPackages +{ lib, stdenvNoLibs, buildPackages , gcc, glibc , libiberty }: @@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec { "--disable-vtable-verify" "--with-system-zlib" - ] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") + ] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc") "--with-glibc-version=${glibc.version}"; configurePlatforms = [ "build" "host" ]; diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix index 41b971ebae2..e2f655a5b6e 100644 --- a/pkgs/development/lisp-modules/asdf/2.26.nix +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [maintainers.raskin]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix index 9149155fb2f..7e697d3a637 100644 --- a/pkgs/development/lisp-modules/asdf/3.1.nix +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -30,11 +30,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 57978819447..eecea3f98b6 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, texinfo, texLive, perl}: +{lib, stdenv, fetchurl, texinfo, texLive, perl}: let s = # Generated upstream information rec { @@ -31,11 +31,11 @@ stdenv.mkDerivation { cp -r doc/* "$out"/share/doc/asdf/ ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; - meta = { + meta = with lib; { inherit (s) version; description = "Standard software-system definition library for Common Lisp"; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit ; + maintainers = [maintainers.raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 821fe892048..69872eb41af 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, asdf, which, bash, lisp ? null}: +{lib, stdenv, asdf, which, bash, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { description = "Script used to wrap Common Lisp implementations"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 96ceb76f6f2..ca969ab2327 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,4 +1,4 @@ -args @ {stdenv, clwrapper, baseName, packageName ? baseName +args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName , parasites ? [] , buildSystems ? ([packageName] ++ parasites) , version ? "latest" @@ -89,7 +89,7 @@ basePackage = { env -i \ NIX_LISP="$NIX_LISP" \ NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn - ${stdenv.lib.concatMapStrings (system: '' + ${lib.concatMapStrings (system: '' (asdf:compile-system :${system}) (asdf:load-system :${system}) (asdf:operate (quote asdf::compile-bundle-op) :${system}) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 63b9540522e..831edcaee27 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -1,6 +1,6 @@ -{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: +{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}: let lispPackages = rec { - inherit pkgs clwrapper stdenv; + inherit lib pkgs clwrapper stdenv; nixLib = pkgs.lib; callPackage = nixLib.callPackageWith lispPackages; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index cbaa13af962..df6d908ba9d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgs, clwrapper}: +{lib, stdenv, fetchurl, pkgs, clwrapper}: let quicklisp-to-nix-packages = rec { - inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; buildLispPackage = callPackage ./define-package.nix; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 03ae3cb8f0e..d8f73d5a7e3 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -110,7 +110,7 @@ rec { */ replaceMaintainersField = stdenv: pkgs: maintainers: stdenv // { mkDerivation = args: - stdenv.lib.recursiveUpdate + pkgs.lib.recursiveUpdate (stdenv.mkDerivation args) { meta.maintainers = maintainers; }; }; diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index bf1bcd67d11..04def66d03c 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 , readline , hardwarePlatform ? "PM3RDV4" @@ -29,7 +29,7 @@ mkDerivation rec { install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; homepage = "https://rfidresearchgroup.com/"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0d24da0ca8..ea0cd7505bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25236,7 +25236,7 @@ in }).overrideAttrs (oldAttrs: rec { pname = "vim-darwin"; meta = { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; }); From 15a64b2facc1b91f4361bdd101576e8886ef834b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 26 Jan 2021 19:01:31 +0100 Subject: [PATCH 22/30] python3Packages.wasabi: 0.8.0 -> 0.8.1 Changelog: https://github.com/ines/wasabi/releases/tag/v0.8.1 --- pkgs/development/python-modules/wasabi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index f9bc1916ad6..cce8c4fc466 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "75fec6db6193c8615d7f398ae4aa2c4ad294e6e3e81c6a6dbbbd3864ee2223c3"; + sha256 = "6e5228a51f5550844ef5080e74759e7ecb6e344241989d018686ba968f0b4f5a"; }; checkInputs = [ pytestCheckHook ]; From 7055f4b42c9d83e13f563f37128759bd478c9dc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Jan 2021 08:19:51 +0100 Subject: [PATCH 23/30] masscan: 1.3.0 -> 1.3.1 --- pkgs/tools/security/masscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 0f45edcff6c..a192f00cef7 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "masscan"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; rev = version; - sha256 = "04nlnficybgxa16kq9fwrrfjsbyiaps4mikfqgdr206fkqk9i05y"; + sha256 = "sha256-gH0zOf2kl6cqws1nB3QPtaAjpvNAgbawXRx77bqJTIc="; }; nativeBuildInputs = [ makeWrapper ]; From 7072a7efd81a8f5bb859468f934f3e778117305a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Jan 2021 08:22:20 +0100 Subject: [PATCH 24/30] masscan: add changelog to meta and update license --- pkgs/tools/security/masscan/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index a192f00cef7..f92ac978f6e 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -5,9 +5,9 @@ stdenv.mkDerivation rec { version = "1.3.1"; src = fetchFromGitHub { - owner = "robertdavidgraham"; - repo = "masscan"; - rev = version; + owner = "robertdavidgraham"; + repo = "masscan"; + rev = version; sha256 = "sha256-gH0zOf2kl6cqws1nB3QPtaAjpvNAgbawXRx77bqJTIc="; }; @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast scan of the Internet"; - homepage = "https://github.com/robertdavidgraham/masscan"; - license = licenses.agpl3; - platforms = platforms.unix; + homepage = "https://github.com/robertdavidgraham/masscan"; + changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${version}"; + license = licenses.agpl3Only; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; }; } From b58f10c3ba10d20f246b668a49a99fb2cfd11b7f Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Tue, 26 Jan 2021 23:29:18 +0100 Subject: [PATCH 25/30] unifi6: update to 6.0.45 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index c8b610c4d17..0bc3c3413bb 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.0.43"; - sha256 = "1d9pw4f20pr4jb1xb43p7ycafv13ld1h40r05qg82029ml1s7jky"; + version = "6.0.45"; + sha256 = "1mph22x2p26q76gh6s714xwsvc03cciy4gx00jv4vhcm28p6nlxy"; }; } From d7b905b6b28129f28f81126d26e4d3c6f31f29e9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 16:35:35 +0700 Subject: [PATCH 26/30] loadlibrary: stdenv_32bit.lib -> lib --- pkgs/tools/misc/loadlibrary/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index d469c43418a..e6d19fc6d40 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -5,7 +5,7 @@ stdenv_32bit.mkDerivation rec { name = "loadlibrary-${version}"; - version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}"; + version = "20170525-${lib.strings.substring 0 7 rev}"; rev = "721b084c088d779075405b7f20c77c2578e2a961"; src = fetchFromGitHub { inherit rev; From afebe553f8f981ac8c605203ab13e0d341d476aa Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 27 Jan 2021 16:38:10 +0700 Subject: [PATCH 27/30] nodePackages: stdenv.lib -> lib --- pkgs/development/node-packages/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 569b0c978b0..0cc648f58ff 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -17,7 +17,7 @@ let buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + wrapProgram "$out/bin/$prog" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }; @@ -91,7 +91,7 @@ let makam = super.makam.override { buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; postFixup = '' - wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]} + wrapProgram "$out/bin/makam" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nodejs ]} ${ if stdenv.isLinux then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" @@ -138,7 +138,7 @@ let node2nix = super.node2nix.override { buildInputs = [ pkgs.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} ''; }; @@ -168,7 +168,7 @@ let ''; postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ + pnpmLibPath = pkgs.lib.makeBinPath [ nodejs.passthru.python nodejs ]; @@ -185,7 +185,7 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/pulp" --suffix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram "$out/bin/pulp" --suffix PATH : ${pkgs.lib.makeBinPath [ pkgs.purescript ]} ''; @@ -220,7 +220,7 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/typescript-language-server" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ self.typescript ]} + --prefix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]} ''; }; From 996a8eb88e7b13d4188ee1e28c498a6fce2ce0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Dec 2020 10:28:11 +0100 Subject: [PATCH 28/30] python3.pkgs.pyworld: init at 0.2.12 Co-authored-by: Sandro --- .../python-modules/pyworld/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyworld/default.nix diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix new file mode 100644 index 00000000000..73cd1fcea22 --- /dev/null +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, cython +}: + +buildPythonPackage rec { + pname = "pyworld"; + version = "0.2.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "896c910696975855578d855f490f94d7a57119e0a75f7f15e11fdf58ba891627"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "pyworld" ]; + + meta = with lib; { + description = "PyWorld is a Python wrapper for WORLD vocoder"; + homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8b4baf882d..30802297181 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6507,6 +6507,8 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; + pyworld = callPackage ../development/python-modules/pyworld { }; + pyx = callPackage ../development/python-modules/pyx { }; pyxdg = callPackage ../development/python-modules/pyxdg { }; From 5fc4e480f2bfabe874706bd63e7218053c939cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Jan 2021 14:11:12 +0100 Subject: [PATCH 29/30] tts: unstable-2020-06-17 -> 0.0.9 --- pkgs/tools/audio/tts/default.nix | 77 +++++++++++++------------------- 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 770e898f2ee..325039d6865 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,42 +1,13 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch , python3 }: -# -# Tested in the following setup: -# -# TTS model: -# Tacotron2 DDC -# https://drive.google.com/drive/folders/1Y_0PcB7W6apQChXtbt6v3fAiNwVf4ER5 -# Vocoder model: -# Multi-Band MelGAN -# https://drive.google.com/drive/folders/1XeRT0q4zm5gjERJqwmX5w84pMrD00cKD -# -# Arrange /tmp/tts like this: -# scale_stats.npy -# tts -# tts/checkpoint_130000.pth.tar -# tts/checkpoint_130000_tf.pkl -# tts/checkpoint_130000_tf_2.3rc0.tflite -# tts/config.json -# tts/scale_stats.npy -# vocoder -# vocoder/checkpoint_1450000.pth.tar -# vocoder/checkpoint_2750000_tf.pkl -# vocoder/checkpoint_2750000_tf_v2.3rc.tflite -# vocoder/config.json -# vocoder/scale_stats.npy -# -# Start like this: -# cd /tmp/tts -# tts-server \ -# --vocoder_config ./tts/vocoder/config.json \ -# --vocoder_checkpoint ./tts/vocoder/checkpoint_1450000.pth.tar \ -# --tts_config ./tts/config.json \ -# --tts_checkpoint ./tts/checkpoint_130000.pth.tar +# USAGE: +# $ tts-server --list_models +# # pick your favorite vocoder/tts model +# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 @@ -47,35 +18,31 @@ python3Packages.buildPythonApplication rec { # until https://github.com/mozilla/TTS/issues/424 is resolved # we treat released models as released versions: # https://github.com/mozilla/TTS/wiki/Released-Models - version = "unstable-2020-06-17"; + version = "0.0.9"; src = fetchFromGitHub { owner = "mozilla"; repo = "TTS"; - rev = "72a6ac54c8cfaa407fc64b660248c6a788bdd381"; - sha256 = "1wvs264if9n5xzwi7ryxvwj1j513szp6sfj6n587xk1fphi0921f"; + rev = "df5899daf4ba4ec89544edf94f9c2e105c544461"; + sha256 = "sha256-lklG8DqG04LKJY93z2axeYhW8gtpbRG41o9ow2gJjuA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mozilla/TTS/commit/36fee428b9f3f4ec1914b090a2ec9d785314d9aa.patch"; - sha256 = "sha256-pP0NxiyrsvQ0A7GEleTdT87XO08o7WxPEpb6Bmj66dc="; - }) - ]; - preBuild = '' # numba jit tries to write to its cache directory export HOME=$TMPDIR - sed -i -e 's!tensorflow==.*!tensorflow!' requirements.txt + # we only support pytorch models right now + sed -i -e '/tensorflow/d' requirements.txt + sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py # Not required for building/installation but for their development/ci workflow - sed -i -e '/pylint/d' requirements.txt setup.py + sed -i -e '/pylint/d' requirements.txt sed -i -e '/cardboardlint/d' requirements.txt setup.py ''; + nativeBuildInputs = [ python3Packages.cython ]; propagatedBuildInputs = with python3Packages; [ matplotlib @@ -88,17 +55,23 @@ python3Packages.buildPythonApplication rec { tqdm librosa unidecode + umap-learn phonemizer tensorboardx fuzzywuzzy - tensorflow_2 inflect gdown pysbd + pyworld ]; postInstall = '' cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server + # cython modules are not installed for some reasons + ( + cd TTS/tts/layers/glow_tts/monotonic_align + ${python3Packages.python.interpreter} setup.py install --prefix=$out + ) ''; checkInputs = with python3Packages; [ pytestCheckHook ]; @@ -114,6 +87,18 @@ python3Packages.buildPythonApplication rec { "test_parametrized_gan_dataset" ]; + preCheck = '' + # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules. + mv TTS{,.old} + ''; + + pytestFlagsArray = [ + # requires tensorflow + "--ignore=tests/test_tacotron2_tf_model.py" + "--ignore=tests/test_vocoder_tf_melgan_generator.py" + "--ignore=tests/test_vocoder_tf_pqmf.py" + ]; + meta = with lib; { homepage = "https://github.com/mozilla/TTS"; description = "Deep learning for Text to Speech"; From b98bfb6536d3e3aa5f47e028aa3311fb5be7fe0c Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 27 Jan 2021 02:03:11 -0800 Subject: [PATCH 30/30] androidenv: do not copy verbosely Verbose copying can exceed hydra's output limit, causing spurious failures. For example, see: https://hydra.nixos.org/eval/1644892?filter=android --- pkgs/development/mobile/androidenv/deploy-androidpackage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix index 4f9db98c006..f23558ebc5c 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ packageBaseDir=$out/libexec/android-sdk/${package.path} mkdir -p $packageBaseDir cd $packageBaseDir - cp -av $sourceRoot/* . + cp -a $sourceRoot/* . ${patchInstructions} '';