diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 433060b4405..f5a653ec637 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1589,4 +1589,26 @@ self: super: { # Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8 yarn-lock = doJailbreak super.yarn-lock; + + # Dependency to regex-tdfa-text can be removed for later regex-tdfa versions. + # Fix protolude compilation error by applying patch from pull-request. + # Override can be removed for the next release > 0.8.0. + yarn2nix = overrideCabal (super.yarn2nix.override { + regex-tdfa-text = null; + }) (attrs: { + jailbreak = true; + # remove dependency on regex-tdfa-text + # which has been merged into regex-tdfa + postPatch = '' + sed -i '/regex-tdfa-text/d' yarn2nix.cabal + ''; + patches = (attrs.patches or []) ++ [ + # fix a compilation error related to protolude 0.3 + (pkgs.fetchpatch { + url = "https://github.com/Profpatsch/yarn2nix/commit/ca78cf06226819b2e78cb6cdbc157d27afb41532.patch"; + sha256 = "1vkczwzhxilnp87apyb18nycn834y5nbw4yr1kpwlwhrhalvzw61"; + includes = [ "*/ResolveLockfile.hs" ]; + }) + ]; + }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super