Created
August 17, 2016 21:10
-
-
Save layus/311fb6cb9d6c83dadb1e1522c6caa9ee to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/pkgs/development/interpreters/python/interpreter.nix b/pkgs/development/interpreters/python/interpreter.nix | |
| index 3683543..cf5a3fa 100644 | |
| --- a/pkgs/development/interpreters/python/interpreter.nix | |
| +++ b/pkgs/development/interpreters/python/interpreter.nix | |
| @@ -10,13 +10,15 @@ let | |
| inherit (stdenv) lib; | |
| + override = overrides: (import ./interpreter.nix { inherit pkgs stdenv python overrides; }).pkgs; | |
| + | |
| # Package set | |
| packages = let | |
| inherit (lib) fix' extends fold; | |
| pythonPackages = self: import ./support.nix { | |
| - inherit pkgs python buildPythonPackage mkDerivation wrapPython setuptools; | |
| + inherit pkgs python buildPythonPackage mkDerivation wrapPython setuptools override; | |
| } self; | |
| commonConfiguration = import ../../../top-level/python-packages.nix { inherit pkgs stdenv; }; | |
| diff --git a/pkgs/development/interpreters/python/support.nix b/pkgs/development/interpreters/python/support.nix | |
| index 896dee5..43ed51a 100644 | |
| --- a/pkgs/development/interpreters/python/support.nix | |
| +++ b/pkgs/development/interpreters/python/support.nix | |
| @@ -1,5 +1,6 @@ | |
| { pkgs | |
| , python | |
| +, override | |
| , buildPythonPackage | |
| , mkDerivation | |
| , wrapPython | |
| @@ -20,7 +21,7 @@ let | |
| in rec { | |
| - inherit python mkDerivation buildPythonPackage wrapPython setuptools; | |
| + inherit python mkDerivation buildPythonPackage wrapPython setuptools override; | |
| inherit modules; | |
| pythonAtLeast = versionAtLeast python.pythonVersion; | |
| diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix | |
| index 11e9d2f..9a27bb6 100644 | |
| --- a/pkgs/top-level/python-packages.nix | |
| +++ b/pkgs/top-level/python-packages.nix | |
| @@ -7151,14 +7151,16 @@ self: super: with super; { | |
| }; | |
| lti = let | |
| - self' = (self.override {self = self';}) // {pytest = self.pytest_27;}; | |
| - mock_1_0_1 = self'.mock.overrideDerivation (_: rec { | |
| - name = "mock-1.0.1"; | |
| - propagatedBuildInputs = null; | |
| - src = pkgs.fetchurl { | |
| - url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz"; | |
| - sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"; | |
| - }; | |
| + self' = self.override (super: self: { | |
| + pytest = self.pytest_27; | |
| + mock_1_0_1 = self'.mock.overrideDerivation (_: rec { | |
| + name = "mock-1.0.1"; | |
| + src = pkgs.fetchurl { | |
| + url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz"; | |
| + sha256 = "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq"; | |
| + }; | |
| + propagatedBuildInputs = null; | |
| + }); | |
| }); | |
| in buildPythonPackage rec { | |
| version = "0.4.1"; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment