Thomas Strobel
1da35629cc
Cleanup: remove newlines.
2014-08-14 12:42:16 +02:00
Thomas Strobel
b63b8260b5
Add thermald: Linux Thermal Daemon
2014-08-14 02:21:31 +02:00
Harald van Dijk
67a5ec4efb
nixos/lighttpd: fix modules for gitweb
...
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.
[Bjørn: modify commit message]
2014-08-12 21:16:01 +02:00
Vladimír Čunát
87c3c0e885
Merge master into #2129
...
Conflicts (easy, just UID shifted):
nixos/modules/misc/ids.nix
nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Matt Miemiec
8695c58648
Add the bspwm window manager to Nix.
2014-08-12 18:22:15 +02:00
Luca Bruno
14895d6c95
Merge branch 'gdm'
2014-08-12 14:57:38 +02:00
Domen Kožar
cc8e4f6814
provide pulseaudioFull and set it as default to hardware.pulseaudio.package
2014-08-12 12:51:25 +02:00
Luca Bruno
1a29fcae69
gdm: Add very experimental display manager
2014-08-12 11:23:42 +02:00
Rickard Nilsson
66858833e3
mopidy: Add mopidy-scan service for scanning local media
2014-08-12 01:40:44 +02:00
Rickard Nilsson
7b5829c314
Add NixOS module for syslog-ng
2014-08-11 15:06:11 +02:00
Eelco Dolstra
c7ca46904f
tests/ipv6.nix: Fix race
...
http://hydra.nixos.org/build/13119647
2014-08-10 14:51:23 +02:00
Jaka Hudoklin
675d76b00c
nixos/znc: add option to add module packages to znc
...
Besides that add option for extra znc config and fix a lot of stuff
2014-08-09 19:35:59 +02:00
Eelco Dolstra
4668f37444
Fix NixOS evaluation on i686-linux
2014-08-09 17:19:09 +02:00
Eelco Dolstra
7a09c6018d
Manual: Generate PDF
...
Issue NixOS/nixos#237 .
2014-08-09 16:33:12 +02:00
Eelco Dolstra
aeb5c14eb9
Manual: Remove outdated author stuff
2014-08-09 16:33:01 +02:00
Eelco Dolstra
80a3c883a9
Manual: Render function defaults
2014-08-09 16:33:01 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Rickard Nilsson
a01862a4b6
nslcd nixos service: Should be wantedBy multi-user, otherwise not started if activated on running server (only starts on bootup)
2014-08-08 17:40:14 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Joel Taylor
d8cca3d624
fail2ban: systemd support
...
- upgrade fail2ban to 0.9
- override systemd to enable python support and include sqlite3 module
- make fail2ban enablable
2014-08-08 00:10:19 +02:00
System administrator
5355d3d30b
logrotate: use systemd instead of cron
2014-08-07 08:58:50 +02:00
Eelco Dolstra
d5b5d763cd
Fix evaluation
2014-08-06 19:44:13 +02:00
Rob Vermaas
34e6cb5083
Merge pull request #3476 from wkennington/master.unifi
...
Add support for the unifi access point controller
2014-08-06 17:00:54 +02:00
Rob Vermaas
46205faf69
Fix evaluation in virtualbox-image.nix
2014-08-06 16:25:42 +02:00
Eelco Dolstra
2b9ea7fd90
test-instrumentation.nix: Set an empty root password
...
This makes it easier to log in during interactive sessions.
2014-08-06 14:15:23 +02:00
Eelco Dolstra
eab25b104a
test-instrumentation.nix: Improve logging
...
In particular, don't clobber the serial console with duplicate output
from systemd and the journal, and increase the log level.
2014-08-06 14:15:18 +02:00
Eelco Dolstra
0d3b3bd01b
systemd: Use the default log target ("journal-or-kmsg")
...
This ensures that early systemd messages end up in the journal (via
the kmsg buffer).
2014-08-06 14:15:12 +02:00
William A. Kennington III
377454ff0e
nixos/unifi: Explain and simplify the bind mount configuration
2014-08-05 23:15:49 -05:00
William A. Kennington III
12ad29226c
nixos/unifi: Fix ordering of mount rules
2014-08-05 22:09:15 -05:00
William A. Kennington III
dfb596b49b
nixos/unifi: Add service module
2014-08-05 21:40:47 -05:00
William A. Kennington III
beddd36c95
nixos/stage-1: Don't check resilient filesystems
2014-08-05 21:06:51 +02:00
Rickard Nilsson
534a01c2b0
amazon ec2: Make fetch-ec2-data more robust
...
curl does not retry if it is unable to connect to the metadata server.
For some reason, when creating a new AMI with a recent nixpkgs, the
metadata server would not be available when fetch-ec2-data ran. Switching
to wget that can retry even on TCP connection errors solved this problem.
I also made the fetch-ec2-data depend on ip-up.target, to get it to start
a bit later.
2014-08-05 15:12:26 +02:00
Eelco Dolstra
d9e6c07c5b
Remove the containers test from the release-critical builds
...
Too many random failures...
2014-08-05 10:25:42 +02:00
Shea Levy
8a35a474fe
Merge branch 'vbox-configurable-imgsize' of git://github.com/rickynils/nixpkgs
2014-08-04 13:20:13 -04:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
b35770818d
In Nix chroots, provide plain bash, not bash-interactive
...
This way we don't get ncurses in the chroot. Also, use a bind-mount of
/bin/sh to bash, rather than the entire /bin from the host filesystem.
2014-08-04 16:46:39 +02:00
Luca Bruno
769ab3a218
nixos synaptics: allow null value for accelFactor, minSpeed and maxSpeed
...
Some desktop managers like GNOME are able to tweak the speed
of the mouse or synaptics at runtime with good defaults.
2014-08-04 13:42:27 +02:00
Rickard Nilsson
ced7fc37c2
virtualbox-image: Make the image size configurable
2014-08-04 11:29:51 +02:00
Chris Farmiloe
34890e7c2a
nixos: Add enablePHP convinence option to services.httpd module to mimic subservices option
...
Fixes #2699
2014-08-03 21:11:45 +02:00
lethalman
c6f9222a22
Merge pull request #3370 from geerds/trackpoint
...
Fix trackpoint configuration on some systems
2014-08-03 20:45:09 +02:00
aszlig
9d3fbcd054
tomcat: Fix evaluation after e27dcff
.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-03 16:09:45 +02:00
Sander van der Burg
2e44bb9ead
Merge pull request #3425 from luke-clifton/lc-tomcat-jdk
...
Allows the JDK to be chosen in services.tomcat
2014-08-03 14:55:46 +02:00
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Shea Levy
fb565f1a4e
amazon-image.nix: Overwrite busybox swapon
2014-08-01 17:55:37 -04:00
Shea Levy
7fec575976
Fix lib functions taken from pkgs.lib instead of lib in nixos
2014-08-01 16:23:56 -04:00
Rob Vermaas
3566807e76
Google Compute image:
...
Removed the 'wait for GCE metadata service' job, as it was causing
issues with the metadata service (likely some firewall or something).
In stead, use wget with retries (including connection refused) in
stead or curl for fetching the SSH keys. Also made the stdout/-err
of this job appear in the console.
2014-08-01 15:25:50 +02:00
Luke Clifton
e27dcfff1b
Allows the JDK to be chosen in services.tomcat
2014-08-01 16:52:19 +08:00
Eelco Dolstra
549855113b
modprobe.nix: Use modern environment.etc syntax
2014-07-31 22:09:51 +02:00
Danny Groenewegen
51494f2c33
Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202
2014-07-31 16:51:51 +02:00
Emery Hemingway
63d259df32
nixos: tmp on tmpfs option
...
/tmp cleaning is done by systemd rather than stage-2-init
enableEmergencyMode moved from systemd to seperate module
new option to mount tmp on tmpfs
new option to enable additional units shipped with systemd
2014-07-30 16:19:26 +02:00