diff options
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/servers/plex/raw.nix | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fb4efba383c..e6f17b599a2 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -3,8 +3,6 @@ , autoreconfHook, nixosTests }: -let inherit (lib) optional optionals; in - stdenv.mkDerivation rec { pname = "knot-dns"; version = "3.1.0"; @@ -29,6 +27,12 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; + # Disable knotd journal tests on platforms that don't use 4k sysconf(_SC_PAGESIZE). + # The journal most likely works fine, but some of the tests currently don't. + postPatch = lib.optionalString (doCheck && stdenv.isDarwin && stdenv.isAarch64) '' + sed '/^\tknot\/test_journal\>/d' -i tests/Makefile.am + ''; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring @@ -39,12 +43,10 @@ stdenv.mkDerivation rec { libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? - ] - ++ optionals stdenv.isLinux [ - libcap_ng systemd - libbpf # XDP support - ] - ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng systemd + libbpf # XDP support + ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6bde2ed5a57..1d404f1fa19 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.5.4862-0f739d462"; + version = "1.23.6.4881-e2e58f321"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1qbv30ki8xw9vdvqw8fh56br8gkm1ndcw361sal7ahn62d4h85nq"; + sha256 = "02vmisqcrchr48pdx61ysfd9j95i5vyr30k20inx3xk4rj50a3cl"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1ac169197gfi78mnm46lhgvzlg2y9c0pzdm5a6031lfalqc7z9nc"; + sha256 = "1wf48h8aqzg5wszp2rcx9mv8xv6xsnqh405z3jna65mxhycf4cv9"; }; outputs = [ "out" "basedb" ]; |