90749 Commits

Author SHA1 Message Date
Eelco Dolstra
ffe45949e8 * Use the right mount command in the filesystems job so that
NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
2008-08-09 12:03:08 +00:00
Michael Raskin
83509605b3 Added possibility to change klibc version
svn path=/nixpkgs/trunk/; revision=12563
2008-08-09 08:40:37 +00:00
Eelco Dolstra
2783f96ce7 * Remove the sleep-5-seconds hack in the initrd, instead loop until
the device to mount appears.  This wasn't previously possible
  because of root devices specified by label (mounted via "mount
  LABEL=foo ..."), but now we use /dev/disk/by-label so we can easily
  test whether the device already exists.

svn path=/nixos/trunk/; revision=12562
2008-08-08 23:15:36 +00:00
Eelco Dolstra
a83becdee8 * When booting from the installation CD, just mount
/dev/disk/by-label/<label>.  This makes the whole
  autoDetectRootDevice/rootLabel machinery unnecessary.

svn path=/nixos/trunk/; revision=12561
2008-08-08 23:01:30 +00:00
Eelco Dolstra
b760a4b8d9 * Use the persistent storage udev rules in the initrd so that we can
use /dev/disk/by-{label,id,...} names for the root FS.
* Kill udevd at the end of stage 1.  Don't know how it got killed
  previously...

svn path=/nixos/trunk/; revision=12560
2008-08-08 22:44:45 +00:00
Michael Raskin
abe260b6c5 Now CLisp builds with full CLX (XShape included)
svn path=/nixpkgs/trunk/; revision=12559
2008-08-08 22:37:37 +00:00
Eelco Dolstra
537fa9185a * Some awful hackery to get volume_id to build with klibc. We'll need
it for mounting by label in the initrd.

svn path=/nixpkgs/trunk/; revision=12558
2008-08-08 19:54:48 +00:00
Eelco Dolstra
1c2d81d93d * Remove "obsolete" notation.
svn path=/nixos/trunk/; revision=12557
2008-08-08 19:40:19 +00:00
Eelco Dolstra
a662f1c473 * Fix building the manual.
svn path=/nixos/trunk/; revision=12556
2008-08-08 19:25:31 +00:00
Eelco Dolstra
a33d2f3adc * Use a klibc-based udev. Hopefully this fixes the problems
encountered on x86-64 when udev is compiled against dietlibc.

svn path=/nixos/trunk/; revision=12555
2008-08-08 19:07:07 +00:00
Eelco Dolstra
a9d19f45db * A function `useKlibc' to build a package using klibc as the C
library.
* Removed devicemapperStatic, e2fsprogsDiet, lvm2Static since they're
  redundant (it's what you get when you use pkgsDiet/pkgsStatic).

svn path=/nixpkgs/trunk/; revision=12554
2008-08-08 19:05:32 +00:00
Nicolas Pierron
2e9dc1ea47 Rename option: services.xserver.packageFun -> .package
svn path=/nixos/trunk/; revision=12553
2008-08-08 18:57:11 +00:00
Nicolas Pierron
3fd58f8a03 Declare obsolete: hardware option; options with arguments.
svn path=/nixos/trunk/; revision=12552
2008-08-08 18:57:09 +00:00
Nicolas Pierron
51210b1904 Remove pkgs argument of:
- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551
2008-08-08 18:57:07 +00:00
Nicolas Pierron
9fc41fc64f Prepare the removal of pkgs arguments.
If user options are using pkgs arguments, these would be replaced by the pkgs argument given to the whole option component expression instead of the pkgs argument given to the option.

svn path=/nixos/trunk/; revision=12550
2008-08-08 18:57:04 +00:00
Nicolas Pierron
d63bfe3c31 Use the new configuration scheme for system's options.
svn path=/nixos/trunk/; revision=12549
2008-08-08 18:56:58 +00:00
Michael Raskin
b8ff944cd2 Postfix list separator fix
svn path=/nixos/trunk/; revision=12548
2008-08-08 18:51:32 +00:00
Eelco Dolstra
63e316ecac * Refactoring: move all the initrd-generation related stuff to
boot-stage-1.nix in order to unclutter system.nix.

svn path=/nixos/trunk/; revision=12547
2008-08-08 17:34:30 +00:00
Michael Raskin
e7438b3525 Ported disk labelling.
svn path=/nixos/trunk/; revision=12546
2008-08-08 17:13:46 +00:00
Eelco Dolstra
abbe260a80 * Don't use modprobe but insmod in the initrd. This means we don't
need module-init-tools in the initrd, since insmod is in klibc.
* Give the installation CD a label.

svn path=/nixos/trunk/; revision=12545
2008-08-08 17:07:04 +00:00
Eelco Dolstra
4d6548e94c * Use the tools from klibc in the initrd instead of the static-tools.
This makes the initrd a few megabytes smaller.
* Use run-init from klibc to delete everything in the initrd ramfs
  prior to switching to the real root FS.
* Removed the stage2Init argument.

svn path=/nixos/trunk/; revision=12544
2008-08-08 15:49:57 +00:00
Sander van der Burg
e920df26c6 Added two useful packages that I don't want to compile over and over again
svn path=/nixpkgs/trunk/; revision=12543
2008-08-08 14:36:51 +00:00
Eelco Dolstra
3dc0ad3aa9 * KVM no longer needs GCC 3.4.
svn path=/nixpkgs/trunk/; revision=12542
2008-08-08 11:53:01 +00:00
Eelco Dolstra
d4f7a93f31 * KVM 72, plus stable 2.6.26 kernel headers (needed for KVM).
svn path=/nixpkgs/trunk/; revision=12541
2008-08-08 11:49:06 +00:00
Michael Raskin
aaba3d2440 Added lincity - a city simulation. And if I build houses, I build houses here.
svn path=/nixpkgs/trunk/; revision=12539
2008-08-08 07:16:34 +00:00
Marc Weber
8302b6ba69 some fixes for bash completion (git, darcs) (-> etc/bash_completion.d/*)
svn path=/nixpkgs/trunk/; revision=12538
2008-08-07 17:30:35 +00:00
Eelco Dolstra
5030b79f44 * NVIDIA driver updated to 173.14.12.
svn path=/nixpkgs/trunk/; revision=12537
2008-08-07 16:47:08 +00:00
Eelco Dolstra
ee17d755ca * Zabbix updated to 1.4.6.
svn path=/nixpkgs/trunk/; revision=12536
2008-08-07 15:05:52 +00:00
Pjotr Prins
07595b0397 Introduced biolib package
svn path=/nixpkgs/trunk/; revision=12535
2008-08-07 15:01:21 +00:00
Eelco Dolstra
9d0b7c4aa9 * Linux 2.6.26.2. Totally untested of course.
svn path=/nixpkgs/trunk/; revision=12534
2008-08-07 14:57:10 +00:00
Eelco Dolstra
6e8d8a1614 * sysstat 8.0.4.1.
svn path=/nixpkgs/trunk/; revision=12533
2008-08-07 11:15:11 +00:00
Michael Raskin
2bcb5a8efe Removed tabs in nix-expressions introduced by me in nixos/ tree.
svn path=/nixos/trunk/; revision=12532
2008-08-07 10:23:20 +00:00
Michael Raskin
014b33637c Added an option to easily allow everyone to use "at".
svn path=/nixos/trunk/; revision=12531
2008-08-07 10:09:17 +00:00
Pjotr Prins
f222b38f00 Added rightly named package gfortran and updated gcc version for compiling gfortran
r-lang debends on gfortran


svn path=/nixpkgs/trunk/; revision=12529
2008-08-07 08:33:03 +00:00
Eelco Dolstra
590ba6453e * GCC 3.3.x doesn't build on x86_64.
svn path=/nixpkgs/trunk/; revision=12528
2008-08-07 08:01:22 +00:00
Marc Weber
468c075ecc added storable vector
svn path=/nixpkgs/trunk/; revision=12527
2008-08-06 21:21:54 +00:00
Marc Weber
9e55727832 Added:
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
2008-08-06 20:39:01 +00:00
Nicolas Pierron
791d8bbc66 Add udev extra option (addUdevPkgs).
Add some merge functions.

svn path=/nixos/trunk/; revision=12523
2008-08-06 19:26:47 +00:00
Nicolas Pierron
692c5a62a4 Use "abort" instead of "throw" when option values cannot be merged.
Fix mergeListOption.
Add error support in mergeEnableOption.

svn path=/nixpkgs/trunk/; revision=12522
2008-08-06 19:24:36 +00:00
Nicolas Pierron
53bdeb43e3 Rewrite the optionDeclarations to collect all options definitions.
svn path=/nixos/trunk/; revision=12521
2008-08-06 18:43:53 +00:00
Nicolas Pierron
0ce4cafd88 * Do not always use the current result as argument.
* "filterOptionSets" returns the only option per attribute instead of a list of options.

svn path=/nixpkgs/trunk/; revision=12520
2008-08-06 18:34:11 +00:00
Nicolas Pierron
92560a1dc0 Use the new scheme of configuration evaluation.
svn path=/nixos/trunk/; revision=12519
2008-08-06 17:39:05 +00:00
Marc Weber
7061a01749 removing empty directory, should have used --rmdir
svn path=/nixpkgs/trunk/; revision=12518
2008-08-06 17:02:28 +00:00
Marc Weber
ec717200c8 ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now)
svn path=/nixpkgs/trunk/; revision=12517
2008-08-06 16:56:05 +00:00
Eelco Dolstra
f5e61dfa0c * Provide a mount command that knows how to mount ntfs-3g and cifs
file systems.  The main advantage is that this allows mounting of
  such file systems from the `filesystems' configuration option at
  boot time, e.g.

    fileSystems = [
      ...
      { mountPoint = "/windows";
        device = "/dev/disk/by-uuid/9EA4B22EA4B208B3";
        fsType = "ntfs-3g";
      }
    ];

  The list of file system helpers should of course be made
  configurable.

svn path=/nixos/trunk/; revision=12516
2008-08-06 15:48:12 +00:00
Eelco Dolstra
decf974c94 * Command for mounting CIFS file systems.
svn path=/nixpkgs/trunk/; revision=12515
2008-08-06 15:43:03 +00:00
Eelco Dolstra
0a884b25f9 * util-linux: added an option to build just mount/umount, and an
option to set the path to the mount helpers programs
  (mount.<fstype>) to something other than /sbin.  Needed in NixOS to
  get the mount command to work for NTFS-3G, CIFS, etc.

svn path=/nixpkgs/trunk/; revision=12514
2008-08-06 15:27:50 +00:00
Sander van der Burg
f652a0836a Added support for custom context.xml
svn path=/nixos/trunk/; revision=12513
2008-08-06 15:07:29 +00:00
Sander van der Burg
63b9500b88 Added support for custom context.xml for Tomcat
svn path=/nixpkgs/trunk/; revision=12512
2008-08-06 14:59:45 +00:00
Sander van der Burg
afdfff7ed8 Added common lib support for tomcat
svn path=/nixos/trunk/; revision=12511
2008-08-06 13:41:08 +00:00