diff --git a/flake.lock b/flake.lock index 8ba4e3f3..0793da50 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1718428119, - "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { diff --git a/lib/mk-aggregated.nix b/lib/mk-aggregated.nix index 971fd861..695be21a 100644 --- a/lib/mk-aggregated.nix +++ b/lib/mk-aggregated.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, symlinkJoin, pkgsTargetTarget, bash, curl }: +{ lib, stdenv, symlinkJoin, pkgsTargetTarget, bash, curl, rustc }: { pname, version, date, selectedComponents, availableComponents ? selectedComponents }: let inherit (lib) optional; @@ -10,7 +10,19 @@ symlinkJoin { paths = selectedComponents; - passthru = { inherit availableComponents; }; + passthru = { + inherit availableComponents; + + # These are used by `buildRustPackage` for default `meta`. We forward + # them to nixpkgs' rustc, or fallback to sane defaults. False-positive + # is better than false-negative which causes eval failures. + # See: + # - https://github.com/oxalica/rust-overlay/issues/191 + # - https://github.com/NixOS/nixpkgs/pull/338999 + targetPlatforms = rustc.targetPlatform or lib.platforms.all; + tier1TargetPlatforms = rustc.tier1TargetPlatforms or lib.platforms.all; + badTargetPlatforms = rustc.badTargetPlatforms or [ ]; + }; # Ourselves have offset -1. In order to make these offset -1 dependencies of downstream derivation, # they are offset 0 propagated.