diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2023-01-10 18:54:37 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-01-13 00:47:12 -0500 |
| commit | df33c13c802cdb846e1377e61bebaebe8955ff15 (patch) | |
| tree | 8738daa20584cb50a317a8e40c4d448d7e7b4744 /.gitlab | |
| parent | 9a3d6add05d9227fb047cf6ce7ae35dc11c51718 (diff) | |
| download | haskell-df33c13c802cdb846e1377e61bebaebe8955ff15.tar.gz | |
gitlab-ci: Bump Darwin bootstrap toolchain
This updates the bootstrap compiler on Darwin from 8.10.7 to 9.2.5,
ensuring that we have the fix for #21964.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/darwin/nix/sources.json | 10 | ||||
| -rw-r--r-- | .gitlab/darwin/toolchain.nix | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab/darwin/nix/sources.json b/.gitlab/darwin/nix/sources.json index a6ff5dc415..c9802d1f8e 100644 --- a/.gitlab/darwin/nix/sources.json +++ b/.gitlab/darwin/nix/sources.json @@ -12,15 +12,15 @@ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs": { - "branch": "wip/ghc-8.10.7-darwin", + "branch": "master", "description": "Nix Packages collection", "homepage": "", - "owner": "bgamari", + "owner": "nixos", "repo": "nixpkgs", - "rev": "37c60356e3f83c708a78a96fdd914b5ffc1f551c", - "sha256": "0i5j7nwk4ky0fg4agla3aznadpxz0jyrdwp2q92hyxidra987syn", + "rev": "ce1aa29621356706746c53e2d480da7c68f6c972", + "sha256": "sha256:1sbs3gi1nf4rcbmnw69fw0fpvb3qvlsa84hqimv78vkpd6xb0bgg", "type": "tarball", - "url": "https://github.com/bgamari/nixpkgs/archive/37c60356e3f83c708a78a96fdd914b5ffc1f551c.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/ce1aa29621356706746c53e2d480da7c68f6c972.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } diff --git a/.gitlab/darwin/toolchain.nix b/.gitlab/darwin/toolchain.nix index 11844f31da..3117b080ab 100644 --- a/.gitlab/darwin/toolchain.nix +++ b/.gitlab/darwin/toolchain.nix @@ -15,16 +15,16 @@ let ghcBindists = let version = ghc.version; in { aarch64-darwin = pkgs.fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; - sha256 = "sha256:10pby1idpxhkjqsi56jivkymhnabsdr8m2x8gdqchnv5113hl72k"; + sha256 = "sha256-tQUHsingxBizLktswGAoi6lJf92RKWLjsHB9CisANlg="; }; x86_64-darwin = pkgs.fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "sha256:012yzyangk26sdapnz4226prgb8jgpf6k5bd9qxsdykk5x7jc7ah"; + sha256 = "sha256-OjXjVe+ZODDCc/hqtihqqz6CX25TKI0ZgORzkR5O3pQ="; }; }; ghc = pkgs.stdenv.mkDerivation rec { - version = "9.4.3"; + version = "9.4.4"; name = "ghc"; src = ghcBindists.${pkgs.stdenv.hostPlatform.system}; configureFlags = [ |