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

Author: avdv

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

@@ -126,7 +126,6 @@ use_repo(
     "nixpkgs_go_sdk_toolchains",
     "nixpkgs_lz4",
     "nixpkgs_python_toolchain",
-    "nixpkgs_unstable",
     "toolchains_libraries",
     "zlib.dev",
 )

rules_haskell_tests/MODULE.bazel

@@ -58,12 +58,6 @@ def repositories(*, bzlmod):
         nix_file = "//nixpkgs:default.nix",
     )
 
-    # TODO switch back to nixpkgs_default once bazel_* matches the version in .bazelversion
-    nixpkgs_local_repository(
-        name = "nixpkgs_unstable",
-        nix_file = "//nixpkgs:nixos-unstable.nix",
-    )
-
     nixpkgs_package(
         name = "glibc_locales",
         attribute_path = "glibcLocales",

rules_haskell_tests/non_module_deps_1.bzl

@@ -11,8 +11,7 @@ def integration_testing_bazel_binaries():
     for package in SUPPORTED_NIXPKGS_BAZEL_PACKAGES:
         nixpkgs_package(
             name = package,
-            # TODO switch back to nixpkgs_default once bazel_* matches the version in .bazelversion
-            repository = "@nixpkgs_unstable",
+            repository = "@nixpkgs_default",
             build_file_content = """\
 filegroup(
     name = "bazel_bin",

rules_haskell_tests/tests/integration_testing/dependencies.bzl

@@ -3,8 +3,6 @@
 with pkgs;
 
 let
-  nixos-unstable = import ./nixpkgs/nixos-unstable.nix { };
-
   macOS-security =
     # make `/usr/bin/security` available in `PATH`, which is needed for stack
     # on darwin which calls this binary to find certificates
@@ -44,8 +42,7 @@ mkShell {
   ++ lib.optionals docTools [ graphviz python39Packages.sphinx zip unzip ]
   ++ lib.optional stdenv.isDarwin macOS-security;
 
-  # TODO switch back to default nixpkgs once bazel_* matches the version in .bazelversion
-  packages = [ nixos-unstable.bazel_6 ];
+  packages = [ bazel_6 ];
 
   shellHook = ''
     # Add nix config flags to .bazelrc.local.