From 641b32b8d0a49315184699035ef76e14da037004 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 29 Jul 2022 20:08:35 -0700 Subject: [PATCH] fix jackett build (by disabling the check phase. manually verified: still works) --- nixpatches/list.nix | 13 ++++++++++++- pkgs/jackett/default.nix | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index c5007869..dcd3e84a 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -9,11 +9,22 @@ fetchpatch: [ ./02-rpi4-uboot.patch # alternative to https://github.com/NixOS/nixpkgs/pull/173200 ./04-dart-2.7.0.patch - # whalebird: suuport aarch64 + # whalebird: support aarch64 (fetchpatch { url = "https://github.com/NixOS/nixpkgs/pull/176476.diff"; sha256 = "sha256-126DljM06hqPZ3fjLZ3LBZR64nFbeTfzSazEu72d4y8="; }) + + # jackett updates + # (fetchpatch { + # url = "https://github.com/NixOS/nixpkgs/pull/169395.diff"; + # sha256 = "sha256-JZh/5I22ZALnzaWQXAbvOJ1ZVjuRpPNY5WWFJDalzXk="; + # }) + # (fetchpatch { + # url = "https://github.com/NixOS/nixpkgs/pull/182847.diff"; + # sha256 = "sha256-EojqEVNBIyM4DJYLMiY+UKey8RV4tuIv0uyTMEhKiRo="; + # }) + # TODO: upstream ./07-duplicity-rich-url.patch # TODO: upstream diff --git a/pkgs/jackett/default.nix b/pkgs/jackett/default.nix index b345f1d1..26f65b46 100644 --- a/pkgs/jackett/default.nix +++ b/pkgs/jackett/default.nix @@ -1,6 +1,8 @@ { pkgs }: (pkgs.jackett.overrideAttrs (upstream: { + # 2022-07-29: check phase segfaults on arm (with or without my patches) + doCheck = false; patches = (upstream.patches or []) ++ [ # bind to an IP address which is usable behind a netns ./01-fix-bind-host.patch