Unverified Commit b9ada945 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #325062 from matteo-pacini/nzbhydra2 

nzbhydra2: 4.7.6 -> 7.2.3, add maintainer
parents fd36f66d 146fa6b1

nixos/tests/nzbhydra2.nix

+1 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ lib, ... }:

  {

    name = "nzbhydra2";

    meta.maintainers = with lib.maintainers; [ jamiemagee ];

    meta.maintainers = with lib.maintainers; [ matteopacini ];



    nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; };

pkgs/servers/nzbhydra2/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -9,15 +9,19 @@ 
}:

stdenv.mkDerivation rec {

  pname = "nzbhydra2";

  version = "4.7.6";

  version = "7.2.3";



  src = fetchzip {

    url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip";

    hash = "sha512-vc+VInEnh00bASxcEwSjJcsa0QJHmtRzSz30uW60wGmA24tlaJYSk42N5KpGFbkQkOkb2ijHmKGxPogSa4izRQ==";

    url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip";

    hash = "sha256-gGTEOqqnVSgsKvEjd6b5aG8EM2M8u0FdpIebYNQFP50=";

    stripRoot = false;

  };



  nativeBuildInputs = [jre makeWrapper unzip];

  nativeBuildInputs = [

    jre

    makeWrapper

    unzip

  ];



  installPhase = ''

    runHook preInstall
@@ -37,7 +41,7 @@ stdenv.mkDerivation rec { 
    description = "Usenet meta search";

    homepage = "https://github.com/theotherp/nzbhydra2";

    license = licenses.asl20;

    maintainers = with maintainers; [jamiemagee];

    maintainers = with maintainers; [ matteopacini ];

    platforms = with platforms; linux;

    mainProgram = "nzbhydra2";

  };

pkgs/top-level/all-packages.nix

+2 −4
Original line number Diff line number Diff line
@@ -11047,10 +11047,8 @@ with pkgs; 
  nzbget = callPackage ../tools/networking/nzbget { };















  nzbhydra2 = callPackage ../servers/nzbhydra2 {













    # You need Java (at least 8, at most 15)













    # https://github.com/theotherp/nzbhydra2/issues/697













    # https://github.com/theotherp/nzbhydra2/#how-to-run













    jre = openjdk11;













    # Requires Java 17, not lower, not higher













    jre = openjdk17;















  };





























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