1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Commit graph

14 commits

Author SHA1 Message Date
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber 7807b74774 php: enable gd support (2d graphics) by default
svn path=/nixpkgs/trunk/; revision=13736
2009-01-11 14:31:48 +00:00
Marc Weber 692d493f4e php: enabling mbstring support by default
svn path=/nixpkgs/trunk/; revision=13704
2009-01-04 20:18:20 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Marc Weber 8e7577363b enabling php sockets openssl and curl support
svn path=/nixpkgs/trunk/; revision=12777
2008-08-31 06:36:56 +00:00
Eelco Dolstra bb2a310c5c * Cleaned up the PHP expression. Added support for GD. Also
turned on PostgreSQL support by default (maybe I shouldn't,
  since it makes PHP rather dependency-heavy...).

svn path=/nixpkgs/trunk/; revision=12002
2008-06-06 13:03:55 +00:00
Eelco Dolstra 15a322f887 * php_unstable: caused nix-env to barf on FreeBSD.
svn path=/nixpkgs/trunk/; revision=11464
2008-04-04 18:49:49 +00:00
Marc Weber 0b6e4828cc added php curl support
svn path=/nixpkgs/trunk/; revision=11446
2008-04-01 18:16:01 +00:00
Marc Weber 4122366233 added zlib support to PHP
svn path=/nixpkgs/trunk/; revision=10703
2008-02-15 11:12:56 +00:00
Marc Weber ef01d05ec9 PHP now with postgresql support
svn path=/nixpkgs/trunk/; revision=10510
2008-02-05 19:58:28 +00:00
Eelco Dolstra cb0c387ce2 * Updated Apache-related packages.
svn path=/nixpkgs/trunk/; revision=10502
2008-02-05 11:41:49 +00:00
Marc Weber 028b0d7ff4 broken comment php_unstable when compiling wihtout xdebug/ xdebug supported
svn path=/nixpkgs/trunk/; revision=10056
2008-01-03 10:46:18 +00:00
Marc Weber 742ae36bf1 svn path=/nixpkgs/trunk/; revision=9598 2007-11-06 13:47:00 +00:00
Marc Weber c7cf206bdd PHP with some configuration flags serving as example. Perhaps you can to extend it more easily if you need to
svn path=/nixpkgs/trunk/; revision=9588
2007-11-05 21:13:16 +00:00