From 6fe8b8ed3c2eec7df228f1dbdafd9aa875ec94e6 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 24 Oct 2022 09:33:28 +0200 Subject: [PATCH] jadx: 1.4.4 -> 1.4.5 --- pkgs/tools/security/jadx/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index b5c9d869396e..ca26467502b1 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-ku82SHCJhrruJEiojH6Rp7FUWvM8KtvDivL8CE5C8gc="; + hash = "sha256-so82zzCXIJV5tIVUBJFZEpArThNQVqWASGofNzIobQM="; }; deps = stdenv.mkDerivation { @@ -37,10 +37,14 @@ let find $GRADLE_USER_HOME/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 + + # Work around okio-2.10.0 bug, fixed in 3.0. Remove "-jvm" from filename. + # https://github.com/square/okio/issues/954 + mv $out/com/squareup/okio/okio/2.10.0/okio{-jvm,}-2.10.0.jar ''; outputHashMode = "recursive"; - outputHash = "sha256-nGejkCScX45VMT2nNArqG+fqOGvDwzeH9Xob4XMtdow="; + outputHash = "sha256-J6YpBYVqx+aWiMFX/67T7bhu4RTlKVaT4t359YJ6m7I="; }; in stdenv.mkDerivation { inherit pname version src;