Get rid of redland-1.0.8

1.0.9 was buggy, but it is fixed in 1.0.10

svn path=/nixpkgs/trunk/; revision=20930

5 files changed, 4 insertions, 58 deletions

diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index d6e19d4f6c38..6b0ecc5aeef2 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -23,8 +23,7 @@ pkgs.recurseIntoAttrs (rec {
   
   soprano = import ./support/soprano {
     inherit (pkgs) stdenv fetchurl lib cmake;
-    inherit (pkgs) qt4 cluceneCore;
-    redland = pkgs.redland_1_0_8;
+    inherit (pkgs) qt4 cluceneCore redland;
   };
   
   qimageblitz = import ./support/qimageblitz {
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 775239376d84..95e40bc2ae12 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -23,8 +23,7 @@ pkgs.recurseIntoAttrs (rec {
   
   soprano = import ./support/soprano {
     inherit (pkgs) stdenv fetchurl lib cmake;
-    inherit (pkgs) qt4 cluceneCore;
-    redland = pkgs.redland_1_0_8;
+    inherit (pkgs) qt4 cluceneCore redland;
   };
   
   qimageblitz = import ./support/qimageblitz {
diff --git a/pkgs/development/libraries/redland/1.0.10.nix b/pkgs/development/libraries/redland/1.0.10.nix
index 141094a81604..959581d407e5 100644
--- a/pkgs/development/libraries/redland/1.0.10.nix
+++ b/pkgs/development/libraries/redland/1.0.10.nix
@@ -22,14 +22,5 @@ stdenv.mkDerivation rec {
     [ "--with-threads" ]
     ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
   
-  patchPhase =
-    ''
-      sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl
-
-      # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API
-      # that collides with a symbol of the same name in sqlite 3.6.19.
-      # This is a quick fix for the problem. A real solution needs to be
-      # implemented upstream, though.
-      find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \;
-    '';
+  patchPhase ="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
 }
diff --git a/pkgs/development/libraries/redland/1.0.8.nix b/pkgs/development/libraries/redland/1.0.8.nix
deleted file mode 100644
index 6d0294ee394a..000000000000
--- a/pkgs/development/libraries/redland/1.0.8.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
-, curl, pcre, libxml2, librdf_rasqal, librdf_raptor
-, mysql ? null, postgresql ? null, sqlite ? null, bdb ? null
-}:
-
-stdenv.mkDerivation rec {
-  name = "redland-1.0.8";
-
-  src = fetchurl {
-    url = "mirror://sf/librdf/${name}.tar.gz";
-    sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe";
-  };
-  
-  buildInputs = [ pkgconfig ];
-  
-  propagatedBuildInputs =
-    [ bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
-      librdf_rasqal librdf_raptor
-    ];
-    
-  configureFlags =
-    [ "--with-threads" ]
-    ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
-  
-  patchPhase =
-    ''
-      sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl
-
-      # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API
-      # that collides with a symbol of the same name in sqlite 3.6.19.
-      # This is a quick fix for the problem. A real solution needs to be
-      # implemented upstream, though.
-      find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \;
-    '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7db3a233121c..c194daac1357 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4912,15 +4912,7 @@ let
     inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
   };
 
-  redland = redland_1_0_10;
-
-  redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) {
-    inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
-      libxslt curl pcre librdf_rasqal librdf_raptor;
-    bdb = db4;
-  };
-
-  redland_1_0_10 = makeOverridable (import ../development/libraries/redland/1.0.10.nix) {
+  redland = makeOverridable (import ../development/libraries/redland/1.0.10.nix) {
     inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite
       mysql libxslt curl pcre librdf_rasqal librdf_raptor;
     bdb = db4;