Graham Christensen
7db1f727f3
moodle: Remove due to continued security issues.
2017-02-08 09:10:45 -05:00
Joachim Schiele
d491728653
httpd: added serviceExpression which extends the serviceType concept -> allows that httpd services can live outside of nixpkgs ( #22269 )
2017-02-06 01:08:58 +01:00
Bas van Dijk
5cc75352f8
wordpress: 4.7.1 -> 4.7.2
...
See: https://make.wordpress.org/core/2017/02/01/disclosure-of-additional-security-fix-in-wordpress-4-7-2/
2017-02-02 16:41:32 +01:00
Svein Ove Aas
9b2d4a9fce
apache-httpd: Add 'extensions' config option
2017-01-28 19:21:56 +00:00
Graham Christensen
c0f3b8d629
wordpress: 4.6.1 -> 4.7.1 for multiple CVEs
...
CVE-2017-5487 CVE-2017-5488 CVE-2017-5489 CVE-2017-5490 CVE-2017-5491 CVE-2017-5492 CVE-2017-5493
2017-01-19 22:53:49 -05:00
Dan Peebles
df7b4f4f6f
httpd module: don't create documentRoot directory if it doesn't exist
...
It hides bugs and do you ever actually want to serve up an empty directory?
It was pretty confusing to me when it tried to write into a read-only store
path because I accidentally pointed it to the wrong store path.
2017-01-05 21:19:16 -05:00
volth
9bb6d91c73
httpd: setuptools is not top-level
2017-01-05 17:37:33 +00:00
Rok Garbas
e6fa6b21e1
apacheHttpdPackages.mod_perl: init at 2.0.10
2016-12-22 13:36:44 +01:00
Michael Raskin
36010e7046
Merge pull request #20366 from MarcWeber/submit/apache-port-to-listen
...
apache-httpd
2016-11-26 13:37:02 +00:00
Marc Weber
b51f165334
apache-httpd
...
* Introduce listen = [ { ip = "*"; port = 443; } ]; configuartion.
* deprecated port = 443 option which is no longer needed
2016-11-12 15:35:38 +01:00
Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Emery Hemingway
b675619391
nixos: use types.lines for extraConfig
2016-10-23 19:41:43 +02:00
Frederik Rietdijk
104c50dd1a
Python: remove modules and pythonFull
2016-10-10 10:33:24 +02:00
Joachim F
0906a0f197
Merge pull request #18491 from groxxda/network-interfaces
...
Replace Network-interfaces.target
2016-10-02 16:34:37 +02:00
Graham Christensen
e2688e072d
moodle: mark as broken
...
https://github.com/NixOS/nixpkgs/issues/18856
2016-09-28 08:52:18 -04:00
Graham Christensen
8504237863
mediawiki: 1.23.13 -> 1.27.1
2016-09-26 21:53:36 -04:00
Graham Christensen
4671806183
wordpress: 4.3.1 -> 4.6.1 + add a test
2016-09-26 19:36:07 -04:00
Alexander Ried
3ada966bd5
treewide: minor format / style / documentation fixes
2016-09-13 11:19:22 +02:00
Eric Sagnes
ff074ec7a4
apache-httpd: add phpPackage option
2016-06-22 21:24:25 +09:00
zimbatm
a95229a963
Merge pull request #15677 from womfoo/mod_auth_mellon
...
mod_auth_mellon: init at 0.12.0 and dependency lasso: init at 2.5.1
2016-06-12 23:38:57 +01:00
Kranium Gikos Mendoza
25fbac5b52
mod_auth_mellon: init at 0.12.0
2016-05-23 02:02:25 +08:00
Vladimír Čunát
73f1f5eb39
imagemagick: split dev output to fix #9604
...
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Eric Sagnes
a8bc5b67f8
php: add default php.ini
2016-04-29 15:26:20 +09:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Eelco Dolstra
133e6e1ea6
httpd.service: Support reload
...
This is useful when ACME has generated a new TLS certificate.
2016-04-07 17:53:46 +02:00
Lluís Batlle i Rossell
e1bcc27f1a
Making trac/ldap handle httpd 2.4.
...
The option authzldapauthoritative had been removed in 2.4
I pushed this into 16.03 instead of master first. My fault.
(cherry picked from commit 516f47efefc44a5465266fe4d72f9136147d2caf)
2016-04-07 11:40:22 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Vladimír Čunát
c801cd1a04
php: fixup build when configured with httpd via nixos
2016-03-11 11:54:53 +01:00
Vladimír Čunát
1952d5d5f7
nixos/foswiki: basic working service definition
...
Activation is as simple as:
services.httpd = {
enable = true;
adminAddr = "nobody@example.com";
extraSubservices = [ {
serviceType = "foswiki";
} ];
};
2016-03-08 16:38:43 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Eelco Dolstra
f3d94cfc23
Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
...
This reverts commit cad8957eab
. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
Thomas Strobel
cad8957eab
Add the tool "nixos-typecheck" that can check an option declaration to:
...
- Enforce that an option declaration has a "defaultText" if and only if the
type of the option derives from "package", "packageSet" or "nixpkgsConfig"
and if a "default" attribute is defined.
- Enforce that the value of the "example" attribute is wrapped with "literalExample"
if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".
- Warn if a "defaultText" is defined in an option declaration if the type of
the option does not derive from "package", "packageSet" or "nixpkgsConfig".
- Warn if no "type" is defined in an option declaration.
2016-02-29 01:09:00 +01:00
Graham Christensen
7df907b272
moodle: 2.8.5 -> 2.8.10 for CVE-2016-0724 CVE-2016-0725
2016-02-27 17:22:14 -06:00
zimbatm
a7715e3e06
Merge pull request #10231 from zimbatm/apache-intermediate-ssl
...
apache-httpd: adopt mozilla's SSL configuration recommendation
2016-02-20 19:14:51 +00:00
aszlig
7bdcfb33f4
nixos: Provide a defaultText for type = package
...
We don't want to build all those things along with the manual, so that's
what the defaultText attribute is for.
Unfortunately a few of them were missing, so let's add them.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-17 21:12:24 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
86c2a0f783
mediawiki: 1.23.9 -> 1.23.13
2016-02-11 11:24:44 +01:00
Tuomas Tynkkynen
13b3f3f246
treewide: Mass replace 'openssl}/bin' to refer the 'bin' output
2016-02-01 20:46:16 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Augustin Borsu
c17a60b636
owncloud httpd-service: add package option
...
Owncloud package used can now be set in configuration.nix using
package option.
2015-12-02 20:37:41 +01:00
Augustin Borsu
9d5bf282c7
owncloud httpd-service: fix trusted_domain when unset
...
When an empty string was given as trusted_domain, the trusted
domain was set to be empty string instead of not beeing set.
2015-12-02 20:37:33 +01:00
Augustin Borsu
16fd6c1cf0
owncloud: 7.0.5 -> 7.0.10 +
...
Commit changes default version to 7.0.10, 7.0.5 version is kept for
people reluctant to update. Needed info has also been added for
versions 8.0, 8.1 and 8.2 only the latest minor version of each
major version is included.
2015-12-02 20:36:40 +01:00
Augustin Borsu
e08ffc472c
owncloud httpd-service: add urlPrefix option
...
This option allows user to specify a url prefix for owncloud.
By default it is set to "" and the document root will be set
to owncloud's dir.
If a prefix is set, e.g. urlPrefix = "/owncloud"
an alias will be created using that prefix to point to owncloud's
dir and owncloud will be available at http://localhost/owncloud
2015-12-02 20:36:26 +01:00
Aristid Breitkreuz
0b9c4af74a
Merge pull request #11342 from basvandijk/wordpress-4.3.1
...
wordpress: 4.3 -> 4.3.1
2015-11-29 20:51:57 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Bas van Dijk
af500630e8
wordpress: use the correct mysql pidDir
2015-11-29 15:46:43 +01:00
Bas van Dijk
f48f916fd1
wordpress: 4.3 -> 4.3.1
2015-11-29 12:50:00 +01:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Domen Kožar
b76519069d
Merge pull request #9733 from basvandijk/wordpress-fix-extraConfig
...
wordpress: execute the extraConfig before loading wp-settings.php
2015-11-16 13:16:10 +01:00
Tuomas Tynkkynen
58dfef2792
treewide: Fix references to apacheHttpd_2_*
2015-10-28 10:23:03 +01:00
Vladimír Čunát
c5579c9184
subversion: fixup some referrers after splitting
2015-10-28 10:22:59 +01:00
zimbatm
f5f039eeb4
apache-httpd: harden default SSL cipher list
...
A couple of tweaks on the SSL cipher list.
Disabled RC4 which is now considered broken.
https://community.qualys.com/blogs/securitylabs/2013/03/19/rc4-in-tls-is-broken-now-what
Enabled Forward Secrecy for modern browsers.
https://en.wikipedia.org/wiki/Forward_secrecy
Without the change, NixOS servers are capped at Grade B on
https://www.ssllabs.com/ssltest/index.html
2015-10-05 17:19:53 +01:00
Bas van Dijk
5cf5e7ff4c
wordpress: allow extending Wordpress's .htaccess file
2015-09-10 13:21:38 +02:00
Bas van Dijk
a9332583eb
wordpress: Execute the extraConfig before loading wp-settings.php
...
This is needed so that settings defined in extraConfig actually get handled.
2015-09-09 01:12:10 +02:00
Bas van Dijk
88d9fd93c6
wordpress: 4.2.2 -> 4.3
2015-09-08 10:36:44 +02:00
Eelco Dolstra
9d82f7e53e
Revert "Apache service module: allow compression"
...
This reverts commit 164f6ff2a8
per
https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359
(it's too site-specific). Furthermore this should be an option at the
virtual host level.
2015-08-28 12:41:06 +02:00
Wout Mertens
164f6ff2a8
Apache service module: allow compression
2015-08-23 15:13:52 +02:00
Eelco Dolstra
9fa19cfcea
apache-httpd: Don't set default content encodings
...
In general, you don't want a .tar.gz file to be served with
"Content-Encoding: x-gzip", because this causes browsers (like Chrome
or "curl --compressed") to decompress the file on the fly. So you end
up with a .tar rather than .tar.gz file, which is unexpected.
If people want such encodings, they should set them in their own NixOS
configuration.
2015-07-07 12:12:49 +02:00
Joachim Schiele
11cd596aea
wordpress: language downloads are now reproducible
2015-07-03 13:06:44 +02:00
Joachim Schiele
011993c86a
wordpress: usability updates
2015-06-25 16:21:14 +02:00
Igor Pashev
4855b0b3fb
Mediawiki 1.23.9
2015-04-28 08:05:16 +00:00
Igor Pashev
bca76e46f0
Apache servedFiles: fixed a typo in example
2015-04-28 08:05:15 +00:00
Igor Pashev
8388bd3280
wiki: do not rewrite served files
2015-04-28 08:05:08 +00:00
Eelco Dolstra
534b84a9ac
Don't require sslServerChain to be set
2015-04-27 18:24:16 +02:00
Eelco Dolstra
574173f0e6
Merge pull request #7027 from ecraven/apache-sslchain
...
apache-httpd: adding support for sslServerChain
2015-04-13 16:48:20 +02:00
Peter Feigl
3837ef82ad
fixing documentation
2015-04-13 15:42:01 +02:00
Peter Feigl
e5b3918f85
apache-httpd: adding support for sslServerChain
2015-04-13 15:41:10 +02:00
Peter Feigl
69b18fc4b6
fixing indentation
2015-04-13 13:46:42 +02:00
Peter Feigl
44ea83b986
changed config to only include the minimum necessary
2015-04-13 13:10:04 +02:00
Peter Feigl
49eb77b26c
apache-httpd: adding subservice moodle
2015-04-13 13:06:39 +02:00
Joachim Schiele
85c454ab1d
Merge pull request #6785 from qknight/wordpress
...
zef hemel's wordpress.nix adapted to extraSubservices
2015-04-13 10:27:55 +02:00
Philip Potter
7ad6dac43b
owncloud: don't store plaintext adminPassword in nix store
...
Rather than using openssl to hash the password at build time, and hence
leaving the plaintext password world-readable in the nix store, we can
instead hash the password in the nix expression itself using
builtins.hashString.
2015-03-16 22:42:22 +00:00
Joachim Schiele
d74ea7d34f
zef hemels' wordpress.nix adapted to extraSubservices
2015-03-13 14:19:48 +01:00
Eelco Dolstra
8cb3e3b864
httpd: Disable insecure protocols/ciphers by default
...
This makes us resistant to FREAK and similar attacks.
2015-03-09 14:18:12 +01:00
Jaka Hudoklin
41ae4d1af9
add limesurvey package and nixos module
2015-02-07 23:18:51 +01:00
Matej Cotman
3ed3977166
owncloud: make .htaccess available
2015-01-21 22:49:22 +01:00
Matej Cotman
7494bd389e
apache-httpd: add owncloud
2015-01-21 22:49:22 +01:00
Matej Cotman
6630e3e4fe
apache-httpd: add restartSec option
2015-01-21 22:49:22 +01:00
Eelco Dolstra
cfe26e4438
Fix using Apache httpd 2.2
2014-12-15 13:13:17 +01:00
Igor Pashev
1dd53cc990
Mediawiki: updated for Apache 2.4
2014-11-26 16:51:30 +01:00
Longrin Wischnewski
490232bd2e
apache-httpd: add mod_access_compat for compatibility with old httpd-22 configurations
2014-11-12 13:18:02 +01:00
Rickard Nilsson
2b3c3d0e32
Fixes to Apache 2.4 configuration
2014-11-06 21:58:40 +01:00
Eelco Dolstra
b3eb981a95
apache-httpd: Make 2.4 the default
...
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Eelco Dolstra
0de982d75b
httpd: Add option for specifying robots.txt
2014-09-18 19:05:26 +02:00
Eelco Dolstra
837a0c05e5
httpd: Don't emit robots.txt if there are no robots entries
2014-09-18 18:48:28 +02:00
Igor Pashev
5c6e4e7433
Updated Mediawiki to 1.23.3
...
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +02:00
Strahinja Popovic
fe3f7716f0
Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306
2014-09-03 15:46:59 +04:00
Igor Pashev
019bc6bb2b
Made Mediawiki rewrite rules work for virtual hosts
...
Related to cdd1785cd6
2014-08-29 13:56:23 +02:00
aszlig
8a56a55bb4
nixos/manual: Use literalExample when feasible.
...
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.
Thanks to @devhell for reporting.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 23:41:15 +02:00
Igor Pashev
cdd1785cd6
Fixed rewrite rules for Mediawiki
...
If Mediawiki was served from the root directory of the server
it was impossible to serve other directories.
Make sure that URLs defined in servedDirs are not rewritten.
Use case: serving local copy of MathJax
2014-08-25 11:55:57 +02:00
Michael Raskin
c0da615c02
Merge pull request #3230 from robberer/module/httpd
...
httpd: disable logging when logFormat = "none"
2014-08-23 11:37:48 +04:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Chris Farmiloe
34890e7c2a
nixos: Add enablePHP convinence option to services.httpd module to mimic subservices option
...
Fixes #2699
2014-08-03 21:11:45 +02:00
Shea Levy
7fec575976
Fix lib functions taken from pkgs.lib instead of lib in nixos
2014-08-01 16:23:56 -04:00
Danny Groenewegen
51494f2c33
Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202
2014-07-31 16:51:51 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
System administrator
cab929c6c2
httpd: disable logging when logFormat = "none"
2014-07-10 14:32:08 +02:00
Sönke Hahn
09448101c3
mediawiki: add patch for fixing postgresql errors
2014-07-07 23:19:31 +08:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
Igor Pashev
d4a320cd12
Updated Mediawiki to 1.23.1
2014-07-04 17:34:37 +02:00
Shea Levy
b3cfb9084b
Get all lib functions from lib, not pkgs.lib, in modules
2014-07-02 12:28:18 -04: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
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02: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
Strahinja Popovic
25e0d51a67
Phabricator, a web application, snapshot of 2014-05-12
2014-05-12 19:59:40 +02:00
Eelco Dolstra
2dfbe55421
Remove use of obsolete flags
2014-04-29 10:13:21 +02:00
Eelco Dolstra
4fb50f071f
Manual: Typo fixes
2014-04-19 22:59:25 +02:00
Eelco Dolstra
29027fd1e1
Rewrite ‘with pkgs.lib’ -> ‘with lib’
...
Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
2014-04-14 16:26:48 +02:00
Eelco Dolstra
28b7d67d08
httpd: Don't require keys.target
...
This has the unintended side-effect of restarting httpd every time we
run switch-to-configuration, even if httpd hasn't changed (because
we're doing a "stop keys.target" now). So use a "Wants" dependency
instead.
2014-03-17 15:01:10 +01:00
Domen Kožar
97a0dd9eb9
nixos: set all package options to have type package
2014-02-27 13:22:29 +01:00
Shea Levy
f7c04b1e6b
mediawiki: Don't rewrite /images if uploads are enabled
2014-02-27 07:17:10 -05:00
Shea Levy
1e7300ad67
mediawiki rewrite rules only needed with no urlPrefix
2014-02-27 07:17:10 -05:00
Shea Levy
793328e1ee
Mediawiki: Add some needed rewrites
2014-02-25 09:13:40 -05:00
Shea Levy
0d4a9e3aa6
Allow httpd subservices to set the document root
...
Only the main service OR one of the subservices can set the document
root. This is used by mediawiki when it is hosted at the root of the
vhost.
2014-02-25 07:44:45 -05:00
Shea Levy
6a8cc9ab11
mediawiki: Fix some references to /bin/bash
2014-02-10 09:14:30 -05:00
Shea Levy
42df6fcee9
mediawiki: Run update script after initializing the database
2014-02-10 08:56:16 -05:00
Rob Vermaas
9b1bd84940
httpd: Respect original order of environment eval.
2014-01-31 21:18:24 +01:00
Rob Vermaas
bfa56d7657
httpd: Only add PHPRC to environment of httpd when enablePHP is true.
2014-01-31 21:14:05 +01:00
Rob Vermaas
4ccd60af00
Merge pull request #1178 from chexxor/fix-httpd-ssh
...
HTTPD: Check for SSL Cert value before building with SSL support.
2014-01-27 12:34:42 -08:00
Eelco Dolstra
f5844f98ac
mediawiki: Update to 1.20.8
...
CVE-2013-4567, CVE-2013-4568
2013-12-20 14:46:57 +01:00
Eelco Dolstra
886b9e27a6
httpd.nix: Support non-root operation
2013-11-18 18:04:17 +01:00
Eelco Dolstra
e815e4026a
mediawiki: Update to 1.20.7
2013-11-13 17:33:58 +01:00
Eelco Dolstra
785eaf2cea
Add some primops to lib
2013-11-12 13:48:30 +01:00
Alex Berg
da654ed9a0
Check empty stringfor globalRedirect. It breaks RedirectPermanent.
2013-11-11 15:18:46 +08:00
Alex Berg
df5f491893
Add HTTPD SSH assertion to check null cert/key.
2013-11-11 12:08:36 +08:00
Alex Berg
0427e7fbf2
Check for SSL Cert value before building with SSL support.
2013-11-06 11:20:14 +08:00
Eelco Dolstra
be5d3a59dd
Clean up some option examples
2013-10-30 18:47:43 +01:00
Eelco Dolstra
985f1f2d8a
Give types to the Apache httpd options
2013-10-29 14:03:39 +01:00
Eelco Dolstra
98ae32286f
Fix evaluation error in the tomcat test
2013-10-29 01:26:51 +01:00
Eelco Dolstra
738a6c173a
Don't copy Nix expressions to the store while processing Apache subservices
2013-10-29 01:20:33 +01:00
Eelco Dolstra
c9dad37f01
Remove obsolete function addDefaultOptionValues
2013-10-28 22:45:58 +01:00
Eelco Dolstra
f8a9eb9f00
Implement services.httpd.virtualHosts using the module system
2013-10-28 22:45:58 +01:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00