diff options
| author | Rok Garbas <rok@garbas.si> | 2016-12-23 23:44:45 +0100 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2016-12-23 23:45:03 +0100 |
| commit | e08f7afc62cbfe038ce5a5bcc9789c76a6548825 (patch) | |
| tree | 550fc62ebd8c94d546a0ea7f4a58e31d2ce73515 /pkgs/development/tools/pypi2nix | |
| parent | c23032a8b11d0585c1f1aece1d2b0abd82148e82 (diff) | |
pypi2nix: 1.5.0 -> 1.6.0
Diffstat (limited to 'pkgs/development/tools/pypi2nix')
| -rw-r--r-- | pkgs/development/tools/pypi2nix/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 229d680f8351f..1e6b6690e71ba 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, python, zip, makeWrapper +{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts }: let - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "0s79pp7gkgyk7discnv94m6z81fd67p66rdbd4cwk1ma0qljlh2k"; + sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn"; }; click = fetchurl { @@ -16,8 +16,8 @@ let }; requests = fetchurl { - url = "https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz"; - sha256 = "0cx1w7m4cpslxz9jljxv0l9892ygrrckkiwpp2hangr8b01rikss"; + url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz"; + sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"; }; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { click requests ]; - buildInputs = [ python zip makeWrapper ]; + buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ]; sourceRoot = "."; postUnpack = '' @@ -45,6 +45,11 @@ in stdenv.mkDerivation rec { fi ''; + patchPhase = '' + sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py + sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py + ''; + commonPhase = '' mkdir -p $out/bin |