Oliver Matthews
2434ee4aab
Allow setting mediatomb interface
2015-06-13 15:16:28 +00:00
Luca Bruno
033605e87f
Merge branch 'nixos-subdir'
...
Conflicts:
nixos/modules/system/boot/loader/grub/grub.nix
2015-06-13 15:18:12 +02:00
Luca Bruno
c3e832b323
stage-1: mkdir -p /mnt-root, it may be created earlier by some hooks
2015-06-13 15:02:51 +02:00
Luca Bruno
3754de550f
nixos/grub: allow customization of the nix store path
2015-06-13 15:02:00 +02:00
William A. Kennington III
954801a9a8
Merge branch 'master.upstream' into staging.upstream
2015-06-12 13:47:46 -07:00
Shea Levy
5ee75e236c
apache-kafka: Enable overriding the kafka package
2015-06-12 15:56:06 -04:00
Sander van der Burg
fd187980c7
Put dysnomia in system environment if Disnix is enabled
2015-06-12 16:18:42 +00:00
Joachim Fasting
ffc6275e55
dnscrypt-proxy service: support custom providers
...
The primary use-case is private DNSCrypt providers.
Also rename the `port` option to differentiate it from the
`customResolver.port` option.
2015-06-12 15:12:33 +02:00
Joachim Fasting
8131065b63
dnscrypt-proxy service: use mkEnableOption
2015-06-12 15:12:33 +02:00
Joachim Fasting
2e8bc2bd5c
nixos: cosmetic improvements to dnscrypt-proxy service module
...
Remove superflous whitespace & comments
2015-06-12 15:12:33 +02:00
Joachim Fasting
a88a6bc676
nixos: additional hardening for dnscrypt-proxy
...
- Run as unprivileged user/group via systemd, obviating the need to
specify capabilities, etc.
- Run with private tmp and minimal device name space
2015-06-12 15:12:33 +02:00
Joachim Fasting
823bb5dd4d
nixos: implement socket-activation for dnscrypt-proxy
...
The socket definition is derived from upstream with the
exception that it does not depend on network.target, as
this creates a cycle between basic.target and sockets.target.
The apparmor profile has been updated to account for additional
runtime dependencies introduced by enabling systemd support.
2015-06-12 15:12:33 +02:00
Joachim Fasting
dfe20de782
nixos: permit dnscrypt-proxy service to read basic user/group info
...
If nscd is not running, dnscrypt-proxy crashes without read access
to /etc/{password,group,nsswitch.conf}.
2015-06-12 15:12:30 +02:00
Eelco Dolstra
07aa0f7f21
Revert "Use nixUnstable by default"
...
This reverts commit 64a41b7a90
.
2015-06-12 13:20:18 +02:00
Luca Bruno
da7748a6fc
nixos: set high fs.inotify.max_user_watches when xserver is enabled
2015-06-12 13:02:35 +02:00
Thomas Strobel
399b549611
Fix: xen-bridge systemd service
2015-06-12 12:52:14 +02:00
Thomas Strobel
a6e12c23fc
Link Xen scripts to /etc/xen
2015-06-12 12:52:14 +02:00
Dan Peebles
4b758e374e
Initial attempt at configuring from EC2 userdata (with input from cstrahan). Now with VM tests!
2015-06-11 23:16:35 -04:00
William A. Kennington III
ffcd8acee6
nixos/pulseaudio: Fix description
2015-06-11 17:26:12 -07:00
Rickard Nilsson
7a0ca52267
scollector: Change type of collectors to allow proper merging
2015-06-11 16:49:43 +02:00
William A. Kennington III
502a19b2b4
nixos/grub: Support labeling efi bootloaders with independent id's
2015-06-10 15:47:08 -07:00
Eelco Dolstra
4a57b07653
Merge remote-tracking branch 'origin/master' into staging
2015-06-11 00:18:24 +02:00
William A. Kennington III
c891134b77
nixos/grub: Prevent module errors and make gfxmode configurable
2015-06-10 11:50:35 -07:00
William A. Kennington III
aece1407d5
pulseaudio: Add a flag for supporting 32-bit
2015-06-10 11:50:35 -07:00
Daniel Peebles
6e73884c31
Merge pull request #8204 from copumpkin/modulesPath
...
An importable modulesPath, once again
2015-06-10 12:32:04 -04:00
Eelco Dolstra
d906939e74
Installer tests: Don't use the ISO
...
We already have separate tests for checking whether the ISO boots
correctly, so it's not necessary to do that here. So now
tests/installer.nix just tests nixos-install, from a regular NixOS VM
that uses the host's Nix store. This makes running the tests more
convenient because we don't have to build a new ISO after every
change.
2015-06-10 15:28:56 +02:00
Eelco Dolstra
e5db79a859
Move stuff to modules/profiles/installation-device.nix
2015-06-10 15:28:55 +02:00
Lluís Batlle i Rossell
1c22734cd2
Forcing the load of atkbd in initrd.
...
In some computers, having the module available does not really load it,
therefore, it results in not having the keyboard avaiable in initrd.
2015-06-10 12:16:25 +02:00
Rob Vermaas
6d859229e1
Remove unnecessary option. My mistake...
2015-06-10 08:36:55 +00:00
Rob Vermaas
42323dc155
Merge cwoac:mysql_socket
2015-06-10 08:31:12 +00:00
Anders Lundstedt
d5b8dda043
mediatomb: fix hardcoded paths
2015-06-10 02:32:33 +02:00
Vladimír Čunát
0b68b92062
nixos i18n.consoleFont: choose a different default
...
Distros often choose Terminus as the default, and it supports some
non-ASCII characters that we use in config. Fixes #8107 .
2015-06-09 20:13:42 +02:00
William A. Kennington III
48381b7621
nixos-artwork: Make into a derivation and use fetchfromgithub
2015-06-08 18:32:32 -07:00
William A. Kennington III
b79a5e812a
nixos/quassel: Use qt5 instead of qt4
...
This really speeds up building quassel daemon since qt5 can be built in
parallel while qt4 cannot.
2015-06-08 15:37:34 -07:00
William A. Kennington III
7464908ae4
Merge pull request #8232 from dezgeg/pr-installer-fix
...
install-cd: Include nixos-artwork to fix installer tests
With the move from storing grub images in the nixpkgs repo to storing them in the nix store, we broke the installer tests as the iso does not contain the artwork needed for the grub splash. This commit fixes the inclusion of the artwork in the iso.
2015-06-08 14:42:57 -07:00
Tuomas Tynkkynen
16165ddc38
install-cd: Include nixos-artwork to fix installer tests
...
Should fix at least nixos.tests.installer.simple.x86_64-linux
http://hydra.nixos.org/build/23001712 :
machine# error: cannot download Encode-Locale-1.03.tar.gz from any mirror
machine# builder for ‘/nix/store/y8gbx2d2fdcvvjy1z53xksfgq66ydlx0-Encode-Locale-1.03.tar.gz.drv’ failed with exit code 1
machine# cannot build derivation ‘/nix/store/y1knci7rix3asnh2b4kfv8jhl2j99xih-perl-Encode-Locale-1.03.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/7xspjwh48kg16drv1jjg5cffaqbxbp8p-perl-libwww-perl-6.05.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/8qsmz3bbk1jwhh50c3i9700bkmn8ns5c-nss-cacert-3.19.1.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/0rgf2l3mdszs4a989ympwc9gk2k8wq6z-nixos-artwork-e71b684.drv’: 1 dependencies couldn't be built
...
2015-06-08 19:12:59 +03:00
Jaka Hudoklin
b570c644c9
Merge pull request #8223 from offlinehacker/pkgs/rippled/update
...
rippled: Update to 0.28.1
2015-06-08 16:49:39 +02:00
Jaka Hudoklin
a5d0ac2003
Merge pull request #8227 from offlinehacker/nixos/consul/alerts-fix
...
nixos/consul: fix consul alerts enable
2015-06-08 14:34:48 +02:00
Jaka Hudoklin
161418537c
rippled: Update to 0.28.1
2015-06-08 14:15:07 +02:00
Jaka Hudoklin
2e5dbc4746
Add ripple rest module
2015-06-08 13:48:23 +02:00
Jaka Hudoklin
c9da002a07
nixos/consul: fix consul alerts enable
2015-06-08 13:41:43 +02:00
Jaka Hudoklin
cc96e474d3
Merge pull request #8226 from offlinehacker/kubernetes/skydns
...
Add skydns module
2015-06-08 13:37:39 +02:00
Jaka Hudoklin
23504e5bf2
Add skydns module
2015-06-08 13:36:05 +02:00
Arseniy Seroka
e24eefedd6
Merge pull request #8217 from ip1981/mwlib
...
mwlib uses pdftk to create books
2015-06-08 14:28:12 +03:00
Jaka Hudoklin
f7a452c8c1
nixos/kubernetes: skydns integration
2015-06-08 13:15:26 +02:00
Jaka Hudoklin
392fc849e4
Update kubernetes to 0.18.0, fix module
2015-06-08 13:10:32 +02:00
Jaka Hudoklin
8b79a09f78
Merge pull request #7553 from offlinehacker/pkgs/python-packages/graphite-beacon
...
Add graphite beacon package and module
2015-06-08 12:17:01 +02:00
Jaka Hudoklin
509afe860b
Merge pull request #7547 from offlinehacker/nixos/docker-registry/fixes
...
nixos/docker-registry: docker independant docker registry
2015-06-08 12:15:35 +02:00
Jaka Hudoklin
98d5b81dad
nixos: add grafana module
2015-06-08 12:13:15 +02:00
Igor Pashev
d85be1cfa3
mwlib uses pdftk to create books
2015-06-08 08:35:12 +00:00
Dan Peebles
b13cb54614
Bring an importable modulesPath back from the dead, in the only way I know
2015-06-08 01:55:49 +00:00
William A. Kennington III
514a9fdf87
Merge pull request #8173 from dezgeg/pr-kernel-config
...
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
2015-06-07 10:14:51 -07:00
Peter Simons
42c65fd1c9
Merge pull request #8206 from bjornfor/postfix-var-mail
...
nixos/postfix: make symlink /var/mail -> /var/spool/mail
2015-06-07 18:10:11 +02:00
Domen Kožar
46b05f0e08
Merge pull request #8193 from lostdj/patch-1
...
bittorrentsync: fix storage_path.
2015-06-07 17:53:19 +02:00
Bjørn Forsman
12e84c6378
nixos/postfix: make symlink /var/mail -> /var/spool/mail
...
This solves the problem of e.g. mutt not finding mail unless the user
sets MAIL=/var/spool/mail/$USER.
The default MAIL variable seems come from bash. Reasons for adding
symlink instead of changing MAIL default in bash:
- No need to rebuild world
- FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix
NixOS mail location than change MAIL in bash to something that doesn't
work on non-NixOS (however unlikely that users run nixpkgs bash on a
non-NixOS distro...).
[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES
2015-06-07 10:38:11 +02:00
William A. Kennington III
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07:00
William A. Kennington III
ffd0539eba
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
2015-06-05 13:00:52 -07:00
Timofey Lagutin
714377f8dc
bittorrentsync: fix storage_path.
...
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".
As seen in f02d4ec9ed
Broken in 0539ed4771
2015-06-05 18:39:01 +03:00
Eelco Dolstra
f1d465f429
pulseaudio: Revert to regular style
...
Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
2015-06-04 14:54:54 +02:00
Eelco Dolstra
7318ff0e38
Add option ‘system.extraDependencies’ for including stuff in the system closure
...
Mostly useful for installer tests that don't have network access. This
generalizes virtualisation.pathsInNixDB and isoImage.storeContents.
2015-06-04 11:06:44 +02:00
Eelco Dolstra
6bf1853387
Don't include 4 editors in the minimal installation CD
...
Emphasis on "minimal".
2015-06-04 11:06:44 +02:00
Tuomas Tynkkynen
9c2f2bc893
kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE
...
Commit 159fed47bc
(nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.
Other distros have similar defaults, at least on Arch:
CONFIG_FB_VESA=y
CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
CONFIG_FB_VESA=m
CONFIG_FRAMEBUFFER_CONSOLE=y
Fixes #8139
2015-06-04 11:26:20 +03:00
lethalman
d144ece04e
Merge pull request #8127 from ip1981/mwlib
...
Add more dependencies for mwlib
2015-06-03 12:50:02 +02:00
Wout Mertens
0666ee4739
Merge pull request #6732 from oconnorr/master
...
Use mktemp to create temporary files to hold ssh host keys and authorized keys
2015-06-02 20:34:43 +02:00
Luca Bruno
c12e1d7278
minimal-iso: enable nixos-manual
2015-06-02 18:14:45 +02:00
Igor Pashev
95c6b835cb
mwlib may use pyfribidi
2015-06-02 06:14:34 +00:00
Igor Pashev
58f6da5cc6
mwlib may use imagemagick (convert)
2015-06-02 06:06:02 +00:00
Bjørn Forsman
70cb6e67c0
nixos/apcupsd: don't evaluate event hooks at build time
...
Better replace the double quotes in 'echo "${commands}"' with single
quotes, to prevent the shell from doing command substitution etc. at
configuration build time.
2015-06-01 22:14:03 +02:00
Eelco Dolstra
64a41b7a90
Use nixUnstable by default
2015-06-01 18:20:28 +02:00
lethalman
3b6dbb1917
Merge pull request #7984 from rushmorem/marathon-module-update
...
Make it easy to override the marathon framework user
2015-06-01 17:06:50 +02:00
Domen Kožar
dc3316268e
Merge branch 'master' into staging
2015-06-01 11:00:51 +02:00
Eelco Dolstra
7edb27b7af
Hide the option fonts.enableCoreFonts
...
We shouldn't have options that simply enable a package.
2015-06-01 10:43:43 +02:00
William A. Kennington III
867d2c5c46
openssl: Remove References to OPENSSL_X509_CERT_FILE
2015-05-31 15:50:51 -07:00
William A. Kennington III
3588cd8c4e
nixos/pulseaudio: Use libpulseaudio
2015-05-29 20:36:46 -07:00
William A. Kennington III
d6cbb061e3
cacert: Build directly from nss instead of our own tarball
2015-05-29 13:52:07 -07:00
William A. Kennington III
aa5d6922c5
Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config."
...
The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.
This reverts commit fd1fb0403c
.
2015-05-29 13:26:51 -07:00
William A. Kennington III
1e98da6d99
nixos/grub: Use nixos artwork
2015-05-29 13:26:32 -07:00
William A. Kennington III
159fed47bc
nixos/grub: Fix video display on efi
2015-05-29 13:26:32 -07:00
William A. Kennington III
d4f3930201
nixos/grub: Fix defaultConfig
2015-05-29 13:26:32 -07:00
Russell O'Connor
29b7d76ec8
Remove use of && in fetch-ssh-keys service.
...
Scripts are run with -e so will abort when a command fails.
2015-05-29 19:53:58 +00:00
Russell O'Connor
4744e3541a
[GCE] Put temp files for fetch-ssh-keys service in /run
2015-05-29 19:53:57 +00:00
Russell O'Connor
1badfabc4d
Use mktemp to create temporary files to hold ssh host keys and authorized keys when downloading them from the metadata server.
2015-05-29 19:53:57 +00:00
Rob Vermaas
fd1fb0403c
Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config.
2015-05-29 19:36:16 +00:00
rushmorem
9c7fae83ee
Make it easy to override the marathon framework user
...
Currently the module hardcodes the systemd service user to "marathon".
With this change one would not need to create an extra systemd config to
override the user.
So why would one need to override the Marathon user? Some apps require
root access to run. You can't run those with Marathon unless you
override the default user to root. Marathon also provides a
`--mesos_user` command line flag which allows you to run apps using
arbitrary users. You need to run the framework as root to enable this
functionality.
2015-05-29 18:07:07 +02:00
lethalman
cb02d37c31
Merge pull request #8034 from ragnard/apache-kafka-exit-code
...
apache-kafka: Treat exit code 143 as success.
2015-05-28 11:59:06 +02:00
Ragnar Dahlén
9f25762d29
apache-kafka: Treat exit code 143 as success.
...
JVMs exit with exit code 128+signal when receiving a (terminating)
signal. This means graceful termination of a JVM will result in 143, so
add that to `SuccessExitStatus` in systemd service unit.
2015-05-28 10:52:50 +01:00
Wout Mertens
ab0ac154f9
Merge pull request #7302 from ragnard/mesos-slave-without-docker
...
mesos-slave: Docker optional & IP address configurable
2015-05-28 11:43:01 +02:00
Ragnar Dahlén
045e93e0a6
mesos-slave: docker and IP address config options
...
- Usage of docker containerizer is currently hardcoded, this PR makes it
optional. Default is to enable it if docker is enabled.
- Make IP address to listen on part of service configuration.
2015-05-28 06:58:12 +01:00
Nikolay Amiantov
7355066bfe
nixos: add support for exfat filesystem
2015-05-27 18:59:33 +03:00
lethalman
71fc9aac4d
Merge pull request #7992 from ip1981/mwlib
...
Added mwlib services
2015-05-27 16:59:57 +02:00
Igor Pashev
7ed1fb30e2
Added mwlib services
...
Simple local usage:
mwlib = {
nserve = {
enable = true;
};
qserve = {
enable = true;
};
};
For MediaWiki:
$wgCollectionMWServeURL = 'http://localhost:8899 ';
$wgCollectionFormats = array(
'rl' => 'PDF',
'odf' => 'ODT',
);
$wgCollectionPortletFormats = array (
'odf', 'rl'
);
2015-05-27 14:55:22 +00:00
Arseniy Seroka
43690ae4ee
Merge pull request #7987 from magnetophon/das_watchdog-master
...
add das_watchdog: a realtime watchdog
2015-05-27 11:47:15 +03:00
Eelco Dolstra
2a1c342887
Disable the manual in the minimal profile
2015-05-26 20:20:53 +02:00
Bart Brouns
c3b7a8b053
add das_watchdog: a realtime watchdog
2015-05-26 15:13:59 +02:00
Mateusz Kowalczyk
1113efec5e
Merge pull request #7559 from offlinehacker/openvswitch/ipsec
...
openvswitch: ipsec support
2015-05-26 11:26:02 +01:00
Mateusz Kowalczyk
4fd0f2cf4d
Merge pull request #7558 from offlinehacker/nixos/docker/typefix
...
nixos/docker: set extraOptions to separatedString type
2015-05-26 11:22:50 +01:00
Mateusz Kowalczyk
a35e1ddfb2
Merge pull request #7566 from offlinehacker/nixos/node-docker-registry/module
...
nixos: add node docker registry server
2015-05-26 11:07:22 +01:00
Mateusz Kowalczyk
002c687edf
nova-image: Delete no longer used comment
2015-05-26 11:05:52 +01:00
Mateusz Kowalczyk
0d454d863f
Merge pull request #7876 from rzetterberg/issue-7869
...
nixos: Fixes eval and build error of nova image builder
2015-05-26 11:05:06 +01:00
lethalman
aff1c293ef
Merge pull request #7998 from dezgeg/pr-ddclient-ssl
...
ddclient: Set SSL_CERT_FILE environment variable
2015-05-26 10:25:47 +02:00
William A. Kennington III
b07d2a447b
nixos/grub: Fix assertion
2015-05-25 23:03:31 -07:00
Tuomas Tynkkynen
2966068968
ddclient: Set SSL_CERT_FILE environment variable
...
Otherwise connection to SSL hosts fails like this:
May 26 06:44:05 kbuilder ddclient[17084]: WARNING: cannot connect to dynamicdns.park-your-domain.com:443 socket:
IO::Socket::IP configuration failed SSL connect attempt failed with unknown error
error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
2015-05-26 06:45:25 +03:00
William A. Kennington III
fd5b273e82
nixos/grub: Add the ability to mirror grub to multiple partitions
2015-05-25 20:23:06 -07:00
William A. Kennington III
f42d2503d7
Merge pull request #7643 from Shados/fix-grub-efi-only
...
grub2: Fix EFI-only installation
2015-05-25 13:55:20 -07:00
Aristid Breitkreuz
4835763e13
Trackpoint scrolling on T450s et al
2015-05-25 20:00:35 +02:00
Jonathan Glines
847f8297fc
Added config options for systemd-coredump functionality.
2015-05-24 18:22:53 -06:00
Peter Simons
50fa9d8eea
Merge pull request #7941 from peti/allow-custom-ssh-moduli-file
...
nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
2015-05-22 20:51:42 +02:00
Peter Simons
86d299bc6e
nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
...
The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:
| #! /usr/bin/env bash
|
| moduliFiles=()
|
| generateModuli()
| {
| ssh-keygen -G "moduli-$1.candidates" -b "$1"
| ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
| rm "moduli-$1.candidates"
| }
|
| for (( i=0 ; i <= 16 ; ++i )); do
| let bitSize="2048 + i * 128"
| generateModuli "$bitSize" &
| moduliFiles+=( "moduli-$bitSize" )
| done
| wait
|
| echo >moduli "# Time Type Tests Tries Size Generator Modulus"
| cat >>moduli "${moduliFiles[@]}"
| rm "${moduliFiles[@]}"
Note that generating moduli takes a long time, i.e. several hours on a fast
machine!
This patch resolves https://github.com/NixOS/nixpkgs/pull/5870 .
2015-05-22 16:28:45 +02:00
viric
bcfa84cae2
Merge pull request #7878 from dezgeg/pr-extlinux
...
generic-extlinux-compatible: Add new bootloader for ARM
2015-05-22 16:02:22 +02:00
William A. Kennington III
31a273cb14
nixos/tinc: users are system users
2015-05-21 20:11:13 -07:00
William A. Kennington III
4f943ef237
nixos/lightdm: More changes
2015-05-21 20:10:52 -07:00
Arseniy Seroka
f134150180
Merge pull request #7857 from rushmorem/marathon-module-update
...
Update Marathon module
2015-05-21 16:52:14 +03:00
rushmorem
b5820a5ebd
Update Marathon module
...
The new module makes it possible to pass extra commandline
arguments to Marathon as well as environment variables.
2015-05-21 15:45:13 +02:00
William A. Kennington III
4ed8cdc3d4
nixos/bird: Fix doc compilation
2015-05-20 18:53:54 -07:00
William A. Kennington III
acdc3e6c9a
nixos/lightdm: Some fixups
2015-05-20 18:32:12 -07:00
Arseniy Seroka
a9171953c6
Merge pull request #7860 from Lassulus/bird
...
nixos: add bird module
2015-05-21 03:24:20 +03:00
Eelco Dolstra
e98da673e4
nixos-checkout: Add nixpkgs-channels as a remote
...
This way, you can do things like
git checkout channels/nixos-14.12
to get the latest tested and built version of NixOS.
2015-05-20 14:16:36 +02:00
Evgeny Egorochkin
8ed3ab50ea
azure-image: common: add sg3_utils
2015-05-20 13:25:01 +03:00
Evgeny Egorochkin
2fe9084397
azure-image: fix, split into bootstrap and regular configurations
...
Conflicts:
nixos/modules/virtualisation/azure-image.nix
2015-05-20 13:24:38 +03:00
Bjørn Forsman
db991a4024
nixos/libvirtd: remove --verbose flag
...
Because it spams the log:
.libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
.libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
.libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
.libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
.libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
.libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
.libvirtd-wrapp[1950]: [137B blob data]
2015-05-20 12:14:18 +02:00
Bjørn Forsman
3d2d78cb39
nixos/libvirtd: add 'extraOptions' option
...
And move the '--verbose' flag to extraOptions, so that users can easily
disable it.
2015-05-20 12:14:18 +02:00
Nikolay Amiantov
3e35ea305f
postgresql-backup: cleanup
2015-05-19 18:35:22 +03:00
lassulus
9d07c54fa1
nixos: add bird module
...
patch bird to look in /var/run for birc.ctl
2015-05-19 15:42:24 +02:00
Luca Bruno
25f9555599
Drop GNOME 3.12
2015-05-18 12:24:08 +02:00
Tuomas Tynkkynen
6d176afe5e
generic-extlinux-compatible: Add new bootloader for ARM
...
This module generates a /boot/extlinux/extlinux.conf bootloader
configuration file that is supported by e.g. U-Boot:
http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master
With this, all ARM boards supported by U-Boot can be booted in a common
way (a single boot file generator, all boards booting via initrd like
x86) and with same boot menu functionality as GRUB has.
-- sample extlinux.conf file --
# Generated file, all changes will be lost on nixos-rebuild!
# Change this to e.g. nixos-42 to temporarily boot to an older configuration.
DEFAULT nixos-default
TIMEOUT 50
LABEL nixos-default
MENU LABEL NixOS - Default
LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
LABEL nixos-71
MENU LABEL NixOS - Configuration 71 (2015-05-17 21:32 - 15.06.git.0b7a7a6M)
LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
2015-05-17 23:38:03 +03:00
Richard Zetterberg
bd5011fc34
Fixes eval and build error of nova image builder
2015-05-17 20:55:07 +02:00
Arseniy Seroka
0b3e2becca
Merge pull request #7829 from joamaki/vmware_guest
...
VMWare guest support and open-vm-tools package
2015-05-15 15:13:30 +03:00
Jussi Maki
6a0d21eb86
VMWare guest support and open-vm-tools package
2015-05-15 12:43:21 +02:00
Arseniy Seroka
946e7dca61
Merge pull request #7842 from dezgeg/pr-nix-serve
...
nix-serve: Add nixos module
2015-05-14 22:44:43 +03:00
lethalman
1103392dd9
Merge pull request #7794 from womfoo/kbdlight
...
Add kbdlight package and setuid wrapper
2015-05-14 17:09:28 +02:00
Tuomas Tynkkynen
fd8cb1ff2d
nix-serve: Add nixos module
...
This allows sharing the Nix store of the machine as a binary cache
simply by setting 'services.nix-serve.enable = true'.
2015-05-14 12:27:28 +03:00
Eelco Dolstra
fc8011ad8d
Ensure that nscd, sshd are created as system users
...
c0f70b4694
removed the fixed uid
assignment, but then it becomes necessary to set isSystemUser.
http://hydra.nixos.org/build/22182588
2015-05-13 16:23:36 +02:00
Nikolay Amiantov
e9679ce32a
postgresql-backup: use system postgresql package
2015-05-13 16:06:50 +03:00
William A. Kennington III
2806491cc4
nixos/consul: Add shell for health checks
2015-05-11 17:44:07 -07:00
William A. Kennington III
b6e26aa8df
nixos/consul: Support a config directory for health checks
2015-05-11 16:45:04 -07:00
William A. Kennington III
1938dc9b54
nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options
2015-05-11 16:27:53 -07:00
Arseniy Seroka
26492cdba3
Merge pull request #7434 from Forkk/plex-media-server
...
plex: add support for managing plugins via Nix
2015-05-11 14:48:30 +03:00
Eelco Dolstra
492471b453
Apply some overrides to upstream systemd units
...
This removes the need for the following patches:
9a6cade993
9f7e832c90
2015-05-11 12:43:35 +02:00
Arseniy Seroka
c0727fb751
Merge pull request #7788 from Lassulus/charybdis
...
add charybdis nixos module
2015-05-11 12:57:58 +03:00
lassulus
304cab2b46
add charybdis nixos module
2015-05-11 11:38:53 +02:00
Domen Kožar
bb4d658f64
Merge branch 'master' into staging
...
Conflicts:
nixos/doc/manual/release-notes/rl-unstable.xml
nixos/modules/services/printing/cupsd.nix
pkgs/applications/misc/calibre/default.nix
pkgs/development/haskell-modules/hackage-packages.nix
pkgs/development/libraries/libsodium/default.nix
pkgs/misc/emulators/wine/unstable.nix
pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Kranium Gikos Mendoza
6f634e3c3a
Add kbdlight package and setuid wrapper
...
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
2015-05-11 13:23:01 +08:00
Ricardo M. Correia
aa75bb25d8
grsecurity: Update stable and test patches
...
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test: 3.1-4.0.2-201505072057 -> 3.1-4.0.2-201505101122
2015-05-11 02:45:38 +02:00
Charles Strahan
ba186ec4b9
mesos service: only pass --zk if quorum > 0
...
The ZooKeeper URL is not necessary when using in-memory slave
registration.
2015-05-10 19:36:20 -04:00
Charles Strahan
760169663e
mesos: fix indentation in service definition
2015-05-10 17:23:33 -04:00
Jascha Geerds
19dbe42aeb
Revert "cups: Rename "browsing" config option to "advertise""
...
This reverts commit 48e65cec4e
.
2015-05-10 20:47:50 +02:00
Jascha Geerds
652d06207d
cups: Rename "browsing" config option to "advertise"
2015-05-10 13:46:32 +02:00
Jascha Geerds
6f69dd46d7
cups: Add defaultShared, browsing and webInterace config option
2015-05-10 13:46:32 +02:00
Jascha Geerds
f4d9c9043c
cups: Remove deprecated config options from cupsd.conf
2015-05-10 13:46:32 +02:00
Jascha Geerds
e9cf6cd34f
cups: Use systemd files provided by CUPS
2015-05-10 13:46:32 +02:00
Jascha Geerds
48e65cec4e
cups: Rename "browsing" config option to "advertise"
2015-05-10 12:41:21 +02:00
Jascha Geerds
2cc8d15653
cups: Add defaultShared, browsing and webInterace config option
2015-05-10 12:41:21 +02:00
Jascha Geerds
3710dbec05
cups: Remove deprecated config options from cupsd.conf
2015-05-10 12:41:20 +02:00
Jascha Geerds
4ac95ab328
cups: Use systemd files provided by CUPS
2015-05-10 12:41:20 +02:00
Lluís Batlle i Rossell
21dd114f82
Revert "Making nixos keep a ref to its stdenv"
...
This reverts commit d170c98d13
.
niksnut argues that we need smaller system closures, not bigger.
So users facing the trouble of getting gcc rebuilds after nix-collect-garbage
for any minimal nixos configuration change should use other means of
not losing the stdenv output.
One way is to keep one somewhere: nix-build -A stdenv -o stdenv '<nixpkgs>'.
Another may be to use nix.conf options like gc-keep-outputs, gc-keep-derivations
or env-keep-derivations.
2015-05-09 21:11:49 +00:00
Lluís Batlle i Rossell
d170c98d13
Making nixos keep a ref to its stdenv
...
This will help a lot on ARM, where nix-collect-garbage erases gcc; then, any
change to a small system config file requires rebuilding gcc again.
I don't know why it does not happen on x86. Maybe it just pulls the gcc from
hydra, if garbage is collected.
2015-05-09 20:19:34 +00:00
Lluís Batlle i Rossell
d8a2bb86c0
Raspberry Pi 2 changes to make it boot.
...
It boots, but some things still don't work:
1) Installation of DTBs
2) Boot of initrd
Booting still needs a proper config.txt in /boot, which could probably be
managed by NixOS.
2015-05-09 17:05:24 +00:00
William A. Kennington III
c9395e1e92
Merge branch 'master' into staging
2015-05-08 05:59:50 -07:00
Rob Vermaas
650d3f8fc4
Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared.
...
(cherry picked from commit ccf672ca6b055e5e862e45b65d122754c16cf7d1)
2015-05-07 08:51:38 +00:00
William A. Kennington III
074c4a7f78
Merge remote-tracking branch 'upstream/master' into staging
2015-05-07 01:44:49 -07:00
Joachim Schiele
7aed6ddbb4
Merge pull request #7482 from qknight/mysql_socket_permissions
...
/run/mysqld now 0755 (instead 0700)
2015-05-07 01:55:00 +02:00
Joachim Schiele
db79335c07
mysql: /run/mysql now 0755 (instead 0700)
...
see https://github.com/NixOS/nixpkgs/pull/7482
2015-05-07 01:51:05 +02:00
Pascal Wittmann
40b9e938b6
postfix service: description enhancement
...
closes #7651
2015-05-06 21:53:39 +02:00
Stephen Weinberg
a6ebccfbb8
Sane default configuration for sabnzbd module
...
Added option to set user. Use unpriviledged user by default. Add sane
default for configuration location.
2015-05-05 00:18:22 -04:00
Aristid Breitkreuz
5ccbfb2dcc
tarsnap: fix up permissions of existing cache directories
2015-05-04 18:58:35 +00:00
Eelco Dolstra
4239e276ea
fetch-ec2-data: Don't restart
...
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
2015-05-04 16:56:46 +02:00
Eelco Dolstra
28e49dcb41
Style fix
2015-05-04 14:18:14 +02:00
Eelco Dolstra
c2bf9c3ee3
Typo
2015-05-04 14:16:19 +02:00
lethalman
f2870bd77d
Merge pull request #7601 from cstrahan/iso-name-fix
...
nixos: fix infinite recursion in isoImage.isoName
2015-05-04 10:24:38 +02:00
Thomas Tuegel
2325791c2b
plasma53: patch upstream startkde
...
Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
2015-05-03 17:09:50 -05:00
Philip Potter
2216728979
add support for pam_u2f to nixos pam module
...
This adds support for authenticating using a U2F device such as a
yubikey neo.
2015-05-03 19:22:00 +01:00
Steven Shaw
2a8577d7fe
Correct spelling
2015-05-03 19:15:03 +10:00
Domen Kožar
00ef77f426
Merge pull request #7565 from offlinehacker/nixos/confd/module
...
nixos: add confd module
2015-05-02 14:43:02 +02:00
William A. Kennington III
00df204c82
Merge remote-tracking branch 'upstream/master' into staging
2015-05-01 15:57:09 -07:00
Charles Strahan
ba50d48400
mbpfan: service improvements
...
* add verbosity setting
* don't set mbpfan as a setuid program
2015-05-01 17:11:55 -04:00
Charles Strahan
d83399dcd9
mgpfan: new service
2015-04-30 21:21:15 -04:00
Jascha Geerds
6823b5e657
Merge pull request #7636 from bramd/brltty
...
Added BRLTTY package
2015-05-01 00:21:49 +02:00
Alexei Robyn
60da99ea2a
grub module: removed invalid device check for grub EFI installation
2015-04-30 19:28:34 +10:00
aszlig
4cdb4a4fef
networkd: Fix evaluation of systemd.network units.
...
During the refactor of the networkd stuff in f8dbe5f
, a lot of the
options are now needed by systemd.nix as well as networkd.nix but
weren't moved by that commit as well.
For now, this fixes all networkd VM tests except for the macvlan one and
thus it should fix #7505 for at least DHCP-based configuration.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-30 06:49:10 +02:00
aszlig
49fa00cded
networkd: Fix disabled networkd units.
...
In f8dbe5f
, the default value for networking unit "enabled" option
suddenly flipped to false. I have no idea of whether this happened by
accident, but I'm setting it to true again, because it essentially
breaks systemd networking support and we have systemd.network.enable to
have a "turn the world off" switch.
And of course, because the mentioned commit obviously wasn't done with
even a run of the simplest run of one of the network VM tests, we now
get an evaluation error if we switch useNetworkd to true.
Fixes the core issue of #7505 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-30 06:49:10 +02:00
Bram Duvigneau
9a535b9023
Added BRLTTY package
2015-04-29 23:02:09 +02:00
Domen Kožar
ff88f4bcda
nixos-install: correctly detect stdin
2015-04-29 18:48:21 +02:00
Thomas Tuegel
1fe28a1132
Merge remote-tracking branch 'upstream/master' into staging
2015-04-29 11:33:28 -05:00
Rob Vermaas
ad0bd73775
Work around infinite recursion issue in nixops.
2015-04-29 09:55:20 +00:00
Arseniy Seroka
8150cf11b0
Merge pull request #7605 from ip1981/wiki
...
Mediawiki updates
2015-04-28 19:00:27 +03:00
Ricardo M. Correia
f5e7190572
nixos.system_tarball_pc: Fix evaluation
...
It was broken due to 57b05765c9
.
ZFS requires `networking.hostId` to be set.
2015-04-28 17:15:02 +02:00
Herwig Hochleitner
8233fd5c6a
i2p: add service to module-list
2015-04-28 14:35:36 +02:00
Jaka Hudoklin
f5bc58d733
Merge pull request #7545 from offlinehacker/pkgs/kubernetes/fixes
...
kubernetes: update to 0.15, module fixes
2015-04-28 14:12:53 +02:00
Jaka Hudoklin
7b878a7ca9
Merge pull request #7555 from offlinehacker/nixos/nginx/reload
...
nixos/nginx: enable service/config reload
2015-04-28 14:12:21 +02:00
Jaka Hudoklin
ef6b88690d
Merge pull request #7549 from offlinehacker/nixos/ripple-data-api/importmode
...
nixos/ripple-data-api: add import mode option
2015-04-28 14:10:50 +02:00
Jookia
71910be9ea
nixos-install: Fix chroot flag not defaulting to Bash outside NixOS.
...
Passing the chroot flag to nixos-install without arguments should now give you a
Bash shell as intended rather than try an empty path.
This was masked by the user's shell (usually /bin/bash) being defaulted to by
chroot, and being found since their paths used NixOS conventions.
2015-04-28 06:37:04 -04:00
Jookia
7b37a5f168
nixos-install: Fix password prompt failing outside NixOS.
...
When bootstrapping from other distributions, nixos-install is unable to find
various tools in the chroot since their paths aren't aware of NixOS conventions.
This makes a small change to existing code by specifying nixpkgs/nixos instead
of just nixos when running nix-instantiate in the chroot. I haven't tested this
outside of bootstrapping, but the same specification is used elsewhere in the
code so I don't see why it wouldn't work.
2015-04-28 06:34:47 -04:00
Igor Pashev
4855b0b3fb
Mediawiki 1.23.9
2015-04-28 08:05:16 +00:00
Igor Pashev
bca76e46f0
Apache servedFiles: fixed a typo in example
2015-04-28 08:05:15 +00:00
Igor Pashev
8388bd3280
wiki: do not rewrite served files
2015-04-28 08:05:08 +00:00
Charles Strahan
a64e90bdef
nixos: fix infinite recursion in isoImage.isoName
2015-04-27 23:10:53 -04:00
Herwig Hochleitner
c600f5af25
gnome3: move definition of package sets into pkgs
2015-04-28 02:54:14 +02:00
Eelco Dolstra
19366a10fc
Remove redundant i18n.supportedLocales setting
...
This is already set in profiles/minimal.nix.
Probably fixes #7589 .
2015-04-27 19:21:28 +02:00
Eelco Dolstra
534b84a9ac
Don't require sslServerChain to be set
2015-04-27 18:24:16 +02:00
lethalman
9807dbc142
Merge pull request #7486 from oxij/actkbd-and-media-keys
...
add actkbd; nixos: add support for volume control with media keys
2015-04-27 12:31:15 +02:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Domen Kožar
ff12c3274a
Merge pull request #7548 from offlinehacker/etcdfix
...
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 22:14:55 +02:00
Jaka Hudoklin
a9cd286cd0
Merge pull request #7546 from offlinehacker/nixos/panamax/reload
...
nixos/fluentd: add support for config reload
2015-04-25 16:29:34 +02:00
Jaka Hudoklin
ffea231652
Merge pull request #7550 from offlinehacker/nixos/rippled/changes
...
nixos/rippled: new options, fixes
2015-04-25 16:28:15 +02:00
Jaka Hudoklin
b7d8d5dd30
Add graphite beacon package and module
2015-04-25 16:25:26 +02:00
Jaka Hudoklin
ff095f5002
nixos: add node docker registry server
2015-04-25 16:16:34 +02:00
Jaka Hudoklin
6ca12344b3
nixos: add confd module
2015-04-25 16:10:49 +02:00
Emery Hemingway
34f1c39fe0
nixos: fix cjdns json config
...
filter extraneous attributes from config modules
2015-04-25 09:40:44 -04:00
Jaka Hudoklin
ec6ecce8cf
nixos/openvswitch: add ipsec gre tunnels support
2015-04-25 15:35:02 +02:00
Jaka Hudoklin
b5114de4ac
nixos: add racoon ipsec IKE deamon
2015-04-25 15:31:27 +02:00
Jaka Hudoklin
d6660af8ac
nixos/docker: set extraOptions to separatedString type
...
This change is needed if you want to pass extraOptions to docker in multiple
nixos modules.
2015-04-25 15:25:15 +02:00
Jaka Hudoklin
fb8bc4da21
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 15:21:49 +02:00
Jaka Hudoklin
494d1820e3
nixos/nginx: enable service/config reload
2015-04-25 15:17:06 +02:00
Jaka Hudoklin
54ddf2176b
nixos/rippled: new options, fixes
2015-04-25 14:39:24 +02:00
Jaka Hudoklin
5984c04f1f
nixos/ripple-data-api: add import mode option
2015-04-25 14:38:05 +02:00
Jaka Hudoklin
b7cb0420ca
nixos/docker-registry: docker independant docker registry
2015-04-25 14:26:35 +02:00
Jaka Hudoklin
f6bb49ad4a
nixos/fluentd: add support for config reload
2015-04-25 14:21:27 +02:00
Jaka Hudoklin
6cb195a83d
nixos/kubernetes: fix module
2015-04-25 14:18:25 +02:00
Luca Bruno
db3b86560f
GNOME 3.16.1, closes #7357
2015-04-25 12:02:33 +02:00
Edward Tjörnhammar
4ea47155af
Merge pull request #7498 from k0ral/sslh
...
sslh: argument to -F can no longer be separated from the option by a space
2015-04-23 21:35:46 +02:00
Dan Peebles
81d8074881
Add hologram service
2015-04-23 14:30:12 -04:00
Oliver Matthews
a498b28322
wait for filesystem before starting btsync; bump to latest package version
2015-04-23 13:09:34 +00:00
koral
88ce17b6e1
sslh: argument to -F can no longer be separated from the option by a space
2015-04-21 16:29:25 +00:00
Nicolas B. Pierron
7585d42d2b
Fix #7354 - Accept _module attributes added to every submodule.
2015-04-20 23:58:32 +02:00
Jan Malakhovski
57ab189e78
nixos: add actkbd module and sound.enableMediaKeys option
2015-04-20 17:11:19 +00:00
Nikolay Amiantov
0f5d5f9d12
lambdabot: add named pipe for incoming commands
2015-04-20 18:56:48 +03:00
Eelco Dolstra
d5f187de03
Typo
2015-04-20 16:12:28 +02:00
Eelco Dolstra
d4d6b8cc61
Grmbl
2015-04-20 14:24:42 +02:00
Eelco Dolstra
fc91ba52df
ntfs.nix: Remove copypasta jfs stuff
...
Thanks to @wizeman for spotting this!
2015-04-20 14:06:44 +02:00
Eelco Dolstra
11a9774c75
Use "mkdir -p" when creating ~/.nix-defexpr
...
Otherwise, simultaneous invocations of /etc/profile can fail, e.g.
mkdir: cannot create directory ‘/.nix-defexpr’: File exists
2015-04-20 13:03:04 +02:00
Eelco Dolstra
d69b205527
Remove sysvtools from the system path
...
All programs in sysvtools (except killall5) are also provided by
util-linux or procps.
Issue #7117 .
2015-04-20 11:33:42 +02:00
Eelco Dolstra
56f66dad97
Fix #7476
2015-04-20 11:32:29 +02:00
Eelco Dolstra
650492c5c8
minimal.nix: Get rid of most Glibc locales
...
This cuts ~100 MB from the system closure.
Issue #7117 .
2015-04-20 11:32:28 +02:00
Eelco Dolstra
bad3211893
Disable some more unnecessary stuff in containers
2015-04-20 11:32:28 +02:00
Eelco Dolstra
abeb4a9c96
stage-2-init: Don't depend on sysvtools
2015-04-20 11:32:28 +02:00
Eelco Dolstra
e66970417b
Remove obsolete "eject" entry from the system path
...
It's an alias for util-linux, so included anyway.
2015-04-20 11:21:20 +02:00
Eelco Dolstra
3d2b24d161
Remove pciutils and usbutils from the default system path
...
Issue #7117 .
2015-04-20 11:21:20 +02:00
Cray Elliott
479f5f4ae6
fix rebuild when using ntfs partitions
...
needed to define inInitrd, used vfat.nix as a template
2015-04-19 15:17:23 -07:00
Eelco Dolstra
2b6d011bec
Include cifs-utils only when needed
...
Issue #7117 .
2015-04-19 22:06:45 +02:00
Eelco Dolstra
1cb5583c05
container.nix -> docker-container.nix
2015-04-19 22:06:45 +02:00
Eelco Dolstra
57b05765c9
Don't include ntfs-3g by default
...
Issue #7117 .
2015-04-19 22:06:45 +02:00
Eelco Dolstra
c0f70b4694
Remove fixed uids for nscd, sshd
...
These services don't create files on disk, let alone on a network
filesystem, so they don't really need a fixed uid. And this also gets
rid of a warning coming from <= 14.12 systems.
2015-04-19 22:06:45 +02:00
Eelco Dolstra
c87977e97d
Don't include networkd units unless enabled
...
Otherwise, the enabled -> disabled transition won't be handled
correctly (switch-to-configuration currently assumes that if a unit is
running and exists, it should be restarted).
2015-04-19 22:06:45 +02:00
Eelco Dolstra
f8dbe5f376
systemd: Move networkd into separate modules
...
The systemd module was getting rather bloated.
2015-04-19 22:06:45 +02:00
Tobias Geerinckx-Rice
1f513c21f9
Merge pull request #7461 from dezgeg/pr-ddclient-unit-type
...
ddclient: Fix capitalization of systemd unit keys
2015-04-19 15:27:21 +02:00
Tuomas Tynkkynen
e7843efe12
ddclient: Fix incorrectly capitalized systemd unit key
...
This avoids the following warning:
Apr 19 10:53:48 xen systemd[1]: [/nix/store/...-unit-ddclient.service/ddclient.service:19] Unknown lvalue 'type' in section 'Service'
As `Type=simple` is the default in systemd, the assignment to the
service type can be simply dropped.
2015-04-19 15:58:34 +03:00
lethalman
e6b664cafe
Merge pull request #7443 from ts468/fixgrub
...
Fix grub for "nodev" targets.
2015-04-18 21:19:04 +02:00
Mateusz Kowalczyk
5676e8b391
lightdm: allow the user to specify extra Seat opts
2015-04-18 20:14:10 +01:00
Mateusz Kowalczyk
1713184b11
xserver.nix: fix indentation issues under Device
2015-04-18 19:04:03 +01:00
Mateusz Kowalczyk
d7810b4303
Hard tabs be gone!
2015-04-18 18:52:15 +01:00