Skip to content

Commit 0b20673

Browse files
authored
Merge pull request #1306 from peterbecich/revert-flake
revert Flake update to f672a3d
2 parents e36f969 + 46758c7 commit 0b20673

File tree

2 files changed

+11
-26
lines changed

2 files changed

+11
-26
lines changed

flake.lock

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

flake.nix

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,18 @@
1919
# has only one.
2020
packages.default = config.packages.hackage-server;
2121
haskellProjects.default = {
22-
basePackages = pkgs.haskell.packages.ghc98;
2322
settings = {
24-
# https://github.com/srid/haskell-flake/discussions/196
2523
hackage-server.check = false;
26-
threads.check = false;
27-
# hackage-server.cabalFlags.write-ghc-environment-files = true;
28-
# hackage-server.cabalFlags.write-ghc-environment = "always";
29-
# hackage-server.extraConfigureFlags = [ "--write-ghc-environment=always" ];
30-
24+
ap-normalize.check = false;
3125
# https://community.flake.parts/haskell-flake/dependency#nixpkgs
3226
tar = { super, ... }:
33-
{ custom = _: super.tar_0_6_2_0; };
34-
# tls = { super, ... }:
35-
# { custom = _: super.tls_2_0_1 // { check = false; }; };
36-
tls.check = false;
37-
tls-session-manager = { super, ... }:
38-
{ custom = _: super.tls-session-manager_0_0_5; };
39-
tasty = { super, ... }:
40-
{ custom = _: super.tasty_1_5; };
41-
logict.jailbreak = true;
42-
integer-logarithms.jailbreak = true;
43-
time-compat.jailbreak = true;
44-
indexed-traversable-instances.jailbreak = true;
27+
{ custom = _: super.tar_0_6_1_0; };
28+
# tasty = { super, ... }:
29+
# { custom = _: super.tasty_1_5; };
4530
};
4631
packages = {
4732
# https://community.flake.parts/haskell-flake/dependency#path
48-
tls.source = "2.0.1";
33+
tls.source = "1.9.0";
4934
};
5035
devShell = {
5136
tools = hp: {

0 commit comments

Comments
 (0)