mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-env: Fix parsing of --system

Browse source 
https://hydra.nixos.org/build/68827814
This commit is contained in:
Eelco Dolstra 2018-02-08 15:25:03 +01:00
parent 444bae44ef
commit ad97a21834
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libmain/common-args.cc
View file

@ -37,6 +37,10 @@ MixCommonArgs::MixCommonArgs(const string & programName)
std::string cat = "config"; std::string cat = "config";
settings.convertToArgs(*this, cat); settings.convertToArgs(*this, cat);
// Backward compatibility hack: nix-env already had a --system flag.
if (programName == "nix-env") longFlags.erase("system");
hiddenCategories.insert(cat); hiddenCategories.insert(cat);
} }

3
tests/user-envs.sh
View file

@ -24,6 +24,9 @@ rm -f $HOME/.nix-defexpr
ln -s $(pwd)/user-envs.nix $HOME/.nix-defexpr ln -s $(pwd)/user-envs.nix $HOME/.nix-defexpr
nix-env -qa '*' --description | grep -q silly nix-env -qa '*' --description | grep -q silly
# Query the system.
nix-env -qa '*' --system | grep -q $system
# Install "foo-1.0". # Install "foo-1.0".
nix-env -i foo-1.0 nix-env -i foo-1.0