From 9e50db9ffadc7aabf5b4c68bba640cfee1801821 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 1 May 2023 15:47:03 -0400
Subject: [PATCH] this is likely closer to canonical
---
.gitlab-ci.yml | 2 +-
flake.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 236b47d..e22644c 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 1079bd0..153768b 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
'';
--
GitLab