James Cook
33550b6efe
Merge pull request #5665 from joachifm/dnscrypt-proxy-apparmor-updates
...
dnscrypt-proxy service: update AppArmor profile
2015-02-14 22:02:31 -08:00
William A. Kennington III
1fddcd1e83
grub: Don't remove zfs support if contained in the default binary
2015-02-13 14:40:41 -08:00
William A. Kennington III
69a277e2cc
iwlegacy: Remove since it is already in linux-firmware-nonfree
2015-02-13 14:27:47 -08:00
Harald van Dijk
0fe9d58e4e
stage-1-init: fix PID 1 shell
...
The PID 1 shell is executed as the last command in a sh invocation. Some
shells implicitly use exec for that, but the current busybox ash does not,
so the shell gets a wrong PID. Spell out the exec.
2015-02-13 10:20:29 +00:00
lethalman
51a7277fac
Merge pull request #6312 from k0ral/sslh
...
sslh: added libwrap support + improved nixos module.
2015-02-13 10:03:48 +01:00
Domen Kožar
5a4614dc1f
Add hid_lenovo to initrd kernel modules
2015-02-13 01:42:13 +01:00
Jaka Hudoklin
a17f5c8c9b
nixos/consul: add consul-alerts service
2015-02-12 19:16:50 +01:00
Jaka Hudoklin
36e7a61dde
Merge pull request #6222 from offlinehacker/limesurvey
...
add limesurvey package and nixos module
2015-02-12 18:07:42 +00:00
koral
cb153cfca3
sslh: added libwrap support + improved nixos module.
2015-02-12 13:21:36 +01:00
Michael Alan Dorman
f21cab27a4
Fix initial-install issues with couchdb.nix.
...
When starting from a clean slate, the couchdb service fails.
First, the pre-start script fails because it tries to chown the uriFile,
which doesn't exist. It also doesn't ensure that the directory in which
the uriFIle is placed is writeable by couchdb, which could also cause
failure (though I didn't observe this).
Additionally, the log file's default location isn't a directory owned by
couchdb, nor is the file guaranteed to exist, nor is it guaranteed to be
chowned to the appropriate user. All of which can cause unexpected
failure.
As a bonus I made a small change in the description of the configFile
attribute, in the hopes of making it a little more obvious why it
existed.
2015-02-11 20:42:52 -05:00
William A. Kennington III
35e9d3c112
nixos/zfs: Use the git version for kernels unsupported by 0.6.3
2015-02-11 15:11:56 -08:00
Luca Bruno
e088fd0314
Revert "Merge pull request #5626 from matthiasbeyer/add-fish_shell_module"
...
This reverts commit 157d199b33
, reversing
changes made to 4c7adddcb7
.
2015-02-11 18:31:11 +01:00
Luca Bruno
c427b48ba6
Revert "Add fish to nixos module list"
...
This reverts commit d7f5d00f0a
.
2015-02-11 18:30:58 +01:00
Luca Bruno
d7f5d00f0a
Add fish to nixos module list
2015-02-11 14:05:30 +00:00
lethalman
157d199b33
Merge pull request #5626 from matthiasbeyer/add-fish_shell_module
...
Add basic nixos module for fish shell
2015-02-11 15:05:03 +01:00
Luca Bruno
f7b26bf98f
gnome3: Set XCURSOR_PATH. Closes #6191
2015-02-11 11:48:51 +00:00
lethalman
c1d22c947e
Merge pull request #6278 from bendlas/cdemu
...
Add cdemu packages and module
2015-02-10 15:33:06 +01:00
Herwig Hochleitner
983fddcea8
Move cdemu module into programs
2015-02-10 13:14:09 +01:00
lethalman
12834a8500
Merge pull request #6072 from AndersonTorres/window-managers
...
Update NixOS module files to include WindowMaker
2015-02-10 13:06:06 +01:00
Herwig Hochleitner
b909def3e1
Whitespace cleanup
2015-02-10 11:49:32 +01:00
lethalman
93ebaafabe
Merge pull request #6170 from k0ral/sslh
...
New sslh module
2015-02-10 11:17:56 +01:00
lethalman
7614b2f984
Merge pull request #6229 from devhell/canto
...
canto-{curses,daemon}: Add packages
2015-02-10 10:34:11 +01:00
Luca Bruno
d06122c58d
Add PermissionsStartOnly to mpd service. Closes #6277
2015-02-10 10:18:54 +01:00
Herwig Hochleitner
2961b83d08
Add cdemu packages and module
2015-02-10 06:49:47 +01:00
William A. Kennington III
650b2258f0
nonfree-firmware: Use the new kernel.org repository for tracking nonfree firmware changes
...
remove the obsolete iwlwifi firmware which is included in the repo.
2015-02-09 16:28:40 -08:00
William A. Kennington III
b556983eb7
nixos/system: Add xhci_pci as it is needed to detect host buses in the initrd for usb keyboards on the xhci bus and storage devices on the iso
2015-02-09 13:09:26 -08:00
Wout Mertens
8f42f33c45
stage-1-init: better warnings
...
- Suppress spurious LVM FD3 warning:
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432986
- Warn when device doesn't come online
2015-02-09 21:53:51 +01:00
Shea Levy
24c0844cfb
Fix grub on nodev installs
2015-02-08 22:31:14 -05:00
William A. Kennington III
c4bec1a0a4
Merge pull request #6152 from abbradar/samba-clean
...
nixos/samba: cleanup and update defaults
2015-02-08 14:20:49 -08:00
William A. Kennington III
2a0754ccbc
Merge pull request #5994 from ts468/grub
...
Add 'target' parameter for GRUB installation chain
2015-02-08 14:18:13 -08:00
devhell
a9ac564f50
canto-daemon: Fix typo and remove TimeoutStopSec
2015-02-08 14:16:17 +00:00
devhell
d6e9df1e1a
canto-daemon: Add a systemd service
...
This adds a systemd service for the canto-daemon.
2015-02-08 14:16:17 +00:00
Domen Kožar
b83433cdd1
Remove gui (see #6207 ), use nixui instead
2015-02-08 10:47:58 +01:00
William A. Kennington III
42a6ac5209
nixos/iso: Increase efi image size to 15M
2015-02-07 20:38:24 -08:00
William A. Kennington III
0fa4c9d6d3
nixos/zfs: Fix references to zfs packages now that they are split
2015-02-07 15:07:39 -08:00
Jaka Hudoklin
41ae4d1af9
add limesurvey package and nixos module
2015-02-07 23:18:51 +01:00
Jaka Hudoklin
f85abb041a
Merge pull request #5622 from offlinehacker/panamax
...
panamax: new package and service
2015-02-07 14:56:25 +00:00
Jaka Hudoklin
769fb8a141
Merge pull request #5486 from matejc/fixgatewayd
...
systemd-journal-gatewayd: add systemd-journal group
2015-02-07 14:52:31 +00:00
Jaka Hudoklin
ae34f923f7
panamax: simplify, refactor, add test
2015-02-07 15:32:20 +01:00
Matej Cotman
8c79a2df63
panamax: new package and service
2015-02-07 15:32:20 +01:00
William A. Kennington III
9792b12e53
nixos/openntpd: Don't start until we have networking
...
This attempts to fix an issues where ntp is unable to resolve hostnames
because it came up before local nameservers or networking.
2015-02-06 14:45:47 -08:00
William A. Kennington III
3e280f2089
nixos/tinc: Fix key generation behavior and use tinc 1.1 by default
2015-02-05 23:37:20 -08:00
Eelco Dolstra
d2bfb5ceb0
Add options for installing additional root certificates
2015-02-05 18:08:35 +01:00
Nikolay Amiantov
f35568e705
Merge pull request #5277 from abbradar/uwsgi
...
Add uWSGI application server
2015-02-05 17:10:37 +03:00
koral
1439e72147
New sslh module.
2015-02-05 13:30:39 +01:00
Edward Tjörnhammar
83925c33f6
i2pd: 0.6.0 -> 0.7.0
...
nixos: i2pd.service, fix string escaping
2015-02-05 12:09:59 +01:00
William A. Kennington III
9ddb6c9cc9
nixos/tinc: Add daemon configuration
2015-02-04 18:19:04 -08:00
William A. Kennington III
bae5faa82d
nixos/dhcpd: Also try restarting openntpd as it suffers the same dns resolution problem
2015-02-04 17:33:14 -08:00
William A. Kennington III
43d8b1ef3c
openntpd: Fixes
2015-02-04 17:30:22 -08:00
William A. Kennington III
a9f1329d2d
nixos/openntpd: Add openntpd to the environment for ntpctl
2015-02-04 17:27:03 -08:00
Nikolay Amiantov
b22a1ff683
Merge pull request #4485 from abbradar/parsoid
...
Add "parsoid" service
2015-02-04 23:08:28 +03:00
Nikolay Amiantov
b903bf0a57
nixos/samba: cleanup and update defaults
2015-02-04 22:31:50 +03:00
AndersonTorres
fff55a968e
Update NixOS module files to include WindowMaker
...
According to a hint on NixOS mailing list[1], I updated nixos/modules/services/x11/window-managers/default.nix
to include windowmaker.
1 - https://github.com/NixOS/nixpkgs/pull/4066#issuecomment-72017611
2015-02-03 21:24:12 -02:00
Lukas Lihotzki
c848d05de9
gitlab: Fix typo
2015-02-03 22:08:10 +01:00
lethalman
49b67bb9cb
Merge pull request #6078 from boothead/sabnzbd
...
sabnzbd Change service to systemd
2015-02-03 13:32:59 +01:00
Peter Simons
b7ecd5e729
Merge pull request #5025 from abbradar/xmonad-wrapper
...
nixos/xmonad: make a wrapper
2015-02-03 11:52:09 +01:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Nikolay Amiantov
b7bb524f04
nixos/xmonad: move to haskell-ng and make a wrapper
2015-02-03 01:05:23 +03:00
Nikolay Amiantov
51681449da
uwsgi: add nixos module
2015-02-02 22:23:42 +03:00
Nikolay Amiantov
9a04482af7
parsoid: add service
2015-02-02 22:21:45 +03:00
Thomas Tuegel
0fee7a2b21
fontconfig: stringify dpi correctly
2015-02-01 16:18:48 -06:00
Bjørn Forsman
ee52a61e3a
nixos/tftpd: add option types and fixup descriptions
...
The first description is a (incorrect) copy/paste from the 'vsftpd'
module, and the second option lacks a 'dot' at the end.
2015-02-01 15:57:28 +01:00
lethalman
9576ff49d8
Merge pull request #5737 from matthiasbeyer/add-gitolite_admin_pubkey_oneline_note
...
Add note that admin-pub-key for gitolite has to be written in one line
2015-01-30 11:24:06 +01:00
lethalman
41cca7d2d6
Merge pull request #6045 from ragnard/apache-kafka
...
apache-kafka: New package and service
2015-01-30 10:50:14 +01:00
Luca Bruno
a239775488
Merge PR #5772 , boot.loader.timeout
2015-01-30 10:39:50 +01:00
Bob van der Linden
a3d5f4f3ef
nixos: gummiboot: change default to 1000 if boot.loader.timeout is null
...
When gummiboot.timeout == null, the menu will still be skipped.
When gummiboot.timeout == 0, the menu will also be skipped.
The only way to show the menu 'indefinitely' is to show it a long time.
2015-01-30 10:36:21 +01:00
Bob van der Linden
f93ba51469
nixos: loader: added generic config.boot.loader.timeout option
...
timeout options of grub and gummiboot will inherit the value of this
option by default.
2015-01-30 09:53:44 +01:00
Shea Levy
52d4b9d982
Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs
2015-01-30 01:07:59 -05:00
Ragnar Dahlén
17bd96ea25
apache-kafka: New service for Apache Kafka
2015-01-29 11:10:22 +00:00
lethalman
a15edc22e3
Merge pull request #5615 from nckx/freefall
...
Add freefall: hard drive protection on HP/Dell laptops
2015-01-28 18:52:46 +01:00
Eelco Dolstra
378006f0f2
Restrict the length of container names
2015-01-28 16:13:00 +01:00
Jaka Hudoklin
c0eff1de61
Merge pull request #5939 from offlinehacker/nixos/containers/containers_in_containers
...
nixos/containers: make containers in containers possible
2015-01-28 16:07:17 +01:00
Jaka Hudoklin
2af3ff52c2
nixos/containers: make containers in containers possible
2015-01-28 16:06:44 +01:00
Tobias Geerinckx-Rice
ff5eae075a
Add freefall NixOS service module
2015-01-28 15:59:21 +01:00
Eelco Dolstra
b61d4ac6a5
ntpd: Fork into the background
...
With -n, ntpd will write log messages to both syslog and stderr, which
is ugly.
2015-01-28 15:34:42 +01:00
Thomas Strobel
3767370866
Add target parameter to grub installation chain
2015-01-27 19:46:37 +01:00
Eelco Dolstra
53710c752a
nixos-rebuild: Update fallback code to update Nix
2015-01-27 18:58:20 +01:00
Eelco Dolstra
6f8fad2253
Remove executable bits from non-executable files
2015-01-27 18:54:38 +01:00
Thomas Tuegel
63ec1a9677
add stable attrs for plasma5, kf5, and kdeApps
2015-01-26 21:01:07 -06:00
Thomas Tuegel
a55543711e
kde5: simplify package list
2015-01-26 21:01:06 -06:00
Thomas Tuegel
3a97ea592f
kdm: install default backgrounds
2015-01-26 21:01:06 -06:00
Thomas Tuegel
726b80bc87
startkde: don't split script between NixOS module and package
2015-01-26 21:01:06 -06:00
Thomas Tuegel
e7508b831f
kde5: warn if enabled with kde4
2015-01-26 21:01:05 -06:00
Thomas Tuegel
16b54d19d3
kde5: rename plasma5 desktop module
2015-01-26 21:01:05 -06:00
Thomas Tuegel
5c52354ee8
add NixOS module for Plasma desktop
2015-01-26 21:00:38 -06:00
Thomas Tuegel
849647a3eb
environment: set paths for Qt plugins and QML
2015-01-26 20:59:49 -06:00
Domen Kožar
9df1bdefef
Merge pull request #5982 from robberer/pkgs/openldap
...
openldap: add dataDir, use cfg.user and cfg.group to run slapd
2015-01-26 10:33:57 +01:00
Domen Kožar
c1ce67561d
openldap: correct directory hint
2015-01-26 10:03:25 +01:00
Longrin Wischnewski
a4af32eec3
openldap: add dataDir, use cfg.user and cfg.group to run slapd
2015-01-26 09:35:56 +01:00
aszlig
d110f5adf7
nixos/gitlab: Fix evaluation.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 08:20:14 +01:00
Jaka Hudoklin
6e7d708bcc
nixos/rabbitmq: fix module
2015-01-26 02:09:04 +01:00
Charles Strahan
6eaa419920
gitlab: fix evaluation
2015-01-25 16:28:18 -05:00
Domen Kožar
2daba83828
openldap: add example config
2015-01-25 21:15:29 +01:00
Edward Tjörnhammar
6bbec634a7
Merge pull request #5850 from edwtjo/kodi-plugins
...
XBMC to Kodi migrations
2015-01-24 14:17:14 +01:00
Domen Kožar
cb7cd012df
Merge pull request #5593 from abbradar/modprobe-fix
...
modprobe: wrap all of kmod
2015-01-24 07:11:16 +01:00
Domen Kožar
fde45d217e
Merge pull request #5531 from abbradar/tlp
...
tlp: add package
2015-01-24 07:10:48 +01:00
Nikolay Amiantov
b7b3a0972d
nixos/tlp: add service
2015-01-24 02:56:21 +03:00
Eelco Dolstra
11a0344e13
Merge pull request #5918 from robberer/openntpd
...
openntpd: add extraConfig and extraOptions
2015-01-23 16:43:15 +01:00
Longrin Wischnewski
4fa5d1f626
openntpd: add extraConfig and extraOptions
2015-01-23 16:15:20 +01:00
aszlig
127c928c23
nixos/rename: Fix merging multiple destinations.
...
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.
We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-22 14:08:28 +01:00