diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-12-03 07:59:32 +0100 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-12-05 11:31:28 +0100 |
| commit | 3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa (patch) | |
| tree | 0db601e598e2f3a6ace4f19e0cfd15015f0c8e42 /pkgs/top-level | |
| parent | 6dc414d6ae439590910a30eedfb5508fa9f62513 (diff) | |
| download | nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.tar nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.tar.gz nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.tar.bz2 nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.tar.lz nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.tar.xz nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.tar.zst nixlib-3cf96816b0ae3bd0dc1672fe97d39bab0411d3aa.zip | |
pycrypto for python26 and 27
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a02a35c7983c..08d5a59e384b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5242,7 +5242,7 @@ let pycairo = callPackage ../development/python-modules/pycairo { }; - pycrypto = callPackage ../development/python-modules/pycrypto { }; + pycrypto = python27Packages.pycrypto; pycups = callPackage ../development/python-modules/pycups { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a09549529b2..5efc8c54804e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -44,6 +44,11 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; + pycrypto = import ../development/python-modules/pycrypto { + inherit (pkgs) fetchurl stdenv gmp; + inherit python buildPythonPackage; + }; + wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; @@ -1590,7 +1595,7 @@ let pythonPackages = python.modules // rec { sha256 = "1bjy4jn51c50mpq51jbwk0glzd8bxz83gxdfkr9p95dmrd17c7hh"; }; - buildInputs = [ pkgs.pycrypto ]; + buildInputs = [ pycrypto ]; meta = { homepage = "http://www.lag.net/paramiko/"; |