1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 08:34:50 +00:00
Commit graph

34 commits

Author SHA1 Message Date
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
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 28e4ac1af2 * Generically handle the case where $out/share/mime/packages or one of
its parents is a symlink.

svn path=/nixos/trunk/; revision=25776
2011-02-05 06:58:15 +00:00
Eelco Dolstra 1fcefe39a1 * Add share/emacs to the paths to symlink.
svn path=/nixos/trunk/; revision=23184
2010-08-16 08:00:18 +00:00
Eelco Dolstra cfb465c7a5 svn path=/nixos/trunk/; revision=23115 2010-08-11 15:10:17 +00:00
Eelco Dolstra c388446bb0 * Xfce is now more or less functional.
svn path=/nixos/trunk/; revision=23075
2010-08-09 21:59:34 +00:00
Eelco Dolstra 7123115d6f * Call update-mime-database.
svn path=/nixos/trunk/; revision=22528
2010-07-08 12:55:18 +00:00
Eelco Dolstra 5702557a65 * Put e2fsprogs etc. in mountall's $PATH so that fsck works.
svn path=/nixos/branches/boot-order/; revision=22151
2010-06-04 15:35:32 +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 7d9644f725 svn path=/nixos/trunk/; revision=22045 2010-05-28 11:24:41 +00:00
Eelco Dolstra 7484774172 * Activate software RAID devices from udev. This makes the swraid
Upstart jobs unnecessary.
* Support having the root filesystem on swraid.

svn path=/nixos/trunk/; revision=21807
2010-05-16 20:40:04 +00:00
Lluís Batlle i Rossell 825923a051 Adding the 'awesome' window manager to nixos.
I made the system sw path include /etc/xdg - awesome looks for some file
in the XDG_CONFIG_DIRS, which in bashrc is set to point to the profiles/etc/xdg


svn path=/nixos/trunk/; revision=21675
2010-05-08 23:24:00 +00:00
Ludovic Courtès 8fcbaefd2e Refer to IceCat instead of Firefox.
svn path=/nixos/trunk/; revision=21636
2010-05-06 20:52:06 +00:00
Yury G. Kudryashov 8e8554242f Remove extraLinkPaths, thanks to Pierron for explanation
Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
2010-04-16 05:09:10 +00:00
Yury G. Kudryashov dcd0be3351 Allow additions to pathsToLink
svn path=/nixos/trunk/; revision=21101
2010-04-15 15:46:55 +00:00
Eelco Dolstra 9a0789a81e * Add devicemapper to the system path.
svn path=/nixos/trunk/; revision=19292
2010-01-07 15:55:05 +00:00
Eelco Dolstra b581a56d79 * Define the Upstart package to use in one place.
svn path=/nixos/branches/upstart-0.6/; revision=18187
2009-11-06 09:36:35 +00:00
Eelco Dolstra fdab662659 * Add iproute to the system path. It was a dependency of dhclient
already anyway.

svn path=/nixos/trunk/; revision=17512
2009-09-29 15:43:52 +00:00
Nicolas Pierron c9f5889ad1 move "environment.extraPackages" into the rename module.
svn path=/nixos/trunk/; revision=17485
2009-09-28 18:26:18 +00:00
Lluís Batlle i Rossell 75f6cd20da Making modular my previous changes for armv5tel. I updated the way to use
grub. Its options are no more inside 'boot', but inside 'boot.loader.grub'.
I added a new bootloader configuration for nixos, generationsDir. It creates
/boot/default/{init,initrd,kernel,system} symlinks, and the same for the generations
in /boot/system-$gen/{init,initrd,kernel,system}.

I can program the u-boot loader to load /boot/default files always, and have
a minimal nixos boot loader installer functionality. Additionally, I can refer
to the other system generations easily, with a simple 'ls' in /boot.

svn path=/nixos/trunk/; revision=17460
2009-09-27 21:51:37 +00:00
Eelco Dolstra b3818c1a77 * Add eject to the system path.
svn path=/nixos/trunk/; revision=17448
2009-09-26 18:57:34 +00:00
Lluís Batlle i Rossell 8b9f510b08 Removing grub from the system expression for armv5tel-linux.
svn path=/nixos/trunk/; revision=17392
2009-09-23 20:51:00 +00:00
Eelco Dolstra 1c6bbf6784 * Add diffutils, gawk and patch to the system path.
svn path=/nixos/branches/modular-nixos/; revision=15943
2009-06-12 11:12:46 +00:00
Eelco Dolstra eb8b534173 * Include only the en_US locale on the CD. This saves 75 MiB or so.
svn path=/nixos/branches/modular-nixos/; revision=15883
2009-06-05 17:19:30 +00:00
Eelco Dolstra dc8cbffe31 * Revert r15862, as the "host" package in system-path.nix (or any other
package) can be overriden by setting environment.systemPackages in
  /etc/nixos/configuration.nix: it shouldn't be special-cased.

svn path=/nixos/branches/modular-nixos/; revision=15863
2009-06-05 12:57:44 +00:00
Michael Raskin 7e2574c4fd Let host be overriden with a better ISC Bind version if the latter is installed
svn path=/nixos/branches/modular-nixos/; revision=15862
2009-06-05 12:44:32 +00:00
Eelco Dolstra 5bcfbcac88 * We lost the "host" command somewhere.
svn path=/nixos/branches/modular-nixos/; revision=15861
2009-06-05 12:39:37 +00:00
Eelco Dolstra 81d8c2e1c8 * Move the info wrapper into a module.
svn path=/nixos/branches/modular-nixos/; revision=15792
2009-05-29 13:29:49 +00:00
Eelco Dolstra 548fb6a1a5 * Move the optional parts of the system path to the appropriate
modules.

svn path=/nixos/branches/modular-nixos/; revision=15791
2009-05-29 13:15:31 +00:00
Eelco Dolstra f36643b6c2 * Move the installer tools to modules/installer/tools.
svn path=/nixos/branches/modular-nixos/; revision=15788
2009-05-29 12:41:29 +00:00
Eelco Dolstra df96e5c456 * Move nixos-checkout into its own module.
svn path=/nixos/branches/modular-nixos/; revision=15787
2009-05-29 12:24:48 +00:00
Eelco Dolstra 2d7beac377 * New directory modules/programs that contains system-wide
configuration for specific programs.  For instance, ssh.nix provides
  the configuration for the SSH client; ssmtp.nix provides the
  configuration for the `ssmtp' MTA.

svn path=/nixos/branches/modular-nixos/; revision=15757
2009-05-27 23:59:14 +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