From 32263223dbeffcd8b6818064e93f26c3ec37511e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 19:31:06 +0200 Subject: [PATCH 1/3] pythonPackages: remove `with lib;` --- pkgs/top-level/python-packages.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5dae694ebd80..c550ba7e0a0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12,8 +12,6 @@ , python }: -with lib; - self: let @@ -40,12 +38,12 @@ let } else ff; - buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { + buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules })); - buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { + buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. })); @@ -60,8 +58,8 @@ let # Get list of required Python modules given a list of derivations. requiredPythonModules = drvs: let - modules = filter hasPythonModule drvs; - in unique ([python] ++ modules ++ concatLists (catAttrs "requiredPythonModules" modules)); + modules = lib.filter hasPythonModule drvs; + in lib.unique ([python] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPythonModules" modules)); # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations # providing Python modules. @@ -4654,7 +4652,7 @@ in { inherit (pkgs) lzfse; }; - libmodulemd = pipe pkgs.libmodulemd [ + libmodulemd = lib.pipe pkgs.libmodulemd [ toPythonModule (p: p.overrideAttrs (super: { @@ -4679,7 +4677,7 @@ in { libpyvivotek = callPackage ../development/python-modules/libpyvivotek { }; - libpwquality = pipe pkgs.libpwquality [ + libpwquality = lib.pipe pkgs.libpwquality [ toPythonModule (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) (p: p.override { enablePython = true; inherit python; }) @@ -4691,7 +4689,7 @@ in { inherit (self) python libxml2; }); - librepo = pipe pkgs.librepo [ + librepo = lib.pipe pkgs.librepo [ toPythonModule (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) (p: p.override { inherit python; }) @@ -4708,7 +4706,7 @@ in { libsavitar = callPackage ../development/python-modules/libsavitar { }; - libselinux = pipe pkgs.libselinux [ + libselinux = lib.pipe pkgs.libselinux [ toPythonModule (p: p.overrideAttrs (super: { From ba60b643b9d10b8f980401b49861777baa703e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 19:31:28 +0200 Subject: [PATCH 2/3] pythonPackages: simplify function --- pkgs/top-level/python-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c550ba7e0a0d..cdeb09ae3185 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -65,8 +65,7 @@ let # providing Python modules. makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); - removePythonPrefix = name: - removePrefix namePrefix name; + removePythonPrefix = lib.removePrefix namePrefix; # Convert derivation to a Python module. toPythonModule = drv: From e7625353449d965641d30e671206ec377b2780f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Mar 2022 19:31:58 +0200 Subject: [PATCH 3/3] pythonPackages: remove optional (), prefer inherit --- pkgs/top-level/python-packages.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdeb09ae3185..3bfe06d114de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1879,7 +1879,7 @@ in { coveralls = callPackage ../development/python-modules/coveralls { }; cppe = callPackage ../development/python-modules/cppe { - cppe = pkgs.cppe; + inherit (pkgs) cppe; }; cppheaderparser = callPackage ../development/python-modules/cppheaderparser { }; @@ -3625,7 +3625,7 @@ in { gst-python = callPackage ../development/python-modules/gst-python { inherit (pkgs) meson; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + inherit (pkgs.gst_all_1) gst-plugins-base; }; gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { }; @@ -4637,7 +4637,7 @@ in { }); libgpuarray = callPackage ../development/python-modules/libgpuarray { - clblas = pkgs.clblas.override { boost = self.boost; }; + clblas = pkgs.clblas.override { inherit (self) boost; }; cudaSupport = pkgs.config.cudaSupport or false; }; @@ -4699,9 +4699,9 @@ in { librouteros = callPackage ../development/python-modules/librouteros { }; - libsass = (callPackage ../development/python-modules/libsass { + libsass = callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; - }); + }; libsavitar = callPackage ../development/python-modules/libsavitar { }; @@ -5235,10 +5235,10 @@ in { monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - monosat = (pkgs.monosat.python { + monosat = pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; - }); + }; monotonic = callPackage ../development/python-modules/monotonic { }; @@ -5762,7 +5762,7 @@ in { openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { - openbabel = (callPackage ../development/libraries/openbabel { python = self.python; }); + openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; }; }; opencv3 = toPythonModule (pkgs.opencv3.override { @@ -6838,7 +6838,7 @@ in { pyctr = callPackage ../development/python-modules/pyctr { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit; + inherit (pkgs) cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; @@ -9361,12 +9361,12 @@ in { snuggs = callPackage ../development/python-modules/snuggs { }; soapysdr = toPythonModule (pkgs.soapysdr.override { - python = self.python; + inherit (self) python; usePython = true; }); soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { - python = self.python; + inherit (self) python; usePython = true; }); @@ -9987,9 +9987,9 @@ in { thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - tkinter = let + tkinter = callPackage ../development/python-modules/tkinter { py = python.override { x11Support=true; }; - in callPackage ../development/python-modules/tkinter { py = py; }; + }; tidylib = callPackage ../development/python-modules/pytidylib { };