From 784362ef0a41587de803e9db466fe0fd4dc924bb Mon Sep 17 00:00:00 2001 From: Vehbi Sinan Tunalioglu Date: Tue, 4 Jun 2024 20:59:44 +0800 Subject: [PATCH] chore(deps): bump nixpkgs to v24.05 --- .github/workflows/check.yaml | 2 +- .github/workflows/release.yml | 2 +- build-static.sh | 2 +- nix/sources.json | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 6d7a70a..3a895fd 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -15,7 +15,7 @@ jobs: - name: "Install nix" uses: "cachix/install-nix-action@v25" with: - nix_path: "nixpkgs=channel:nixos-23.11" + nix_path: "nixpkgs=channel:nixos-24.05" - name: "Use magic Nix cache" uses: "DeterminateSystems/magic-nix-cache-action@v3" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7b612d..9441750 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: if: "${{ steps.release.outputs.release_created }}" uses: "cachix/install-nix-action@v25" with: - nix_path: "nixpkgs=channel:nixos-23.11" + nix_path: "nixpkgs=channel:nixos-24.05" extra_nix_config: "system-features = benchmark, big-parallel, nixos-test, uid-range, kvm" - name: "Use magic Nix cache" diff --git a/build-static.sh b/build-static.sh index a238320..33ccab7 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.4.8" +GHC_VERSION="9.6.5" ## Docker image: DOCKER_IMAGE="quay.io/benz0li/ghc-musl:${GHC_VERSION}" diff --git a/nix/sources.json b/nix/sources.json index 6f4cde2..1717514 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "nixpkgs": { - "branch": "release-23.11", + "branch": "release-24.05", "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "7644b4bc09c6329bcd82561a076fd7add697d092", - "sha256": "11ic5as26f82rcd71wag0n5p4aacb7cz4v3y3kw9p72nkv0i19wi", + "rev": "4e08cafd686c7b2a191a82e593762c3a095f88eb", + "sha256": "1pzc8mxwp1sqpnh32kf26skj656kbj7ysrp46d4kqmnlaz3chrqk", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7644b4bc09c6329bcd82561a076fd7add697d092.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/4e08cafd686c7b2a191a82e593762c3a095f88eb.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }