Bjørn Forsman
25a6745310
nixos/fail2ban: capitalize service description
2015-02-22 16:54:14 +01:00
Lluís Batlle i Rossell
4e99901961
nixos: Adding OATH in pam.
...
(cherry picked from commit cb3cba54a1b87c376d0801238cb827eadb18e39e)
Conflicts:
nixos/modules/security/pam.nix
2015-02-22 15:25:38 +01:00
Bjørn Forsman
419a4166a7
nixos/haproxy: small cleanup
...
* Add option types
* Rewrite option descriptions
* /var/run/haproxy.pid => /run/haproxy.pid (canonical location)
2015-02-22 12:29:34 +01:00
aszlig
030895f075
nixos/dhcpcd: Only run resume commands if enabled.
...
The networkd implementation sets systemd.services.dhcpcd.enable to
false in nixos/modules/tasks/network-interfaces-systemd.nix. So we need
to respect that in the dhcpcd module.
If we don't, the resumeCommand is set nevertheless, which causes the
post-resume.service to fail after resuming:
Failed to reload dhcpcd.service: Unit dhcpcd.service is masked.
post-resume.service: main process exited, code=exited, status=1/FAILURE
Failed to start Post-Resume Actions.
Dependency failed for Post-Resume Actions.
Unit post-resume.service entered failed state.
post-resume.service failed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:09:04 +01:00
Thomas Tuegel
d15d0bebc3
kde5: remove file collisions
2015-02-21 20:58:43 -06:00
Thomas Tuegel
68f2db74ff
kde5: always use plasma-nm
2015-02-21 13:59:28 -06:00
Thomas Tuegel
7eb8a9b41f
kde5: install media-player-info udev rules for solid
2015-02-21 11:39:21 -06:00
Thomas Tuegel
532650e4bb
kde5: change notice about default Phonon backend
2015-02-21 11:39:21 -06:00
Thomas Tuegel
e5de75bf2a
kde5: install kde-frameworks version used by plasma
2015-02-21 11:39:21 -06:00
Thomas Tuegel
b050babd3e
kde5: fix Phonon GStreamer backend
2015-02-21 11:39:20 -06:00
Thomas Tuegel
a79936561b
environment: use Qt 5 Qml import paths
2015-02-21 11:39:20 -06:00
Vladimír Čunát
a3a467ce77
nixos/nvidia: use correct 32-bit legacy libs; refactor
...
Fixes #6127 .
Now we avoid multiple switches among the version possibilities.
2015-02-21 16:34:24 +01:00
Bjørn Forsman
97875ac175
bridge-utils: align attrname with pkgname
2015-02-20 22:30:51 +01:00
Thomas Strobel
c62e42e9c5
Enhance stage-1/2 scripts for better dealing with squashfs
2015-02-20 17:42:22 +01:00
Peter Simons
263a49be20
Merge pull request #5704 from eduarrrd/nixos-version
...
Add option to display git revision to nixos-version
2015-02-20 16:35:56 +01:00
Shea Levy
2fe3a3c203
Merge branch 'grub' of git://github.com/ts468/nixpkgs
...
Fix grubTarget on nodev installs
2015-02-20 07:47:06 -05:00
tv
86cb16965a
exim: add version 4.85 incl. nixos module
2015-02-20 10:49:15 +01:00
Shea Levy
3e44f99055
Fix grub 1 install
2015-02-19 19:33:17 -05:00
Eelco Dolstra
5762f8f95c
Add options to support signed binary caches
...
Typical use:
nix.requireSignedBinaryCaches = true;
nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];
(The public key of cache.nixos.org is included by default.)
Note that this requires Nix 1.9 and that most of cache.nixos.org
hasn't been signed yet.
2015-02-19 14:22:43 +01:00
Jaka Hudoklin
ebfadc2fc9
Merge pull request #6452 from rushmorem/update-chronos-port
...
Update chronos default port
2015-02-19 14:13:00 +01:00
rushmorem
74b40e9a43
Add marathon mesos framework
2015-02-19 13:30:00 +02:00
rushmorem
a661802d29
Update chronos default port
...
Update chronos default port to match the one documented on
their website (http://airbnb.github.io/chronos ). The one in
their repo (the current one) clashes with the marathon documented
one.
2015-02-19 12:31:12 +02:00
Eelco Dolstra
4ac280ec49
Blacklist the nouveau driver on EC2
2015-02-18 13:04:10 +01:00
Sou Bunnbu
f8dbd6f9ae
Merge pull request #6427 from grwlf/vsftpd-port
...
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 19:18:34 +08:00
Sergey Mironov
ac65a757f0
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 11:51:43 +03:00
Mathijs Kwik
2fe44b95d0
nixos/wpa_supplicant: fix conflicting documentation
...
fixes #6298
2015-02-17 22:16:20 +01:00
James Cook
6daf9aa922
Merge pull request #5995 from ts468/qemu-vm
...
Update QEMU Nixos Virtual Machine
2015-02-16 13:13:26 -08:00
Thomas Strobel
c61ff9b51e
Fix grubTarget on nodev installs
2015-02-16 20:19:44 +01:00
Thomas Strobel
80afabd5b5
Update QEMU Nixos Virtual Machine
...
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
2015-02-16 20:07:42 +01:00
Evgeny Egorochkin
4621f16b34
azure: add a job to download ssh host and root keys if they are made available via "custom data"; see #3986
2015-02-16 16:54:30 +02:00
Eelco Dolstra
5d7000df68
Automatically set nix.nrBuildUsers to at least nix.maxJobs
2015-02-16 12:02:49 +01:00
Wout Mertens
65438da88a
Merge pull request #6357 from NixOS/jobs-vs-users
...
nix-daemon: Sanity check maxJobs vs nrBuildUsers
2015-02-16 11:42:24 +01:00
Rob Vermaas
824fccd3e9
Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.
...
(cherry picked from commit 213fe8427c5ce455b893c0c5c56cc38175bf36b7)
2015-02-16 09:57:19 +00:00
Eelco Dolstra
5092d625d6
/etc/ssl/certs/ca-bundle.crt -> ca-certificates.crt
...
Even though there is no "official" standard location, it's better to
stick to what most distros are using.
2015-02-15 19:06:31 +01:00
Eelco Dolstra
75e1b5e317
Provide symlinks to ca-bundle.crt for compat with other distros
...
There is no "standard" location for the certificate bundle, so many
programs/libraries have various hard-coded default locations that
don't exist on NixOS. To make these more likely to work, provide
some symlinks.
2015-02-15 19:06:31 +01:00
AndersonTorres
f19ed980a2
Sawfish (git): New Package
...
Sawfish is a versatile, Lisp-based window manager
In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
2015-02-15 19:42:53 +03:00
Wout Mertens
d41367735d
nix-daemon: Sanity check maxJobs vs nrBuildUsers
2015-02-15 15:37:30 +01:00
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