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

Commits on Nov 20, 2018

  1. repl: Remove code that was commented out

    @KaiHa
    KaiHa committed Nov 20, 2018
    Copy the full SHA
    b289d86 View commit details

  2. repl: give user the choice between libeditline and libreadline 

    The goal is to support libeditline AND libreadline and let the user
decide at compile time which one to use.

Add a compile time option to use libreadline instead of
libeditline. If compiled against libreadline completion functionality
is lost because of a incompatibility between libeditlines and
libreadlines completion function. Completion with libreadline is
possible and can be added later.

To use libreadline instead of libeditline the environment
variables 'EDITLINE_LIBS' and 'EDITLINE_CFLAGS' have to been set
during the ./configure step.

Example:

  EDITLINE_LIBS="/usr/lib/x86_64-linux-gnu/libhistory.so /usr/lib/x86_64-linux-gnu/libreadline.so"
  EDITLINE_CFLAGS="-DREADLINE"

The reason for this change is that for example on Debian already three
different editline libraries exist but none of those is compatible the
flavor used by nix. My hope is that with this change it would be
easier to port nix to systems that have already libreadline available.
    @KaiHa
    KaiHa committed Nov 20, 2018
    Copy the full SHA
    de59973 View commit details

  3. Merge pull request #2551 from KaiHa/kaiha/libreadline_option 

    repl: give user the choice between libeditline and libreadline
    @edolstra
    edolstra authored Nov 20, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    338fcec View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 src/nix/repl.cc
11 changes: 9 additions & 2 deletions src/nix/repl.cc
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,12 @@

#include <setjmp.h>

#ifdef READLINE
#include <readline/history.h>
#include <readline/readline.h>
#else
#include <editline.h>
#endif

#include "shared.hh"
#include "eval.hh"
@@ -202,13 +207,15 @@ void NixRepl::mainLoop(const std::vector<std::string> & files)
// Allow nix-repl specific settings in .inputrc
rl_readline_name = "nix-repl";
createDirs(dirOf(historyFile));
#ifndef READLINE
el_hist_size = 1000;
#endif
read_history(historyFile.c_str());
// rl_initialize();
// linenoiseSetCompletionCallback(completionCallback);
curRepl = this;
#ifndef READLINE
rl_set_complete_func(completionCallback);
rl_set_list_possib_func(listPossibleCallback);
#endif

std::string input;