Merge pull request #2217 from tweag/cb/upgrade-nixpkgs-nixos-24.05

Upgrade nixpkgs to nixos-24.05 and remove nixos-unstable again

Author: mergify[bot]

.github/workflows/workflow.yaml

@@ -48,7 +48,7 @@ jobs:
         bzlmod: [true, false]
         ghc:
           - 9.4.6
-          - 9.6.2
+          - 9.6.5
           - 9.8.1
         exclude:
           - module: rules_haskell_nix
@@ -58,7 +58,7 @@ jobs:
           #       and stack config per GHC version
           - ghc: 9.8.1
             bzlmod: true
-          - ghc: 9.6.2
+          - ghc: 9.6.5
             bzlmod: true
     runs-on: ${{ matrix.os }}
     env:
@@ -144,17 +144,17 @@ jobs:
         bzlmod: [true, false]
         ghc:
           - 9.4.6
-          - 9.6.2
+          - 9.6.5
           - 9.8.1
         exclude:
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
           #       and stack config per GHC version
           - ghc: 9.8.1
             bzlmod: true
-          - ghc: 9.6.2
+          - ghc: 9.6.5
             bzlmod: true
           # currently proto-lens-protoc fails with an access violation on Windows
-          - ghc: 9.6.2
+          - ghc: 9.6.5
             os: windows-latest
           - ghc: 9.8.1
             os: windows-latest

MODULE.bazel

@@ -119,27 +119,27 @@ use_repo(npm, "rules_haskell_npm")
 #### Development dependencies ####
 bazel_dep(
     name = "rules_nixpkgs_core",
-    version = "0.11.1",
+    version = "0.12.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_cc",
-    version = "0.11.1",
+    version = "0.12.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_python",
-    version = "0.11.1",
+    version = "0.12.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_go",
-    version = "0.11.1",
+    version = "0.12.0",
     dev_dependency = True,
 )
 bazel_dep(
     name = "rules_nixpkgs_posix",
-    version = "0.11.1",
+    version = "0.12.0",
     dev_dependency = True,
 )
 bazel_dep(
@@ -150,7 +150,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_nixpkgs_nodejs",
-    version = "0.11.1",
+    version = "0.12.0",
     dev_dependency = True,
 )
 

haskell/repositories.bzl

@@ -8,8 +8,8 @@ load(
     "check_bazel_version_compatible",
 )
 
-_rules_nixpkgs_version = "0.11.1"
-_rules_nixpkgs_sha256 = "2a555348d7f8593fca2bf3fc6ce53c5d62929de81b6c292e23f16c557c0ae45a"
+_rules_nixpkgs_version = "0.12.0"
+_rules_nixpkgs_sha256 = "1adb04dc0416915fef427757f4272c4f7dacefeceeefc50f683aec7f7e9b787a"
 
 _rules_sh_version = "v0.4.0"
 _rules_sh_sha256 = "3243af3fcb3768633fd39f3654de773e5fb61471a2fae5762a1653c22c412d2c"

nixpkgs/default.nix

@@ -1,8 +1,8 @@
 { ... }@args:
 let
-  # 2023-11-30
-  sha256 = "sha256:1lm7rkcbr7gg5zp62bga8iqyhg5hsvcly95hq0p3mcv7zq8n3wc2";
-  rev = "7144d6241f02d171d25fba3edeaf15e0f2592105";
+  # nixos-24.05 @ 2024-07-02
+  sha256 = "sha256:0bpw6x46mp0xqfdwbrhnjn6qlb4avglir993n3cdqg8zv4klgllw";
+  rev = "706eef542dec88cc0ed25b9075d3037564b2d164";
 in
 import (fetchTarball {
   inherit sha256;

nixpkgs/nixos-unstable.nix

@@ -1,8 +1,8 @@
 module(
     name = "rules_nixpkgs_cc",
-    version = "0.11.1",
+    version = "0.12.0",
 )
 
-bazel_dep(name = "rules_nixpkgs_core", version = "0.11.1")
+bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0")
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
 bazel_dep(name = "rules_cc", version = "0.0.1")

registry/modules/rules_nixpkgs_cc/0.11.1/source.json

@@ -0,0 +1,5 @@
+{
+    "integrity": "sha256-GtsE3AQWkV/vQndX9CcsT32s7+zu78UPaDrsf36beHo=",
+    "strip_prefix": "rules_nixpkgs-0.12.0/toolchains/cc",
+    "url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz"
+}

registry/modules/rules_nixpkgs_cc/0.11.1/MODULE.bazel renamed to registry/modules/rules_nixpkgs_cc/0.12.0/MODULE.bazel

@@ -12,6 +12,6 @@
       "name": "Andreas Herrmann"
     }
   ],
-  "versions": ["0.11.1"],
+  "versions": ["0.12.0"],
   "yanked_versions": []
 }