From e6d583ab056c4bab2565d5d00321091ba4b81127 Mon Sep 17 00:00:00 2001
From: Vehbi Sinan Tunalioglu <vst@vsthost.com>
Date: Thu, 6 Jun 2024 17:05:17 +0800
Subject: [PATCH 1/2] chore(deps): bump nixpkgs to v24.05

... and update related stuff.
---
 .github/workflows/check.yaml  |  2 +-
 .github/workflows/release.yml |  2 +-
 build-static.sh               |  2 +-
 default.nix                   |  6 +-----
 nix/sources.json              | 15 ++++-----------
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index b92703b..da173fe 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: "Install nix"
         uses: "cachix/install-nix-action@v26"
         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"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 817359c..1bc5f2a 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 f35becb..cfdf019 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/default.nix b/default.nix
index 9708bd4..61f9767 100644
--- a/default.nix
+++ b/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: { };
   };
 
   ###########
diff --git a/nix/sources.json b/nix/sources.json
index c9bd03a..1717514 100644
--- a/nix/sources.json
+++ b/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"
     }
 }

From ea691885d8301e63a88d7a00eda6e8f8ccdcf85c Mon Sep 17 00:00:00 2001
From: Vehbi Sinan Tunalioglu <vst@vsthost.com>
Date: Thu, 6 Jun 2024 17:08:18 +0800
Subject: [PATCH 2/2] chore: bump GitHub action versions

---
 .github/workflows/check.yaml  | 4 ++--
 .github/workflows/release.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index da173fe..4051ffd 100644
--- a/.github/workflows/check.yaml
+++ b/.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-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: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1bc5f2a..0501a10 100644
--- a/.github/workflows/release.yml
+++ b/.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-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 }}"