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

Updating from trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
This commit is contained in:
Lluís Batlle i Rossell
2009-12-10 14:48:45 +00:00
parent 60788973d0 16eabd95b3
commit 89fe676bb3
124 changed files with 1304 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
let version = "5.2.9"; in
let version = "5.2.11"; in
args: with args;
@@ -177,7 +177,7 @@ composableDerivation {} ( fixed : {
src = args.fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
md5 = "280d6cda7f72a4fc6de42fda21ac2db7";
md5 = "286bf34630f5643c25ebcedfec5e0a09";
name = "php-${version}.tar.bz2";
};

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

@@ -82,4 +82,4 @@ stdenv.mkDerivation ( {
# - On Darwin, `python.exe' fails with "Bus Error".
platforms = stdenv.lib.platforms.allBut "i686-darwin";
};
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) )

2
pkgs/development/interpreters/python/2.6/default.nix
View File

@@ -89,4 +89,4 @@ stdenv.mkDerivation ( {
meta = {
platforms = stdenv.lib.platforms;
};
} // (if stdenv.system == "i686-darwin" then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )