Simplify rules_nixpkgs_core module extensions

.bazelrc.common

@@ -1,7 +1,8 @@
 build --host_platform=@rules_nixpkgs_core//platforms:host
 
-build:bzlmod --enable_bzlmod
-build:bzlmod --registry=https://bcr.bazel.build
+common:bzlmod --enable_bzlmod
+common:bzlmod --registry=https://bcr.bazel.build
+common:bzlmod --experimental_isolated_extension_usages
 
 test --test_output=errors
 

.github/build-and-test

@@ -36,6 +36,7 @@ if [[ ${BZLMOD_ENABLED-} = true ]]; then
     )
     declare -ra test_dirs=(
         testing/core
+        testing/core/tests/intermediate_module
         testing/go-bzlmod
         testing/java
         testing/nodejs

WORKSPACE

@@ -24,27 +24,23 @@ docs_dependencies_2()
 load(
     "//nixpkgs:nixpkgs.bzl",
     "nixpkgs_git_repository",
-    "nixpkgs_local_repository",
     "nixpkgs_package",
 )
 
-nixpkgs_local_repository(
-    name = "nixpkgs",
-    nix_file = "@rules_nixpkgs_core//:nixpkgs.nix",
-    nix_file_deps = ["@rules_nixpkgs_core//:nixpkgs.json"],
-)
-
 nixpkgs_package(
-    name = "nix_2_7",
-    attribute_path = "nixVersions.nix_2_7",
+    name = "nix_2_10",
+    attribute_path = "nixVersions.nix_2_10",
     repositories = {"nixpkgs": "@nixpkgs"},
 )
 
 # This is used to run Nix in a sandboxed Bazel test. See the test
 # `run-test-invalid-nixpkgs-package`.
 nixpkgs_package(
     name = "coreutils_static",
-    attribute_path = "pkgsStatic.coreutils",
+    # Work around https://github.com/tweag/rules_nixpkgs/issues/424.
+    # `pkgsStatic.coreutils` stopped working on MacOS 11 with x86_64 as used on GitHub actions CI.
+    # Fall back to `pkgs.coreutils` on MacOS.
+    nix_file_content = "let pkgs = import <nixpkgs> { config = {}; overlays = []; }; in if pkgs.stdenv.isDarwin then pkgs.coreutils else pkgs.pkgsStatic.coreutils",
     repository = "@nixpkgs",
 )
 

core/MODULE.bazel

@@ -7,10 +7,9 @@ bazel_dep(name = "platforms", version = "0.0.4")
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
 
 nix_repo = use_extension("//extensions:repository.bzl", "nix_repo")
-use_repo(nix_repo, "nixpkgs_repositories")
-nix_repo.override(name = "nixpkgs")
 nix_repo.github(
     name = "nixpkgs",
     tag = "22.11",
     sha256 = "ddc3428d9e1a381b7476750ac4dbea7a42885cbbe6e1af44b21d6447c9609a6f",
 )
+use_repo(nix_repo, "nixpkgs")