From 5f45309fa08a59bb545e9c3fc094a0b8c42ff852 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 25 Dec 2024 16:30:00 +0100 Subject: [PATCH 1/2] freenet: 01497 -> 01499 --- pkgs/by-name/fr/freenet/deps.json | 403 ++++++++++++++++++++++++---- pkgs/by-name/fr/freenet/package.nix | 42 +-- 2 files changed, 355 insertions(+), 90 deletions(-) diff --git a/pkgs/by-name/fr/freenet/deps.json b/pkgs/by-name/fr/freenet/deps.json index 83ae9f333ae5..a88cff023e70 100644 --- a/pkgs/by-name/fr/freenet/deps.json +++ b/pkgs/by-name/fr/freenet/deps.json @@ -1,61 +1,6 @@ { "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, - "https://jcenter.bintray.com": { - "io/pebbletemplates#pebble-project/3.1.5": { - "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM=" - }, - "io/pebbletemplates#pebble/3.1.5": { - "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=", - "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc=" - }, - "junit#junit/4.12": { - "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", - "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" - }, - "net/java/dev/jna#jna-platform/4.5.2": { - "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=", - "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU=" - }, - "net/java/dev/jna#jna/4.5.2": { - "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=", - "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8=" - }, - "org/bouncycastle#bcprov-jdk15on/1.59": { - "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=", - "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-library/1.3": { - "jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=", - "pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/mockito#mockito-core/1.9.5": { - "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=", - "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw=" - }, - "org/objenesis#objenesis/1.0": { - "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=", - "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs=" - }, - "org/slf4j#slf4j-api/1.7.25": { - "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", - "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" - }, - "org/slf4j#slf4j-parent/1.7.25": { - "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" - }, - "org/unbescape#unbescape/1.1.6.RELEASE": { - "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", - "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" - } - }, "https://mvn.freenetproject.org": { "org/freenetproject#freenet-ext/29": { "jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=" @@ -98,6 +43,30 @@ "jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=", "pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0=" }, + "com/android/tools/build/builder-model/0.9.2/builder-model-0.9.2.jar": { + "asc": "sha256-mvzW7dRcRrToD9jWhsDp1nwq2XVTZeOUx5/CYFLukfQ=" + }, + "com/android/tools/build/builder-model/0.9.2/builder-model-0.9.2.pom": { + "asc": "sha256-n958l8bKaQ1Qx2r+bcAlndat8CwvZbZiNe+cxPi2MMQ=" + }, + "com/android/tools/build/builder-test-api/0.9.2/builder-test-api-0.9.2.jar": { + "asc": "sha256-6v/kcHV6Usj90eieQgOgMl2b3q1LS1i6KJQItY/o2cg=" + }, + "com/android/tools/build/builder-test-api/0.9.2/builder-test-api-0.9.2.pom": { + "asc": "sha256-Crh44ObdpB0SJ+h9M7pWIE/bYK4l5rrx0fak28HgSNI=" + }, + "com/android/tools/build/builder/0.9.2/builder-0.9.2.jar": { + "asc": "sha256-ztAiK1VbDcSvFZ0j9rXrFVNf33Rhzrm8wzn5gPGvfzk=" + }, + "com/android/tools/build/builder/0.9.2/builder-0.9.2.pom": { + "asc": "sha256-syEEuQm2v5Z8NNGANlh/myoZfi4OaIjjk4Al3x5ljYw=" + }, + "com/android/tools/build/gradle/0.9.2/gradle-0.9.2.jar": { + "asc": "sha256-qyO5UMul04CKVrdOCBB+ouP1H03GgG9GFYI0dksRNHo=" + }, + "com/android/tools/build/gradle/0.9.2/gradle-0.9.2.pom": { + "asc": "sha256-IgxhubDsggD6cinAXDC2WgyKq0rQpE7mQHSnTdkhKNE=" + }, "com/android/tools/build/gradle/maven-metadata": { "xml": { "groupId": "com.android.tools.build", @@ -105,18 +74,54 @@ "release": "2.3.0" } }, + "com/android/tools/build/manifest-merger/22.7.2/manifest-merger-22.7.2.jar": { + "asc": "sha256-l7sOFoQMAzDBHZmJAI4oAcEMEj8IZDkULMZpj4+RkEE=" + }, + "com/android/tools/build/manifest-merger/22.7.2/manifest-merger-22.7.2.pom": { + "asc": "sha256-jHFCoJT3Vklk1CHcU5htftAxjHayTF3PQp0/BAhI2BA=" + }, + "com/android/tools/common/22.7.2/common-22.7.2.jar": { + "asc": "sha256-n/wISK1w475HWWyAVpyFf0vfrZk+SuDoJPnab+1N2kE=" + }, + "com/android/tools/common/22.7.2/common-22.7.2.pom": { + "asc": "sha256-TFNSXpxIshBScNQNWSba6QOuxtEQai2OdOBohuCgKzI=" + }, "com/android/tools/ddms#ddmlib/22.7.2": { "jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=", "pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY=" }, + "com/android/tools/ddms/ddmlib/22.7.2/ddmlib-22.7.2.jar": { + "asc": "sha256-vSgCnTMlLGziMsAKCJKTne+asEEe8K8R+poeHCmL+hI=" + }, + "com/android/tools/ddms/ddmlib/22.7.2/ddmlib-22.7.2.pom": { + "asc": "sha256-FnOAxy4OttUH0A1K72JWeH+siIglSW68ArW9oQhdJIc=" + }, + "com/android/tools/dvlib/22.7.2/dvlib-22.7.2.jar": { + "asc": "sha256-WgfgmfP4gV9Y3me/FSkYjHmm5QXHO2P1GqFTNsVXGJM=" + }, + "com/android/tools/dvlib/22.7.2/dvlib-22.7.2.pom": { + "asc": "sha256-PIx3iCiWEA/GYUfT0L+Y+lhfa98ssDWLSjWl1qF5okA=" + }, "com/android/tools/external/lombok#lombok-ast/0.2.2": { "jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=", "pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074=" }, + "com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar": { + "asc": "sha256-ubvH9/JIm1E4JxKsA2I8gmKSgedhyQrehjbtKvkvXuk=" + }, + "com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.pom": { + "asc": "sha256-h86LTl/gH52T3cqAVBNuNX6F4EgX2y2aXWGQ3ie0R1o=" + }, "com/android/tools/layoutlib#layoutlib-api/22.7.2": { "jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=", "pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM=" }, + "com/android/tools/layoutlib/layoutlib-api/22.7.2/layoutlib-api-22.7.2.jar": { + "asc": "sha256-3tXQc62IfKonpENS1sEbBJap0hhdcUSqWbkpvu/vyFs=" + }, + "com/android/tools/layoutlib/layoutlib-api/22.7.2/layoutlib-api-22.7.2.pom": { + "asc": "sha256-C09wcRuPuH4qsmXkncBSeO0Z2GZxKPOQQvJDQwfMBZ4=" + }, "com/android/tools/lint#lint-api/22.7.2": { "jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=", "pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM=" @@ -129,6 +134,36 @@ "jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=", "pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc=" }, + "com/android/tools/lint/lint-api/22.7.2/lint-api-22.7.2.jar": { + "asc": "sha256-YH4XVrtDVk9Gey/I60RSUWWu0QtFFSCZpg6O5h87CIw=" + }, + "com/android/tools/lint/lint-api/22.7.2/lint-api-22.7.2.pom": { + "asc": "sha256-5UjETgtrLCNiMvg+uWqet4FnrvoLiQq3wITS6oGX13o=" + }, + "com/android/tools/lint/lint-checks/22.7.2/lint-checks-22.7.2.jar": { + "asc": "sha256-P0Kq4YSaRD91xQCOWv7WO6Ae7Kv0DQpf0icYXPEkssU=" + }, + "com/android/tools/lint/lint-checks/22.7.2/lint-checks-22.7.2.pom": { + "asc": "sha256-uR2CLmzh+m7mAA5SDvS5eeGlIveZmzpLpfDsW1CHIps=" + }, + "com/android/tools/lint/lint/22.7.2/lint-22.7.2.jar": { + "asc": "sha256-k1lNA9bAtAVz6GA00rkJusVIoUiNn+J+hXvUch7SYyQ=" + }, + "com/android/tools/lint/lint/22.7.2/lint-22.7.2.pom": { + "asc": "sha256-Q16Lx4njfrT0vUR4/oCA6AZ9XjBOV2F7YW0HxTEBu/s=" + }, + "com/android/tools/sdk-common/22.7.2/sdk-common-22.7.2.jar": { + "asc": "sha256-F7wcwNMx92sutxXHVpsI8vkvHiXngBvbpwbF5teMCr4=" + }, + "com/android/tools/sdk-common/22.7.2/sdk-common-22.7.2.pom": { + "asc": "sha256-HAG4PLQozpyFKT1Z4RWJbkqCcLdqKIX1jMzq7xEdVYs=" + }, + "com/android/tools/sdklib/22.7.2/sdklib-22.7.2.jar": { + "asc": "sha256-y7XVQ5ikgdTJx/9DxBCcFFBLefGH8eUEXM8i6xNj6Dc=" + }, + "com/android/tools/sdklib/22.7.2/sdklib-22.7.2.pom": { + "asc": "sha256-LdpmibFMCP7bk1qQd7r7pdSfSEVX1fItSq/A3XYohvs=" + }, "com/google/guava#guava-parent/15.0": { "pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js=" }, @@ -136,21 +171,94 @@ "jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=", "pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs=" }, + "com/google/guava/guava-parent/15.0/guava-parent-15.0.pom": { + "asc": "sha256-GTlOaEPTfDFHy1xkMncIK2RKh3V0ltThkNvZ/iTKQPw=" + }, + "com/google/guava/guava/15.0/guava-15.0.jar": { + "asc": "sha256-O+b5j21kF4SwFWVKdhyosCbDa8YDmyir0I3dFePvdoU=" + }, + "com/google/guava/guava/15.0/guava-15.0.pom": { + "asc": "sha256-6UQa9fz5vuf/GA+ByIcpViliI9pUc8+rjRzHVJL/iCw=" + }, "com/squareup#javawriter/2.2.1": { "jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=", "pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA=" }, + "com/squareup/javawriter/2.2.1/javawriter-2.2.1.jar": { + "asc": "sha256-3Yy6yNGFQ/RrvC9/hh9/Sng320M+zSdgydw2D0IICO0=" + }, + "com/squareup/javawriter/2.2.1/javawriter-2.2.1.pom": { + "asc": "sha256-NPDWZzyuLZPDZkxtM3X4fNkrcOgBlA25Ur4bQLv7QAg=" + }, "commons-codec#commons-codec/1.4": { "jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=", "pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8=" }, + "commons-codec/commons-codec/1.4/commons-codec-1.4.jar": { + "asc": "sha256-nnSvNrWBCQnQHrEmCToDzejnbXJImQrPe+ffRPCgipw=" + }, + "commons-codec/commons-codec/1.4/commons-codec-1.4.pom": { + "asc": "sha256-4YgQcyQZ5ziWdGwzeWxMn/oOM2UdYLrhq5wUtjjKJPc=" + }, "commons-logging#commons-logging/1.1.1": { "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" }, + "commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar": { + "asc": "sha256-wY7phz0hNTOPi8YInSBZ+DH75wcqsAYvq6svJABO8BY=" + }, + "commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom": { + "asc": "sha256-5O+8adBtGElIn97Mi2kMVHXSJlNDj0C1uc2txt/HcJs=" + }, + "io/pebbletemplates#pebble-project/3.1.5": { + "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM=" + }, + "io/pebbletemplates#pebble/3.1.5": { + "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=", + "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc=" + }, + "io/pebbletemplates/pebble-project/3.1.5/pebble-project-3.1.5.pom": { + "asc": "sha256-xVWh8tfwv8bCI1PiVOOgDx3O/fpvFTTdScy5Zw2Q/To=" + }, + "io/pebbletemplates/pebble/3.1.5/pebble-3.1.5.jar": { + "asc": "sha256-cFF8mZganRCeN3NneTDN1q23v7gpiaQmqF1xB+gDf1Y=" + }, + "io/pebbletemplates/pebble/3.1.5/pebble-3.1.5.pom": { + "asc": "sha256-qzOpaSYC/oOoJLkeqRdWDoFp1tMNERW/eZM7y2yJ90M=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "junit/junit/4.13.2/junit-4.13.2.jar": { + "asc": "sha256-qFOPh/WLb1S3ps7/0BJisILDiWIrCIbFIIeN4e+56rk=" + }, + "junit/junit/4.13.2/junit-4.13.2.pom": { + "asc": "sha256-gIzTYDjanf/1IzpX45EvG3BKlDTnp02va57XpLBi9d0=" + }, "kxml2#kxml2/2.3.0": { "pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU=" }, + "net/java/dev/jna#jna-platform/4.5.2": { + "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=", + "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU=" + }, + "net/java/dev/jna#jna/4.5.2": { + "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=", + "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8=" + }, + "net/java/dev/jna/jna-platform/4.5.2/jna-platform-4.5.2.jar": { + "asc": "sha256-mCY0PWlQJMB6IzgJ1xaO/nJZJZC0PDYDYwIjLKzaTcg=" + }, + "net/java/dev/jna/jna-platform/4.5.2/jna-platform-4.5.2.pom": { + "asc": "sha256-Jpde2ET9nK96bRMGPKRXJD8naBJCRtNLZS5/J1f8AVc=" + }, + "net/java/dev/jna/jna/4.5.2/jna-4.5.2.jar": { + "asc": "sha256-9KXn9EXk1JJdLNAxXt23tC4ZvAc8YyQcPUtAhmPRy30=" + }, + "net/java/dev/jna/jna/4.5.2/jna-4.5.2.pom": { + "asc": "sha256-EgEfn4uqaMa1yS1oAC6BYwnERayRmBUfNiN0vAMGAqI=" + }, "net/sf/kxml#kxml2/2.3.0": { "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" @@ -166,9 +274,27 @@ "net/sf/proguard#proguard-parent/4.10": { "pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM=" }, + "net/sf/proguard/proguard-base/4.10/proguard-base-4.10.jar": { + "asc": "sha256-TL4/Aaaoj77RknIIiDFg34ZvkkmI92HUjA38kfABdc0=" + }, + "net/sf/proguard/proguard-base/4.10/proguard-base-4.10.pom": { + "asc": "sha256-KzDBhyCZaQn/l1lk5J1qSUDpC2l96x3lUkv6HiiPu0k=" + }, + "net/sf/proguard/proguard-gradle/4.10/proguard-gradle-4.10.jar": { + "asc": "sha256-nsPmzDnUqRzyKzVolwnP+R8YgVDziMqZaR82RolwmK0=" + }, + "net/sf/proguard/proguard-gradle/4.10/proguard-gradle-4.10.pom": { + "asc": "sha256-xLysB82xpC/dbOBFGqBK0sa6vitiUpSKmGAN7wbidX8=" + }, + "net/sf/proguard/proguard-parent/4.10/proguard-parent-4.10.pom": { + "asc": "sha256-QyzAPExvQl0zxiS6j2eZJxPoiAA3RAl4X8FM3OD4+GI=" + }, "org/apache#apache/4": { "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" }, + "org/apache/apache/4/apache-4.pom": { + "asc": "sha256-aAalIBTrcoWtABbZ1280b5N7+qINywPWWTtR2Gw9pak=" + }, "org/apache/commons#commons-compress/1.0": { "jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=", "pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E=" @@ -179,6 +305,18 @@ "org/apache/commons#commons-parent/5": { "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" }, + "org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar": { + "asc": "sha256-IEO1Qm7Y1AdNkfT99t+8mqQ7KwPoLSEBlc8Ups3nUyY=" + }, + "org/apache/commons/commons-compress/1.0/commons-compress-1.0.pom": { + "asc": "sha256-tuFXfC5uycG29GlxwmhjY65JuNabajDXHLJbGdAQjlE=" + }, + "org/apache/commons/commons-parent/11/commons-parent-11.pom": { + "asc": "sha256-hgEzyW2ItIA1+P6i6cHRWr3bILkS2ynh/pyNFS4/OLM=" + }, + "org/apache/commons/commons-parent/5/commons-parent-5.pom": { + "asc": "sha256-6ZA2PdnME62+KkCoEMHjJMBZRWLlGefwiMyaMJLIiLQ=" + }, "org/apache/httpcomponents#httpclient/4.1.1": { "jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=", "pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc=" @@ -203,6 +341,36 @@ "org/apache/httpcomponents#project/4.1.1": { "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow=" }, + "org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar": { + "asc": "sha256-IBjcWIUV/O4A7rHpXO+Jd64Lm+d4W7xYU+Nv00kCXeg=" + }, + "org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom": { + "asc": "sha256-YezBIVduwFwXabNCrrZn7oEFO1tLJ5ztz+RJHqGWjLE=" + }, + "org/apache/httpcomponents/httpcomponents-client/4.1.1/httpcomponents-client-4.1.1.pom": { + "asc": "sha256-bKJv92oBSHgdXHI884xvZ22L38qboC1BKWO08HUrz0Y=" + }, + "org/apache/httpcomponents/httpcomponents-client/4.1/httpcomponents-client-4.1.pom": { + "asc": "sha256-EutH7JPGE7OMO4mOsWpAIw9j9shsWd+obgCKe+Vx2KU=" + }, + "org/apache/httpcomponents/httpcomponents-core/4.1/httpcomponents-core-4.1.pom": { + "asc": "sha256-dXFGZMsRHYLkjBv4QBH8mr1U5xm1fytTKAb2KFE2FEY=" + }, + "org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar": { + "asc": "sha256-xqZuKzF6klaO0bD8bXE5tyiWkO1Hpe9387qt/AJcs54=" + }, + "org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.pom": { + "asc": "sha256-ovZWk6l1FQsg0C65j4H3srHRuqGYZ1QWLE72AsmnPPk=" + }, + "org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar": { + "asc": "sha256-QJ5DghXtPl2nissIn4G6sZHdPngQHL7iCn7H7BxM5Yw=" + }, + "org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.pom": { + "asc": "sha256-tWXRxOIKfwDlekZQPv6Dsyo82VgiFRwpoPA9c7xxqFA=" + }, + "org/apache/httpcomponents/project/4.1.1/project-4.1.1.pom": { + "asc": "sha256-RC9FuVR7UWWSIVwOci4aF3BPeHZAaAP4hSyXhU1ahFY=" + }, "org/bouncycastle#bcpkix-jdk15on/1.48": { "jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=", "pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0=" @@ -211,10 +379,85 @@ "jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=", "pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI=" }, + "org/bouncycastle#bcprov-jdk15on/1.59": { + "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=", + "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU=" + }, + "org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar": { + "asc": "sha256-6tXbsLOuaFcz7tQZL5gydPf5nC4ghFFt49OXSkQEZEA=" + }, + "org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.pom": { + "asc": "sha256-bx8bIFid6sxY9CdeW+Hs97+FLy1DscS6wC9u+P63LT0=" + }, + "org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar": { + "asc": "sha256-f9qKQ9gEnRNI3dvoQpvrTFO6QEZM8hTDXNg3G5/N104=" + }, + "org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.pom": { + "asc": "sha256-fzInz+bfjfvS6HWuYgtz9P6KEXK0tRt+r+weNqVS/Yw=" + }, + "org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.jar": { + "asc": "sha256-ICEPWOGva/aukTU8MqzkEKgtMKCLlHROqYt5HOYJ5mk=" + }, + "org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.pom": { + "asc": "sha256-F6lDq/sfWn2DvCZzOpgvKvxByFso/1OSOHPNtCKIF78=" + }, "org/eclipse/jdt/core/compiler#ecj/4.2.2": { "jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=", "pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0=" }, + "org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.jar": { + "asc": "sha256-4EsxB+k8PkrYaQC659GD+f17mBEi6FQqihlswUFZGjg=" + }, + "org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.pom": { + "asc": "sha256-tnaW/JMy9jqxXze2MoL0xsIQL/K6fiiyBA6EfrsCUfc=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/3.0": { + "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=", + "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=", + "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE=" + }, + "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar": { + "asc": "sha256-YNmOD50t5Jur372FbCQ67ZeNG0jNA/+j3Y+8SGmGGXc=" + }, + "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom": { + "asc": "sha256-l6OtfH63FxpqJBn5YBbgEATt+c7SkwBtlz8QhThi7kM=" + }, + "org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom": { + "asc": "sha256-0Iq1QfQtuRW9U8CAaXL08S6msdH/wJeUYMQ6H5ql0aY=" + }, + "org/hamcrest/hamcrest/3.0/hamcrest-3.0.jar": { + "asc": "sha256-RneFTdkbhb4gYFeggKnn7GGxx9bwh1oPKhaV+rOSPiw=" + }, + "org/hamcrest/hamcrest/3.0/hamcrest-3.0.module": { + "asc": "sha256-/J6pffAL2DCSbrZPuO6qDMktPg9RjMZutKGFyEU7aTI=" + }, + "org/mockito#mockito-core/1.9.5": { + "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=", + "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw=" + }, + "org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar": { + "asc": "sha256-eIfgc49Zw5Oqx+vVeB66zTNKoBvixcE6KDkf7Aav6Lo=" + }, + "org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom": { + "asc": "sha256-rfCK39qLfToRTlvgFQpZnFMEYMCZqDtcFd1KvNjpwbo=" + }, + "org/objenesis#objenesis/1.0": { + "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=", + "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs=" + }, + "org/objenesis/objenesis/1.0/objenesis-1.0.jar": { + "asc": "sha256-3mmf2B0Qzgs7ymDdqIa2Viw3V+DZa/nhNlnbG5+Jctw=" + }, + "org/objenesis/objenesis/1.0/objenesis-1.0.pom": { + "asc": "sha256-qcTqne8ZjjbFkMP5t/2gwG0i/dVrTD+SjTHY0Wn7IqA=" + }, "org/ow2#ow2/1.3": { "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" }, @@ -233,8 +476,58 @@ "jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=", "pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc=" }, + "org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar": { + "asc": "sha256-3a/+snWLUZFPxcIcazh0kRrFMkBveZi4KH96bF7wzfI=" + }, + "org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.pom": { + "asc": "sha256-qq5cOCS/6PDbcjQEO/oiw/vBd9uOr+KUYikDHuHyzCk=" + }, + "org/ow2/asm/asm-parent/4.0/asm-parent-4.0.pom": { + "asc": "sha256-eonTcSxLVAyUxUyG6KXF04wV9IO1MoHzL7hpcKE9i6E=" + }, + "org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar": { + "asc": "sha256-LZuPDX8KrSvgD7DfnRyoENbfW8oGMqiazi3MtugqBTA=" + }, + "org/ow2/asm/asm-tree/4.0/asm-tree-4.0.pom": { + "asc": "sha256-pZUFC8L/8axy7jgRmvHo0E5/X9wWWLpjh43D6X3p4Sg=" + }, + "org/ow2/asm/asm/4.0/asm-4.0.jar": { + "asc": "sha256-6k6hHuOMwtShQlN69KEfZe6t1U84URL8qA9zpF2EQC4=" + }, + "org/ow2/asm/asm/4.0/asm-4.0.pom": { + "asc": "sha256-Chrj2eVc9d/X29xW6MDTXx9jyiT/FA8BnHMOONKFGFw=" + }, + "org/ow2/ow2/1.3/ow2-1.3.pom": { + "asc": "sha256-EKqTTnapQPgeFNBNoK+2aBGNwuHZZMHbwpEutEQO7ZE=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar": { + "asc": "sha256-BKW7pnBF865e25U5DhApCyET6bbeguvQzwxwcHbPCeI=" + }, + "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom": { + "asc": "sha256-aZiuTbgrIvslBuWIqOBhSJKQhuk2sGcbXeKuR04sqws=" + }, + "org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25.pom": { + "asc": "sha256-BwwQsg8JhBbRGGrCjXUJdZtHcIjBm332csOEmX92IeU=" + }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/unbescape#unbescape/1.1.6.RELEASE": { + "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", + "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" + }, + "org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar": { + "asc": "sha256-qz5rvOGRW+6t/VyP982ODE4t6IBemafD8LBYvd7tVRU=" + }, + "org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.pom": { + "asc": "sha256-WnZ7/qjsZQszhpIN2ZZ0ceoGqs1M7P78Y+aKREUuE5k=" } } } diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 96aae5ebdbc0..05150b011732 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -3,34 +3,19 @@ stdenv, fetchurl, fetchFromGitHub, - jdk17_headless, - jre17_minimal, - gradle_7, + jdk_headless, + jre, + gradle_8, bash, coreutils, substituteAll, nixosTests, - fetchpatch, writeText, }: let - gradle = gradle_7; - jdk = jdk17_headless; - # Reduce closure size - jre = jre17_minimal.override { - modules = [ - "java.base" - "java.logging" - "java.naming" - "java.sql" - "java.desktop" - "java.management" - ]; - jdk = jdk17_headless; - }; - - version = "01497"; + gradle = gradle_8; + jdk = jdk_headless; freenet_ext = fetchurl { url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar"; @@ -48,31 +33,18 @@ let ''; }; - patches = [ - # gradle 7 support - # https://github.com/freenet/fred/pull/827 - (fetchpatch { - url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; - hash = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; - }) - ]; - in stdenv.mkDerivation rec { pname = "freenet"; - inherit version patches; + version = "01499"; src = fetchFromGitHub { owner = "freenet"; repo = "fred"; rev = "refs/tags/build${version}"; - hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ="; + hash = "sha256-L9vae7wB6Ow2O4JA7CG/XV/zI8OS9/Rg7in/TSatXxY="; }; - postPatch = '' - rm gradle/verification-{keyring.keys,metadata.xml} - ''; - nativeBuildInputs = [ gradle jdk From ff8e6f3033834cb52beffbf5e3d49c8725dc104b Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 24 May 2023 15:45:00 +0200 Subject: [PATCH 2/2] freenet: add mainProgram --- pkgs/by-name/fr/freenet/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 05150b011732..2d69097c057f 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nagy ]; platforms = with lib.platforms; linux; changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; + mainProgram = "freenet"; }; }