From 623541a18b3540f9bf90029966fce44943ca9004 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 5 Feb 2025 14:29:04 +0100 Subject: [PATCH] Revert "pkgs/top-level: add assert to prevent passing elaborated systems" This reverts commit 434e36ab91be1454bcd4854878d683aaf50633f5. --- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/default.nix | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f86fc3ec11..9b1537d6bdd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1669,9 +1669,9 @@ with pkgs; # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build freshBootstrapTools = if stdenv.hostPlatform.isDarwin then callPackage ../stdenv/darwin/make-bootstrap-tools.nix { - localSystem = { config = lib.systems.parse.tripleFromSystem stdenv.buildPlatform; }; + localSystem = stdenv.buildPlatform; crossSystem = - if stdenv.buildPlatform == stdenv.hostPlatform then null else { config = lib.systems.parse.tripleFromSystem stdenv.hostPlatform; }; + if stdenv.buildPlatform == stdenv.hostPlatform then null else stdenv.hostPlatform; } else if stdenv.hostPlatform.isLinux then callPackage ../stdenv/linux/make-bootstrap-tools.nix {} diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 8aa678b43c4d..6787793dbdfc 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -46,11 +46,6 @@ ... } @ args: -# Passing fully elaborated systems to localSystem or crossSystem will break composability -# of package sets. -assert builtins.isAttrs localSystem -> !(localSystem ? parsed); -assert builtins.isAttrs crossSystem -> !(crossSystem ? parsed); - let # Rename the function arguments config0 = config; crossSystem0 = crossSystem;