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

Merging from trunk. I solved some trivial merge conflicts.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
This commit is contained in:
Lluís Batlle i Rossell
2010-12-17 20:39:58 +00:00
parent e60ba9135a a6f1f87697
commit b48b2a7bb4
137 changed files with 1155 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/php/5.3.nix
View File

@@ -8,7 +8,7 @@ in
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.3.3";
version = "5.3.4";
name = "php_configurable-${version}";
@@ -151,7 +151,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
src = args.fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
sha256 = "16iz1cprpjw60nf6n5z6isdziyzj56i3r8161si58j65yd86g1zj";
sha256 = "1391yibyc7kcrnprv6g57s2m6ld6n9j2iybzvwd2srdihl8q6cm8";
name = "php-${version}.tar.bz2";
};