Merge pull request #39 from vst/38-upgrade-to-nixpkgs-v2405

chore(deps): bump nixpkgs to v24.05

Author: vst

.github/workflows/check.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: "Install nix"
         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@v6"

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

@@ -12,9 +12,6 @@ let
   ## Import nixpkgs pinned by niv:
   pkgs = import sources.nixpkgs { inherit system; };
 
-  ## Import nixpkgs pinned by niv:
-  pkgs-unstable = import sources.nixpkgs-unstable { inherit system; };
-
   ##################
   ## LOAD HELPERS ##
   ##################
@@ -110,7 +107,7 @@ let
       thisHaskell.hpack
 
       ## Application dependencies:
-      pkgs-unstable.d2
+      pkgs.d2
 
       ## Other build inputs for various development requirements:
       pkgs.docker-client

nix/sources.json

@@ -1,26 +1,14 @@
 {
     "nixpkgs": {
-        "branch": "release-23.11",
+        "branch": "release-24.05",
         "description": "Nix Packages collection",
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "40d989164088db79c1895f177ee67216d91ae8a5",
-        "sha256": "149awch51367za8mjs2inx5m3jgijh9ibda1slf8gywc7lbalsaa",
+        "rev": "4e08cafd686c7b2a191a82e593762c3a095f88eb",
+        "sha256": "1pzc8mxwp1sqpnh32kf26skj656kbj7ysrp46d4kqmnlaz3chrqk",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/40d989164088db79c1895f177ee67216d91ae8a5.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs-unstable": {
-        "branch": "nixpkgs-unstable",
-        "description": "Nix Packages collection & NixOS",
-        "homepage": "",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3f316d2a50699a78afe5e77ca486ad553169061e",
-        "sha256": "1gfnjl8zjai1cjqhx96jjnnq7zjdn0ajd14xmb09jrgnjs0dw1im",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/3f316d2a50699a78afe5e77ca486ad553169061e.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/4e08cafd686c7b2a191a82e593762c3a095f88eb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }