John Ericson
85cbf2e6e7
nixos/netboot: Remove redundant setting
...
@volth tells me that is the default for `system.boot.loader.kernelFile` anyways.
2018-08-20 16:52:24 -04:00
Joachim F
69d3bdfa16
Merge pull request #44631 from dasJ/terraria
...
nixos/terraria: Wait for daemon to stop
2018-08-20 20:23:34 +00:00
Janne Heß
943786eccf
nixos/terraria: Wait for daemon to stop
2018-08-20 21:41:29 +02:00
John Ericson
7d85ade0cc
treewide: Purge stdenv.platform and top-level platform
...
Progress towards #27069
2018-08-20 15:22:46 -04:00
John Ericson
f0d6e22b7f
Merge pull request #45397 from volth/patch-233
...
$toplevel/system: buildPlatform.system -> hostPlatform.system
2018-08-20 14:36:13 -04:00
volth
72f5078beb
top-level.nix: stdenv.platform -> stdenv.hostPlatform.platform
...
because stdenv.platform is stdenv.buildPlatform.platform
2018-08-20 18:20:57 +00:00
volth
6efaa88fcc
$toplevel/system: buildPlatform.system -> hostPlatform.system
2018-08-20 18:12:13 +00:00
Jake Woods
64223a2c1b
nixos/thermald: add manual config file
...
thermald has two modes: zero-config and manual. Sometimes it is useful
to manually configure thermald to achieve better thermal results or to give
thermald a hand when detecting possible cooling options.
2018-08-19 15:54:42 +10:00
Silvan Mosberger
eacaaa2161
Merge pull request #44880 from srghma/build-max-jobs-auto
...
nixos/nix-daemon: build-max-jobs, add support to auto
2018-08-18 16:46:08 +02:00
srghma
37e2ebdfbc
nixos/nix-daemon: build-max-jobs, add support to auto
2018-08-18 14:45:12 +03:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next
...
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Tuomas Tynkkynen
58dc26180f
nixos: Fix iso_graphical evaluation
...
I broke it:
in job ‘nixos.iso_graphical.x86_64-linux’:
The option `services.udisks2.enable' has conflicting definitions, in `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/profiles/installation-device.nix' and `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/services/x11/desktop-managers/plasma5.nix'.
2018-08-17 07:43:58 +03:00
Tuomas Tynkkynen
571fb74f44
installer: Disable udisks
...
Due to whoever-knows-what, udisks nowadays pulls in GTK+ et al. But it
shouldn't be needed anyway in the installer, so disable it.
2018-08-17 06:56:51 +03:00
Silvan Mosberger
be34fdfa89
Merge pull request #45078 from Izorkin/syslog-ng-reload-fix
...
syslog-ng: fix reload service
2018-08-16 18:11:52 +02:00
Izorkin
e4f4589186
syslog-ng: fix reload service
2018-08-16 18:23:58 +03:00
Jan Tojnar
6f8fe25ccf
Merge pull request #45107 from mnacamura/lightdm-accountsservice
...
lightdm: enable the accounts daemon to find dbus interface
2018-08-16 17:15:05 +02:00
Silvan Mosberger
ed2148b5af
Merge pull request #44238 from jfrankenau/samba-conf-override
...
nixos/samba: allow dummy conf file to be overridden
2018-08-16 16:56:24 +02:00
Silvan Mosberger
d3c5a9bf17
Merge pull request #40747 from WhittlesJr/synergy-fix
...
services.synergy: Use graphical target (fixes #9468 )
2018-08-16 16:55:38 +02:00
Jan Tojnar
7bfb3e163e
Merge pull request #45095 from worldofpeace/zeitgeist-service
...
nixos/zeitgeist: init
2018-08-16 15:02:06 +02:00
Alex Whitt
9a63f51454
nixos/synergy: Use graphical target ( fixes #9468 )
2018-08-16 08:53:45 -04:00
Mitsuhiro Nakamura
7fbdd7fcf4
lightdm: enable the accounts daemon to find dbus interface
2018-08-16 21:52:25 +09:00
Mitsuhiro Nakamura
6c84945099
lightdm: fix typos
2018-08-16 21:52:25 +09:00
Sarah Brofeldt
78fb4bd644
nixos/qemu-vm: Don't explicitly mknod /dev/vda*
...
And don't need to source the uevent files anymore either since $MAJOR
or $MINOR aren't used elsewhere.
[dezgeg: The reason these are no longer needed is that 0d27df280f
2018-08-16 14:19:41 +03:00
Jörg Thalheim
3d36e7c1fa
Merge pull request #44233 from jfrankenau/networkd-fix-options
...
nixos/networkd: add missing options
2018-08-16 11:18:18 +02:00
Mitsuhiro Nakamura
7952b51461
accountsservice: fix a bug
2018-08-16 18:00:58 +09:00
Johannes Frankenau
b2f1790070
nixos/networkd: add missing options
2018-08-16 10:27:34 +02:00
Johannes Frankenau
51169880bd
nixos/samba: allow dummy conf file to be overridden
...
This allows configuring samba clients on systems without a samba server.
2018-08-16 10:24:09 +02:00
Jörg Thalheim
5bf43e47d3
Merge pull request #45098 from Chiiruno/dev/hydron
...
Fix hydron service, update hydron and meguca
2018-08-16 10:10:27 +02:00
Okina Matara
aba87b85ef
nixos/hydron: Various tweaks
...
Make timer persistent
Start timer after hydron
Change interval from hourly to weekly
2018-08-15 22:00:13 -05:00
worldofpeace
48a765e641
nixos/zeitgeist: init
2018-08-15 20:05:00 -04:00
Izorkin
300fe1cc9a
syslog-ng: fix reload service
2018-08-16 00:05:35 +03:00
Samuel Leathers
67b1cbb39d
Merge pull request #40399 from rvl/datadog-agent
...
DataDog Agent v6
2018-08-15 15:53:03 -04:00
Jörg Thalheim
34c7d06db8
Merge pull request #45073 from Izorkin/syslog-ng
...
syslog-ng: enable reload service
2018-08-15 19:31:19 +02:00
Izorkin
c2b24892b0
syslog-ng: enable reload service
2018-08-15 19:46:47 +03:00
(cdep)illabout
e04e92d38b
Merge remote-tracking branch 'origin/master' into vbox-extpack
2018-08-16 00:40:09 +09:00
Jan Tojnar
fe51bf322c
Merge pull request #44820 from michaelpj/fix/redshift-geoclue-agents
...
redshift/geoclue/localtime: progress in fixing agent confusion
2018-08-14 17:13:09 +02:00
Michael Peyton Jones
80d4fa725b
localtime: simplify module a little
2018-08-14 15:55:05 +01:00
Michael Peyton Jones
316669327c
geoclue2 service: add option to run demo agent
2018-08-14 15:55:04 +01:00
Michael Peyton Jones
a1762065c3
redshift: install desktop files, and use absolute paths in them to avoid confusing geoclue agent
2018-08-14 15:53:39 +01:00
Jörg Thalheim
93f9b7069a
Merge pull request #45012 from Mic92/zfs
...
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
2018-08-14 14:39:04 +02:00
Jörg Thalheim
4360a87c45
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
...
spl was merged into zfs master
2018-08-14 14:12:07 +02:00
Franz Pletz
0371570807
Merge pull request #44524 from vincentbernat/fix/dhcpcd-systemd
...
dhcpcd service: order before network target
2018-08-13 20:24:22 +00:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next
...
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.
Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Jörg Thalheim
43595c7884
zfsLegacyCrypto: remove
...
This package was only mandatory for migration for people on zfsUnstable
in nixos unstable.
2018-08-13 19:53:50 +02:00
Alyssa Ross
98b8d4cfbc
environment.extraInit: fix description typo
2018-08-13 14:28:52 +01:00
Sarah Brofeldt
b4d15afe02
Merge pull request #44876 from eadwu/display-managers/pulseaudio-rely-on-socket
...
nixos/display-managers: rely on socket to activate pulseaudio
2018-08-12 22:23:45 +02:00
Jan Tojnar
f496d26247
Merge pull request #44651 from jtojnar/gobby
...
gobby5: fix build
2018-08-12 17:25:07 +02:00
Silvan Mosberger
8fb7ab9b32
Merge pull request #43282 from Ma27/support-external-zsh-plugins
...
nixos/ohMyZsh: allow multiple derivations in `ZSH_CUSTOM`
2018-08-12 16:47:12 +02:00
Thibault Polge
d470a407eb
nixos/systemd-boot: Add missing newline
...
This fixes an issue where setting both
`boot.loader.systemd-boot.editor` to `false` and
`boot.loader.systemd-boot.consoleMode` to any value would concatenate
the two configuration lines in the output, resulting in an invalid
`loader.conf`.
2018-08-12 15:12:27 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
...
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
