diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2f89623ecdeb..ac3ee1eb3ba6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1079,10 +1079,15 @@ self: super: { hpack = self.hpack_0_31_0; yaml = self.yaml_0_10_1_1; }); + stack2nix = super.stack2nix.overrideScope (self: super: { + hpack = self.hpack_0_31_0; + yaml = self.yaml_0_10_1_1; + }); # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; + # https://github.com/pikajude/stylish-cabal/issues/11 stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 194e13a52532..003d9d259ace 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -41639,6 +41639,10 @@ self: { base Cabal containers directory filepath language-nix lens pretty process tasty tasty-golden ]; + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -203186,7 +203190,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "termplot" = callPackage