Eelco Dolstra
295dafed8a
* Refactoring: graphical.nix no longer includes base.nix so that it
...
just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD. The "auto" display manager doesn't
properly handle shutdowns etc.
svn path=/nixos/trunk/; revision=30331
2011-11-08 16:17:37 +00:00
Eelco Dolstra
ba7f635f8b
* Move the hardware bits of base.nix into a separate module,
...
all-hardware.nix. This allows base.nix (which should probably be
renamed to something more descriptive) to be reused without getting
the hardware configuration of the installation CD.
svn path=/nixos/trunk/; revision=30327
2011-11-08 15:58:59 +00:00
Shea Levy
7f7eb341c8
Update the comment in the nixos-option generated configuration.nix in light of r30325
...
svn path=/nixos/trunk/; revision=30326
2011-11-08 15:51:39 +00:00
Eelco Dolstra
a76fe106e7
* nixos-hardware-scan: don't emit an include of an "install profile".
...
That's confusing and wrong: nixos-hardware-scan should just enable
support for the detected hardware, not enable lots of software (let
alone KDE).
svn path=/nixos/trunk/; revision=30325
2011-11-08 15:39:13 +00:00
Eelco Dolstra
3e30d87c26
* aufs2 -> aufs.
...
svn path=/nixos/trunk/; revision=30323
2011-11-08 15:12:11 +00:00
Eelco Dolstra
848485a043
* Remove installation-cd-rescue as it's not used, and the other CDs
...
should also contain all appropriate rescue tools.
svn path=/nixos/trunk/; revision=30320
2011-11-08 14:29:35 +00:00
Eelco Dolstra
b024940384
* Enable upower on the graphical ISO.
...
svn path=/nixos/trunk/; revision=30156
2011-10-31 21:08:22 +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
fe045dc949
sed -i -e 's|/nix/var|@stateDir@|g' -e 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh
...
Use configurable storeDir and stateDir in the installer tools
svn path=/nixos/trunk/; revision=30106
2011-10-29 22:14:27 +00:00
Shea Levy
a16d43a8ac
Make the stateDir and storeDir available for substitution into the tools
...
svn path=/nixos/trunk/; revision=30105
2011-10-29 22:00:25 +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
Eelco Dolstra
0a1fee9ec8
* Add a module for the Broadcom firmware. Also, add it to the
...
installation CD (though the kernel on the CD is not recent
enough yet to actually support the device). (This is kind of
an abuse of "not-detected.nix".)
svn path=/nixos/trunk/; revision=30003
2011-10-24 23:41:33 +00:00
Eelco Dolstra
00ce9aaf1a
* svn.nixos.org -> nixos.org.
...
svn path=/nixos/trunk/; revision=29690
2011-10-06 11:29:44 +00:00
Peter Simons
18d52f8f4b
modules/installer/scan/not-detected.nix: don't depend on pkgs.rt73fw
...
The rt73 firmware has disappeared from the upstream server, and we don't
have a new URL yet.
svn path=/nixos/trunk/; revision=29620
2011-10-04 08:45:15 +00:00
Shea Levy
3a201ef6a7
Enable building ISOs for aufs3 kernels
...
svn path=/nixos/trunk/; revision=29538
2011-09-28 22:43:53 +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
Nicolas Pierron
def746fcdd
Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).
...
svn path=/nixos/trunk/; revision=29020
2011-09-05 09:19:55 +00:00
Lluís Batlle i Rossell
4bc0bfec4c
Making the system-tarball-pc boot fine with PXE, and include help files and a
...
readme file as examples for an easy PXE setup.
This allows booting the NixOS in the system tarball, and thus allows installing nixos.
svn path=/nixos/trunk/; revision=28585
2011-08-15 14:37:00 +00:00
Lluís Batlle i Rossell
8f6a4be721
Trying to make the system tarball for pc closer to PXE boot.
...
svn path=/nixos/trunk/; revision=28573
2011-08-14 22:01:58 +00:00
Eelco Dolstra
63e9ece771
* Support booting into another GRUB boot entry via ‘grub-reboot’.
...
This requires grub.conf to honour the saved_entry GRUB environment
variable.
svn path=/nixos/trunk/; revision=27807
2011-07-17 11:42:44 +00:00
Sander van der Burg
ab70d480ab
The machines in the network should be accessed by the node function parameter
...
svn path=/nixos/trunk/; revision=27538
2011-06-24 12:35:58 +00:00
Eelco Dolstra
d72ba42187
* Revert to GRUB 1 as the default. The switch to GRUB 2 seems to
...
cause more problems than expected, so we should probably think about
the proper migration path for a while. In the meantime, of course,
everybody is encouraged to set boot.loader.grub.version = 2.
svn path=/nixos/trunk/; revision=27209
2011-05-10 10:35:20 +00:00
Michael Raskin
f24a78fe35
Fix typo in emergency grub config
...
svn path=/nixos/trunk/; revision=27196
2011-05-09 14:21:02 +00:00
Ludovic Courtès
9c3d72cf8e
Default to GRUB version 2.
...
svn path=/nixos/trunk/; revision=27165
2011-05-05 15:07:37 +00:00
Sander van der Burg
deb6cce4bb
Adapted deploy-network to accept multiple network configurations which are zipped together. With this you can run the tool like this:
...
$ nixos-deploy-network network1.nix network2.nix
svn path=/nixos/trunk/; revision=27028
2011-04-28 11:02:58 +00:00
Eelco Dolstra
3ae283e8c3
* Remove installer2 and nixos-bootstrap-archive for lack of
...
documentation / maintenance / clear use cases.
svn path=/nixos/trunk/; revision=27008
2011-04-27 16:16:47 +00:00
Eelco Dolstra
b8a1e98180
* nixos-checkout depends on subversion. (The original nixos-checkout
...
did a "nix-env -i subversion", which may be preferable to a static
dependency.)
svn path=/nixos/trunk/; revision=27006
2011-04-27 15:42:14 +00:00
Eelco Dolstra
41a8f23189
* Revert to the old (r10556) version of the nixos-checkout script. It
...
was never intended as a generic "check out anything" script; it's
just a convenience script to obtain the NixOS trunk after
installation. So that's what it should do.
svn path=/nixos/trunk/; revision=27005
2011-04-27 15:34:33 +00:00
Eelco Dolstra
650d14be8d
* Remove most references to the "services" tree.
...
svn path=/nixos/trunk/; revision=26990
2011-04-27 13:16:33 +00:00
Eelco Dolstra
be7a7a5b78
* nixos-build-vms/build-vms.nix: drop the "nixos" function argument,
...
since the path to the NixOS source tree is known.
svn path=/nixos/trunk/; revision=26989
2011-04-27 13:01:42 +00:00
Nicolas Pierron
6839bddd1b
modules/installer/tools: nixos-gui: Fix derivation.
...
svn path=/nixos/trunk/; revision=26972
2011-04-25 17:48:59 +00:00
Nicolas Pierron
921231b555
Add nixos-gui among the installer tools.
...
Add it as a default for the graphical profile.
svn path=/nixos/trunk/; revision=26960
2011-04-25 01:03:57 +00:00
Nicolas Pierron
66eed7681d
nixos-option: Add xml output to reduce the effort in nixos-gui.
...
svn path=/nixos/trunk/; revision=26950
2011-04-24 15:30:25 +00:00
Nicolas Pierron
ba2d96cf85
nixos-option: Handle Lambdas in the injection of previously pretty-printed
...
output.
svn path=/nixos/trunk/; revision=26936
2011-04-23 17:53:05 +00:00
Eelco Dolstra
ee3269cbbd
* Put "minimal" or "graphical" in the ISO name to distinguish between
...
the files.
svn path=/nixos/trunk/; revision=26901
2011-04-20 10:48:52 +00:00
Shea Levy
8dd6f42a91
Fixed formatting
...
svn path=/nixos/trunk/; revision=26647
2011-03-31 23:06:36 +00:00
Shea Levy
f269206972
Update iso-image.nix to work with kernels that use AUFS 2.1 instead of AUFS 2. Older kernels are unaffected.
...
svn path=/nixos/trunk/; revision=26646
2011-03-31 23:03:54 +00:00
Eelco Dolstra
6c55079ab0
* nixos-hardware-scan: It's not necessary to detect Intel graphics
...
cards because the default X config contains the Intel driver.
Likewise, there is no need for the "vesa" default.
* nixos-hardware-scan: Clean up the output a bit.
svn path=/nixos/trunk/; revision=26423
2011-03-18 13:52:09 +00:00
Eelco Dolstra
6ee609a0a3
* On the installation CD, set the overcommit heuristic to "always
...
overcommit". This makes it less likely that the installer fails
randomly in low memory environments.
svn path=/nixos/trunk/; revision=26369
2011-03-16 15:17:54 +00:00
Eelco Dolstra
6646268c95
* This should no longer be needed.
...
svn path=/nixos/trunk/; revision=26331
2011-03-15 18:47:56 +00:00
Eelco Dolstra
d8b69f2fad
* grub-mkimage now requires a format flag. Also, the "sh" module has
...
disappeared. Hopefully it's not important :-)
svn path=/nixos/trunk/; revision=26234
2011-03-09 16:26:03 +00:00
Eelco Dolstra
6f1068b0b7
* Remove the unnecessary warning printed by `nixos-rebuild test'. The
...
current configuration (/var/run/current-system) is always a GC root.
svn path=/nixos/trunk/; revision=26227
2011-03-09 12:14:06 +00:00
Eelco Dolstra
f1277862cd
* Handle --cores.
...
svn path=/nixos/trunk/; revision=26188
2011-03-07 12:12:53 +00:00
Eelco Dolstra
5cff6eda3d
* Revert r21410 because it breaks handling of "--max-jobs".
...
svn path=/nixos/trunk/; revision=26187
2011-03-07 12:12:39 +00:00
Eelco Dolstra
34dea57f8a
* Add wicd to the NixOS CD.
...
svn path=/nixos/trunk/; revision=26083
2011-02-23 19:11:32 +00:00
Eelco Dolstra
9fca36bfa3
* Add the Intel 5000/6000 firmwares to the installation media.
...
svn path=/nixos/trunk/; revision=26081
2011-02-23 19:06:14 +00:00
Ludovic Courtès
0513b31f73
Improve the documentation of `generationsDir'.
...
svn path=/nixos/trunk/; revision=25718
2011-01-29 23:07:02 +00:00
Eelco Dolstra
8361444f9b
* Disable compositing for now in the graphical installation CD. It
...
seems to cause problems with KDE 4.5 on some graphics drivers (such
as Cirrus and VGA in QEMU). (NixOS/121)
svn path=/nixos/trunk/; revision=25659
2011-01-21 13:38:30 +00:00
Sander van der Burg
96b769c979
Removed the backdoor, because it does not work anymore and it has also become obsolete (Disnix uses something else now)
...
svn path=/nixos/trunk/; revision=25601
2011-01-17 16:15:59 +00:00
Sander van der Burg
c7a5960101
Removed backdoor argument
...
svn path=/nixos/trunk/; revision=25592
2011-01-16 21:59:17 +00:00