From 081690e8c6e335f5e1a4964bd5645f1744dee284 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Mon, 13 May 2024 18:05:27 -0700 Subject: [PATCH] dmarc-report-notifier: Work around broken dependency --- nur.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nur.nix b/nur.nix index 3cf24d3..43e2100 100644 --- a/nur.nix +++ b/nur.nix @@ -27,7 +27,21 @@ rec { ch57x-keyboard-tool = pkgs.callPackage ./packages/ch57x-keyboard-tool.nix { }; co2monitor = pkgs.callPackage ./packages/co2monitor.nix { }; decompiler-mc = pkgs.callPackage ./packages/decompiler-mc.nix { }; - dmarc-report-notifier = pkgs.callPackage ./packages/dmarc-report-notifier.nix { }; + dmarc-report-notifier = pkgs.callPackage ./packages/dmarc-report-notifier.nix ( + # Dependency pkgs.python3Packages.parsedmarc was broken on 2024-03-12 by + # NixOS/nixpkgs#294305. A workaround was subsequently applied to dependent + # pkgs.parsedmarc in NixOS/nixpkgs#280940 but the library remains broken, so + # here we duplicate the workaround. + pkgs.lib.optionalAttrs (pkgs.lib.versionAtLeast pkgs.lib.trivial.release "24.05") { + python3Packages = pkgs.lib.throwIfNot pkgs.python3Packages.parsedmarc.meta.broken + "python3Packages.parsedmarc is no longer broken" + (pkgs.python3.override { + packageOverrides = _: _: { + msgraph-core = pkgs.lib.findFirst (p: p.pname == "msgraph-core") null pkgs.parsedmarc.requiredPythonModules; + }; + }).pkgs; + } + ); fastnbt-tools = pkgs.callPackage ./packages/fastnbt-tools.nix { }; fediblockhole = pkgs.callPackage ./packages/fediblockhole.nix { }; git-diff-image = pkgs.callPackage ./packages/git-diff-image.nix { };