alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
48312 commits 217 branches 121 tags 4.5 GiB
Commit graph

1402 commits

Author SHA1 Message Date
Eelco Dolstra 5e96158234 Remove Subversion from the installation CD 2014-07-30 16:04:15 +02:00
Eelco Dolstra e68b0c7f5f Mount unionfs-fuse filesystems using the normal fileSystems option 2014-07-30 16:04:15 +02:00
Eelco Dolstra d45dcf348e Really fix NixOS/nixos#287 2014-07-30 16:04:15 +02:00
Eelco Dolstra b599deedb4 makeTest: Pass nodes attribute 
This allows doing things like:

  nix-build nixos/tests/misc.nix -A nodes.machine.config.system.build.initialRamdisk
 2014-07-30 14:30:25 +02:00
Eelco Dolstra f94f659a31 Don't require a device for tmpfs filesystems 2014-07-30 13:18:33 +02:00
Eelco Dolstra 94ce6ec866 Print a sensible error message if no device is specified for a filesystem 2014-07-30 13:18:33 +02:00
Eelco Dolstra b7c543136a Move CIFS support into a separate module 2014-07-30 12:39:35 +02:00
Eelco Dolstra 9956b97b2f Check for systemd environment variables that are too long 
Issue #3403. For the case of $PATH being too long, we could call
buildEnv automatically.
 2014-07-30 10:28:05 +02:00
Eelco Dolstra 19fc92a8ed nixos/tests/containers.nix: Don't ping 
This randomly fails with "Destination Host Unreachable". That
shouldn't happen, since all interfaces/routes should be up after
"nixos-container start" returns. Need more investigation...
 2014-07-29 15:34:22 +02:00
Damien Cassou 355a46ec5d Make the networkmanager group more discoverable 
This change makes the manual present the networkmanager group at several
places to make sure new users see it.
 2014-07-29 09:14:57 +02:00
Jascha Geerds ead06339b8 Add activationScript for TrackPoint configuration 2014-07-28 23:33:05 +02:00
Eelco Dolstra cb7b871bd6 initrd: Include filesystem support for /nix, /var etc. 2014-07-28 22:31:18 +02:00
Paul Colomiets 9bc1676e5a Upgrade docker to 1.1.2 and add docker module 
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
 2014-07-28 21:45:49 +02:00
Rickard Nilsson f5d0d8dbf1 elasticsearch: Fix error in NixOS module, systemd ExecStart path must be absolute. 2014-07-28 20:12:19 +02:00
Rickard Nilsson 212f476c97 Add NixOS module for Mopidy, a music player daemon 2014-07-28 19:52:32 +02:00
Eelco Dolstra 36f99a9a82 Set $SSL_CERT_FILE 
It's more standard than $OPENSSL_X509_CERT_FILE (which I guess was a
totally unnecessary patch to OpenSSL). Since curl respects
$SSL_CERT_FILE, it's no longer needed to set $CURL_CA_BUNDLE. Git
unfortunately doesn't.
 2014-07-28 19:09:32 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	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-07-28 11:30:49 +02:00
Jaka Hudoklin cbb6948b4e Merge pull request #3369 from matejc/fixcpufreqmodule 
fix e18 cpufreq module: set setuid to freqset
 2014-07-26 14:24:23 +02:00
Evgeny Egorochkin be2cec24ed RabbitMQ service: add properties essential for clusters 2014-07-26 14:33:53 +03:00
lethalman de59b6d7cd Merge pull request #3262 from bjornfor/znc-module-types 
nixos/znc-service: don't use types.string (it's deprecated)
 2014-07-26 12:41:25 +02:00
Jaka Hudoklin b035be7b44 Merge pull request #3292 from offlinehacker/elasticsearch_plugins 
elasticsearch: add support for plugins
 2014-07-26 02:23:46 +02:00
Bjørn Forsman 0a750e0f39 nixos/munin: change activationScript to preStart script 
All activation scripts run in serial upon boot and nixos-rebuild switch
etc., in contrast to preStart which run before a service starts, and can
run in parallel with other services.

The munin(-node) activation script is particularly slow. Change it to a
preStart script so that it can run in parallel with other services and
not slow down boot (or nixos-rebuild switch).

This reduces (repeated) "nixos-rebuild test" time from ~16 seconds to ~8
on my (old) laptop.
 2014-07-26 00:31:34 +02:00
Jascha Geerds 6fe59796b2 Use a udev rule for trackpoint configuration 2014-07-25 17:40:13 +02:00
Jaka Hudoklin 7eb4d306fb elasticsearch: add support for plugins 2014-07-25 17:28:59 +02:00
Eelco Dolstra 7c480ad896 setup-etc.pl: Keep track of copied files 
We now track copied files in /etc/.clean. This is important, because
otherwise files that are removed from environment.etc will not
actually be removed from the file system. In particular, changing
users.extraUsers.<user>.openssh.authorizedKeys.keys to an empty list
would not cause /etc/ssh/authorized_keys.d/<user> to be removed, which
was a security issue.
 2014-07-25 14:29:08 +02:00
Eelco Dolstra 72af71d626 nix-ssh: Don't use a shell that refers to a store path 2014-07-25 14:29:08 +02:00
Eelco Dolstra 77dbe2f46e Add convenience option nix.sshServe.keys 
This is equivalent to setting
users.extraUsers.nix-cache.openssh.authorizedKeys.keys.
 2014-07-25 14:29:08 +02:00
