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 { };