From b127690cea5fb44fd716dd799074af662f6b3ae8 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Fri, 3 Jan 2025 21:53:23 +1300 Subject: [PATCH] Update ghc git pins --- lazy-inputs/ghc912X/flake.lock | 8 ++++---- lazy-inputs/ghc913/flake.lock | 8 ++++---- test/gi-gtk/default.nix | 2 +- test/plugin/default.nix | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lazy-inputs/ghc912X/flake.lock b/lazy-inputs/ghc912X/flake.lock index dbf610844..b93ee1ac2 100644 --- a/lazy-inputs/ghc912X/flake.lock +++ b/lazy-inputs/ghc912X/flake.lock @@ -3,11 +3,11 @@ "ghc912X": { "flake": false, "locked": { - "lastModified": 1732798405, - "narHash": "sha256-gYYJMwnnPFHHbSc2SkJldBRl5ECZg3/muFAd21xJqfM=", + "lastModified": 1734278290, + "narHash": "sha256-aKgEM8StW/SmyrciVkGtclw/8eKNOmTjp1hSfxG1qLQ=", "ref": "ghc-9.12", - "rev": "5d938345841e3dff6a1dfa129202ba939a4564c9", - "revCount": 67485, + "rev": "daf659b6e3c8f2a84100fbee797cd9d457c00df5", + "revCount": 67524, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" diff --git a/lazy-inputs/ghc913/flake.lock b/lazy-inputs/ghc913/flake.lock index 010b5c746..d38791baa 100644 --- a/lazy-inputs/ghc913/flake.lock +++ b/lazy-inputs/ghc913/flake.lock @@ -3,11 +3,11 @@ "ghc913": { "flake": false, "locked": { - "lastModified": 1733355534, - "narHash": "sha256-kCiFiMIsOQWfXP73qWjhfvGv8OdFBg7nz6InQc/xhhQ=", + "lastModified": 1735577639, + "narHash": "sha256-1Rbx6NrCza6VGzFfi+9kL7zaSRqqOsZYfcter8Tce6Q=", "ref": "refs/heads/master", - "rev": "cad6fede4252aeff3a0a93e81c2188a825ab39c6", - "revCount": 67629, + "rev": "278a53ee698d961d97afb60be9db2d8bf60b4074", + "revCount": 67713, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" diff --git a/test/gi-gtk/default.nix b/test/gi-gtk/default.nix index c8ef2232a..2a01d3d9b 100644 --- a/test/gi-gtk/default.nix +++ b/test/gi-gtk/default.nix @@ -31,7 +31,7 @@ in recurseIntoAttrs rec { # Cross compilation to aarch64 is also broken || stdenv.hostPlatform.isAarch64 && !stdenv.buildPlatform.isAarch64 # Building profiled version of Cabal for haskell-gi is currently broken for GHC head - || compiler-nix-name == "ghc91320241204"; + || compiler-nix-name == "ghc91320241230"; ifdInputs = { inherit (project) plan-nix; diff --git a/test/plugin/default.nix b/test/plugin/default.nix index ed515040b..3ec41d357 100644 --- a/test/plugin/default.nix +++ b/test/plugin/default.nix @@ -20,7 +20,7 @@ in recurseIntoAttrs { # Not sure why this breaks for ghc 8.10.7 meta.disabled = compiler-nix-name == "ghc8107" - || builtins.elem compiler-nix-name [ "ghc9121" "ghc912020241128" "ghc91320241204" ] + || builtins.elem compiler-nix-name [ "ghc9121" "ghc912020241215" "ghc91320241230" ] || stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isGhcjs || stdenv.hostPlatform.isWindows