Commit graph

1475 commits

Author SHA1 Message Date
Peter Simons 20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy fe045dc949 sed -i -e 's|/nix/var|@stateDir@|g' -e 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh
Use configurable storeDir and stateDir in the installer tools

svn path=/nixos/trunk/; revision=30106
2011-10-29 22:14:27 +00:00
Shea Levy a16d43a8ac Make the stateDir and storeDir available for substitution into the tools
svn path=/nixos/trunk/; revision=30105
2011-10-29 22:00:25 +00:00
Shea Levy 09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
2011-10-29 21:03:57 +00:00
Shea Levy 9d496c77ac nixpkgs: Always set nixpkgs.config.{state,store}Dir
This will allow NixOS modules to always refer to config.nixpkgs.config.nix to find the store or state
directory

svn path=/nixos/trunk/; revision=30103
2011-10-29 18:20:02 +00:00
Lluís Batlle i Rossell 035ccb8faf Making dovecot2 authentication work (wrong pam module)
svn path=/nixos/trunk/; revision=30076
2011-10-27 22:04:08 +00:00
Lluís Batlle i Rossell 69a31a37e4 Adding a module for dovecot2. I've not tried it much.
svn path=/nixos/trunk/; revision=30072
2011-10-27 19:43:20 +00:00
Eelco Dolstra ce822289c3 * Create /etc/localtime as a symlink to the right zoneinfo file.
However, this won't do anything until we merge the stdenv branch.

svn path=/nixos/trunk/; revision=30071
2011-10-27 19:36:03 +00:00
Lluís Batlle i Rossell 1fe1481adf Fixing systemhealth for kernels 3.x
svn path=/nixos/trunk/; revision=30068
2011-10-27 18:06:54 +00:00
Eelco Dolstra 3397bc6e09 * Recent kernels need some more modules in the initrd to be able to do
CIFS mounts.

svn path=/nixos/trunk/; revision=30067
2011-10-27 17:46:25 +00:00
Eelco Dolstra 926091c265 * Make the permissions on /run less liberal.
svn path=/nixos/trunk/; revision=30065
2011-10-27 17:34:16 +00:00
Lluís Batlle i Rossell c7f568dc06 Fixing the xserver.enableTCP for kdm.
svn path=/nixos/trunk/; revision=30056
2011-10-27 15:43:13 +00:00
Eelco Dolstra 564f7358f1 * Fix EC2 terminology: zone -> region. (Availability zones are
something else.)

svn path=/nixos/trunk/; revision=30050
2011-10-26 23:44:13 +00:00
Eelco Dolstra 6e809242e9 * Ensure that the "kde" PAM module exists whn KDE is enabled.
Previously, this was only enabled in the KDM module, so if you were
  using a different display manager than KDM, stuff like getting out
  of the screensaver didn't work correctly.

svn path=/nixos/trunk/; revision=30049
2011-10-26 21:47:03 +00:00
Eelco Dolstra 021409b21f * Declaring fileSystems as "loa" (list or attribute set) is bad because it can
cause the filesystems to be reordered.  During stage 1, the ordering of
  filesystems is sensitive.  (In stage 2, mountall ensures that filesystems
  are mounted in the right order.)

svn path=/nixos/trunk/; revision=30046
2011-10-26 19:37:47 +00:00
Eelco Dolstra 0fce64bb37 * Specify more option types.
svn path=/nixos/trunk/; revision=30045
2011-10-26 18:08:58 +00:00
Eelco Dolstra 8137be6f27 * Updated eu-west-1 64-bit image.
svn path=/nixos/trunk/; revision=30017
2011-10-25 17:14:22 +00:00
Eelco Dolstra a9cfde0df1 * securityGroup -> securityGroups.
svn path=/nixos/trunk/; revision=30014
2011-10-25 15:27:29 +00:00
Eelco Dolstra e4a6ea0632 * Add some options that are useful in Charon network specifications.
svn path=/nixos/trunk/; revision=30006
2011-10-25 04:01:34 +00:00
Eelco Dolstra a82bfec343 * Add an option ‘deployment.ec2.zone’. For EC2 deployments, this
automatically sets ‘deployment.ec2.controller’ and
  ‘deployment.ec2.ami’ to sensible values.

