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: 4bfba1305ed0
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7b8f799380d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 23, 2020

  1. Get rid of basicDerivation::findOutput 

    It's a tiny function which is:

 - hardly worth abstrating over, and also only used once.

 - doesn't work once we get CA drvs

I rewrote the one callsite to be forwards compatable with CA
derivations, and also potentially more performant: instead of reading in
the derivation it can ust consult the SQLite DB in the common case.
    @Ericson2314
    Ericson2314 committed Jul 23, 2020
    Copy the full SHA
    2274f63 View commit details

  2. Merge pull request #3855 from obsidiansystems/delete-find-output 

    Get rid of `basicDerivation::findOutput`
    @edolstra
    edolstra authored Jul 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a7b8f79 View commit details
Showing with 2 additions and 13 deletions.
  1. +0 −8 src/libstore/derivations.cc
  2. +0 −4 src/libstore/derivations.hh
  3. +2 −1 src/nix-env/nix-env.cc
8 changes: 0 additions & 8 deletions src/libstore/derivations.cc
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,6 @@

namespace nix {

const StorePath & BasicDerivation::findOutput(const string & id) const
{
auto i = outputs.find(id);
if (i == outputs.end())
throw Error("derivation has no output '%s'", id);
return i->second.path;
}


bool BasicDerivation::isBuiltin() const
{
4 changes: 0 additions & 4 deletions src/libstore/derivations.hh
View file
Original file line number Diff line number Diff line change
@@ -39,10 +39,6 @@ struct BasicDerivation
BasicDerivation() { }
virtual ~BasicDerivation() { };

/* Return the path corresponding to the output identifier `id' in
the given derivation. */
const StorePath & findOutput(const std::string & id) const;

bool isBuiltin() const;

/* Return true iff this is a fixed-output derivation. */
3 changes: 2 additions & 1 deletion src/nix-env/nix-env.cc
View file
Original file line number Diff line number Diff line change
@@ -381,7 +381,8 @@ static void queryInstSources(EvalState & state,

if (path.isDerivation()) {
elem.setDrvPath(state.store->printStorePath(path));
elem.setOutPath(state.store->printStorePath(state.store->derivationFromPath(path).findOutput("out")));
auto outputs = state.store->queryDerivationOutputMap(path);
elem.setOutPath(state.store->printStorePath(outputs.at("out")));
if (name.size() >= drvExtension.size() &&
string(name, name.size() - drvExtension.size()) == drvExtension)
name = string(name, 0, name.size() - drvExtension.size());