From 9f76b6edd14eefa104cb69d8ee3ab4eb158210a0 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 1 Oct 2020 11:21:06 -0700 Subject: [PATCH 1/2] Revert "top-level: fix nix-shell eval w/nixUnstable" This reverts commit fa6064ad86a020f52a75219bff044714f2a9ebbd. (cherry picked from commit d91cab87b14b0d3034ecadb4665d0fe6f723acfc) --- pkgs/top-level/impure.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 88440f711d363..3ba6c08a140b2 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -81,7 +81,7 @@ in # not be passed. assert args ? localSystem -> !(args ? system || args ? platform); -import ./. (builtins.removeAttrs args [ "system" "platform" "inNixShell" ] // { +import ./. (builtins.removeAttrs args [ "system" "platform" ] // { inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. From c2c7a5cecd19b316afa1531e43acf1958c7862cb Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 1 Oct 2020 11:21:32 -0700 Subject: [PATCH 2/2] top-level: ignore unexpected args This fixes both `nix-shell` failing to eval with `nixUnstable`, as well as ofborg's failure to eval on aarch64 due to passing an "unexpected arg" (https://github.com/NixOS/ofborg/blob/1112e3a8c8621203fae71283d700e0383b5e1e80/ofborg/src/nix.rs#L334-L340). (cherry picked from commit 11eddd61bcd2618563d8023bef4572be88c1f096) --- pkgs/top-level/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 904ef8d39796d..dfa68ba31b841 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -38,6 +38,9 @@ # environment. See below for the arguments given to that function, the type of # list it returns. stdenvStages ? import ../stdenv + +, # Ignore unexpected args. + ... } @ args: let # Rename the function arguments