cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pythonPackages: remove optional (), prefer inherit

Browse source
This commit is contained in:
Sandro Jäckel 2022-03-29 19:31:58 +02:00
parent ba60b643b9
commit e762535344
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/top-level/python-packages.nix
View file

@ -1879,7 +1879,7 @@ in {
coveralls = callPackage ../development/python-modules/coveralls { }; coveralls = callPackage ../development/python-modules/coveralls { };
cppe = callPackage ../development/python-modules/cppe { cppe = callPackage ../development/python-modules/cppe {
cppe = pkgs.cppe; inherit (pkgs) cppe;
}; };
cppheaderparser = callPackage ../development/python-modules/cppheaderparser { }; cppheaderparser = callPackage ../development/python-modules/cppheaderparser { };
@ -3625,7 +3625,7 @@ in {
gst-python = callPackage ../development/python-modules/gst-python { gst-python = callPackage ../development/python-modules/gst-python {
inherit (pkgs) meson; 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 { }; gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { };
@ -4637,7 +4637,7 @@ in {
}); });
libgpuarray = callPackage ../development/python-modules/libgpuarray { 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; cudaSupport = pkgs.config.cudaSupport or false;
}; };
@ -4699,9 +4699,9 @@ in {
librouteros = callPackage ../development/python-modules/librouteros { }; librouteros = callPackage ../development/python-modules/librouteros { };
libsass = (callPackage ../development/python-modules/libsass { libsass = callPackage ../development/python-modules/libsass {
inherit (pkgs) libsass; inherit (pkgs) libsass;
}); };
libsavitar = callPackage ../development/python-modules/libsavitar { }; libsavitar = callPackage ../development/python-modules/libsavitar { };
@ -5235,10 +5235,10 @@ in {
monkeyhex = callPackage ../development/python-modules/monkeyhex { }; monkeyhex = callPackage ../development/python-modules/monkeyhex { };
monosat = (pkgs.monosat.python { monosat = pkgs.monosat.python {
inherit buildPythonPackage; inherit buildPythonPackage;
inherit (self) cython; inherit (self) cython;
}); };
monotonic = callPackage ../development/python-modules/monotonic { }; monotonic = callPackage ../development/python-modules/monotonic { };
@ -5762,7 +5762,7 @@ in {
openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };
openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { 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 { opencv3 = toPythonModule (pkgs.opencv3.override {
@ -6838,7 +6838,7 @@ in {
pyctr = callPackage ../development/python-modules/pyctr { }; pyctr = callPackage ../development/python-modules/pyctr { };
pycuda = callPackage ../development/python-modules/pycuda { pycuda = callPackage ../development/python-modules/pycuda {
cudatoolkit = pkgs.cudatoolkit; inherit (pkgs) cudatoolkit;
inherit (pkgs.stdenv) mkDerivation; inherit (pkgs.stdenv) mkDerivation;
}; };
@ -9361,12 +9361,12 @@ in {
snuggs = callPackage ../development/python-modules/snuggs { }; snuggs = callPackage ../development/python-modules/snuggs { };
soapysdr = toPythonModule (pkgs.soapysdr.override { soapysdr = toPythonModule (pkgs.soapysdr.override {
python = self.python; inherit (self) python;
usePython = true; usePython = true;
}); });
soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override {
python = self.python; inherit (self) python;
usePython = true; usePython = true;
}); });
@ -9987,9 +9987,9 @@ in {
thumborPexif = callPackage ../development/python-modules/thumborpexif { }; thumborPexif = callPackage ../development/python-modules/thumborpexif { };
tkinter = let tkinter = callPackage ../development/python-modules/tkinter {
py = python.override { x11Support=true; }; py = python.override { x11Support=true; };
in callPackage ../development/python-modules/tkinter { py = py; }; };
tidylib = callPackage ../development/python-modules/pytidylib { }; tidylib = callPackage ../development/python-modules/pytidylib { };