svn path=/nixos/trunk/; revision=30005
2011-10-25 01:59:39 +00:00
Eelco Dolstra 49adbed510 * Add a module that provides all the Radeon firmwares.
svn path=/nixos/trunk/; revision=30004
2011-10-25 00:27:07 +00:00
Eelco Dolstra 0a1fee9ec8 * Add a module for the Broadcom firmware. Also, add it to the
installation CD (though the kernel on the CD is not recent
  enough yet to actually support the device).  (This is kind of
  an abuse of "not-detected.nix".)

svn path=/nixos/trunk/; revision=30003
2011-10-24 23:41:33 +00:00
Eelco Dolstra 504f4943a0 * Add a securityGroup attribute for EC2 deployment.
svn path=/nixos/trunk/; revision=30001
2011-10-24 19:27:58 +00:00
Eelco Dolstra 5a03989036 * Fix Amazon image generation (there is no $ORIG_TMPDIR in
runInLinuxVM anymore; use /tmp/xchg instead).

svn path=/nixos/trunk/; revision=29970
2011-10-21 23:39:05 +00:00
Eelco Dolstra 9076456b15 * Don't restart udevtrigger from the switch script. It's triggered by
udev.

svn path=/nixos/trunk/; revision=29962
2011-10-21 16:22:38 +00:00
Lluís Batlle i Rossell b5baad31d2 The virtual consoles were launching a bash not aware of locales.
svn path=/nixos/trunk/; revision=29882
2011-10-18 21:44:35 +00:00
Lluís Batlle i Rossell 62dede7121 The system health url moved.
svn path=/nixos/trunk/; revision=29881
2011-10-18 21:44:06 +00:00
Nicolas Pierron 38bc39c299 Add support for NFS root file system.
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29855
2011-10-15 21:01:30 +00:00
Joachim Schiele 298186fd06 added cntlm as a system service with its own user 'cntlm'
svn path=/nixos/trunk/; revision=29737
2011-10-09 22:34:32 +00:00
Eelco Dolstra 00ce9aaf1a * svn.nixos.org -> nixos.org.
svn path=/nixos/trunk/; revision=29690
2011-10-06 11:29:44 +00:00
Eelco Dolstra 0f816374c7 * Use shm and posixsem for the SSL session cache.
svn path=/nixos/trunk/; revision=29658
2011-10-05 12:24:53 +00:00
Peter Simons 18d52f8f4b modules/installer/scan/not-detected.nix: don't depend on pkgs.rt73fw
The rt73 firmware has disappeared from the upstream server, and we don't
have a new URL yet.

svn path=/nixos/trunk/; revision=29620
2011-10-04 08:45:15 +00:00
Nicolas Pierron 47a1941696 LDAP non-anonymous bind.
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29563
2011-10-02 13:24:10 +00:00
Shea Levy 3a201ef6a7 Enable building ISOs for aufs3 kernels
svn path=/nixos/trunk/; revision=29538
2011-09-28 22:43:53 +00:00
Peter Simons 32d6a441a5 modules/tasks/network-interfaces.nix: create network bridges with "forward delay" set to zero
This change obsoletes the need to increase the IPv6 "router_solicitations" parameter.

svn path=/nixos/trunk/; revision=29493
2011-09-26 09:41:40 +00:00
Peter Simons 84a37365c2 modules/services/printing/cupsd.nix: ensure that /etc/cups exists before the daemon is run
CUPS is really unhappy when /etc/cups doesn't exist, and without that
directory it's going to mess up file permissions of /nix/store, the web
front-end won't work, and probably all kinds of other stuff is broken
that I didn't notice yet. :-(

