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

Commits on Apr 18, 2018

  1. nix repl: Fix multiline SIGINT handling. 

    Fixes #2076

(cherry picked from commit a91fb42)
    @picnoir @edolstra
    picnoir authored and edolstra committed Apr 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5be4f48 View commit details

  2. Handle arguments in $EDITOR 

    Fixes #2079.

(cherry picked from commit a4aac7f)
    @edolstra
    edolstra committed Apr 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b1ade66 View commit details

  3. initPlugins: Fix dlopen error message. 

    (cherry picked from commit dc0a542)
    @shlevy @edolstra
    shlevy authored and edolstra committed Apr 18, 2018

    Partially verified

    This commit is signed with the committer’s verified signature.
    edolstra’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    b61ea7b View commit details
Showing with 4 additions and 3 deletions.
  1. +1 −1 src/libstore/globals.cc
  2. +2 −2 src/nix/edit.cc
  3. +1 −0 src/nix/repl.cc
2 changes: 1 addition & 1 deletion src/libstore/globals.cc
View file
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ void initPlugins()
void *handle =
dlopen(file.c_str(), RTLD_LAZY | RTLD_LOCAL);
if (!handle)
throw Error("could not dynamically open plugin file '%s%': %s%", file, dlerror());
throw Error("could not dynamically open plugin file '%s': %s", file, dlerror());
}
}
/* We handle settings registrations here, since plugins can add settings */
4 changes: 2 additions & 2 deletions src/nix/edit.cc
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ struct CmdEdit : InstallableCommand

auto editor = getEnv("EDITOR", "cat");

Strings args{editor};
auto args = tokenizeString<Strings>(editor);

if (editor.find("emacs") != std::string::npos ||
editor.find("nano") != std::string::npos ||
@@ -72,7 +72,7 @@ struct CmdEdit : InstallableCommand

stopProgressBar();

execvp(editor.c_str(), stringsToCharPtrs(args).data());
execvp(args.front().c_str(), stringsToCharPtrs(args).data());

throw SysError("cannot run editor '%s'", editor);
}
1 change: 1 addition & 0 deletions src/nix/repl.cc
View file
Original file line number Diff line number Diff line change
@@ -189,6 +189,7 @@ bool NixRepl::getLine(string & input, const std::string &prompt)
if (!s) {
switch (auto type = linenoiseKeyType()) {
case 1: // ctrl-C
input = "";
return true;
case 2: // ctrl-D
return false;