From 97c452c853b086670ef426045f8062cd85bc704e Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 7 Sep 2024 12:00:00 +0200
Subject: [PATCH 1/3] freenet: format

---
 .../networking/p2p/freenet/default.nix        | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index abcc69ec1240..ff0b449cafd0 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,5 +1,18 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils
-, substituteAll, nixosTests, fetchpatch, writeText }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchFromGitHub,
+  jdk,
+  jre,
+  gradle,
+  bash,
+  coreutils,
+  substituteAll,
+  nixosTests,
+  fetchpatch,
+  writeText,
+}:
 
 let
   version = "01497";
@@ -23,7 +36,8 @@ let
     })
   ];
 
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "freenet";
   inherit version patches;
 
@@ -38,11 +52,19 @@ in stdenv.mkDerivation rec {
     rm gradle/verification-{keyring.keys,metadata.xml}
   '';
 
-  nativeBuildInputs = [ gradle jdk ];
+  nativeBuildInputs = [
+    gradle
+    jdk
+  ];
 
   wrapper = substituteAll {
     src = ./freenetWrapper;
-    inherit bash coreutils jre seednodes;
+    inherit
+      bash
+      coreutils
+      jre
+      seednodes
+      ;
   };
 
   mitmCache = gradle.fetchDeps {
@@ -68,7 +90,9 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.tests = { inherit (nixosTests) freenet; };
+  passthru.tests = {
+    inherit (nixosTests) freenet;
+  };
 
   meta = {
     description = "Decentralised and censorship-resistant network";

From 22ef72420a461b9947ed595df0297b59e8738062 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 7 Sep 2024 12:00:00 +0200
Subject: [PATCH 2/3] freenet: fix build

---
 .../networking/p2p/freenet/default.nix        | 21 +++++++++++++------
 .../networking/p2p/freenet/freenetWrapper     |  5 ++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index ff0b449cafd0..0a46a6095489 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -22,9 +22,15 @@ let
     sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
   };
 
-  seednodes = fetchurl {
-    url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref";
-    sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";
+  seednodes = fetchFromGitHub {
+    name = "freenet-seednodes";
+    owner = "hyphanet";
+    repo = "seedrefs";
+    rev = "9df1bf93ab64aba634bdfc5f4d0e960571ce4ba5";
+    hash = "sha256-nvwJvKw5IPhItPe4k/jnOGaa8H4DtOi8XxKFOKFMAuY=";
+    postFetch = ''
+      cat $out/* > $out/seednodes.fref
+    '';
   };
 
   patches = [
@@ -81,12 +87,15 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm444 build/libs/freenet.jar $out/share/freenet/freenet.jar
+
+    install -Dm644 build/libs/freenet.jar $out/share/freenet/freenet.jar
     ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar
     mkdir -p $out/bin
-    install -Dm555 ${wrapper} $out/bin/freenet
+    install -Dm755 ${wrapper} $out/bin/freenet
+    export CLASSPATH="$(find ${mitmCache} -name "*.jar"| sort | grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :):$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar"
     substituteInPlace $out/bin/freenet \
-      --subst-var-by outFreenet $out
+      --subst-var-by CLASSPATH "$CLASSPATH"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
index 74ff2c62961f..5e4e43d08a1b 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -1,8 +1,7 @@
 #! @bash@/bin/bash
 set -eo pipefail
 PATH=@coreutils@/bin:$PATH
-export CLASSPATH=$(find @outFreenet@/deps/ -name "*.jar"|grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :)
-CLASSPATH=$CLASSPATH:@outFreenet@/share/freenet/freenet-ext.jar:@outFreenet@/share/freenet/freenet.jar
+export CLASSPATH=@CLASSPATH@
 
 export FREENET_HOME="$HOME/.local/share/freenet"
 if [ -n "$XDG_DATA_HOME" ] ; then
@@ -11,7 +10,7 @@ fi
 
 mkdir -p -- $FREENET_HOME
 
-cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
+cp -u -- @seednodes@/seednodes.fref $FREENET_HOME/seednodes.fref
 chmod u+rw -- $FREENET_HOME/seednodes.fref
 
 cd -- $FREENET_HOME

From 975218a784ff333d3680a0ce72fd5b5a93682190 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 7 Sep 2024 18:18:07 +0200
Subject: [PATCH 3/3] freenet: move to pkgs/by-name

---
 .../p2p => by-name/fr}/freenet/deps.json      |  0
 .../p2p => by-name/fr}/freenet/freenetWrapper |  0
 .../fr/freenet/package.nix}                   | 21 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               | 17 ---------------
 4 files changed, 18 insertions(+), 20 deletions(-)
 rename pkgs/{applications/networking/p2p => by-name/fr}/freenet/deps.json (100%)
 rename pkgs/{applications/networking/p2p => by-name/fr}/freenet/freenetWrapper (100%)
 rename pkgs/{applications/networking/p2p/freenet/default.nix => by-name/fr/freenet/package.nix} (89%)

diff --git a/pkgs/applications/networking/p2p/freenet/deps.json b/pkgs/by-name/fr/freenet/deps.json
similarity index 100%
rename from pkgs/applications/networking/p2p/freenet/deps.json
rename to pkgs/by-name/fr/freenet/deps.json
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/by-name/fr/freenet/freenetWrapper
similarity index 100%
rename from pkgs/applications/networking/p2p/freenet/freenetWrapper
rename to pkgs/by-name/fr/freenet/freenetWrapper
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/by-name/fr/freenet/package.nix
similarity index 89%
rename from pkgs/applications/networking/p2p/freenet/default.nix
rename to pkgs/by-name/fr/freenet/package.nix
index 0a46a6095489..3142baf9501b 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/by-name/fr/freenet/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  jdk,
-  jre,
-  gradle,
+  jdk17_headless,
+  jre17_minimal,
+  gradle_7,
   bash,
   coreutils,
   substituteAll,
@@ -15,6 +15,21 @@
 }:
 
 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";
 
   freenet_ext = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e840bf055948..623f34588159 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30169,23 +30169,6 @@ with pkgs;
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  freenet = callPackage ../applications/networking/p2p/freenet {
-    gradle = gradle_7;
-    jdk = jdk17_headless;
-    # Reduce closure size
-    jre = pkgs.jre17_minimal.override {
-      modules = [
-        "java.base"
-        "java.logging"
-        "java.naming"
-        "java.sql"
-        "java.desktop"
-        "java.management"
-      ];
-      jdk = jdk17_headless;
-    };
-  };
-
   freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };
 
   freepv = callPackage ../applications/graphics/freepv { };