Author: urkud
Date: Mon Aug 15 18:04:51 2011
New Revision: 28589
URL: https://svn.nixos.org/websvn/nix/?rev=28589&sc=1
Log:
redland-1.0.14, move to librdf/
* rename redland to librdf_redland
* add compatibility alias
* propagate some inputs
Added:
nixpkgs/trunk/pkgs/development/libraries/librdf/redland.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/redland/
Modified:
nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix Mon Aug 15
18:04:40 2011 (r28588)
+++ nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix Mon Aug 15
18:04:51 2011 (r28589)
@@ -8,7 +8,11 @@
sha256 = "1drjcy1k9g72iis0ghllzn7n0w03bahhrd2p5hs39anbm6mr0yk9";
};
- buildInputs = [ pkgconfig librdf_raptor2 gmp pcre libxml2 ];
+ buildNativeInputs = [ pkgconfig ];
+
+ buildInputs = [ gmp pcre libxml2 ];
+
+ propagatedBuildInputs = [ librdf_raptor2 ];
postInstall = "rm -rvf $out/share/gtk-doc";
Added: nixpkgs/trunk/pkgs/development/libraries/librdf/redland.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/librdf/redland.nix Mon Aug 15
18:04:51 2011 (r28589)
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
+, curl, pcre, libxml2, librdf_rasqal
+, mysql, withMysql ? false
+, postgresql, withPostgresql ? false
+, sqlite, withSqlite ? true
+, db4, withBdb ? false
+}:
+
+stdenv.mkDerivation rec {
+ name = "redland-1.0.14";
+
+ src = fetchurl {
+ url = "http://download.librdf.org/source/${name}.tar.gz";;
+ sha256 = "1i460q9gslb7l75hjwc6w2kp2wk7fgp8lr7phamg33c6j013y30k";
+ };
+
+ buildNativeInputs = [ perl pkgconfig ];
+
+ buildInputs = [ openssl libxslt curl pcre libxml2 ]
+ ++ stdenv.lib.optional withMysql mysql
+ ++ stdenv.lib.optional withSqlite sqlite
+ ++ stdenv.lib.optional withPostgresql postgresql
+ ++ stdenv.lib.optional withBdb db4;
+
+ propagatedBuildInputs = [ librdf_rasqal ];
+
+ postInstall = "rm -rvf $out/share/gtk-doc";
+
+ configureFlags =
+ [ "--with-threads" ]
+ ++ stdenv.lib.optional withBdb "--with-bdb=${db4}";
+
+ meta = {
+ homepage = http://librdf.org/;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 15 18:04:40
2011 (r28588)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 15 18:04:51
2011 (r28589)
@@ -4319,15 +4319,13 @@
librdf_rasqal = callPackage ../development/libraries/librdf/rasqal.nix { };
+ librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
+
librdf = callPackage ../development/libraries/librdf { };
qrupdate = callPackage ../development/libraries/qrupdate { };
- redland = callPackage ../development/libraries/redland/1.0.10.nix {
- bdb = db4;
- postgresql = null;
- mysql = null;
- };
+ redland = pkgs.librdf_redland;
rhino = callPackage ../development/libraries/java/rhino {
ant = apacheAntGcj;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
