diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-17 13:45:50 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-17 13:45:50 +0000 |
commit | 26a152653db6f04752aeabb99600f5aa8d834bf5 (patch) | |
tree | 9f8b8de6b97932bde78ab9169794fecc8f41bdab /pkgs/development | |
parent | a47057c615cda385fb275a8c0d69053f9913115b (diff) | |
download | nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.tar nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.tar.gz nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.tar.bz2 nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.tar.lz nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.tar.xz nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.tar.zst nixlib-26a152653db6f04752aeabb99600f5aa8d834bf5.zip |
* Adde xpra. Doesn't quite work yet.
* Removed python_alts. svn path=/nixpkgs/trunk/; revision=11161
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/pyrex/0.9.5.nix | 26 | ||||
-rw-r--r-- | pkgs/development/interpreters/pyrex/0.9.6.nix | 44 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/2.4/default.nix (renamed from pkgs/development/interpreters/python/2.4.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/2.4/search-path.patch (renamed from pkgs/development/interpreters/python/search-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/2.4/setup-hook.sh (renamed from pkgs/development/interpreters/python/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/pygtk/default.nix | 7 |
7 files changed, 54 insertions, 29 deletions
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix new file mode 100644 index 000000000000..d494b5a15394 --- /dev/null +++ b/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; + }; +} diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 3747bbed4c30..02c1d532abb3 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/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; + }; } diff --git a/pkgs/development/interpreters/python/2.4.nix b/pkgs/development/interpreters/python/2.4/default.nix index 726d2ac4aa96..726d2ac4aa96 100644 --- a/pkgs/development/interpreters/python/2.4.nix +++ b/pkgs/development/interpreters/python/2.4/default.nix diff --git a/pkgs/development/interpreters/python/search-path.patch b/pkgs/development/interpreters/python/2.4/search-path.patch index 2e7b7526c0ce..2e7b7526c0ce 100644 --- a/pkgs/development/interpreters/python/search-path.patch +++ b/pkgs/development/interpreters/python/2.4/search-path.patch diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/2.4/setup-hook.sh index 58b8d1cab760..58b8d1cab760 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/2.4/setup-hook.sh diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix deleted file mode 100644 index af90018870fb..000000000000 --- a/pkgs/development/interpreters/python/default.nix +++ /dev/null @@ -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) ] -] diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index e8a66817013e..9d487db5dd03 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -2,12 +2,13 @@ stdenv.mkDerivation { name = "pygtk-2.10.4"; -# builder = ./builder.sh; + src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/pygtk-2.10.4.tar.bz2; sha256 = "1xg8vng42lql29aa5ryva8icc8dwdc7h2y3yn96qjdgl394d96mb"; }; - buildInputs = [python pkgconfig glib gtk pycairo]; + + buildInputs = [python pkgconfig glib gtk]; - propagatedBuildInputs = [pygobject]; + propagatedBuildInputs = [pygobject pycairo]; } |