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 { };