Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dc82725

Browse files
committedDec 30, 2023
upgrade lockfree-queue in nix
upgrade nixpkgs upgrade GHC in docker image creation to 9.2.8 due to module conflict
1 parent 61b03cc commit dc82725

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed
 

‎nix/sources.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"homepage": "",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "429c23aad0fce9ef38b0e60d55d7459c19d53ddc",
33-
"sha256": "1nj8sh1fnxp07jdlvjkijwfd1pnsi2zj0ivy7a0dhx02g63byhg3",
32+
"rev": "9fafaa30660e204bb27a35b3c608f03609705a5d",
33+
"sha256": "sha256:0ijw5yvglmh1kicxdailn0hvv2lbwbwgs9p9dshnxv0pvgvqi433",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/429c23aad0fce9ef38b0e60d55d7459c19d53ddc.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/9fafaa30660e204bb27a35b3c608f03609705a5d.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
}
3838
}

‎release.nix

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ compiler ? "ghc8104"
1+
{ compiler ? "ghc928"
22
, sources ? import ./nix/sources.nix
33
, pkgs ? import sources.nixpkgs { }
44
}:
@@ -28,6 +28,12 @@ let
2828
ver = "0.1.0";
2929
sha256 = "sha256-hoSV6Q2+X5a7hFnJAArqNPjcMaCVyX9Vz4FcxeJ+jgI="; } {};
3030

31+
lockfree-queue = self.callHackageDirect {
32+
pkg = "lockfree-queue";
33+
ver = "0.2.4";
34+
sha256 = "sha256-h1s/tiBq5Gzl8FtenQacmxJp7zPJPnmZXtKDPvxTSa4="; } {};
35+
36+
3137
unicode-data = self.callHackageDirect {
3238
pkg = "unicode-data";
3339
ver = "0.2.0";
@@ -46,11 +52,11 @@ let
4652
sha256 = "sha256-2pXGgM5n2hKh2gvKhGJMKzAwWMEn6KUUz8i5n3pHakY=";
4753
} {};
4854

49-
hashable = self.callHackageDirect {
50-
pkg = "hashable";
51-
ver = "1.3.2.0";
52-
sha256 = "sha256-aMtNQNykvenduMW99h0ZDuU4kI1fFbIY4m4rRRNAU9o=";
53-
} {};
55+
barbies-th = self.callHackageDirect {
56+
pkg = "barbies-th";
57+
ver = "0.1.10";
58+
sha256 = "sha256-cnTevB2qoEBMmGbqypQwJzPVF6z3cOXADbWF8OKQGAo=";
59+
} {};
5460

5561
project-m36 = ((self.callCabal2nixWithOptions "project-m36" ./. "-f-haskell-scripting" {}));
5662
};

0 commit comments

Comments
 (0)
Please sign in to comment.