Unverified Commit 975218a7 authored by Daniel Nagy's avatar Daniel Nagy
Browse files

freenet: move to pkgs/by-name

parent 22ef7242
Loading
Loading
Loading
Loading
+18 −3
Original line number Diff line number Diff line
@@ -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 {
+0 −17
Original line number Diff line number Diff line
@@ -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 { };