Commit graph

103 commits

Author SHA1 Message Date
Nicolas Pierron
fa3437cb35 Remove enableIntel* and enableGo7007 options.
Update nixos-hardware-scan.pl to generate files without these options.

svn path=/nixos/branches/fix-style/; revision=13856
2009-01-25 15:48:59 +00:00
Nicolas Pierron
7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Nicolas Pierron
e4b0134a43 Add a grub configuration file.
svn path=/nixos/branches/fix-style/; revision=13685
2009-01-02 16:07:34 +00:00
Nicolas Pierron
205a7431ac Remove extra arguments comming from config.*.
svn path=/nixos/branches/fix-style/; revision=13381
2008-11-23 01:29:20 +00:00
Nicolas Pierron
3b2016569a Replace some ${nixpkgsPath}/pkgs by ${pkgs.path}.
svn path=/nixos/branches/fix-style/; revision=13380
2008-11-23 01:29:13 +00:00
Eelco Dolstra
3a9700b226 * Include the kernel version in the description for
each Grub menu entry.  (Ideally, we would show
  what changed between each entry, e.g. "KDE upgraded to 4.1",
  but that would be hard to do generically.)

svn path=/nixos/trunk/; revision=13146
2008-10-29 13:24:00 +00:00
Michael Raskin
1d55390e1c An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards.
svn path=/nixos/trunk/; revision=13109
2008-10-24 10:30:38 +00:00
Marc Weber
d438b972b1 nixos-rebuild: take NIXPKGS location from env, too
svn path=/nixos/trunk/; revision=12981
2008-10-06 23:23:28 +00:00
Michael Raskin
f03fed54e0 Now automated test runs - installs and boots NixOS - on my computer. Some minor issue with socat transferring report from virtual machine to host, though.
svn path=/nixos/trunk/; revision=12830
2008-09-08 22:36:11 +00:00
Michael Raskin
88be528d9d Updating rescue-cd-configurable to match rescue-cd.nix updates
svn path=/nixos/trunk/; revision=12829
2008-09-08 21:08:20 +00:00
Michael Raskin
75dc712c59 Added virtio modules to module list for rescue CD variations.
svn path=/nixos/trunk/; revision=12828
2008-09-08 21:07:49 +00:00
Eelco Dolstra
212d5ceff5 * Don't generate a manifest for the CD anymore, just use the
copy-from-other-stores substituter to copy paths directly from the
  Nix store on the CD.

svn path=/nixos/trunk/; revision=12826
2008-09-08 12:40:05 +00:00
Eelco Dolstra
5e88ff8269 * Fix relative paths.
svn path=/nixos/trunk/; revision=12823
2008-09-08 09:36:54 +00:00
Eelco Dolstra
21ee887b75 * Renamed `configuration' to something more descriptive.
svn path=/nixos/trunk/; revision=12822
2008-09-08 08:51:09 +00:00
Eelco Dolstra
5fb3cdc82b * Typo.
svn path=/nixos/trunk/; revision=12762
2008-08-29 09:26:30 +00:00
Eelco Dolstra
c34c703040 * Don't use camel case for filenames.
* "by env overridable settings" is not good English :-)

svn path=/nixos/trunk/; revision=12732
2008-08-27 09:37:44 +00:00
Marc Weber
4eceb15830 fix typos, moved nixos-checkout code into its own file
following some other suggestions made by niksnut
added further PATH hint in repos description of options.nix

svn path=/nixos/trunk/; revision=12730
2008-08-26 19:45:06 +00:00
Marc Weber
b0b4c0e2b3 echo working copies beeing used when calling showSyntax (help output)
svn path=/nixos/trunk/; revision=12729
2008-08-26 19:44:54 +00:00
Marc Weber
67b1b9af80 rewritten nixos-checkout code.
You can now define multiple repositories. See options.nix

svn path=/nixos/trunk/; revision=12645
2008-08-17 01:11:57 +00:00
Eelco Dolstra
64fc690afa * Make that dry-run' (as an action) instead of --dry-run'.
svn path=/nixos/trunk/; revision=12488
2008-08-04 15:04:06 +00:00
Eelco Dolstra
3ea5264b1b * Option `--dry-run' to see what's going to be built.
* Properly parse the command line arguments before doing anything
  (reported by Andres).

svn path=/nixos/trunk/; revision=12486
2008-08-04 14:58:26 +00:00
Eelco Dolstra
a66248e2a2 * Fix extraGrubEntriesBeforeNixos, it always placed the extra entries
before the default (so I suddenly found myself booting into 
  Windows...).  BTW it would be better to have string-valued options
  like extraGrubEntriesBefore / extraGrubEntriesAfter or something 
  like that.

svn path=/nixos/trunk/; revision=12401
2008-07-23 09:10:19 +00:00
Wouter den Breejen
ab41596a7f Added option boot.extraGrubEntriesBeforeNixos=true/false to boot by default into nixos-default or into your extraGrubEntries
svn path=/nixos/trunk/; revision=12263
2008-07-05 00:16:39 +00:00
Eelco Dolstra
8cad20e1c9 * Doh!
svn path=/nixos/trunk/; revision=12016
2008-06-09 11:14:28 +00:00
Eelco Dolstra
ebb43a3f67 * Make the location of Nixpkgs a function argument (defaulting
to ../../nixpkgs).  This makes the "pkgs" symlink under the 
  nixos checkout unnecessary.

