public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98617 from avh4/elm-format-0.8.4 

elm-format: 0.8.3 -> 0.8.4
This commit is contained in:
Domen Kožar 2020-09-24 10:15:12 +02:00 committed by GitHub
parent 0765b507f9 a67d4c9744
commit 5f9475d3ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/elm/default.nix
View File

@ -30,18 +30,6 @@ let
`package/nix/build.sh` `package/nix/build.sh`
*/ */
elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { 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; jailbreak = true;
})); }));

16
pkgs/development/compilers/elm/packages/elm-format.nix
View File

@ -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 , bytestring, cmark, containers, directory, filepath, free, HUnit
, indents, json, mtl, optparse-applicative, parsec, process , indents, json, mtl, optparse-applicative, parsec, process
, QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden
@ -6,11 +6,11 @@
}: }:
mkDerivation { mkDerivation {
pname = "elm-format"; pname = "elm-format";
version = "0.8.3"; version = "0.8.4";
src = fetchgit { src = fetchgit {
url = "https://github.com/avh4/elm-format"; url = "https://github.com/avh4/elm-format";
sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8"; sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai";
rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b"; rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890";
}; };
postPatch = '' postPatch = ''
mkdir -p ./generated mkdir -p ./generated
@ -18,15 +18,15 @@ mkDerivation {
module Build_elm_format where module Build_elm_format where
gitDescribe :: String gitDescribe :: String
gitDescribe = "0.8.3" gitDescribe = "0.8.4"
EOHS EOHS
''; '';
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base binary bytestring containers ansi-terminal ansi-wl-pprint array base binary bytestring
directory filepath free indents json mtl optparse-applicative containers directory filepath free indents json mtl
parsec process split text optparse-applicative parsec process split text
]; ];
executableHaskellDepends = [ base ]; executableHaskellDepends = [ base ];
testHaskellDepends = [ testHaskellDepends = [