diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 14:29:32 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-27 14:29:32 +0000 |
| commit | d5bb67cfa4da130a9949a9b4eb8aba6cb74ea5c7 (patch) | |
| tree | ed365ca233fa7edfba9551539c4a903f109abef0 /src/nix | |
| parent | 048e916f6477acc7e57e1d85e832d3efb42ad3f6 (diff) | |
| parent | d7c0f094cbcfe1ae4ccc3d54baec00b66ccb1ed0 (diff) | |
Merge remote-tracking branch 'upstream/master' into optional-derivation-output-storepath
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/edit.cc | 1 | ||||
| -rw-r--r-- | src/nix/profile.cc | 2 | ||||
| -rw-r--r-- | src/nix/registry.cc | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/nix/edit.cc b/src/nix/edit.cc index dc9775635..378a3739c 100644 --- a/src/nix/edit.cc +++ b/src/nix/edit.cc @@ -45,6 +45,7 @@ struct CmdEdit : InstallableCommand auto args = editorFor(pos); + restoreSignals(); execvp(args.front().c_str(), stringsToCharPtrs(args).data()); std::string command; diff --git a/src/nix/profile.cc b/src/nix/profile.cc index 729924e3a..c6cd88c49 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -395,7 +395,7 @@ struct CmdProfileInfo : virtual EvalCommand, virtual StoreCommand, MixDefaultPro } }; -struct CmdProfileDiffClosures : virtual EvalCommand, virtual StoreCommand, MixDefaultProfile +struct CmdProfileDiffClosures : virtual StoreCommand, MixDefaultProfile { std::string description() override { diff --git a/src/nix/registry.cc b/src/nix/registry.cc index 16d7e511f..ebee4545c 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -111,6 +111,7 @@ struct CmdRegistryPin : virtual Args, EvalCommand fetchers::Attrs extraAttrs; if (ref.subdir != "") extraAttrs["dir"] = ref.subdir; userRegistry->add(ref.input, resolved, extraAttrs); + userRegistry->write(fetchers::getUserRegistryPath()); } }; |