Skip to content

[Needs testing and review] Remove dead code #2612

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

Merged
edolstra merged 4 commits into from
Jan 7, 2019
Merged

[Needs testing and review] Remove dead code #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
318153f
Remove dead code computing `dynlib_suffix` from comfigure.ac
Ericson2314 Jan 5, 2019
e10d6ed
brotli is only used as a library now
Ericson2314 Jan 5, 2019
fef9f56
Remove mentions of `libformat`, it no longer exists
Ericson2314 Jan 5, 2019
2733287
Don't look for a "pv" program, or mention it in the manual source
Ericson2314 Jan 7, 2019
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: 0 additions & 1 deletion Makefile.config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ LIBBROTLI_LIBS = @LIBBROTLI_LIBS@
EDITLINE_LIBS = @EDITLINE_LIBS@
bash = @bash@
bindir = @bindir@
brotli = @brotli@
lsof = @lsof@
datadir = @datadir@
datarootdir = @datarootdir@
Expand Down
7 changes: 0 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ NEED_PROG(bzip2, bzip2)
NEED_PROG(gzip, gzip)
NEED_PROG(xz, xz)
AC_PATH_PROG(dot, dot)
AC_PATH_PROG(pv, pv, pv)
AC_PATH_PROGS(brotli, brotli bro, bro)
AC_PATH_PROG(lsof, lsof, lsof)


Expand Down Expand Up @@ -253,11 +251,6 @@ if test "$(uname)" = "Darwin"; then
fi


# Figure out the extension of dynamic libraries.
eval dynlib_suffix=$shrext_cmds
AC_SUBST(dynlib_suffix)


# Do we have GNU tar?
AC_MSG_CHECKING([if you have a recent GNU tar])
if $tar --version 2> /dev/null | grep -q GNU && tar cvf /dev/null --warning=no-timestamp ./config.log > /dev/null; then
Expand Down
9 changes: 0 additions & 9 deletions doc/manual/command-ref/nix-copy-closure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,6 @@ those paths. If this bothers you, use

</varlistentry>

<!--
<varlistentry><term><option>- -show-progress</option></term>

<listitem><para>Show the progress of each path's transfer as it's made.
This requires the <command>pv</command> utility to be in <envar>PATH</envar>.</para></listitem>

</varlistentry>
-->

<varlistentry><term><option>--include-outputs</option></term>

<listitem><para>Also copy the outputs of store derivations
Expand Down
2 changes: 1 addition & 1 deletion src/libexpr/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ libexpr_DIR := $(d)

libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc

libexpr_LIBS = libutil libstore libformat
libexpr_LIBS = libutil libstore

libexpr_LDFLAGS =
ifneq ($(OS), FreeBSD)
Expand Down
2 changes: 1 addition & 1 deletion src/libmain/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ libmain_SOURCES := $(wildcard $(d)/*.cc)

libmain_LDFLAGS = $(OPENSSL_LIBS)

libmain_LIBS = libstore libutil libformat
libmain_LIBS = libstore libutil

libmain_ALLOW_UNDEFINED = 1

Expand Down
2 changes: 1 addition & 1 deletion src/libstore/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ libstore_DIR := $(d)

libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc)

libstore_LIBS = libutil libformat
libstore_LIBS = libutil

libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
ifneq ($(OS), FreeBSD)
Expand Down
4 changes: 0 additions & 4 deletions src/libutil/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@ libutil_DIR := $(d)
libutil_SOURCES := $(wildcard $(d)/*.cc)

libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context

libutil_LIBS = libformat

libutil_CXXFLAGS = -DBROTLI=\"$(brotli)\"
2 changes: 1 addition & 1 deletion src/nix/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nix_SOURCES := \
$(wildcard src/nix-prefetch-url/*.cc) \
$(wildcard src/nix-store/*.cc) \

nix_LIBS = libexpr libmain libstore libutil libformat
nix_LIBS = libexpr libmain libstore libutil

nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS)

Expand Down
2 changes: 1 addition & 1 deletion src/resolve-system-dependencies/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ resolve-system-dependencies_DIR := $(d)

resolve-system-dependencies_INSTALL_DIR := $(libexecdir)/nix

resolve-system-dependencies_LIBS := libstore libmain libutil libformat
resolve-system-dependencies_LIBS := libstore libmain libutil

resolve-system-dependencies_SOURCES := $(d)/resolve-system-dependencies.cc