Merge pull request #225822 from avh4/elm-format-0.8.7

elmPackages.elm-format: 0.8.6 -> 0.8.7

authored by Sandro and committed by GitHub 936e99ba 86a685ce

+40 -47
-2
pkgs/development/compilers/elm/default.nix
··· 107 107 108 108 # elm-format requires text >= 2.0 109 109 text = self.text_2_0_2; 110 - # elm-format-lib requires hspec-golden < 0.2 111 - hspec-golden = self.hspec-golden_0_1_0_3; 112 110 # unorderd-container's tests indirectly depend on text < 2.0 113 111 unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers; 114 112 # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0
+10 -11
pkgs/development/compilers/elm/packages/avh4-lib.nix
··· 1 - { mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap 2 - , binary, bytestring, containers, directory, fetchgit, filepath 3 - , lib, mtl, pooled-io, process, relude, tasty, tasty-discover 4 - , tasty-hspec, tasty-hunit, text 1 + { mkDerivation, array, base, bytestring, directory, fetchgit 2 + , filepath, lib, mtl, pooled-io, process, relude, tasty 3 + , tasty-discover, tasty-hspec, tasty-hunit, text 5 4 }: 6 5 mkDerivation { 7 6 pname = "avh4-lib"; 8 7 version = "0.0.0.1"; 9 8 src = fetchgit { 10 9 url = "https://github.com/avh4/elm-format"; 11 - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; 12 - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; 10 + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; 11 + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; 13 12 fetchSubmodules = true; 14 13 }; 15 14 postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; 15 + configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ]; 16 16 libraryHaskellDepends = [ 17 - ansi-terminal ansi-wl-pprint array base bimap binary bytestring 18 - containers directory filepath mtl pooled-io process relude text 17 + array base bytestring directory filepath mtl pooled-io process 18 + relude text 19 19 ]; 20 20 testHaskellDepends = [ 21 - ansi-terminal ansi-wl-pprint array base bimap binary bytestring 22 - containers directory filepath mtl pooled-io process relude tasty 23 - tasty-hspec tasty-hunit text 21 + array base bytestring directory filepath mtl pooled-io process 22 + relude tasty tasty-hspec tasty-hunit text 24 23 ]; 25 24 testToolDepends = [ tasty-discover ]; 26 25 doHaddock = false;
+12 -15
pkgs/development/compilers/elm/packages/elm-format-lib.nix
··· 1 - { mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, array 2 - , avh4-lib, base, bimap, binary, bytestring, containers, directory 3 - , elm-format-markdown, elm-format-test-lib, fetchgit, filepath 4 - , ghc-prim, hspec, lib, mtl, optparse-applicative, process, relude 5 - , split, tasty, tasty-discover, tasty-hspec, tasty-hunit, text 1 + { mkDerivation, aeson, avh4-lib, base, bimap, binary, bytestring 2 + , containers, elm-format-markdown, elm-format-test-lib, fetchgit 3 + , hspec, lib, mtl, optparse-applicative, relude, split, tasty 4 + , tasty-discover, tasty-hspec, tasty-hunit, text 6 5 }: 7 6 mkDerivation { 8 7 pname = "elm-format-lib"; 9 8 version = "0.0.0.1"; 10 9 src = fetchgit { 11 10 url = "https://github.com/avh4/elm-format"; 12 - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; 13 - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; 11 + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; 12 + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; 14 13 fetchSubmodules = true; 15 14 }; 16 15 postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot"; 17 16 libraryHaskellDepends = [ 18 - aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary 19 - bytestring containers directory elm-format-markdown filepath 20 - ghc-prim mtl optparse-applicative process relude text 17 + aeson avh4-lib base bimap binary bytestring containers 18 + elm-format-markdown mtl optparse-applicative relude text 21 19 ]; 22 20 testHaskellDepends = [ 23 - aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary 24 - bytestring containers directory elm-format-markdown 25 - elm-format-test-lib filepath ghc-prim hspec mtl 26 - optparse-applicative process relude split tasty tasty-hspec 27 - tasty-hunit text 21 + aeson avh4-lib base bimap binary bytestring containers 22 + elm-format-markdown elm-format-test-lib hspec mtl 23 + optparse-applicative relude split tasty tasty-hspec tasty-hunit 24 + text 28 25 ]; 29 26 testToolDepends = [ tasty-discover ]; 30 27 doHaddock = false;
+2 -2
pkgs/development/compilers/elm/packages/elm-format-markdown.nix
··· 4 4 version = "0.0.0.1"; 5 5 src = fetchgit { 6 6 url = "https://github.com/avh4/elm-format"; 7 - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; 8 - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; 7 + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; 8 + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; 9 9 fetchSubmodules = true; 10 10 }; 11 11 postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot";
+3 -3
pkgs/development/compilers/elm/packages/elm-format-test-lib.nix
··· 7 7 version = "0.0.0.1"; 8 8 src = fetchgit { 9 9 url = "https://github.com/avh4/elm-format"; 10 - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; 11 - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; 10 + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; 11 + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; 12 12 fetchSubmodules = true; 13 13 }; 14 14 postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot"; 15 15 libraryHaskellDepends = [ 16 16 avh4-lib base containers filepath hspec hspec-core hspec-golden mtl 17 - split tasty tasty-hspec tasty-hunit text 17 + split tasty-hunit text 18 18 ]; 19 19 testHaskellDepends = [ 20 20 avh4-lib base containers filepath hspec hspec-core hspec-golden mtl
+13 -14
pkgs/development/compilers/elm/packages/elm-format.nix
··· 1 - { mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bimap 2 - , bytestring, containers, elm-format-lib, elm-format-test-lib 3 - , fetchgit, hspec, lib, mtl, optparse-applicative, QuickCheck 4 - , quickcheck-io, relude, tasty, tasty-hspec, tasty-hunit 5 - , tasty-quickcheck, text 1 + { mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bytestring 2 + , elm-format-lib, elm-format-test-lib, fetchgit, hspec, lib 3 + , optparse-applicative, QuickCheck, quickcheck-io, relude, tasty 4 + , tasty-hspec, tasty-hunit, tasty-quickcheck, text 6 5 }: 7 6 mkDerivation rec { 8 7 pname = "elm-format"; 9 - version = "0.8.6"; 8 + version = "0.8.7"; 10 9 src = fetchgit { 11 10 url = "https://github.com/avh4/elm-format"; 12 - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; 13 - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; 11 + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; 12 + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; 14 13 fetchSubmodules = true; 15 14 }; 16 15 isLibrary = false; 17 16 isExecutable = true; 18 17 executableHaskellDepends = [ 19 - aeson ansi-wl-pprint avh4-lib base bytestring containers 20 - elm-format-lib optparse-applicative relude text 18 + aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib 19 + optparse-applicative relude text 21 20 ]; 22 21 testHaskellDepends = [ 23 - aeson ansi-wl-pprint avh4-lib base bimap bytestring containers 24 - elm-format-lib elm-format-test-lib hspec mtl optparse-applicative 25 - QuickCheck quickcheck-io relude tasty tasty-hspec tasty-hunit 26 - tasty-quickcheck text 22 + aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib 23 + elm-format-test-lib hspec optparse-applicative QuickCheck 24 + quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck 25 + text 27 26 ]; 28 27 doHaddock = false; 29 28 homepage = "https://elm-lang.org";