Commit Graph

3462 Commits

Author SHA1 Message Date
Jaka Hudoklin
e0881324ac Merge pull request #9925 from oxij/nixos-cleanups-and-fixes
nixos types: cleanups and fixes
2015-09-19 00:28:49 +02:00
Arseniy Seroka
b2578aa871 Merge pull request #9927 from oxij/nixos-discoverability
nixos: rename some outputs for better discoverability in /nix/store
2015-09-19 00:17:49 +03:00
Jan Malakhovski
75ba6b553c nixos: add physlock service 2015-09-18 19:12:34 +00:00
Jan Malakhovski
a153de28bb nixos: rename some outputs for better discoverability in /nix/store 2015-09-18 19:00:20 +00:00
Jan Malakhovski
dddcec21fe nixos: add xfs support to profiles/minimal 2015-09-18 18:58:18 +00:00
Jan Malakhovski
6eadb16022 nixos: fix some types 2015-09-18 18:48:50 +00:00
Jan Malakhovski
33ae3f2fe4 nixos,lib: move environment generation related copy-paste to lib 2015-09-18 18:48:49 +00:00
Bryan Gardiner
d42fbef595
xf86-input-synaptics: make use of 50-synaptics.conf
The default synaptics functionality (without this file) is limited for
clickpads: the right soft button area in the bottom right isn't active by
default, so the entire pad generates left-clicks.  There is no way to
right-drag.

This file defines soft button areas and provides some matching rules.
These settings don't conflict with the synaptics options that NixOS
provides.
2015-09-18 07:16:52 -07:00
lethalman
d6fd3c4270 Merge pull request #9317 from dfoxfranke/oidentd-ipv6
oidentd: listen on IPv6
2015-09-18 15:20:02 +02:00
aszlig
da0e642c2b
tests/virtualbox: Add systemd-detect-virt subtest.
Addresses #9876 in the way that we want to make sure that VirtualBox 5.x
is going to be properly detected. Right now the result is "kvm", so the
subtest fails as expected with:

error: systemd-detect-virt returned "kvm" instead of "oracle" at (eval
       14) line 414, <__ANONIO__> line 92.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
Eelco Dolstra
e636e0a532 gdb: Look for debug info in /run/current-system/sw/lib/debug
The previous default was $out/lib/debug, which wasn't very useful.

This ensures that you can do

  environment.systemPackages = [ pkgs.hello.debug ];

to install debug info.
2015-09-17 15:56:37 +02:00
aszlig
03730319bd
nixos/virtualbox-image: Use 32MB of video memory.
Booting the demo/installer image won't work if the video memory is too
low. It boots into KDE, shows the background image and doesn't do
anything, according to @domenkozar.

Thanks to @domenkozar for reporting and testing this with 32MB.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:59 +02:00
aszlig
4e23f1f908
nixos/virtualbox-image: Enable PAE on 32bit.
pkgs/os-specific/linux/kernel/common-config.nix defines HIGHMEM64G on
line 441 for 32bit systems, which implies PAE.

We now creating the OVA with PAE support enabled, which fixes bootup of
the image if people are just importing it without setting PAE
explicitly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:59 +02:00
aszlig
effe0309ee
tests/virtualbox: Put name in log descriptions.
Makes it easier to debug and find out for which machine a certain log
socket has been started or stopped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:59 +02:00
aszlig
29f535761a
tests/virtualbox: Use antiquotes for log sockets.
We're simply using antiquotation, since it's been a while since these
got introduced (in Nix 1.7). So we can use them because it makes the
code much more readable.

As usual, I made sure that I didn't accidentally change something in
functionality:

$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
aszlig
17f58275a0
tests/virtualbox: Fix long line in guestAdditions.
This is essentially not only "wrapping" the line but refactoring into a
shorter name which is used in two places.

And yes, I know I'm very pedantic if it comes to whitespaces and line
lengths, but I made sure this doesn't change any functionality:

$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
aszlig
8f98226f50
tests/virtualbox: Allow to call it with debug attr.
Instead of manually setting debug to true or false, this should make it
possible to now run the test like this:

