diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-05 12:22:59 +0200 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-05-05 12:55:29 +0200 |
| commit | 20020d3ec8764d119df541d4ceae1d2a81f909df (patch) | |
| tree | a059f202929f1c410af5e299a95b6a3a3c9fa305 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | eb9b3a59f0699754a31f76e886ed7eaf9b9e2cdb (diff) | |
| download | nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.tar nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.tar.gz nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.tar.bz2 nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.tar.lz nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.tar.xz nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.tar.zst nixpkgs-20020d3ec8764d119df541d4ceae1d2a81f909df.zip | |
haskellPackages.hnix: unbreak
The mystery build failure was caused by having the same instance as an orphan and imported from ref-tf 0.5 (why ever that doesn't warrant a logged error message…). The solution for this is https://github.com/haskell-nix/hnix/pull/918, which sadly doesn't apply cleanly on the hnix 0.12.0.1 tarball. Therefore I've backported the patch until hnix hopefully gets a new hackage release soon.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1b51fe615ca..b0ff20c4cf7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -197,7 +197,19 @@ self: super: { digit = doJailbreak super.digit; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); + hnix = generateOptparseApplicativeCompletion "hnix" + (overrideCabal super.hnix (drv: { + doCheck = false; + prePatch = '' + # fix encoding problems when patching + ${pkgs.dos2unix}/bin/dos2unix hnix.cabal + '' + (drv.prePatch or ""); + patches = [ + # support ref-tf in hnix 0.12.0.1, can be removed after + # https://github.com/haskell-nix/hnix/pull/918 + ./patches/hnix-ref-tf-0.5-support.patch + ] ++ (drv.patches or []); + })); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; |