Skip to content

Commit

Permalink
Merge pull request #89 from vst/88-upgrade-to-nixpkgs-v2405
Browse files Browse the repository at this point in the history
chore(deps): bump nixpkgs to v24.05
  • Loading branch information
vst authored Jun 4, 2024
2 parents 6064905 + 784362e commit b8d9d1e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build-static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
@@ -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/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

0 comments on commit b8d9d1e

Please sign in to comment.