From 829c386d1a557f2eb8fa90cd9346c0818f0b8d01 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 31 Oct 2024 14:16:49 +1300 Subject: [PATCH 1/3] Pin index-state used to build hoogle in tests See #2277 --- test/cabal-simple/default.nix | 2 +- test/shell-for-setup-deps/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cabal-simple/default.nix b/test/cabal-simple/default.nix index c98578cfe6..3850cea678 100644 --- a/test/cabal-simple/default.nix +++ b/test/cabal-simple/default.nix @@ -33,7 +33,7 @@ in recurseIntoAttrs { test-shell = (project.shellFor { tools = { cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; - hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; + hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-01T00:00:00Z"; }; }; withHoogle = true; }).overrideAttrs (_: _: { diff --git a/test/shell-for-setup-deps/default.nix b/test/shell-for-setup-deps/default.nix index 6bf7214373..3f4e4bd02d 100644 --- a/test/shell-for-setup-deps/default.nix +++ b/test/shell-for-setup-deps/default.nix @@ -10,7 +10,7 @@ let }; env = project.shellFor { - tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; + tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-01T00:00:00Z"; }; withHoogle = true; }; From dffd9b528b145e860d65f0debd60c35c11423262 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 31 Oct 2024 20:21:44 +1300 Subject: [PATCH 2/3] Also fix shell-for test --- test/shell-for/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/shell-for/default.nix b/test/shell-for/default.nix index a090c83f92..2fa7f7c4e7 100644 --- a/test/shell-for/default.nix +++ b/test/shell-for/default.nix @@ -20,7 +20,10 @@ 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 = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; }; + tools = { + cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local; + hoogle.index-state = "2024-10-01T00:00:00Z"; + }; exactDeps = true; # Avoid duplicate package issues when runghc looks for packages packageSetupDeps = false; @@ -31,7 +34,10 @@ 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 = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; }; + tools = { + cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local; + hoogle.index-state = "2024-10-01T00:00:00Z"; + }; exactDeps = true; # Avoid duplicate package issues when runghc looks for packages packageSetupDeps = false; @@ -43,7 +49,10 @@ 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 = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; }; + tools = { + cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local; + hoogle.index-state = "2024-10-01T00:00:00Z"; + }; # Avoid duplicate package issues when runghc looks for packages packageSetupDeps = false; }; From e908413b316befce311231172b1087e92b1a0a48 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 31 Oct 2024 23:09:27 +1300 Subject: [PATCH 3/3] Bump index-state to 2024-10-26 --- test/cabal-simple/default.nix | 2 +- test/shell-for-setup-deps/default.nix | 2 +- test/shell-for/default.nix | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cabal-simple/default.nix b/test/cabal-simple/default.nix index 3850cea678..8e1af7e40b 100644 --- a/test/cabal-simple/default.nix +++ b/test/cabal-simple/default.nix @@ -33,7 +33,7 @@ in recurseIntoAttrs { test-shell = (project.shellFor { tools = { cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; - hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-01T00:00:00Z"; }; + hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-26T00:00:00Z"; }; }; withHoogle = true; }).overrideAttrs (_: _: { diff --git a/test/shell-for-setup-deps/default.nix b/test/shell-for-setup-deps/default.nix index 3f4e4bd02d..6ee5f6e72e 100644 --- a/test/shell-for-setup-deps/default.nix +++ b/test/shell-for-setup-deps/default.nix @@ -10,7 +10,7 @@ let }; env = project.shellFor { - tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-01T00:00:00Z"; }; + tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-26T00:00:00Z"; }; withHoogle = true; }; diff --git a/test/shell-for/default.nix b/test/shell-for/default.nix index 2fa7f7c4e7..4c26839c8e 100644 --- a/test/shell-for/default.nix +++ b/test/shell-for/default.nix @@ -22,7 +22,7 @@ let # they use a nix-shell --pure. Normally you would BYO cabal-install. tools = { cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local; - hoogle.index-state = "2024-10-01T00:00:00Z"; + hoogle.index-state = "2024-10-26T00:00:00Z"; }; exactDeps = true; # Avoid duplicate package issues when runghc looks for packages @@ -36,7 +36,7 @@ let # they use a nix-shell --pure. Normally you would BYO cabal-install. tools = { cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local; - hoogle.index-state = "2024-10-01T00:00:00Z"; + hoogle.index-state = "2024-10-26T00:00:00Z"; }; exactDeps = true; # Avoid duplicate package issues when runghc looks for packages @@ -51,7 +51,7 @@ let # they use a nix-shell --pure. Normally you would BYO cabal-install. tools = { cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local; - hoogle.index-state = "2024-10-01T00:00:00Z"; + hoogle.index-state = "2024-10-26T00:00:00Z"; }; # Avoid duplicate package issues when runghc looks for packages packageSetupDeps = false;