diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix index 003b36dea253..4db9aae029e5 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix @@ -5,13 +5,13 @@ }: maven.buildMavenPackage rec { pname = "binary-file-toolkit"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "boricj"; repo = "binary-file-toolkit"; tag = "v${version}"; - hash = "sha256-ABDJDdx0OxXVOgYAw4kZAP3Psr+w7YevP1xk1RszXw8="; + hash = "sha256-HMzRh/Q06Ik33mEkmh5U6qLiWk7ZCEstYq3Ll/pFhXM="; }; mvnHash = "sha256-Ek2qulMSHd1ZJfEloo6fIe+QMqub/Ftna/TzTt01ky8="; diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix index c089a154c893..0c88293b41a0 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix @@ -9,26 +9,27 @@ }: ghidra.buildGhidraExtension (finalAttrs: { pname = "ghidra-delinker-extension"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "boricj"; repo = "ghidra-delinker-extension"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hgpf1eqP/DRYczRDvAhXTWoycHe8N/xhMorlYDjytZg="; + hash = "sha256-Wqxi/xF+HMG9wQUiHwilKX8PkdtHtGaNrXZyPMjT4iE="; }; patches = [ # The GitHub Maven repository is not available unauthenticated, # so patch in the dependency this way and replace the fake path # with the locally built derivation later. - # This is tracked at boricj/binary-file-toolkit#1. + # The vendored-in dependency does not work for us because maven + # needs to download dependencies while building. ./local-binary-file-toolkit.patch ]; postPatch = '' substituteInPlace build.gradle \ - --replace-fail '"''${getGitHash()}"' '"v${finalAttrs.version}"' \ + --replace-fail '"GIT_VERSION", gitVersionProvider' '"GIT_VERSION", "v${finalAttrs.version}"' \ --replace-fail '"@binary-file-toolkit@"' '"${binary-file-toolkit}"' ''; diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json index ca347cfae912..3b220a34fabd 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json @@ -162,24 +162,24 @@ "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, - "org/jacoco#org.jacoco.agent/0.8.11": { - "jar": "sha256-0+2F3qeKntVYRqdzjjoMoVxwLGYe5LyMv+Aqi59KmcA=", - "pom": "sha256-FuBen0liG4fFPmk1AUDzxG1C2WbGepM730sGOiscj8U=" + "org/jacoco#org.jacoco.agent/0.8.13": { + "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=", + "pom": "sha256-auuUf988z1Qlydq41oPWu+MPCSjEWnAuYlWMblXmRLc=" }, - "org/jacoco#org.jacoco.ant/0.8.11": { - "jar": "sha256-gdfriJDZvjCpOWEsKVYDVBBjUpzdA6UyZaunRHS3C3w=", - "pom": "sha256-ftED2VnQzue6v7Ewf6bkUbFpb/01JwYVU7VQ3lUgHYU=" + "org/jacoco#org.jacoco.ant/0.8.13": { + "jar": "sha256-ZDS4VS/z0OSi+70Tpu+xJODJykU4F8YsA96DkNh//RE=", + "pom": "sha256-I4tCPVxuZQ9LQPF1T42iYQDHpzYz5d1RKIxzgHRj744=" }, - "org/jacoco#org.jacoco.build/0.8.11": { - "pom": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws=" + "org/jacoco#org.jacoco.build/0.8.13": { + "pom": "sha256-mUw64c/KZ2WWj+Pt5PN5mGrrLn61GiAUyqSgnXGo9KM=" }, - "org/jacoco#org.jacoco.core/0.8.11": { - "jar": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c=", - "pom": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E=" + "org/jacoco#org.jacoco.core/0.8.13": { + "jar": "sha256-UUwj32z9AV19g8EKeS41q2int+gvPWo6RIF2LBMuM6k=", + "pom": "sha256-73/2F3zZcB1QXv6C9N1P6l5fcssEesK088qitBbaD08=" }, - "org/jacoco#org.jacoco.report/0.8.11": { - "jar": "sha256-g5MpWuJGgO0QytgzOQcED5KLhxMySRWBylvHhOLLT74=", - "pom": "sha256-jjtzR3nV4/1oPsAVQT1S+WGYTFDLkEX9orI7/160I4E=" + "org/jacoco#org.jacoco.report/0.8.13": { + "jar": "sha256-gTMoCgqkQ1i+nRNrUjcDQvRVzLlEquB0OCIKd2YleKI=", + "pom": "sha256-EBBlOpAAx+qoVqJx+E0HH/Rt6nojdbhKitmiOz5lPOg=" }, "org/mockito#mockito-core/5.4.0": { "jar": "sha256-sWibBmF+oB/Xd7+u293lEvrwg9Y5oEn3mziNWk6W0uU=", @@ -195,20 +195,20 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-bom/9.6": { - "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4=" + "org/ow2/asm#asm-bom/9.8": { + "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA=" }, - "org/ow2/asm#asm-commons/9.6": { - "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", - "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + "org/ow2/asm#asm-commons/9.8": { + "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=", + "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI=" }, - "org/ow2/asm#asm-tree/9.6": { - "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", - "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + "org/ow2/asm#asm-tree/9.8": { + "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", + "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" }, - "org/ow2/asm#asm/9.6": { - "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", - "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" } } } diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch index 891bd2d8b029..bbc93d2b2dfe 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch @@ -1,8 +1,8 @@ diff --git a/build.gradle b/build.gradle -index 6f3bc6f..16fc51b 100644 +index 48da640..bca1958 100644 --- a/build.gradle +++ b/build.gradle -@@ -55,16 +55,8 @@ else { +@@ -84,16 +84,8 @@ tasks.register("installStandaloneDeps") { repositories { mavenLocal() mavenCentral() @@ -10,12 +10,12 @@ index 6f3bc6f..16fc51b 100644 - name = "boricj's binary-file-toolkit" - url = uri("https://maven.pkg.github.com/boricj/binary-file-toolkit") - credentials(HttpHeaderCredentials) { -- name = "Authorization" -- value = "Bearer " + project.findProperty("githubToken") as String ?: System.getenv("GITHUB_TOKEN") +- name = "Authorization" +- value = "Bearer " + project.findProperty("githubToken") as String ?: System.getenv("GITHUB_TOKEN") +- } +- authentication { +- header(HttpHeaderAuthentication) - } -- authentication { -- header(HttpHeaderAuthentication) -- } + flatDir { + dirs "@binary-file-toolkit@" }