git.iko.soy/typeable/nixpkgs
on master help sign in
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

commit5aef5e8d1ed1d75eb3aed18133be26404d0ed433 authorMichael Raskin <7c6f434c@mail.ru> dateSat 18 Sep 2021, 21:29 (5 years ago) parent8fac2b1a53e02e
3 files changed+8−7
compare with master
unifiedsplit
pkgs/servers/nosql/apache-jena/binary.nix+2−2 pkgs/servers/nosql/apache-jena/fuseki-binary.nix+4−3 pkgs/top-level/all-packages.nix+2−2
pkgs/servers/nosql/apache-jena/binary.nix+2−2
@@ -3,10 +3,10 @@ let
33 s = # Generated upstream information
44 rec {
55 baseName="apache-jena";
6− version = "3.7.0";
6+ version = "4.2.0";
77 name="${baseName}-${version}";
88 url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
9− sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq";
9+ sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq";
1010 };
1111 buildInputs = [
1212 makeWrapper
pkgs/servers/nosql/apache-jena/fuseki-binary.nix+4−3
@@ -3,10 +3,10 @@ let
33 s = # Generated upstream information
44 rec {
55 baseName="apache-jena-fuseki";
6− version = "3.13.1";
6+ version = "4.2.0";
77 name="${baseName}-${version}";
88 url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
9− sha256 = "018b07icvjhd44c046rxfjiczcs63cic77cymgg4w8pd3na06c7y";
9+ sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h";
1010 };
1111 buildInputs = [
1212 makeWrapper
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
2020 };
2121 installPhase = ''
2222 cp -r . "$out"
23− ln -s "$out"/{fuseki-server,fuseki} "$out/bin"
23+ chmod +x $out/fuseki
24+ ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin"
2425 for i in "$out"/bin/*; do
2526 wrapProgram "$i" \
2627 --prefix "PATH" : "${java}/bin/" \
pkgs/top-level/all-packages.nix+2−2
@@ -19895,11 +19895,11 @@ with pkgs;
1989519895 cassandra = cassandra_3_11;
1989619896
1989719897 apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
19898− java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
19898+ java = jre;
1989919899 };
1990019900
1990119901 apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix {
19902− java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
19902+ java = jre;
1990319903 };
1990419904
1990519905 apcupsd = callPackage ../servers/apcupsd { };