Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use editline instead of linenoise(-ng) #2228

Merged
merged 3 commits into from
Nov 13, 2018
Merged

use editline instead of linenoise(-ng) #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d974d3
editline: wip
dtzWill Oct 29, 2018
9f99809
repl: complete if all matches share prefix
dtzWill Jun 26, 2018
2a8bdfd
editline: 1.15.3 -> 1.16.0
dtzWill Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile.config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ SODIUM_LIBS = @SODIUM_LIBS@
LIBLZMA_LIBS = @LIBLZMA_LIBS@
SQLITE3_LIBS = @SQLITE3_LIBS@
LIBBROTLI_LIBS = @LIBBROTLI_LIBS@
EDITLINE_LIBS = @EDITLINE_LIBS@
bash = @bash@
bindir = @bindir@
brotli = @brotli@
Expand Down
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19], [CXXFLAGS="$SQLITE3_CFLAGS $CX
# Look for libcurl, a required dependency.
PKG_CHECK_MODULES([LIBCURL], [libcurl], [CXXFLAGS="$LIBCURL_CFLAGS $CXXFLAGS"])

# Look for editline, a required dependency.
PKG_CHECK_MODULES([EDITLINE], [libeditline], [CXXFLAGS="$EDITLINE_CFLAGS $CXXFLAGS"])

# Look for libsodium, an optional dependency.
PKG_CHECK_MODULES([SODIUM], [libsodium],
Expand Down
6 changes: 0 additions & 6 deletions doc/manual/introduction/about-nix.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,6 @@ xlink:href="http://nixos.org/">NixOS homepage</link>.</para>
xlink:href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
LGPLv2.1 or (at your option) any later version</link>.</para>

<para>Nix uses the <link
xlink:href="https://github.com/arangodb/linenoise-ng">linenoise-ng
library</link>, which has the following license:</para>

<programlisting><xi:include href="../../../src/linenoise/LICENSE" parse="text" /></programlisting>

</simplesect>


Expand Down
24 changes: 24 additions & 0 deletions editline.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:

stdenv.mkDerivation rec {
name = "editline-${version}";
version = "1.16.0";
src = fetchFromGitHub {
owner = "troglobit";
repo = "editline";
rev = version;
sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2";
};

nativeBuildInputs = [ autoreconfHook ];

dontDisableStatic = true;

meta = with stdenv.lib; {
homepage = http://troglobit.com/editline.html;
description = "A readline() replacement for UNIX without termcap (ncurses)";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.all;
};
}
4 changes: 3 additions & 1 deletion release-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ rec {
'';
});

editline = pkgs.editline or (pkgs.callPackage ./editline.nix {});

configureFlags =
[
"--enable-gc"
Expand All @@ -49,7 +51,7 @@ rec {

buildDeps =
[ curl
bzip2 xz brotli
bzip2 xz brotli editline
openssl pkgconfig sqlite boehmgc
boost

Expand Down
Loading