diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 236b47d7160f841abe9e56c59f8d3604d4bf2f5b..e22644cc74d3247df5d9c8371cc63df17e467c7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ cabal-build-and-test: # This is only done in CI configuration because non-CI users probably # want their local cabal configuration left alone. cat >cabal.project.local <<EOF - store-dir: $CI_PROJECT_DIR/.cabal + store-dir: $CI_PROJECT_DIR/.cabal/store remote-repo-cache: $CI_PROJECT_DIR/.cabal/packages EOF nix run .#cabal-test diff --git a/flake.nix b/flake.nix index 1079bd01c8634ac9941bbba4cdc8e042bd442af5..153768b55982c4d870e328e9a17415bdc6a99eb5 100644 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ export PKG_CONFIG_PATH=${pkgs.lib.makeSearchPath "lib/pkgconfig" [pkgs.zlib.dev]} find . - ghc-pkg check --package-db .cabal/ghc-8.10.7/package.db + ghc-pkg check --package-db .cabal/store/ghc-8.10.7/package.db cabal update hackage.haskell.org cabal run tests '';