Skip to content

Commit 71e96c8

Browse files
committed
Bump haskell.nix, remove now-unnecessary workarounds
1 parent 8e16ce0 commit 71e96c8

File tree

3 files changed

+43
-30
lines changed

3 files changed

+43
-30
lines changed

flake.lock

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

nix/ci.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ let
5050
};
5151
} // lib.optionalAttrs (buildSystem == "x86_64-linux") {
5252
windows = {
53-
# https://github.com/input-output-hk/haskell.nix/issues/2361
54-
haskell912 = mkHaskellJobsFor pkgs.hsPkgs.projectCross.ucrt64.projectVariants.ghc912;
53+
haskell96 = mkHaskellJobsFor pkgs.hsPkgs.projectCross.ucrt64;
5554
};
5655
});
5756

nix/shell.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ hsPkgs.shellFor {
1818
pkgs.fourmolu
1919

2020
# release management
21-
(pkgs.scriv.overridePythonAttrs (_oldAttrs: {
22-
# Already fixed upstream: https://github.com/NixOS/nixpkgs/pull/407167
23-
doCheck = false;
24-
}))
21+
pkgs.scriv
2522
(pkgs.python3.withPackages (p: [ p.beautifulsoup4 p.html5lib p.matplotlib p.pandas ]))
2623
];
2724

0 commit comments

Comments
 (0)