cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskellPackages: Fix eval by bumping pinned versions

Browse source
This commit is contained in:
maralorn 2023-01-29 12:10:44 +01:00
parent 9dd80f0e9e
commit e92ea6d48d
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -747,9 +747,9 @@ self: super: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override { }) (super.sensei.override {
hspec = self.hspec_2_10_8; hspec = self.hspec_2_10_9;
hspec-wai = super.hspec-wai.override { hspec-wai = super.hspec-wai.override {
hspec = self.hspec_2_10_8; hspec = self.hspec_2_10_9;
}; };
}); });
@ -1376,7 +1376,7 @@ self: super: {
hls-hlint-plugin = super.hls-hlint-plugin.override { hls-hlint-plugin = super.hls-hlint-plugin.override {
# For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515
hlint = enableCabalFlag "ghc-lib" super.hlint; hlint = enableCabalFlag "ghc-lib" super.hlint;
apply-refact = self.apply-refact_0_11_0_0; apply-refact = self.apply-refact_0_12_0_0;
}; };
# For -f-auto see cabal.project in haskell-language-server. # For -f-auto see cabal.project in haskell-language-server.
@ -1436,14 +1436,14 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3; servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope # Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override { hspec_2_10_9 = doDistribute (super.hspec_2_10_9.override {
hspec-discover = self.hspec-discover_2_10_8; hspec-discover = self.hspec-discover_2_10_9;
hspec-core = self.hspec-core_2_10_8; hspec-core = self.hspec-core_2_10_9;
}); });
hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override { hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override {
hspec-meta = self.hspec-meta_2_10_5; hspec-meta = self.hspec-meta_2_10_5;
}; };
hspec-core_2_10_8 = super.hspec-core_2_10_8.override { hspec-core_2_10_9 = super.hspec-core_2_10_9.override {
hspec-meta = self.hspec-meta_2_10_5; hspec-meta = self.hspec-meta_2_10_5;
}; };

6
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -111,10 +111,10 @@ in {
# Note: Any compilation fixes need to be done on the versioned attributes, # Note: Any compilation fixes need to be done on the versioned attributes,
# since those are used for the internal dependencies between the versioned # since those are used for the internal dependencies between the versioned
# hspec packages in configuration-common.nix. # hspec packages in configuration-common.nix.
hspec = self.hspec_2_10_8; hspec = self.hspec_2_10_9;
hspec-core = self.hspec-core_2_10_8; hspec-core = self.hspec-core_2_10_9;
hspec-meta = self.hspec-meta_2_10_5; hspec-meta = self.hspec-meta_2_10_5;
hspec-discover = self.hspec-discover_2_10_8; hspec-discover = self.hspec-discover_2_10_9;
# the dontHaddock is due to a GHC panic. might be this bug, not sure. # the dontHaddock is due to a GHC panic. might be this bug, not sure.
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619 # https://gitlab.haskell.org/ghc/ghc/-/issues/21619