public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=16094
This commit is contained in:
Eelco Dolstra
2009-06-30 11:42:15 +00:00
parent 785e9630f0 d2419bccee
commit cdf4cf5c23
471 changed files with 16343 additions and 1627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/development/interpreters/clisp/2.44.1.nix Normal file
View File

@@ -0,0 +1,44 @@
args: with args;
stdenv.mkDerivation rec {
v = "2.44.1";
name = "clisp-${v}";
src =
fetchurl {
url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
};
inherit libsigsegv gettext coreutils;
buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
libXt pcre zlib libXpm xproto libXext xextproto libffi
libffcall];
# First, replace port 9090 (rather low, can be used)
# with 64237 (much higher, IANA private area, not
# anything rememberable).
patchPhase = ''
sed -e 's@9090@64237@g' -i tests/socket.tst
sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
'';
configureFlags = "--with-readline builddir --with-dynamic-ffi
--with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
--with-module=pcre --with-module=rawsock --with-module=readline
--with-module=syscalls --with-module=wildcard --with-module=zlib";
preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
cd builddir
'';
NIX_CFLAGS_COMPILE="-O0";
# TODO : make mod-check fails
doCheck = 1;
meta = {
description = "ANSI Common Lisp Implementation";
homepage = http://clisp.cons.org;
};
}

14
pkgs/development/interpreters/clisp/default.nix
View File