svn path=/nixos/trunk/; revision=11989
2008-06-05 15:33:17 +00:00
Eelco Dolstra
bd33b3e756 * Build through the Nix daemon if it's running.
svn path=/nixos/trunk/; revision=11966
2008-06-04 09:01:54 +00:00
Eelco Dolstra
cc7f3c7aaa * URL updates.
svn path=/nixos/trunk/; revision=11801
2008-05-09 15:08:43 +00:00
Eelco Dolstra
5feff6f5d4 * Symlink $mountPoint/etc/mtab to /proc/mounts.
svn path=/nixos/trunk/; revision=11793
2008-05-09 10:08:02 +00:00
Eelco Dolstra
728a278641 * Unmount only the filesystems that the installer actually mounted.
So if the user mounted /mnt/boot or something, don't unmount it.

svn path=/nixos/trunk/; revision=11792
2008-05-09 09:32:31 +00:00
Michael Raskin
98748a319a I have probably fixed the "separate /boot" problem. Tested in Qemu, it worked
svn path=/nixos/trunk/; revision=11789
2008-05-09 05:58:21 +00:00
Tobias Hammerschmidt
228792a70d updated svn repositories
svn path=/nixos/trunk/; revision=11721
2008-04-25 20:28:39 +00:00
Eelco Dolstra
e32a8437d5 svn path=/nixos/trunk/; revision=11203 2008-03-19 12:58:14 +00:00
Ludovic Courtès
3a973ab55c nixos-rebuild: Determine $NIXPKGS' from $NIXOS' by default.
svn path=/nixos/trunk/; revision=11200
2008-03-19 12:27:30 +00:00
Eelco Dolstra
473d75fc46 * Typo.
svn path=/nixos/trunk/; revision=11199
2008-03-19 12:21:09 +00:00
Eelco Dolstra
52aed402db * Moved to Nixpkgs.
svn path=/nixos/trunk/; revision=11155
2008-03-17 10:51:09 +00:00
Eelco Dolstra
95d41d5e27 * Allow the location of Nixpkgs to be specified through $NIXPKGS.
* $NIXOS_NO_PULL: changed to $NIXOS_PULL (which should be set to "0"
  to disable pulling).
* New variable $NIXOS_BUILD_NIX, which can be set to "0" to disable
  building nixUnstable from Nixpkgs.

svn path=/nixos/trunk/; revision=11096
2008-03-13 10:17:42 +00:00
Michael Raskin
4b31843e64 Added nixos-gen-seccure-keys and modified nixos-checkout to store /etc/nixos/version.nix with string representing checkout version.
svn path=/nixos/trunk/; revision=10936
2008-03-03 23:31:48 +00:00
Michael Raskin
067db8fa72 Modifications to nixos-checkout for multi-branch support.
svn path=/nixos/trunk/; revision=10558
2008-02-08 19:13:29 +00:00
Eelco Dolstra
ce250ffb37 * Installation CD: include a lot of modules (SATA, PATA, Firewire,
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
2008-02-08 15:59:15 +00:00
Eelco Dolstra
c30e7b0f13 * Determine networking.enableIntel3945ABGFirmware.
svn path=/nixos/trunk/; revision=10490
2008-02-04 10:39:06 +00:00
Eelco Dolstra
7521d6c49a * Add the Intel 82G965.
svn path=/nixos/trunk/; revision=10410
2008-01-30 14:57:13 +00:00
Eelco Dolstra
8ea2ce37c8 * NVIDIA support.
svn path=/nixos/trunk/; revision=10409
2008-01-30 14:53:06 +00:00
Eelco Dolstra
8e94f3ad67 * First attempt at detecting services.xserver.videoDriver.
svn path=/nixos/trunk/; revision=10408
2008-01-30 14:50:25 +00:00
Eelco Dolstra
92fffa1ee8 * Detect the networking.enableIntel2200BGFirmware option.
svn path=/nixos/trunk/; revision=10406
2008-01-30 14:32:02 +00:00
Eelco Dolstra
7363895f6d * Rewrote the hardware scanner in Perl.
svn path=/nixos/trunk/; revision=10405
2008-01-30 14:16:38 +00:00
Eelco Dolstra
9fd5d70968 * The CD is now a true live CD: you can run Nix operations in it
thanks to unionfs.  For instance, nix-env and nixos-rebuild work.
  The tricky part was to build a Nix database (in the tmpfs/unionfs)
  which is now necessary to prevent store paths on the CD from being
  deleted right away because they otherwise wouldn't be valid.
  
* nixos-install: use the /etc/nixos/configuration.nix from the target
  file system (don't copy it anymore).  Since the user is supposed to
  mount the target file system on /mnt anyway, we may as well require
  that configuration.nix is placed in /mnt/etc/nixos.  This also makes
  upgrading / reinstalling much easier, since it will automatically
  use the right configuration.nix.

svn path=/nixos/trunk/; revision=10399
2008-01-30 01:28:56 +00:00
Eelco Dolstra
fcef0545be * A program for generating the hardware-specific bits of
configuration.nix.  Right now it finds out the following:

  - How many CPUs the machine has (for nix.maxJobs).
  - Whether to load KVM support (either kvm-intel or kvm-amd).
  - The modules necessary for the initrd by scanning the PCI and USB
    busses.  Only mass-storage and HID related modules are added.

svn path=/nixos/trunk/; revision=10221
2008-01-18 16:17:48 +00:00
Michael Raskin
8eeb6a0a91 'As GRUB limit on x86 is probably 191 entries, make sure we don't get more than 190 (one for safety)'
svn path=/nixos/trunk/; revision=10110
2008-01-10 12:28:01 +00:00
Michael Raskin
ad2ecc2cb5 Changed GRUB failure backups a bit after testing
svn path=/nixos/trunk/; revision=10108
2008-01-10 05:50:58 +00:00
Michael Raskin
99a2f550c0 Modifications to grub-menu-builder: copy default kernel and initrd to /boot/nixos-.. , limit menu size
svn path=/nixos/trunk/; revision=10106
2008-01-10 04:43:19 +00:00