Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade nixpkgs, GitHub actions #62

Merged
merged 2 commits into from
Jun 6, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
uses: "actions/checkout@v4"

- name: "Install nix"
uses: "cachix/install-nix-action@v26"
uses: "cachix/install-nix-action@v27"
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@v4"
uses: "DeterminateSystems/magic-nix-cache-action@v7"

- name: "Check Application"
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- id: "release"
name: "Release"
uses: "google-github-actions/release-please-action@v4"
uses: "googleapis/release-please-action@v4"

- name: "Checkout Codebase"
if: "${{ steps.release.outputs.release_created }}"
Expand All @@ -26,14 +26,14 @@ jobs:

- name: "Install nix"
if: "${{ steps.release.outputs.release_created }}"
uses: "cachix/install-nix-action@v25"
uses: "cachix/install-nix-action@v27"
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"
if: "${{ steps.release.outputs.release_created }}"
uses: "DeterminateSystems/magic-nix-cache-action@v3"
uses: "DeterminateSystems/magic-nix-cache-action@v7"

- 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.4.8"
GHC_VERSION="9.6.5"

## Docker image:
DOCKER_IMAGE="quay.io/benz0li/ghc-musl:${GHC_VERSION}"
Expand Down
6 changes: 1 addition & 5 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,7 @@ let
thisHaskell = mkHaskell {
haskell = baseHaskell;
packages = thisHaskellPackagesAll;
overrides = self: super: {
bytehash = pkgs.haskell.lib.dontCheck super.bytehash;
hetzner = self.hetzner_0_6_0_0;
table-layout = self.callCabal2nixWithOptions "table-layout" sources.table-layout "--no-check" { };
};
overrides = self: super: { };
};

###########
Expand Down
15 changes: 4 additions & 11 deletions nix/sources.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
{
"nixpkgs": {
"branch": "release-23.11",
"branch": "release-24.05",
"description": "Nix Packages collection",
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8468b0786c4f5a4e5eab5a4921b75a0139b0474d",
"sha256": "0ba0808wjgzxwrxjbf4h8261x3gr0ymd3s97w392rrr86x8kmpcv",
"rev": "4e08cafd686c7b2a191a82e593762c3a095f88eb",
"sha256": "1pzc8mxwp1sqpnh32kf26skj656kbj7ysrp46d4kqmnlaz3chrqk",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/8468b0786c4f5a4e5eab5a4921b75a0139b0474d.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/4e08cafd686c7b2a191a82e593762c3a095f88eb.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"table-layout": {
"sha256": "0vbz8lmjzxz9flpnzjfhis85ck3q6zfn6xa1ms8j5gcgh1bfjilr",
"type": "tarball",
"url": "https://hackage.haskell.org/package/table-layout-1.0.0.0/table-layout-1.0.0.0.tar.gz",
"url_template": "https://hackage.haskell.org/package/table-layout-<version>/table-layout-<version>.tar.gz",
"version": "1.0.0.0"
}
}