From e7e0c8dd7b47c20fd9bc75148e3a8c66fa2e92db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Mon, 1 Sep 2025 15:55:41 +0200 Subject: [PATCH] quake-injector: 06 -> 07 --- pkgs/by-name/qu/quake-injector/deps.json | 190 --------------------- pkgs/by-name/qu/quake-injector/package.nix | 70 ++++---- 2 files changed, 38 insertions(+), 222 deletions(-) delete mode 100644 pkgs/by-name/qu/quake-injector/deps.json diff --git a/pkgs/by-name/qu/quake-injector/deps.json b/pkgs/by-name/qu/quake-injector/deps.json deleted file mode 100644 index 3f0440140798..000000000000 --- a/pkgs/by-name/qu/quake-injector/deps.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://github.com": { - "adoptium/temurin17-binaries/releases/download/jdk-17.0.10%2B7/OpenJDK17U-jdk_x86-32_windows_hotspot_17.0.10_7": { - "zip": "sha256-EWZ+nnu8uYBDDWzGMFUxYqDBikI4xLBAu2cc2AYHcQY=" - } - }, - "https://jcenter.bintray.com": { - "com/github/spotbugs#spotbugs-annotations/4.2.2": { - "jar": "sha256-VlfEgKMYg88/xtEuauUiyfzJpjA7RZOe5Cyi4Mz07QQ=", - "module": "sha256-yjYif6H3bmbT7boJ5N9R38nyrfkyttH6EjT+Lx0KB5s=", - "pom": "sha256-vz9CdawvbTnQq1gV28D2/yYBUoRztjtpkGdM3uuuRaM=" - }, - "com/github/spotbugs#spotbugs/4.2.2": { - "jar": "sha256-JO9T3cYiZAe+ndgHzFy5ZFQwKG91Bb0yK24Cc9Bz8DY=", - "module": "sha256-vRozvig14GQmmfibS3VeJ1iNrYu5vbuAYxT6LdWECRQ=", - "pom": "sha256-M2abH/xQYg2pZA2xlZepdre64Cab/05yd7Gg3D1qUNA=" - }, - "com/google/code/findbugs#jsr305/3.0.2": { - "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", - "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" - }, - "com/google/code/gson#gson-parent/2.8.6": { - "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" - }, - "com/google/code/gson#gson/2.8.6": { - "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", - "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" - }, - "edu/stanford/ejalbert#BrowserLauncher2/1.3": { - "jar": "sha256-pt7rHbhm7S+cyE7uu4kIgOfOAgptYS9pnpBAOuP371o=", - "pom": "sha256-zcuMk+OUxzYg8zUs1ALIN0rF3wI7bJArOhDST1SUeG0=" - }, - "jaxen#jaxen/1.2.0": { - "jar": "sha256-cP7vndda0GTe8Fo86Jda66UV7n0b4UbRIZnIgopkF0w=", - "pom": "sha256-zEgr+qIqVQepb6WzorYVkRRDrT9zZOAgBNGQsGfzsH8=" - }, - "net/jcip#jcip-annotations/1.0": { - "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", - "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" - }, - "net/sf/launch4j#launch4j/3.14": { - "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" - }, - "net/sf/launch4j#launch4j/3.14/workdir-linux64": { - "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" - }, - "net/sf/saxon#Saxon-HE/10.3": { - "jar": "sha256-ZgqJFipXfP1zvD2zxTy+x+gtSrIFEkfzGSfxNa/3yQg=", - "pom": "sha256-FfRI8O2fblTGre47tov582btryOPYW33hB8dzXc3hpg=" - }, - "org/apache#apache/21": { - "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache/bcel#bcel/6.5.0": { - "jar": "sha256-ves4HQ0ZmZ4iHmoPjYv0T1sZwuV+q/aLcNwJhlKu+vU=", - "pom": "sha256-/B6eb17UvSAMsGYghsiYwAAmOGoutKY0hBH34OBotcU=" - }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" - }, - "org/apache/commons#commons-parent/50": { - "pom": "sha256-e3ots/dHB0tYZ/VT1e/IByvibt4yh50FLDR+fIERfwY=" - }, - "org/apache/commons#commons-parent/51": { - "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" - }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, - "org/apache/commons#commons-text/1.9": { - "jar": "sha256-CBLyhKxd0NYXRh2aKrasaBETfyUSLf/9R4ikhx5zLQA=", - "pom": "sha256-n5IWz8lE3KeC5jEdYnV/13Fk/mfaKbWPAVaH+gn0QFA=" - }, - "org/dom4j#dom4j/2.1.3": { - "jar": "sha256-VJ8wB8YpD2qQHlfR0zG07Q5r9zhPeL8QMW/87sqDTeY=", - "module": "sha256-3sfF/Y1SDa+1exXi87a+LxgFYTQqP0Ub7u6QVUO8FwM=", - "pom": "sha256-zcnEn1nSMNQnF3G7dkqnCX1qy83CUAFJ5NLJUd9crDA=" - }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, - "org/ow2#ow2/1.5": { - "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" - }, - "org/ow2/asm#asm-analysis/9.1": { - "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=", - "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY=" - }, - "org/ow2/asm#asm-commons/9.1": { - "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=", - "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38=" - }, - "org/ow2/asm#asm-tree/9.1": { - "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=", - "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw=" - }, - "org/ow2/asm#asm-util/9.1": { - "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=", - "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88=" - }, - "org/ow2/asm#asm/9.1": { - "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=", - "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0=" - }, - "org/slf4j#slf4j-api/1.8.0-beta4": { - "jar": "sha256-YCtxIynIS0qDxARk9P39D+QjjFPvOXE5qGcGRznb9OA=", - "pom": "sha256-+DFtKKzyUrIbHp6O7ZqEwq+9yOBA9p06ELq4E9PYWoU=" - }, - "org/slf4j#slf4j-parent/1.8.0-beta4": { - "pom": "sha256-uvujCoPVOpRVAZZEdWKqjNrRRWFcKJMsaku0QcNVMQE=" - }, - "org/slf4j#slf4j-simple/1.8.0-beta4": { - "jar": "sha256-usZqvFtEYt/2Lh4ZqzsKZcFg681WTPJZENsAOo5WnP0=", - "pom": "sha256-oXrS6OU00OgZ6o0UIT3nSNRlD/8qJX0+kqE9oxAoe/c=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - } - }, - "https://plugins.gradle.org/m2": { - "com/formdev#flatlaf/1.0": { - "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", - "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", - "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" - }, - "com/github/spotbugs#com.github.spotbugs.gradle.plugin/4.7.1": { - "pom": "sha256-vzSvShy4wBuhRYlSW5K1KXuRB3UmfD4r86m9Y5WEIXc=" - }, - "com/thoughtworks/xstream#xstream-parent/1.4.15": { - "pom": "sha256-GDOZpW5OtAJkCjcZURmuZx61kW17OKX2PpTvGvkPuc4=" - }, - "com/thoughtworks/xstream#xstream/1.4.15": { - "jar": "sha256-MneEmWGqnrBV+HcYEEUAhtOMwuQH7rg0bQI56gIYpFM=", - "pom": "sha256-sX3W1xyyywYmTZ6q0a6Mgg5FdhTx1jRcdgmSB3Ei1EY=" - }, - "commons-beanutils#commons-beanutils/1.9.4": { - "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", - "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" - }, - "commons-logging#commons-logging/1.2": { - "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", - "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" - }, - "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.0": { - "pom": "sha256-n0puUetm4COQOF+0PkmHup+PCZ5QD8WCPwKh9ZFQ4Q4=" - }, - "edu/sc/seis/launch4j#launch4j/2.5.0": { - "jar": "sha256-UX6wYGabD7AySfEXvtG5UbckhI1XLhpeSgnHRWnC8CQ=", - "module": "sha256-ujuCeHwFd2TaKUOOoAxuVaD1xcppLb6Pm0zt1QZVSXs=", - "pom": "sha256-sadCLzKqOPcR43vhoilGBV2MJiby9Xy2LUHMWR6h4TI=" - }, - "gradle/plugin/com/github/spotbugs/snom#spotbugs-gradle-plugin/4.7.1": { - "jar": "sha256-4zxJQ+EOPtJ1mRoZMFagVtdXUYUcvWGqysipEXTm4Kc=", - "pom": "sha256-aBZTKWh+foW+JoNs7+nuoWT4xFhi+M70qkP9yr+P7T8=" - }, - "net/sf/launch4j#launch4j/3.14": { - "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" - }, - "net/sf/launch4j#launch4j/3.14/core": { - "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache#apache/19": { - "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" - }, - "org/apache/commons#commons-parent/34": { - "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" - }, - "org/apache/commons#commons-parent/47": { - "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" - }, - "xmlpull#xmlpull/1.1.3.1": { - "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", - "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" - }, - "xpp3#xpp3_min/1.1.4c": { - "jar": "sha256-v8kOnjLQ6rHzl/uXS18VCoFRiDgqxB83KnFJ1bwXgAg=", - "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8=" - } - } -} diff --git a/pkgs/by-name/qu/quake-injector/package.nix b/pkgs/by-name/qu/quake-injector/package.nix index 02db59fc26f5..da5f23d57827 100644 --- a/pkgs/by-name/qu/quake-injector/package.nix +++ b/pkgs/by-name/qu/quake-injector/package.nix @@ -1,56 +1,65 @@ { lib, stdenv, - fetchFromGitHub, - gradle, jre, makeWrapper, jdk, - git, makeDesktopItem, copyDesktopItems, + fetchzip, + fetchurl, }: +let + icon = fetchurl { + url = "https://raw.githubusercontent.com/hrehfeld/QuakeInjector/b741bae9904acbf2e18cdb1ca8e71a12e7d416cf/src/main/resources/Inject2_256.png"; + hash = "sha256-769YoSJ52+BTk7s+wh4oOyHwPPrR7AeOxCS58CdQ93s="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "quake-injector"; - version = "06"; + version = "07"; - src = fetchFromGitHub { - owner = "hrehfeld"; - repo = "QuakeInjector"; - tag = "alpha${finalAttrs.version}"; - hash = "sha256-bbvLp5/Grg+mXBuV5aJCMOSjFp1+ukZS+AivcbhBxHU="; + src = fetchzip { + url = "https://github.com/hrehfeld/QuakeInjector/releases/download/alpha${finalAttrs.version}/QuakeInjector-alpha${finalAttrs.version}.zip"; + hash = "sha256-Lixac9K3+9j7QvprZGzhnYuvlJV9V+ja4EipygELkWA="; }; nativeBuildInputs = [ - gradle makeWrapper - git copyDesktopItems ]; - mitmCache = gradle.fetchDeps { - inherit (finalAttrs) pname; - data = ./deps.json; - }; + installPhase = + let + # Explicit needed JAR filenames + filenames = [ + "QuakeInjector-alpha${finalAttrs.version}.jar" + "BrowserLauncher2-1.3.jar" + "jackson-annotations-2.13.3.jar" + "jackson-core-2.13.3.jar" + "jackson-databind-2.13.3.jar" + ]; - __darwinAllowLocalNetworking = true; + mkClasspath = prefix: lib.concatMapStringsSep ":" (filename: "${prefix}/${filename}") filenames; + classpath = mkClasspath "$out/share/quake-injector"; + in + '' + runHook preInstall - doCheck = true; + mkdir -p $out/{bin,share/quake-injector} + cp lib/*.jar $out/share/quake-injector - installPhase = '' - runHook preInstall + mkdir -p $out/share/icons/hicolor/256x256/apps + cp ${icon} $out/share/icons/hicolor/256x256/apps/quake-injector.png - mkdir -p $out/{bin,share/quake-injector} - cp build/libs/QuakeInjector.jar $out/share/quake-injector + makeWrapper ${jre}/bin/java $out/bin/quake-injector \ + --add-flags "-classpath ${classpath} de.haukerehfeld.quakeinjector.QuakeInjector" - mkdir -p $out/share/icons/hicolor/256x256/apps - cp src/main/resources/Inject2_256.png $out/share/icons/hicolor/256x256/apps/quake-injector.png + runHook postInstall + ''; - makeWrapper ${jre}/bin/java $out/bin/quake-injector \ - --add-flags "-jar $out/share/quake-injector/QuakeInjector.jar" - - runHook postInstall - ''; + # There are no tests. + doCheck = false; desktopItems = [ (makeDesktopItem { @@ -71,9 +80,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ theobori ]; mainProgram = "quake-injector"; platforms = jdk.meta.platforms; - sourceProvenance = with lib.sourceTypes; [ - fromSource - binaryBytecode # mitm cache - ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; })