diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2012-11-22 13:38:08 +0100 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2012-11-22 13:38:08 +0100 |
| commit | 1b013ac1ea10bb063e0674559b1cb13c77884433 (patch) | |
| tree | 76be4dde62648d9b9a559a2c899358cfb10ce091 /pkgs/development/interpreters | |
| parent | bd443d69c9be7bf03e9eb3e8b72caed529b2da79 (diff) | |
| parent | 3665e02901759cb584b383306cbba867a25918ff (diff) | |
| download | nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.tar nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.tar.gz nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.tar.bz2 nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.tar.lz nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.tar.xz nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.tar.zst nixlib-1b013ac1ea10bb063e0674559b1cb13c77884433.zip | |
Merge branch 'py/pdb' into python-merge
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" |