summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix18
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe9ad364e75..0197c1da2e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1443,6 +1443,20 @@ let
 
   dash = callPackage ../shells/dash { };
 
+  ipython = callPackage ../shells/ipython {
+    # I did not find any better way of reusing buildPythonPackage+setuptools
+    # for a python with openssl support
+    buildPythonPackage = assert pythonFull.readlineSupport;
+      import ../development/python-modules/generic {
+        inherit makeWrapper lib;
+        python = pythonFull;
+        setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
+          inherit makeWrapper;
+          python = pythonFull;
+        };
+      };
+ };
+
   tcsh = callPackage ../shells/tcsh { };
 
   rush = callPackage ../shells/rush { };
@@ -6622,6 +6636,8 @@ let
 
   crack_attack = callPackage ../games/crack-attack { };
 
+  crrcsim = callPackage ../games/crrcsim {};
+
   dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { 
     gnomegtk = pkgsi686Linux.gnome.gtk;
   };
@@ -6651,6 +6667,8 @@ let
     stdenv = stdenv2;
   };
 
+  gl117 = callPackage ../games/gl-117 {};
+
   gltron = callPackage ../games/gltron { };
 
   gnuchess = builderDefsPackage (import ../games/gnuchess) {