Skip to content

python: introduce config.pythonPackageOverrides for proper overrides #40417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oxij wants to merge 1 commit into from
Closed

python: introduce config.pythonPackageOverrides for proper overrides #40417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/development/interpreters/python/cpython/2.7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
, python-setup-hook
# Some proprietary libs assume UCS2 unicode, especially on darwin :(
, ucsEncoding ? 4
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:

assert x11Support -> tcl != null
Expand Down Expand Up @@ -227,7 +225,7 @@ in stdenv.mkDerivation {
'';

passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
pythonPackages = callPackage ../../../../../top-level/python-packages.nix { python=self; };
in rec {
inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding;
executable = libPrefix;
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/interpreters/python/cpython/3.4/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
, self
, CF, configd
, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:

assert x11Support -> tcl != null
Expand Down Expand Up @@ -161,7 +159,7 @@ in stdenv.mkDerivation {
'';

passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
pythonPackages = callPackage ../../../../../top-level/python-packages.nix { python=self; };
in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/interpreters/python/cpython/3.5/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
, self
, CF, configd
, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:

assert x11Support -> tcl != null
Expand Down Expand Up @@ -155,7 +153,7 @@ in stdenv.mkDerivation {
'';

passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
pythonPackages = callPackage ../../../../../top-level/python-packages.nix { python=self; };
in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/interpreters/python/cpython/3.6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
, self
, CF, configd
, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:

assert x11Support -> tcl != null
Expand Down Expand Up @@ -178,7 +176,7 @@ in stdenv.mkDerivation {
'';

passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
pythonPackages = callPackage ../../../../../top-level/python-packages.nix { python=self; };
in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
Expand Down
5 changes: 3 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
#
# For more details, please see the Python section in the Nixpkgs manual.

{ pkgs
{ config
, pkgs
, stdenv
, python
, overrides ? (self: super: {})
, overrides ? config.pythonPackageOverrides or (self: super: {})
}:

with pkgs.lib;
Expand Down