From 316f093b4e7d28a37c08f2eb20915d7b079ec88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 7 Jan 2023 09:31:13 +0000 Subject: [PATCH] nix-diff: fix build --- pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ccfdc2ef20ab..3cc9cb81a604 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -800,6 +800,14 @@ self: super: builtins.intersectAttrs super { # time random = dontCheck super.random; + # https://github.com/Gabriella439/nix-diff/pull/74 + nix-diff = overrideCabal (drv: { + postPatch = '' + substituteInPlace src/Nix/Diff/Types.hs \ + --replace "{-# OPTIONS_GHC -Wno-orphans #-}" "{-# OPTIONS_GHC -Wno-orphans -fconstraint-solver-iterations=0 #-}" + ''; + }) (doJailbreak (dontCheck super.nix-diff)); + # mockery's tests depend on hspec-discover which dependso on mockery for its tests mockery = dontCheck super.mockery; # same for logging-facade