svn path=/nixos/trunk/; revision=29452
2011-09-23 14:41:22 +00:00
Peter Simons 432d71f3ed modules/programs/bash: major clean-up and re-factoring of /etc/profile and /etc/bashrc
* Moved bash-specific code from /etc/profile to /etc/bashrc.

 * Moved general Bourne shell code from /etc/bashrc to /etc/profile.

 * Added "include guards" to both files to ensure that they aren't sourced
   multiple times (which would result in lots of redundancy in $PATH, etc.).

 * Both files include each other to make sure that the correct system
   environment is always defined.

 * When the current user has installed the 'bash-completion' package in her
   $HOME/.nix-profile, programmable completion is automatically enabled in
   interactive shells.

 * The /etc/skel/.bashrc we installed has been dropped because it is redundant.

svn path=/nixos/trunk/; revision=29451
2011-09-23 14:21:36 +00:00
Eelco Dolstra 3fa2bbd029 * Properly shut down udevd in stage 1. Otherwise there is a slight
possibility that a udevd process survives, preventing udevd from
  starting in stage 2:

  machine# udevd[1421]: bind failed: Address already in use
  machine# udevd[1421]: error binding udev control socket

svn path=/nixos/trunk/; revision=29434
2011-09-22 08:26:58 +00:00
Marco Maggesi 229b99321f Make blcr module use the configured kernel
svn path=/nixos/trunk/; revision=29413
2011-09-21 13:13:36 +00:00
David Guibert 7d982fd1bd cups: fix smb backend
svn path=/nixos/trunk/; revision=29393
2011-09-20 07:14:27 +00:00
David Guibert df1c3dda68 autofs: add sshfs to PATH
svn path=/nixos/trunk/; revision=29392
2011-09-20 07:14:24 +00:00
Marco Maggesi 91a6dc6168 Make VirtualBox Guest Additions use the configured kernel.
svn path=/nixos/trunk/; revision=29346
2011-09-19 13:20:09 +00:00
Alexander Tsamutali 8e13361521 modules/profiles/base.nix: Added gptfdisk.
svn path=/nixos/trunk/; revision=29320
2011-09-17 13:09:38 +00:00
Eelco Dolstra 4fff0d2291 * Log sitecopy runs.
svn path=/nixos/trunk/; revision=29299
2011-09-15 15:33:34 +00:00
Eelco Dolstra 61072f8995 * Add a module for a Flash policy server.
svn path=/nixos/trunk/; revision=29296
2011-09-15 15:13:46 +00:00
Peter Simons 8abea71eaa modules/services/monitoring/smartd.nix: run the daemon with --no-fork to make life easier for upstart
svn path=/nixos/trunk/; revision=29287
2011-09-14 18:30:10 +00:00
Peter Simons d1cf78c756 modules/services/monitoring/smartd.nix: provide the implicitly set flag '-a' explicitly
svn path=/nixos/trunk/; revision=29286
2011-09-14 18:30:07 +00:00
Peter Simons eb6e1310b8 strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Peter Simons f5e8d35f8e modules/services/printing/cupsd.nix: /etc/cups/mime.{convs,types} are obsolete
Current versions of CUPS (1.4.7 or later, apparently) load these files
from ${cups}/share/mime, so we no longer need the symlinks in /etc.

