From fff1cc805a4d65b331bd40cc2e06b86b4fe55b07 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Mar 2015 11:06:41 +0100 Subject: [PATCH 1/3] add calendar functions to PHP by default --- pkgs/development/interpreters/php/5.4.nix | 5 +++++ pkgs/development/interpreters/php/5.5.nix | 4 ++++ pkgs/development/interpreters/php/5.6.nix | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index dab983a13494..75e3b6b2be96 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -189,6 +189,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-maintainer-zts"]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -229,6 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); ztsSupport = config.php.zts or false; + calendarSupport = config.php.calendar or false; }; configurePhase = '' diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 70380889bd3c..27878925e88f 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -193,6 +193,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; }; cfg = { @@ -227,6 +230,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index bf0f2076c1c4..aba94d639328 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -193,6 +193,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + + calendar = { + configureFlags = ["--enable-calendar"]; + }; + }; cfg = { @@ -227,6 +232,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' From 9d26ad274a8fbb476c286eda2ee3294064822533 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Mar 2015 11:24:43 +0100 Subject: [PATCH 2/3] rename weirdly called patch for php --- pkgs/development/interpreters/php/5.4.nix | 2 +- pkgs/development/interpreters/php/5.5.nix | 2 +- pkgs/development/interpreters/php/5.6.nix | 2 +- .../interpreters/php/{fix-5.4.patch => fix-paths.patch} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/interpreters/php/{fix-5.4.patch => fix-paths.patch} (100%) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 75e3b6b2be96..598d4fa7d1d4 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -267,6 +267,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) license = stdenv.lib.licenses.php301; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 27878925e88f..f4933ede9d3b 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -264,6 +264,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) license = stdenv.lib.licenses.php301; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index aba94d639328..a0131dcdac57 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -266,6 +266,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) license = stdenv.lib.licenses.php301; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/fix-5.4.patch b/pkgs/development/interpreters/php/fix-paths.patch similarity index 100% rename from pkgs/development/interpreters/php/fix-5.4.patch rename to pkgs/development/interpreters/php/fix-paths.patch From 282530454a7d4388b462f277b0296f385ad52fb5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 11 Mar 2015 11:24:55 +0100 Subject: [PATCH 3/3] add myself as php and rustc maintainer --- lib/maintainers.nix | 1 + pkgs/development/compilers/rustc/makeRustcDerivation.nix | 2 +- pkgs/development/interpreters/php/5.4.nix | 3 ++- pkgs/development/interpreters/php/5.5.nix | 3 ++- pkgs/development/interpreters/php/5.6.nix | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a16f6ed9631c..a25b20667ca7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -80,6 +80,7 @@ garbas = "Rok Garbas "; garrison = "Jim Garrison "; gavin = "Gavin Rogers "; + globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index 7be005fb763e..0059fd82227b 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -61,7 +61,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin ]; license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 598d4fa7d1d4..49740fddb466 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -261,10 +261,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index f4933ede9d3b..fac046548470 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -258,10 +258,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index a0131dcdac57..6559ecfa658c 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -260,10 +260,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "0vfhvwn84lrz9psf10sjnwljbna1r7yqxq3lmsh5qajifl3lraxd"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; patches = [ ./fix-paths.patch ];