Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
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.6.5"
GHC_VERSION="9.6.6"

## 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-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/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
Loading