aszlig
29f535761a
tests/virtualbox: Use antiquotes for log sockets.
...
We're simply using antiquotation, since it's been a while since these
got introduced (in Nix 1.7). So we can use them because it makes the
code much more readable.
As usual, I made sure that I didn't accidentally change something in
functionality:
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
aszlig
17f58275a0
tests/virtualbox: Fix long line in guestAdditions.
...
This is essentially not only "wrapping" the line but refactoring into a
shorter name which is used in two places.
And yes, I know I'm very pedantic if it comes to whitespaces and line
lengths, but I made sure this doesn't change any functionality:
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
aszlig
8f98226f50
tests/virtualbox: Allow to call it with debug attr.
...
Instead of manually setting debug to true or false, this should make it
possible to now run the test like this:
nix-build nixos/tests/virtualbox.nix --arg debug true
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
Vladimír Čunát
485ea9a621
xf86_video_nouveau: deprecate this alias
2015-09-17 09:11:18 +02:00
Matthias Beyer
a38d9d1ca8
nixos-container: Add bash completion for "nixos-container" command
2015-09-16 22:18:48 +02:00
Domen Kožar
122efd93d0
Merge pull request #9880 from mbbx6spp/add-package-option-elasticsearch-module
...
elasticsearch module: add package option
2015-09-16 10:48:16 +02:00
Florian Baumann
88a3951926
mlmmj: Fix invalid mailman entry and update transports and virtual dbs on activation
2015-09-16 09:31:38 +02:00
aszlig
0d4a3ce485
tests/virtualbox: Give test machines more memory.
...
Sometimes there are random kernel panics do to the lack of memory in the
qemu guests, but as we're setting the VirtualBox memory size relatively
low, 1024 MB should be enough for the qemu guests.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-16 00:19:52 +02:00
aszlig
7707c7df7f
tests/virtualbox: Start systemwide DBus in guests.
...
We want to check whether DBus functionality is working, so let's make
sure it is running in our mini-initrd.
DBus unfortunately requires to have users properly set up and another
configuration file other than in ${dbus.daemon}/etc/dbus-1/system.conf,
so we do provide that as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-16 00:19:52 +02:00
Susan Potter
79c1bbf050
Add package option to elasticsearch NixOS module
2015-09-15 15:49:04 -05:00
Luca Bruno
dfeee51818
nixos tests: add gdm test
2015-09-15 14:25:36 +02:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Tobias Geerinckx-Rice
193319ce03
"Parallel Tools" -> Parallels Tools
2015-09-15 08:51:02 +02:00
Tobias Geerinckx-Rice
4105fe0062
nixos: correct "Kubernets" -> "Kubernetes"
2015-09-15 08:51:01 +02:00
Arseniy Seroka
d9ac1c31b2
Merge pull request #9819 from gebner/xdotool-3-20150503-1
...
xdotool: 2.20110530.1 -> 3.20150503.1
2015-09-14 17:40:49 +03:00
Luca Bruno
c94a625585
nixos gdm: use AutomaticLogin if delay is zero. Closes #9843
2015-09-14 08:48:53 +00:00
Luca Bruno
6644af5910
nixos gdm: add debug option
2015-09-14 08:33:44 +00:00
William A. Kennington III
c2e4fb29c6
nixos/lxd: Add service
2015-09-13 23:27:31 -07:00
Tobias Geerinckx-Rice
b6c24c12b4
nixos: samba module: fix typo & clarify
2015-09-14 02:51:39 +02:00
Matej Cotman
8a79bdddf8
Merge pull request #9825 from ericsagnes/connman-conf
...
connman: improved configuration
2015-09-13 14:30:33 +02:00
Geoffrey Reedy
9d3da3a3bf
nixos i18n: add option to set console keymap from xkb
...
Close #9675 . The expression was refactored heavily by vcunat.
2015-09-13 11:02:16 +02:00
Mathnerd314
87012187b2
kmod-debian-aliases: init at 21-1
2015-09-13 10:55:44 +02:00
Eric Sagnes
095bf185ec
connman: improved configuration support
2015-09-12 23:31:50 +09:00
Gabriel Ebner
50b1ca6dcc
xdotool: 2.20110530.1 -> 3.20150503.1
2015-09-12 13:18:31 +02:00
Nikolay Amiantov
a2f246770e
Merge pull request #9782 from abbradar/deluge-restart
...
nixos/deluge: restart daemon if it's stopped from GUI
2015-09-12 00:03:13 +03:00
Eelco Dolstra
9ad5315b52
Merge pull request #9772 from lethalman/containers
...
nixos containers: fix system path when reloading
2015-09-11 18:25:16 +02:00
Edward Tjörnhammar
d3cff630ac
Merge pull request #9792 from noqqe/master
...
mlmmj: postfix master config uses deprecated nextHop instead of nexthop
2015-09-11 18:15:38 +02:00
Arseniy Seroka
cb90dbfafe
Merge pull request #9745 from bramd/brltty
...
Brltty
2015-09-11 19:13:58 +03:00
Edward Tjörnhammar
8b0aa65c67
Merge pull request #9793 from noqqe/mlmmj-fix-customheaders
...
mlmmj: fixing reply-to field in customheaders
2015-09-11 18:05:30 +02:00
Luca Bruno
682777ed24
nixos containers: fix system path when reloading
2015-09-11 16:59:40 +02:00
Florian Baumann
3ea6eda04e
mlmmj: fixing reply-to field in customheaders
2015-09-11 14:28:47 +02:00
Florian Baumann
7adb779d1f
mlmmj: postfix master config uses deprecated nextHop instead of nexthop
2015-09-11 13:27:15 +02:00
Nikolay Amiantov
0570ea2169
nixos/deluge: restart daemon if it's stopped from GUI
2015-09-11 01:32:21 +03:00
Paul Wilson
d2ca8b4079
gitit service: check null github auth options
2015-09-10 17:32:30 +00:00
Paul Wilson
dbd125b055
gitit service: add github authentication
2015-09-10 17:32:30 +00:00
Arseniy Seroka
38ed88538d
Merge pull request #9773 from basvandijk/wordpress-extraHtaccess
...
wordpress: allow extending Wordpress's .htaccess file
2015-09-10 19:18:00 +03:00
Thomas Strobel
684cd17ff5
dnschain nixos module: init
2015-09-10 18:11:40 +02:00
Thomas Strobel
8db7c14e56
namecoind nixos module: security enhancements
2015-09-10 18:11:40 +02:00
Bas van Dijk
5cf5e7ff4c
wordpress: allow extending Wordpress's .htaccess file
2015-09-10 13:21:38 +02:00
Peter Simons
7690891ea4
nixos: give users of 'services.openvpn.enable' a nice warning message
2015-09-10 11:38:43 +02:00
Luca Bruno
f4b7be4f04
nixos ntpd: allow passing extra flags
2015-09-10 10:58:13 +02:00
Peter Simons
64eb5527ba
nixos: remove the obsolete 'services.openvpn.enable' option
...
OpenVPN is enabled implicitly when configuring 'services.openvpn.servers', so the
"enable" option is meaningless since b2910df04e
.
Closes https://github.com/NixOS/nixpkgs/issues/9764 .
2015-09-10 10:38:38 +02:00
Bram Duvigneau
18acb80b82
Brltty service: simplified systemd service definition, now it matches
...
the
variant that has been developed upstream. Now the BRLTTY service comes up reliably on boot.
2015-09-09 22:40:12 +02:00
Joachim Schiele
bb546ca4a8
Merge pull request #9703 from basvandijk/wordpress-upgrade
...
wordpress: 4.2.2 -> 4.3
2015-09-09 12:47:38 +02:00
Arseniy Seroka
90a7bb69d0
Merge pull request #9711 from anderspapitto/bitlbee
...
plugin support for bitlbee, and facebook plugin
2015-09-09 03:03:53 +03:00
Anders Papitto
78f7a09e3a
bitlbee service: enable plugins
2015-09-08 14:24:50 -07:00
Thomas Strobel
cb4bea5f97
namecoind nixos module: fix environment variable
2015-09-08 22:37:10 +02:00
Thomas Strobel
b6fb760484
namecoind nixos module: init
2015-09-08 20:17:52 +02:00
Thomas Strobel
5e21271af0
dnsmasq nixos module: fix path in systemd service
2015-09-08 19:33:01 +02:00
Eelco Dolstra
c904dfa87c
nixos-container: Fix show-host-key
...
We don't generate ecdsa keys by default anymore, so print ed25519
instead if available.
2015-09-08 15:57:49 +02:00
Arseniy Seroka
0236bd6590
Merge pull request #9696 from basvandijk/mysql-hostname-fix
...
Bring hostname into scope needed by mysql_install_db
2015-09-08 13:27:48 +03:00
Bas van Dijk
88d9fd93c6
wordpress: 4.2.2 -> 4.3
2015-09-08 10:36:44 +02:00
Bas van Dijk
1f1e02daad
mysql: add nettools to path
...
The mysql_install_db command, called in preStart, needs the hostname command.
2015-09-08 10:32:37 +02:00
Eelco Dolstra
3ebe5f802b
Remove references to /root/test-firmware
...
This is no longer supported by systemd.
2015-09-07 22:55:16 +02:00
obadz
afdfe76bbd
nixos: environment.pathsToLink += some desktop dirs
...
Close #9622 .
(adding common desktop locations and locations specified in
http://standards.freedesktop.org/menu-spec/1.1/ )
2015-09-07 21:16:23 +02:00
Domen Kožar
ba5919ef3b
nginx: include mimetypes mapping
...
(cherry picked from commit b01eebf021
)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-07 14:43:19 +02:00
Domen Kožar
71e67797d6
Revert "reverse_proxy module: helper to run nginx as reverse proxy"
...
This reverts commit e6f0cd336d
.
These modifications are too specific to use cases and shouldn't be part of
nginx module.
2015-09-07 14:18:31 +02:00
Tobias Geerinckx-Rice
5d8f61a660
nixos: sitecopy service: re-format descriptions
2015-09-07 01:25:54 +02:00
Tobias Geerinckx-Rice
18851071e6
nixos: bacula service: re-format descriptions
2015-09-07 01:12:26 +02:00
Tobias Geerinckx-Rice
45b86d6981
nixos: cdemu service: mark up & tweak descriptions
2015-09-07 00:47:18 +02:00
Tobias Geerinckx-Rice
c90eb862fc
nixos: prey module: fix option descriptions
2015-09-06 23:50:03 +02:00
Tobias Geerinckx-Rice
24048fa226
nixos: redshift module: add package
option
...
...and make code more consistent.
2015-09-06 23:50:02 +02:00
Tobias Geerinckx-Rice
fa3d7ea77b
nixos: freefall module: add package
option
...
...and tidy up some of my old cargo-culted code.
2015-09-06 23:50:02 +02:00
Jaka Hudoklin
572ebb2f20
grafana: fix package naming
2015-09-06 15:23:31 +02:00
Jaka Hudoklin
93132d1717
logstash service: fix tests
2015-09-06 15:20:56 +02:00
Jaka Hudoklin
77356690fb
logstash service: fix startup
2015-09-06 15:20:56 +02:00
Jaka Hudoklin
a79d732243
etcd service: fix tests
2015-09-06 14:44:13 +02:00
Arseniy Seroka
fc29fe1d63
Merge pull request #9661 from noqqe/master
...
mlmmj: Fixed postfix config items to make module work again
2015-09-05 23:47:53 +03:00
Bjørn Forsman
41ae7e00d7
nixos/gdm: simplify assert expression
2015-09-05 10:23:43 +02:00
Florian Baumann
935d0e858e
mlmmj: Fixed postfix config items to make module work again
2015-09-05 10:14:48 +02:00
William A. Kennington III
8fe216dd3e
bosun: Move to go-packages
2015-09-04 21:11:42 -07:00
Rickard Nilsson
ed140ff927
bosun,scollector: Fix NixOS modules to use bin attr of go pkgs
2015-09-04 21:46:10 +02:00
lethalman
8bfacda44c
Merge pull request #9642 from Mathnerd314/power-fix
...
Remove desktopManagerHandlesLidAndPower
2015-09-04 18:09:51 +02:00
Mathnerd314
13a314ec17
Remove all explicit assignments of desktopManagerHandlesLidAndPower
2015-09-04 09:34:15 -06:00
Peter Simons
96cb733207
nix-gc.nix: Revert 'prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"'
...
This reverts commit ab6c8643d4
. Issue
https://github.com/NixOS/nix/issues/609 has been resolved, the new Nix
version is available after 86eaeb4c0a
, and
using nix-collect-garbage has the advantage that the '-d' flag is
available, which nix-store doesn't have.
2015-09-04 11:51:01 +02:00
Domen Kožar
747e7e7b42
Merge pull request #9650 from ragnard/docker-fixes
...
docker: Minor improvements, fix failing test
2015-09-04 09:55:14 +02:00
Ragnar Dahlén
9bfe92ecee
docker: Minor improvements, fix failing test
...
- Replace usage of deprecated CLI flag `--daemon`
- Introduce `storageDriver` option for module
- Fix failing test by using `overlay` storage driver
2015-09-04 00:23:38 +01:00
Bjørn Forsman
b716673f97
nixos/gdm: add assertion for the autoLogin.user option
...
Or else users may see this unfriendly message:
error: cannot coerce null to a string, at .../nixos/modules/services/x11/display-managers/gdm.nix:107:49
2015-09-03 22:30:07 +02:00
Bjørn Forsman
833b4c34c2
nixos/gdm: fix description typo
2015-09-03 22:30:07 +02:00
Eelco Dolstra
f223448d5d
Shorten inhibit message
...
This also makes it consistent with KDE's inhibit message.
2015-09-03 13:03:14 +02:00
Eelco Dolstra
882b2465c2
Remove ad hoc README
...
It's unlikely that people will see this file, so it's kind of
pointless.
2015-09-03 13:03:14 +02:00
Kovacsics Robert (NixOS-SSD2)
b22e6cb299
wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609
...
wiimenu superseded by wimenu from wmii
wmiiSnap superseded by wmii_hg
libixp_for_wmii superseded by libixp_hg
2015-09-03 12:58:24 +02:00
Kovacsics Robert (NixOS-SSD2)
553e7d49ff
wmii service: refactor to use wmii_hg
2015-09-03 12:58:11 +02:00
Domen Kožar
7bc624f572
And next release is called Emu!
...
http://img.gawkerassets.com/img/17qtp0agra45ajpg/original.jpg
2015-09-03 11:39:56 +02:00
Eelco Dolstra
6ab7e0de29
Create /var/log/journal
...
Fixes #9614 .
2015-09-03 11:35:47 +02:00
Tobias Geerinckx-Rice
e87fa04ddc
nixos: move left-behind allowUnfree comment
2015-09-03 01:17:10 +02:00
Eelco Dolstra
c090efb9d8
command-not-found: Fix nix-env invocation
2015-09-02 19:49:34 +02:00
Enrico Fasoli
44788bb2ce
fixed syncthing service to work as expected
2015-09-02 18:14:21 +02:00
Eelco Dolstra
13532ee161
command-not-found: Use attribute name
2015-09-02 17:40:19 +02:00
Eelco Dolstra
14321ae243
Rename users.extraUsers -> users.users, users.extraGroup -> users.groups
...
The "extra" part hasn't made sense for years.
2015-09-02 17:34:23 +02:00
Eelco Dolstra
6e76765795
If !cfg.mutableUsers, require a password or SSH authorized key
...
Fixes https://github.com/NixOS/nixpkgs/issues/7308
2015-09-02 16:17:33 +02:00
Eelco Dolstra
e70f8c58cc
Manual: Document system.autoUpgrade
2015-09-02 16:17:32 +02:00
Bjørn Forsman
bd84ebaa1e
nixos: document nvidia legacy driver options
2015-09-02 13:25:50 +02:00
Vladimír Čunát
54c4aab662
nixos: kill services.virtualboxGuest to fix #9600
2015-09-02 04:54:31 +02:00
Profpatsch
44c12dc0ff
desktopManagerHandlesLidAndPower default
false`
...
Changes the option and explicitely sets it for each desktopManager.
Reasoning: Currently,
services.xserver.displayManager.desktopManagerHandlesLidAndPower is set
to true by default. This creates a problem for users without desktop
environments activated, since lid management simply doesn't work
(and they have to be lucky to find this option).
See issue #9671
2015-09-01 12:14:44 +02:00
Eelco Dolstra
ea7b5bb8b0
Fix NFSv4 test
...
http://hydra.nixos.org/build/25349071
2015-09-01 12:00:04 +02:00
Vladimír Čunát
b92c4a51e6
desktop and xmonad wrappers: preferLocalBuild
...
Also no substitution.
2015-09-01 09:43:37 +02:00
Eelco Dolstra
c839c988f4
Make proxy test more robust
...
http://hydra.nixos.org/build/25322489
2015-08-31 18:36:32 +02:00
Luca Bruno
38dd4f5ce1
gnome3 test: revert back to using slim
...
GDM needs more time to load on hydra, need a better way to find out
when the user has logged in.
2015-08-31 10:36:18 +02:00
ts468
12d3de1caa
Merge pull request #9103 from ts468/upstream.nginx
...
reverse_proxy module: helper to run nginx as reverse proxy
2015-08-30 18:32:07 +02:00
Daniel Fox Franke
fc96dbb1a2
oidentd: listen on IPv6
2015-08-30 10:53:08 -04:00
William A. Kennington III
83cf8b0cf8
goPackages: Split into multiple derivations
...
This should reduce the closure size for end users who only need go
binaries as well as reduce the size of closures hydra builders consume.
2015-08-29 12:58:03 -07:00
Jaka Hudoklin
be1d6923a8
Merge pull request #9528 from offlinehacker/nixos/openvswitch/startup_fix
...
openvswitch service: fix ipsec startup order
2015-08-29 19:19:56 +02:00
Jaka Hudoklin
eaaad0deea
Merge pull request #9527 from offlinehacker/nixos/kube/options
...
kubernetes service: add a few options
2015-08-29 19:19:23 +02:00
Jaka Hudoklin
c65cdcf722
kubernetes service: add a few options
2015-08-29 19:18:38 +02:00
Jaka Hudoklin
c7bb64cb97
Merge pull request #7344 from joachifm/apparmor-pam
...
nixos: add AppArmor PAM support
2015-08-29 18:59:53 +02:00
Jaka Hudoklin
29c0262708
openvswitch service: fix ipsec startup order
2015-08-29 18:21:43 +02:00
Eelco Dolstra
1852e65776
Fix tests that use the Valgrind docs
2015-08-28 13:27:51 +02:00
Eelco Dolstra
9d82f7e53e
Revert "Apache service module: allow compression"
...
This reverts commit 164f6ff2a8
per
https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359
(it's too site-specific). Furthermore this should be an option at the
virtual host level.
2015-08-28 12:41:06 +02:00
Luca Bruno
d7d619f2cb
nixos gdm: fix enable description
2015-08-28 10:36:25 +02:00
Thomas Strobel
e6f0cd336d
reverse_proxy module: helper to run nginx as reverse proxy
2015-08-28 09:33:08 +02:00
Edward Tjörnhammar
7f3566da8a
services.xserver.displayManager.gdm.autoLogin: add description
2015-08-28 05:55:56 +02:00
Luca Bruno
119a6ef543
gnome3 test: use gdm with autologin instead of slim
2015-08-27 18:11:40 +02:00
Luca Bruno
6eb096900f
nixos gdm: support autologin
2015-08-27 18:11:39 +02:00
Eelco Dolstra
f6eece6f8f
programs.ssh.knownHosts: Use attribute name
...
This allows writing:
programs.ssh.knownHosts."10.1.2.3".publicKey = "bar";
instead of
programs.ssh.knownHosts = [ { hostNames = [ "10.1.2.3" ]; publicKey = "bar"; } ];
2015-08-27 15:32:46 +02:00
Eelco Dolstra
7c6ff6c1da
programs.ssh.knownHosts: Use submodule
2015-08-27 15:32:46 +02:00
Eelco Dolstra
287c08d8a3
Rename services.openssh.knownHosts -> programs.ssh.knownHosts
...
This option configures the SSH client, not the server.
2015-08-27 15:32:46 +02:00
Eelco Dolstra
d4ccd68648
Rename rl-unstable.xml -> rl-1509.xml
2015-08-27 11:50:45 +02:00
Jascha Geerds
ab70c601b6
cups: Fix printing test
2015-08-27 09:24:45 +02:00
Boris Sukholitko
ae80c3e7bc
containers: fix interfaces option bugs
...
The default should be [], no need to check it for INTERFACES
variable.
2015-08-26 22:11:12 +03:00
Eelco Dolstra
1e18b75170
Prefer local build for the test driver script
2015-08-26 15:04:47 +02:00
lethalman
a45a0911d4
Merge pull request #9376 from rick68/softether
...
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
lethalman
d025500186
Merge pull request #9383 from anderspapitto/master
...
also generate startAt timers for systemd user units
2015-08-26 10:42:44 +02:00
lethalman
3aed00d593
Merge pull request #9395 from bosu/cont-ifaces
...
containers: add interfaces config option.
2015-08-26 10:41:21 +02:00
lethalman
207f51a5e1
Merge pull request #9439 from noqqe/master
...
fixed: mlmmj-recieve: No such file or directory
2015-08-25 15:37:42 +02:00
Florian Baumann
d43496300e
fixed: mlmmj-recieve: No such file or directory
2015-08-25 15:27:58 +02:00
Eelco Dolstra
aa3b13549f
Grmbl
...
http://hydra.nixos.org/build/24983009
2015-08-25 11:26:38 +02:00
Eelco Dolstra
87789ac39d
Hide services.dbus.enable
...
Realistically, you can't disable D-Bus on a modern system.
2015-08-25 11:07:31 +02:00
Wout Mertens
660cafe69a
Merge pull request #9407 from wmertens/apache-deflate
...
Apache service module: allow compression
2015-08-25 07:36:27 +02:00
Eelco Dolstra
e4610f2965
buildEnv: Support package priorities like nix-env
...
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
Eelco Dolstra
9c61317002
Put all firmware in $out/lib/firmware
...
This way, hardware.firmware can be a list of packages.
2015-08-25 00:40:34 +02:00
Eelco Dolstra
779e585549
chromium: Fix test on i686-linux
...
http://hydra.nixos.org/build/24982682
2015-08-24 11:05:01 +02:00
Wout Mertens
164f6ff2a8
Apache service module: allow compression
2015-08-23 15:13:52 +02:00
Charles Strahan
648973d641
nixos: rename service 'ubuntu-fan' as 'fan'
2015-08-22 14:05:35 -04:00
Boris Sukholitko
77c49d9333
containers: add interfaces config option.
...
It uses systemd-nspawn's --network-interface to move
existing interfaces into the container.
2015-08-22 13:03:07 +03:00
Jaka Hudoklin
46203a790d
kubernetes service: fix option conversion
2015-08-21 20:55:40 +02:00
Anders Papitto
57f7798b51
also generate startAt timers for systemd user units
2015-08-20 23:46:08 -07:00
Wei-Ming Yang
efd34824eb
softether: support SoftEther VPN 4.18
2015-08-21 13:59:00 +08:00
Peter Simons
ab6c8643d4
nix-gc.nix: prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"
...
Works around https://github.com/NixOS/nix/issues/609 .
2015-08-20 22:56:41 +02:00
Eelco Dolstra
d1c30dc5aa
Give the chromium test more memory
...
Hopefully fixes random failures like
http://hydra.nixos.org/build/24861987/nixlog/446
2015-08-20 20:34:35 +02:00
Eelco Dolstra
401782cb67
Revert "openssh: 6.9p1 -> 7.0p1"
...
This reverts commit a8eb2a6a81
. OpenSSH
7.0 is causing too many interoperability problems so soon before the
15.08 release.
For instance, it causes NixOps EC2 initial deployments to fail with
"REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client
knows the server's ssh-dss host key, but this key is no longer
accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does
not work because it causes ssh-dss to be ordered after
"ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh
prioritizes host key algorithms for which the client has a known host
key, but not if you set HostKeyAlgorithms.)
2015-08-20 14:08:18 +02:00
aszlig
0ed0669699
nixos/tests/lightdm: Drop "session" screenshot.
...
Using waitForWindow on the IceWM root window doesn't necessarily mean
that the panel will be shown. In the lightdm test, we only make sure
that the login is working and thus it doesn't matter how the session
itself will look or whether IceWM is broken, so we don't need that
screenshot.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-20 12:57:40 +02:00
aszlig
fbfdafc2c9
Merge pull request #9263 from @dezgeg.
...
This looks for the window title instead of OCRing the clock from the
IceWM panel. Of course, this has the drawback, that whenever IceWM is
started it doesn't necessarily mean that the panel is also visible at
that time, so we might want to drop the screenshot of the "session" as
well.
2015-08-20 12:55:23 +02:00
Jaka Hudoklin
d06eb2951b
Merge pull request #9355 from offlinehacker/nixos/etcd/fixstart
...
etcd service: do not wait for cluster up
2015-08-20 02:26:49 +02:00
Jaka Hudoklin
40582b68f4
Merge pull request #9354 from offlinehacker/nixos/skydns/fixdns
...
skydns service: fix skydns nameservers env option
2015-08-20 02:26:33 +02:00
Jaka Hudoklin
e057cbe580
Merge pull request #9352 from offlinehacker/nixos/racoon/fix_start
...
nixos/racoon: create /var/racoon upon start
2015-08-20 02:26:17 +02:00
Jaka Hudoklin
86ee6c2512
etcd service: do not wait for cluster up
2015-08-20 00:02:27 +02:00
Jaka Hudoklin
ed356eefa6
skydns service: fix skydns nameservers env option
2015-08-19 23:54:54 +02:00
Jaka Hudoklin
c33d282278
kubernetes service: fix for 1.0.3
2015-08-19 23:52:19 +02:00
Jaka Hudoklin
c171cfabed
nixos/racoon: create /var/racoon upon start
2015-08-19 23:38:44 +02:00