obadz
cfc0a5415b
Revert "fontconfig: fix etc priority"
...
This reverts commit 1e53d4a777
.
Closes #16983
cc @vcunat @ericsagnes @dezgeg
2016-07-15 20:44:21 +02:00
Robin Gloster
0749876016
Merge pull request #15957 from mayflower/sonarr_upstream
...
sonarr: init at 2.0.0.4146 + sonarr service
2016-07-15 17:34:18 +02:00
Bjørn Forsman
8c2d888401
jenkins: move $out/{lib => webapps}/jenkins.war
...
As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.
Commit 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
2016-07-15 17:18:44 +02:00
Tristan Helmich
ed466b7fef
sonarr service: initial service
2016-07-15 16:18:37 +02:00
Bjørn Forsman
4075c10a59
jenkins: move .war file from $out to $out/lib/jenkins.war
...
Fixes #14137 , also known as:
$ nix-shell -p jenkins
bash: source: /nix/store/ln1yw6c2v8bb2cjqfr1z5aqcssw054wa-jenkins-2.3:
cannot execute binary file
[nix-shell exited with error]
The problem is that jenkins.war is not installed inside the directory
$out, but rather _as the file_ $out. Fix it by moving the file to
$out/lib/jenkins.war.
While at it, move buildCommand so that the "meta" section is at the end
of the expression (standard style), and quote shell variables.
2016-07-15 15:12:52 +02:00
Frederik Rietdijk
cfb4a19f51
Merge pull request #16967 from davidak/caddy-fix
...
caddy service: fix nix store output path
2016-07-15 12:26:18 +02:00
Eelco Dolstra
55eb18d212
Add some more info to the nixos-version manpage
2016-07-15 12:02:39 +02:00
Luca Bruno
4b8c31d981
gnome3: enable X libinput by default
...
See https://bugzilla.gnome.org/show_bug.cgi?id=764257#c12
2016-07-14 22:06:18 +01:00
davidak
d2164cfcda
caddy service: fix nix store output path
...
systemd[11376]: caddy.service: Failed at step EXEC spawning /nix/store/ghpcwj6paccc92l1gk7ykb6gf2i2w6fi-go1.6-caddy-0.8.3/bin/caddy: No such file or directory
2016-07-14 22:04:55 +02:00
Vladimír Čunát
1b5ac05845
Merge branch 'staging'
...
Includes security fixes in gd and libarchive.
2016-07-14 15:51:28 +02:00
obadz
de80d0544c
ecryptfs: add test to release-combined.nix
2016-07-14 11:52:50 +02:00
obadz
f76a8fbbac
ecryptfs: add test to release ( #16910 )
...
Would have caught regression #16766
2016-07-13 14:57:13 +02:00
davidak
d97a107426
nixos-version: fix syntax error and add -h ( #16906 )
...
* nixos-version: fix syntax error
* nixos-version: add -h parameter
2016-07-13 09:11:32 +02:00
Nikolay Amiantov
d9aafc885f
Merge branch 'early-kbd' into staging
2016-07-13 03:56:07 +03:00
Nikolay Amiantov
1848bfc92d
Merge branch 'plymouth' into staging
2016-07-13 03:54:38 +03:00
obadz
d781bf94c1
ecryptfs: test bug from #16766
2016-07-13 02:00:22 +02:00
obadz
ab6fc29719
ecryptfs: add nixos/tests/ecryptfs.nix
2016-07-13 01:48:41 +02:00
Vladimír Čunát
40785f0dac
Merge branch 'master' into staging
...
Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00
Nikolay Amiantov
c69c76ca7e
nixos stage-1: try to quit plymouth if started on failure
2016-07-12 22:22:29 +03:00
Nikolay Amiantov
a2d4235fe1
plymouth service: init
2016-07-12 22:22:29 +03:00
Nikolay Amiantov
d3e3e643cb
nixos stage-1: set extraUtils variable
2016-07-12 22:22:29 +03:00
Nikolay Amiantov
3508918da2
nixos stage-1: replace udevadm in udevRules
2016-07-12 22:22:28 +03:00
Nikolay Amiantov
e02b5ace0b
nixos stage-1: guard udevRules from extra references
2016-07-12 22:22:28 +03:00
Nikolay Amiantov
bd0ab027c1
nixos stage-1: recursively process binaries and libraries
2016-07-12 22:22:28 +03:00
Nikolay Amiantov
90ad879753
nixos stage-1: unconditionally mount /dev/pts
2016-07-12 22:22:28 +03:00
Eelco Dolstra
9aa3e78ab2
Update 16.03 AMIs
2016-07-12 17:26:29 +02:00
Eelco Dolstra
94cc18e9aa
Add AMIs in ap-northeast-2 and ap-south-1
2016-07-12 17:26:25 +02:00
Eelco Dolstra
1e9b8bfb31
Copy AMIs in parallel
2016-07-12 17:26:16 +02:00
Eelco Dolstra
02db7d9821
Create AMIs with Enhanced Networking
...
Fixes #15956 .
2016-07-12 17:25:52 +02:00
Graham Christensen
d9724bcdbf
doc: add man page for nixos-version ( #16869 )
2016-07-12 16:29:13 +02:00
Eric Litak
2b47d24007
factorio: 0.12.35 -> 0.13.8
2016-07-12 05:03:51 -07:00
Bjørn Forsman
2eb8aab42c
nixos/systemd: disable timer units with service
...
A disabled systemd service with a "startAt" attribute, like this:
systemd.services.foo-service = {
enable = false;
startAt = "*-*-* 05:15:00";
...
};
will cause the following errors in the system journal:
systemd[1]: foo-service.timer: Refusing to start, unit to trigger not loaded.
systemd[1]: Failed to start foo-service.timer.
Fix it by not generating the corresponding timer unit when the service
is disabled.
2016-07-11 22:42:47 +02:00
Eric Sagnes
1349cd4e8d
fcitx: refactor ( #16858 )
2016-07-11 17:50:22 +02:00
Eelco Dolstra
44789200f0
Merge pull request #16835 from Jookia/RFC_coredump
...
systemd-coredump: Add systemd service and fix sysctl pattern.
2016-07-11 16:10:20 +02:00
Eelco Dolstra
56badfee94
amazon-image.nix: Add the ena driver
...
This is necessary for Enhanced Networking on x1.* instances.
2016-07-11 14:32:18 +02:00
Damien Cassou
85a895d60f
offlineimap: add nixos module ( #16842 )
2016-07-11 10:37:18 +02:00
Luca Bruno
5a245c24b0
gnome3: make 3.20 the default
2016-07-10 16:17:37 +02:00
Jookia
b187c869f4
systemd-coredump: Add systemd service and fix sysctl pattern.
2016-07-10 18:07:37 +10:00
Tuomas Tynkkynen
931706cdc1
extlinux-conf-builder: Choose whether to use DTBs on per-generation basis
...
Previously, the value from stdenv.platform.kernelDTB was used. That
doesn't work well if both kinds (DTB and non-DTB) of generations exist
in the system profile.
2016-07-10 03:03:51 +03:00
Luca Bruno
977e0c6599
nixos/bash: enable colors during completion
2016-07-09 20:51:31 +01:00
Eric Sagnes
1e53d4a777
fontconfig: fix etc priority
2016-07-09 16:50:13 +02:00
Vladimír Čunát
95a9fa0ba0
Merge branch 'master' into staging
2016-07-09 16:49:48 +02:00
Robert Helgesson
9f4775dbb5
ddclient service: use environment.etc
...
The ddclient daemon requires that the configuration file is only
accessible by the ddclient user. This since it typically contains login
information.
2016-07-09 14:51:36 +02:00
Nikolay Amiantov
9e48baa716
kbd service: add support for early loading of fonts and keymaps
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
803b1eedd6
kbd service: add system-wise console resources
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
5622226d5b
kbd service: drop a comment now when we do restart vconsole setup
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
8b92103ae8
Merge branch 'master' into staging
2016-07-08 20:36:44 +03:00
Nikolay Amiantov
4ae98c2064
Merge branch 'kbd-paths' into staging
...
Closes #16642
2016-07-08 20:35:25 +03:00
Anders Lundstedt
5f3c4bd11e
nixos: fix avahi connectivity for shairport-sync module
...
The shairport-sync service currently fails to start with the error
shairport avahi_entry_group_new failed
This problem seems to have been introduced by
cdd7310a50
After some trial and error I concluded that the attached commit is a minimal
fix.
2016-07-08 16:22:51 +02:00
Nikolay Amiantov
c89843b604
kbd: split keymaps into kbdKeymaps
2016-07-08 12:52:39 +03:00