diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-01-13 01:40:04 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-13 01:40:04 +0100 |
commit | 6764f94317be05d2c3b08acdcbb2c4730f0c617d (patch) | |
tree | adcfd0000cbe9a8c614181e39d7cbe7f1e1bc164 /tests/guix-system.sh | |
parent | 67ff2bdf6100cc887b0d5aebbcd1f539c634a3dc (diff) | |
parent | 1710ffa4c79c79079ebd4e523eef8883eb2d3953 (diff) | |
download | guix-6764f94317be05d2c3b08acdcbb2c4730f0c617d.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'tests/guix-system.sh')
-rw-r--r-- | tests/guix-system.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 23d2da4903..adb623d244 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> # Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> # @@ -258,7 +258,9 @@ cat > "$tmpdir/config.scm"<<EOF (operating-system $OS_BASE - (services (cons (tor-service (local-file "my-torrc")) + (services (cons (service tor-service-type + (tor-configuration + (config-file (local-file "my-torrc")))) %base-services))) EOF |