From b1ff1909be5e849801ad902b2a577ea4643f6588 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 20 Dec 2020 19:21:43 +0100 Subject: [PATCH] haskellPackages.gitit: jailbreak Should fix the build failure described in #107209 for master/unstable. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++-- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30a9420b2bb..58bb73e4445 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1164,8 +1164,10 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; - # gitit is unbroken in the latest release - gitit = markUnbroken super.gitit; + # version constraints break the build, so we jailbreak + # can be removed at a new release which also fixes + # https://github.com/jgm/gitit/issues/665 + gitit = doJailbreak super.gitit; # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9585b696468..fdc8651728e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5540,7 +5540,6 @@ broken-packages: - github-webhook-handler-snap - githud - gitignore - - gitit - gitlab-api - gitlib - gitlib-cmdline