Skip to content

Commit ca8b290

Browse files
haskellPackages.hnix-store-{core,remote}: restrict to < 0.7
These are the only versions of these packages that are compatible with hnix 0.17.0, pending haskell-nix/hnix#1112. Since hnix has more reverse dependencies, it is easier to make its requirements the default. Since Stackage LTS no longer tracks hnix-store-*, the overridding situation is less hairy than it used to. All hnix-store-* packages except hnix-store-core and hnix-store-remote have been introduced after hnix-store-core >= 0.8 and need to be overridden to use that. This partially reverts commit 330ee35.
1 parent eca7927 commit ca8b290

File tree

3 files changed

+173
-0
lines changed

3 files changed

+173
-0
lines changed

pkgs/development/haskell-modules/configuration-common.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,7 @@ with haskellLib;
750750
(
751751
super.cachix.override {
752752
nix = self.hercules-ci-cnix-store.nixPackage;
753+
hnix-store-core = self.hnix-store-core_0_8_0_0;
753754
}
754755
)
755756
);
@@ -901,6 +902,24 @@ with haskellLib;
901902
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
902903
# 2024-01-15: too strict bound on free < 5.2
903904
hnix = doJailbreak (dontCheck super.hnix);
905+
# 2025-09-13: too strict bound on algebraic-graphs
906+
hnix-store-core = warnAfterVersion "0.6.1.0" (doJailbreak super.hnix-store-core);
907+
908+
# hnix doesn't support hnix-store-core >= 0.8: https://github.com/haskell-nix/hnix/pull/1112
909+
hnix-store-core_0_8_0_0 = doDistribute super.hnix-store-core_0_8_0_0;
910+
hnix-store-db = super.hnix-store-db.override { hnix-store-core = self.hnix-store-core_0_8_0_0; };
911+
hnix-store-json = super.hnix-store-json.override {
912+
hnix-store-core = self.hnix-store-core_0_8_0_0;
913+
};
914+
hnix-store-readonly = super.hnix-store-readonly.override {
915+
hnix-store-core = self.hnix-store-core_0_8_0_0;
916+
};
917+
hnix-store-remote_0_7_0_0 = doDistribute (
918+
super.hnix-store-remote_0_7_0_0.override { hnix-store-core = self.hnix-store-core_0_8_0_0; }
919+
);
920+
hnix-store-tests = super.hnix-store-tests.override {
921+
hnix-store-core = self.hnix-store-core_0_8_0_0;
922+
};
904923

905924
# Fails for non-obvious reasons while attempting to use doctest.
906925
focuslist = dontCheck super.focuslist;

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ default-package-overrides:
2929
- extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
3030
# 2025-07-26: HLS doesn't support hiedb >= 0.7 yet
3131
- hiedb < 0.7
32+
# 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
33+
# https://github.com/haskell-nix/hnix/pull/1112
34+
- hnix-store-core < 0.7
35+
- hnix-store-remote < 0.7
3236
# 2025-08-03: need to match stackage version of hosc
3337
- hsc3 >= 0.21 && < 0.22
3438
# liquidhaskell-boot 0.9.10.1.2 requires this specific version of liquid-fixpoint

pkgs/development/haskell-modules/hackage-packages.nix

Lines changed: 150 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)