Skip to content

Commit e6d4cfe

Browse files
authored
Merge pull request #1285 from peterbecich/update-nix-flake
update Nix Flake
2 parents 898b521 + c4655d2 commit e6d4cfe

File tree

3 files changed

+49
-25
lines changed

3 files changed

+49
-25
lines changed

.github/workflows/nix-flake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
nix:
1111
strategy:
12-
fail-fast: false
12+
fail-fast: true
1313
matrix:
1414
os:
1515
- ubuntu-latest

flake.lock

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

flake.nix

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
haskell-flake.url = "github:srid/haskell-flake";
66
flake-root.url = "github:srid/flake-root";
77
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
8+
9+
hoogle-input.url = "github:ndmitchell/hoogle";
10+
hoogle-input.flake = false;
811
};
912

1013
outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
@@ -21,24 +24,28 @@
2124
haskellProjects.default = {
2225
settings = {
2326
hackage-server.check = false;
27+
warp-tls.jailbreak = true;
28+
tls-session-manager.jailbreak = true;
29+
# http-client-tls.jailbreak = true;
30+
# crypton-connection.jailbreak = true;
2431
heist.check = false;
25-
fourmolu.check = false;
26-
hw-prim.jailbreak = true;
27-
hw-hspec-hedgehog.jailbreak = true;
28-
hw-fingertree.jailbreak = true;
32+
ap-normalize.check = false;
33+
extensions.jailbreak = true;
34+
# https://community.flake.parts/haskell-flake/dependency#nixpkgs
35+
# tar = { super, ... }:
36+
# { custom = _: super.tar_0_6_0_0; };
37+
# tasty = { super, ... }:
38+
# { custom = _: super.tasty_1_5; };
2939
};
3040
packages = {
31-
Cabal.source = "3.10.1.0";
32-
Cabal-syntax.source = "3.10.1.0";
33-
attoparsec-aeson.source = "2.1.0.0";
34-
hedgehog.source = "1.4";
35-
ormolu.source = "0.7.2.0";
36-
fourmolu.source = "0.13.1.0";
37-
tasty-hedgehog.source = "1.4.0.2";
38-
ghc-lib-parser.source = "9.6.2.20230523";
39-
ghc-lib-parser-ex.source = "9.6.0.2";
40-
hlint.source = "3.6.1";
41-
stylish-haskell.source = "0.14.5.0";
41+
# https://community.flake.parts/haskell-flake/dependency#path
42+
hoogle.source = inputs.hoogle-input;
43+
heist.source = "1.1.1.2";
44+
# tls-session-manager.source = "0.0.4";
45+
# warp-tls.source = "3.4.3";
46+
# http-io-streams.source = "0.1.6.3";
47+
tls.source = "1.9.0";
48+
# tasty.source = "1.5";
4249
};
4350
devShell = {
4451
tools = hp: {

0 commit comments

Comments
 (0)