philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

111 commits

Author SHA1 Message Date
Eelco Dolstra 81796c5baf Add a command ‘nixos-help’ that opens the NixOS manual in a browser 2013-01-08 02:13:33 +01:00
Eelco Dolstra 1aea92c4ce Ensure that ‘nix.gc.options’ is subject to shell expansion 2013-01-05 01:35:26 +01:00
Eelco Dolstra baac242a1f Run the garbage collector as a systemd service 
Running it from systemd rather than cron has several advantages:
systemd ensures that only one instance runs at a time; the GC can be
manually started/stopped; and logging goes to the journal.

We still need cron to start the service at the right time, but
hopefully soon we can get rid of cron entirely (once systemd supports
starting a unit at a specific time).
 2013-01-04 14:04:41 +01:00
Eelco Dolstra f701acfac0 nix-daemon: Start "nix-daemon" rather than "nix-worker --daemon" 2013-01-04 13:50:50 +01:00
Eelco Dolstra 97ae408e83 Merge remote-tracking branch 'origin/master' into systemd 2012-12-11 17:40:39 +01:00
Eelco Dolstra ef3199f782 Add options for specifying binary caches 
Cherry-picked a4bcb26b1a.
 2012-12-08 18:37:40 +01:00
Eelco Dolstra a4bcb26b1a Add options for specifying binary caches 2012-11-22 11:49:47 +01:00
Eelco Dolstra 6c6134c2d2 Fix the manual service on the installation CD 2012-10-04 16:15:10 -04:00
Eelco Dolstra 8dc4f2c3be Fix the rogue service for systemd 2012-10-04 15:27:31 -04:00
Eelco Dolstra 2cf5e3cb66 Add options ‘boot.systemd.targets’ and ‘boot.systemd.sockets’ 2012-10-01 18:58:11 -04:00
Eelco Dolstra 891be375b5 Make unitConfig/serviceConfig attribute sets 
So instead of:

  boot.systemd.services."foo".serviceConfig =
    ''
      StartLimitInterval=10
      CPUShare=500
    '';

you can say:

  boot.systemd.services."foo".serviceConfig.StartLimitInterval = 10;
  boot.systemd.services."foo".serviceConfig.CPUShare = 500;

This way all unit options are available and users can set/override
options in configuration.nix.
 2012-10-01 16:27:42 -04:00
Eelco Dolstra 3e6bb7d1de Move setting ownership of /nix/store to stage-2-init 
This is necessary because the store might be bind-mounted read-only.
 2012-09-28 10:59:58 -04:00
Eelco Dolstra a139fa14b1 Optionally make the Nix store read-only to enforce immutability 
This will be the default once Nix 1.2 is released.
 2012-09-25 16:33:21 -04:00
Eelco Dolstra b02c488fde Automatically append ".service" to the name of service units 2012-08-23 10:25:27 -04:00
Eelco Dolstra d4fec178fd Merge remote-tracking branch 'origin/master' into systemd 2012-08-02 13:44:16 -04:00
Eelco Dolstra 1fcef0a0e0 Don't use nixUnstable 2012-08-02 13:31:57 -04:00
Eelco Dolstra 1602f8e162 Typo 2012-07-20 14:58:15 -04:00
Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd 
Conflicts:
	modules/config/networking.nix
	modules/services/networking/ssh/sshd.nix
	modules/services/ttys/agetty.nix
	modules/system/boot/stage-2-init.sh
	modules/system/upstart-events/shutdown.nix
 2012-07-16 17:27:11 -04:00
Eelco Dolstra 73532c3855 Global replace /var/run/current-system -> /run/current-system 2012-07-16 11:34:21 -04:00
Eelco Dolstra 88f94d76bc Use socket-based activation of the Nix daemon 2012-06-18 23:31:07 -04:00
Eelco Dolstra ca57a8e638 * Add type. 
svn path=/nixos/trunk/; revision=34345
 2012-06-04 14:35:48 +00:00
Eelco Dolstra 801cd7402c * Don't use ‘chown user.group’ since that syntax is not officially 
supported (you're supposed to say ‘chown user:group’).

svn path=/nixos/trunk/; revision=34161
 2012-05-17 19:43:32 +00:00
Eelco Dolstra dbf5e3229e * Remove Nix's dependencies from the chroot. Nix 1.0 doesn't need 
this anymore.

svn path=/nixos/trunk/; revision=34113
 2012-05-15 16:12:22 +00:00
Eelco Dolstra 6c1bb54483 * In the installation CD, make the NixOS/Nixpkgs available as if they 
were obtained from the NixOS channel.  "nixos-install" copies this
  to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
  the benefit of memory-constrained environments.

svn path=/nixos/trunk/; revision=33887
 2012-04-23 00:41:37 +00:00
Sander van der Burg a34e20e292 deployment attribute does not exists anymore, will fix this later 
svn path=/nixos/trunk/; revision=33747
 2012-04-11 13:46:49 +00:00
Eelco Dolstra 86d8d62d16 * Allow Upstart jobs to declare that they shouldn't be restarted by 
switch-to-configuration.  E.g. the X server shouldn't be restarted
  because that kills all the X clients.

svn path=/nixos/trunk/; revision=33223
 2012-03-18 02:10:39 +00:00
Eelco Dolstra 573877c1ac * Use boot.kernelModules everywhere instead of explicit calls to 
modprobe.
* Move the implementation of boot.kernelModules from the udev job to
  the activation script.  This prevents races with the udev job.
* Drop references to the "capability" kernel module, which no longer
  exists.

svn path=/nixos/trunk/; revision=33208
 2012-03-17 17:26:17 +00:00
Eelco Dolstra 03ebb883d1 * Modularize filesystem support. Filesystems such as btrfs and 
reiserfs now have separate modules that are conditional on
  boot.supportedFilesystems and boot.initrd.supportedFilesystems.
  By default, these include the filesystems specified in the fsType
  attribute in fileSystems.  Ext2/3/4 support is currently
  unconditional.

  Also unbreak the installer test (http://hydra.nixos.org/build/2272302). 

svn path=/nixos/trunk/; revision=32954
 2012-03-09 14:37:58 +00:00
Eelco Dolstra d9d6fb58e4 * Prevent the VirtualBox guest additions from being restarted 
constantly by Upstart.  Also move the module to a better location.

svn path=/nixos/trunk/; revision=32565
 2012-02-25 20:10:53 +00:00
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