about summary refs log tree commit diff
path: root/pkgs/by-name/fr
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2024-05-19 19:14:23 +0200
committerPol Dellaiera <pol.dellaiera@protonmail.com>2024-05-19 22:54:45 +0200
commit97ea42f642017f57c802561856b10ef23b9c4328 (patch)
tree05d3de038ca5f36c8faae9453ee85b9332db9c64 /pkgs/by-name/fr
parentc94251cd8feb57a30896a613d72fc383969bfeb0 (diff)
freeplane: 1.11.8 -> 1.11.14
Co-authored-by: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Diffstat (limited to 'pkgs/by-name/fr')
-rw-r--r--pkgs/by-name/fr/freeplane/package.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix
index 2346b51ceae5d..5ce7cebac0987 100644
--- a/pkgs/by-name/fr/freeplane/package.nix
+++ b/pkgs/by-name/fr/freeplane/package.nix
@@ -13,7 +13,7 @@
 
 let
   pname = "freeplane";
-  version = "1.11.8";
+  version = "1.11.14";
 
   jdk = jdk17;
   gradle = gradle_7;
@@ -22,7 +22,7 @@ let
     owner = "freeplane";
     repo = "freeplane";
     rev = "release-${version}";
-    hash = "sha256-Qh2V265FvQpqGKmPsiswnC5yECwIcNwMI3/Ka9sBqXE=";
+    hash = "sha256-zEQjB57iiKVQnH8VtynpEGKNAa2e+WpqnGt6fnv5Rjs=";
   };
 
   deps = stdenvNoCC.mkDerivation {
@@ -48,11 +48,9 @@ let
       find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
         | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
         | sh
-      # com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar expected to exist under name okio-2.10.0.jar
+      # com/squareup/okio/okio-jvm/x.y.z/okio-jvm-x.y.z.jar is expected to exist under com/squareup/okio/okio/x.y.z/okio-x.y.z.jar
       while IFS="" read -r -d "" path; do
-        dir=''${path%/*}; file=''${path##*/}; dest=''${file//-jvm-/-}
-        [[ -e $dir/$dest ]] && continue
-        ln -s "$dir/$file" "$dir/$dest"
+        ln -s "$path" ''${path//okio-jvm/okio}
       done < <(find "$out" -type f -name 'okio-jvm-*.jar' -print0)
       runHook postInstall
     '';
@@ -61,7 +59,7 @@ let
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "sha256-2Zaw4FW12dThdr082dEB1EYkGwNiayz501wIPGXUfBw=";
+    outputHash = "sha256-mWQTe/hOWGwWtsUPCZ7gle2FtskcEmJwsGQZITEc/Uc=";
   };
 
   # Point to our local deps repo