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}:
let
s = # Generated upstream information
rec {
baseName="apache-jena";
version = "4.3.2";
name="${baseName}-${version}";
url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
{ lib, stdenv, fetchurl, java, makeWrapper }:
stdenv.mkDerivation rec {
pname = "apache-jena";
version = "4.3.2";
src = fetchurl {
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y=";
};
buildInputs = [
makeWrapper
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
installPhase = ''
cp -r . "$out"
for i in "$out"/bin/*; do
wrapProgram "$i" --prefix "PATH" : "${java}/bin/"
done
'';
meta = {
inherit (s) version;
meta = with lib; {
description = "RDF database";
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
homepage = "https://jena.apache.org";
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}:
let
s = # Generated upstream information
rec {
baseName="apache-jena-fuseki";
version = "4.3.1";
name="${baseName}-${version}";
url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
{ lib, stdenv, fetchurl, java, makeWrapper }:
stdenv.mkDerivation rec {
pname = "apache-jena-fuseki";
version = "4.3.1";
src = fetchurl {
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";
};
buildInputs = [
makeWrapper
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
installPhase = ''
cp -r . "$out"
chmod +x $out/fuseki
@ -29,14 +21,12 @@ stdenv.mkDerivation {
;
done
'';
meta = {
inherit (s) version;
meta = with lib; {
description = "SPARQL server";
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
homepage = "https://jena.apache.org";
downloadPage = "https://archive.apache.org/dist/jena/binaries/";
downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
};
}