diff options
Diffstat (limited to 'pkgs/servers/nosql/apache-jena')
-rw-r--r-- | pkgs/servers/nosql/apache-jena/binary.nix | 39 | ||||
-rw-r--r-- | pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 36 | ||||
-rw-r--r-- | pkgs/servers/nosql/apache-jena/fuseki-binary.upstream | 4 |
3 files changed, 27 insertions, 52 deletions
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index e32f31926bcf2..983ff0e8be7d8 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -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"; - sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y="; +{ lib, stdenv, fetchurl, java, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "apache-jena"; + version = "4.4.0"; + src = fetchurl { + url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; + sha256 = "sha256-/+F7wKklFiJ3dTHd650IBSnAYOAx/ZLbk9ofoZF9E8k="; }; 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; - homepage = "http://jena.apache.org"; - downloadPage = "http://archive.apache.org/dist/jena/binaries/"; - updateWalker = true; - downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$"; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + homepage = "https://jena.apache.org"; + downloadPage = "https://archive.apache.org/dist/jena/binaries/"; }; } diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 849827c075d79..d7c53bc7aa833 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -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; - homepage = "http://jena.apache.org"; - downloadPage = "http://archive.apache.org/dist/jena/binaries/"; - downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$"; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + homepage = "https://jena.apache.org"; + downloadPage = "https://archive.apache.org/dist/jena/binaries/"; }; } diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream deleted file mode 100644 index a18675347d58a..0000000000000 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream +++ /dev/null @@ -1,4 +0,0 @@ -name apache-jena-fuseki -attribute apache-jena-fuseki -target fuseki-binary.nix -minimize_overwrite |