Merge remote-tracking branch 'origin/master' into staging-next

2025-10-05 12:17:08 +03:00
parent 10ceb7bbdf aee3f2ec9e
commit e93c560b79
1577 changed files with 2261 additions and 2253 deletions
@@ -92,7 +92,7 @@ in
        buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable;
        # Analogous to stdenv
        rustPlatform = makeRustPlatform self.buildRustPackages;
-        rustc-unwrapped = self.callPackage ./rustc.nix ({
+        rustc-unwrapped = self.callPackage ./rustc.nix {
          version = rustcVersion;
          sha256 = rustcSha256;
          inherit enableRustcDev;
@@ -109,7 +109,7 @@ in

          # Use boot package set to break cycle
          inherit (bootstrapRustPackages) cargo rustc rustfmt;
-        });
+        };
        rustc = wrapRustcWith {
          inherit (self) rustc-unwrapped;
          sysroot = if fastCross then self.rustc-unwrapped else null;