From 148d4a214a1a7f4b21f19d9468286a8a837b09f6 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Mon, 21 Oct 2019 22:41:29 +0200 Subject: [PATCH] elmPackages: elm-format GHC 8.8.1 patch --- pkgs/development/compilers/elm/default.nix | 18 ++++++++++++++++-- .../configuration-hackage2nix.yaml | 1 - 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 9dbde319f0a0..321176ea514d 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -27,9 +27,23 @@ let The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: `package/nix/build.sh` */ - #elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {})); + elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { + # GHC 8.8.1 support + # https://github.com/avh4/elm-format/pull/640 + patches = [( + fetchpatch { + url = "https://github.com/turboMaCk/elm-format/commit/4f4abdc7117ed6ce3335f6cf39b6495b48067b7c.patch"; + sha256 = "1zqk6q6w0ph12mnwffgwzf4h1hcgqg0v09ws9q2g5bg2riq4rvd9"; + } + )]; + # Tests are failing after upgrade to ghc881. + # Cause is probably just a minor change in stdout output + # see https://github.com/avh4/elm-format/pull/640 + doCheck = false; + jailbreak = true; + })); elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { - prePatch = '' + prePatch = '' substituteInPlace package.yaml --replace "- -Werror" "" hpack ''; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 657fc791cafc..527e355883cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6322,7 +6322,6 @@ broken-packages: - incremental-computing - incremental-maps - increments - - indents - indexation - IndexedList - indextype