diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-18 18:57:24 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-18 18:57:24 +0200 |
| commit | 6be8ad3392d87e277804ddec364377b5341430b7 (patch) | |
| tree | ce8a334fb3611b27336e9602bd248682931016b8 /pkgs/development/interpreters/python/2.6 | |
| parent | ea6f711e8ec7208626a084edb81a78ee455a0b67 (diff) | |
| parent | 06d6c3ed5d061e95d1db92f7eff08d5c1a2181d8 (diff) | |
| download | nixlib-6be8ad3392d87e277804ddec364377b5341430b7.tar nixlib-6be8ad3392d87e277804ddec364377b5341430b7.tar.gz nixlib-6be8ad3392d87e277804ddec364377b5341430b7.tar.bz2 nixlib-6be8ad3392d87e277804ddec364377b5341430b7.tar.lz nixlib-6be8ad3392d87e277804ddec364377b5341430b7.tar.xz nixlib-6be8ad3392d87e277804ddec364377b5341430b7.tar.zst nixlib-6be8ad3392d87e277804ddec364377b5341430b7.zip | |
Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo version 4.x. At least is used to, I'm not sure whether it still does.
Diffstat (limited to 'pkgs/development/interpreters/python/2.6')
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index b99beca38923..6b746185b6cc 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -160,6 +160,11 @@ let deps = [ ncurses ]; }; + curses_panel = buildInternalPythonModule { + moduleName = "curses_panel"; + deps = [ ncurses modules.curses ]; + }; + gdbm = buildInternalPythonModule { moduleName = "gdbm"; internalName = "gdbm"; |