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

142 commits

Author SHA1 Message Date
Eelco Dolstra 8edefa2960 * Grrr. Fix the sort order. 
svn path=/nixos/trunk/; revision=23732
 2010-09-10 17:35:13 +00:00
Eelco Dolstra 4ae4b7d47f * Support booting Xen in the Grub menu builder. 
svn path=/nixos/trunk/; revision=23730
 2010-09-10 17:15:35 +00:00
Eelco Dolstra 8f4139987e * Regex listing the system generations was selecting the number from 
only the first generation in the list.  (From Karn Kallio.)

svn path=/nixos/trunk/; revision=23728
 2010-09-10 15:47:06 +00:00
Eelco Dolstra 7b635ee4ed * "ls -d" -> "echo", since "ls" prints the current directory if 
nothing matches.

svn path=/nixos/trunk/; revision=23716
 2010-09-10 12:25:59 +00:00
Nicolas Pierron c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused 
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
 2010-09-03 19:10:59 +00:00
Nicolas Pierron 1f69bc4b9d Remove deprecated notation in tools.nix. 
svn path=/nixos/trunk/; revision=23630
 2010-09-03 19:10:54 +00:00
Nicolas Pierron 9e04f67b3d Add nixos-option tool to investigate option details on the cmd-line. 
svn path=/nixos/trunk/; revision=23629
 2010-09-03 19:10:50 +00:00
Michael Raskin 597e083d82 Adding an option to include build dependencies into ISO image 
svn path=/nixos/trunk/; revision=23502
 2010-08-29 12:11:31 +00:00
Eelco Dolstra 8c960af984 * Handle the case where /boot is on the same filesystem as / 
but on a different filesystem than /nix/store.  In that case
  we need to copy the kernels and initrds to /boot.

svn path=/nixos/trunk/; revision=23085
 2010-08-10 08:36:59 +00:00
Eelco Dolstra cbc05c1480 * Enable wpa_supplicant on the installation CD. 
svn path=/nixos/trunk/; revision=23034
 2010-08-08 13:55:35 +00:00
Eelco Dolstra e8e7ee356c * In the installation CD, pass the label of the CD through the 
root=... kernel command line parameter, instead of hard-coding it in
  `fileSystems'.  This is to allow CD-to-USB converters such as
  UNetbootin to rewrite the kernel command line to the label or UUID
  of the USB stick.

svn path=/nixos/trunk/; revision=23024
 2010-08-07 14:16:18 +00:00
Eelco Dolstra d7d2d5e3d5 * Add some NLS modules required to mount FAT filesystems. We need 
this to boot the NixOS installer from a USB stick.

svn path=/nixos/trunk/; revision=23019
 2010-08-06 23:09:37 +00:00
Eelco Dolstra 05fc10f3a8 * Add dosfstools to the installation CD (for 
{mkfs,fsck}.{vfat,msdos}).

svn path=/nixos/trunk/; revision=23006
 2010-08-06 18:52:00 +00:00
Eelco Dolstra d659488209 * Use the regular GRUB menu builder for Amazon. There are two issues: 
we want to generate the GRUB menu without actually installing GRUB
  (because Amazon supplies its own pv-grub), and each menu entry
  requires "root (hd0)".  For the first, allow boot.loader.grub.device
  to be set to "nodev" to indicate that the GRUB menu should be
  generated without installing GRUB.  For the second, add an option
  boot.loader.grub.extraPerEntryConfig to allow commands to be added
  to each GRUB menu entry (in this case, "root (hd0)").

svn path=/nixos/trunk/; revision=22712
 2010-07-22 14:40:29 +00:00
Eelco Dolstra f1dde44ac1 * Added an action `nixos-rebuild pull' to just pull the Nixpkgs 
channel manifest and exit.  Useful if you don't want to use
  nix-channel.

svn path=/nixos/trunk/; revision=22601
 2010-07-14 14:18:27 +00:00
Eelco Dolstra baf54c517d * Fix the terminal_output command. (This used to work but not with 
the latest GRUB I guess.)

svn path=/nixos/trunk/; revision=22575
 2010-07-13 11:48:40 +00:00
