From 0bb9486e518e66e41c37d137e845bea28d537d71 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 7 Dec 2022 16:28:56 +0100 Subject: [PATCH] elmPackages.elm: fix build --- pkgs/development/compilers/elm/default.nix | 1 + .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 27 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index f395651a0f18..4bf3647d8785 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -96,6 +96,7 @@ let hspec = self.hspec_2_7_10; hspec-core = self.hspec-core_2_7_10; hspec-discover = self.hspec-discover_2_7_10; + hspec-meta = self.hspec-meta_2_7_8; elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ff6a8c0c9973..cbf267bc72a7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -138,6 +138,7 @@ extra-packages: - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dc997e523384..e5d166ff2821 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -149230,6 +149230,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-meta_2_7_8" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, QuickCheck, quickcheck-io, random + , setenv, stm, time, transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.7.8"; + sha256 = "0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath QuickCheck quickcheck-io random setenv stm time + transformers + ]; + executableHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath QuickCheck quickcheck-io random setenv stm time + transformers + ]; + description = "A version of Hspec which is used to test Hspec itself"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hspec-meta-discover"; + }) {}; + "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, ghc, ghc-boot-th, QuickCheck