nix-build nixos/tests/virtualbox.nix --arg debug true

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 12:31:58 +02:00
Vladimír Čunát
485ea9a621 xf86_video_nouveau: deprecate this alias 2015-09-17 09:11:18 +02:00
Matthias Beyer
a38d9d1ca8 nixos-container: Add bash completion for "nixos-container" command 2015-09-16 22:18:48 +02:00
Domen Kožar
122efd93d0 Merge pull request #9880 from mbbx6spp/add-package-option-elasticsearch-module
elasticsearch module: add package option
2015-09-16 10:48:16 +02:00
Florian Baumann
88a3951926 mlmmj: Fix invalid mailman entry and update transports and virtual dbs on activation 2015-09-16 09:31:38 +02:00
aszlig
0d4a3ce485
tests/virtualbox: Give test machines more memory.
Sometimes there are random kernel panics do to the lack of memory in the
qemu guests, but as we're setting the VirtualBox memory size relatively
low, 1024 MB should be enough for the qemu guests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-16 00:19:52 +02:00
aszlig
7707c7df7f
tests/virtualbox: Start systemwide DBus in guests.
We want to check whether DBus functionality is working, so let's make
sure it is running in our mini-initrd.

DBus unfortunately requires to have users properly set up and another
configuration file other than in ${dbus.daemon}/etc/dbus-1/system.conf,
so we do provide that as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-16 00:19:52 +02:00
Susan Potter
79c1bbf050 Add package option to elasticsearch NixOS module 2015-09-15 15:49:04 -05:00
Luca Bruno
dfeee51818 nixos tests: add gdm test 2015-09-15 14:25:36 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Tobias Geerinckx-Rice
193319ce03 "Parallel Tools" -> Parallels Tools 2015-09-15 08:51:02 +02:00
Tobias Geerinckx-Rice
4105fe0062 nixos: correct "Kubernets" -> "Kubernetes" 2015-09-15 08:51:01 +02:00
Arseniy Seroka
d9ac1c31b2 Merge pull request #9819 from gebner/xdotool-3-20150503-1
xdotool: 2.20110530.1 -> 3.20150503.1
2015-09-14 17:40:49 +03:00
Luca Bruno
c94a625585 nixos gdm: use AutomaticLogin if delay is zero. Closes #9843 2015-09-14 08:48:53 +00:00
Luca Bruno
6644af5910 nixos gdm: add debug option 2015-09-14 08:33:44 +00:00
William A. Kennington III
c2e4fb29c6 nixos/lxd: Add service 2015-09-13 23:27:31 -07:00
Tobias Geerinckx-Rice
b6c24c12b4 nixos: samba module: fix typo & clarify 2015-09-14 02:51:39 +02:00
Matej Cotman
8a79bdddf8 Merge pull request #9825 from ericsagnes/connman-conf
connman: improved configuration
2015-09-13 14:30:33 +02:00
Geoffrey Reedy
9d3da3a3bf nixos i18n: add option to set console keymap from xkb
Close #9675. The expression was refactored heavily by vcunat.
2015-09-13 11:02:16 +02:00
Mathnerd314
87012187b2 kmod-debian-aliases: init at 21-1 2015-09-13 10:55:44 +02:00
Eric Sagnes
095bf185ec connman: improved configuration support 2015-09-12 23:31:50 +09:00
Gabriel Ebner
50b1ca6dcc xdotool: 2.20110530.1 -> 3.20150503.1 2015-09-12 13:18:31 +02:00
Nikolay Amiantov
a2f246770e Merge pull request #9782 from abbradar/deluge-restart
nixos/deluge: restart daemon if it's stopped from GUI
2015-09-12 00:03:13 +03:00
Eelco Dolstra
9ad5315b52 Merge pull request #9772 from lethalman/containers
nixos containers: fix system path when reloading
2015-09-11 18:25:16 +02:00
Edward Tjörnhammar
d3cff630ac Merge pull request #9792 from noqqe/master
mlmmj: postfix master config uses deprecated nextHop instead of nexthop
2015-09-11 18:15:38 +02:00
Arseniy Seroka
cb90dbfafe Merge pull request #9745 from bramd/brltty
Brltty
2015-09-11 19:13:58 +03:00
Edward Tjörnhammar
8b0aa65c67 Merge pull request #9793 from noqqe/mlmmj-fix-customheaders
mlmmj: fixing reply-to field in customheaders
2015-09-11 18:05:30 +02:00
Luca Bruno
682777ed24 nixos containers: fix system path when reloading 2015-09-11 16:59:40 +02:00
Florian Baumann
3ea6eda04e mlmmj: fixing reply-to field in customheaders 2015-09-11 14:28:47 +02:00
Florian Baumann
7adb779d1f mlmmj: postfix master config uses deprecated nextHop instead of nexthop 2015-09-11 13:27:15 +02:00
Nikolay Amiantov
0570ea2169 nixos/deluge: restart daemon if it's stopped from GUI 2015-09-11 01:32:21 +03:00
Paul Wilson
d2ca8b4079 gitit service: check null github auth options 2015-09-10 17:32:30 +00:00
Paul Wilson
dbd125b055 gitit service: add github authentication 2015-09-10 17:32:30 +00:00
Arseniy Seroka
38ed88538d Merge pull request #9773 from basvandijk/wordpress-extraHtaccess
wordpress: allow extending Wordpress's .htaccess file
2015-09-10 19:18:00 +03:00
Thomas Strobel
684cd17ff5 dnschain nixos module: init 2015-09-10 18:11:40 +02:00
Thomas Strobel
8db7c14e56 namecoind nixos module: security enhancements 2015-09-10 18:11:40 +02:00
Bas van Dijk
5cf5e7ff4c wordpress: allow extending Wordpress's .htaccess file 2015-09-10 13:21:38 +02:00
Peter Simons
7690891ea4 nixos: give users of 'services.openvpn.enable' a nice warning message 2015-09-10 11:38:43 +02:00
Luca Bruno
f4b7be4f04 nixos ntpd: allow passing extra flags 2015-09-10 10:58:13 +02:00
Peter Simons
64eb5527ba nixos: remove the obsolete 'services.openvpn.enable' option
OpenVPN is enabled implicitly when configuring 'services.openvpn.servers', so the
"enable" option is meaningless since b2910df04e4ec3e707ad08074bd128dedf9b2c23.