Eelco Dolstra 3e9c2bf4b5 nix-ssh-serve.nix: Remove unnecessary check 
ForceCommand ensures that we always run nix-store --serve, so there is
no need to check SSH_ORIGINAL_COMMAND.
 2014-07-25 14:29:08 +02:00
Jascha Geerds 49e6ef2a19 Fix trackpoint configuration on some systems 2014-07-25 14:01:06 +02:00
Matej Cotman 5b97751a8f fix e18 cpufreq module: set setuid to freqset 2014-07-25 12:49:31 +02:00
Bjørn Forsman 162cb556f6 nixos/lighttpd: improve sub-service option types (cgit, gitweb) 2014-07-23 22:18:37 +02:00
Bjørn Forsman 35ebc72f1c nixos/lighttpd-service: don't use types.string (it's deprecated) 2014-07-23 22:12:38 +02:00
aszlig 15bb4c20e6
nixos/doc/manual: Fix typos in README. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-07-23 15:00:25 +02:00
Rob Vermaas 4cac67cada Merge pull request #3335 from DamienCassou/doc-for-building-the-nixos-manual 
README for building the nixos manual
 2014-07-23 09:48:09 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Vladimír Čunát 644c9eb6f7 Revert "Merge #3054: add kde 4.13.2" 
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e, reversing
changes made to 07a09fbe63.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
 2014-07-22 17:48:14 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
lethalman 27a5a68e41 Merge pull request #3336 from DamienCassou/installing-on-efi 
Adding a missing instruction for EFI installations
 2014-07-22 09:36:26 +02:00
Pascal Wittmann 261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2 
Logstash 1.4.2
 2014-07-21 20:02:11 +02:00
Damien Cassou 812da7cd2f Adding a missing instruction for EFI installations 
This commit also adds a link to rEFInd which is a useful tool to manage
EFI systems. If this link is not desired, I can remove it.
 2014-07-21 17:54:38 +02:00
William Roe 8f31b13938 Fix service to use logstash new directory layout 2014-07-21 16:24:18 +01:00
Damien Cassou c59dc1ddc0 README for building the nixos manual 2014-07-21 17:24:10 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Evgeny Egorochkin 2660e19b73 Google Compute config: add a unit to wait for the metadata server to become available 2014-07-20 14:07:46 +03:00
Matej Cotman 1afb26fb17 e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
Eelco Dolstra 1a1442db74 Don't restart systemd-journal-flush 
It only needs to be started during boot. Starting it at other times
shouldn't hurt, except that if systemd-journald is restarting at the
same time, the latter might not have a SIGUSR1 signal handler
installed yet, so it might be killed by systemd-journal-flush. (At
least that's my theory about the dead systemd-journald instances in
the build farm...)
 2014-07-17 21:01:25 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Bjørn Forsman f9a24ba487 nixos/module-list.nix: keep it sorted 2014-07-16 22:16:34 +02:00
Peter Simons 75bbad8abe Merge pull request #3285 from ehmry/polipo 
Polipo
 2014-07-16 18:29:11 +02:00
Emery Hemingway e5988bf4dd polipo: new service expression 2014-07-16 11:29:40 -04:00
Shea Levy 654c88cc6b Fix virtualbox image building with new nix 2014-07-15 19:17:06 -04:00
Bjørn Forsman a4cf5e903b nixos/redis: fix evaluation 
Commit 89fee1006c ("nixos/redis: clean up
option types") broke nixos evaluation:

  error: attempt to call something which is not a function but a set, at .../nixpkgs/nixos/modules/services/databases/redis.nix:111:28

Fix it.

Reported by Oliver Charles (thanks!).
 2014-07-15 17:05:54 +02:00
Bjørn Forsman 89fee1006c nixos/redis: clean up option types 
Some options lack a type and some use the deprecated "string" type. Fix
it.
 2014-07-15 15:45:52 +02:00
Paul Colomiets 496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
taku0 a0c91d66f1 uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt 2014-07-14 21:33:05 +09:00
Bjørn Forsman 3a4498ab07 nixos/znc-service: don't use types.string (it's deprecated) 
Apart from s/types.string/types.str/ (or types.lines where appropriate):

* port is changed from string to int.

* extraFlags is changed from types.string (with unfortunate merge
  semantics) into a list of strings. A list of strings merge better:
  one space is added between elements.
 2014-07-13 20:33:15 +02:00
Pascal Wittmann e57e57c25d Merge pull request #3245 from rastus-vernon/patch-1 
Fix repeated typo
 2014-07-12 09:36:22 +02:00
Evgeny Egorochkin 64c01fdf81 Google Compute Image: fetch host keys if possible 2014-07-12 08:47:03 +03:00
Evgeny Egorochkin 9d8ddd465d Google Compute Image needs the interface to be named eth0 for google tools to work properly 2014-07-12 08:47:03 +03:00
Rastus Vernon d5daa8ae6f Fix repeated typo 
"Can either by" should be "Can either be". There are three occurrences of this mistake, all in descriptions of configuration options.
 2014-07-11 23:14:53 -04:00
Eelco Dolstra 3b2609deec Don't restart systemd-remount-fs 
It's only needed during early boot (in fact, it's probably not needed
at all on NixOS). Restarting it is expensive because it does a sync()
of the root file system.
 2014-07-11 23:34:58 +02:00
System administrator cab929c6c2 httpd: disable logging when logFormat = "none" 2014-07-10 14:32:08 +02:00
Luca Bruno da9b510996 Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset 2014-07-10 11:39:16 +02:00
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
Chris Farmiloe d39684b69b Simple nixos module to enable configuration of freetds and setup the expected environment variables 2014-06-22 14:24:54 +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