git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112457 from avh4/elm-format-0.8.5

elm-format: 0.8.4 -> 0.8.5

commit576f60806bede1c4ea6837e437c37dfcdfe4cf89 authorDomen Kožar <domen@dev.si> dateThu 11 Feb 2021, 11:52 (6 years ago) parentd319653bdf0239
9 files changed+159−28
maintainers/maintainer-list.nix+6 pkgs/development/compilers/elm/default.nix+7−2 pkgs/development/compilers/elm/packages/avh4-lib.nix+29 pkgs/development/compilers/elm/packages/bimap.nix+15 pkgs/development/compilers/elm/packages/elm-format-lib.nix+33 pkgs/development/compilers/elm/packages/elm-format-markdown.nix+16 pkgs/development/compilers/elm/packages/elm-format-test-lib.nix+27 pkgs/development/compilers/elm/packages/elm-format.nix+25−25 pkgs/development/compilers/elm/packages/indents.nix+1−1
maintainers/maintainer-list.nix+6
@@ -910,6 +910,12 @@
910910 githubId = 687218;
911911 name = "averelld";
912912 };
913+ avh4 = {
914+ email = "gruen0aermel@gmail.com";
915+ github = "avh4";
916+ githubId = 1222;
917+ name = "Aaron VonderHaar";
918+ };
913919 avitex = {
914920 email = "theavitex@gmail.com";
915921 github = "avitex";
pkgs/development/compilers/elm/default.nix+7−2
@@ -7,7 +7,7 @@
77let
88 fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
99
10− hsPkgs = haskell.packages.ghc883.override {
10+ hsPkgs = haskell.packages.ghc8103.override {
1111 overrides = self: super: with haskell.lib; with lib;
1212 let elmPkgs = rec {
1313 elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
@@ -41,7 +41,7 @@ let
4141 description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
4242 homepage = "https://github.com/avh4/elm-format";
4343 license = licenses.bsd3;
44− maintainers = with maintainers; [ turbomack ];
44+ maintainers = with maintainers; [ avh4 turbomack ];
4545 }));
4646
4747 elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: {
@@ -79,6 +79,11 @@ let
7979
8080 # Needed for elm-format
8181 indents = self.callPackage ./packages/indents.nix {};
82+ bimap = self.callPackage ./packages/bimap.nix {};
83+ avh4-lib = self.callPackage ./packages/avh4-lib.nix {};
84+ elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {};
85+ elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {};
86+ elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
8287 };
8388 };
8489
pkgs/development/compilers/elm/packages/avh4-lib.nixnew file+29
@@ -0,0 +1,29 @@
1+{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap
2+, binary, bytestring, containers, directory, fetchgit, filepath
3+, lib, mtl, process, relude, tasty, tasty-discover, tasty-hspec
4+, tasty-hunit, text
5+}:
6+mkDerivation {
7+ pname = "avh4-lib";
8+ version = "0.0.0.1";
9+ src = fetchgit {
10+ url = "https://github.com/avh4/elm-format";
11+ sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6";
12+ rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be";
13+ fetchSubmodules = true;
14+ };
15+ postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot";
16+ libraryHaskellDepends = [
17+ ansi-terminal ansi-wl-pprint array base bimap binary bytestring
18+ containers directory filepath mtl process relude text
19+ ];
20+ testHaskellDepends = [
21+ ansi-terminal ansi-wl-pprint array base bimap binary bytestring
22+ containers directory filepath mtl process relude tasty tasty-hspec
23+ tasty-hunit text
24+ ];
25+ testToolDepends = [ tasty-discover ];
26+ doHaddock = false;
27+ description = "Common code for haskell projects";
28+ license = lib.licenses.bsd3;
29+}
pkgs/development/compilers/elm/packages/bimap.nixnew file+15
@@ -0,0 +1,15 @@
1+{ mkDerivation, base, containers, exceptions, lib, QuickCheck
2+, template-haskell
3+}:
4+mkDerivation {
5+ pname = "bimap";
6+ version = "0.3.3";
7+ sha256 = "73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1";
8+ libraryHaskellDepends = [ base containers exceptions ];
9+ testHaskellDepends = [
10+ base containers exceptions QuickCheck template-haskell
11+ ];
12+ homepage = "https://github.com/joelwilliamson/bimap";
13+ description = "Bidirectional mapping between two key types";
14+ license = lib.licenses.bsd3;
15+}
pkgs/development/compilers/elm/packages/elm-format-lib.nixnew file+33
@@ -0,0 +1,33 @@
1+{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, avh4-lib
2+, base, bimap, binary, bytestring, containers, directory
3+, elm-format-markdown, elm-format-test-lib, fetchgit, filepath
4+, indents, json, lib, mtl, optparse-applicative, parsec, process
5+, relude, split, tasty, tasty-discover, tasty-hspec, tasty-hunit
6+, text
7+}:
8+mkDerivation {
9+ pname = "elm-format-lib";
10+ version = "0.0.0.1";
11+ src = fetchgit {
12+ url = "https://github.com/avh4/elm-format";
13+ sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6";
14+ rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be";
15+ fetchSubmodules = true;
16+ };
17+ postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot";
18+ libraryHaskellDepends = [
19+ ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary
20+ bytestring containers directory elm-format-markdown filepath
21+ indents json mtl optparse-applicative parsec process relude text
22+ ];
23+ testHaskellDepends = [
24+ ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary
25+ bytestring containers directory elm-format-markdown
26+ elm-format-test-lib filepath indents json mtl optparse-applicative
27+ parsec process relude split tasty tasty-hspec tasty-hunit text
28+ ];
29+ testToolDepends = [ tasty-discover ];
30+ doHaddock = false;
31+ description = "Common code used by elm-format and elm-refactor";
32+ license = lib.licenses.bsd3;
33+}
pkgs/development/compilers/elm/packages/elm-format-markdown.nixnew file+16
@@ -0,0 +1,16 @@
1+{ mkDerivation, base, containers, fetchgit, lib, mtl, text }:
2+mkDerivation {
3+ pname = "elm-format-markdown";
4+ version = "0.0.0.1";
5+ src = fetchgit {
6+ url = "https://github.com/avh4/elm-format";
7+ sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6";
8+ rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be";
9+ fetchSubmodules = true;
10+ };
11+ postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot";
12+ libraryHaskellDepends = [ base containers mtl text ];
13+ doHaddock = false;
14+ description = "Markdown parsing for Elm documentation comments";
15+ license = lib.licenses.bsd3;
16+}
pkgs/development/compilers/elm/packages/elm-format-test-lib.nixnew file+27
@@ -0,0 +1,27 @@
1+{ mkDerivation, avh4-lib, base, containers, fetchgit, filepath
2+, hspec-core, hspec-golden, lib, mtl, split, tasty, tasty-discover
3+, tasty-hspec, tasty-hunit, text
4+}:
5+mkDerivation {
6+ pname = "elm-format-test-lib";
7+ version = "0.0.0.1";
8+ src = fetchgit {
9+ url = "https://github.com/avh4/elm-format";
10+ sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6";
11+ rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be";
12+ fetchSubmodules = true;
13+ };
14+ postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot";
15+ libraryHaskellDepends = [
16+ avh4-lib base containers filepath hspec-core hspec-golden mtl split
17+ tasty tasty-hspec tasty-hunit text
18+ ];
19+ testHaskellDepends = [
20+ avh4-lib base containers filepath hspec-core hspec-golden mtl split
21+ tasty tasty-hspec tasty-hunit text
22+ ];
23+ testToolDepends = [ tasty-discover ];
24+ doHaddock = false;
25+ description = "Test helpers used by elm-format-tests and elm-refactor-tests";
26+ license = lib.licenses.bsd3;
27+}
pkgs/development/compilers/elm/packages/elm-format.nix+25−25
@@ -1,40 +1,40 @@
1−{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary
2−, bytestring, cmark, containers, directory, filepath, free, HUnit
3−, indents, json, mtl, optparse-applicative, parsec, process
4−, QuickCheck, quickcheck-io, split, lib, tasty, tasty-golden
5−, tasty-hunit, tasty-quickcheck, text
1+{ mkDerivation, ansi-wl-pprint, avh4-lib, base, bimap, cmark
2+, containers, elm-format-lib, elm-format-test-lib, fetchgit, json
3+, lib, mtl, optparse-applicative, parsec, QuickCheck, quickcheck-io
4+, relude, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, text
65}:
7−mkDerivation {
6+mkDerivation rec {
87 pname = "elm-format";
9− version = "0.8.4";
8+ version = "0.8.5";
109 src = fetchgit {
1110 url = "https://github.com/avh4/elm-format";
12− sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai";
13− rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890";
11+ sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6";
12+ rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be";
13+ fetchSubmodules = true;
1414 };
15− postPatch = ''
16− mkdir -p ./generated
17− cat <<EOHS > ./generated/Build_elm_format.hs
18− module Build_elm_format where
19−
20− gitDescribe :: String
21− gitDescribe = "0.8.4"
22− EOHS
23− '';
2415 isLibrary = false;
2516 isExecutable = true;
26− libraryHaskellDepends = [
27− ansi-terminal ansi-wl-pprint array base binary bytestring
28− containers directory filepath free indents json mtl
29− optparse-applicative parsec process split text
17+ executableHaskellDepends = [
18+ ansi-wl-pprint avh4-lib base containers elm-format-lib json
19+ optparse-applicative relude text
3020 ];
31− executableHaskellDepends = [ base ];
3221 testHaskellDepends = [
33− base cmark containers HUnit mtl parsec QuickCheck quickcheck-io
34− split tasty tasty-golden tasty-hunit tasty-quickcheck text
22+ ansi-wl-pprint avh4-lib base bimap cmark containers elm-format-lib
23+ elm-format-test-lib json mtl optparse-applicative parsec QuickCheck
24+ quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck
25+ text
3526 ];
3627 doHaddock = false;
3728 homepage = "https://elm-lang.org";
3829 description = "A source code formatter for Elm";
3930 license = lib.licenses.bsd3;
31+ postPatch = ''
32+ mkdir -p ./generated
33+ cat <<EOHS > ./generated/Build_elm_format.hs
34+ module Build_elm_format where
35+
36+ gitDescribe :: String
37+ gitDescribe = "${version}"
38+ EOHS
39+ '';
4040}
pkgs/development/compilers/elm/packages/indents.nix+1−1
@@ -1,4 +1,4 @@
1−{ mkDerivation, base, concatenative, mtl, parsec, lib }:
1+{ mkDerivation, base, concatenative, lib, mtl, parsec }:
22mkDerivation {
33 pname = "indents";
44 version = "0.3.3";