JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,786 Commits 2 Branches 0 Tags 13 GiB
497760b444
Commit Graph

1786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2c03c134f5 * Build the big CD image in Hydra. 
svn path=/nixos/branches/modular-nixos/; revision=16033
 2009-06-24 09:14:28 +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
27ad47bdac * Build the ISO from the modular branch. Don't bzip the ISO anymore 
since it's already compressed using squashfs.

svn path=/nixos/branches/modular-nixos/; revision=16026
 2009-06-22 16:28:21 +00:00
Eelco Dolstra
ccdae5ed87 * Fix building the manual. 
svn path=/nixos/branches/modular-nixos/; revision=16025
 2009-06-22 16:06: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
Eelco Dolstra
16937dd23d * Make fsck on journaling filesystems optional (enabled by default). 
This is because fsck.ext3 takes several minutes to recover the
  journal, whereas the ext3 implementation in the kernel only takes a
  few seconds.  I'd love to know why this is the case...

svn path=/nixos/branches/modular-nixos/; revision=15965
 2009-06-15 16:47:37 +00:00
Eelco Dolstra
048e03377f * Don't try to run fsck on ISO-9660/UDF filesystems. 
svn path=/nixos/branches/modular-nixos/; revision=15963
 2009-06-15 15:50:36 +00:00
Eelco Dolstra
ff58b5dede * Booting was broken when using the "label" option. 
svn path=/nixos/branches/modular-nixos/; revision=15957
 2009-06-14 11:08:44 +00:00
Eelco Dolstra
f258edcb80 * autocreate should be a boolean. 
svn path=/nixos/branches/modular-nixos/; revision=15956
 2009-06-14 11:07:44 +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
Nicolas Pierron
6cee6e9d87 Replace special rule by a module-list.mask file which enumerates all 
patterns matching the files which should not figure in module-list.nix.

svn path=/nixos/branches/modular-nixos/; revision=15941
 2009-06-11 17:59:47 +00:00
Nicolas Pierron
4001b66c88 Move the option declaration of filesystems.*.neededForBoot to boot/stage-1.nix. 
svn path=/nixos/branches/modular-nixos/; revision=15940
 2009-06-11 16:04:03 +00:00
Nicolas Pierron
0657b26ab1 Use types in to improve filesystems.nix 
svn path=/nixos/branches/modular-nixos/; revision=15939
 2009-06-11 16:03:57 +00:00
Eelco Dolstra
03760c0c03 * `installation-cd-big.nix' builds a NixOS installation CD containing 
an X server and KDE 4.  Thanks to squashfs it's only 466 MiB large.
  `installation-cd-small.nix' builds the original, text-only
  installation CD.

svn path=/nixos/branches/modular-nixos/; revision=15934
 2009-06-11 09:51:27 +00:00
Eelco Dolstra
cd1e4aefc1 * Break the cyclic dependency between the system derivation and 
Grub's menu.lst.

svn path=/nixos/branches/modular-nixos/; revision=15931
 2009-06-10 21:46:42 +00:00
Eelco Dolstra
1cea6b09ef * Compress the Nix store on the CD using squashfs. This reduces the 
size of the i686-linux ISO image from 463 MiB to 147 MiB.  Hopefully
  it also speeds up installation due to reduced seek time and larger
  block sizes, but I haven't tested that yet (on real hardware).

svn path=/nixos/branches/modular-nixos/; revision=15930
 2009-06-10 16:29:48 +00:00
Eelco Dolstra
31c6852403 * The menu.lst fragment in the top-level system derivation doesn't 
seem to be used anywhere.  Removed.

svn path=/nixos/branches/modular-nixos/; revision=15928
 2009-06-10 16:05:25 +00:00
Eelco Dolstra
e940f1fbd7 * Cleaned up the error messages in the stage 1 init script. 
* Use the basename from coreutils rather than a bash hack.

svn path=/nixos/branches/modular-nixos/; revision=15927
 2009-06-10 15:02:39 +00:00
Eelco Dolstra
27230eed8e * A function for generating squashfs filesystem images. 
svn path=/nixos/branches/modular-nixos/; revision=15926
 2009-06-10 13:40:35 +00:00
Eelco Dolstra
262ddf0854 * Move the manual/Rogue from virtual consoles 7/8 to 8/9 
respectively so that the X server can run on 7.

svn path=/nixos/branches/modular-nixos/; revision=15924
 2009-06-10 12:53:45 +00:00
Eelco Dolstra
135240e05f * Sigh. The nix-env call has to come after nix-store --load-db. 
Should really allow an ordering between postBootCommands.

svn path=/nixos/branches/modular-nixos/; revision=15923
 2009-06-10 12:51:16 +00:00
Eelco Dolstra
463cf8efdd * Provide a /etc/nixos/configuration.nix in the booted CD to make 
nixos-rebuild work.  This makes it a true live CD.

svn path=/nixos/branches/modular-nixos/; revision=15922
 2009-06-10 12:34:58 +00:00
Eelco Dolstra
56922fa5b1 * Removed the installer directory. 
svn path=/nixos/branches/modular-nixos/; revision=15918
 2009-06-10 11:02:17 +00:00
Eelco Dolstra
1f8602afd2 * Get rid of the old CD/DVD expressions. live-dvd.nix is basically 
rescue-dvd.nix (not tested though), i.e. it has all its extra
  packages and includes the build-time dependencies.

svn path=/nixos/branches/modular-nixos/; revision=15917
 2009-06-10 11:00:29 +00:00
Eelco Dolstra
ba43b5d000 * Set the CD volume ID and the ISO filename. 
svn path=/nixos/branches/modular-nixos/; revision=15912
 2009-06-09 15:23:03 +00:00
Eelco Dolstra
803d8b646f * Option isoImage.storeContents to add extra paths to the Nix store on 
the CD.

svn path=/nixos/branches/modular-nixos/; revision=15906
 2009-06-09 13:27:50 +00:00
Eelco Dolstra
45e6fe420c svn path=/nixos/branches/modular-nixos/; revision=15905 2009-06-09 13:14:43 +00:00
Eelco Dolstra
6023722135 * Provide Memtest86 as a module. 
svn path=/nixos/branches/modular-nixos/; revision=15904
 2009-06-09 12:02:52 +00:00