1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-10 22:57:15 +00:00
Commit graph

7 commits

Author SHA1 Message Date
Nixpkgs Monitor 143dcc1123 geos: update from 3.3.8 to 3.4.2 2013-12-12 03:11:34 +02:00
Lluís Batlle i Rossell 328774ab1f Updating qgis (1.8.0 & geos (3.3.8).
I also add libspatialindex and libspatialite, to get the latest qgis building.
2013-07-18 11:43:01 +02:00
Eelco Dolstra f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Marc Weber 6a9f333cea geos update 3.2.2 because of postgis
svn path=/nixpkgs/trunk/; revision=21690
2010-05-09 20:38:12 +00:00
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 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 d870cba8bc geos library added
svn path=/nixpkgs/trunk/; revision=9837
2007-12-03 16:01:51 +00:00