From 37701d0828e371bd55a6ae0e875041ccdc3c2838 Mon Sep 17 00:00:00 2001 From: Vehbi Sinan Tunalioglu Date: Wed, 15 Jan 2025 16:23:07 +0800 Subject: [PATCH 1/3] chore(deps): upgrade nixpkgs to v24.11 --- nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 16cb240..94bb0a0 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "nixpkgs": { - "branch": "release-24.05", + "branch": "release-24.11", "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "29c3451c88250659c4dccf3468523c00ed530c07", - "sha256": "19qrl1bb9m5bdgpq5pcpd2yd22h7vllcxcinmwlwj8c6v76dyk1s", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "sha256": "1m383nldy1jvl8n2jw02l26w9iib4b2a9341c1kf74miaahw7qx6", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/29c3451c88250659c4dccf3468523c00ed530c07.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/e24b4c09e963677b1beea49d411cd315a024ad3a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } From 327657dbad56ebdbf9bd8f570e2c46a6504a04a3 Mon Sep 17 00:00:00 2001 From: Vehbi Sinan Tunalioglu Date: Wed, 15 Jan 2025 16:32:22 +0800 Subject: [PATCH 2/3] chore(build): update GHC version to 9.6.6 for static build Updated the GHC version from 9.6.5 to 9.6.6 in the build-static.sh script. --- build-static.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-static.sh b/build-static.sh index 33ccab7..83da028 100644 --- a/build-static.sh +++ b/build-static.sh @@ -9,7 +9,7 @@ ## `--enable-executable-stripping`, hence the `strip` command usage. ## GHC version: -GHC_VERSION="9.6.5" +GHC_VERSION="9.6.6" ## Docker image: DOCKER_IMAGE="quay.io/benz0li/ghc-musl:${GHC_VERSION}" From 204989e22e0b68d02fee3708128043f736669713 Mon Sep 17 00:00:00 2001 From: Vehbi Sinan Tunalioglu Date: Wed, 15 Jan 2025 16:34:40 +0800 Subject: [PATCH 3/3] chore(ci): update Nix actions and add Haskell package update Use the Nix installer action to DeterminateSystems/nix-installer-action@v16 and update the Nix cache action to DeterminateSystems/magic-nix-cache-action@v8. Added a step to update the Haskell package list due to requirements of nixpkgs v24.11. --- .github/workflows/check.yaml | 13 ++++++++----- .github/workflows/release.yml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 43bdc05..fd0fa64 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -13,12 +13,15 @@ jobs: uses: "actions/checkout@v4" - name: "Install Nix" - uses: "cachix/install-nix-action@v27" - with: - nix_path: "nixpkgs=channel:nixos-24.05" + uses: "DeterminateSystems/nix-installer-action@v16" - - name: "Use Magic Nix Cache" - uses: "DeterminateSystems/magic-nix-cache-action@v7" + - name: "Use Nix Cache" + uses: "DeterminateSystems/magic-nix-cache-action@v8" + + ## TODO: This should not be necessary, but nixpkgs v24.11 requires it. + - name: "Update Haskell Package List" + run: | + nix-shell --pure --run "cabal update --ignore-project" - name: "Check Application" run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66adc04..8b99332 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,15 +25,15 @@ jobs: fetch-depth: 0 - name: "Install Nix" - if: "${{ steps.release.outputs.release_created }}" - uses: "cachix/install-nix-action@v27" - with: - nix_path: "nixpkgs=channel:nixos-24.05" - extra_nix_config: "system-features = benchmark, big-parallel, nixos-test, uid-range, kvm" + uses: "DeterminateSystems/nix-installer-action@v16" - - name: "Use Magic Nix Cache" - if: "${{ steps.release.outputs.release_created }}" - uses: "DeterminateSystems/magic-nix-cache-action@v3" + - name: "Use Nix Cache" + uses: "DeterminateSystems/magic-nix-cache-action@v8" + + ## TODO: This should not be necessary, but nixpkgs v24.11 requires it. + - name: "Update Haskell Package List" + run: | + nix-shell --pure --run "cabal update --ignore-project" - name: "Build Application" if: "${{ steps.release.outputs.release_created }}"