gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.fourmolu*: enable tests for all versions

Browse Source 
Clean up override for removed version.
This commit is contained in:
sternenseemann
2024-01-07 01:44:48 +01:00
parent e155eee35e
commit 799b5efeef
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+1 -3
View File
@@ -116,9 +116,7 @@ in {
in
lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
haskell-language-server = allowInconsistentDependencies super.haskell-language-server;
# Tests fail due to the newly-build fourmolu not being in PATH
# https://github.com/fourmolu/fourmolu/issues/231
fourmolu = dontCheck super.fourmolu_0_14_0_0;
fourmolu = self.fourmolu_0_14_0_0;
ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0);
hlint = super.hlint_3_6_1;
stylish-haskell = super.stylish-haskell;
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+1 -3
View File
@@ -95,9 +95,7 @@ self: super: {
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231121;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2;
# Tests fail due to the newly-build fourmolu not being in PATH
# https://github.com/fourmolu/fourmolu/issues/231
fourmolu = dontCheck super.fourmolu_0_14_0_0;
fourmolu = doDistribute self.fourmolu_0_14_0_0;
ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0);
hlint = super.hlint_3_6_1;
pkgs/development/haskell-modules/configuration-nix.nix
+19 -11
View File
@@ -1216,18 +1216,26 @@ self: super: builtins.intersectAttrs super {
}) super.procex;
# Test suite wants to run main executable
fourmolu = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu;
# https://github.com/fourmolu/fourmolu/issues/231
inherit (
let
fourmoluTestFix = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
hydraPlatforms = lib.platforms.all; # also test versioned attributes
});
in
# Test suite wants to run main executable
fourmolu_0_10_1_0 = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_10_1_0;
{
fourmolu = fourmoluTestFix super.fourmolu;
fourmolu_0_14_0_0 = fourmoluTestFix super.fourmolu_0_14_0_0;
fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0;
})
fourmolu
fourmolu_0_14_0_0
fourmolu_0_14_1_0
;
# Test suite needs to execute 'disco' binary
disco = overrideCabal (drv: {