freeplane: 1.9.5 -> 1.9.14

Signed-off-by: Maximilian Huber <gh@maxhbr.de>

+20 -15
+20 -15
pkgs/applications/misc/freeplane/default.nix
··· 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 }: 2 2 3 3 let 4 4 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; 6 13 7 14 src = fetchFromGitHub { 8 15 owner = pname; 9 16 repo = pname; 10 17 rev = "release-${version}"; 11 - sha256 = "qfhhmF3mePxcL4U8izkEmWaiaOLi4slsaymVnDoO3sY="; 18 + sha256 = src_sha256; 12 19 }; 13 20 14 21 deps = stdenv.mkDerivation { 15 22 name = "${pname}-deps"; 16 23 inherit src; 17 24 18 - nativeBuildInputs = [ jdk11 perl gradle_5 ]; 25 + nativeBuildInputs = [ jdk perl gradle ]; 19 26 20 27 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 22 29 ''; 23 30 24 31 # Mavenize dependency paths ··· 31 38 32 39 outputHashAlgo = "sha256"; 33 40 outputHashMode = "recursive"; 34 - outputHash = "xphTzaSXTGpP7vI/t4oIiv1ZpbekG2dFRzyl3ub6qnA="; 41 + outputHash = deps_outputHash; 35 42 }; 36 43 37 44 # Point to our local deps repo ··· 60 67 } 61 68 ''; 62 69 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 65 70 emoji = stdenv.mkDerivation rec { 66 71 name = "${pname}-emoji"; 67 72 inherit src; 68 73 69 - nativeBuildInputs = [ jdk11 gradle_5 ]; 74 + nativeBuildInputs = [ jdk gradle ]; 70 75 71 76 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 73 78 ''; 74 79 75 80 installPhase = '' ··· 80 85 81 86 outputHashAlgo = "sha256"; 82 87 outputHashMode = "recursive"; 83 - outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3"; 88 + outputHash = emoji_outputHash; 84 89 }; 85 90 86 91 in stdenv.mkDerivation rec { 87 92 inherit pname version src; 88 93 89 - nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ]; 94 + nativeBuildInputs = [ makeWrapper jdk gradle ]; 90 95 91 96 buildPhase = '' 92 97 mkdir -p -- ./freeplane/build/emoji/{txt,resources/images} 93 98 cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt 94 99 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 96 101 ''; 97 102 98 103 installPhase = '' ··· 102 107 cp -a ./BIN/. $out/share/${pname} 103 108 makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \ 104 109 --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 ]} 107 112 runHook postInstall 108 113 ''; 109 114