svn path=/nixos/trunk/; revision=29284
2011-09-14 18:20:13 +00:00
Russell O'Connor 1744733be8 Revering CUPS update.
svn path=/nixos/trunk/; revision=29283
2011-09-14 17:58:57 +00:00
Peter Simons 02bb4eb289 modules/services/printing/cupsd.nix: MIME related config files have moved to share in cups 1.5
svn path=/nixos/trunk/; revision=29254
2011-09-13 20:42:21 +00:00
Peter Simons a499049ce5 Strip trailing whitespace.
svn path=/nixos/trunk/; revision=29246
2011-09-13 18:49:50 +00:00
Peter Simons d3528a3c4e modules/system/boot/stage-1-init.sh: added "boot.runSize" option to determine the maximum size of the /run tmpfs
svn path=/nixos/trunk/; revision=29245
2011-09-13 18:49:47 +00:00
Peter Simons c01c41e2da modules/system/boot/kernel.nix: disable "elevator=cfq" boot parameter for the time being
This setting causes the init ram disk to hang indefinitely on some systems.

svn path=/nixos/trunk/; revision=29228
2011-09-12 18:01:18 +00:00
Eelco Dolstra 64340dc03c * Set OPENSSL_X509_CERT_FILE.
svn path=/nixos/trunk/; revision=29225
2011-09-12 17:01:43 +00:00
Eelco Dolstra 7dc59f0bb0 * Zabbix: only enable PostgreSQL if it's on the same machine.
svn path=/nixos/trunk/; revision=29185
2011-09-11 15:55:43 +00:00
Yury G. Kudryashov 7a858f2a89 Adjust DM/kde4.nix to latest changes in kde-4.7
svn path=/nixos/trunk/; revision=29181
2011-09-11 12:44:54 +00:00
Yury G. Kudryashov c56a8456ed Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config
Namely, allow {pkgs}: { packageOverrides = p: ...; };

svn path=/nixos/trunk/; revision=29180
2011-09-11 12:41:47 +00:00
Yury G. Kudryashov 9a096c9ee7 Partially revert r2903
The nepomuk&virtuoso problem is solved without polutting $QT_PLUGIN_PATH and/or
$LD_LIBRARY_PATH by patching soprano.

svn path=/nixos/trunk/; revision=29107
2011-09-07 23:11:04 +00:00
Yury G. Kudryashov bcee582a74 Preserve <standard_session_service_dirs/> in dbus.conf
This way *session* dbus daemon loads services from XDG_DATA_DIRS

svn path=/nixos/trunk/; revision=29106
2011-09-07 23:07:05 +00:00
Peter Simons 6c08bf40a6 modules/system/boot/kernel.nix: stripped trailing whitespace
svn path=/nixos/trunk/; revision=29101
2011-09-07 20:36:13 +00:00
Eelco Dolstra ed1bc1e180 * Handle the case where a symlink in /etc needs to change into a
directory.  This happened with /etc/polkit-1, which used to be a
  symlink to /etc/static/polkit-1, which was itself a symlink but now
  is a directory.  Not handling this correctly led to /etc/static
  being clobbered with symlinks pointing to themselves.

svn path=/nixos/trunk/; revision=29061
2011-09-06 12:32:07 +00:00
Eelco Dolstra 4a65eb6830 * Create /var/lib/upower, where upowerd keeps historical battery data.
svn path=/nixos/trunk/; revision=29057
2011-09-06 11:18:36 +00:00
Eelco Dolstra 5de82a6802 svn path=/nixos/trunk/; revision=29053 2011-09-05 23:33:29 +00:00
Eelco Dolstra 0de04bd4be * Xfce 4.6 fix.
svn path=/nixos/trunk/; revision=29046
2011-09-05 20:50:15 +00:00
Eelco Dolstra 8d8c250b8f * Enable gvfs in Xfce.
svn path=/nixos/trunk/; revision=29044
2011-09-05 20:37:06 +00:00
Eelco Dolstra 94014f4adc * Get the Virtuoso backend in Soprano/Nepomuk to work. Soprano tries
to find virtodbc_r.so in QT_PLUGIN_PATH (among other locations), so
  make sure that Virtuoso can be found there.

svn path=/nixos/trunk/; revision=29033
2011-09-05 17:55:53 +00:00
Eelco Dolstra 4b8275d2c4 * Force loading of the CFQ module, i.e. don't do it on demand — that
seems to cause weird modprobe hangs.

