Vladimír Čunát
5979d428b4
Merge recent master into x-updates
...
Hydra: ?compare=1134869
Conflicts (just meta):
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Eelco Dolstra
973c9abdbe
Fix info command
...
The "info" command has been broken on NixOS since
457fdb3842
(proving that nobody uses
info).
2014-07-08 15:19:08 +02:00
Marc Weber
672adc126e
nixos: add 'firebird' group
...
The firebird module complains without missing 'firebird' group, add it.
2014-07-08 00:00:33 +02:00
Sönke Hahn
09448101c3
mediawiki: add patch for fixing postgresql errors
2014-07-07 23:19:31 +08:00
lethalman
e497265b72
Merge pull request #2963 from Fuuzetsu/locate
...
locate service: allow customisation
2014-07-07 14:24:04 +02:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
lethalman
789c9508c2
Merge pull request #2582 from chexxor/feature/add-znc-module
...
Add ZNC module
2014-07-06 11:23:08 +02:00
Igor Pashev
d4a320cd12
Updated Mediawiki to 1.23.1
2014-07-04 17:34:37 +02:00
Alex Berg
7b768ba2f5
Merge remote-tracking branch 'nixos/master' into feature/add-znc-module
...
Conflicts:
nixos/modules/misc/ids.nix
2014-07-03 11:30:11 -05:00
lethalman
cb86818789
Merge pull request #3079 from wmertens/patch-4
...
virtualbox: Fix permissions for /dev/vboxdrvu
2014-07-03 15:05:05 +02:00
Vladimír Čunát
aceb30cd93
Merge master into x-updates
...
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Shea Levy
b3cfb9084b
Get all lib functions from lib, not pkgs.lib, in modules
2014-07-02 12:28:18 -04:00
Luca Bruno
cb41fecaa1
Try fixing the nixos mumble tests, again
2014-07-02 11:28:43 +02:00
Eelco Dolstra
b8cb960a58
Fix evaluation
2014-07-01 16:28:34 +02:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Vladimír Čunát
6a77d5fd3e
Merge #3054 : add kde 4.13.2
2014-06-30 21:26:49 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Jaka Hudoklin
16f801cba9
nixos/pam: make pam_loginuid optional if in container
2014-06-30 11:08:39 +02:00
Michael Raskin
77314b7eb2
Merge pull request #2888 from nilcons/no-random-arch-downgrades
...
Fix nixos-rebuild.sh to depend on Nix
2014-06-30 12:47:17 +04:00
Michael Raskin
02266194ea
Merge pull request #2894 from kirelagin/fixusergroup
...
Fix conditional handling of users and groups in some services
2014-06-30 10:16:20 +04:00
Michael Raskin
b403893aa2
Merge pull request #2778 from edwtjo/radicale
...
Adding Radicale package and service
2014-06-30 10:11:23 +04:00
Michael Raskin
f2e9ebbd46
Merge pull request #2283 from wizeman/u/sysctl-merge
...
nixos: Fix sysctl option merging
2014-06-30 09:03:33 +04:00
Florian Friesdorf
9b7dbcc83e
name nixos tests, close #3078
2014-06-28 16:05:47 +02:00
Florian Friesdorf
6a3e6164bd
support for nixos test names
2014-06-28 16:05:03 +02:00
aszlig
622673495b
nixos/log2html: Remove schema from jQuery URLs.
...
This allows viewing test logs for example when using a Hydra running
with HTTPS.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 09:41:11 +02:00
aszlig
da32f052b1
Revert "nixos/sshd: drop mode from auth keys file".
...
This reverts commit a3331eb87b
.
See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334
for a description why this is not a good idea.
I guess it's better to implement a sane way to remove all files in
authorized_keys.d, especially because it is also backwards-compatible.
Reopens #2559 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 09:22:07 +02:00
aszlig
865787ef32
nixos/tests/openssh: Test configured auth keys.
...
So far the test only uses an authorized key that is copied over to the
target machine instead of being set by the target's configuration.
Now, we cover both cases.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 08:52:03 +02:00
John Wiegley
8eedf968eb
Merge pull request #3093 from lethalman/sshkeys
...
nixos/sshd: drop mode from auth keys file. Closes #2559
2014-06-26 10:26:47 -07:00
Luca Bruno
a3331eb87b
nixos/sshd: drop mode from auth keys file. Closes #2559
2014-06-26 10:15:34 +02:00
Austin Seipp
13162e8cdb
Fix gitolite docs
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:55:43 -05:00
Austin Seipp
3eb2d1e03e
nixos: add gitolite module
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:54:18 -05:00
Alex Berg
9af1e2ab51
Add ZNC module. Has zncConfOptions or specify full conf file.
2014-06-26 05:44:32 +02:00
Jan Malakhovski
37c7d024ef
nixos: change EDITOR and PAGER environment variables to mkDefaults
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-06-25 17:07:10 +02:00
wmertens
147fd1ff12
virtualbox: Fix permissions for /dev/vboxdrvu
...
See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
2014-06-25 15:52:05 +02:00
Bjørn Forsman
4def9a762f
nixos: add some missing '.' in option descriptions
2014-06-24 21:25:11 +02:00
Bjørn Forsman
f78ce19d8c
nixos/elasticsearch: capitalize systemd service description
2014-06-24 21:11:12 +02:00
Bjørn Forsman
6ce8f753e0
nixos/elasticsearch: add '.' at end of description strings
...
Nixos option descriptions should be full sentences, ending in a full
stop. (Package descriptions, on the other hand, should not.)
2014-06-24 21:06:30 +02:00
Mateusz Kowalczyk
4934f52bb7
locate service: allow customisation
...
Fixes #2961
2014-06-24 12:54:16 +02:00
lethalman
6d006a9cca
Merge pull request #3005 from offlinehacker/nixos/logstash/enableWeb
...
nixos/logstash: add enableWeb option to enable kibana web interface
2014-06-24 12:42:26 +02:00
Rickard Nilsson
9ff0b303ff
elasticsearch: Add option specifying extra command line options
2014-06-24 11:01:28 +02:00
Rickard Nilsson
94deea2035
nixos: Add option hardware.sane.configDir
2014-06-24 10:52:12 +02:00
Austin Seipp
0399c5ee24
grsecurity: update stable/testing kernels, refactoring
...
This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.
This also removes the vserver kernel, since it's probably not nearly as
used.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 22:29:10 -05:00
Bjørn Forsman
76672dd9e3
accountsservice: be consistent in naming (always two 's')
...
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
2014-06-22 21:32:16 +02:00
Wout Mertens
ab184b3388
kde: Allow kde_next as a desktop environment
2014-06-22 19:28:18 +02:00
Cillian de Róiste
74cd7cb3c8
sane: environment.variables -> environment.sessionVariables
...
See 13befa3979
for details
2014-06-22 14:38:45 +02:00
Austin Seipp
6cfa38ce7d
nagios: significant upgrades
...
- Upgrade Nagios Core to 4.x
- Expose mainConfigFile and cgiConfigFile in module for finer
configuration control.
- Upgrade Plugins to 2.x
- Remove default objectDefs, which users probably want to customize.
- Systemd-ify Nagios module and simplify directory structure
- Upgrade Nagios package with more modern patch, and ensure the
statedir is set to /var/lib/nagios
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 00:22:10 -05:00
Paul Colomiets
11e25f1a3e
Implement per-user socket units
2014-06-20 17:41:14 -04:00
Rob Vermaas
04e648f789
Change size of Amazon EC2 S3-backed images to 8GB (was 4GB).
...
(cherry picked from commit 05543ef6e0
)
2014-06-19 11:28:06 +02:00
Rob Vermaas
fe3a63b7d0
EC2: allow building S3-backed HVM ami's
...
(cherry picked from commit e007559e95
)
2014-06-19 10:57:26 +02:00
aszlig
3e64126344
nixos/shadow: Add an example for defaultUserShell.
...
Thanks to @devhell for the suggestion.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-19 01:51:33 +02:00
Austin Seipp
15aee28fa1
Merge pull request #2990 from third3ye/patch-3
...
Minor logic fix
2014-06-18 16:16:58 -05:00
Austin Seipp
e5023b1f45
Merge pull request #2974 from bluescreen303/samba
...
samba really requires its daemons
2014-06-18 16:15:50 -05:00
Austin Seipp
4eb7fdcc13
Merge pull request #2966 from wkennington/master.sudo
...
Update and fix sudo
2014-06-18 16:13:53 -05:00
Austin Seipp
91f1dda340
Merge pull request #2980 from bluescreen303/php-fpm
...
phpfpm: add option for setting php.ini file
2014-06-18 16:08:21 -05:00
Jaka Hudoklin
db8de47ce7
nixos/logstash: add enableWeb option to enable kibana web interface
2014-06-18 13:37:13 +02:00
William A. Kennington III
ef4ea24420
sudo: Always keepVisudo in order to simplify sudo build
2014-06-17 22:41:32 -05:00
Anders Claesson
97d65d8010
nixos manual: fix typo ( close #2997 )
2014-06-17 21:52:22 +02:00
William A. Kennington III
86711e4120
nixos-iso: Re-enable new kernel iso images ( close #2839 )
2014-06-17 21:23:52 +02:00
Ricardo M. Correia
f8e108c865
nixos.tests.installer: Fix test failures due to network being disabled
2014-06-17 18:41:26 +02:00
third3ye
9c83a6bc76
Minor logic fix
...
music_directory "${cfg.musicDirectory}"
playlist_directory "${cfg.dataDir}/playlists"
db_file "${cfg.dataDir}/tag_cache"
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/".
Parsing for instance ${cfg.datadir}/playlists results in:
/var/lib/mpd//playlists - NOT FOUND.
2014-06-17 03:24:39 +00:00
Mathijs Kwik
464739c391
samba really requires its daemons
2014-06-16 22:44:27 +02:00
Mathijs Kwik
35df71ac1d
phpfpm: add option for setting php.ini file
2014-06-16 22:44:18 +02:00
Mathijs Kwik
a97bef3e8c
nixos/nginx: fix group and stateDir permissions
...
furthermore, I don't think adding nginx to systemPackages is of any use.
2014-06-16 22:43:58 +02:00
Eelco Dolstra
9ae3654fd6
Fix generation of synergy-{client,server} when disabled
2014-06-16 10:45:09 -04:00
Vladimír Čunát
1200a1ecf3
fixup the previous: got renamed to sessionVariables
...
I'm sorry; I didn't notice Eelco renamed the option.
My dry-run didn't catch that one with nvidia driver, no idea why.
2014-06-15 20:28:30 +02:00
Vladimír Čunát
de783277da
nixos/opengl: add LD_LIBRARY_PATH to systemVariables instead
...
so all users get this variable, thanks to work from #2692 .
2014-06-15 19:18:16 +02:00
Eelco Dolstra
13befa3979
Set session variables in the shell as well
2014-06-13 18:34:56 +02:00
Eelco Dolstra
f5055e2ef6
Rename environment.systemVariables -> environment.sessionVariables
...
This makes it clearer that they're part of PAM sessions.
2014-06-13 17:57:04 +02:00
Eelco Dolstra
a7d31fe449
Handle <nixpkgs> being a symlink
...
Fixes #1898 .
2014-06-13 16:48:49 +02:00
Rob Vermaas
98d6ff9cec
Remove -f from elasticsearch ExecStart, not valid anymore.
2014-06-13 14:00:55 +02:00
Domen Kožar
5c01d45a62
Merge pull request #2928 from akc/spelling
...
Fix trivial spelling mistake in docs
2014-06-13 13:49:05 +02:00
Rob Vermaas
40566790d3
elasticsearch: run preStart as root, to allow creating the necessary directories.
2014-06-13 13:42:52 +02:00
Anders Claesson
1777724a33
Fix trivial spelling mistake in docs
2014-06-13 11:11:27 +01:00
Bjørn Forsman
aff4394be6
nixos-generate-config: fix nix-env example command
...
An escape char is needed to prevent "$ nix" from being evaluated and
expanded to an empty string. With this change the resulting text is
$ nix-env -qaP | grep wget
instead of
-env -qaP | grep wget
2014-06-12 21:18:21 +02:00
Christoph Hrdinka
8daaa28ac8
nsd-service: add service module for nsd
2014-06-12 11:20:43 +02:00
Michael Raskin
dceda93bd0
Merge pull request #2543 from wizeman/u/zramswap
...
nixos: Add zram swap module
2014-06-12 13:01:29 +04:00
Michael Raskin
8007f32712
Merge pull request #2380 from wkennington/cache.search
...
network-interfaces: Add an option for specifying search to resolv.conf
2014-06-12 12:56:41 +04:00
Kirill Elagin
f81434bdfe
Fix trying to add users to non-existent groups
2014-06-11 13:36:15 +04:00
Kirill Elagin
1208dd4df0
Fix configuring apache with extra user/group
...
This fix is consistent with all the other modules.
2014-06-11 13:17:42 +04:00
Kirill Elagin
80721cdd41
Revert "Fix configuring httpd with custom user/group."
...
This reverts commit 08f9da2e8e
.
2014-06-11 13:17:00 +04:00
Rob Vermaas
08f9da2e8e
Fix configuring httpd with custom user/group.
2014-06-11 10:18:37 +02:00
Evgeny Egorochkin
b415876bdb
systemd service: fix issues with escaping when unit name contains '-'
...
systemd escaping rules translate this into a string containing '\'
which is treated by some code paths as quoted, and by others as unquoted
causing the affected units to fail.
2014-06-11 04:08:13 +03:00
Gergely Risko
068c7fd037
Fix nixos-rebuild.sh to depend on Nix
...
And therefore always choose the correct architecture for the rebuilt
system regardless for the PATH setting of the user.
2014-06-10 20:13:47 +02:00
Eelco Dolstra
8ae659f16c
Revert "Revert "Merge #2692 : Use pam_env to properly setup system-wide env""
...
This reverts commit 491c088731
.
2014-06-10 13:07:10 +02:00
Eelco Dolstra
491c088731
Revert "Merge #2692 : Use pam_env to properly setup system-wide env"
...
This reverts commit 18a0cdd864
.
2014-06-10 13:03:44 +02:00
Vladimír Čunát
18a0cdd864
Merge #2692 : Use pam_env to properly setup system-wide env
2014-06-10 11:42:59 +02:00
Sander van der Burg
6b6f098fd1
disnix: bump versions and update module to use its latest features
2014-06-09 23:46:30 +02:00
lethalman
f5aeae49ef
Merge pull request #2837 from lethalman/security
...
Add system.replaceRuntimeDependencies to quickly replace system dependencies
2014-06-09 15:42:59 +02:00
Sander van der Burg
33d99a22ca
nixos-build-vms: Fix function invocation to test driver
2014-06-09 13:36:26 +02:00
Bjørn Forsman
054a3c0321
nixos/graphite-service: clean up restartTriggers
...
Currently, the restartTriggers are abusing the systemd unit file in that
the cfg.carbon.config/storageAggregation/... option text is pasted into
the unit file. Even though this sort-of works (the service is restarted
if the config changes) this causes systemd to print error messages about
invalid sections (rightfully so!).
The correct use of restartTriggers is to list storage paths, which is
what this change does. If any of the
cfg.carbon/config/storageAggregation/... options change, configDir will
get a new hash. It is not as "fine grained" as the current version, but
it is not abusing the interface.
Also, remove unneeded 'waitress' in one of the restartTriggers, because
it is already listed as part of the service config.
2014-06-09 11:40:33 +02:00
Bjørn Forsman
208d466c21
nixos/graphite-service: make option descriptions end with '.'
...
Because that is how it is supposed to be.
2014-06-09 11:40:28 +02:00
William A. Kennington III
ab29b6527f
nixos-iso: Use a simpler disk label
...
When formatting a nixos usb using my windows machine I noticed that the
disk labeling using periods was not compatible with my linux kernel /
udev recognition. When labeling a volume NIXOS_14.10 under Windows, it would
show up as NIXOS_14_10 on NixOS. This meant that /dev/root would never come
up at boot time, preventing the livecd from starting.
This patch works around this issue by eliminating any special characters
other than underscores. The previous versioning didn't seem all that
useful, especially when consdering there are many different version of
the year.month named iso.
2014-06-08 15:53:45 -05:00
Michael Raskin
e68a5b265a
Enable checking sudoers syntax. Fixes #2850 , probably.
2014-06-09 00:54:21 +04:00
Bjørn Forsman
0195628118
nixos/statsd-service: fix 'graphitePort' default value
...
graphitePort must point to the port that carbon-cache listens on, not
the graphite webUI port.
With this change I finally got data from statsd to graphite.
2014-06-08 16:10:39 +02:00
Bjørn Forsman
476a3d818f
nixos/graphite-service: fix filename typo
...
It's "aggregation" with two 'g's.
Fixes this:
carbon-cache[9363]: [console] /nix/store/drxq4jj92sjk3cjik2l4hnsndbray3i4-graphite-config/storage-aggregation.conf not found, ignoring.
2014-06-07 23:45:17 +02:00
Florian Friesdorf
0136fcb3df
Merge pull request #2726 from pSub/trackpoint
...
Added an option to configure sensitivity and speed of trackpoints.
2014-06-07 13:09:26 +02:00
Luca Bruno
66ddb1c322
Add system.replaceRuntimeDependencies to quickly replace system dependencies
2014-06-06 21:17:31 +02:00
Rok Garbas
cc160a196a
couchdb service: adding customizable config file which is writable by couchdb
2014-06-06 15:30:58 +01:00
Luca Bruno
94c2661503
tomcat: fix service to be a daemon, and run tomcat in script rather than preStart
2014-06-06 14:04:35 +02:00
Moritz Ulrich
f6d03359b3
Only overwrite container-configuration when --config is specified.
...
Fixes #2834 .
2014-06-06 11:49:16 +02:00
Eelco Dolstra
906aa9ccb1
Make pseudo-filesystems show up as "tmpfs" etc. rather than "none" in df
2014-06-05 13:39:17 +02:00
Luca Bruno
12f06b3cc3
fcgiwrap: new package
...
Simple server for running CGI applications over FastCGI
https://nginx.localdomain.pl/wiki/FcgiWrap
2014-06-04 10:20:19 +02:00
Ricardo M. Correia
abd0b3f411
nixos.tests.installer: Attempt to fix race condition
...
Attempt to fix race condition in installer tests, especially the
grub1 test.
The latter was failing when running "parted /dev/sda ..." because
/dev/sda didn't exist yet.
2014-05-30 21:26:24 +02:00
Peter Simons
ce7be7584f
Merge pull request #2790 from ehmry/unbound
...
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
2014-05-30 14:46:29 +02:00
Rickard Nilsson
5bf076d99b
sane: Make SANE_CONFIG_DIR overrideable
2014-05-30 10:18:39 +02:00
Emery Hemingway
0ddce8db12
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
2014-05-29 09:59:55 -04:00
Peter Simons
642449da18
Merge pull request #2782 from soenkehahn/better_error_message_missing_uid
...
better error message in case of missing uids
2014-05-28 20:59:43 +02:00
Edward Tjörnhammar
d1277ddcc2
Adding Radicale package and service
2014-05-28 20:41:39 +02:00
Luca Bruno
a013d00448
nautilus-sendto: new package
...
Integrates Evolution and Pidgin into the Nautilus file manager
2014-05-28 17:27:48 +02:00
Luca Bruno
bf6ddc6285
nautilus 3.12: find extensions
2014-05-28 17:27:48 +02:00
Eelco Dolstra
a8c9c11f9e
Manual: Note about using a local branch
2014-05-28 14:38:07 +02:00
Sönke Hahn
089b293019
better error message in case of missing uids
2014-05-28 20:12:53 +08:00
Rob Vermaas
e328471b8a
Merge pull request #2777 from offlinehacker/nixos/influxdb/add
...
nixos: add influxdb module
2014-05-28 08:32:37 +02:00
Shea Levy
57ed344917
Fix /run/keys permissions
2014-05-27 17:22:25 -04:00
Jaka Hudoklin
66456c0798
nixos: add influxdb module
2014-05-27 22:56:36 +02:00
Alexei Robyn
4fa4518875
Add TeamSpeak 3 server & service module ( close #2056 )
...
Conflicts (trivial):
lib/maintainers.nix
nixos/modules/misc/ids.nix
2014-05-27 17:30:26 +02:00
Michael Raskin
80cc011f77
Merge pull request #2617 from ttuegel/hplip
...
hplip: update and fix scanning
2014-05-27 02:31:27 -07:00
Michael Raskin
2e5e49c306
Merge pull request #2424 from wkennington/cache.sshKey
...
ssh: Support knownHost public keys as strings
2014-05-27 01:46:12 -07:00
Michael Raskin
19ce0416f1
Merge pull request #2416 from edwtjo/encdev-module
...
Enable encrypted backing devices in fileystem configurations
2014-05-27 01:45:17 -07:00
Luca Bruno
6b21186742
gnome 3.12: make remote desktop sharing work
2014-05-26 17:18:04 +02:00
Luca Bruno
2131313fa6
Add gvfs dbus service and gvfs gio modules to gnome 3
...
Closes #2746
2014-05-26 11:13:51 +02:00
Luca Bruno
b0234f216c
Fix passing extra qemu opts when using boot loader
2014-05-25 21:37:02 +02:00
Bjørn Forsman
15beb4054d
nixos: add 'gvfs' when using GNOME3 desktop
...
One reason for adding this is to make Chromium able to open files it has
downloaded.
Currently this happens:
/run/current-system/sw/bin/xdg-open: line 364: gnome-open: command not found
(And nothing happens in the GUI when clicking a downloaded file.)
Looking into xdg-open, one can see that it first tries to run gvfs-open
and then falls back to gnome-open. Adding 'gvfs' makes the first command
succeed.
2014-05-25 14:17:36 +02:00
Peter Simons
c18775837c
nixos/modules/services/audio/alsa.nix: fix evaluation
...
https://github.com/NixOS/nixpkgs/issues/2732
2014-05-23 19:20:49 +02:00
Arseniy Seroka
dc8625305a
fix mistake
2014-05-23 14:58:07 +04:00
Arseniy Seroka
c84d81541e
alsa: add option to change system wide configuration
2014-05-23 14:53:24 +04:00
Pascal Wittmann
128636ff24
Added an option to configure sensitivity and speed of trackpoints.
2014-05-23 10:18:03 +02:00
Vladimír Čunát
4241e30874
Merge pull request #2719 from wizeman/u/transmission-upd
...
transmission: Update from 2.82 -> 2.83 + fixes
2014-05-22 21:11:34 +02:00
Ricardo M. Correia
f0cf8f4140
grsecurity: Fix module evaluation
2014-05-22 20:17:34 +02:00
Ricardo M. Correia
a131baf502
transmission: Fix apparmor rules to allow loading more libraries
2014-05-22 19:46:08 +02:00
Eelco Dolstra
58226a7b06
Add type for fonts.fonts option
2014-05-22 14:20:23 +02:00
Eelco Dolstra
f4b7ac11a3
Remove udisks module
...
It's no longer used in NixOS.
2014-05-22 12:11:53 +02:00
Eelco Dolstra
0bc7ec6e28
Remove obsolete udisks test
...
Closes #2716 .
2014-05-22 12:11:53 +02:00
Eelco Dolstra
7fd13ddc66
Set TZDIR for all systemd services
...
This only matters if a service also overrides the $TZ variable.
Issue #2447 .
2014-05-21 18:31:40 +02:00
Luca Bruno
927b385cc9
Fix mumble test: wait for X windows to appear, not only sleep
2014-05-21 18:09:21 +02:00
Rob Vermaas
973fa21b52
Better support for HVM instances. Now the NixOS images can
...
be used on HVM instances without needing nixops. Previously
the grub setup was incorrect, so a plain 'nixos-rebuild switch'
and a reboot would result in a broken system.
Also added growing of the partition of the root disk in the initrd,
so you can run resize2fs after initial boot, without needing an
extra reboot. This is useful especially for nixops'
deployment.ec2.ebsInitialRootDiskSize option.
(cherry picked from commit 044a24e58b
)
2014-05-21 16:37:55 +02:00
Rob Vermaas
cdfb8738a4
Use HVM instance for EBS creator, guarantees everything is created in the correct zone.
...
(cherry picked from commit c9763e20e5
)
2014-05-21 16:37:55 +02:00
Rob Vermaas
3da94435c0
Add option ec2.hvm, to set some boot configuration specific for EC2 HVM instances.
...
(cherry picked from commit 35c76d9173
)
Conflicts:
nixos/modules/virtualisation/amazon-image.nix
2014-05-21 16:37:53 +02:00
Eelco Dolstra
f23231f198
Installer test: Don't wait for dhcpcd if we don't have a network
2014-05-21 15:55:50 +02:00
Eelco Dolstra
784503864b
Enable the xf86-video-modesetting driver
2014-05-21 15:55:50 +02:00
Eelco Dolstra
ca123bc274
Installer test: Get rid of a warning
2014-05-21 15:55:50 +02:00
Eelco Dolstra
c54eb79063
Don't kill unionfs-fuse during shutdown
...
Killing the daemon backing /nix/store prevents a clean shutdown. See
http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
2014-05-21 15:55:50 +02:00
Eelco Dolstra
5e364503d5
NixOS ISO: Don't use a unionfs for /
...
We don't need a unionfs on /, we only need a tmpfs.
2014-05-21 15:55:50 +02:00
Eelco Dolstra
48601269a9
test-driver: Set context to include machines created by createMachine
2014-05-21 15:55:50 +02:00
Eelco Dolstra
d4ccfe3f6b
Don't create /media
...
It's obsolete - udisks2 uses /run/media/<username>.
2014-05-21 15:55:49 +02:00
Eelco Dolstra
1e2291f23a
nixos-install: Fix running it after again the activation script
2014-05-21 15:55:49 +02:00
Luca Bruno
6e13cc82df
Override glib_networking with gnome 3.12 scope
2014-05-21 13:40:35 +02:00
Luca Bruno
7da235a988
evolution-data-server: use the right gnome3 package set in the service
2014-05-21 13:40:35 +02:00
Eelco Dolstra
48768f3129
NixOS ISO: Set empty root password
2014-05-21 12:04:08 +02:00
Eelco Dolstra
e135e6b35b
nixos-install: Copy /etc/hosts
...
http://hydra.nixos.org/build/11130069
2014-05-21 11:20:33 +02:00
Eelco Dolstra
35925d7a76
Fix installer test
...
The installer now asks the user to set a root password if stdin is a
tty, which doesn't work for an interactive test.
http://hydra.nixos.org/build/11130072
2014-05-21 11:04:45 +02:00
lethalman
1b0b0d3bb2
Merge pull request #2675 from cstrahan/fix-useradd
...
Fix -G delimiter in call to useradd
2014-05-21 00:40:50 +02:00
Luca Bruno
af3d1ad06d
Add gnome 3.12 test
2014-05-20 13:41:41 +02:00
Luca Bruno
df95a8cc2f
upower: add 0.99 version for gnome 3.12
2014-05-20 13:41:39 +02:00
Luca Bruno
f07fd89111
Allow specifying the gnome3 packages to use for the xserver service
2014-05-20 13:41:39 +02:00
Eelco Dolstra
097f9c7e57
Fix udev rule required by gpm
...
Backport: 14.04
2014-05-20 13:09:41 +02:00
Eelco Dolstra
bddd10d75c
switch-to-configuration: Don't restart instances of user@.service
...
Restarting user@ instances is bad because it causes all user services
(such as ssh-agent.service) to be restarted. Maybe one day we can have
switch-to-configuration restart user units in a fine-grained way, but
for now we should just ignore user systemd instances.
Backport: 14.04
2014-05-20 11:12:56 +02:00
Austin Seipp
e31f212f6b
nixos/duosec: Add an option to allow TCP forwarding
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-20 02:42:38 -05:00
Austin Seipp
67c309fe75
Fix fallout from 4f27ad14
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-18 07:38:13 -05:00
Vladimír Čunát
bc792bda14
fix eval after previous commit
2014-05-18 14:27:41 +02:00
Vladimír Čunát
8e9ead8656
berlios.de probably shut down, replace it
...
The shutdown was announced years ago, only now it stopped working.
2014-05-18 13:30:27 +02:00
Rob Vermaas
3ce6ce149e
Fix dogstatsd, needs procps in path.
...
(cherry picked from commit ecdb0f7867
)
2014-05-18 13:00:57 +02:00
Austin Seipp
a0c6f07be4
Merge pull request #2604 from wkennington/master.notbit
...
notbit: Bump version and add more configuration options
2014-05-17 16:44:27 -05:00
Austin Seipp
4f27ad14a1
grsec: refactor grsecurity packages
...
This now provides a handful of different grsecurity kernels for slightly
different 'flavors' of packages. This doesn't change the grsecurity
module to use them just yet, however.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:43 -05:00
Austin Seipp
92abc4c610
kernel: enable AppArmor by default
...
AppArmor only requires a few patches to the 3.2 and 3.4 kernels in order
to work properly (with the minor catch grsecurity -stable includes the
3.2 patches.) This adds them to the kernel builds by default, removes
features.apparmor (since it's always true) and makes it the default MAC
system.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-17 14:09:09 -05:00
Charles Strahan
5445132f73
fix -G delimiter in call to useradd
2014-05-17 00:45:16 -04:00
Austin Seipp
2558fa587b
Merge pull request #2629 from letac/master
...
Phabricator, a web application, snapshot of 2014-05-12
2014-05-14 14:57:36 -05:00
lethalman
8967d2d3b3
Merge pull request #2301 from bjornfor/graphite-fixes
...
nixos/graphite-service: fix startup
2014-05-14 21:44:43 +02:00
William A. Kennington III
08467c14de
notbit: Add additional options to the daemon
2014-05-13 20:20:19 -05:00
William A. Kennington III
042273e528
notbit: Don't include unecessary notbit binaries in the environment
2014-05-13 20:19:57 -05:00
William A. Kennington III
8915390bab
notbit: Use the correct default port
2014-05-13 20:19:27 -05:00
Athan Clark
5fc3df831c
Simple typo
2014-05-13 10:35:57 -06:00
lethalman
8051101362
Merge pull request #2375 from lethalman/gnome3
...
gtkhtml, evolution, gnome-photos, gnome-clocks, zeitgeist, bijiben
2014-05-13 12:04:11 +02:00
Corey O'Connor
5112e6476b
resolve issue #2308
2014-05-13 11:11:34 +02:00
Strahinja Popovic
25e0d51a67
Phabricator, a web application, snapshot of 2014-05-12
2014-05-12 19:59:40 +02:00
Wout Mertens
c927cee2c3
dhcpcd: Allow adding hook code
2014-05-12 15:03:42 +02:00
Rob Vermaas
7d3dcd9a8c
Set console=ttyS0 for Amazon EC2 instances, as suggested by Amazon.
2014-05-12 12:29:04 +02:00
Thomas Tuegel
8df521bf0f
sane: use mkSaneConfig to set system environment
2014-05-11 14:01:07 -05:00
Emery Hemingway
c96d5fe170
nixos: f2fs filesystem module support ( close #2085 )
2014-05-11 13:53:26 +02:00
mornfall
456ef924ba
Merge pull request #2497 from aristidb/sudo_terminfo
...
sudo: env_keep TERMINFO for urxvt
2014-05-10 19:34:14 +02:00
Rickard Nilsson
b87b6870f8
When auto-formatting ext devices, use the -F flag to make it work with unpartioned disks
2014-05-09 16:49:03 +02:00
Eelco Dolstra
253bbb8e2b
nixos-container: Ensure umask 022
...
Fixes #2585 .
2014-05-09 13:26:02 +02:00
Eelco Dolstra
1c4fd9b25d
nixos-install: Run in a separate UTS namespace
...
This prevents the activation script from clobbering our hostname.
2014-05-09 13:25:53 +02:00
Eelco Dolstra
c06786759c
/var/run -> /run
2014-05-09 00:52:02 +02:00
Eelco Dolstra
61bdad6775
nixos-install: Don't bind-mount all of /etc
...
We only need a copy of /etc/resolv.conf for networking, and
/etc/{passwd,group} for building.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
3ef8d6ad5c
nixos-install: Add operation --chroot
...
"nixos-install --chroot" runs a command (by default a login shell) in
a chroot inside the NixOS installation in /mnt. This might useful for
poking around a new installation.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
4fc151b5a3
nixos-install: Ask the user to set a root password
...
This removes the need to have an initially empty root password.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
8919d736a0
nixos-install: Don't copy the bootstrap Nix if it's already there
...
This makes re-running nixos-install a bit faster.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
22f102cbdc
nixos-install: Assume the build user group is "nixbld"
...
The build user group is always "nixbld", so no need to detect it.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
171d43ba4f
nixos-install: Run in a private mount namespace
...
This ensures that all mounts are automatically cleaned up.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
e0e656ef46
nixos-install: Don't pass --show-trace by default
2014-05-09 00:51:48 +02:00
Eelco Dolstra
4b7c606589
nixos-generator-config: Don't emit a double / in bind mounts
2014-05-09 00:51:48 +02:00
Eelco Dolstra
dc78ae327c
nixos-generate-config: Don't include /var/setuid-wrappers
2014-05-09 00:51:48 +02:00
Eelco Dolstra
91afe9eb8d
nixos-generate-config: Use stable device paths (e.g. /dev/disk/by-uuid/X)
2014-05-09 00:51:48 +02:00
Eelco Dolstra
1bd8ced9c0
Don't enable the NVIDIA driver by default because it's unfree
2014-05-09 00:51:48 +02:00
Vladimír Čunát
2aa3580a5e
nixos-generate-config.pl: add new PCI IDs for broadcom_sta
...
The last ID wasn't in official README,
but it was reported by third3ye on IRC.
2014-05-08 15:24:41 +02:00
Eelco Dolstra
30180e8a24
Fix incorrect comment
2014-05-08 12:29:59 +02:00
Eelco Dolstra
fae135b871
Installer test: Increase amount of RAM
...
On x86_64, 384 MB is not enough anymore for running "nix-env -i".
http://hydra.nixos.org/build/10865007
2014-05-07 18:24:15 +02:00
Eelco Dolstra
333bfe16c4
Containers: Support setting up macvlan interfaces
...
By setting a line like
MACVLANS="eno1"
in /etc/containers/<name>.conf, the container will get an Ethernet
interface named mv-eno1, which represents an additional MAC address on
the physical eno1 interface. Thus the container has direct access to
the physical network. You can specify multiple interfaces in MACVLANS.
Unfortunately, you can't do this with wireless interfaces.
Note that dhcpcd is disabled in containers by default, so you'll
probably want to set
networking.useDHCP = true;
in the container, or configure a static IP address.
To do: add a containers.* option for this, and a flag for
"nixos-container create".
2014-05-07 17:53:57 +02:00
Eelco Dolstra
6f7aaf10a5
Containers: Use systemd-nspawn's --network-veth flag
...
Note that this causes the name of the host-side interface to change
from c-<name> to ve-<name>.
2014-05-07 17:53:57 +02:00
Eelco Dolstra
810680bcae
Containers: Use systemd-nspawn's --keep-unit flag
...
This gets rid of some redundant scopes/slices.
2014-05-07 17:53:57 +02:00
Ricardo M. Correia
cd1b48bc35
nixos: Add zram swap module
...
This allows you to use the Linux kernel's built-in compressed memory as
swap space functionality.
It is recommended to enable only for kernel 3.14 (which is when zram came out of
the staging drivers area) or higher.
2014-05-06 20:04:22 +02:00
Eelco Dolstra
5bfe944907
Don't run hwclock if /dev/rtc doesn't exist
...
E.g. on EC2 instances.
Backport: 14.04
2014-05-05 16:47:51 +02:00
Eelco Dolstra
4a08f37206
Don't start getty@tty1 on headless machines (like EC2)
...
Backport: 14.04
2014-05-05 16:47:36 +02:00
Eelco Dolstra
bac68f9747
switch-to-configuration: Honour RefuseManualStop
...
This prevents spurious errors about systemd-tmpfiles-setup.service.
Backport: 14.04
2014-05-05 16:46:58 +02:00
Rob Vermaas
d056d1d37b
Fix users.*.extraGroups for users.mutableUsers = true.
...
(cherry picked from commit eb22292305
)
2014-05-05 15:35:16 +02:00
Aristid Breitkreuz
204fc0a397
sudo: env_keep TERMINFO for urxvt
2014-05-04 14:42:16 +02:00
William A. Kennington III
84a94ff006
network-interfaces: Add an option for specifying search to resolv.conf
2014-05-02 12:42:20 -05:00
Luca Bruno
4ca985a7e3
bijiben: new package
...
Note editor designed to remain simple to use
https://wiki.gnome.org/Apps/Bijiben
2014-05-02 17:43:18 +02:00
Luca Bruno
b3fe998fdb
gnome-clocks: new package
...
Clock application designed for GNOME 3
https://wiki.gnome.org/Apps/Clocks
2014-05-02 16:04:57 +02:00
Luca Bruno
fbfccea0e8
geoclue2: add dbus service
2014-05-02 16:04:57 +02:00
Luca Bruno
4229053cb0
gnome-photos: new package
...
Photos is an application to access, organize and share your photos with GNOME 3
https://wiki.gnome.org/Apps/Photos
2014-05-02 16:04:57 +02:00
Luca Bruno
d6206ccceb
evolution: new package
...
Personal information management application that provides integrated mail,
calendaring and address book functionality
https://wiki.gnome.org/Apps/Evolution
2014-05-02 16:04:57 +02:00
Michael Raskin
eef9a8ac2a
On my system OpenGL with bumblebee seems to require libudev in LD_LIBRARY_PATH. Fix that, fix bumblebee module loading and make the socket group configurable
2014-05-02 14:32:47 +04:00
Austin Seipp
368a677c97
nixos: overhaul datadog module
...
This overhauls the Datadog module a bit to be much more useful. In
particular, it adds support for nginx and postgresql monitoring
integrations to dd-agent. These have to exist in separate files under
/etc/dd-agent, so the module just exposes then as separate options. In
the future, more integrations could be added this way.
In the process of doing this, I also had to rename the dd-agent user to
datadog. Note the UIDs did not change, so this is strictly backwards
compatible. The reason for this is to make it easier to create a
'datadog' postgres user with access to pg_stats, as 'dd-agent' typically
isn't a valid username. This allows the out of the box configurations to
be used.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 01:24:35 -05:00
Austin Seipp
b553d11616
btsync: Default to no login/password for the Web UI
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 00:41:47 -05:00
Austin Seipp
8946e91fad
btsync: remove unneeded assertion
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 17:00:49 -05:00
William A. Kennington III
1396f624f4
sshd: Fix typing for options which take paths
2014-05-01 16:33:44 -05:00
William A. Kennington III
78c33177ce
ssh: Support knownHost public keys as strings
2014-05-01 16:21:25 -05:00
Domen Kožar
1a501134e8
Merge pull request #2467 from lethalman/release-notes
...
Added gnome 3.10 to the release notes
2014-05-01 18:37:08 +02:00
Luca Bruno
ea1a9445bb
Added gnome 3.10 to the release notes
2014-05-01 18:32:28 +02:00
Shea Levy
e4630c1d41
grub: Allow setting the boot root explicitly
...
If /boot is a btrfs subvolume, it will be on a different device than /
but not be at the root from grub's perspective. This should be fixed in
a nicer way by #2449 , but that can't go into 14.04.
2014-05-01 10:56:55 -04:00
Eelco Dolstra
0b091e1286
Mark builds from git explicitly
2014-05-01 15:05:14 +02:00
Eelco Dolstra
3b616e378a
release.nix: Drop officialRelease flag
2014-05-01 15:05:14 +02:00
Eelco Dolstra
c9ebb42573
Disable the rabbitmq test
...
It frequently gets stuck in an infinite loop, delaying releases for
many hours.
2014-04-30 23:19:50 +02:00
Eelco Dolstra
0ea20bef3c
Set release date
2014-04-30 23:13:45 +02:00
Eelco Dolstra
be0f5eb45c
qemu-guest.nix: Load virtio_rng
...
This allows the guest to have a paravirtualized RNG, if the host
provides it.
2014-04-30 18:23:42 +02:00
Eelco Dolstra
a96f4920d5
Don't make the EFI tests release-critical
...
They're failing on i686: http://hydra.nixos.org/build/10712961
2014-04-30 16:48:20 +02:00
Eelco Dolstra
1d8f7e63b0
Punctuation
2014-04-30 16:39:56 +02:00
Shea Levy
8e9de81857
Merge remote-tracking branch 'origin/modernize_nixos_generate_config'
...
modernize nixos-generate-config
2014-04-30 10:23:52 -04:00
Shea Levy
26d03000c2
Actually use services.mysql.port
...
Fixes #1315
2014-04-30 10:21:29 -04:00
Eelco Dolstra
05decd49ff
Handle Zabbix agent and server both being enabled
...
This gave an error about the zabbix user uid being defined multiple
times.
2014-04-30 16:18:03 +02:00
Domen Kozar
88a8ec37d3
modernize nixos-generate-config
2014-04-30 16:14:53 +02:00
Eelco Dolstra
27d47f3983
Fix the simple installer test
...
http://hydra.nixos.org/build/10712818
2014-04-30 15:07:34 +02:00
Eelco Dolstra
437962ebb2
Installer test: Unmount filesystems after installation
...
Hopefully fixes failures like:
http://hydra.nixos.org/build/10712833
This shouldn't be necessary, but it might be that the use of unionfs
is interfering with a clean shutdown.
2014-04-30 15:07:34 +02:00
Eelco Dolstra
728d3476ba
systemd: Require some more kernel features
2014-04-30 13:53:12 +02:00
Eelco Dolstra
9bb209a3bd
gummiboot: Automatically disable GRUB
2014-04-30 11:47:18 +02:00
Eelco Dolstra
e9be441b62
Merge the EFI test into tests/installer.nix
2014-04-30 11:26:39 +02:00
Eelco Dolstra
8c75ae3838
nixos-generate-config: Use systemd-detect-virt instead of dmidecode
...
Dmidecode fails in our EFI test with the error "SMBIOS entry point
missing". But we don't need dmidecode because we have already have
systemd-detect-virt.
2014-04-30 11:26:39 +02:00
Eelco Dolstra
956f464fff
Remove obsolete zsh help text
2014-04-30 11:26:39 +02:00
Eelco Dolstra
077ecf43e5
Installer test: Remove fileSystems argument
...
The config function unintentionally ignored its fileSystems
argument. However, things still worked thanks to the magic of
nixos-generate-config. Yay!
2014-04-30 11:26:39 +02:00
Eelco Dolstra
90dac235bb
Remove the option ‘programs.bash.enable’
...
NixOS has a pervasive dependency on bash. For instance, the X11
session script sources /etc/profile to get a reasonable
environment. Thus we should not provide an option to disable bash.
Also, enabling zsh no longer sets ‘users.defaultUserShell’ to zsh, to
prevent a collision with bash's definition of the same
option. (Changing the default shell is also something that should be
left to the user.)
2014-04-29 19:00:39 +02:00
Eelco Dolstra
bfc524664a
Disable autofs module
...
It appears to be unmaintained and untested. Also, systemd provides
automount functionality so it's probably not needed anymore.
2014-04-29 15:34:55 +02:00
Eelco Dolstra
501d532188
Add a test for automounting
2014-04-29 15:34:55 +02:00
Eelco Dolstra
02cef04c81
Move the NVIDIA support into its own module
...
Previously all card-specific stuff was scattered across xserver.nix
and opengl.nix, which is ugly. Now it can be kept together in a single
card-specific module. This required the addition of a few internal
options:
- services.xserver.drivers: A list of { name, driverName, modules,
libPath } sets.
- hardware.opengl.package: The OpenGL implementation. Note that there
can be only one OpenGL implementation at a time in a system
configuration (i.e. no dynamic detection).
- hardware.opengl.package32: The 32-bit OpenGL implementation.
2014-04-29 14:42:36 +02:00
Eelco Dolstra
3fe96bcca1
Rename hardware.opengl.videoDrivers back to services.xserver.videoDrivers
...
Fixes #2379 .
The new name was a misnomer because the values really are X11 video
drivers (e.g. ‘cirrus’ or ‘nvidia’), not OpenGL implementations. That
it's also used to set an OpenGL implementation for kmscon is just
confusing overloading.
2014-04-29 14:42:36 +02:00
Eelco Dolstra
e6b5c0121f
Obsolete fonts.extraFonts
...
You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.
2014-04-29 12:34:57 +02:00
Eelco Dolstra
d6c2dcd98c
Remove redundant ~/.fonts element from the font search path
2014-04-29 12:27:03 +02:00
William A. Kennington III
936481a12e
nixos: Add support for changing supported systems
...
release.nix and release-combined.nix current hardcode the systems which
they are built for. This change introduces an argument to the
expressions called supportedSystems, which allows the builder to choose
which architectures he wants to build. By default, this uses the same
linux x86_64 and i686 architectures.
2014-04-29 10:53:36 +02:00
Eelco Dolstra
a142d68b43
Fix some uid/gid attributes to match the actual user/group name
2014-04-29 10:51:42 +02:00