From 028f3ec7d0d0682b504945822862733fe74d75ba Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 21 Sep 2009 09:58:21 +0000
Subject: [PATCH] updating redland, adding rasqal, raptor, librdf

svn path=/nixpkgs/trunk/; revision=17320
---
 pkgs/development/libraries/librdf/default.nix | 19 +++++++++++++++
 pkgs/development/libraries/librdf/raptor.nix  | 21 ++++++++++++++++
 pkgs/development/libraries/librdf/rasqal.nix  | 24 +++++++++++++++++++
 .../development/libraries/redland/default.nix |  7 +++---
 pkgs/top-level/all-packages.nix               | 12 +++++++++-
 5 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/librdf/default.nix
 create mode 100644 pkgs/development/libraries/librdf/raptor.nix
 create mode 100644 pkgs/development/libraries/librdf/rasqal.nix

diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
new file mode 100644
index 000000000000..05ffb27bc0a4
--- /dev/null
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -0,0 +1,19 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "liblrdf-0.4.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/lrdf/liblrdf/0.4.0/liblrdf-0.4.0.tar.gz;
+    sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm";
+  };
+
+  buildInputs = [pkgconfig librdf_raptor ladspaH openssl zlib];
+
+  meta = { 
+    description = "A lightweight RDF library with special support for LADSPA plugins.";
+    homepage = http://sourceforge.net/projects/lrdf/;
+    license = "GPLv2";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
new file mode 100644
index 000000000000..294e51c66544
--- /dev/null
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -0,0 +1,21 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "raptor-1.4.19";
+
+  src = fetchurl {
+    url = http://download.librdf.org/source/raptor-1.4.19.tar.gz;
+    sha256 = "0qpfl73dvkhngica7wk9qglvd0b3fp9wqnjkl5q8m6h1kf8605ml";
+  };
+
+  buildInputs = [
+    #optional
+    libxml2 curl];
+
+  meta = { 
+    description = "The RDF Parser Toolkit";
+    homepage = "http://librdf.org/raptor";
+    license = "LGPL-2.1 Apache-2.0";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
new file mode 100644
index 000000000000..ff3bcbfbd161
--- /dev/null
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -0,0 +1,24 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "rasqal-0.9.16";
+
+  src = fetchurl {
+    url = http://download.librdf.org/source/rasqal-0.9.16.tar.gz;
+    sha256 = "1qvxbkynxwfw22hn2qbgxczzaq24h9649bcfbc598x9gq5m7hsq6";
+  };
+
+  buildInputs = [
+    librdf_raptor
+    gmp /*or mpfr*/
+    #optional
+    pcre libxml2 
+    ];
+
+  meta = { 
+    description = "library that handles Resource Description Framework (RDF)";
+    homepage = "http://librdf.org/rasqal";
+    license = "LGPL-2.1 Apache-2.0";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/redland/default.nix b/pkgs/development/libraries/redland/default.nix
index 94e8a98f7c02..83defbcf4ef8 100644
--- a/pkgs/development/libraries/redland/default.nix
+++ b/pkgs/development/libraries/redland/default.nix
@@ -1,17 +1,18 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "redland-1.0.7";
+  name = "redland-1.0.9";
 
   src = fetchurl {
     url = "mirror://sf/librdf/${name}.tar.gz";
-    sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z";
+    sha256 = "090mkrbssj9lm7hifkdrm7397sqcw0wx2ydz60iwrm2x9zcdx45a";
   };
   
-  buildInputs = [pkgconfig];
+  buildInputs = [pkgconfig librdf_raptor];
   
   propagatedBuildInputs = [
     bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
+    librdf_rasqal librdf_raptor
   ];
     
   configureFlags = "--with-threads --with-bdb=${bdb}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ba3fb7dcd7b..835b9567b352 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4153,10 +4153,20 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
+  librdf_raptor = import ../development/libraries/librdf/raptor.nix {
+    inherit fetchurl stdenv lib libxml2 curl;
+  };
+  librdf_rasqal = import ../development/libraries/librdf/rasqal.nix {
+    inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor;
+  };
+  librdf = import ../development/libraries/librdf {
+    inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
+  };
+
   # Also known as librdf, includes raptor and rasqal
   redland = import ../development/libraries/redland {
     inherit fetchurl stdenv openssl libxml2 pkgconfig perl postgresql sqlite
-      mysql libxslt curl pcre;
+      mysql libxslt curl pcre librdf_rasqal librdf_raptor;
     bdb = db4;
   };