diff options
| author | Aaron VonderHaar <gruen0aermel@gmail.com> | 2020-09-23 22:34:04 -0700 |
|---|---|---|
| committer | Aaron VonderHaar <gruen0aermel@gmail.com> | 2020-09-23 22:34:04 -0700 |
| commit | a67d4c974420f18b1f3c55756381726822bc2318 (patch) | |
| tree | b8b008acdb271cc2101f8e018ba1dce27b37c74c /pkgs/development/compilers/elm | |
| parent | 2be541ff7ce6bca74ddf7cbb54bbc9863011925b (diff) | |
elm-format: 0.8.3 -> 0.8.4
Diffstat (limited to 'pkgs/development/compilers/elm')
| -rw-r--r-- | pkgs/development/compilers/elm/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/elm/packages/elm-format.nix | 16 |
2 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 53ccb57abe6b3..369ea86262045 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -30,18 +30,6 @@ let `package/nix/build.sh` */ elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { - # GHC 8.8.3 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; })); diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index e498b4b1494f5..ff944cc4b6471 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary +{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary , bytestring, cmark, containers, directory, filepath, free, HUnit , indents, json, mtl, optparse-applicative, parsec, process , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-format"; - version = "0.8.3"; + version = "0.8.4"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8"; - rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b"; + sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai"; + rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890"; }; postPatch = '' mkdir -p ./generated @@ -18,15 +18,15 @@ mkDerivation { module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.3" + gitDescribe = "0.8.4" EOHS ''; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base binary bytestring containers - directory filepath free indents json mtl optparse-applicative - parsec process split text + ansi-terminal ansi-wl-pprint array base binary bytestring + containers directory filepath free indents json mtl + optparse-applicative parsec process split text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ |