Skip to content

Commit 2a460e6

Browse files
committed
Add hackage-quirk for #2277
1 parent 57f689e commit 2a460e6

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

modules/hackage-quirks.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ in [
3030
{ _file = "haskell.nix/overlays/hackage-quirks.nix#${n}"; } //
3131
lib.mkIf (n == config.name) v) {
3232

33+
# See https://github.com/input-output-hk/haskell.nix/issues/2277
34+
hoogle = {
35+
cabalProject = ''
36+
packages: .
37+
constraints: data-default-class >=0.2.0.0
38+
'';
39+
};
40+
3341
lsp-test = {
3442
cabalProject = ''
3543
packages: .

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; index-state = "2024-10-26T00:00:00Z"; };
36+
hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
3737
};
3838
withHoogle = true;
3939
}).overrideAttrs (_: _: {

test/cabal.project.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repository head.hackage.ghc.haskell.org
2424
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
2525
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
2626
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
27-
--sha256: sha256-3sLKfBBTFmzRWgGpPcNBaMZ9HXw6xTIzlKvopQxA2LM=
27+
--sha256: sha256-kFayk9sOpeopLOXQG8yyTqRwEBLKsQOR+6efzbm6YxE=
2828

2929
repository ghcjs-overlay
3030
url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/ffb32dce467b9a4d27be759fdd2740a6edd09d0b

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; index-state = "2024-10-26T00:00:00Z"; };
13+
tools.hoogle = { cabalProjectLocal = builtins.readFile ../cabal.project.local; };
1414
withHoogle = true;
1515
};
1616

test/shell-for/default.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ let
2222
# they use a nix-shell --pure. Normally you would BYO cabal-install.
2323
tools = {
2424
cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local;
25-
hoogle.index-state = "2024-10-26T00:00:00Z";
2625
};
2726
exactDeps = true;
2827
# Avoid duplicate package issues when runghc looks for packages
@@ -36,7 +35,6 @@ let
3635
# they use a nix-shell --pure. Normally you would BYO cabal-install.
3736
tools = {
3837
cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local;
39-
hoogle.index-state = "2024-10-26T00:00:00Z";
4038
};
4139
exactDeps = true;
4240
# Avoid duplicate package issues when runghc looks for packages
@@ -51,7 +49,6 @@ let
5149
# they use a nix-shell --pure. Normally you would BYO cabal-install.
5250
tools = {
5351
cabal.cabalProjectLocal = builtins.readFile ../cabal.project.local;
54-
hoogle.index-state = "2024-10-26T00:00:00Z";
5552
};
5653
# Avoid duplicate package issues when runghc looks for packages
5754
packageSetupDeps = false;

0 commit comments

Comments
 (0)