NixOS · xokdvium · Dec 1, 2025 · Dec 1, 2025 · Dec 1, 2025 · Dec 2, 2025
@@ -1,5 +1,7 @@
 # Default meson build dir
 /build
+# Meson creates this file too
+src/.wraplock
 
 # /tests/functional/
 /tests/functional/common/subst-vars.sh

@@ -1,7 +1,7 @@
 {
   description = "The purely functional package manager";
 
-  inputs.nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
+  inputs.nixpkgs.url = "https://channels.nixos.org/nixos-25.11/nixexprs.tar.xz";
 
   inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
   inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";

@@ -93,7 +93,7 @@
           clang-format = {
             enable = true;
             # https://github.com/cachix/git-hooks.nix/pull/532
-            package = pkgs.llvmPackages_latest.clang-tools;
+            package = pkgs.llvmPackages_21.clang-tools;
             excludes = [
               # We don't want to format test data
               # ''tests/(?!nixos/).*\.nix''

@@ -1,7 +1,7 @@
 # Clang gets grumpy about missing libasan symbols if -shared-libasan is not
 # passed when building shared libs, at least on Linux
 if cxx.get_id() == 'clang' and ('address' in get_option('b_sanitize') or 'undefined' in get_option(
-  'b_sanitize',
+    'b_sanitize',
 ))
   add_project_link_arguments('-shared-libasan', language : 'cpp')
 endif

@@ -155,11 +155,14 @@ let
     ];
   };
 
-  mesonBuildLayer = finalAttrs: prevAttrs: {
+  mesonBuildLayer = finalAttrs: prevAttrs: rec {
     nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [
       pkg-config
     ];
     separateDebugInfo = !stdenv.hostPlatform.isStatic;
+    # needed by separateDebugInfo
+    # SEE: https://github.com/NixOS/nixpkgs/pull/394674/commits/a4d355342976e9e9823fb94f133bc43ebec9da5b
+    __structuredAttrs = separateDebugInfo;
     hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
   };
 

@@ -38,6 +38,7 @@ escape_systemd_env() {
 create_systemd_proxy_env() {
     vars="http_proxy https_proxy ftp_proxy all_proxy no_proxy HTTP_PROXY HTTPS_PROXY FTP_PROXY ALL_PROXY NO_PROXY"
     for v in $vars; do
+        # shellcheck disable=SC2268
         if [ "x${!v:-}" != "x" ]; then
             echo "Environment=${v}=$(escape_systemd_env "${!v}")"
         fi

@@ -533,8 +533,8 @@ inline constexpr bool useBitPackedValueStorage = (ptrSize == 8) && (__STDCPP_DEF
  * Packs discriminator bits into the pointer alignment niches.
  */
 template<std::size_t ptrSize>
-class alignas(16) ValueStorage<ptrSize, std::enable_if_t<detail::useBitPackedValueStorage<ptrSize>>>
-    : public detail::ValueBase
+class alignas(16)
+    ValueStorage<ptrSize, std::enable_if_t<detail::useBitPackedValueStorage<ptrSize>>> : public detail::ValueBase
 {
     /* Needs a dependent type name in order for member functions (and
      * potentially ill-formed bit casts) to be SFINAE'd out.

@@ -47,6 +47,8 @@ perl.pkgs.toPerlModule (
       nix-store
       bzip2
       libsodium
+      perlPackages.DBI
+      perlPackages.DBDSQLite
     ];
 
     # `perlPackages.Test2Harness` is marked broken for Darwin
@@ -64,8 +66,6 @@ perl.pkgs.toPerlModule (
       '';
 
     mesonFlags = [
-      (lib.mesonOption "dbi_path" "${perlPackages.DBI}/${perl.libPrefix}")
-      (lib.mesonOption "dbd_sqlite_path" "${perlPackages.DBDSQLite}/${perl.libPrefix}")
       (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
     ];
 

@@ -181,7 +181,10 @@ test "$status" = 1
 # Precise number of errors depends on daemon version / goal refactorings
 (( "$(<<<"$out" grep -cE '^error:')" >= 2 ))
 
-if isDaemonNewer "2.29pre"; then
+if isDaemonNewer "2.31"; then
+    <<<"$out" grepQuiet -E "error: Cannot build '.*-x4\\.drv'"
+    <<<"$out" grepQuiet -E "Reason: 1 dependency failed."
+elif isDaemonNewer "2.29pre"; then
     <<<"$out" grepQuiet -E "error: Cannot build '.*-x4\\.drv'"
     <<<"$out" grepQuiet -E "Reason: 1 dependency failed."
     <<<"$out" grepQuiet -E "Build failed due to failed dependency"

@@ -52,8 +52,8 @@ buildViaSubstitute use-a-more-outputs^first
 
 delete
 
-# Failure with 2.28 encountered in CI
-requireDaemonNewerThan "2.29"
+# Failure with 2.34 encountered in CI
+requireDaemonNewerThan "2.34"
 
 # Substitue just the first output
 #

@@ -70,6 +70,7 @@ mountOverlayfs () {
     "$storeBRoot/nix/store" \
     || skipTest "overlayfs is not supported"
 
+  # shellcheck disable=SC2329
   cleanupOverlay () {
     # shellcheck disable=2317
     umount -n "$storeBRoot/nix/store"

@@ -48,15 +48,15 @@ expectStderr 1 noisyFalse | grepQuiet NAY
 
 # `set -o pipefile` is enabled
 
-# shellcheck disable=SC2317# shellcheck disable=SC2317
+# shellcheck disable=SC2329
 pipefailure () {
     # shellcheck disable=SC2216
     true | false | true
 }
 expect 1 pipefailure
 unset pipefailure
 
-# shellcheck disable=SC2317
+# shellcheck disable=2329
 pipefailure () {
     # shellcheck disable=SC2216
     false | true | true
@@ -84,7 +84,7 @@ expect 1 useUnbound
 # ! alone unfortunately negates `set -e`, but it works in functions:
 # shellcheck disable=SC2251
 ! true
-# shellcheck disable=SC2317
+# shellcheck disable=SC2329
 funBang () {
     ! true
 }

@@ -80,13 +80,14 @@ let
     {
       imports = [ checkOverrideNixVersion ];
       nix.package = lib.mkForce (
-        pkgs.nixVersions.nix_2_3.overrideAttrs (o: {
-          meta = o.meta // {
-            # This version shouldn't be used by end-users, but we run tests against
-            # it to ensure we don't break protocol compatibility.
-            knownVulnerabilities = [ ];
-          };
-        })
+        nixpkgs-23-11.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixVersions.nix_2_3.overrideAttrs
+          (o: {
+            meta = o.meta // {
+              # This version shouldn't be used by end-users, but we run tests against
+              # it to ensure we don't break protocol compatibility.
+              knownVulnerabilities = [ ];
+            };
+          })
       );
     };
 

@@ -4,6 +4,22 @@
   nodes.substituter =
     { pkgs, ... }:
     {
+      # nix-serve is broken while cross-compiling in nixpkgs 25.11. It's been
+      # fixed since, but while we're pinning 25.11 we use this workaround.
+      nixpkgs.overlays = [
+        (final: prev: {
+          nix-serve =
+            final.lib.warnIf (final.lib.versions.majorMinor final.lib.version != "25.11")
+              "remove the hack in fetchers-substitute.nix when updating nixpkgs from 25.11"
+              (
+                prev.nix-serve.override {
+                  nix = prev.nix // {
+                    libs.nix-perl-bindings = prev.nix.nix-perl-bindings or null;
+                  };
+                }
+              );
+        })
+      ];
       virtualisation.writableStore = true;
 
       nix.settings.extra-experimental-features = [

@@ -1,14 +1,5 @@
 { lib, nixComponents, ... }:
 
-let
-  # FIXME (roberth) reference issue
-  inputDerivation =
-    pkg:
-    (pkg.overrideAttrs (o: {
-      disallowedReferences = [ ];
-    })).inputDerivation;
-
-in
 {
   # We rarely change the script in a way that benefits from type checking, so
   # we skip it to save time.
@@ -20,7 +11,7 @@ in
 
       virtualisation.writableStore = true;
       system.extraDependencies = [
-        (inputDerivation config.nix.package)
+        config.nix.package.inputDerivation
       ];
 
       nix.settings.substituters = lib.mkForce [ ];

@@ -905,7 +905,7 @@ in
       server.wait_for_unit("minio")
       server.wait_for_unit("network-addresses-eth1.service")
       server.wait_for_open_port(9000)
-      server.succeed(f"mc config host add minio http://localhost:9000 {ACCESS_KEY} {SECRET_KEY} --api s3v4")
+      server.succeed(f"mc alias set minio http://localhost:9000 {ACCESS_KEY} {SECRET_KEY} --api s3v4")
 
       # Run tests (each gets isolated bucket via decorator)
       test_credential_caching()