Skip to content

Commit

Permalink
Fix for tests broken by cabal update in hackage
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Aug 10, 2022
1 parent 7d38602 commit 397267f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test/cabal-simple/default.nix
Expand Up @@ -30,7 +30,7 @@ in recurseIntoAttrs {
};

# Used for testing externally with nix-shell (../tests.sh).
test-shell = project.shellFor { tools = { cabal = "3.6.2.0"; }; withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924"]; };
test-shell = project.shellFor { tools = { cabal = "latest"; }; withHoogle = !__elem compiler-nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924"]; };

run = stdenv.mkDerivation {
name = "cabal-simple-test";
Expand Down
6 changes: 3 additions & 3 deletions test/shell-for/default.nix
Expand Up @@ -23,7 +23,7 @@ let
packages = ps: with ps; [ pkga pkgb ];
# This adds cabal-install to the shell, which helps tests because
# they use a nix-shell --pure. Normally you would BYO cabal-install.
tools = { cabal = "3.2.0.0"; };
tools = { cabal = "latest"; };
exactDeps = true;
# Avoid duplicate package issues when runghc looks for packages
packageSetupDeps = false;
Expand All @@ -34,7 +34,7 @@ let
packages = ps: with ps; [ pkga ];
# This adds cabal-install to the shell, which helps tests because
# they use a nix-shell --pure. Normally you would BYO cabal-install.
tools = { cabal = "3.2.0.0"; };
tools = { cabal = "latest"; };
exactDeps = true;
# Avoid duplicate package issues when runghc looks for packages
packageSetupDeps = false;
Expand All @@ -46,7 +46,7 @@ let
# packages = ps: with ps; [ pkga pkgb ];
# This adds cabal-install to the shell, which helps tests because
# they use a nix-shell --pure. Normally you would BYO cabal-install.
tools = { cabal = "3.2.0.0"; };
tools = { cabal = "latest"; };
# Avoid duplicate package issues when runghc looks for packages
packageSetupDeps = false;
};
Expand Down

0 comments on commit 397267f

Please sign in to comment.