diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 98e5b4b1da0e7..0e3a857938664 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -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 @@ -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; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 797a5be40ff39..5535313ee302d 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -14,8 +14,6 @@ , self , CF, configd , python-setup-hook -# For the Python package set -, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -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"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 6dbf9a09cf565..0a14febfba4a4 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -14,8 +14,6 @@ , self , CF, configd , python-setup-hook -# For the Python package set -, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -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"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index cc8f6228f623e..b3938817bb427 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -15,8 +15,6 @@ , self , CF, configd , python-setup-hook -# For the Python package set -, pkgs, packageOverrides ? (self: super: {}) }: assert x11Support -> tcl != null @@ -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"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9033c3d825d6..158c8a595deef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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;