Merge branch 'master.upstream' into staging.upstream

2015-06-22 10:57:36 -07:00
parent ad779acd3b 22172b8e43
commit 282d03befa
114 changed files with 1394 additions and 412 deletions
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
      enhanced interactive Python shell and an architecture for
      interactive parallel computing.
    '';
-    maintainers = [ stdenv.lib.maintainers.bjornfor ];
+    maintainers = with stdenv.lib.maintainers; [ bjornfor jgeerds ];
  };
 }