Author: raskin Date: 2010-06-30 21:51:48 +0000 (Wed, 30 Jun 2010) New Revision: 22434
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22434&view=rev Added: nixpkgs/trunk/pkgs/servers/http/4store/ nixpkgs/trunk/pkgs/servers/http/4store/default.nix nixpkgs/trunk/pkgs/servers/http/4store/src-for-default.nix nixpkgs/trunk/pkgs/servers/http/4store/src-info-for-default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Adding 4store RDF storage/SparQL server Changes: Modified: nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix 2010-06-30 15:54:40 UTC (rev 22433) +++ nixpkgs/trunk/pkgs/development/libraries/librdf/rasqal.nix 2010-06-30 21:51:48 UTC (rev 22434) @@ -1,15 +1,16 @@ args: with args; -stdenv.mkDerivation { - name = "rasqal-0.9.16"; +stdenv.mkDerivation rec { + name = "rasqal-0.9.19"; src = fetchurl { - url = http://download.librdf.org/source/rasqal-0.9.16.tar.gz; - sha256 = "1qvxbkynxwfw22hn2qbgxczzaq24h9649bcfbc598x9gq5m7hsq6"; + url = "http://download.librdf.org/source/${name}.tar.gz";; + sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08"; }; buildInputs = [ librdf_raptor gmp /*or mpfr*/ + pkgconfig #optional pcre libxml2 ]; Added: nixpkgs/trunk/pkgs/servers/http/4store/default.nix =================================================================== --- nixpkgs/trunk/pkgs/servers/http/4store/default.nix (rev 0) +++ nixpkgs/trunk/pkgs/servers/http/4store/default.nix 2010-06-30 21:51:48 UTC (rev 22434) @@ -0,0 +1,44 @@ +...@{builderdefspackage + , librdf_raptor, librdf_rasqal, + glib, libxml2, pcre, avahi, + readline, ncurses, expat, + zlib, pkgconfig, which, + db_dir ? "/var/lib/4store" + , ...}: +builderDefsPackage +(a : +let + s = import ./src-for-default.nix; + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + ["db_dir"]; + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); +in +rec { + src = a.fetchUrlFromSrcInfo s; + + inherit (s) name; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"]; + + doFixConfigure = a.fullDepEntry '' + sed -e 's...@#! */bin/b...@#! ${a.stdenv.shell}@' -i configure + find . -name Makefile -exec sed -e "s@/usr/lo...@$out@g" -i '{}' ';' + sed -e '/\/var\/lib\/4store/d' -i src/utilities/Makefile + + sed -e 's@/var/lib/4st...@${db_dir}@g' -i src/common/params.h src/utilities/* + '' ["minInit" "doUnpack"]; + + meta = { + description = "SparQL query server (RDF storage)"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; +}) x + Added: nixpkgs/trunk/pkgs/servers/http/4store/src-for-default.nix =================================================================== --- nixpkgs/trunk/pkgs/servers/http/4store/src-for-default.nix (rev 0) +++ nixpkgs/trunk/pkgs/servers/http/4store/src-for-default.nix 2010-06-30 21:51:48 UTC (rev 22434) @@ -0,0 +1,9 @@ +rec { + version="v1.0.3"; + name="4store-v1.0.3"; + hash="1d3n2xgqrq2kgigql3slxw1w2bml3b57xa7h6x9dbngxcz11xg22"; + url="http://4store.org/download/4store-${version}.tar.gz";; + advertisedUrl="http://4store.org/download/4store-v1.0.3.tar.gz";; + + +} Added: nixpkgs/trunk/pkgs/servers/http/4store/src-info-for-default.nix =================================================================== --- nixpkgs/trunk/pkgs/servers/http/4store/src-info-for-default.nix (rev 0) +++ nixpkgs/trunk/pkgs/servers/http/4store/src-info-for-default.nix 2010-06-30 21:51:48 UTC (rev 22434) @@ -0,0 +1,6 @@ +{ + downloadPage = "http://4store.org/download/";; + baseName = "4store"; + choiceCommand = "tail -n 1"; + versionExtractorSedScript = "s...@.*-(v[0-9.]+)[....@\\1@"; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-30 15:54:40 UTC (rev 22433) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-30 21:51:48 UTC (rev 22434) @@ -5223,7 +5223,7 @@ }; librdf_rasqal = import ../development/libraries/librdf/rasqal.nix { - inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor; + inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor pkgconfig; }; librdf = import ../development/libraries/librdf { @@ -5756,6 +5756,11 @@ ### SERVERS + rdf4store = import ../servers/http/4store { + inherit builderDefsPackage librdf_raptor librdf_rasqal libxml2 + pcre avahi readline ncurses expat zlib pkgconfig which; + inherit (gtkLibs) glib; + }; apacheHttpd = makeOverridable (import ../servers/http/apache-httpd) { inherit (pkgsOverriden) fetchurl stdenv perl openssl zlib apr aprutil pcre; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
