Merge pull request #231755 from figsoda/nzbget
nzbget: make compatible with openssl 3
This commit is contained in:
commit
21e3532284
|
@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
"${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V"
|
||||
)
|
||||
|
||||
config = server.succeed("${nodes.server.config.systemd.services.nzbget.serviceConfig.ExecStart} --printconfig")
|
||||
config = server.succeed("${nodes.server.systemd.services.nzbget.serviceConfig.ExecStart} --printconfig")
|
||||
|
||||
# confirm the test settings are applied
|
||||
assert 'MainDir = "/var/lib/nzbget"' in config
|
||||
|
|
|
@ -1,5 +1,18 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2
|
||||
, gnutls, libgcrypt, zlib, openssl, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gnutls
|
||||
, libgcrypt
|
||||
, libpar2
|
||||
, libsigcxx
|
||||
, libxml2
|
||||
, ncurses
|
||||
, openssl
|
||||
, zlib
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nzbget";
|
||||
|
@ -7,13 +20,31 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
|
||||
sha256 = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU=";
|
||||
hash = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# openssl 3 compatibility
|
||||
# https://github.com/nzbget/nzbget/pull/793
|
||||
(fetchpatch {
|
||||
name = "daemon-connect-dont-use-fips-mode-set-with-openssl-3.patch";
|
||||
url = "https://github.com/nzbget/nzbget/commit/f76e8555504e3af4cf8dd4a8c8e374b3ca025099.patch";
|
||||
hash = "sha256-39lvnhBK4126TYsRbJOUxsV9s9Hjuviw7CH/wWn/VkM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libxml2 ncurses libsigcxx libpar2 gnutls
|
||||
libgcrypt zlib openssl ];
|
||||
buildInputs = [
|
||||
gnutls
|
||||
libgcrypt
|
||||
libpar2
|
||||
libsigcxx
|
||||
libxml2
|
||||
ncurses
|
||||
openssl
|
||||
zlib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -10568,9 +10568,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
nzbget = callPackage ../tools/networking/nzbget {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
nzbget = callPackage ../tools/networking/nzbget { };
|
||||
|
||||
nzbhydra2 = callPackage ../servers/nzbhydra2 {
|
||||
# You need Java (at least 8, at most 15)
|
||||
|
|
Loading…
Reference in a new issue