mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Merge pull request #138457 from risicle/ris-apache-jena-4.2.0
apache-jena: 3.7.0 -> 4.2.0, apache-jena-fuseki: 3.13.1 -> 4.2.0
This commit is contained in:
commit
5aef5e8d1e
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena";
|
||||
version = "3.7.0";
|
||||
version = "4.2.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq";
|
||||
sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
|
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "3.13.1";
|
||||
version = "4.2.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "018b07icvjhd44c046rxfjiczcs63cic77cymgg4w8pd3na06c7y";
|
||||
sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
@ -20,7 +20,8 @@ stdenv.mkDerivation {
|
||||
};
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
ln -s "$out"/{fuseki-server,fuseki} "$out/bin"
|
||||
chmod +x $out/fuseki
|
||||
ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin"
|
||||
for i in "$out"/bin/*; do
|
||||
wrapProgram "$i" \
|
||||
--prefix "PATH" : "${java}/bin/" \
|
||||
|
@ -19895,11 +19895,11 @@ with pkgs;
|
||||
cassandra = cassandra_3_11;
|
||||
|
||||
apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
|
||||
java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
java = jre;
|
||||
};
|
||||
|
||||
apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix {
|
||||
java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
java = jre;
|
||||
};
|
||||
|
||||
apcupsd = callPackage ../servers/apcupsd { };
|
||||
|
Loading…
Reference in New Issue
Block a user