From 376a511e0997247b8d3a8f46b63a83d6444bf7d2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 23 Feb 2022 22:36:48 +0100 Subject: [PATCH] elmPackages.elm: build using attoparsec 0.13.2.5 Seems like elm is not quite ready for attoparsec 0.14. --- pkgs/development/compilers/elm/default.nix | 3 ++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 31 +++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ab19ac42d24c..1edf6e5ce7f1 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -77,6 +77,9 @@ let in elmPkgs // { inherit elmPkgs; + # We need attoparsec < 0.14 to build elm for now + attoparsec = self.attoparsec_0_13_2_5; + # Needed for elm-format indents = self.callPackage ./packages/indents.nix {}; bimap = self.callPackage ./packages/bimap.nix {}; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ed5c69d26bcb..5426789f79d7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -123,6 +123,7 @@ extra-packages: - ghc-exactprint == 1.4.* # 2022-02-07: preserve for now, 1.5.0 has a breaking change without type changes - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 + - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 72363fbe3ce8..f775dcca1b05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -35408,6 +35408,37 @@ self: { broken = true; }) {}; + "attoparsec_0_13_2_5" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.5"; + sha256 = "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11"; + revision = "2"; + editedCabalFile = "1syz7hf2h8c8vwqniymblnyciwqh4hvflfp1h0ywg7ad8q4gqr0v"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, deepseq, directory, filepath, ghc-prim, http-types