From 9b79de383c5f130657166f869e2ccd2f39c1bed6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 00:21:55 +0200 Subject: [PATCH] haskellPackages.hnix: make sure patches apply Cabal revisions can break the patches we apply, so we'll need to make any necessary changes to the cabal file with patches ourselves. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b7d079a99b3e..59d0248df9af 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,6 +204,9 @@ self: super: { revert = true; }) ] ++ (drv.patches or []); + # make sure patches are not broken by cabal file revisions + revision = null; + editedCabalFile = null; })); # Fails for non-obvious reasons while attempting to use doctest.