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

240 commits

Author SHA1 Message Date
Eelco Dolstra
bd2fbcf9e5 * Fix the bluetoothd stop condition. 
svn path=/nixos/trunk/; revision=16687
 2009-08-11 21:06:17 +00:00
Eelco Dolstra
fe329f96ef * Mount the host's /nix/var/nix/db in the guest. 
svn path=/nixos/trunk/; revision=16674
 2009-08-11 14:28:25 +00:00
Sander van der Burg
e8103aa39d Implemented support for per application configuration files 
svn path=/nixos/trunk/; revision=16668
 2009-08-11 09:40:31 +00:00
Eelco Dolstra
c21b02d34b * Add some groups required by the latest udev. 
svn path=/nixos/trunk/; revision=16667
 2009-08-11 09:17:30 +00:00
Eelco Dolstra
f666aa7479 * With "nixos-rebuild build-vm", override the video driver of 
the host (since e.g. "nvidia" won't work in the VM).

svn path=/nixos/trunk/; revision=16663
 2009-08-11 02:02:01 +00:00
Eelco Dolstra
89ef5c979b * New nixos-rebuild action: "nixos-rebuild build-vm" builds a virtual 
machine containing a replica (minus the state) of the system
  configuration.  This is mostly useful for testing configuration
  changes prior to doing an actual "nixos-rebuild switch" (or even
  "nixos-rebuild test").  The VM can be started as follows:

  $ nixos-rebuild build-vm
  $ ./result/bin/run-*-vm

  which starts a KVM/QEMU instance.  Additional QEMU options can be
  passed through the QEMU_OPTS environment variable
  (e.g. QEMU_OPTS="-redir tcp:8080::80" to forward a host port to the
  guest).  The fileSystem attribute of the regular system
  configuration is ignored (using mkOverride), because obviously we
  can't allow the VM to access the host's block devices.  Instead, at
  startup the VM creates an empty disk image in ./<hostname>.qcow2 to
  store the VM's root filesystem.

  Building a VM in this way is efficient because the VM shares its Nix
  store with the host (through a CIFS mount).  However, because the
  Nix store of the host is mounted read-only in the guest, you cannot
  run Nix build actions inside the VM.  Therefore the VM can only be
  reconfigured by re-running "nixos-rebuild build-vm" on the host and
  restarting the VM.

svn path=/nixos/trunk/; revision=16662
 2009-08-11 01:35:56 +00:00
Sander van der Burg
ebd2fbd24f Removed mod_jk option, which is obsolete 
svn path=/nixos/trunk/; revision=16660
 2009-08-10 20:16:33 +00:00
Eelco Dolstra
f003f6d7cd * Fixed the path to the services tree. This should be a NixOS module argument. 
svn path=/nixos/trunk/; revision=16658
 2009-08-10 20:07:58 +00:00
Eelco Dolstra
167ccdd537 * Move the firmware loader into a separate module. 
* services.udev.addFirmware -> hardware.firmware.

svn path=/nixos/trunk/; revision=16657
 2009-08-10 19:27:15 +00:00
Eelco Dolstra
b3c0061a91 * services.udev.addUdevPkgs -> services.udev.packages. 
* Simplified the udev rules generation: merged nixRules into
  services.udev.extraRules, and handle services.udev.extraRules using
  services.udev.packages.

svn path=/nixos/trunk/; revision=16655
 2009-08-10 19:05:20 +00:00
Sander van der Burg
0d35699507 Implemented virtual host support. Now it's possible to assign web applications to virtual host, for example: 
{
  ...

  services = {
    tomcat = {
      enable = true;
      virtualHosts = [
        { name = "test1.localhost";
          webapps = [ mypkgs.HelloApp ];
        }
        { name = "test2.localhost";
          webapps = [ mypkgs.ByeApp ];
        }
      ];
    };
  };
}


svn path=/nixos/trunk/; revision=16654
 2009-08-10 18:45:18 +00:00
Eelco Dolstra
b4f8f919ab * Clean up the udev module. 
svn path=/nixos/trunk/; revision=16653
 2009-08-10 18:41:57 +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
0ab6be1c81 * Restarting dbus no longer seems to kill the X server. 
svn path=/nixos/trunk/; revision=16650
 2009-08-10 16:18:51 +00:00
Sander van der Burg
89810914e4 Added virtual host support, which requires some more testing 
svn path=/nixos/trunk/; revision=16649
 2009-08-10 15:27:25 +00:00
Ludovic Courtès
fe51b0c6c3 bashrc: Source `${bash}/etc/bash_completion' when available. 
svn path=/nixos/trunk/; revision=16641
 2009-08-10 10:18:33 +00:00
Ludovic Courtès
4c848efc1a bashrc: Remove obsolete aclocal' and rpcgen' hacks. 
svn path=/nixos/trunk/; revision=16640
 2009-08-10 10:07:30 +00:00
Ludovic Courtès
ac29ad197b stage-1-init: Remove timeout from `fail()'. 
Timeouts upon failure can be harmful, e.g., after a file system failure
that needs manual intervention.

svn path=/nixos/trunk/; revision=16637
 2009-08-10 09:20:05 +00:00
Sander van der Burg
8c034b988d Added a lot of modifications in order to expression a Tomcat configuration better and to perform more efficient management of various Tomcat components. 
With these modifications, a user can configure a tomcat instance with web applications and web services by writing a service, such as:

...

services = {
  tomcat = {
    enable = true;
    webapps = [ mypkgs.HelloWorldWebApplication ];
    axis2 = {
      enable = true;
      services = [ mypkgs.HelloService mypkgs.HelloWorldService ];
    };
  };
};


svn path=/nixos/trunk/; revision=16619
 2009-08-09 20:19:07 +00:00
Eelco Dolstra
02c119a104 * Workaround for hangs on x86_64. 
svn path=/nixos/branches/modular-nixos/; revision=16590
 2009-08-05 11:43:51 +00:00
Eelco Dolstra
7d3e2b15ef svn path=/nixos/branches/modular-nixos/; revision=16585 2009-08-04 16:09:07 +00:00
Eelco Dolstra
32bb5b2d0f * Bring back the options to enable/disable the Intel firmwares. 
svn path=/nixos/branches/modular-nixos/; revision=16574
 2009-08-04 08:50:02 +00:00
Michael Raskin
c8705704e1 Add Wacom X11 driver support 
svn path=/nixos/branches/modular-nixos/; revision=16569
 2009-08-03 19:55:33 +00:00
Eelco Dolstra
383370f782 * Don't create a temporary file in $HOME. 
svn path=/nixos/branches/modular-nixos/; revision=16561
 2009-08-03 12:44:45 +00:00
Eelco Dolstra
6802a75076 * nixos-rebuild: replaced some environment variables with options 
(e.g. --install-grub instead of $NIXOS_INSTALL_GRUB).  Also support
  some nix-build options (e.g. --show-trace and -j).

svn path=/nixos/branches/modular-nixos/; revision=16560
 2009-08-03 12:36:15 +00:00
Eelco Dolstra
bc54061cba svn path=/nixos/branches/modular-nixos/; revision=16557 2009-08-03 12:17:23 +00:00
Michael Raskin
137ce0907c Some fixes in on-boot activation 
svn path=/nixos/branches/modular-nixos/; revision=16525
 2009-07-31 08:32:53 +00:00
Michael Raskin
f05682c84d Give some progress indications during Stage2 boot 
svn path=/nixos/branches/modular-nixos/; revision=16523
 2009-07-31 04:56:52 +00:00
Michael Raskin
bef1dc8bd5 Update RC kernel for rescue CD: includes some BtrFS fixes 
svn path=/nixos/branches/modular-nixos/; revision=16515
 2009-07-30 04:20:56 +00:00
Michael Raskin
6aba79bed5 Update child configuration generation 
svn path=/nixos/branches/modular-nixos/; revision=16514
 2009-07-30 04:20:23 +00:00
Rob Vermaas
9c05dd98dc intel5000 firmware 
svn path=/nixos/branches/modular-nixos/; revision=16473
 2009-07-27 14:08:14 +00:00
Eelco Dolstra
f0f5434eaa * Add an option to enable the firewall. It should eventually be 
enabled by default.

svn path=/nixos/branches/modular-nixos/; revision=16464
 2009-07-26 21:27:35 +00:00
Eelco Dolstra
264b49fce7 * A very basic firewall that rejects all incoming connections except 
for the ports defined in networking.firewall.allowedTCPPorts.

svn path=/nixos/branches/modular-nixos/; revision=16460
 2009-07-24 23:12:52 +00:00
Eelco Dolstra
38d594deec * wpa_supplicant: start/stop automatically. 
svn path=/nixos/branches/modular-nixos/; revision=16451
 2009-07-24 00:31:42 +00:00
Eelco Dolstra
c4780a8953 * dhcp 4.1 requires IPv6 support. 
svn path=/nixos/branches/modular-nixos/; revision=16450
 2009-07-24 00:31:22 +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
d591559609 * A simple module for running wpa_supplicant. 
svn path=/nixos/branches/modular-nixos/; revision=16409
 2009-07-16 21:08:32 +00:00
Eelco Dolstra
3abf509637 * Don't try to start dhclient on the wmaster0 interface. This just 
gets rid of endless dhclient log messages such as

    Jul 16 19:09:30 dutibo dhclient: DHCPDISCOVER on wmaster0 to 255.255.255.255 port 67 interval 19
    Jul 16 19:09:30 dutibo dhclient: send_packet: Network is down

svn path=/nixos/branches/modular-nixos/; revision=16407
 2009-07-16 17:25:50 +00:00
Eelco Dolstra
b58682401e * Give a type to networking.interfaces. 
* Simplified the pre-start script of the network-interfaces module.
* Removed wireless support from the network-interfaces module.  It
  only worked for static WEP configurations anyway, and AFAIK nobody
  used it.

svn path=/nixos/branches/modular-nixos/; revision=16406
 2009-07-16 17:18:54 +00:00
Eelco Dolstra
f53c9d70ec * The lack of a newline at the end of "EnableSendFile Off" caused a 
broken httpd.conf to be generated.  We should really have a merge
  function that appends newlines to every value of options like
  services.httpd.extraConfig.

svn path=/nixos/branches/modular-nixos/; revision=16404
 2009-07-16 16:13:35 +00:00
Eelco Dolstra
2cd3e205f4 svn path=/nixos/branches/modular-nixos/; revision=16397 2009-07-16 15:01:56 +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
7cb4503ad6 * More Upstart refactoring. 
svn path=/nixos/branches/modular-nixos/; revision=16394
 2009-07-16 13:55:11 +00:00
Eelco Dolstra
bb292fdf04 * Support post-stop actions. 
svn path=/nixos/branches/modular-nixos/; revision=16393
 2009-07-16 13:46:49 +00:00
Michael Raskin
8f7b33c87d I thought squashfs would not require loop.ko 
svn path=/nixos/branches/modular-nixos/; revision=16388
 2009-07-16 10:28:58 +00:00
Michael Raskin
fac9d09941 Oops, forgot FS modules 
svn path=/nixos/branches/modular-nixos/; revision=16387
 2009-07-16 10:06:53 +00:00
Michael Raskin
e155a46516 Forgot all-module fixes for the correct booting in rescue CD 
svn path=/nixos/branches/modular-nixos/; revision=16386
 2009-07-16 09:48:22 +00:00
Michael Raskin
a7f24fd4bb Trying to build a good rescue CD.. 
svn path=/nixos/branches/modular-nixos/; revision=16385
 2009-07-16 09:22:40 +00:00
Eelco Dolstra
889311f4ca * Refactored the sshd module. 
svn path=/nixos/branches/modular-nixos/; revision=16377
 2009-07-15 15:53:39 +00:00
Eelco Dolstra
c45cf3a28e * In the jobs attribute, support a more high-level way of specifying 
jobs, e.g. (from the nscd job)

    { name = "nscd";

      description = "Name Service Cache Daemon";

      startOn = "startup";
      stopOn = "shutdown";

      environment = { LD_LIBRARY_PATH = nssModulesPath; };
        
      preStart =
        ''
          mkdir -m 0755 -p /var/run/nscd
          mkdir -m 0755 -p /var/db/nscd
        '';

      exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
    };

  The Upstart job is generated from this.  The main goal is to provide
  some abstraction from the Upstart syntax.  For instance, this should
  make it easier to upgrade to newer versions of Upstart, to switch to
  an entirely different process management system (e.g. initng or
  launchd), or to test a job independantly from Upstart.  (However the
  startOn and stopOn attributes are tied to Upstart's event model.)

svn path=/nixos/branches/modular-nixos/; revision=16376
 2009-07-15 15:24:11 +00:00
Eelco Dolstra
0e3bef4195 * Declare the type of jobs. 
svn path=/nixos/branches/modular-nixos/; revision=16375
 2009-07-15 13:41:00 +00:00
Eelco Dolstra
1424399002 * Simplify. 
svn path=/nixos/branches/modular-nixos/; revision=16373
 2009-07-15 12:52:32 +00:00
Eelco Dolstra
96fe3ba1b7 * Inline make-job.nix. 
svn path=/nixos/branches/modular-nixos/; revision=16372
 2009-07-15 11:38:17 +00:00
Eelco Dolstra
9d1e31117f * Get rid of the "users" and "groups" fields in jobs. 
svn path=/nixos/branches/modular-nixos/; revision=16371
 2009-07-15 11:34:55 +00:00
Eelco Dolstra
ca8e00cafa * Got rid of the extraPath field in jobs (use 
environment.systemPackages instead).  Also renamed
  services.extraJobs to jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
 2009-07-15 11:19:11 +00:00
Eelco Dolstra
def0be732f * job.extraHttpdConfig: not used anywhere. 
svn path=/nixos/branches/modular-nixos/; revision=16369
 2009-07-15 09:14:24 +00:00
Eelco Dolstra
118418ba31 * Refactoring the Upstart module. Got rid of job.extraEtc, it's 
redundant now (modules can just define environment.etc).

svn path=/nixos/branches/modular-nixos/; revision=16367
 2009-07-15 09:06:36 +00:00
Eelco Dolstra
b66fd2364c * Don't put /etc/nixos/nixos in ~/.nix-defexpr. 
svn path=/nixos/branches/modular-nixos/; revision=16366
 2009-07-15 08:45:29 +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
Eelco Dolstra
ab1676b457 * Urgh, this should have been in commit r16350. 
svn path=/nixos/branches/modular-nixos/; revision=16353
 2009-07-14 13:28:50 +00:00
Eelco Dolstra
b84bab7873 * Use the relatime mount option by default. (This is the default 
anyway in Linux 2.6.30.)

svn path=/nixos/branches/modular-nixos/; revision=16348
 2009-07-14 12:07:17 +00:00
Lluís Batlle i Rossell
c331fd106b Updated the xserver video drivers list, removing the old via, and putting the new openchrome. 
svn path=/nixos/branches/modular-nixos/; revision=16330
 2009-07-11 10:33:42 +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
6d2cc812c2 Make the Liberation Fonts available by default. 
svn path=/nixos/branches/modular-nixos/; revision=16274
 2009-07-09 12:10:58 +00:00
Ludovic Courtès
fa9f557b96 Add `localhost' under its "real" host name to /etc/hosts. 
svn path=/nixos/branches/modular-nixos/; revision=16258
 2009-07-08 16:10:09 +00:00
Ludovic Courtès
a62e1cf2dd Disable proprietary fonts by default. 
svn path=/nixos/branches/modular-nixos/; revision=16253
 2009-07-08 14:52:58 +00:00
Michael Raskin
35011ade4e Adding back passthru functionality 
svn path=/nixos/branches/modular-nixos/; revision=16237
 2009-07-08 09:10:48 +00:00
Michael Raskin
9a66d59786 Fixing wrong assertion sign 
svn path=/nixos/branches/modular-nixos/; revision=16236
 2009-07-08 09:10:26 +00:00
Michael Raskin
1118c4b6d1 Fix service tree paths 
svn path=/nixos/branches/modular-nixos/; revision=16235
 2009-07-08 09:09:57 +00:00
Ludovic Courtès
1f9d8f45ea lshd: Fix typo; comment on the seed generation. 
svn path=/nixos/branches/modular-nixos/; revision=16142
 2009-07-02 14:05:01 +00:00
Ludovic Courtès
74738de1f8 Make NSS modules visible to `avahi-daemon'. 
It allows it to know whether `libnss-mdns' is available, which clients
can ask via the `IsNSSSupportAvailable' D-Bus method.

svn path=/nixos/branches/modular-nixos/; revision=16125
 2009-07-01 12:27:35 +00:00
Ludovic Courtès
e2e373b89c bitlbee: Fix `systemPackages' attribute. 
svn path=/nixos/branches/modular-nixos/; revision=16090
 2009-06-30 08:01:14 +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
Ludovic Courtès
d68e177909 Oops. 
svn path=/nixos/branches/modular-nixos/; revision=16064
 2009-06-26 21:39:31 +00:00
Ludovic Courtès
dbac392266 Fix typo in `config/nsswitch.nix'. 
svn path=/nixos/branches/modular-nixos/; revision=16063
 2009-06-26 21:24:18 +00:00
Nicolas Pierron
5f59ac0447 Fix a bad use of pkgs.lib.optional. (detect with bad type error on x11Packages) 
svn path=/nixos/branches/modular-nixos/; revision=16053
 2009-06-26 12:14:02 +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
Nicolas Pierron
f61a3ebd2c Generate hal configuration file form the xserver settings. 
svn path=/nixos/branches/modular-nixos/; revision=16046
 2009-06-25 23:29:49 +00:00
Nicolas Pierron
0bd210bb78 Fix typos in type names. (types.packages -> types.package) 
svn path=/nixos/branches/modular-nixos/; revision=16045
 2009-06-25 22:49:05 +00:00
Nicolas Pierron
6e802e5d75 Replace extraPackages by x11Packages for all windows/desktop managers. 
-> No longer install graphical packages if the xserver is disabled.
-> avoid duplication of "mkIf config.services.xserver.enable".

svn path=/nixos/branches/modular-nixos/; revision=16044
 2009-06-25 22:08:03 +00:00
Eelco Dolstra
b701207ead * Typo. 
svn path=/nixos/branches/modular-nixos/; revision=16039
 2009-06-24 22:27:54 +00:00
Eelco Dolstra
9704472d1c Some hacks to support clean shutdowns of VMs that mount the Nix store 
ove QEMU (and other NixOS instances that use a remote filesystem like
NFS):

* Don't take down the network interfaces during shutdown.
* Don't try to unmount the Nix store.  Usually, this doesn't work
  because it's still in use, but on remote filesystems like CIFS the
  `-f' umount flag actually works.

svn path=/nixos/branches/modular-nixos/; revision=16036
 2009-06-24 13:33:03 +00:00
Eelco Dolstra
aa075f089e * Set the default gateway. 
svn path=/nixos/branches/modular-nixos/; revision=16034
 2009-06-24 12:16:06 +00:00
Eelco Dolstra
1803c67d13 * Leave out HAL and d-bus (not needed). 
svn path=/nixos/branches/modular-nixos/; revision=16032
 2009-06-24 09:11:26 +00:00
Eelco Dolstra
2346754f5e * Don't add xterm and feh to the system path if the X server is 
disabled.  Other desktop/display/window manager modules should be
  conditional on config.services.xserver.enable as well, but at least
  they're disabled by default due to other options.

svn path=/nixos/branches/modular-nixos/; revision=16031
 2009-06-22 20:34:51 +00:00
Eelco Dolstra
74995fe553 * The CD volume label was just over the limit of 32 characters. 
svn path=/nixos/branches/modular-nixos/; revision=16027
 2009-06-22 16:38:11 +00:00
Eelco Dolstra
64d8af9677 svn path=/nixos/branches/modular-nixos/; revision=16024 2009-06-22 14:45:28 +00:00
Eelco Dolstra
0b39f614e9 * Don't wait for CIFS "devices" (//share/path) to appear since they 
won't.  This speeds up booting from CIFS a lot.

svn path=/nixos/branches/modular-nixos/; revision=16023
 2009-06-22 14:44:48 +00:00
Eelco Dolstra
0f6d7c8862 * Use insmod from module_init_tools in the initrd, since the latest 
klibc no longer has it.

svn path=/nixos/branches/modular-nixos/; revision=16019
 2009-06-22 14:10:11 +00:00
Eelco Dolstra
97a4e1fcb3 * Rename the CD modules to something more sensible. 
* Make sure that reconfiguration in the live CD works properly by
  including the proper configuration module in
  /etc/nixos/configuration.nix.  Ugly.

svn path=/nixos/branches/modular-nixos/; revision=16016
 2009-06-22 10:03:58 +00:00
Eelco Dolstra
fc3eecad91 * Remove some references to the services tree. 
svn path=/nixos/branches/modular-nixos/; revision=16015
 2009-06-22 10:01:14 +00:00
Eelco Dolstra
da77a6437f * qemu-vm.nix: automatically create and initialise the disk image if 
it doesn't already exist.  Also set up some ad hoc port forwarding
  from the host to the guest.

svn path=/nixos/branches/modular-nixos/; revision=16012
 2009-06-19 15:19:56 +00:00
Eelco Dolstra
aa60f3e9a7 * sendfile() is broken over CIFS. 
svn path=/nixos/branches/modular-nixos/; revision=16011
 2009-06-19 14:30:56 +00:00
Eelco Dolstra
d06556e274 * Get rid of the `experimental' flag. 
svn path=/nixos/branches/modular-nixos/; revision=16010
 2009-06-19 14:27:43 +00:00
Eelco Dolstra
9460a30851 * Use the fileSystems option to mount the host filesystem. Also, it 
seems that mount.cifs isn't actually needed (anymore?).

svn path=/nixos/branches/modular-nixos/; revision=16000
 2009-06-18 16:47:00 +00:00
Eelco Dolstra
8179e5213f * A module for building KVM/QEMU virtual machines from a NixOS 
configuration.  No virtual disk image is generated; the VM shares a
  Nix store with the host.  This makes it very fast to build new VMs.

svn path=/nixos/branches/modular-nixos/; revision=15999
 2009-06-18 16:16:12 +00:00
Eelco Dolstra
e08e7aedbc * Option boot.initrd.postMountCommands to specify additional shell 
commands for in stage 1 of the boot.

svn path=/nixos/branches/modular-nixos/; revision=15998
 2009-06-18 16:03:18 +00:00
Eelco Dolstra
c46dc8ad10 * Fix nixos-hardware-scan. BTW the model is now to do something like 
$ nixos-hardware-scan > /etc/nixos/hardware.nix

  and import the hardware.nix module in /etc/nixos/configuration.nix.
  That way you can easily rescan for new hardware.

svn path=/nixos/branches/modular-nixos/; revision=15979
 2009-06-17 10:41:17 +00:00
Eelco Dolstra
c3ea825c23 * Fix installing from the modular branch. system/system.nix no longer 
exists.  $NIXPKGS needs to be set, otherwise NixOS can't find
  Nixpkgs (because in the chroot it's in /mnt/etc/nixos/nixpkgs).
  Also clear LANG to shut up Perl warnings about the locale.

svn path=/nixos/branches/modular-nixos/; revision=15978
 2009-06-17 10:07:31 +00:00