cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove references to xmllint

Browse source
This commit is contained in:
Eelco Dolstra 2020-07-22 20:46:12 +02:00
parent e0ea3c82ca
commit 8e41c38867
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.config.in
View file

@ -41,5 +41,3 @@ sandbox_shell = @sandbox_shell@
storedir = @storedir@ storedir = @storedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
system = @system@ system = @system@
xmllint = @xmllint@
xsltproc = @xsltproc@

2
doc/manual/local.mk
View file

@ -25,8 +25,6 @@ clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
dist-files += $(man-pages) dist-files += $(man-pages)
$(d)/nix-copy-closure.1: $(d)/src/command-ref/nix-copy-closure.md $(d)/nix-copy-closure.1: $(d)/src/command-ref/nix-copy-closure.md
%.1: %.md
$(trace-gen) lowdown -sT man $^ -o $@ $(trace-gen) lowdown -sT man $^ -o $@
# Generate the HTML manual. # Generate the HTML manual.

1
tests/common.sh.in
View file

@ -32,7 +32,6 @@ export PATH=@bindir@:$PATH
coreutils=@coreutils@ coreutils=@coreutils@
export dot=@dot@ export dot=@dot@
export xmllint="@xmllint@"
export SHELL="@bash@" export SHELL="@bash@"
export PAGER=cat export PAGER=cat
export HAVE_SODIUM="@HAVE_SODIUM@" export HAVE_SODIUM="@HAVE_SODIUM@"

6
tests/nix-channel.sh
View file

@ -28,9 +28,6 @@ nix-channel --update
# Do a query. # Do a query.
nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml
if [ "$xmllint" != false ]; then
$xmllint --noout $TEST_ROOT/meta.xml || fail "malformed XML"
fi
grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml
grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml
@ -47,9 +44,6 @@ nix-channel --update
# Do a query. # Do a query.
nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml
if [ "$xmllint" != false ]; then
$xmllint --noout $TEST_ROOT/meta.xml || fail "malformed XML"
fi
grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml
grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml