From b1afe4e7ac3ab47d73bc1f748cc406e8e4910ecd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Jul 2010 07:02:26 +0000
Subject: [PATCH] * Finish renaming.
svn path=/nixpkgs/trunk/; revision=22801
---
.../interpreters/{php_configurable => php}/default.nix | 0
.../interpreters/{php_configurable => php}/fix.patch | 0
pkgs/top-level/all-packages.nix | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename pkgs/development/interpreters/{php_configurable => php}/default.nix (100%)
rename pkgs/development/interpreters/{php_configurable => php}/fix.patch (100%)
diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php/default.nix
similarity index 100%
rename from pkgs/development/interpreters/php_configurable/default.nix
rename to pkgs/development/interpreters/php/default.nix
diff --git a/pkgs/development/interpreters/php_configurable/fix.patch b/pkgs/development/interpreters/php/fix.patch
similarity index 100%
rename from pkgs/development/interpreters/php_configurable/fix.patch
rename to pkgs/development/interpreters/php/fix.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24f166dd2c8f..c6f75018dff4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2843,10 +2843,10 @@ let
perl = useFromStdenv "perl"
(if system != "i686-cygwin" then perl510 else sysPerl);
- php = makeOverridable (import ../development/interpreters/php_configurable) {
+ php = makeOverridable (import ../development/interpreters/php) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
- flex bison apacheHttpd mysql libxml2 # gettext
+ flex bison apacheHttpd mysql libxml2
zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng;
};