From de24c5bdf7fca364932bd3036ad18e048b0d60fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Tue, 16 Jul 2024 16:51:19 +0200 Subject: [PATCH] release-upload.yml: adapt to changes in Hydra's job names --- .github/workflows/release-upload.yml | 4 ++-- flake.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-upload.yml b/.github/workflows/release-upload.yml index 7d80cea8a3..7996a5fd32 100644 --- a/.github/workflows/release-upload.yml +++ b/.github/workflows/release-upload.yml @@ -159,10 +159,10 @@ jobs: derivation+="${{ matrix.arch }}" ;; "x86_64-linux") - derivation+="x86_64-linux.x86_64-unknown-linux-musl" + derivation+="x86_64-linux.ghc965-x86_64-unknown-linux-musl" ;; "aarch64-linux") - derivation+="x86_64-linux.aarch64-unknown-linux-musl" + derivation+="x86_64-linux.ghc965-aarch64-unknown-linux-musl" ;; *) echo "Unexpected matrix.arch value: ${{ matrix.arch }}" diff --git a/flake.nix b/flake.nix index 32fd21a16b..aad8fbc0b0 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ # see flake `variants` below for alternative compilers defaultCompiler = "ghc982"; haddockShellCompiler = defaultCompiler; - mingwVersion = "ghc965"; + mingwVersion = "ghc965"; # Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the latter if you change this value. cabalHeadOverlay = final: prev: { cabal-head = (final.haskell-nix.cabalProject {