diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-12 17:01:20 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-12 17:01:20 +0100 |
| commit | f364619e222148ca23647ad67293b0a99ddf0e55 (patch) | |
| tree | 7755a4c4514cf5bc926af7ff96f04558afffdd87 /pkgs/development/interpreters | |
| parent | 0ecd1f62c799dffbdbd4bc1ba8120bfb4a4c7a6f (diff) | |
| parent | 5054e8ec29f06dae986297debc6d0c4e60c9da7a (diff) | |
| download | nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.tar nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.tar.gz nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.tar.bz2 nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.tar.lz nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.tar.xz nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.tar.zst nixlib-f364619e222148ca23647ad67293b0a99ddf0e55.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/2.7/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/wrapper.nix | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index f87e1e3810f0..6fa27c23525c 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -60,6 +60,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 098603105410..7e28cdc1db74 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -74,6 +74,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index e8e343976bc3..f4892f92b417 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' mkdir -p "$out/bin" - for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do + for prg in 2to3 idle pdb pdb${python.majorVersion} pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" done ensureDir "$out/share" |