Merge pull request #155244 from Stunkymonkey/apache-jena-refactor

apache-jena: refactor, apache-jena-fuseki: refactor
This commit is contained in:
7c6f434c 2022-01-16 18:55:09 +00:00 committed by GitHub
commit e285be7511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 43 deletions

View File

@ -1,38 +1,27 @@
{lib, stdenv, fetchurl, java, makeWrapper}: { lib, stdenv, fetchurl, java, makeWrapper }:
let
s = # Generated upstream information stdenv.mkDerivation rec {
rec { pname = "apache-jena";
baseName="apache-jena"; version = "4.3.2";
version = "4.3.2"; src = fetchurl {
name="${baseName}-${version}"; url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y="; sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y=";
}; };
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
]; ];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
installPhase = '' installPhase = ''
cp -r . "$out" cp -r . "$out"
for i in "$out"/bin/*; do for i in "$out"/bin/*; do
wrapProgram "$i" --prefix "PATH" : "${java}/bin/" wrapProgram "$i" --prefix "PATH" : "${java}/bin/"
done done
''; '';
meta = { meta = with lib; {
inherit (s) version;
description = "RDF database"; description = "RDF database";
license = lib.licenses.asl20; license = licenses.asl20;
maintainers = [lib.maintainers.raskin]; maintainers = with maintainers; [ raskin ];
platforms = lib.platforms.linux; platforms = platforms.linux;
homepage = "https://jena.apache.org"; homepage = "https://jena.apache.org";
downloadPage = "https://archive.apache.org/dist/jena/binaries/"; downloadPage = "https://archive.apache.org/dist/jena/binaries/";
updateWalker = true;
downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";
}; };
} }

View File

@ -1,23 +1,15 @@
{lib, stdenv, fetchurl, java, makeWrapper}: { lib, stdenv, fetchurl, java, makeWrapper }:
let
s = # Generated upstream information stdenv.mkDerivation rec {
rec { pname = "apache-jena-fuseki";
baseName="apache-jena-fuseki"; version = "4.3.1";
version = "4.3.1"; src = fetchurl {
name="${baseName}-${version}"; url = "https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx"; sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";
}; };
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
]; ];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
installPhase = '' installPhase = ''
cp -r . "$out" cp -r . "$out"
chmod +x $out/fuseki chmod +x $out/fuseki
@ -29,14 +21,12 @@ stdenv.mkDerivation {
; ;
done done
''; '';
meta = { meta = with lib; {
inherit (s) version;
description = "SPARQL server"; description = "SPARQL server";
license = lib.licenses.asl20; license = licenses.asl20;
maintainers = [lib.maintainers.raskin]; maintainers = with maintainers; [ raskin ];
platforms = lib.platforms.linux; platforms = platforms.linux;
homepage = "https://jena.apache.org"; homepage = "https://jena.apache.org";
downloadPage = "https://archive.apache.org/dist/jena/binaries/"; downloadPage = "https://archive.apache.org/dist/jena/binaries/";
downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
}; };
} }