diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 02baf6227d91..8ebe0d816de4 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -107,8 +107,6 @@ let # elm-format requires text >= 2.0 text = self.text_2_0_2; - # elm-format-lib requires hspec-golden < 0.2 - hspec-golden = self.hspec-golden_0_1_0_3; # unorderd-container's tests indirectly depend on text < 2.0 unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers; # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0 diff --git a/pkgs/development/compilers/elm/packages/avh4-lib.nix b/pkgs/development/compilers/elm/packages/avh4-lib.nix index 96ee35af27c9..f7f9381703c6 100644 --- a/pkgs/development/compilers/elm/packages/avh4-lib.nix +++ b/pkgs/development/compilers/elm/packages/avh4-lib.nix @@ -1,26 +1,25 @@ -{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap -, binary, bytestring, containers, directory, fetchgit, filepath -, lib, mtl, pooled-io, process, relude, tasty, tasty-discover -, tasty-hspec, tasty-hunit, text +{ mkDerivation, array, base, bytestring, directory, fetchgit +, filepath, lib, mtl, pooled-io, process, relude, tasty +, tasty-discover, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "avh4-lib"; version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; + configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base bimap binary bytestring - containers directory filepath mtl pooled-io process relude text + array base bytestring directory filepath mtl pooled-io process + relude text ]; testHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base bimap binary bytestring - containers directory filepath mtl pooled-io process relude tasty - tasty-hspec tasty-hunit text + array base bytestring directory filepath mtl pooled-io process + relude tasty tasty-hspec tasty-hunit text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; diff --git a/pkgs/development/compilers/elm/packages/elm-format-lib.nix b/pkgs/development/compilers/elm/packages/elm-format-lib.nix index 255e43af6917..a6b70414143f 100644 --- a/pkgs/development/compilers/elm/packages/elm-format-lib.nix +++ b/pkgs/development/compilers/elm/packages/elm-format-lib.nix @@ -1,30 +1,27 @@ -{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, array -, avh4-lib, base, bimap, binary, bytestring, containers, directory -, elm-format-markdown, elm-format-test-lib, fetchgit, filepath -, ghc-prim, hspec, lib, mtl, optparse-applicative, process, relude -, split, tasty, tasty-discover, tasty-hspec, tasty-hunit, text +{ mkDerivation, aeson, avh4-lib, base, bimap, binary, bytestring +, containers, elm-format-markdown, elm-format-test-lib, fetchgit +, hspec, lib, mtl, optparse-applicative, relude, split, tasty +, tasty-discover, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "elm-format-lib"; version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary - bytestring containers directory elm-format-markdown filepath - ghc-prim mtl optparse-applicative process relude text + aeson avh4-lib base bimap binary bytestring containers + elm-format-markdown mtl optparse-applicative relude text ]; testHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary - bytestring containers directory elm-format-markdown - elm-format-test-lib filepath ghc-prim hspec mtl - optparse-applicative process relude split tasty tasty-hspec - tasty-hunit text + aeson avh4-lib base bimap binary bytestring containers + elm-format-markdown elm-format-test-lib hspec mtl + optparse-applicative relude split tasty tasty-hspec tasty-hunit + text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; diff --git a/pkgs/development/compilers/elm/packages/elm-format-markdown.nix b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix index f5cc03c95326..fdeb2e88d384 100644 --- a/pkgs/development/compilers/elm/packages/elm-format-markdown.nix +++ b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix @@ -4,8 +4,8 @@ mkDerivation { version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix index 6dd8598be32b..ccd6264d6c16 100644 --- a/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix +++ b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix @@ -7,14 +7,14 @@ mkDerivation { version = "0.0.0.1"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ avh4-lib base containers filepath hspec hspec-core hspec-golden mtl - split tasty tasty-hspec tasty-hunit text + split tasty-hunit text ]; testHaskellDepends = [ avh4-lib base containers filepath hspec hspec-core hspec-golden mtl diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 1f88650bd3f6..c4448f246425 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,29 +1,28 @@ -{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bimap -, bytestring, containers, elm-format-lib, elm-format-test-lib -, fetchgit, hspec, lib, mtl, optparse-applicative, QuickCheck -, quickcheck-io, relude, tasty, tasty-hspec, tasty-hunit -, tasty-quickcheck, text +{ mkDerivation, aeson, ansi-wl-pprint, avh4-lib, base, bytestring +, elm-format-lib, elm-format-test-lib, fetchgit, hspec, lib +, optparse-applicative, QuickCheck, quickcheck-io, relude, tasty +, tasty-hspec, tasty-hunit, tasty-quickcheck, text }: mkDerivation rec { pname = "elm-format"; - version = "0.8.6"; + version = "0.8.7"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "1aiq3mv2ycv6bal5hnz6k33bzmnnidzxxs5b6z9y6lvmr0lbf3j4"; - rev = "7e80dd48dd9b30994e43f4804b2ea7118664e8e0"; + sha256 = "04l1bn4w8q3ifd6mc4mfrqxfbihmqnpfjdn6gr0x2jqcasjbk0bi"; + rev = "b5cca4c26b473dab06e5d73b98148637e4770d45"; fetchSubmodules = true; }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson ansi-wl-pprint avh4-lib base bytestring containers - elm-format-lib optparse-applicative relude text + aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib + optparse-applicative relude text ]; testHaskellDepends = [ - aeson ansi-wl-pprint avh4-lib base bimap bytestring containers - elm-format-lib elm-format-test-lib hspec mtl optparse-applicative - QuickCheck quickcheck-io relude tasty tasty-hspec tasty-hunit - tasty-quickcheck text + aeson ansi-wl-pprint avh4-lib base bytestring elm-format-lib + elm-format-test-lib hspec optparse-applicative QuickCheck + quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck + text ]; doHaddock = false; homepage = "https://elm-lang.org";