Closes https://github.com/NixOS/nixpkgs/issues/9764.
2015-09-10 10:38:38 +02:00
Bram Duvigneau
18acb80b82 Brltty service: simplified systemd service definition, now it matches
the
variant that has been developed upstream. Now the BRLTTY service comes up reliably on boot.
2015-09-09 22:40:12 +02:00
Joachim Schiele
bb546ca4a8 Merge pull request #9703 from basvandijk/wordpress-upgrade
wordpress: 4.2.2 -> 4.3
2015-09-09 12:47:38 +02:00
Arseniy Seroka
90a7bb69d0 Merge pull request #9711 from anderspapitto/bitlbee
plugin support for bitlbee, and facebook plugin
2015-09-09 03:03:53 +03:00
Anders Papitto
78f7a09e3a bitlbee service: enable plugins 2015-09-08 14:24:50 -07:00
Thomas Strobel
cb4bea5f97 namecoind nixos module: fix environment variable 2015-09-08 22:37:10 +02:00
Thomas Strobel
b6fb760484 namecoind nixos module: init 2015-09-08 20:17:52 +02:00
Thomas Strobel
5e21271af0 dnsmasq nixos module: fix path in systemd service 2015-09-08 19:33:01 +02:00
Eelco Dolstra
c904dfa87c nixos-container: Fix show-host-key
We don't generate ecdsa keys by default anymore, so print ed25519
instead if available.
2015-09-08 15:57:49 +02:00
Arseniy Seroka
0236bd6590 Merge pull request #9696 from basvandijk/mysql-hostname-fix
Bring hostname into scope needed by mysql_install_db
2015-09-08 13:27:48 +03:00
Bas van Dijk
88d9fd93c6 wordpress: 4.2.2 -> 4.3 2015-09-08 10:36:44 +02:00
Bas van Dijk
1f1e02daad mysql: add nettools to path
The mysql_install_db command, called in preStart, needs the hostname command.
2015-09-08 10:32:37 +02:00
Eelco Dolstra
3ebe5f802b Remove references to /root/test-firmware
This is no longer supported by systemd.
2015-09-07 22:55:16 +02:00
obadz
afdfe76bbd nixos: environment.pathsToLink += some desktop dirs
Close #9622.
(adding common desktop locations and locations specified in
http://standards.freedesktop.org/menu-spec/1.1/)
2015-09-07 21:16:23 +02:00
Domen Kožar
ba5919ef3b nginx: include mimetypes mapping
(cherry picked from commit b01eebf021388d92a8aaba9339dcc1fa2270294d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-07 14:43:19 +02:00
Domen Kožar
71e67797d6 Revert "reverse_proxy module: helper to run nginx as reverse proxy"
This reverts commit e6f0cd336dd286232136503c02598372162f1b8d.

These modifications are too specific to use cases and shouldn't be part of
nginx module.
2015-09-07 14:18:31 +02:00
Tobias Geerinckx-Rice
5d8f61a660 nixos: sitecopy service: re-format descriptions 2015-09-07 01:25:54 +02:00
Tobias Geerinckx-Rice
18851071e6 nixos: bacula service: re-format descriptions 2015-09-07 01:12:26 +02:00
Tobias Geerinckx-Rice
45b86d6981 nixos: cdemu service: mark up & tweak descriptions 2015-09-07 00:47:18 +02:00
Tobias Geerinckx-Rice
c90eb862fc nixos: prey module: fix option descriptions 2015-09-06 23:50:03 +02:00
Tobias Geerinckx-Rice
24048fa226 nixos: redshift module: add package option
...and make code more consistent.
2015-09-06 23:50:02 +02:00
Tobias Geerinckx-Rice
fa3d7ea77b nixos: freefall module: add package option
...and tidy up some of my old cargo-culted code.
2015-09-06 23:50:02 +02:00
Jaka Hudoklin
572ebb2f20 grafana: fix package naming 2015-09-06 15:23:31 +02:00
Jaka Hudoklin
93132d1717 logstash service: fix tests 2015-09-06 15:20:56 +02:00
Jaka Hudoklin
77356690fb logstash service: fix startup 2015-09-06 15:20:56 +02:00
Jaka Hudoklin
a79d732243 etcd service: fix tests 2015-09-06 14:44:13 +02:00
Arseniy Seroka
fc29fe1d63 Merge pull request #9661 from noqqe/master
mlmmj: Fixed postfix config items to make module work again
2015-09-05 23:47:53 +03:00
Bjørn Forsman
41ae7e00d7 nixos/gdm: simplify assert expression 2015-09-05 10:23:43 +02:00
Florian Baumann
935d0e858e mlmmj: Fixed postfix config items to make module work again 2015-09-05 10:14:48 +02:00
William A. Kennington III
8fe216dd3e bosun: Move to go-packages 2015-09-04 21:11:42 -07:00
Rickard Nilsson
ed140ff927 bosun,scollector: Fix NixOS modules to use bin attr of go pkgs 2015-09-04 21:46:10 +02:00
lethalman
8bfacda44c Merge pull request #9642 from Mathnerd314/power-fix
Remove desktopManagerHandlesLidAndPower
2015-09-04 18:09:51 +02:00
Mathnerd314
13a314ec17 Remove all explicit assignments of desktopManagerHandlesLidAndPower 2015-09-04 09:34:15 -06:00
Peter Simons
96cb733207 nix-gc.nix: Revert 'prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"'
This reverts commit ab6c8643d451b04884e938cd7ed2186663d32a96. Issue
https://github.com/NixOS/nix/issues/609 has been resolved, the new Nix
version is available after 86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5, and
using nix-collect-garbage has the advantage that the '-d' flag is
available, which nix-store doesn't have.
2015-09-04 11:51:01 +02:00
Domen Kožar
747e7e7b42 Merge pull request #9650 from ragnard/docker-fixes
docker: Minor improvements, fix failing test
2015-09-04 09:55:14 +02:00
Ragnar Dahlén
9bfe92ecee docker: Minor improvements, fix failing test
- Replace usage of deprecated CLI flag `--daemon`
- Introduce `storageDriver` option for module
- Fix failing test by using `overlay` storage driver
2015-09-04 00:23:38 +01:00
Bjørn Forsman
b716673f97 nixos/gdm: add assertion for the autoLogin.user option
Or else users may see this unfriendly message:

  error: cannot coerce null to a string, at .../nixos/modules/services/x11/display-managers/gdm.nix:107:49
2015-09-03 22:30:07 +02:00
Bjørn Forsman
833b4c34c2 nixos/gdm: fix description typo 2015-09-03 22:30:07 +02:00
Eelco Dolstra
f223448d5d Shorten inhibit message
This also makes it consistent with KDE's inhibit message.
2015-09-03 13:03:14 +02:00
Eelco Dolstra
882b2465c2 Remove ad hoc README
It's unlikely that people will see this file, so it's kind of
pointless.
2015-09-03 13:03:14 +02:00
Kovacsics Robert (NixOS-SSD2)
b22e6cb299 wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609
wiimenu superseded by wimenu from wmii
wmiiSnap superseded by wmii_hg
libixp_for_wmii superseded by libixp_hg
2015-09-03 12:58:24 +02:00
Kovacsics Robert (NixOS-SSD2)
553e7d49ff wmii service: refactor to use wmii_hg 2015-09-03 12:58:11 +02:00
Domen Kožar
7bc624f572 And next release is called Emu!
http://img.gawkerassets.com/img/17qtp0agra45ajpg/original.jpg
2015-09-03 11:39:56 +02:00
Eelco Dolstra
6ab7e0de29 Create /var/log/journal
Fixes #9614.
2015-09-03 11:35:47 +02:00
Tobias Geerinckx-Rice
e87fa04ddc nixos: move left-behind allowUnfree comment 2015-09-03 01:17:10 +02:00