Vladimír Čunát
e0feace5cd
nixos docs: allow displaying package references
...
This is an improved version of original #12357 .
For the purpose of generating docs, evaluate options with each derivation
in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
It isn't perfect, but it seems to cover a vast majority of use cases.
Caveat: even if the package is reached by a different means,
the path above will be shown and not e.g. `${config.services.foo.package}`.
As before, defaults created by `mkDefault` aren't displayed,
but documentation shouldn't (mostly) be a reason to use that anymore.
Note: t wouldn't be enough to just use `lib.mapAttrsRecursive`,
because derivations are also (special) attribute sets.
2016-02-03 14:47:14 +01:00
Vladimír Čunát
889351af8b
Revert "Merge #12357 : nixos docs: show references to packages"
...
The PR wasn't good enough yet.
This reverts commit b2a37ceeea
, reversing
changes made to 7fa9a1abce
.
2016-02-03 12:16:33 +01:00
Vladimír Čunát
b2a37ceeea
Merge #12357 : nixos docs: show references to packages
2016-02-03 10:07:27 +01:00
Franz Pletz
dbb01a863b
Merge pull request #12699 from simonvandel/sundtek
...
sundtek: 2015-12-12 -> 2016-01-26 + service change
2016-01-30 20:41:04 +01:00
Simon Vandel Sillesen
81e99998f7
sundtek: 2015-12-12 -> 2016-01-26 + service change
...
* There is no need for hydra to build this, hence preferLocal
* service change: do not hardcode a wait time of 5 seconds
2016-01-30 20:08:52 +01:00
Eelco Dolstra
bfebc7342e
Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt
2016-01-29 02:32:05 +01:00
Thomas Bereknyei
eda3e938d7
IHaskell: remove un-needed inherit
2016-01-21 17:21:00 -05:00
Edward Tjörnhammar
4948bdadd6
nixos: ihaskell, wrong type restriction redacted
2016-01-21 10:02:39 +01: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
Pascal Wittmann
a3e7adf509
nixos/plex: fix service startup, see #12422
2016-01-17 13:01:42 +01:00
Sander van der Burg
4fafd77f7e
disnix: propagate ejabberd username to the activation module
2016-01-16 18:08:07 +00:00
roblabla
7e10bf4327
matrix-synapse: init at 0.12.0
2016-01-15 15:17:14 +01:00
Vladimír Čunát
3bcf8ae879
nixos manuals: bring back package references
...
This reverts most of 89e983786a
, as those references are sanitized now.
Fixes #10039 , at least most of it.
The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
2016-01-13 12:04:31 +01:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
Peter Simons
d807b057ed
Merge pull request #11920 from bjornfor/rename-host-to-listen-address
...
Rename NixOS option names: 'host' to 'listenAddress'
2016-01-05 12:54:15 +01:00
Benjamin Staffin
fe8498f609
nixos/mathics: New service and test
2016-01-02 14:34:55 -08:00
Austin Seipp
59acfd4f16
nixos/plex: Add 'package' option to module
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-12-30 20:20:25 -06:00
Bjørn Forsman
6b10df7eaa
nixos/subsonic: rename 'host' to 'listenAddress'
...
More descriptive option name.
2015-12-24 00:13:15 +01:00
Bjørn Forsman
e0b0b9723c
nixos/docker-registry: rename 'host' to 'listenAddress'
...
More descriptive option name.
2015-12-24 00:06:40 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Bjørn Forsman
2acf59efa4
nixos/redmine: improve assert message
...
Give the user more context.
2015-12-08 22:52:02 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Arseniy Seroka
0c05f14d53
Merge pull request #10535 from roblabla/feature-updateGitlab8.0.5
...
gitlab: 7.4.2 -> 8.0.5
2015-12-04 16:30:09 +03:00
roblabla
b7a4231aa2
gitlab: 7.4.2 -> 8.0.5
2015-12-04 01:14:24 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Sander van der Burg
a744aa74aa
disnix: add a target for services activated and deactivated by dysnomia
2015-11-26 17:21:19 +00:00
Jan Malakhovski
244fba351c
nixos: use w3m-nox for the manual
2015-11-26 00:34:10 +00:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
makefu
0bdc5e269b
services/misc/bepasty: init at 2015-10-21
...
This module implements a way to start one or more bepasty servers.
It supports configuring the listen address of gunicorn and how bepasty
behaves internally.
Configuring multiple bepasty servers provides a way to serve pastes externally
without authentication and provide creating,listing,deleting pastes interally.
nginx can be used to provide access via hostname + listen address.
`configuration.nix`:
services.bepasty = {
enable = true;
servers = {
internal = {
defaultPermissions = "admin,list,create,read,delete";
secretKey = "secret";
bind = "127.0.0.1:8000";
};
external = {
defaultPermissions = "read";
bind = "127.0.0.1:8001";
secretKey = "another-secret";
};
};
};
2015-11-23 22:10:14 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Ollie Charles
013b848346
devmon: Non-root user, set PATH, require udisks2
...
devmon refuses to run as root. Instead, we now run it as a user service,
and enable udisks2 in order to perform the mounts.
2015-11-18 11:30:08 +00:00
Lengyel Balázs
162542bf8f
fix: ihaskell's and xmonad's dependence on haskell-ng
2015-11-13 19:14:40 +01:00
Nikolay Amiantov
9800862397
nixos/autofs: revive and update to systemd
2015-11-11 16:18:57 +03:00
Domen Kožar
581ae33e96
Merge pull request #10107 from ryantm/calibre-server
...
calibre-server service: init
2015-11-01 09:19:03 +01:00
Ryan Mulligan
922bf3986b
calibre-server service: add type to libraryDir option
2015-10-31 14:21:56 -07:00
Eelco Dolstra
c20403631d
Factor out "man" into a separate module and add "man" outputs to system.path
...
Fixes #10270 .
2015-10-30 15:21:12 +01:00
Vladimír Čunát
c5579c9184
subversion: fixup some referrers after splitting
2015-10-28 10:22:59 +01:00
aszlig
80fb17b251
nixos/nix-daemon: Require .mount for /nix/store.
...
Also related to NixOS/nixops#350 , because while switching to the new
configuration, depending on /nix/store also propagates to the mount
points for /nix/.ro-store and /nix/.rw-store and we don't get an error
while trying to unmount them (because nix-daemon needs to be stopped for
unmounting these paths).
While Nix does have the option to set a different store path, I've found
only hardcoded references in nix-daemon.nix, so I'm using a hardcoded
reference here as well, because after all customizing the store path
will probably only make sense on non-NixOS systems.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-22 19:50:12 +02:00
Nikolay Amiantov
763ad3372a
nixos/parsoid: use nodejs 0.10
2015-10-22 14:34:02 +03:00
Vladimír Čunát
4a571ba0dd
ffmpeg: split into multiple outputs
...
Also fix some referrers.
2015-10-13 20:18:57 +02:00
Vladimír Čunát
99e4371526
curl: split into multiple outputs
...
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
aszlig
e4caf0fde0
nixos/synergy: Restart services on failure.
...
Synergy seems to get more and more unstable in recent versions, so we
might want to debug this properly. However, it makes sense to restart
the service nevertheless, because synergy is about keyboard and mouse
sharing and it's quite annoying to either SSH in to restart the service
or even needing to unplug the keyboard and plug in into the machine with
the failing service.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 04:42:39 +02:00
Ryan Mulligan
a41d07074d
calibre-server service: configuration improvements
...
based on @eldostra feedback:
* remove user and group configuration, because it is probably
unnecessary
* remove libraryDir default
* capitalize and shorten service description
2015-10-03 05:48:46 -07:00
Tuomas Tynkkynen
c856b13067
nixos/nix-daemon: Reference correct output of openssl
2015-10-03 14:08:53 +02:00
Ryan Mulligan
9c22cd380c
calibre-server service: init
2015-09-27 20:31:17 -07:00
Jan Malakhovski
9cc7859b2e
nixos: show the manual in system's /share/doc ( close #9928 )
2015-09-24 12:29:57 +02:00
Eelco Dolstra
89e983786a
Manual: Remove store path references
2015-09-24 11:50:58 +02:00
Edward Tjörnhammar
aeba3eabcd
Revert "Don't evaluate haskellPackages when gitit is disabled"
...
This reverts commit 99750d89dd
.
2015-09-20 21:40:17 +02:00
Paul Wilson
d2ca8b4079
gitit service: check null github auth options
2015-09-10 17:32:30 +00:00
Paul Wilson
dbd125b055
gitit service: add github authentication
2015-09-10 17:32:30 +00:00
Peter Simons
96cb733207
nix-gc.nix: Revert 'prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"'
...
This reverts commit ab6c8643d4
. Issue
https://github.com/NixOS/nix/issues/609 has been resolved, the new Nix
version is available after 86eaeb4c0a
, and
using nix-collect-garbage has the advantage that the '-d' flag is
available, which nix-store doesn't have.
2015-09-04 11:51:01 +02:00
William A. Kennington III
83cf8b0cf8
goPackages: Split into multiple derivations
...
This should reduce the closure size for end users who only need go
binaries as well as reduce the size of closures hydra builders consume.
2015-08-29 12:58:03 -07:00
Peter Simons
ab6c8643d4
nix-gc.nix: prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"
...
Works around https://github.com/NixOS/nix/issues/609 .
2015-08-20 22:56:41 +02:00
Jaka Hudoklin
86ee6c2512
etcd service: do not wait for cluster up
2015-08-20 00:02:27 +02:00
Eelco Dolstra
b3d8d750de
Remove /etc/nixos/nixpkgs from $NIX_PATH
...
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
2015-08-05 14:34:33 +02:00
Eelco Dolstra
3f1354a3cd
Add an option ‘nix.nixPath’ for specifying $NIX_PATH
2015-08-05 14:33:15 +02:00
Edward Tjörnhammar
727e2b5237
nixos: gitit service, add all different repo initalizers
2015-08-03 22:29:47 +02:00
Edward Tjörnhammar
1e2d3f3b5f
nixos: gitit service, use list of strings for plugins
2015-08-03 22:29:41 +02:00
Edward Tjörnhammar
6d23f43b30
nixos: gitit service, use proper documentation formatting in examples
2015-08-03 22:29:30 +02:00
Edward Tjörnhammar
4802a277a4
nixos: gitit service, change yesNo to bool and add toYesNo from bool
2015-08-03 22:29:23 +02:00
Tobias Geerinckx-Rice
c78fd07460
nixos: nix-daemon: update maxJobs description
...
I bought an X2 in 2006. It was awesome.
Use a more contemporary and model-agnostic example.
2015-07-30 19:06:45 +02:00
viric
982ce5ed58
Merge pull request #8978 from dezgeg/pr-arm-images
...
ARM SD card image expressions
2015-07-29 14:13:57 +02:00
Eelco Dolstra
99750d89dd
Don't evaluate haskellPackages when gitit is disabled
...
This cuts evaluation time of my NixOS configuration from 1.76s to
1.36s, and RSS from 443 MiB to 368 MiB.
Issue #8152 .
2015-07-28 10:25:31 +02:00
Eelco Dolstra
e3a5bca4ae
Require signed binary caches by default
2015-07-27 20:30:09 +02:00
Tuomas Tynkkynen
1947179036
nixos/rogue: Set WorkingDirectory to /tmp
...
Otherwise we can get an ugly /rogue.scr in the root of the filesystem
hierarchy.
2015-07-22 16:08:17 +03:00
Oliver Charles
08c192a40b
devmon: New service
2015-07-19 13:39:00 +01:00
Simon Vandel Sillesen
e85dac137e
sundtek init at 30-06-2015
2015-07-07 10:58:58 +02:00
Luca Bruno
41cf8be412
nixos nix-daemon: lower priority is 19. Closes #8675
2015-07-07 09:49:05 +02:00
Robert Irelan
f64a5dd3f3
subsonic service: init
...
Add a systemd service and UID/GID for the Subsonic personal media
streamer server (<http://subsonic.org >).
2015-07-05 17:25:42 -07:00
Eelco Dolstra
a9b3d75e9e
nix.buildMachines: Fewer required fields
2015-06-30 00:51:07 +02:00
Edward Tjörnhammar
ed9dc1fd9e
nixos: added gitit service
2015-06-28 12:39:52 +02:00
William A. Kennington III
fee9ef8659
nixos: Replace pkgs.openssh with config.programs.ssh.package
2015-06-26 17:09:58 -07:00
Eelco Dolstra
1f3f31b2a8
Add options nix.{trustedUsers,allowedUsers}
...
These are just trusted-users and allowed-users in nix.conf. It's
useful to have options for them so that different modules can specify
trusted/allowed users.
2015-06-26 18:45:27 +02:00
Eelco Dolstra
fb203a34c0
nix.buildMachines: Don't require sshUser
2015-06-26 18:44:44 +02:00
Rok Garbas
d405d036c5
redmine service: fixing a typo, pointing to bundler package
2015-06-25 15:24:57 +02:00
Arseniy Seroka
cf44a27fc4
fix argument in mkEnableOption
2015-06-21 18:21:21 +03:00
Eelco Dolstra
6e6a96d42c
Some more type cleanup
2015-06-15 18:18:46 +02:00
Eelco Dolstra
19ffa212af
types.uniq types.int -> types.int
...
types.int already implies uniqueness.
2015-06-15 18:11:32 +02:00
Eelco Dolstra
c738b309ee
types.uniq types.bool -> types.bool
2015-06-15 18:10:26 +02:00
Oliver Matthews
2434ee4aab
Allow setting mediatomb interface
2015-06-13 15:16:28 +00:00
Shea Levy
5ee75e236c
apache-kafka: Enable overriding the kafka package
2015-06-12 15:56:06 -04:00
Sander van der Burg
fd187980c7
Put dysnomia in system environment if Disnix is enabled
2015-06-12 16:18:42 +00:00
Eelco Dolstra
07aa0f7f21
Revert "Use nixUnstable by default"
...
This reverts commit 64a41b7a90
.
2015-06-12 13:20:18 +02:00
Anders Lundstedt
d5b8dda043
mediatomb: fix hardcoded paths
2015-06-10 02:32:33 +02:00
Jaka Hudoklin
b570c644c9
Merge pull request #8223 from offlinehacker/pkgs/rippled/update
...
rippled: Update to 0.28.1
2015-06-08 16:49:39 +02:00
Jaka Hudoklin
161418537c
rippled: Update to 0.28.1
2015-06-08 14:15:07 +02:00
Jaka Hudoklin
2e5dbc4746
Add ripple rest module
2015-06-08 13:48:23 +02:00
Arseniy Seroka
e24eefedd6
Merge pull request #8217 from ip1981/mwlib
...
mwlib uses pdftk to create books
2015-06-08 14:28:12 +03:00
Jaka Hudoklin
509afe860b
Merge pull request #7547 from offlinehacker/nixos/docker-registry/fixes
...
nixos/docker-registry: docker independant docker registry
2015-06-08 12:15:35 +02:00
Igor Pashev
d85be1cfa3
mwlib uses pdftk to create books
2015-06-08 08:35:12 +00:00
lethalman
d144ece04e
Merge pull request #8127 from ip1981/mwlib
...
Add more dependencies for mwlib
2015-06-03 12:50:02 +02:00
Igor Pashev
95c6b835cb
mwlib may use pyfribidi
2015-06-02 06:14:34 +00:00
Igor Pashev
58f6da5cc6
mwlib may use imagemagick (convert)
2015-06-02 06:06:02 +00:00
Eelco Dolstra
64a41b7a90
Use nixUnstable by default
2015-06-01 18:20:28 +02:00
lethalman
cb02d37c31
Merge pull request #8034 from ragnard/apache-kafka-exit-code
...
apache-kafka: Treat exit code 143 as success.
2015-05-28 11:59:06 +02:00
Ragnar Dahlén
9f25762d29
apache-kafka: Treat exit code 143 as success.
...
JVMs exit with exit code 128+signal when receiving a (terminating)
signal. This means graceful termination of a JVM will result in 143, so
add that to `SuccessExitStatus` in systemd service unit.
2015-05-28 10:52:50 +01:00
Wout Mertens
ab0ac154f9
Merge pull request #7302 from ragnard/mesos-slave-without-docker
...
mesos-slave: Docker optional & IP address configurable
2015-05-28 11:43:01 +02:00
Ragnar Dahlén
045e93e0a6
mesos-slave: docker and IP address config options
...
- Usage of docker containerizer is currently hardcoded, this PR makes it
optional. Default is to enable it if docker is enabled.
- Make IP address to listen on part of service configuration.
2015-05-28 06:58:12 +01:00
Igor Pashev
7ed1fb30e2
Added mwlib services
...
Simple local usage:
mwlib = {
nserve = {
enable = true;
};
qserve = {
enable = true;
};
};
For MediaWiki:
$wgCollectionMWServeURL = 'http://localhost:8899 ';
$wgCollectionFormats = array(
'rl' => 'PDF',
'odf' => 'ODT',
);
$wgCollectionPortletFormats = array (
'odf', 'rl'
);
2015-05-27 14:55:22 +00:00
Arseniy Seroka
26492cdba3
Merge pull request #7434 from Forkk/plex-media-server
...
plex: add support for managing plugins via Nix
2015-05-11 14:48:30 +03:00
Charles Strahan
ba186ec4b9
mesos service: only pass --zk if quorum > 0
...
The ZooKeeper URL is not necessary when using in-memory slave
registration.
2015-05-10 19:36:20 -04:00
Charles Strahan
760169663e
mesos: fix indentation in service definition
2015-05-10 17:23:33 -04:00
Domen Kožar
00ef77f426
Merge pull request #7565 from offlinehacker/nixos/confd/module
...
nixos: add confd module
2015-05-02 14:43:02 +02:00
Charles Strahan
ba50d48400
mbpfan: service improvements
...
* add verbosity setting
* don't set mbpfan as a setuid program
2015-05-01 17:11:55 -04:00
Charles Strahan
d83399dcd9
mgpfan: new service
2015-04-30 21:21:15 -04:00
Jaka Hudoklin
ef6b88690d
Merge pull request #7549 from offlinehacker/nixos/ripple-data-api/importmode
...
nixos/ripple-data-api: add import mode option
2015-04-28 14:10:50 +02:00
Domen Kožar
ff12c3274a
Merge pull request #7548 from offlinehacker/etcdfix
...
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 22:14:55 +02:00
Jaka Hudoklin
ffea231652
Merge pull request #7550 from offlinehacker/nixos/rippled/changes
...
nixos/rippled: new options, fixes
2015-04-25 16:28:15 +02:00
Jaka Hudoklin
6ca12344b3
nixos: add confd module
2015-04-25 16:10:49 +02:00
Jaka Hudoklin
fb8bc4da21
nixos/etcd: fix enable type, so it could be enabled on multiple places
2015-04-25 15:21:49 +02:00
Jaka Hudoklin
54ddf2176b
nixos/rippled: new options, fixes
2015-04-25 14:39:24 +02:00
Jaka Hudoklin
5984c04f1f
nixos/ripple-data-api: add import mode option
2015-04-25 14:38:05 +02:00
Jaka Hudoklin
b7cb0420ca
nixos/docker-registry: docker independant docker registry
2015-04-25 14:26:35 +02:00
Forkk
771c7fb496
plex: add support for managing plugins via Nix
...
Added support for managing Plex plugins via Nix. This is done via an
"extraPlugins" configuration option which takes a list of paths to
plugin bundles, which are then symlinked into Plex's plugin directory
when the service is started.
2015-04-17 14:45:49 -05:00
Forkk
079da8cdcd
plex: init at 0.9.11.16.958
...
Added a package and module for Plex Media Server, an application for
managing media collections across multiple devices.
2015-04-17 12:11:30 -05:00
Edward Tjörnhammar
dfc8e5ab05
ihaskell: cleanup wrapper and service
2015-04-15 23:00:03 +02:00
Edward Tjörnhammar
7d0ddbd154
nixos: add ihaskell service
2015-04-11 00:09:31 +02:00
Vladimír Čunát
5aa9b72400
nixos: typo in docker option description
2015-04-09 20:58:20 +02:00
Nicolas B. Pierron
296e6c4991
Fix #7252 - NixOS Manual: Carry the current system value to evaluation of the manual.
2015-04-08 23:14:19 +02:00
Nicolas B. Pierron
6de931a0f8
Merge rename.nix changes.
2015-04-03 23:12:12 +02:00
Eelco Dolstra
fdfe4b7cde
Remove unnecessary symlinks in /nix/var/nix/gcroots
2015-04-01 14:45:02 +02:00
Oliver Matthews
51b06c5865
Add MediaTomb service
2015-03-27 12:45:25 +01:00
Jaka Hudoklin
d3c6d4175a
Merge pull request #6940 from offlinehacker/pkgs/ripple-data-api/add
...
Add ripple data api package and nixos service
2015-03-26 20:04:51 +01:00
Jaka Hudoklin
75169aabc3
Add ripple data api package and nixos service
2015-03-26 20:02:39 +01:00
Jaka Hudoklin
4947bacd52
rippled: expose more options, make compatible with new rippled version
2015-03-21 12:52:06 +01:00
Nicolas B. Pierron
05e8a48fb4
Document and rename internal option of modules.
2015-03-15 14:45:42 +01:00
Shea Levy
1d62ad4746
modules.nix: Generate the extra argument set from the configuration
...
This allows for module arguments to be handled modularly, in particular
allowing the nixpkgs module to handle the nixpkgs import internally.
This creates the __internal option namespace, which should only be added
to by the module system itself.
2015-03-12 23:42:57 +01:00
William A. Kennington III
4940e643cc
nixos/display-manager: Support configurable hidden users
2015-03-09 18:10:31 -07:00
Sander van der Burg
7b27af61fb
Add NixOS global binaries to the PATH
2015-02-26 17:29:49 +00:00
Eelco Dolstra
5762f8f95c
Add options to support signed binary caches
...
Typical use:
nix.requireSignedBinaryCaches = true;
nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];
(The public key of cache.nixos.org is included by default.)
Note that this requires Nix 1.9 and that most of cache.nixos.org
hasn't been signed yet.
2015-02-19 14:22:43 +01:00
Eelco Dolstra
5d7000df68
Automatically set nix.nrBuildUsers to at least nix.maxJobs
2015-02-16 12:02:49 +01:00
Wout Mertens
d41367735d
nix-daemon: Sanity check maxJobs vs nrBuildUsers
2015-02-15 15:37:30 +01:00
lethalman
7614b2f984
Merge pull request #6229 from devhell/canto
...
canto-{curses,daemon}: Add packages
2015-02-10 10:34:11 +01:00
devhell
a9ac564f50
canto-daemon: Fix typo and remove TimeoutStopSec
2015-02-08 14:16:17 +00:00
devhell
d6e9df1e1a
canto-daemon: Add a systemd service
...
This adds a systemd service for the canto-daemon.
2015-02-08 14:16:17 +00:00
Nikolay Amiantov
b22a1ff683
Merge pull request #4485 from abbradar/parsoid
...
Add "parsoid" service
2015-02-04 23:08:28 +03:00
Lukas Lihotzki
c848d05de9
gitlab: Fix typo
2015-02-03 22:08:10 +01:00
Nikolay Amiantov
9a04482af7
parsoid: add service
2015-02-02 22:21:45 +03:00
lethalman
9576ff49d8
Merge pull request #5737 from matthiasbeyer/add-gitolite_admin_pubkey_oneline_note
...
Add note that admin-pub-key for gitolite has to be written in one line
2015-01-30 11:24:06 +01:00
Ragnar Dahlén
17bd96ea25
apache-kafka: New service for Apache Kafka
2015-01-29 11:10:22 +00:00
aszlig
d110f5adf7
nixos/gitlab: Fix evaluation.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 08:20:14 +01:00
Charles Strahan
6eaa419920
gitlab: fix evaluation
2015-01-25 16:28:18 -05:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Ryan Mulligan
2e3fa5b849
different wording for adminPubkey description
...
Maybe this wording is a slight improvement?
2015-01-12 21:49:33 -08:00
Matthias Beyer
f64d795950
Add note that administrative public key for gitolite has to be written in one line
2015-01-12 23:10:27 +01:00
Peter Simons
ea94a6d653
nixos/modules/services/misc/nix-daemon.nix: document meaning of '0' for the buildCores attribute
2015-01-05 15:38:08 +01:00
Charles Strahan
94dd4b9721
ruby: WIP
2014-12-30 21:05:00 -05:00
Charles Strahan
145733c479
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/redmine/default.nix
pkgs/development/interpreters/ruby/gem.nix
pkgs/development/interpreters/ruby/generated.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/tools/vagrant/default.nix
pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Charles Strahan
4ed847d81d
redmine: fix use of bundler
2014-12-28 14:22:11 -05:00
aszlig
c7e3ddf7ff
nixos/synergy: Fix use of the "optional" function.
...
Commit 939edb1
reintroduced autoStart, but instead of creating a list of
units for the wantedBy list with optional it became a list of lists of
units.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-24 12:35:57 +01:00
wmertens
a8c726da56
Merge pull request #5378 from benley/mesos
...
mesos-slave: add config option for slave attributes
2014-12-19 08:10:07 +01:00
Evgeny Egorochkin
939edb1873
synergy: restore autostart option.
...
closes #5334
2014-12-19 08:25:23 +02:00
Benjamin Staffin
c47cefd05e
nixos/mesos: Parameterize mesos slave attributes
...
Added attributes to nixos/tests/mesos.nix to verify that mesos-slave
attributes work. If the generated attributes are invalid, the daemon
should fail to start.
Change-Id: I5511245add30aba658b1af22cd7355b0bbf5d15c
2014-12-18 14:47:24 -08:00
Jaka Hudoklin
90683792aa
gitlab: fix i686-linux build and module
...
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available ).
But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 02:24:12 +01:00
Jaka Hudoklin
13e58784bf
nixos/gitlab: fixes
...
- fix timezone data not found
- fix module, add simple test
- allow to set port
2014-12-12 18:01:31 +01:00
Thomas Hunger
59995e168c
nixos: Add gitlab and gitlab-shell
...
I had to make several adjustments to make it work with nixos:
* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
pre-receive.
* Modify gitlab-shell to write some environment variables into
the .authorized_keys file to make sure gitlab-shell reads the
correct config file.
* Log unicorn output to syslog.
I tried various ways of adding a syslog package but the bundler would
not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
This is useful to run e.g. backups etc. with the correct
environment set up.
2014-12-12 18:01:29 +01:00
Eelco Dolstra
faf0797c0c
Use https://cache.nixos.org
2014-12-09 13:38:46 +01:00
Bjørn Forsman
f85ad2d378
nfs-utils: align attrname with pkgname
...
nfsUtils => nfs-utils. Keep copy of old attribute for backward
compatibility.
2014-12-06 17:01:05 +01:00
William A. Kennington III
8297e09d78
nixos/synergy: Don't generate units unecessarily
2014-12-05 12:12:17 -08:00
Jaka Hudoklin
a0cf449fa5
mesos: add docker support
2014-12-02 12:22:12 +01:00
Jaka Hudoklin
4fe3e44645
nixos/mesos: restart on failure
2014-12-01 16:57:56 +01:00
Jaka Hudoklin
827ad85a1e
nixos/mesos: convert quorum to string
2014-12-01 16:57:17 +01:00
Antoine R. Dumont
e54f9ffcf4
Ensure nix-daemon sees the proxy defined options
...
(Not sure about this one)
Here are the incomplete and a little contradictory discussions about
it (or at least my interpretations of them):
- https://github.com/NixOS/nixpkgs/pull/5058#discussion_r20830855
- https://github.com/NixOS/nixpkgs/pull/5058#discussion_r21043552
cc @edolstra @wmertens
What did I get wrong?
2014-11-30 15:19:30 +01:00
Antoine R. Dumont
3c7e779602
Introduce a dedicated networking.proxy option
...
Following the discussion NixOS#5021:
- obsolete the nix.proxy option
- add the networking.proxy option
- open a default no_proxy environment variable
- add a rsync option
- Manual tests ok.
- Automatic tests ok.
Amended by lethalman to simplify the option descriptions.
2014-11-30 15:19:25 +01:00
cillianderoiste
04d62f6643
Merge pull request #5006 from daogames/este/customgitoliteuser
...
enable different useraccount name for gitolite user
2014-11-24 22:03:20 +01:00
Jaka Hudoklin
4f592d4f29
nixos/etcd: fix postStart check and make tests deterministic
2014-11-23 12:16:50 +01:00
Jaka Hudoklin
7202121e0e
nixos/etcd: only use one cient url by default
2014-11-23 01:25:53 +01:00
Jaka Hudoklin
73dc767aa0
nixos: add docker-registry module
2014-11-22 12:16:41 +01:00
Jaka Hudoklin
444bda1936
Merge pull request #4991 from offlinehacker/nixos/etcd
...
nixos: add etcd module
2014-11-22 12:05:35 +01:00
Jaka Hudoklin
b02d90969f
make zookeeper.nix non-executable
2014-11-21 15:06:51 +01:00
Jaka Hudoklin
b3bc157f7f
nixos: add etcd module
2014-11-21 13:54:45 +01:00
Ronny Esterluss
2b243bfbad
enable different useraccount name for gitolite user
2014-11-14 17:39:41 +01:00
Charles Strahan
6e6ac35024
more rubyLibs renaming
2014-11-12 22:32:32 +00:00
Nikolay Amiantov
5423f62373
gitolite: add dataDir
2014-11-02 02:24:41 +03:00
Nikolay Amiantov
e8dace201f
nix-daemon: add maxCores option
2014-11-01 23:58:21 +03:00
Domen Kožar
b4a335cd59
nixos: add redmine service
2014-10-07 10:55:50 +02:00
Mateusz Kowalczyk
cd5f4e7f85
Merge pull request #4211 from ehmry/cpuminer-cryptonight
...
Cpuminer cryptonight
2014-09-22 19:26:35 +01:00
Emery Hemingway
c8109488b3
cpuminer-cryptonight: new service module
2014-09-22 13:37:47 -04:00
Ronny Esterluss
473ffd9eae
extended gitolite service to take custom hooks
...
Closes #4160
2014-09-21 00:08:40 +01:00
Nathan Bijnens
00ad134284
Mesos: services
2014-09-03 19:21:49 +02:00
Michael Raskin
94a131b95a
Fix forgotten unit entry
2014-09-03 15:47:53 +04: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
Emery Hemingway
f5b4eacad6
uhub: initial service expression
2014-09-01 10:53:19 +04:00
Nathan Bijnens
ac90177cb1
Zookeeper
2014-08-27 13:01:30 +02:00
Eelco Dolstra
005f78e739
Fix opening NixOS manual
...
http://hydra.nixos.org/build/13760576
2014-08-27 11:08:50 +02:00
Emery Hemingway
af09d3ebd8
siproxd: initial service expression
2014-08-19 10:19:52 -04:00
Eelco Dolstra
b35770818d
In Nix chroots, provide plain bash, not bash-interactive
...
This way we don't get ncurses in the chroot. Also, use a bind-mount of
/bin/sh to bash, rather than the entire /bin from the host filesystem.
2014-08-04 16:46:39 +02:00
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
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
Eelco Dolstra
9ae3654fd6
Fix generation of synergy-{client,server} when disabled
2014-06-16 10:45:09 -04: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
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
Eelco Dolstra
a142d68b43
Fix some uid/gid attributes to match the actual user/group name
2014-04-29 10:51:42 +02:00
Eelco Dolstra
48d90cf3b6
Revert "Put /nix/var/nix/{temproots,userpool} on a tmpfs"
...
This reverts commit dd49094a25
. Nix
barfs if /nix/var/nix/temproots is a symlink :-(
2014-04-18 18:37:07 +02:00
Eelco Dolstra
dd49094a25
Put /nix/var/nix/{temproots,userpool} on a tmpfs
2014-04-18 16:56:20 +02:00
Eelco Dolstra
c13cede19d
Remove long-obsolete /nix/var/nix/chroots directory
2014-04-18 16:50:37 +02:00
Eelco Dolstra
9bb40b7a5b
Pull in nix-daemon.socket
...
This led to the container test failing, which made no sense
whatsoever, until I realized nix-daemon.socket creates the socket
directory as a side effect, which systemd-nspawn then bind-mounts.
http://hydra.nixos.org/build/10397575
2014-04-18 14:50:07 +02:00
Eelco Dolstra
179acfb664
Allow upstream systemd units to be extended
...
If you define a unit, and either systemd or a package in
systemd.packages already provides that unit, then we now generate a
file /etc/systemd/system/<unit>.d/overrides.conf. This makes it
possible to use upstream units, while allowing them to be customised
from the NixOS configuration. For instance, the module nix-daemon.nix
now uses the units provided by the Nix package. And all unit
definitions that duplicated upstream systemd units are finally gone.
This makes the baseUnit option unnecessary, so I've removed it.
2014-04-17 18:52:31 +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
2da09363bf
nix: Update to 1.7
2014-04-11 12:24:48 +02:00
Emery Hemingway
def448f127
rippled: added comment on commented out config options
2014-03-31 22:59:01 -04:00
Emery Hemingway
6c77690b28
rippled: initial pkg and module expressions
...
rippled is the Ripple P2P payment network reference server
https://ripple.com
2014-03-29 15:31:37 -04:00
Eelco Dolstra
1b6c01721d
Revert "nixos-manual: show manual on tty8 by default"
...
This reverts commit b792394119
.
Starting the manual on tty8 was intended as a convenience during
installation, not as a general purpose thing. In fact, given that w3m
runs as root, this is highly insecure!
2014-03-17 12:45:57 +01:00
Bjørn Forsman
f7006116b3
nixos/gpsd-service: add type declarations to options
2014-03-15 17:35:55 +01:00
Bjørn Forsman
28e5f72f05
nixos/gpsd-service: change from deprecated 'jobs' type to 'systemd'
...
This has the nice side-effect of making gpsd actually run!
Old behaviour (debugLevel=2):
systemd[1]: gpsd.service holdoff time over, scheduling restart.
systemd[1]: Stopping GPSD daemon...
systemd[1]: Starting GPSD daemon...
systemd[1]: gpsd.service start request repeated too quickly, refusing to start.
systemd[1]: Failed to start GPSD daemon.
systemd[1]: Unit gpsd.service entered failed state.
New behaviour (debugLevel=2):
gpsd[945]: gpsd: launching (Version 2.95)
systemd[1]: Started GPSD daemon.
gpsd[945]: gpsd: listening on port 2947
gpsd[945]: gpsd: running with effective group ID 27
gpsd[945]: gpsd: running with effective user ID 23
gpsd[945]: gpsd: stashing device /dev/ttyUSB0 at slot 0
2014-03-15 17:35:55 +01:00
Domen Kožar
b792394119
nixos-manual: show manual on tty8 by default
2014-02-28 13:32:19 +01:00
Domen Kožar
97a0dd9eb9
nixos: set all package options to have type package
2014-02-27 13:22:29 +01:00
Petr Rockai
f21abed131
nixos: Assign uid/gid to dictd's service user.
2014-02-22 12:00:08 +01:00
Shea Levy
95a77ea39f
Unconditionally add ssh to nix-daemon's path for the ssh substitituer
2014-02-20 14:17:30 -05:00
Shea Levy
fefc0d9917
Add module to enable the server for the ssh substituter
2014-02-20 13:40:51 -05:00
Petr Rockai
66db1b3a64
nixos: Add a dictd service.
2014-01-25 16:35:02 +01:00
Jaka Hudoklin
ba1bbc2fa8
nixos/cgminer: fix restarts, set uid
2014-01-13 00:19:06 +01:00
Eelco Dolstra
57f145a7f8
When setting $NIX_REMOTE, check whether /nix/var/nix/db is writable
...
In NixOS containers, root doesn't have write permission to
/nix/var/nix/db, so it has to use the daemon.
2013-11-27 17:09:17 +01:00
Eelco Dolstra
2b1f212494
Disable various services when running inside a container
2013-11-26 18:19:45 +01:00
Eelco Dolstra
785eaf2cea
Add some primops to lib
2013-11-12 13:48:30 +01:00
Sander van der Burg
d31b328d0a
Updated Disnix service definition to support new development version and mongo databases
2013-11-07 10:54:53 +01:00
Eelco Dolstra
d9c13a73c2
gurobi: Remove
...
It's proprietary, non-redistributable software.
2013-11-05 00:07:24 +01:00
Eelco Dolstra
9ef07d859b
Include the NixOS version in the manual
...
In particular, this will make it clear what version of the manual is
shown at http://nixos.org/nixos/manual/ .
2013-11-01 16:47:29 +01:00
Eelco Dolstra
456d8ec52b
Clean up Synergy option descriptions a bit
2013-10-31 13:18:00 +01:00
Eelco Dolstra
408b8b5725
Add lots of missing option types
2013-10-30 18:47:43 +01:00
Eelco Dolstra
862e3dd977
Substitute "types.uniq types.string" -> "types.str"
2013-10-30 14:57:42 +01:00
Eelco Dolstra
0695b68c8c
Manual: Render multi-line strings properly
2013-10-29 17:39:31 +01:00
Eelco Dolstra
259f7a93b1
Rename environment.nix -> nix.package
2013-10-28 22:45:57 +01:00
Eelco Dolstra
d5047faede
Remove uses of the "merge" option attribute
...
It's redundant because you can (and should) specify an option type, or
an apply function.
2013-10-28 22:45:56 +01:00
Eelco Dolstra
f4a418761b
Check for undeclared options
2013-10-28 22:45:56 +01:00
Eelco Dolstra
89bd18b3af
Fix manual generation
2013-10-28 22:45:56 +01:00
Eelco Dolstra
7cf0e0bda8
Manual: Fix bad \" characters
2013-10-28 22:45:56 +01:00
Eelco Dolstra
20150b1cee
Ensure that the manual job gets build with the right revision info
2013-10-24 19:58:34 +02:00
Eelco Dolstra
d49f141a79
Manual: When building from the channel, link to the exact Git revision
2013-10-24 02:03:10 +02:00
Eelco Dolstra
65277727e8
nix-gc: Revert to "script" instead of ExecStart
...
There is an assumption that cfg.options can contain shell code, so
ExecStart doesn't work here.
2013-10-21 11:22:27 +02:00
Eelco Dolstra
82ad8c5ce0
Make manual generation not depend on the user's configuration
...
Previously changing the value of certain options in configuration.nix
would cause the manual to be regenerated, because some option defaults
depend on the configuration. This is undesirable because rebuilding
the manual is kind of slow. So now the manual reflects an empty
configuration.
The downside is that this requires another call to fixMergeModules,
which adds about 14% to evaluation time. Probably worth it.
2013-10-17 13:43:40 +02:00
Shea Levy
a5a13c4e43
Add gurobi token server service
...
Not yet tested, I don't have a license yet
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-16 11:02:05 -04:00
Eelco Dolstra
e0db0aaa4d
Rename /etc/nix.machines to /etc/nix/machines
...
Since we have a /etc/nix directory, we should use it and not pollute
/etc.
2013-10-16 10:57:25 +02:00
Eelco Dolstra
16cd8b039b
Remove nix.manualNixMachines
...
Suggested by Marc Weber. Fixes #1059 .
Generate /etc/nix.machines only if buildMachines is not empty. Thus,
if you want to manage /etc/nix.machines in some other way, you can set
nix.distributedBuilds to true but not set nix.buildMachines.
2013-10-16 10:53:23 +02:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00