lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Urgggh

Browse source 
http://hydra.nixos.org/build/3661100
This commit is contained in:
Eelco Dolstra 2013-01-02 23:52:15 +01:00
parent f12492c66d
commit 0a4e90395c
7 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -354,7 +354,6 @@ fi
AC_SUBST(tarFlags) AC_SUBST(tarFlags)
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile

2
release.nix
View file

@ -94,6 +94,8 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
makeFlags = "profiledir=$(out)/etc/profile.d";
installFlags = "sysconfdir=$(out)/etc"; installFlags = "sysconfdir=$(out)/etc";
doInstallCheck = true; doInstallCheck = true;

6
scripts/Makefile.am
View file

@ -7,9 +7,11 @@ noinst_SCRIPTS = nix-profile.sh \
find-runtime-roots.pl build-remote.pl nix-reduce-build \ find-runtime-roots.pl build-remote.pl nix-reduce-build \
copy-from-other-stores.pl nix-http-export.cgi copy-from-other-stores.pl nix-http-export.cgi
profiledir = $(sysconfdir)/profile.d
install-exec-local: download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl find-runtime-roots.pl install-exec-local: download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl find-runtime-roots.pl
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/profile.d $(INSTALL) -d $(DESTDIR)$(profiledir)
$(INSTALL_DATA) nix-profile.sh $(DESTDIR)$(sysconfdir)/profile.d/nix.sh $(INSTALL_DATA) nix-profile.sh $(DESTDIR)$(profiledir)/nix.sh
$(INSTALL) -d $(DESTDIR)$(libexecdir)/nix $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix
$(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix $(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix
$(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix $(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix

1
substitute.mk
View file

@ -7,6 +7,7 @@
-e "s^@bindir\@^$(bindir)^g" \ -e "s^@bindir\@^$(bindir)^g" \
-e "s^@datadir\@^$(datadir)^g" \ -e "s^@datadir\@^$(datadir)^g" \
-e "s^@sysconfdir\@^$(sysconfdir)^g" \ -e "s^@sysconfdir\@^$(sysconfdir)^g" \
-e "s^@profiledir\@^$(profiledir)^g" \
-e "s^@localstatedir\@^$(localstatedir)^g" \ -e "s^@localstatedir\@^$(localstatedir)^g" \
-e "s^@datadir\@^$(datadir)^g" \ -e "s^@datadir\@^$(datadir)^g" \
-e "s^@libdir\@^$(libdir)^g" \ -e "s^@libdir\@^$(libdir)^g" \

2
tests/Makefile.am
View file

@ -14,6 +14,8 @@ TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \
XFAIL_TESTS = XFAIL_TESTS =
profiledir = $(sysconfdir)/profile.d
include ../substitute.mk include ../substitute.mk
$(TESTS): common.sh config.nix $(TESTS): common.sh config.nix

2
tests/common.sh.in
View file

@ -1,7 +1,7 @@
set -e set -e
datadir="@datadir@" datadir="@datadir@"
sysconfdir="@sysconfdir@" profiledir="@profiledir@"
export TEST_ROOT=$(pwd)/test-tmp export TEST_ROOT=$(pwd)/test-tmp
export NIX_STORE_DIR export NIX_STORE_DIR

4
tests/nix-profile.sh
View file

@ -3,8 +3,8 @@ source common.sh
home=$TEST_ROOT/home home=$TEST_ROOT/home
rm -rf $home rm -rf $home
mkdir -p $home mkdir -p $home
HOME=$home $SHELL -e -c ". $sysconfdir/profile.d/nix.sh" HOME=$home $SHELL -e -c ". $profiledir/nix.sh"
HOME=$home $SHELL -e -c ". $sysconfdir/profile.d/nix.sh" # test idempotency HOME=$home $SHELL -e -c ". $profiledir/nix.sh" # test idempotency
[ -L $home/.nix-profile ] [ -L $home/.nix-profile ]
[ -e $home/.nix-channels ] [ -e $home/.nix-channels ]