Merge pull request #86427 from flokli/jameica-2.8.6

jameica: 2.8.4 -> 2.8.6
This commit is contained in:
Florian Klink 2020-05-01 02:59:58 +02:00 committed by GitHub
commit 30db7b6ea3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
let let
_version = "2.8.4"; _version = "2.8.6";
_build = "453"; _build = "455";
version = "${_version}-${_build}"; version = "${_version}-${_build}";
name = "jameica-${version}"; name = "jameica-${version}";
@ -17,7 +17,7 @@ let
comment = "Free Runtime Environment for Java Applications."; comment = "Free Runtime Environment for Java Applications.";
desktopName = "Jameica"; desktopName = "Jameica";
genericName = "Jameica"; genericName = "Jameica";
categories = "Application;Office;"; categories = "Office;";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "willuhn"; owner = "willuhn";
repo = "jameica"; repo = "jameica";
rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl"; sha256 = "1pndklxsvixy6zyblqr62ki3pqaq8lfrzgasrvhclqxxh76gjlss";
}; };
# there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries