Skip to content

Commit

Permalink
upgrade lockfree-queue in nix
Browse files Browse the repository at this point in the history
upgrade nixpkgs
upgrade GHC in docker image creation to 9.2.8 due to module conflict
  • Loading branch information
agentm committed Dec 30, 2023
1 parent 61b03cc commit dc82725
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "429c23aad0fce9ef38b0e60d55d7459c19d53ddc",
"sha256": "1nj8sh1fnxp07jdlvjkijwfd1pnsi2zj0ivy7a0dhx02g63byhg3",
"rev": "9fafaa30660e204bb27a35b3c608f03609705a5d",
"sha256": "sha256:0ijw5yvglmh1kicxdailn0hvv2lbwbwgs9p9dshnxv0pvgvqi433",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/429c23aad0fce9ef38b0e60d55d7459c19d53ddc.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/9fafaa30660e204bb27a35b3c608f03609705a5d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
18 changes: 12 additions & 6 deletions release.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ compiler ? "ghc8104"
{ compiler ? "ghc928"
, sources ? import ./nix/sources.nix
, pkgs ? import sources.nixpkgs { }
}:
Expand Down Expand Up @@ -28,6 +28,12 @@ let
ver = "0.1.0";
sha256 = "sha256-hoSV6Q2+X5a7hFnJAArqNPjcMaCVyX9Vz4FcxeJ+jgI="; } {};

lockfree-queue = self.callHackageDirect {
pkg = "lockfree-queue";
ver = "0.2.4";
sha256 = "sha256-h1s/tiBq5Gzl8FtenQacmxJp7zPJPnmZXtKDPvxTSa4="; } {};


unicode-data = self.callHackageDirect {
pkg = "unicode-data";
ver = "0.2.0";
Expand All @@ -46,11 +52,11 @@ let
sha256 = "sha256-2pXGgM5n2hKh2gvKhGJMKzAwWMEn6KUUz8i5n3pHakY=";
} {};

hashable = self.callHackageDirect {
pkg = "hashable";
ver = "1.3.2.0";
sha256 = "sha256-aMtNQNykvenduMW99h0ZDuU4kI1fFbIY4m4rRRNAU9o=";
} {};
barbies-th = self.callHackageDirect {
pkg = "barbies-th";
ver = "0.1.10";
sha256 = "sha256-cnTevB2qoEBMmGbqypQwJzPVF6z3cOXADbWF8OKQGAo=";
} {};

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

0 comments on commit dc82725

Please sign in to comment.