@@ -1,24 +1,31 @@
1−{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_5, which }:
1+{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_6, which }:
22
33let
44 pname = "freeplane";
5− version = "1.9.5";
5+ version = "1.9.14";
6+
7+ src_sha256 = "UiXtGJs+hibB63BaDDLXgjt3INBs+NfMsKcX2Q/kxKw=";
8+ deps_outputHash = "tHhRaMIQK8ERuzm+qB9tRe2XSesL0bN3rComB9/qWgg=";
9+ emoji_outputHash = "w96or4lpKCRK8A5HaB4Eakr7oVSiQALJ9tCJvKZaM34=";
10+
11+ jdk = jdk11;
12+ gradle = gradle_6;
613
714 src = fetchFromGitHub {
815 owner = pname;
916 repo = pname;
1017 rev = "release-${version}";
11− sha256 = "qfhhmF3mePxcL4U8izkEmWaiaOLi4slsaymVnDoO3sY=";
18+ sha256 = src_sha256;
1219 };
1320
1421 deps = stdenv.mkDerivation {
1522 name = "${pname}-deps";
1623 inherit src;
1724
18− nativeBuildInputs = [ jdk11 perl gradle_5 ];
25+ nativeBuildInputs = [ jdk perl gradle ];
1926
2027 buildPhase = ''
21− GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon jar
28+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon jar
2229 '';
2330
2431 # Mavenize dependency paths
@@ -31,7 +38,7 @@ let
3138
3239 outputHashAlgo = "sha256";
3340 outputHashMode = "recursive";
34− outputHash = "xphTzaSXTGpP7vI/t4oIiv1ZpbekG2dFRzyl3ub6qnA=";
41+ outputHash = deps_outputHash;
3542 };
3643
3744 # Point to our local deps repo
@@ -60,16 +67,14 @@ let
6067 }
6168 '';
6269
63− # downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle
64− # the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1
6570 emoji = stdenv.mkDerivation rec {
6671 name = "${pname}-emoji";
6772 inherit src;
6873
69− nativeBuildInputs = [ jdk11 gradle_5 ];
74+ nativeBuildInputs = [ jdk gradle ];
7075
7176 buildPhase = ''
72− GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses
77+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} :freeplane:downloadEmoji
7378 '';
7479
7580 installPhase = ''
@@ -80,19 +85,19 @@ let
8085
8186 outputHashAlgo = "sha256";
8287 outputHashMode = "recursive";
83− outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3";
88+ outputHash = emoji_outputHash;
8489 };
8590
8691in stdenv.mkDerivation rec {
8792 inherit pname version src;
8893
89− nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ];
94+ nativeBuildInputs = [ makeWrapper jdk gradle ];
9095
9196 buildPhase = ''
9297 mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
9398 cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt
9499 cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji
95− GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
100+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
96101 '';
97102
98103 installPhase = ''
@@ -102,8 +107,8 @@ in stdenv.mkDerivation rec {
102107 cp -a ./BIN/. $out/share/${pname}
103108 makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \
104109 --set FREEPLANE_BASE_DIR $out/share/${pname} \
105− --set JAVA_HOME ${jdk11} \
106− --prefix PATH : ${lib.makeBinPath [ jdk11 which ]}
110+ --set JAVA_HOME ${jdk} \
111+ --prefix PATH : ${lib.makeBinPath [ jdk which ]}
107112 runHook postInstall
108113 '';
109114