svn path=/nixos/trunk/; revision=29027
2011-09-05 14:58:26 +00:00
Eelco Dolstra 453675c5c1 * Allow literal examples to be included in the manual.
svn path=/nixos/trunk/; revision=29025
2011-09-05 10:14:42 +00:00
Eelco Dolstra 5813e99fb3 * Fix description.
svn path=/nixos/trunk/; revision=29022
2011-09-05 09:46:14 +00:00
Nicolas Pierron 6669cf61f4 Add merge capabilities to nixpkgs.config option.
svn path=/nixos/trunk/; revision=29021
2011-09-05 09:19:59 +00:00
Nicolas Pierron def746fcdd Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode).
svn path=/nixos/trunk/; revision=29020
2011-09-05 09:19:55 +00:00
Eelco Dolstra 0cbdfb2bbf * Use boot.initrd.availableKernelModules for the QEMU modules.
svn path=/nixos/trunk/; revision=28973
2011-09-02 13:20:05 +00:00
Eelco Dolstra 8b3fd3ed49 * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This
was already the case on Linux 2.6.32, but in newer kernels the CFQ
  scheduler is built as a module, so all block devices got the ‘none’
  scheduler instead.

svn path=/nixos/trunk/; revision=28972
2011-09-02 13:19:45 +00:00
Lluís Batlle i Rossell 8138feb630 The VM did not want to mount the CIFS without these two modules available in stage1.
svn path=/nixos/trunk/; revision=28947
2011-08-31 21:20:48 +00:00
Eelco Dolstra bd5ca54584 * Add fsck.vfat etc. to the default install. Useful for USB sticks
and stuff like that.

svn path=/nixos/trunk/; revision=28934
2011-08-30 18:25:54 +00:00
Yury G. Kudryashov 5ee15d4986 Fix hal evaluation
svn path=/nixos/trunk/; revision=28842
2011-08-26 17:30:53 +00:00
Yury G. Kudryashov c174554ad7 polkit_kde_agent is now kde4.polkit_kde_agent
svn path=/nixos/trunk/; revision=28834
2011-08-26 13:50:03 +00:00
Yury G. Kudryashov 42a03ef0eb Sync with dbus changes in nixpkgs
svn path=/nixos/trunk/; revision=28832
2011-08-26 13:46:59 +00:00
Yury G. Kudryashov ea4630bf97 Allow RUN+="socket:..." in udev rules
svn path=/nixos/trunk/; revision=28808
2011-08-25 08:06:09 +00:00
Shea Levy 25594961ad modprobe.nix: Blacklist snd_pcsp by default
svn path=/nixos/trunk/; revision=28805
2011-08-24 23:37:40 +00:00
Yury G. Kudryashov e5917ea6fc Merge with udev-173
The only conflict was the addition of two different options at the same place.

svn path=/nixos/trunk/; revision=28801
2011-08-24 21:24:39 +00:00
Eelco Dolstra 1aa1c86afc * Enable upower and udisks for Xfce 4.8.
svn path=/nixos/trunk/; revision=28764
2011-08-22 23:10:24 +00:00
Eelco Dolstra 3b1c741f3f * Xfce 4.8 doesn't need HAL anymore.
svn path=/nixos/trunk/; revision=28762
2011-08-22 22:52:13 +00:00
Eelco Dolstra ecbfe0d9c0 * Cause KDE's Polkit authentication agent to be started at login.
You now get a nice popup window asking for the appropriate password
  if you try to do something that requires administrative privilege
  (e.g. "pkexec ls" in a terminal, unmounting devices that don't
  belong to you in Dolphin, or killing other people's processes in
  ksysguard).

svn path=/nixos/trunk/; revision=28735
2011-08-22 11:51:03 +00:00
Eelco Dolstra d1ae2c2ac1 * Polkit: remove the wrapper since it's no longer needed (and didn't
really work as far as I can tell).