@@ -1,16 +1,17 @@
args: with args;
stdenv.mkDerivation rec {
v = "2.43";
v = "2.47";
name = "clisp-${v}";
src =
fetchurl {
url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
sha256 = "10qyn6wccnayf1cyvrcanay6c6laar6z1r608w7ijp6nb763q8dm";
url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
sha256 = "0slfx519pk75y5rf7wfna7jgyhkr4qp29z9zd1rcnnrhps11bpn7";
};
inherit libsigsegv gettext coreutils;
buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
libXt pcre zlib libXpm xproto libXext xextproto];
libXt pcre zlib libXpm xproto libXext xextproto libffi
libffcall];
# First, replace port 9090 (rather low, can be used)
# with 64237 (much higher, IANA private area, not
@@ -26,7 +27,10 @@ stdenv.mkDerivation rec {
--with-module=pcre --with-module=rawsock --with-module=readline
--with-module=syscalls --with-module=wildcard --with-module=zlib";
preBuild = "cd builddir";
preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
cd builddir
'';
NIX_CFLAGS_COMPILE="-O0";

10
pkgs/development/interpreters/io/default.nix
View File

@@ -2,10 +2,10 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
doPatchShebangs = args.doPatchShebangs;
version = lib.getAttr ["version"] "2008.03.30" args;
version = lib.attrByPath ["version"] "2008.03.30" args;
buildInputs = with args; [
zlib sqlite gmp libffi cairo ncurses freetype mesa
libpng libtiff libjpeg readline libsndfile libxml2
@@ -17,7 +17,7 @@ rec {
fetchurl {
url = "http://github.com/stevedekorte/io/tarball/${version}";
name = "io-${version}.tar.gz";
sha256 = "1vdjyqv86l290kzhyw8mwzfqgb279dl9nqmy6bih6g8n4yz36ady";
sha256 = "0mn7vm2q1r5l3la5k4hdx5cqrp3nhpw01ywnx43k9gfxkdbajn9g";
};
inherit buildInputs;
@@ -29,7 +29,7 @@ rec {
phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples")
(doPatchShebangs "$out/lib/io")];
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
for i in $pkgs ${
if args.stdenv ? glibc then args.stdenv.glibc else ""
} ${
@@ -41,7 +41,7 @@ rec {
done
'') ["minInit" "addInputs" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ensureDir $out/share/io
ln -s $out/lib/io/addons $out/share/io

18
pkgs/development/interpreters/jruby/default.nix Normal file
View File

@@ -0,0 +1,18 @@
args: with args;
stdenv.mkDerivation {
name = "jruby-1.1.6";
src = fetchurl {
url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz;
sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
};
buildInputs = [];
installPhase = '' ensureDir $out; cp -r * $out '';
meta = {
description = "ruby interpreter written in Java";
homepage = http://jruby.codehaus.org/;
license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
};
}

19
pkgs/development/interpreters/php_configurable/default.nix
View File

@@ -1,4 +1,4 @@
let version = "5.2.6"; in
let version = "5.2.9"; in
args: with args;
@@ -38,6 +38,11 @@ composableDerivation {} ( fixed : {
buildInputs = [ libxml2 ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
};
postgresql = {
configureFlags = ["--with-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
@@ -73,6 +78,10 @@ composableDerivation {} ( fixed : {
buildInputs = [gd];
};
soap = {
configureFlags = ["--enable-soap"];
};
sockets = {
configureFlags = ["--enable-sockets"];
};
@@ -115,18 +124,22 @@ composableDerivation {} ( fixed : {
curlSupport = true;
gettextSupport = true;
postgresqlSupport = true;
sqliteSupport = true;
soapSupport = true;
zlibSupport = true;
opnesslSupport = true;
opensslSupport = true;
xdebugSupport = true;
mbstringSupport = true;
gdSupport = true;
};
# only -O1
configurePhase = ''
iniFile=$out/etc/$name.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
echo configurePhase end
sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3
'';
installPhase = ''
@@ -162,7 +175,7 @@ composableDerivation {} ( fixed : {
src = args.fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
md5 = "7380ffecebd95c6edb317ef861229ebd";
md5 = "280d6cda7f72a4fc6de42fda21ac2db7";
name = "php-${version}.tar.bz2";
};

4
pkgs/development/interpreters/plt-scheme/default.nix
View File

@@ -1,5 +1,5 @@
args: with args;
let version = lib.getAttr ["version"] "4.0.1" args; in
let version = lib.attrByPath ["version"] "4.0.1" args; in
rec {
src = fetchurl {
url = "ftp://infogroep.be/pub/plt/bundles/${version}/plt/plt-${version}-src-unix.tgz";
@@ -15,7 +15,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
'') ["minInit" "addInputs" "doUnpack"];

140
pkgs/development/interpreters/python-new/2.5/default.nix
View File

@@ -12,10 +12,11 @@
p: # p = pkgs
let
inherit (builtins) isAttrs hasAttr;
inherit (p) lib fetchurl stdenv getConfig;
inherit (p.composableDerivation) composableDerivation;
# withName prevents nix-env -qa \* from aborting (pythonLibStub is a derivation but hasn't a name)
withName = lib.mapAttrs (n : v : if (__isAttrs v && (!__hasAttr "name" v)) then null else v);
withName = lib.mapAttrs (n : v : if (isAttrs v && (!hasAttr "name" v)) then null else v);
in
withName ( lib.fix ( t : { # t = this attrs
@@ -82,18 +83,7 @@ in
pythonLibStub = composableDerivation {} {
propagatedBuildInputs = [ t.pythonFull ]; # see [1]
postPhases = ["postAll"]; # using new name so that you dno't override this phase by accident
prePhases = ["defineValidatingEval"];
# ensure phases are run or a non zero exit status is caused (if there are any syntax errors such as eval "while")
defineValidatingEval = ''
eval(){
e="$(type eval | { read; while read line; do echo $line; done })"
unset eval;
local evalSucc="failure"
eval "evalSucc=ok;""$1"
eval "$e"
[ $evalSucc = "failure" ] && { echo "eval failed, snippet:"; echo "$1"; return 1; }
}
'';
postAll = ''
ensureDir $out/nix-support
echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook
@@ -113,6 +103,7 @@ in
libPython = t.version; # used to find all python libraries fitting this version (-> see name all below)
};
mergeAttrBy = {
postPhases = lib.concat;
pyCheck = x : y : "${x}\n${y}";
};
};
@@ -496,6 +487,129 @@ in
};
};
# unmantained ? (gentoo/ debian even do have python-3* patches)
pyxml = t.pythonLibSetup.merge {
name = "pyxml-0.8.4";
src = fetchurl {
url = mirror://sourceforge/pyxml/PyXML-0.8.4.tar.gz;
sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
};
meta = {
description = "python xml package";
homepage = http://sourceforge.net/projects/pyxml/;
license = "Python License"; # (CNRI Python License);
};
};
/*
# untested
libxml2dom = t.pythonLibSetup.merge {
name = "libxml2dom-0.4.7";
buildInputs = [ p.libxml2 ];
src = fetchurl {
url = http://www.boddie.org.uk/python/downloads/libxml2dom-0.4.7.tar.gz;
sha256 = "0zh68adxn4l4b6q99jl1pi00171ah2marbbs8qfww4wpjavfw844";
};
pyCheck = "import libxml2dom.svg";
meta = {
description = "provides a traditional DOM wrapper around the Python bindings for libxml2";
homepage = http://www.boddie.org.uk/python/libxml2dom.html;
license = "LGPL3+";
};
};
*/
fpconst = t.pythonLibSetup.merge {
name = "fpconst-0.7.3";
pyCheck = "import fpconst";
src = fetchurl {
url="mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz";
sha256 = "1a5c2e4a1ecefd9981988cea15068699eccbc55e350af3471e782083d390c727";
};
meta = {
description="Python Module for handling IEEE 754 floating point special values";
homepage="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/";
license = "GPLv2";
};
};
soappy = t.pythonLibSetup.merge {
name = "soappy-0.12";
pyCheck = "from SOAPpy import WSDL";
propagatedBuildInputs = [ t.fpconst ];
src = fetchurl {
url = "http://switch.dl.sourceforge.net/sourceforge/pywebsvcs/SOAPpy-0.12.0.tar.gz";
sha256 = "02a0wpir0gl0n9cl7a5hxliwsywvcw847i5in7i14i57kk6dl7rd";
};
patches = [ ./gentoo-python-2.5-compat.patch ];
meta = {
description = "SOAP implementation for Python";
homepage="http://pywebsvcs.sourceforge.net/";
license = "BSD";
};
};
sqlalchemy05 = t.pythonLibSetup.merge {
name = "sqlalchemy-0.5.5-svn-trunk";
pyCheck = ''
import sqlalchemy
import sqlalchemy.orm
import sqlalchemy.orm.collections
'';
src = p.bleedingEdgeRepos.sourceByName "sqlalchemy05";
meta = {
description = "sql orm wrapper for python";
homepage = http://www.sqlalchemy.org;
license = "MIT";
};
postPhases = ["installMigration"];
buildInputs = [ t.setuptools /* required for migration lib */ ];
/* impure ? I don't care right now
Reading http://pypi.python.org/simple/decorator/
Reading http://www.phyast.pitt.edu/~micheles/python/documentation.html
Best match: decorator 3.0.1
Downloading http://pypi.python.org/packages/source/d/decorator/decorator-3.0.1.tar.gz#md5=c4130a467be7f71154976c84af4a04c6
iElectric: column.alter could be broken ..
*/
installMigration = ''
cd $TMP
mkdir migrate
cd migrate
unpackFile ${p.bleedingEdgeRepos.sourceByName "sqlalchemyMigrate"}
cd *
python setup.py $setupFlags build
python setup.py $setupFlags install --prefix=$out
echo "import migrate.changeset.schema" | python
'';
/*
mv $out/lib/python2.5/site-packages/sqlalchemy_migrate-0.5.5.dev_r0-py2.5.egg/* \
$out/lib/python2.5/site-packages
*/
};
/* doesn't work on its own, its included in sqlalchemy05 for that reason.
sqlalchemyMigrate = t.pythonLibSetup.merge {
name = "sqlalchemy-migrate-svn";
buildInputs = [ t.setuptools t.sqlalchemy05 ];
pyCheck = ''
import migrate
import migrate.changeset
import migrate.changeset.schema
'';
src = p.bleedingEdgeRepos.sourceByName "sqlalchemyMigrate";
meta = {
description = "sqlalchemy database versioning and scheme migration";
homepage = http://packages.python.org/sqlalchemy-migrate/download.html;
license = "MIT";
};
};
*/
### python applications
pythonExStub = composableDerivation {} {
@@ -557,7 +671,7 @@ in
};
all = lib.filter (x:
(__isAttrs x)
(isAttrs x)
&& ((lib.maybeAttr "libPython" false x) == t.version)
&& (lib.maybeAttr "name" false x != false) # don't collect pythonLibStub etc
) (lib.flattenAttrs (removeAttrs t ["all"])); # nix is not yet lazy enough, so I've to remove all first

72
pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch Normal file
View File

@@ -0,0 +1,72 @@
diff --git a/SOAPpy/Client.py b/SOAPpy/Client.py
index 7437049..13ba160 100644
--- a/SOAPpy/Client.py
+++ b/SOAPpy/Client.py
@@ -40,11 +40,11 @@
################################################################################
"""
+from __future__ import nested_scopes
+
ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $'
from version import __version__
-from __future__ import nested_scopes
-
#import xml.sax
import urllib
from types import *
diff --git a/SOAPpy/GSIServer.py b/SOAPpy/GSIServer.py
index 48c1303..c7ad13d 100644
--- a/SOAPpy/GSIServer.py
+++ b/SOAPpy/GSIServer.py
@@ -43,11 +43,11 @@ GSIServer - Contributed by Ivan R. Judson <judson@mcs.anl.gov>
################################################################################
"""
+from __future__ import nested_scopes
+
ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $'
from version import __version__
-from __future__ import nested_scopes
-
#import xml.sax
import re
import socket
diff --git a/SOAPpy/Server.py b/SOAPpy/Server.py
index b28153d..76ce0b4 100644
--- a/SOAPpy/Server.py
+++ b/SOAPpy/Server.py
@@ -40,11 +40,11 @@
################################################################################
"""
+from __future__ import nested_scopes
+
ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $'
from version import __version__
-from __future__ import nested_scopes
-
#import xml.sax
import re
import socket
diff --git a/SOAPpy/Types.py b/SOAPpy/Types.py
index 6cc5456..62d44b2 100644
--- a/SOAPpy/Types.py
+++ b/SOAPpy/Types.py
@@ -33,11 +33,11 @@
################################################################################
"""
+from __future__ import nested_scopes
+
ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $'
from version import __version__
-from __future__ import nested_scopes
-
import UserList
import base64
import cgi

7
pkgs/development/interpreters/python/2.5/default.nix
View File

@@ -34,7 +34,7 @@ let
in
stdenv.mkDerivation {
stdenv.mkDerivation ( {
name = "python-2.5.4";
src = fetchurl {
@@ -50,7 +50,6 @@ stdenv.mkDerivation {
inherit buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared --with-wctype-functions";
preConfigure = ''
@@ -76,5 +75,5 @@ stdenv.mkDerivation {
opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null);
libPrefix = "python2.5";
};
}
} ;
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; } else {} ) )

2
pkgs/development/interpreters/ruby/gems.nix
View File

@@ -9,7 +9,7 @@ rec {
buildInputs = [ruby makeWrapper];
configureFlags = [];
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
ruby setup.rb --prefix=$out/
wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];