Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

elm-format: 0.8.1 -> 0.8.2 #66364

Merged
merged 1 commit into from
Aug 10, 2019
Merged

elm-format: 0.8.1 -> 0.8.2 #66364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 13 additions & 9 deletions pkgs/development/compilers/elm/packages/elm-format.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary
, bytestring, Cabal, cmark, containers, directory, filepath, free
, HUnit, indents, json, mtl, optparse-applicative, parsec, process
, bytestring, cmark, containers, directory, filepath, free, HUnit
, indents, json, mtl, optparse-applicative, parsec, process
, QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden
, tasty-hunit, tasty-quickcheck, text
}:
mkDerivation {
pname = "elm-format";
version = "0.8.1";
version = "0.8.2";
src = fetchgit {
url = "https://github.com/avh4/elm-format";
sha256 = "0p1dy1m6illsl7i04zsv5jqw7i4znv7pfpdfm53zy0k7mq0fk09j";
rev = "89694e858664329e3cbdaeb71b15c4456fd739ff";
sha256 = "0ly37fszrfviwqgrww57ikdcr7i8lcpczhqm8xqp5s7mrlpdxv7z";
rev = "ab3627cce01e5556b3fe8c2b5e3d92b80bfc74af";
};
postPatch = ''
sed -i "s|desc <-.*||" ./Setup.hs
sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"0.8.1\\\\\"\"|" ./Setup.hs
mkdir -p ./generated
cat <<EOHS > ./generated/Build_elm_format.hs
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reworked the elm-format build scripts, so there's no longer a custom cabal setup. Instead you just need to generate this file before building.

module Build_elm_format where

gitDescribe :: String
gitDescribe = "0.8.2"
EOHS
'';
isLibrary = true;
isLibrary = false;
Copy link
Member Author

@avh4 avh4 Aug 9, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nix file that includes this one uses justStaticExecutables (I think because building just the library used to fail on MacOS?), so it was suggested that the library shouldn't be exposed. I think this is the appropriate change?

isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base binary bytestring containers
directory filepath free indents json mtl optparse-applicative
Expand Down