From 62bce8ce7fa0bb66cf188ca864c8699dc6b4f17a Mon Sep 17 00:00:00 2001 From: David Asabina Date: Thu, 24 Jan 2019 11:28:05 +0100 Subject: [PATCH 1/4] ganttproject-bin: 2.7.2 -> 2.8.9 --- pkgs/applications/misc/ganttproject-bin/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 2257b2a98fb..4ce45718496 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "ganttproject-bin-${version}"; - version = "2.7.2"; + version = "2.8.9"; - src = let build = "r1954"; in fetchzip { - sha256 = "0l655w6n88j7klz56af8xkpiv1pwlkfl5x1d33sqv9dnyisyw2hc"; + src = let build = "r2335"; in fetchzip { + sha256 = "1fmfrsy9z2nff0bxwj7xsfbwkb9y1dmssvy5wkmf9ngihyzj3w1k"; url = "https://dl.ganttproject.biz/ganttproject-${version}/" + "ganttproject-${version}-${build}.zip"; }; @@ -37,9 +37,6 @@ stdenv.mkDerivation rec { --set JAVA_HOME "${jre}" mv -v "$out/share/ganttproject/ganttproject" "$out/bin" - install -v -Dm644 \ - plugins/net.sourceforge.ganttproject/data/resources/icons/ganttproject.png \ - "$out/share/pixmaps/ganttproject.png" cp -rv "${desktopItem}/share/applications" "$out/share" ''; From a2f3b8653ddafd5a060fe4341f2ca289956caec6 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Thu, 24 Jan 2019 11:55:11 +0100 Subject: [PATCH 2/4] ganttproject-bin: add myself as maintainer --- pkgs/applications/misc/ganttproject-bin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 4ce45718496..08b9f714588 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.vidbina ]; }; } From 6932d934a24caa50d91990987c2e8269581328ed Mon Sep 17 00:00:00 2001 From: David Asabina Date: Thu, 24 Jan 2019 12:24:14 +0100 Subject: [PATCH 3/4] ganttproject-bin: enable anti-aliasing by default On my setup the GUI text is anti-aliased. Since I have a hi-res display it works quite well for me but since I can imagine that other user may not want anti-aliasing on their machines (perhaps because they have lower-res displays) and can override the javaOptions array to control this behavior. --- pkgs/applications/misc/ganttproject-bin/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 08b9f714588..9e9d857d23b 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchzip, makeDesktopItem, makeWrapper -, jre }: +{ stdenv, lib, fetchzip, makeDesktopItem, makeWrapper +, jre +}: stdenv.mkDerivation rec { name = "ganttproject-bin-${version}"; @@ -28,13 +29,19 @@ stdenv.mkDerivation rec { categories = "Office;Application;"; }; + javaOptions = [ + "-Dawt.useSystemAAFontSettings=on" + ]; + in '' mkdir -pv "$out/share/ganttproject" cp -rv * "$out/share/ganttproject" mkdir -pv "$out/bin" wrapProgram "$out/share/ganttproject/ganttproject" \ - --set JAVA_HOME "${jre}" + --set JAVA_HOME "${jre}" \ + --set _JAVA_OPTIONS "${builtins.toString javaOptions}" + mv -v "$out/share/ganttproject/ganttproject" "$out/bin" cp -rv "${desktopItem}/share/applications" "$out/share" From 5c3c126b65147234364437fca83b198ff0177ab6 Mon Sep 17 00:00:00 2001 From: David Asabina Date: Wed, 6 Mar 2019 14:36:57 +0100 Subject: [PATCH 4/4] ganttproject-bin: 2.8.9 -> 2.8.10 --- pkgs/applications/misc/ganttproject-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 9e9d857d23b..6bc18ba3790 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "ganttproject-bin-${version}"; - version = "2.8.9"; + version = "2.8.10"; - src = let build = "r2335"; in fetchzip { - sha256 = "1fmfrsy9z2nff0bxwj7xsfbwkb9y1dmssvy5wkmf9ngihyzj3w1k"; + src = let build = "r2364"; in fetchzip { + sha256 = "0cclgyqv4f9pjsdlh93cqvgbzrp8ajvrpc2xszs03sknqz2kdh7r"; url = "https://dl.ganttproject.biz/ganttproject-${version}/" + "ganttproject-${version}-${build}.zip"; };