From 912e9f2c80a11a4eb4549b6aa3bbbcb4c620433b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2009 08:55:37 +0000 Subject: [PATCH] * Revert Redland - see http://hydra.nixos.org/build/78513. svn path=/nixpkgs/trunk/; revision=17347 --- pkgs/development/libraries/redland/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/redland/default.nix b/pkgs/development/libraries/redland/default.nix index 83defbcf4ef8..94e8a98f7c02 100644 --- a/pkgs/development/libraries/redland/default.nix +++ b/pkgs/development/libraries/redland/default.nix @@ -1,18 +1,17 @@ args: with args; stdenv.mkDerivation rec { - name = "redland-1.0.9"; + name = "redland-1.0.7"; src = fetchurl { url = "mirror://sf/librdf/${name}.tar.gz"; - sha256 = "090mkrbssj9lm7hifkdrm7397sqcw0wx2ydz60iwrm2x9zcdx45a"; + sha256 = "1z160hhrnlyy5c8vh2hjza6kdfmzml8mg9dk8yffifkhnxjq5r2z"; }; - buildInputs = [pkgconfig librdf_raptor]; + buildInputs = [pkgconfig]; 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 6ff7fef0e678..953b8907a645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4182,7 +4182,7 @@ let # 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 librdf_rasqal librdf_raptor; + mysql libxslt curl pcre; bdb = db4; };