Merge pull request #62 from vst/59-upgrade-to-nixpkgs-v2405

Upgrade nixpkgs, GitHub actions

.github/workflows/check.yaml

@@ -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: |

.github/workflows/release.yml

@@ -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 }}"
@@ -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 }}"

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}"

default.nix

@@ -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: { };
   };
 
   ###########

nix/sources.json

@@ -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"
     }
 }