Unverified Commit 0b6d56d7 authored by Florian's avatar Florian Committed by GitHub
Browse files

Merge pull request #333065 from matteo-pacini/nzbhydra2-move 

nzbhydra2: move to pkgs/by-name
parents e2c919dc 411c3eec

pkgs/servers/nzbhydra2/default.nix→pkgs/by-name/nz/nzbhydra2/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stdenv,

  fetchzip,

  makeWrapper,

  jre,

  openjdk17,

  python3,

  unzip,

}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [

    jre

    openjdk17

    makeWrapper

    unzip

  ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 


    makeWrapper ${python3}/bin/python $out/bin/nzbhydra2 \

      --add-flags "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" \

      --prefix PATH ":" ${jre}/bin

      --prefix PATH ":" ${openjdk17}/bin



    runHook postInstall

  '';

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -10933,11 +10933,6 @@ with pkgs; 














  nzbget = callPackage ../tools/networking/nzbget { };



























  nzbhydra2 = callPackage ../servers/nzbhydra2 {













    # Requires Java 17, not lower, not higher













    jre = openjdk17;













  };



























  oapi-codegen = callPackage ../tools/networking/oapi-codegen { };





























  oath-toolkit = callPackage ../tools/security/oath-toolkit { };