* Adde xpra. Doesn't quite work yet.

* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161

pkgs/development/interpreters/pyrex/0.9.5.nix

@@ -0,0 +1,26 @@
+args: with args;
+
+let
+
+  localDefs = builderDefs {
+
+    src = fetchurl {
+      url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz;
+      sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z";
+    };
+
+    buildInputs = [python];
+
+  } null; /* null is a terminator for sumArgs */
+
+in with localDefs;
+        
+stdenv.mkDerivation rec {
+  name = "pyrex-0.9.5.1.1";
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs [installPythonPackage doForceShare]);
+  meta = {
+    description = "Python package compiler or something like that";
+    inherit src;
+  };
+}

pkgs/development/interpreters/pyrex/0.9.6.nix

@@ -1,22 +1,26 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-	fetchurl {
-		url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.tar.gz;
-		sha256 = "1i0mrv2a3ihnj5mjf07aic7nlps9qap57j477m8ajwhhwx9vwlxy";
-	};
-		buildInputs = [python];
-		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
+args: with args;
+
+let
+
+  localDefs = builderDefs {
+
+    src = fetchurl {
+      url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz;
+      sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8";
+    };
+
+    buildInputs = [python];
+
+  } null; /* null is a terminator for sumArgs */
+
+in with localDefs;
+        
 stdenv.mkDerivation rec {
-	name = "Pyrex-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [installPythonPackage doForceShare]);
-	meta = {
-		description = "
-	Python package compiler or something like that.	
-";
-		inherit src;
-	};
+  name = "pyrex-0.9.6.4";
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs [installPythonPackage doForceShare]);
+  meta = {
+    description = "Python package compiler or something like that";
+    inherit src;
+  };
 }

pkgs/development/interpreters/python/default.nix

@@ -1,6 +0,0 @@
-args:
-args.stdenv.lib.listOfListsToAttrs [
-	[ "default"  (import ./2.4.nix args) ]
-	[ "2.4"  (import ./2.4.nix args) ]
-	[ "2.5" (import ./2.5 args) ]
-]