colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99316 from cole-h/fix-nix-shell-and-borg

Browse Source 
top-level: ignore unexpected args
This commit is contained in:
Silvan Mosberger 2020-10-05 21:09:33 +02:00 committed by GitHub
commit 1781e11061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/default.nix
View File

@ -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

2
pkgs/top-level/impure.nix
View File

@ -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.