From a53e02e3ec3fa770e9449924c45fe99bc10a1cda Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Sep 2021 21:27:15 +0100 Subject: [PATCH] apache-jena-fuseki: 3.13.1 -> 4.2.0 --- pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 7084130eaef8..9be009f3b1f1 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -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/" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee123b2bb341..4b361878c7e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19897,7 +19897,7 @@ with pkgs; }; 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 { };