Author: viric
Date: Fri Nov 26 14:26:15 2010
New Revision: 24872
URL: https://svn.nixos.org/websvn/nix/?rev=24872&sc=1
Log:
Adding php 5.2 (5.3 does not build on arm), although not the default in the
attribute 'php'.
Added:
nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix
- copied, changed from r24869,
nixpkgs/trunk/pkgs/development/interpreters/php/default.nix
nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix
- copied, changed from r24869,
nixpkgs/trunk/pkgs/development/interpreters/php/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/interpreters/php/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix
(from r24869, nixpkgs/trunk/pkgs/development/interpreters/php/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/php/default.nix Fri Nov 26
12:38:42 2010 (r24869, copy source)
+++ nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix Fri Nov 26
14:26:15 2010 (r24872)
@@ -8,7 +8,7 @@
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
- version = "5.3.3";
+ version = "5.2.14";
name = "php_configurable-${version}";
@@ -151,7 +151,7 @@
src = args.fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";;
- sha256 = "16iz1cprpjw60nf6n5z6isdziyzj56i3r8161si58j65yd86g1zj";
+ sha256 = "1l9b7iv0f6ds9x2ayclcfgjh62xbabbv11ixp5cqsyaq2ba5ynsi";
name = "php-${version}.tar.bz2";
};
Copied and modified: nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix
(from r24869, nixpkgs/trunk/pkgs/development/interpreters/php/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Nov 26 14:16:12
2010 (r24871)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Nov 26 14:26:15
2010 (r24872)
@@ -2109,7 +2109,16 @@
perl = if system != "i686-cygwin" then perl510 else sysPerl;
- php = makeOverridable (import ../development/interpreters/php) {
+ php = php5_3;
+
+ php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) {
+ inherit
+ stdenv fetchurl lib composableDerivation autoconf automake
+ flex bison apacheHttpd mysql libxml2
+ zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv
libjpeg libpng;
+ };
+
+ php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
