Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit f608ffb

Browse files
committed
[DEVOPS-1120] Bring pkgs.nix up to date for latest nix-tools
1 parent 466c7b8 commit f608ffb

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

nix/pkgs.nix

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ let
1414
hackage = import (overrideWith "hackage"
1515
(pkgs.fetchFromGitHub { owner = "angerman";
1616
repo = "hackage.nix";
17-
rev = "cd21bbd8d8c961793a562d557f9244bd90236961";
18-
sha256 = "03v2fw63xi3l2a7cvz1n9rl0nq9hk65g1k20w8i0gkky7a6cq9yd";
17+
rev = "d8e03ec0e3c99903d970406ae5bceac7d993035d";
18+
sha256 = "0c7camspw7v5bg23hcas0r10c40fnwwwmz0adsjpsxgdjxayws3v";
1919
name = "hackage-exprs-source"; }))
2020
;
2121
# a different haskell infrastructure
2222
haskell = import (overrideWith "haskell"
2323
(pkgs.fetchFromGitHub { owner = "angerman";
2424
repo = "haskell.nix";
25-
rev = "28a9c6f3528daa57d506d134e137fb617a947985";
26-
sha256 = "0qv0vb5q96sdfi8pwwrswfhcw3ay0qh91a8l2g6bz46q7zmgp75m";
25+
rev = "03026b7bb95a6713f4d50b841abadabb343f83d2";
26+
sha256 = "05ma2qmmn4p2xcgyy8waissfj953b7wyq97yx80d936074gyyw4s";
2727
name = "haskell-lib-source"; }))
2828
hackage;
2929

3030
# the set of all stackage snapshots
3131
stackage = import (overrideWith "stackage"
3232
(pkgs.fetchFromGitHub { owner = "angerman";
3333
repo = "stackage.nix";
34-
rev = "014445d63dcf374f30435e5859e463d2c29b5c4e";
35-
sha256 = "1hma4clx8lslah8l4xpglshbbd42v1vraafhb03ci92dyjscnkdq";
34+
rev = "67675ea78ae5c321ed0b8327040addecc743a96c";
35+
sha256 = "1ds2xfsnkm2byg8js6c9032nvfwmbx7lgcsndjgkhgq56bmw5wap";
3636
name = "stackage-snapshot-source"; }))
3737
;
3838

@@ -49,7 +49,9 @@ let
4949
pkgSet = haskell.mkNewPkgSet {
5050
inherit pkgs;
5151
pkg-def = stackage.${stack-pkgs.resolver};
52-
modules = [ stack-pkgs.module ];
52+
modules = [
53+
# stack-pkgs.module ## seems to not exist
54+
];
5355
};
5456

5557
packages = pkgSet.config.hsPkgs // { _config = pkgSet.config; };

0 commit comments

Comments
 (0)