Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1af7b94c1d46
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6be04476dc07
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 28, 2020

  1. Shut up warning

    @edolstra
    edolstra committed Jan 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    epiteff
    GPG key ID: 94F82827CA03B374
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6be0447 View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 src/nix/installables.cc
5 changes: 1 addition & 4 deletions src/nix/installables.cc
View file
Original file line number Diff line number Diff line change
@@ -434,10 +434,6 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
};

for (auto & s : ss) {

size_t hash;
std::optional<StorePath> storePath;

if (hasPrefix(s, "nixpkgs.")) {
bool static warned;
warnOnce(warned, "the syntax 'nixpkgs.<attr>' is deprecated; use 'nixpkgs:<attr>' instead");
@@ -454,6 +450,7 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
fragment == "" ? getDefaultFlakeAttrPaths() : Strings{fragment},
getDefaultFlakeAttrPathPrefixes()));
} else {
std::optional<StorePath> storePath;
if (s.find('/') != std::string::npos && (storePath = follow(s)))
result.push_back(std::make_shared<InstallableStorePath>(store, store->printStorePath(*storePath)));
else