forked from mirrors/nixpkgs
Renaud
GitHub
parent
b0db7c4f7b
commit
f640cf49d1
|
|
@ -220,6 +220,11 @@
|
|||
in conjunction with an external webserver to replace this functionality.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The fourStore and fourStoreEndpoint modules have been removed.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ in
|
|||
#kdm = 39; # dropped in 17.03
|
||||
#ghostone = 40; # dropped in 18.03
|
||||
git = 41;
|
||||
fourstore = 42;
|
||||
fourstorehttp = 43;
|
||||
#fourstore = 42; # dropped in 20.03
|
||||
#fourstorehttp = 43; # dropped in 20.03
|
||||
virtuoso = 44;
|
||||
rtkit = 45;
|
||||
dovecot2 = 46;
|
||||
|
|
|
|||
|
|
@ -254,8 +254,6 @@
|
|||
./services/continuous-integration/jenkins/default.nix
|
||||
./services/continuous-integration/jenkins/job-builder.nix
|
||||
./services/continuous-integration/jenkins/slave.nix
|
||||
./services/databases/4store-endpoint.nix
|
||||
./services/databases/4store.nix
|
||||
./services/databases/aerospike.nix
|
||||
./services/databases/cassandra.nix
|
||||
./services/databases/clickhouse.nix
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.fourStoreEndpoint;
|
||||
endpointUser = "fourstorehttp";
|
||||
run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${endpointUser} -c";
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.fourStoreEndpoint = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
description = "Whether to enable 4Store SPARQL endpoint.";
|
||||
};
|
||||
|
||||
database = mkOption {
|
||||
default = config.services.fourStore.database;
|
||||
description = "RDF database name to expose via the endpoint. Defaults to local 4Store database name.";
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
default = null;
|
||||
description = "IP address to listen on.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
default = 8080;
|
||||
description = "port to listen on.";
|
||||
};
|
||||
|
||||
options = mkOption {
|
||||
default = "";
|
||||
description = "Extra CLI options to pass to 4Store's 4s-httpd process.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = singleton
|
||||
{ assertion = cfg.enable -> cfg.database != "";
|
||||
message = "Must specify 4Store database name";
|
||||
};
|
||||
|
||||
users.users = singleton
|
||||
{ name = endpointUser;
|
||||
uid = config.ids.uids.fourstorehttp;
|
||||
description = "4Store SPARQL endpoint user";
|
||||
};
|
||||
|
||||
services.avahi.enable = true;
|
||||
|
||||
systemd.services."4store-endpoint" = {
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
script = ''
|
||||
${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.fourStore;
|
||||
stateDir = "/var/lib/4store";
|
||||
fourStoreUser = "fourstore";
|
||||
run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fourStoreUser}";
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.fourStore = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
description = "Whether to enable 4Store RDF database server.";
|
||||
};
|
||||
|
||||
database = mkOption {
|
||||
default = "";
|
||||
description = "RDF database name. If it doesn't exist, it will be created. Databases are stored in ${stateDir}.";
|
||||
};
|
||||
|
||||
options = mkOption {
|
||||
default = "";
|
||||
description = "Extra CLI options to pass to 4Store.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = singleton
|
||||
{ assertion = cfg.enable -> cfg.database != "";
|
||||
message = "Must specify 4Store database name.";
|
||||
};
|
||||
|
||||
users.users = singleton
|
||||
{ name = fourStoreUser;
|
||||
uid = config.ids.uids.fourstore;
|
||||
description = "4Store database user";
|
||||
home = stateDir;
|
||||
};
|
||||
|
||||
services.avahi.enable = true;
|
||||
|
||||
systemd.services."4store" = {
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
preStart = ''
|
||||
mkdir -p ${stateDir}/
|
||||
chown ${fourStoreUser} ${stateDir}
|
||||
if ! test -e "${stateDir}/${cfg.database}"; then
|
||||
${run} -c '${pkgs.rdf4store}/bin/4s-backend-setup ${cfg.database}'
|
||||
fi
|
||||
'';
|
||||
|
||||
script = ''
|
||||
${run} -c '${pkgs.rdf4store}/bin/4s-backend -D ${cfg.options} ${cfg.database}'
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/src/frontend/filter-datatypes.c b/src/frontend/filter-datatypes.c
|
||||
index 8aae1dd..49ed358 100644
|
||||
--- a/src/frontend/filter-datatypes.c
|
||||
+++ b/src/frontend/filter-datatypes.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#define __USE_MISC
|
||||
+#define __USE_XOPEN_EXTENDED
|
||||
#include <time.h>
|
||||
|
||||
#include "filter.h"
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, librdf_raptor
|
||||
, librdf_rasqal, glib, libxml2, pcre
|
||||
, avahi, readline, ncurses, expat, autoreconfHook
|
||||
, zlib, pkgconfig, which, perl, libuuid
|
||||
, gmp, mpfr
|
||||
, db_dir ? "/var/lib/4store" }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "4store";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "4store";
|
||||
repo = "4store";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk";
|
||||
};
|
||||
|
||||
patches = [ ./4store-1.1.6-glibc-2.26.patch ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook perl pkgconfig which ];
|
||||
|
||||
buildInputs = [ librdf_raptor librdf_rasqal glib libxml2 pcre
|
||||
avahi readline ncurses expat zlib libuuid gmp mpfr ];
|
||||
|
||||
# needed for ./autogen.sh
|
||||
prePatch = ''
|
||||
echo "${version}" > .version
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's@#! */bin/bash@#! ${stdenv.shell}@' -i configure
|
||||
find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
|
||||
|
||||
rm src/utilities/4s-backend
|
||||
sed -e 's@/var/lib/4store@${db_dir}@g' -i configure.ac src/utilities/*
|
||||
sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile*
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SparQL query server (RDF storage)";
|
||||
homepage = https://4store.danielknoell.de/;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # since 2018-04-11
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
rec {
|
||||
version="v1.1.5";
|
||||
name="4store-v1.1.5";
|
||||
hash="0nwckvf8xqwvc2h3v6s1rvmxvcx2xrjy6yapghc052180jw6zp9b";
|
||||
url="http://4store.org/download/4store-${version}.tar.gz";
|
||||
advertisedUrl="http://4store.org/download/4store-v1.1.5.tar.gz";
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
downloadPage = "http://4store.org/download/";
|
||||
baseName = "4store";
|
||||
choiceCommand = "tail -n 1";
|
||||
versionExtractorSedScript = "s@.*-(v[0-9.]+)[.].*@\\1@";
|
||||
}
|
||||
|
|
@ -14912,8 +14912,6 @@ in
|
|||
kerberos = libkrb5;
|
||||
};
|
||||
|
||||
rdf4store = callPackage ../servers/http/4store { };
|
||||
|
||||
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
|
||||
apacheHttpd = pkgs.apacheHttpd_2_4;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue