diff --git a/packages/piped-backend.nix b/packages/piped-backend.nix index 4ad8503..7ecffdb 100644 --- a/packages/piped-backend.nix +++ b/packages/piped-backend.nix @@ -6,7 +6,9 @@ gradle, makeWrapper, semeru-jre-bin-21, - javaRuntime ? semeru-jre-bin-21 + javaRuntime ? semeru-jre-bin-21, + + patchWithJunixsocket ? false }: stdenv.mkDerivation { @@ -26,6 +28,8 @@ stdenv.mkDerivation { makeWrapper ]; + patches = lib.optional patchWithJunixsocket ./piped-backend/add_junixsocket.patch; + mitmCache = gradle.fetchDeps { pkg = stackpkgs.piped-backend; data = ./piped-backend/deps.json; diff --git a/packages/piped-backend/add_junixsocket.patch b/packages/piped-backend/add_junixsocket.patch new file mode 100644 index 0000000..1def14a --- /dev/null +++ b/packages/piped-backend/add_junixsocket.patch @@ -0,0 +1,12 @@ +diff --git a/build.gradle b/build.gradle +index 7e121dc..4de04ae 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -46,6 +46,7 @@ dependencies { + implementation 'io.minio:minio:8.5.11' + compileOnly 'org.projectlombok:lombok:1.18.34' + annotationProcessor 'org.projectlombok:lombok:1.18.34' ++ implementation 'com.kohlschutter.junixsocket:junixsocket-core:2.10.1' + } + + shadowJar { diff --git a/packages/piped-backend/deps.json b/packages/piped-backend/deps.json index f8865c3..f6a3cc3 100644 --- a/packages/piped-backend/deps.json +++ b/packages/piped-backend/deps.json @@ -234,6 +234,26 @@ "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" }, + "com/kohlschutter#kohlschutter-parent-multirelease/1.7.4": { + "pom": "sha256-D4WGWIXlDWSBYqF+qhLiTeZ4j6yg4mwiYfPoS5WF8Zw=" + }, + "com/kohlschutter#kohlschutter-parent/1.7.4": { + "pom": "sha256-HGRVEFa32Vf9vGl/AHQgZqpKr9VAh9WXo7lEJxEjBO4=" + }, + "com/kohlschutter/junixsocket#junixsocket-common/2.10.1": { + "jar": "sha256-GeX3YVrSKT81Mrw/mRsxOWwRYYNOidmmqgx975OcZyk=", + "pom": "sha256-HLsKDl8eqevLRfOWJTaNBzvd+Wr8fNzYgBZlMxg5VsI=" + }, + "com/kohlschutter/junixsocket#junixsocket-core/2.10.1": { + "pom": "sha256-X2WdPNfqInB5jjoHjf1HSbrjMQKoL5m2MjtHHrMfssM=" + }, + "com/kohlschutter/junixsocket#junixsocket-native-common/2.10.1": { + "jar": "sha256-ASbOC68c61de9ReAfU0rFLnzLwYYAgThLsc6tKdyVno=", + "pom": "sha256-7vhEVBWe4P24IaBxi5X9WVF4G2MCrvC/1m3i0nYdcbQ=" + }, + "com/kohlschutter/junixsocket#junixsocket/2.10.1": { + "pom": "sha256-8ABkSjwfJ0vGcH8jmwKrLglfrIeEaCJLQ/GfPm8Cy6c=" + }, "com/opencsv#opencsv/5.9": { "jar": "sha256-ICOWm4bOlorYrlSWSKxYfRQcGa5oSppcZ8kQXzerDRw=", "pom": "sha256-l+UC78Xmwt0VZiGynKy8D0dEIowAmPaxafV/eukwMGA=" @@ -649,6 +669,10 @@ "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, "org/junit#junit-bom/5.11.0-M2": { "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="