Skip to content

Commit 2b247e1

Browse files
Move to nixpkgs close to 24.05 and use ghc-9.6.4
1 parent e3b17f6 commit 2b247e1

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ stack_snapshot(
149149
"exe",
150150
],
151151
},
152-
local_snapshot = "//:snapshot-9.6.7.yaml",
152+
local_snapshot = "//:snapshot-9.6.4.yaml",
153153
# stack = "@stack_ignore_global_hints//:bin/stack" if ghc_version == "9.0.1" else None,
154154
)
155155

@@ -170,10 +170,10 @@ filegroup(
170170
)
171171

172172
haskell_register_ghc_nixpkgs(
173-
attribute_path = "haskell.compiler.ghc967",
173+
attribute_path = "haskell.compiler.ghc964",
174174
locale_archive = "@glibc_locales//:locale-archive",
175175
repositories = {"nixpkgs": "@nixpkgs"},
176-
version = "9.6.7",
176+
version = "9.6.4",
177177
ghcopts = [
178178
"-Werror",
179179
"-Wall",

nixpkgs.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
args:
22
let pkgs = import (fetchTarball {
3-
sha256 = "0dcslr2lwfaclfl4pmbwb3yw27bnvwlqiif394d3d66vyd163dvy";
4-
url = "https://github.com/NixOS/nixpkgs/archive/3e3afe5174c561dee0df6f2c2b2236990146329f.tar.gz";
3+
sha256 = "sha256:0bpw6x46mp0xqfdwbrhnjn6qlb4avglir993n3cdqg8zv4klgllw";
4+
url = "https://github.com/NixOS/nixpkgs/archive/706eef542dec88cc0ed25b9075d3037564b2d164.tar.gz";
55
}) args;
66
stack_ignore_global_hints = pkgs.writeScriptBin "stack" ''
77
#!${pkgs.stdenv.shell}

shell-stack.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
pkgs ? import ./nixpkgs.nix { },
3-
ghcAttr ? "ghc967",
3+
ghcAttr ? "ghc964",
44
}:
55

66
with pkgs;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-22.44
1+
resolver: lts-22.20
22

33
packages:
44
- linear-base-0.5.0

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-22.44
1+
resolver: lts-22.20
22

33
packages:
44
- jni

0 commit comments

Comments
 (0)