Commit graph

164 commits

Author SHA1 Message Date
Nicolas Pierron 16a916f297 * Synced with trunk @ 14905
svn path=/nixos/branches/modular-nixos/; revision=14986
2009-04-11 22:12:02 +00:00
Nicolas Pierron 3f1dd56e9e * Synced with trunk @ 14801
svn path=/nixos/branches/modular-nixos/; revision=14953
2009-04-08 14:01:16 +00:00
Nicolas Pierron af88c29d5b * Synced with trunk @ 14148
svn path=/nixos/branches/modular-nixos/; revision=14948
2009-04-08 13:41:33 +00:00
Lluís Batlle i Rossell d9b6234e9f Adding nfsutils on mount-helpers. That adds more binaries to mount-helpers, but at
least allows mounting nfs paths.


svn path=/nixos/trunk/; revision=14905
2009-04-06 19:25:45 +00:00
Michael Raskin 5dadce8770 Adding comment about child configurations
svn path=/nixos/trunk/; revision=14889
2009-04-05 19:13:52 +00:00
Eelco Dolstra 4be528a72c * An option to activate additional KDE packages.
svn path=/nixos/trunk/; revision=14888
2009-04-05 19:10:34 +00:00
Eelco Dolstra d5e97ab056 * Let KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS contain the KDE
packages that we need rather than just /var/run/current-system/sw.
  This ensures consistency when upgrading a system (e.g. you don't end
  up with a mix of KDE versions at runtime).  This partially reverts
  r14148 (in particular the update-mime-database hack in the
  systemPath post-build).

svn path=/nixos/trunk/; revision=14887
2009-04-05 18:30:39 +00:00
Eelco Dolstra 723b0dc74b * Use utillinuxng.override.
svn path=/nixos/trunk/; revision=14801
2009-03-31 09:33:35 +00:00
Eelco Dolstra ccbcf58062 * nvidiaDrivers -> nvidia_x11.
svn path=/nixos/trunk/; revision=14788
2009-03-30 14:54:22 +00:00
Eelco Dolstra b470feb916 * nixpkgsPath -> nixpkgs.
svn path=/nixos/trunk/; revision=14702
2009-03-25 15:47:29 +00:00
Eelco Dolstra 311ff6c8e7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/trunk/; revision=14148
2009-02-20 16:31:42 +00:00
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 9fa758c657 Update the function used to merge option sets.
svn path=/nixos/branches/fix-style/; revision=13853
2009-01-25 15:48:43 +00:00
Eelco Dolstra d532df65dd * Quick hack to make the `info' command work properly by generating
a "dir" file on the fly in a wrapper script.

svn path=/nixos/trunk/; revision=13805
2009-01-19 12:34:14 +00:00
Michael Raskin 0a1f41c742 An upstart job to display manual
svn path=/nixos/trunk/; revision=13728
2009-01-08 23:30:23 +00:00
Michael Raskin 32adf2c521 Option for proxy usage in Nix daemon
svn path=/nixos/trunk/; revision=13689
2009-01-03 09:07:52 +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 d745c21aab Merge system/fontdir.nix and system/fonts.nix into a new configuration file.
svn path=/nixos/branches/fix-style/; revision=13686
2009-01-02 16:07: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 b67e2a12aa Convert "boot/boot-stage-2.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13684
2009-01-02 16:07:30 +00:00
Nicolas Pierron 7cdb7d38ef Replace the activation script by one which is completely generated.
svn path=/nixos/branches/fix-style/; revision=13683
2009-01-02 16:07:24 +00:00
Nicolas Pierron 1b32260084 Convert "upstart-jobs/xserver.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13682
2009-01-02 16:07:21 +00:00
Nicolas Pierron 44f1d9f0bf Extra sudo configuration file from:
- system/options.nix
- system/system.nix
- etc/default.nix

svn path=/nixos/branches/fix-style/; revision=13681
2009-01-02 16:07:15 +00:00
Nicolas Pierron 79bfab0e07 convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files.
svn path=/nixos/branches/fix-style/; revision=13680
2009-01-02 16:07:10 +00:00
Nicolas Pierron 145345c307 system/users-groups.nix is now a configuration file.
Remove user & group references from system/system.nix.

svn path=/nixos/branches/fix-style/; revision=13678
2009-01-02 16:07:01 +00:00
Nicolas Pierron 1533dec09d * etc/default.nix is now a configuration file.
* the script used to build the etc directory in stored in config.system.build.etc.
* The activation script is defined inside etc/Default.nix instead of system/activate-configuration.sh

svn path=/nixos/branches/fix-style/; revision=13676
2009-01-02 16:06:52 +00:00
Nicolas Pierron e7e45dbd2c Start moving the "activate configuration" script to be extensible.
svn path=/nixos/branches/fix-style/; revision=13675
2009-01-02 16:06:46 +00:00
Eelco Dolstra c155a3f46e * When doing chroot builds, the `build-chroot-dirs' option should
include the closure of /bin/sh.  Otherwise all builders that call
  /bin/sh will fail when using the new chroot implementation, which
  only bind-mounts the inputs of a build rather than the whole Nix
  store.

svn path=/nixos/trunk/; revision=13640
2008-12-15 23:54:10 +00:00
Ludovic Courtès 8373c890a8 atd: Make `at' and friends actually usable by regular users.
This patch makes the `at' commands setuid `atd' (instead of `root')
and fixes the ownership of `/etc/at/at.deny'.

svn path=/nixos/trunk/; revision=13515
2008-11-29 17:36:00 +00:00
Michael Raskin 7a6df0a5a8 Create a low-priority section in system.nix; host goes there
svn path=/nixos/trunk/; revision=13513
2008-11-29 07:10:31 +00:00
Michael Raskin 7ebc1821f9 Fixing build for new kernels when Intel WiFi firmware is used
svn path=/nixos/trunk/; revision=13470
2008-11-27 20:35:26 +00:00
Ludovic Courtès 3919a28971 Add host' to systemPathList'.
svn path=/nixos/trunk/; revision=13462
2008-11-27 15:30:25 +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
Nicolas Pierron 9c0eef3bae Convert "dbus" & "avahi-deamon" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13378
2008-11-23 01:28:58 +00:00
Nicolas Pierron 892d12bccf - Move some system configuration to options:
* system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
2008-11-18 18:00:09 +00:00
Nicolas Pierron 866987a60e cron.nix: Use the new option scheme.
svn path=/nixos/trunk/; revision=13235
2008-11-09 16:44:43 +00:00
Nicolas Pierron 2e6c2f9aaf Add config.etc option to add extra /etc/* files.
svn path=/nixos/trunk/; revision=13234
2008-11-09 16:44:37 +00:00
Nicolas Pierron 92f790036c Replace obsolete name.
svn path=/nixos/trunk/; revision=13233
2008-11-09 16:44:31 +00:00
Marc Weber f1be382d71 add setuidOwners programs automatically to setuid list
It should be enough to specify them once

svn path=/nixos/trunk/; revision=12640
2008-08-16 00:59:23 +00:00
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
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
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 d63bfe3c31 Use the new configuration scheme for system's options.
svn path=/nixos/trunk/; revision=12549
2008-08-08 18:56:58 +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
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
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 92560a1dc0 Use the new scheme of configuration evaluation.
svn path=/nixos/trunk/; revision=12519
2008-08-06 17:39: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