Skip to content

Commit 3a26624

Browse files
authored
Pin index-state used to build hoogle in tests (#2278)
* Pin index-state used to build hoogle in tests See #2277 * Also fix shell-for test * Bump index-state to 2024-10-26
1 parent 9a39281 commit 3a26624

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

test/cabal-simple/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ in recurseIntoAttrs {
3333
test-shell = (project.shellFor {
3434
tools = {
3535
cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
36-
hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
36+
hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-26T00:00:00Z"; };
3737
};
3838
withHoogle = true;
3939
}).overrideAttrs (_: _: {

test/shell-for-setup-deps/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let
1010
};
1111

1212
env = project.shellFor {
13-
tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
13+
tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; index-state = "2024-10-26T00:00:00Z"; };
1414
withHoogle = true;
1515
};
1616

test/shell-for/default.nix

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ let
2020
packages = ps: with ps; [ pkga pkgb ];
2121
# This adds cabal-install to the shell, which helps tests because
2222
# they use a nix-shell --pure. Normally you would BYO cabal-install.
23-
tools = { cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; };
23+
tools = {
24+
cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local;
25+
hoogle.index-state = "2024-10-26T00:00:00Z";
26+
};
2427
exactDeps = true;
2528
# Avoid duplicate package issues when runghc looks for packages
2629
packageSetupDeps = false;
@@ -31,7 +34,10 @@ let
3134
packages = ps: with ps; [ pkga ];
3235
# This adds cabal-install to the shell, which helps tests because
3336
# they use a nix-shell --pure. Normally you would BYO cabal-install.
34-
tools = { cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; };
37+
tools = {
38+
cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local;
39+
hoogle.index-state = "2024-10-26T00:00:00Z";
40+
};
3541
exactDeps = true;
3642
# Avoid duplicate package issues when runghc looks for packages
3743
packageSetupDeps = false;
@@ -43,7 +49,10 @@ let
4349
# packages = ps: with ps; [ pkga pkgb ];
4450
# This adds cabal-install to the shell, which helps tests because
4551
# they use a nix-shell --pure. Normally you would BYO cabal-install.
46-
tools = { cabal = { cabalProjectLocal = builtins.readFile ../cabal.project.local; }; };
52+
tools = {
53+
cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local;
54+
hoogle.index-state = "2024-10-26T00:00:00Z";
55+
};
4756
# Avoid duplicate package issues when runghc looks for packages
4857
packageSetupDeps = false;
4958
};

0 commit comments

Comments
 (0)