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

Commits on Oct 29, 2018

  1. editline: wip

    @dtzWill
    dtzWill committed Oct 29, 2018
    Copy the full SHA
    3d974d3 View commit details

  2. repl: complete if all matches share prefix

    @dtzWill
    dtzWill committed Oct 29, 2018
    Copy the full SHA
    9f99809 View commit details

  3. editline: 1.15.3 -> 1.16.0 

    Bump fallback editline expression to latest in nixpkgs.
    @dtzWill
    dtzWill committed Oct 29, 2018
    Copy the full SHA
    2a8bdfd View commit details

Commits on Nov 13, 2018

  1. Merge branch 'feature/editline-pr' of https://github.com/dtzWill/nix

    @edolstra
    edolstra committed Nov 13, 2018
    Copy the full SHA
    6c6bbeb View commit details

  2. Remove editline expression, not needed anymore

    @edolstra
    edolstra committed Nov 13, 2018
    Copy the full SHA
    9dc9b64 View commit details
Showing with 81 additions and 4,648 deletions.
  1. +1 −0 Makefile.config.in
  2. +2 −0 configure.ac
  3. +0 −6 doc/manual/introduction/about-nix.xml
  4. +1 −1 release-common.nix
  5. +0 −542 src/linenoise/ConvertUTF.cpp
  6. +0 −162 src/linenoise/ConvertUTF.h
  7. +0 −66 src/linenoise/LICENSE
  8. +0 −3,450 src/linenoise/linenoise.cpp
  9. +0 −73 src/linenoise/linenoise.h
  10. +0 −315 src/linenoise/wcwidth.cpp
  11. +1 −2 src/nix/local.mk
  12. +76 −31 src/nix/repl.cc
1 change: 1 addition & 0 deletions Makefile.config.in
View file
Original file line number Diff line number Diff line change
@@ -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@
2 changes: 2 additions & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -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],
6 changes: 0 additions & 6 deletions doc/manual/introduction/about-nix.xml
View file
Original file line number Diff line number Diff line change
@@ -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>


2 changes: 1 addition & 1 deletion release-common.nix
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ rec {

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

Loading