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

Turn more licenses into lib.licenses style

Browse Source 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
This commit is contained in:
Mateusz Kowalczyk
2014-11-06 00:44:33 +00:00
parent d91986c24f
commit 007f80c1d0
187 changed files with 835 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/php/5.4.nix
View File

@@ -185,12 +185,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
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.
Xdebug could be put in its own derivation.
* /
meta = {
description = "debugging support for PHP";
homepage = http://xdebug.org;
license = "based on the PHP license - as is";
};
*/
};
@@ -255,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
meta = {
description = "An HTML-embedded scripting language";
homepage = http://www.php.net/;
license = "PHP-3";
license = stdenv.lib.licenses.php301;
};
patches = [ ./fix-5.4.patch ];