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.
2013-10-18 18:57:24 +02:00
parent ea6f711e8e 06d6c3ed5d
commit 6be8ad3392
1177 changed files with 57151 additions and 6093 deletions
@@ -160,6 +160,11 @@ let
      deps = [ ncurses ];
    };

+    curses_panel = buildInternalPythonModule {
+      moduleName = "curses_panel";
+      deps = [ ncurses modules.curses ];
+    };
+
    gdbm = buildInternalPythonModule {
      moduleName = "gdbm";
      internalName = "gdbm";