Sander van der Burg
3a9dfceb07
Implemented a very very dirty hack, which makes it possible to statically determine which activation types are supported, instead of determining this by the avahi service
...
svn path=/nixos/trunk/; revision=32089
2012-02-06 22:49:41 +00:00
Florian Friesdorf
eb755d4692
switched all mergeOptionString to pkgs.lib.types.string
...
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.
For my system the change evaluated to the exactly same.
svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Eelco Dolstra
8eba736da9
* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
...
more readable (also in "ps" output).
svn path=/nixos/trunk/; revision=30565
2011-11-25 16:32:54 +00:00
Eelco Dolstra
d77fc84d2f
* For consistency, use /etc/nix/nix.conf instead of /nix/etc/nix/nix.conf.
...
There is really no reason to have a configuration file outside of /etc,
and it's consistent with what the Fedora/Debian packages for Nix use.
svn path=/nixos/trunk/; revision=30212
2011-11-03 19:04:54 +00:00
Peter Simons
20b364f4de
Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
...
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.
svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy
09cf6ce70c
find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'
...
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable
svn path=/nixos/trunk/; revision=30104
2011-10-29 21:03:57 +00:00
David Guibert
df1c3dda68
autofs: add sshfs to PATH
...
svn path=/nixos/trunk/; revision=29392
2011-09-20 07:14:24 +00:00
Marco Maggesi
91a6dc6168
Make VirtualBox Guest Additions use the configured kernel.
...
svn path=/nixos/trunk/; revision=29346
2011-09-19 13:20:09 +00:00
Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Eelco Dolstra
5de82a6802
svn path=/nixos/trunk/; revision=29053
2011-09-05 23:33:29 +00:00
David Guibert
96304c9afc
make the virtualbox guest module loadable by modprobe.
...
svn path=/nixos/trunk/; revision=28436
2011-08-09 19:53:01 +00:00
Eelco Dolstra
908a025b22
* Die tabs die.
...
svn path=/nixos/trunk/; revision=26184
2011-03-07 08:21:39 +00:00
Eelco Dolstra
10e8a801b6
* Refactor: extraChrootPaths -> chrootDirs. This allows disabling the
...
default chroot paths using mkOverride.
svn path=/nixos/trunk/; revision=26183
2011-03-07 08:20:24 +00:00
Michael Raskin
00f3a816a9
Adding a possibility to add more paths to chroots used by nix-daemons. The use-case is building the latest version from repository with very large checkouts. That way you do not get extra copy in store every time you rebuild, and you can implement a saner version checking than checksumming all the data
...
svn path=/nixos/trunk/; revision=26174
2011-03-06 15:39:05 +00:00
Sander van der Burg
66ead80026
Disnix now also waits for the services it supports before it starts the Disnix daemon itself
...
svn path=/nixos/trunk/; revision=25626
2011-01-19 12:59:32 +00:00
Sander van der Burg
6ba45109a1
Integers must be converted to strings, of course
...
svn path=/nixos/trunk/; revision=25274
2010-12-24 16:34:18 +00:00
Sander van der Burg
70402c9397
Adapted Disnix module to publish the svnBaseDir and to support the postgresql and subversion types
...
svn path=/nixos/trunk/; revision=25236
2010-12-22 13:32:51 +00:00
Sander van der Burg
edcf526c32
Added svnserve module, to serve Subversion repositories through the SVN protocol
...
svn path=/nixos/trunk/; revision=25235
2010-12-22 13:32:16 +00:00
Sander van der Burg
281f3b0776
Fixed the avahi service and do some better formatting of the key=value pairs
...
svn path=/nixos/trunk/; revision=25060
2010-12-10 23:58:57 +00:00
Sander van der Burg
e51fcac73c
- deployment.targetHost is now defined as an option
...
- developed services.disnix.infrastructure option, which contains properties for the Disnix infrastructure model (these properties can be either used by Disnix itself or the Avahi publisher)
svn path=/nixos/trunk/; revision=25052
2010-12-10 14:22:00 +00:00
Sander van der Burg
b064f5c80e
The Disnix avahi server now also publishes the 'system' attribute and the properties defined in config.deployment
...
svn path=/nixos/trunk/; revision=24849
2010-11-24 23:00:52 +00:00
Sander van der Burg
fcf53be5bd
The DisnixWebService is also published through Avahi
...
svn path=/nixos/trunk/; revision=24792
2010-11-21 16:04:26 +00:00
Sander van der Burg
ad48c7c534
Initial implementation for the Disnix avahi publisher
...
svn path=/nixos/trunk/; revision=24789
2010-11-21 13:28:48 +00:00
Sander van der Burg
4858ab9da8
The DisnixWebService is now also part of the systemPackages so that a user can invoke the client tool from the command-line
...
svn path=/nixos/trunk/; revision=24564
2010-11-02 04:20:37 +00:00
Sander van der Burg
e39b10a4d9
- The Disnix service needs Nix in its PATH for now
...
- Implemented an extraGroups property for tomcat to grant a tomcat application access to the Disnix service
svn path=/nixos/trunk/; revision=24561
2010-11-01 19:01:26 +00:00
Sander van der Burg
9359ebf975
Implemented an option to enable to DisnixWebService on Apache Tomcat
...
svn path=/nixos/trunk/; revision=24560
2010-11-01 17:33:54 +00:00
Evgeny Egorochkin
39193fa1e7
Folding@Home service: don't make binaries visible
...
svn path=/nixos/trunk/; revision=23852
2010-09-18 12:44:03 +00:00
Evgeny Egorochkin
dc8eff071a
Added Folding@Home service
...
svn path=/nixos/trunk/; revision=23816
2010-09-16 02:06:44 +00:00
Eelco Dolstra
f729f12e4e
Some cleanups in the activation script:
...
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
never makes sense not to have it there. It no longer needs to be
declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
string (i.e., `noDepEntry' is not needed anymore).
svn path=/nixos/trunk/; revision=23762
2010-09-13 15:41:38 +00:00
Sander van der Burg
10a3bd6ffe
Added virtualbox service, which fixes the RandR problem and also keeps the guest's clock in sync with the host
...
svn path=/nixos/trunk/; revision=23672
2010-09-07 13:28:17 +00:00
Eelco Dolstra
2ec105cc85
* Separate building of the NixOS manual and manpages. Usually we only
...
need the manpages, and the manual takes much longer to build.
svn path=/nixos/trunk/; revision=23112
2010-08-11 12:28:53 +00:00
Marc Weber
0dd9b4caaf
reverting -r22286
...
svn path=/nixos/trunk/; revision=22358
2010-06-21 14:17:19 +00:00
Marc Weber
d0fd8da8f0
example how to pass options to nix-daemon
...
svn path=/nixos/trunk/; revision=22286
2010-06-15 19:04:06 +00:00
Eelco Dolstra
c089738bdc
* Use the shadow' package instead of
pwdutils', `pam_login' and
...
`su'.
* The `usermod' from `shadow' allows setting a supplementary group
equal to the user's primary group, so the special hack for the
`nixbld' group is no longer needed.
* Removed /etc/default/passwd since it's not used by the new passwd.
The hash is configured in pam_unix.
* Move some values for `security.setuidPrograms' and
`security.pam.services' to the appropriate modules.
svn path=/nixos/trunk/; revision=22107
2010-06-02 21:10:48 +00:00
Eelco Dolstra
d67e6e6285
* Remove some `stopOn = "ip-down"' declarations since they probably
...
don't do the right thing (e.g. they don't distinguish between
network interfaces).
svn path=/nixos/trunk/; revision=22102
2010-06-02 16:19:48 +00:00
Lluís Batlle i Rossell
27886d8288
Fixing an xml manual tag (the manual did not validate, so, its build failed)
...
svn path=/nixos/trunk/; revision=21440
2010-04-29 19:06:18 +00:00
Marc Weber
8754644faf
add more documentation to distributedBuilds and what can be done if buildmachines are not always up
...
svn path=/nixos/trunk/; revision=21409
2010-04-28 19:52:00 +00:00
Sander van der Burg
d9528767af
Added preliminary Apache Felix service
...
svn path=/nixos/trunk/; revision=21244
2010-04-22 15:13:50 +00:00
Sander van der Burg
2936d7062d
Added creation of the disnix group on first startup, if the disnix service is enabled
...
svn path=/nixos/trunk/; revision=21164
2010-04-19 13:26:21 +00:00
Sander van der Burg
b904954793
Updated disnix service for the 0.1 release
...
svn path=/nixos/trunk/; revision=20917
2010-04-01 14:53:17 +00:00
Eelco Dolstra
bd81b7a173
* Urgh, this should never have been committed.
...
svn path=/nixos/trunk/; revision=20660
2010-03-16 15:15:17 +00:00
Eelco Dolstra
a104f07a07
* Move the definition of the Nix build users out of user-groups.nix to
...
nix-daemon.nix.
* Add an option ‘nix.nrBuildUsers’ to allow the number of build users
to be overriden.
svn path=/nixos/trunk/; revision=20571
2010-03-11 16:50:08 +00:00
Rob Vermaas
2b7da40351
revert unintended part of the previous commit
...
svn path=/nixos/trunk/; revision=20123
2010-02-19 09:55:28 +00:00
Rob Vermaas
a87ee76cb3
* hydra: added option to self manage nix.machines (for buildfarm purposes)
...
svn path=/nixos/trunk/; revision=20121
2010-02-19 09:48:24 +00:00
Marc Weber
c0c4d575d2
autofs job fixes:
...
use exec so that upstart knows when automount shuts down.
If a mount is used upstart will send SIGKILL.
Automount doesn't clean up. So unmount everything using a post script.
svn path=/nixos/trunk/; revision=19105
2009-12-25 06:39:43 +00:00
Ludovic Courtès
3f2348ef91
Start networking services on `ip-up' when it makes sense.
...
svn path=/nixos/trunk/; revision=18962
2009-12-15 13:02:23 +00:00
Nicolas Pierron
05c23802bb
Fix synergy client.
...
* Add serverAddress option.
* Evaluate the client daemon in foreground, otherwise upstart get the hand
and tries to restart it.
svn path=/nixos/trunk/; revision=18799
2009-12-04 12:50:49 +00:00
Nicolas Pierron
f4a6f9e84b
* Add options to handle automatic calls to the garbage collector.
...
These options avoid manual references to pkgs.nixUnstable which might be
changed with environment.nix option.
svn path=/nixos/trunk/; revision=18798
2009-12-04 12:50:44 +00:00
Eelco Dolstra
83a9bf9a6a
* Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
...
(e.g., startOn = "started foo" instead of startOn = "foo").
svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra
77ec877a8c
* Fix the background of the manual.
...
svn path=/nixos/trunk/; revision=17832
2009-10-15 14:35:10 +00:00
Eelco Dolstra
762c13b83e
* Fix the Rogue job.
...
svn path=/nixos/trunk/; revision=17830
2009-10-15 14:02:24 +00:00
Eelco Dolstra
f6f5d0414e
* Run the nix-daemon with a lower I/O priority so that it doesn't
...
interfere with interactive tasks as much (hopefully).
svn path=/nixos/trunk/; revision=17820
2009-10-15 11:25:15 +00:00
Eelco Dolstra
1581d91330
* Fix the job name of the Nix daemon.
...
svn path=/nixos/trunk/; revision=17776
2009-10-13 10:09:06 +00:00
Eelco Dolstra
eba8f94069
* jobAttrs -> jobs.
...
svn path=/nixos/trunk/; revision=17769
2009-10-12 18:09:34 +00:00
Eelco Dolstra
d982f23f20
* Convert the remaining jobs to jobAttrs style.
...
svn path=/nixos/trunk/; revision=17764
2009-10-12 17:27:57 +00:00
Eelco Dolstra
9943e0762e
* Update some more modules.
...
svn path=/nixos/trunk/; revision=17763
2009-10-12 17:09:38 +00:00
Eelco Dolstra
e91d882a94
* Converted modules that were still using the old (concrete syntax)
...
style of declaring Upstart jobs. While at it, converted them to the
current NixOS module style and improved some option descriptions.
Hopefully I didn't break too much :-)
svn path=/nixos/trunk/; revision=17761
2009-10-12 16:36:19 +00:00
Eelco Dolstra
8ab6828f31
* Export the manual under system.build.manual to make it easier to
...
test (nix-build /etc/nixos/nixos -A config.system.build.manual).
svn path=/nixos/trunk/; revision=17644
2009-10-05 13:55:33 +00:00
Eelco Dolstra
38898d5304
* r17391 changed the mingetty ttys to device names instead of tty
...
numbers. This also requires kbd and tty-backgrounds to be updated
(and by extension syslogd and rogue). Also updated the style of
those modules.
svn path=/nixos/trunk/; revision=17424
2009-09-25 19:55:08 +00:00
Nicolas Pierron
2ebd1252aa
Fix typo.
...
svn path=/nixos/trunk/; revision=17260
2009-09-18 15:47:02 +00:00
Nicolas Pierron
0e3981213f
Add an option to change the policy of source file links inside the manual.
...
The default policy use local files instead of remote ones.
svn path=/nixos/trunk/; revision=17258
2009-09-18 15:27:10 +00:00
Eelco Dolstra
70a10c1720
* In the generation of machines.nix, support specifying a
...
speed factor and multiple system types.
svn path=/nixos/trunk/; revision=17231
2009-09-17 16:22:26 +00:00
Nicolas Pierron
10e9705a86
Replace optionDeclarations by options which is directly computed by
...
moduleMerge.
svn path=/nixos/trunk/; revision=17166
2009-09-15 14:09:18 +00:00
Eelco Dolstra
17d287afa5
* Bump the number of maximum open files for Nix builders.
...
Our VM builds were causing Samba to go over this limit.
svn path=/nixos/trunk/; revision=16960
2009-09-04 15:27:52 +00:00
Sander van der Burg
484580dbbd
Updated disnix service to work with latest revision
...
svn path=/nixos/trunk/; revision=16929
2009-09-02 10:27:44 +00:00
Eelco Dolstra
f1035de47c
* For the generation of manual / manpages, don't evaluate the option
...
declarations again (because we already have them). This cuts
evaluation time from 7.2s to 4.9s.
svn path=/nixos/trunk/; revision=16798
2009-08-21 09:08:55 +00:00
Eelco Dolstra
2331a5140d
* Added a module for the bluetooth daemon.
...
* Refactored some other modules (dbus, hal).
svn path=/nixos/trunk/; revision=16652
2009-08-10 18:25:09 +00:00
Eelco Dolstra
32b311a0f5
* Add gzip to the $PATH of nix-daemon, otherwise distributed builds
...
don't work. This is a regression wrt the trunk.
svn path=/nixos/branches/modular-nixos/; revision=16448
2009-07-23 23:25:50 +00:00
Marc Weber
dbd6ea7f63
adding daemonNiceLevel option. running biulds with niceness 0 can be annoying
...
svn path=/nixos/branches/modular-nixos/; revision=16420
2009-07-18 16:14:03 +00:00
Eelco Dolstra
6119c399d8
* Support tasks in the new Upstart formalism.
...
* Swap task: fixed removing disabled swap devices.
* Swap task: specified the type of swapDevices.
svn path=/nixos/branches/modular-nixos/; revision=16396
2009-07-16 14:51:49 +00:00
Eelco Dolstra
da996583ee
* Include the NixOS manpages in the system environment. Actually
...
there is only one currently: configuration.nix(5), which contains a
list of all the options.
svn path=/nixos/branches/modular-nixos/; revision=16360
2009-07-14 16:27:46 +00:00
Marc Weber
d4a37c2f1b
fix copy paste error
...
svn path=/nixos/branches/modular-nixos/; revision=16278
2009-07-09 14:35:03 +00:00
Ludovic Courtès
6566bc4882
gpsd: Fix UID/GID declaration.
...
svn path=/nixos/branches/modular-nixos/; revision=16089
2009-06-30 07:56:08 +00:00
Eelco Dolstra
0d5ea86748
* Merge some stuff from the trunk.
...
svn path=/nixos/branches/modular-nixos/; revision=16051
2009-06-26 11:36:38 +00:00
Eelco Dolstra
262ddf0854
* Move the manual/Rogue from virtual consoles 7/8 to 8/9
...
respectively so that the X server can run on 7.
svn path=/nixos/branches/modular-nixos/; revision=15924
2009-06-10 12:53:45 +00:00
Eelco Dolstra
463cf8efdd
* Provide a /etc/nixos/configuration.nix in the booted CD to make
...
nixos-rebuild work. This makes it a true live CD.
svn path=/nixos/branches/modular-nixos/; revision=15922
2009-06-10 12:34:58 +00:00
Eelco Dolstra
b7cad3c059
* Style fix.
...
svn path=/nixos/branches/modular-nixos/; revision=15896
2009-06-08 22:44:59 +00:00
Eelco Dolstra
42513650d8
svn path=/nixos/branches/modular-nixos/; revision=15895
2009-06-08 22:44:05 +00:00
Eelco Dolstra
f4b5a21d59
* Fix building the manual.
...
svn path=/nixos/branches/modular-nixos/; revision=15877
2009-06-05 15:04:58 +00:00
Eelco Dolstra
de7aae5d5e
* Move the generation of /etc/nix.machines to the nix-daemon module.
...
svn path=/nixos/branches/modular-nixos/; revision=15765
2009-05-28 12:56:56 +00:00
Eelco Dolstra
60b3f95ad8
* Move the definition of the set of system packages to
...
modules/config/system-path.nix. system/system.nix is now almost
empty.
* Removed the cleanStart option - it should be possible to get the
same functionality by overriding config.system.path (or defining
config.system.systemPackages with a higher priority - don't know if
that works though).
svn path=/nixos/branches/modular-nixos/; revision=15727
2009-05-25 17:41:03 +00:00
Eelco Dolstra
5ebdee3577
* Continued refactoring the tree: moved most Upstart jobs (namely
...
those that run daemons) to modules/services. This probably broke
some things since there are a few relative paths in modules
(e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
modules that use them.
svn path=/nixos/branches/modular-nixos/; revision=15717
2009-05-24 23:13:23 +00:00