svn path=/nixos/trunk/; revision=28734
2011-08-22 11:46:32 +00:00
Eelco Dolstra 13a2563d02 * Create /var/lib/udisks because that's where udisks keeps its mtab
file.  Without this, users are not able to unmount their own
  devices (because udisks doesn't remember who mounted them).

svn path=/nixos/trunk/; revision=28730
2011-08-21 21:03:02 +00:00
Eelco Dolstra 7980c71d9c * Add some options to allow setting PolKit permissions.
svn path=/nixos/trunk/; revision=28729
2011-08-21 20:38:45 +00:00
Peter Simons a84ada1d92 modules/services/monitoring/smartd.nix: pass TZ variable to smartd to ensure that notification e-mails have a proper time zone
svn path=/nixos/trunk/; revision=28702
2011-08-19 20:44:12 +00:00
Yury G. Kudryashov 9177fc455d Adjust nixos to latest changes in kde-4.7 in nixpkgs
svn path=/nixos/trunk/; revision=28598
2011-08-15 18:08:12 +00:00
Eelco Dolstra 4790c147bf * Revert r28400 because ConsoleKit got reverted to 0.4.1.
svn path=/nixos/trunk/; revision=28587
2011-08-15 14:48:32 +00:00
Lluís Batlle i Rossell 4bc0bfec4c Making the system-tarball-pc boot fine with PXE, and include help files and a
readme file as examples for an easy PXE setup.

This allows booting the NixOS in the system tarball, and thus allows installing nixos.


svn path=/nixos/trunk/; revision=28585
2011-08-15 14:37:00 +00:00
Lluís Batlle i Rossell 8f6a4be721 Trying to make the system tarball for pc closer to PXE boot.
svn path=/nixos/trunk/; revision=28573
2011-08-14 22:01:58 +00:00
Eelco Dolstra 7e2ea4df32 * Xsession script: set the current directory to $HOME.
svn path=/nixos/trunk/; revision=28511
2011-08-12 10:04:43 +00:00
Shea Levy 38cab9070f synaptics module: By default, disable edge drag scrolling if two finger scrolling is enabled
svn path=/nixos/trunk/; revision=28472
2011-08-10 22:14:46 +00:00
David Guibert 96304c9afc make the virtualbox guest module loadable by modprobe.
svn path=/nixos/trunk/; revision=28436
2011-08-09 19:53:01 +00:00
Eelco Dolstra 74586fd2bb * Fix the permissions on /tmp.
svn path=/nixos/trunk/; revision=28435
2011-08-09 15:32:39 +00:00
Eelco Dolstra d75efe4aa1 * For security, don't mount the entire host filesystem.
svn path=/nixos/trunk/; revision=28429
2011-08-09 14:07:44 +00:00
Eelco Dolstra 45d8c418b5 * Some hackery to get ConsoleKit to work with the SLIM and "auto"
display managers.  This was broken due to a change in ConsoleKit
  0.4.2:

    https://bugs.freedesktop.org/show_bug.cgi?id=28377

  Using ConsoleKit's pam-ck-connector helps in that it creates local
  sessions; however, they're not marked as active because the
  x11-display-device property is not set.  As a workaround, calling
  ck-launch-session seems to work.

  More details:

    https://bugs.gentoo.org/show_bug.cgi?id=336634
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150
    https://bugzilla.redhat.com/show_bug.cgi?id=585952

svn path=/nixos/trunk/; revision=28400
2011-08-08 19:28:17 +00:00
Eelco Dolstra eba6e0456b * Use the VESA driver. It seems to work better now. In particular,
it doesn't turn blue backgrounds into yellow (see
  e.g. http://hydra.nixos.org/build/1232626/download/1/screen.png).

svn path=/nixos/trunk/; revision=28395
2011-08-08 15:16:42 +00:00