Eelco Dolstra 54d201294b * Sync with the trunk. 
svn path=/nixos/branches/boot-order/; revision=22487
 2010-07-06 08:21:05 +00:00
Lluís Batlle i Rossell 41cc6ecdbb Trying to make the nixos-bootstrap-archive (nixos-minimal-archive in other places named) to have an 
hydra build product for easy tarball download.


svn path=/nixos/trunk/; revision=22440
 2010-07-01 17:54:03 +00:00
Eelco Dolstra d43d321e86 * Sync with the trunk. 
svn path=/nixos/branches/boot-order/; revision=22349
 2010-06-20 20:54:31 +00:00
Eelco Dolstra a65b5ec81c * Added an option boot.loader.grub.extraConfig to add commands to 
grub.cfg before the menu entries.  (This could also be done using
  `extraEntriesBeforeNixOS', but then you can't have entries *after*
  the main entry anymore.)
* In the installer test, redirect GRUB output to the serial port.

svn path=/nixos/branches/boot-order/; revision=22300
 2010-06-16 22:18:26 +00:00
Lluís Batlle i Rossell f69d7b1768 Fixing my previous bad commit on stat. Thank you David! 
svn path=/nixos/trunk/; revision=22297
 2010-06-16 15:17:02 +00:00
Lluís Batlle i Rossell fbb3046a87 Making the grub menu builder take a better path at distinguishing if / and /boot are different fs. 
I chose %D over %d because I like hex more.


svn path=/nixos/trunk/; revision=22294
 2010-06-16 13:58:15 +00:00
Eelco Dolstra ca1910e4b0 * Seems that we don't need the aufs2 mount helper. 
svn path=/nixos/trunk/; revision=22038
 2010-05-28 09:35:24 +00:00
Eelco Dolstra f9f224972a * Use AUFS2. 
svn path=/nixos/trunk/; revision=22033
 2010-05-28 07:09:34 +00:00
Yury G. Kudryashov 2dfd9b51ae gnupg2 is now called gnupg 
svn path=/nixos/trunk/; revision=21889
 2010-05-19 21:11:46 +00:00
Marc Weber ce642f0cc2 nixos-rebuild: accept both: -jn and -j n 
svn path=/nixos/trunk/; revision=21410
 2010-04-28 19:52:03 +00:00
Yury G. Kudryashov a30637aba5 Really use nix-worker in nixos-rebuild 
svn path=/nixos/trunk/; revision=21307
 2010-04-25 18:26:51 +00:00
Eelco Dolstra c1e313b5e1 * Remove obsolete references to kernelPackages in Nixpkgs. 
svn path=/nixos/trunk/; revision=20647
 2010-03-16 12:10:06 +00:00
Ludovic Courtès 8e16742b79 Update users of `services.sshd'. 
svn path=/nixos/trunk/; revision=20575
 2010-03-11 17:02:53 +00:00
Ludovic Courtès bcd3cd85f3 installation-cd: Add an `installer.basePackages' option. 
svn path=/nixos/trunk/; revision=20573
 2010-03-11 17:02:36 +00:00
Eelco Dolstra 1065e86642 * In nixos-rebuild, build config.environment.nix before trying nixFallback or nixUnstable. 
svn path=/nixos/trunk/; revision=20376
 2010-03-04 14:38:53 +00:00
Lluís Batlle i Rossell b6090bff9d Making the bootloaders respect the platform.kernelTarget set in nixpkgs. 
svn path=/nixos/trunk/; revision=20283
 2010-02-27 22:17:10 +00:00
Lluís Batlle i Rossell 093b51a562 Removing references to linux kernel 'vmlinuz', and making them point to 'bzImage'. 
That should match with a related change in nixpkgs.


svn path=/nixos/trunk/; revision=20095
 2010-02-18 11:35:39 +00:00
Lluís Batlle i Rossell 1dd3162d7c First attempt at trying to get a tarball of a bootable nixos system. 
What I want with this derivation is to allow the sheevaplug nixos to
build a tarball with all the needed files to boot. Then, this can be
unpacked into an SD card, or into a NFS/TFTP server, and then the
user can boot the system with help of the uboot console.
By now, I have only tried to build the tarball in a PC, in order
to develop the nix expressions quicker.

There is nothing written specialy for the Sheevaplug in all this,
by now.


svn path=/nixos/trunk/; revision=20035
 2010-02-15 23:27:51 +00:00
Eelco Dolstra dbc03fbf68 * nixos-install: copy /etc/nsswitch.conf to the chroot. This seems 
necessary to have it use /etc/hosts.

svn path=/nixos/trunk/; revision=19905
 2010-02-10 14:31:46 +00:00
Eelco Dolstra 6a06118f85 * Use the build flags given on the command line while building Nix. 
svn path=/nixos/trunk/; revision=19799
 2010-02-03 22:49:50 +00:00
Lluís Batlle i Rossell 13ee735395 Making nixos work well with the new names 'linuxPackages' in stdenv-updates, additionally 
to the nixpkgs trunk 'kernelPackages'.
Seeing a strange kernelPackages mentioned in installation-cd-rescue (2.6.31_something) I
update that to 2.6.32.


svn path=/nixos/trunk/; revision=19443
 2010-01-14 19:50:49 +00:00
Eelco Dolstra 5c66611f3e svn path=/nixos/trunk/; revision=19333 2010-01-10 18:34:32 +00:00
Eelco Dolstra 1a0bb65901 * Added a regression test for whether the Nixpkgs channel works. This 
is done by instantiating a webserver that simulates nixos.org.
  Using nix-push we create a channel that contains some stuff (namely
  the GNU Hello source tarball and the rlwrap program).  This was a
  bit tricky because nix-push requires a writable Nix store.  Using
  AUFS this is possible, but not on recent Linux kernels (AUFS1 over
  CIFS fails).

svn path=/nixos/trunk/; revision=19327
 2010-01-10 01:26:01 +00:00
Eelco Dolstra 39796e26b4 * Removed the boot.isLiveCD option. Moved the code for mounting a 
tmpfs on top of the CD to iso-image.nix.

svn path=/nixos/trunk/; revision=19318
 2010-01-09 15:13:06 +00:00
Eelco Dolstra 34341d810a * Remove a debug line. 
svn path=/nixos/trunk/; revision=19285
 2010-01-07 13:53:09 +00:00
Eelco Dolstra 83478a0800 * Add klibc and klibcShrunk to the CD because they're always needed 
during an installation.

svn path=/nixos/trunk/; revision=19273
 2010-01-06 20:51:10 +00:00
Eelco Dolstra 8ebde1ea8a * Add the modules for all block devices. 
svn path=/nixos/trunk/; revision=19271
 2010-01-06 20:09:53 +00:00
Eelco Dolstra 1b21115f61 * Support creating a virtual disk in the test driver. 
svn path=/nixos/trunk/; revision=19263
 2010-01-06 14:37:23 +00:00
Eelco Dolstra 1da72333d9 * Put the NixOS boot at the top so that it's the default. 
svn path=/nixos/trunk/; revision=19255
 2010-01-06 12:24:20 +00:00
Eelco Dolstra 790368e315 * Removed installation-cd-minimal-fresh-kernel.nix since the kernel in 
installation-cd-minimal.nix is now 2.6.32.  Added most of its extra
  tools to installation-cd-base.nix.
* Put memtest86 at the bottom of the GRUB menu.  (There is currently
  no good way to do this other than to change the module inclusion
  order.)

svn path=/nixos/trunk/; revision=19188
 2010-01-03 17:13:30 +00:00
Eelco Dolstra 21216b0461 * Move some kernel modules around. 
svn path=/nixos/trunk/; revision=19187
 2010-01-03 16:29:17 +00:00
Marc Weber 4378018164 nixos-rebuild: allow passing --fallback 
replacing if .. fi by case .. esac

svn path=/nixos/trunk/; revision=19186
 2010-01-03 13:36:23 +00:00
Eelco Dolstra 64c75274e1 * Use Linux 2.6.32 on the installation CD. 
svn path=/nixos/trunk/; revision=19166
 2010-01-01 16:26:01 +00:00
Marc Weber 93cb9f819d cosmetic: remove redundancy 
svn path=/nixos/trunk/; revision=19040
 2009-12-18 15:08:50 +00:00