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

1243 commits

Author SHA1 Message Date
Eelco Dolstra 102a1e15ba * Use the "iburst" flag. This makes ntpd synchronise in a few seconds rather than 
a few minutes by sending an initial burst of messages to the time servers.

svn path=/nixos/trunk/; revision=24119
 2010-10-06 16:03:37 +00:00
Rob Vermaas f2f048db4d mercurial/apache: put PYTHONPATH in globalEnvVars 
svn path=/nixos/trunk/; revision=24115
 2010-10-06 12:38:37 +00:00
Rob Vermaas 8d60cad42a mercurial: initial version for hgweb apache module 
svn path=/nixos/trunk/; revision=24111
 2010-10-06 11:21:15 +00:00
Eelco Dolstra aeb89fc753 * Set /proc/sys/kernel/poweroff_cmd to Upstart's poweroff command 
(rather than /sbin/poweroff).  Xen's "xm shutdown" needs this to
  enable the host to cleanly shutdown the guest.

svn path=/nixos/trunk/; revision=24094
 2010-10-05 17:58:58 +00:00
Eelco Dolstra 8b5fba4942 * Added a module that provides common configuration for DomU 
machines.

svn path=/nixos/trunk/; revision=24084
 2010-10-05 15:44:40 +00:00
Eelco Dolstra 35562ea4a3 * Don't daemonize; otherwise Upstart will respawn it. 
svn path=/nixos/trunk/; revision=24081
 2010-10-05 15:17:09 +00:00
Eelco Dolstra c5b39e70ef * Rename the xen module to xen-dom0. 
svn path=/nixos/trunk/; revision=24078
 2010-10-05 14:23:12 +00:00
Eelco Dolstra c8fc492acf * Start atd when udev has finished completely. Hopefully this fixes 
the random atd failures at boot time, which seem to be caused by a
  race with the creation of /dev/null or something.

svn path=/nixos/trunk/; revision=24077
 2010-10-05 14:22:06 +00:00
Eelco Dolstra 17213c4f2a * When generating a GRUB 1 menu, don't use the "module" command to 
load the initrd, because pv-grub doesn't like it.

svn path=/nixos/trunk/; revision=24068
 2010-10-05 13:11:30 +00:00
Evgeny Egorochkin ac7ef33e4a Tor: socksListenAddress must always be in ip:port format 
svn path=/nixos/trunk/; revision=24022
 2010-10-02 02:19:17 +00:00
Rob Vermaas 7468ad50e0 nixos-option.sh: fix typo 
svn path=/nixos/trunk/; revision=24015
 2010-10-01 06:31:27 +00:00
Russell O'Connor 2811c7270a Replacing tsocks with torsocks. 
tsocks leaks DNS requests and is less secure than torsocks.

torsocks is a fork of tsocks that is patched specifically for Tor.


svn path=/nixos/trunk/; revision=24012
 2010-10-01 03:41:43 +00:00
Eelco Dolstra ab8a6d43c4 svn path=/nixos/trunk/; revision=23998 2010-09-30 13:53:30 +00:00
Evgeny Egorochkin 02f2b1f640 Fix lots of KDE functionality 
svn path=/nixos/trunk/; revision=23992
 2010-09-30 05:08:33 +00:00
Rob Vermaas 8a37500355 initial try for a nixos module for hydra channel mirroring 
svn path=/nixos/trunk/; revision=23990
 2010-09-29 11:31:09 +00:00
Eelco Dolstra deca72f3cf * Xen (or rather QEMU) needs /dev/net/tun, so load the tap 
module.

svn path=/nixos/trunk/; revision=23970
 2010-09-27 16:32:42 +00:00
Nicolas Pierron 567f37f3e4 Export tools which may be useful for users that want to switch to NixOS 
without using a live CD.

svn path=/nixos/trunk/; revision=23939
 2010-09-26 13:39:16 +00:00
Nicolas Pierron 62c9591d0b Fix usage message (-description) and honor $NIXOS instead of $NIXOS_PATH. 
svn path=/nixos/trunk/; revision=23937
 2010-09-26 08:43:55 +00:00
Evgeny Egorochkin bf3a8dfbe4 bashrc: make ALSA plugins discoverable 
svn path=/nixos/trunk/; revision=23932
 2010-09-26 03:49:33 +00:00
Evgeny Egorochkin 88b24ece7f Quassel: quick fix 
svn path=/nixos/trunk/; revision=23930
 2010-09-26 02:10:23 +00:00
Evgeny Egorochkin b766f8ac8d AMule: quick fix 
svn path=/nixos/trunk/; revision=23929
 2010-09-26 02:09:34 +00:00
Evgeny Egorochkin 3bca96e1bd AMule: create the user only if the user option is null, don't pollute the system profile with useless packages. 
svn path=/nixos/trunk/; revision=23928
 2010-09-26 02:04:06 +00:00
Evgeny Egorochkin d8c72719aa Quassel: Create quassel user only if cfg.user is left empty to avoid messing up existing users. 
This solution is still suboptimal but others are even worse.

svn path=/nixos/trunk/; revision=23927
 2010-09-26 01:58:44 +00:00
Nicolas Pierron 7ea957fd3d Add --install option for nixos-option which is used to handle options of 
the target system (when installing) and also to generate a template
configuration file for users.

svn path=/nixos/trunk/; revision=23923
 2010-09-25 22:29:50 +00:00
Nicolas Pierron 58ce746eb0 Add empty profile. 
svn path=/nixos/trunk/; revision=23922
 2010-09-25 22:29:42 +00:00
Nicolas Pierron fe7c1eb16b Remove duplicated definitions. 
svn path=/nixos/trunk/; revision=23921
 2010-09-25 09:44:48 +00:00
Nicolas Pierron e20ef7564e Update live-dvd configuration. 
svn path=/nixos/trunk/; revision=23919
 2010-09-25 09:33:17 +00:00
Nicolas Pierron c18fe31160 Make nixos-hardware-scan adding a profile to the generated configuration 
file.

svn path=/nixos/trunk/; revision=23918
 2010-09-25 09:33:13 +00:00
Nicolas Pierron 5fb80fcc4b Extract rescue profile from the the corresponding CD. 
svn path=/nixos/trunk/; revision=23917
 2010-09-25 09:33:09 +00:00
Nicolas Pierron 9936a6f525 Simplify system-tarball-pc.nix. Factor detected / undetected devices into 
the instalaltion-device profile.

svn path=/nixos/trunk/; revision=23916
 2010-09-25 09:33:03 +00:00
Nicolas Pierron f3cc01bd3b Extract graphical and minimal profiles from the installation CDs. 
svn path=/nixos/trunk/; revision=23915
 2010-09-25 09:32:57 +00:00
Nicolas Pierron 59429aa449 Change the policy used to select files added in the import list of the 
generated configuration.  Use all files listed as modules of eval-config.

svn path=/nixos/trunk/; revision=23914
 2010-09-25 09:32:52 +00:00
Nicolas Pierron d2d139e920 Move the generation of the dummy configuration file into the installation 
device profile.

TODO: The current configuration does not reproduce exactly the CD
configuration, fix it.

svn path=/nixos/trunk/; revision=23913
 2010-09-25 09:32:48 +00:00
Nicolas Pierron 112cd0c4d4 Add an installation device profile, and use it it the basic installation CD. 
svn path=/nixos/trunk/; revision=23912
 2010-09-25 09:32:43 +00:00
Nicolas Pierron cf103b8d4d Add 2 index file to define the default case for detected and not-detected 
devices.  These are used to replace hand made listings in the basic
installation CD.

The configuration file, which is generated by nixos-hardware-scan, enables
not-detected devices by default.

svn path=/nixos/trunk/; revision=23911
 2010-09-25 09:32:37 +00:00
Nicolas Pierron c90a7b9be4 Remove duplicated (modules-list) includes from the basic installation cd. 
svn path=/nixos/trunk/; revision=23910
 2010-09-25 09:32:32 +00:00
Nicolas Pierron d304d12f37 Extract a base profile from the basic installation cd. 
svn path=/nixos/trunk/; revision=23909
 2010-09-25 09:32:27 +00:00
Evgeny Egorochkin 9b7533c2fd KDE4: fix suid for kcheckpass, although suid doesn't seem to be needed if you use PAM 
svn path=/nixos/trunk/; revision=23906
 2010-09-22 23:08:05 +00:00
Evgeny Egorochkin 910103246f TOR: make torify work(only when enabled as a service. nix-env -i tor replaces it with a broken version.) 
svn path=/nixos/trunk/; revision=23905
 2010-09-22 23:07:59 +00:00
Evgeny Egorochkin c0751f83e9 Quassel: don't pollute profiles with useless files 
svn path=/nixos/trunk/; revision=23904
 2010-09-22 23:07:52 +00:00
Yury G. Kudryashov 1319531f28 Add system.path to PATH instead of overriding 
svn path=/nixos/trunk/; revision=23879
 2010-09-21 09:16:47 +00:00
Yury G. Kudryashov ca4b60d059 Auto add $prefix/lib/kde4/plugins to QT_PLUGIN_PATH 
svn path=/nixos/trunk/; revision=23872
 2010-09-20 14:10:46 +00:00
Evgeny Egorochkin 36fe7f69c6 Quassel: get rid of custom logging remnants 
svn path=/nixos/trunk/; revision=23867
 2010-09-20 01:44:07 +00:00
Evgeny Egorochkin e5aea56bb5 TOR: prevent creation of torPrivoxy.conf if Privoxy is disabled. 
Patch by Russel O'Connor

svn path=/nixos/trunk/; revision=23862
 2010-09-19 15:40:03 +00:00
Lluís Batlle i Rossell b9aa56969f Applying patch sent by roconnor about allowing "nix-env -S" in NixOS. I agree with the change. 
svn path=/nixos/trunk/; revision=23861
 2010-09-19 00:21:30 +00:00
Evgeny Egorochkin 385ec89817 TOR: client should be disabled by default 
svn path=/nixos/trunk/; revision=23860
 2010-09-18 16:36:03 +00:00
Evgeny Egorochkin 764f5f34fd Quassel: use the generic logging for jobs instead of rolling your own. 
svn path=/nixos/trunk/; revision=23854
 2010-09-18 12:50:55 +00:00
Evgeny Egorochkin 39193fa1e7 Folding@Home service: don't make binaries visible 
svn path=/nixos/trunk/; revision=23852
 2010-09-18 12:44:03 +00:00
Evgeny Egorochkin 41530c8e76 TOR service: sane default for burst rate 
svn path=/nixos/trunk/; revision=23851
 2010-09-18 12:43:48 +00:00
Evgeny Egorochkin b2b227c99f TOR service: refactored options to avoid mess 
svn path=/nixos/trunk/; revision=23850
 2010-09-18 11:30:14 +00:00
Evgeny Egorochkin 259c007f70 Quassel: use the convenience daemon package. 
svn path=/nixos/trunk/; revision=23849
 2010-09-18 11:30:09 +00:00
Evgeny Egorochkin 1b4c811d41 Added AMule daemon service 
svn path=/nixos/trunk/; revision=23848
 2010-09-18 11:30:04 +00:00
Lluís Batlle i Rossell c1e4586ed1 Again trying to get the kernelFile paths right 
svn path=/nixos/branches/stdenv-updates/; revision=23836
 2010-09-17 17:25:46 +00:00
Lluís Batlle i Rossell 743b75fbaf Making the fuloong2f system-tarball more specific for the fuloong, so, helping in how 
to use the system more easily.


svn path=/nixos/branches/stdenv-updates/; revision=23826
 2010-09-16 19:26:34 +00:00
Lluís Batlle i Rossell 3b216865d2 Writing better some sheevaplug system-tarball lines (kernel parameters in a single line, for example) 
svn path=/nixos/branches/stdenv-updates/; revision=23825
 2010-09-16 19:25:29 +00:00
Lluís Batlle i Rossell 83d012ba13 Trying to fix again system-tarball-pc (again, the kernel file name) 
svn path=/nixos/branches/stdenv-updates/; revision=23824
 2010-09-16 19:24:52 +00:00
Eelco Dolstra 0442e7e82a * Add Xen's udev rules. This is necessary to get automatically 
created block and network devices to work.

svn path=/nixos/trunk/; revision=23823
 2010-09-16 15:24:46 +00:00
Eelco Dolstra 82f97b5fb2 * Allow modules to add packages to the $PATH seen by programs called 
from udev rules.  This is slightly tricky because udev has a
  512-character limit on environment variables, so we create a symlink
  tree to work around this.

svn path=/nixos/trunk/; revision=23822
 2010-09-16 15:23:12 +00:00
Evgeny Egorochkin dc8eff071a Added Folding@Home service 
svn path=/nixos/trunk/; revision=23816
 2010-09-16 02:06:44 +00:00
Lluís Batlle i Rossell 7672c36a70 Trying to get system-tarball-pc build properly. 
svn path=/nixos/branches/stdenv-updates/; revision=23814
 2010-09-15 21:36:56 +00:00
Eelco Dolstra 5b3fd663ed * Don't set hostname to "", dhclient no longer needs it. 
svn path=/nixos/trunk/; revision=23783
 2010-09-14 11:58:55 +00:00
Eelco Dolstra 071b192c9d * Start dhclient after xend. 
svn path=/nixos/trunk/; revision=23782
 2010-09-14 11:58:06 +00:00
Eelco Dolstra 72d9235992 * Added an Upstart job for the Xen control daemon (xend). 
svn path=/nixos/trunk/; revision=23781
 2010-09-14 11:22:50 +00:00
Eelco Dolstra 8a6fad83f4 * Add a job attribute (path) to allow adding packages to the job's 
$PATH environment variable.

svn path=/nixos/trunk/; revision=23780
 2010-09-14 11:22:17 +00:00
Eelco Dolstra ea4d3e2c8c * Don't run dhclient on Xen's peth* devices. 
svn path=/nixos/trunk/; revision=23779
 2010-09-14 11:17:48 +00:00
Eelco Dolstra c4f910f550 * Substitute the path of the system derivation directly in the stage 2 
init script.  This removes the need for the `systemConfig' boot
  parameter; `init=<stage-2-init>' is enough.  However, the GRUB menu
  builder still needs to add `systemConfig' to the kernel command line
  for compatibility with old configurations.

svn path=/nixos/trunk/; revision=23775
 2010-09-13 22:10:25 +00:00
Lluís Batlle i Rossell 245df33c6c Making the system tarballs of fuloong and sheevaplug reference the proper nixpkgs, and not that of /etc/... 
svn path=/nixos/branches/stdenv-updates/; revision=23772
 2010-09-13 20:52:49 +00:00
Eelco Dolstra 4046056cdc * In the activation script, don't require the path to the "system" 
derivation on the command line.

svn path=/nixos/trunk/; revision=23770
 2010-09-13 18:19:15 +00:00
Eelco Dolstra d48e2fdb4d * Don't print kernel log messages twice. 
svn path=/nixos/trunk/; revision=23769
 2010-09-13 17:36:01 +00:00
Eelco Dolstra c8d1774f09 * Speed up the initialisation of /etc in the activation script a lot 
by doing it in Perl instead of in Bash.  Forking a zillion times is
  slow.

svn path=/nixos/trunk/; revision=23766
 2010-09-13 17:26:42 +00:00
Eelco Dolstra f8f04aa756 * Fix the tests. 
svn path=/nixos/trunk/; revision=23764
 2010-09-13 16:02:54 +00:00
Eelco Dolstra f729f12e4e Some cleanups in the activation script: 
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
 2010-09-13 15:41:38 +00:00
Eelco Dolstra f99e42cfbc * Doh. 
svn path=/nixos/trunk/; revision=23748
 2010-09-13 13:43:53 +00:00
Eelco Dolstra c1295661c4 * Added a command `nixos-rebuild build-vm-with-bootloader'. This is 
like `build-vm', but boots using the regular boot loader (i.e. GRUB
  1 or 2) rather than booting directly from the kernel/initrd.  Thus
  it allows testing of GRUB.

svn path=/nixos/trunk/; revision=23747
 2010-09-13 12:34:58 +00:00
Eelco Dolstra b756a1ee81 * Added an option to disable fsck on particular filesystems. 
svn path=/nixos/trunk/; revision=23744
 2010-09-13 11:46:35 +00:00
Eelco Dolstra e871e84159 * mkOverrideTemplate -> mkOverride. 
svn path=/nixos/trunk/; revision=23743
 2010-09-13 11:33:05 +00:00
Eelco Dolstra 6b2844c6b2 * Mount /proc/xen. 
svn path=/nixos/trunk/; revision=23741
 2010-09-12 22:56:54 +00:00
Eelco Dolstra 987dd76811 * Added a module to enable the Xen hypervisor. 
svn path=/nixos/trunk/; revision=23739
 2010-09-12 22:43:45 +00:00
Evgeny Egorochkin 9f06fb806c Fix TOR option descriptions: kbytes-> bytes 
svn path=/nixos/trunk/; revision=23735
 2010-09-11 11:43:09 +00:00
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 6258845b61 svn path=/nixos/trunk/; revision=23727 2010-09-10 15:25:58 +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
Lluís Batlle i Rossell 9ba735714a Adding a system-tarball expression for the sheevaplug (which a previous commit already put a reference to) 
svn path=/nixos/branches/stdenv-updates/; revision=23690
 2010-09-08 17:15:31 +00:00
Lluís Batlle i Rossell ccf7852e11 Updating the system-tarball work, having just tested that of the fuloong2f. 
svn path=/nixos/branches/stdenv-updates/; revision=23689
 2010-09-08 16:53:36 +00:00
Lluís Batlle i Rossell 7fe1c5fe90 Making eval-config not pass 'platform' as a nixpkgs parameter, but expect a nixpkgs config attribute. 
svn path=/nixos/branches/stdenv-updates/; revision=23688
 2010-09-08 16:52:15 +00:00
Sander van der Burg 10a3bd6ffe Added virtualbox service, which fixes the RandR problem and also keeps the guest's clock in sync with the host 
svn path=/nixos/trunk/; revision=23672
 2010-09-07 13:28:17 +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
Nicolas Pierron 6fa66ff7b9 Move matches just below the identifier. 
svn path=/nixos/trunk/; revision=23628
 2010-09-03 19:10:45 +00:00
Eelco Dolstra f1a6a8b6e0 svn path=/nixos/trunk/; revision=23614 2010-09-03 11:39:48 +00:00
Eelco Dolstra d550cc6d63 * Grmbl. Create the missing mount points. 
svn path=/nixos/trunk/; revision=23592
 2010-09-01 11:00:35 +00:00
Eelco Dolstra 2ac462c3c7 * Set NIX_CONF_DIR in cronjobs. Otherwise the garbage collector won't see 
the system nix.conf.

svn path=/nixos/trunk/; revision=23561
 2010-08-31 12:57:47 +00:00
Eelco Dolstra 68ebbb6093 * Put /nix on /ephemeral0 using AUFS (with the original /nix from the 
AMI as a base) because the root filesystem is rather small.

svn path=/nixos/trunk/; revision=23534
 2010-08-29 22:29:10 +00:00
Eelco Dolstra 34719e0c4a * On second thought, panicking in stage 1 doesn't help because it 
won't actually cause the instance to be terminated (even if
  "panic=1" were to be set), merely rebooted.

svn path=/nixos/trunk/; revision=23533
 2010-08-29 22:11:33 +00:00
Eelco Dolstra a242602b40 * /data -> /ephemeral0. 
* Put /tmp and /var on the /ephemeral0, as it has much more
  space than the root filesystem.
* Panic on stage 1 errors since they cannot be repaired anyway.

svn path=/nixos/trunk/; revision=23532
 2010-08-29 22:09:15 +00:00
Eelco Dolstra 4963f769d9 * Print the host public key on the console so that the user can obtain 
it securely by parsing the output of ec2-get-console-output.

svn path=/nixos/trunk/; revision=23524
 2010-08-29 21:03:22 +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 59b29535e5 * Include the Bluetooth module in module-list.nix. 
svn path=/nixos/trunk/; revision=23486
 2010-08-27 15:32:49 +00:00
Eelco Dolstra 4bca743766 * Typo. 
svn path=/nixos/trunk/; revision=23485
 2010-08-27 15:31:04 +00:00
Eelco Dolstra f067d179ab * Create /nix/var/nix/gcroots/tmp in the activation script. The 
build hook uses this directory to store temporary GC roots.  (It
  creates it if it doesn't exist, but it's better to do it here as
  well to ensure the right ownership and permissions.)
* Clear /nix/var/nix/gcroots/tmp and /nix/var/nix/temproots at boot
  time.

svn path=/nixos/trunk/; revision=23417
 2010-08-25 11:59:04 +00:00
Lluís Batlle i Rossell 63c3d72aa6 Updating the nvidiaLegacy nixos xserver driver to a numbered name, to match the current 
*two* possibilities of nvidia legacy driver in nixpkgs.


svn path=/nixos/trunk/; revision=23412
 2010-08-24 22:00:18 +00:00
Lluís Batlle i Rossell 1e7058d025 Removing the NvAGP special option for nvidiaLegacy. Although it helped in 
suspending the machine, it also slowed down the graphics (specially 2D) quite a lot.
firefox flash, firefox scrolling was a pain.

I'll leave that up to the nixos user with the cfg.deviceSection.


svn path=/nixos/trunk/; revision=23407
 2010-08-24 18:24:06 +00:00
Eelco Dolstra 3f10cf70f6 * Regression test for the build hook mechanism. 
svn path=/nixos/trunk/; revision=23395
 2010-08-24 13:27:28 +00:00
Eelco Dolstra 392275f185 * Move support for writable Nix stores to qemu-vm.nix. 
svn path=/nixos/trunk/; revision=23393
 2010-08-24 12:59:16 +00:00
Lluís Batlle i Rossell fe2f7eae17 Making the stage1 work on mips too (for the name of the dynamic loader) 
svn path=/nixos/trunk/; revision=23325
 2010-08-21 18:23:55 +00:00
Yury G. Kudryashov a7d7f1630f Will move digikam outside of kde4 in kde4.5, so change example 
svn path=/nixos/trunk/; revision=23266
 2010-08-19 23:07:14 +00:00
Eelco Dolstra 4c8fb8d4b2 * The "atd" job tends to fail randomly on startup for unknown 
reasons.  Doing "atd -f" seems to work better.

svn path=/nixos/trunk/; revision=23251
 2010-08-19 14:50:48 +00:00
Eelco Dolstra c55f496c52 * The ALSA job shouldn't be started until udevtrigger has finished. 
Otherwise the sound card drivers may not have been loaded yet, and
  restoring the mixer settings will fail.  Also, since the ALSA job
  itself will fail, it won't save the mixer settings on shutdown.

svn path=/nixos/trunk/; revision=23245
 2010-08-19 11:55:52 +00:00
Rob Vermaas e87a298c33 qemu virtualiztion: do not pass username on guest cifs mount, use sec=none in stead 
svn path=/nixos/trunk/; revision=23243
 2010-08-19 08:32:31 +00:00
Eelco Dolstra 1fcefe39a1 * Add share/emacs to the paths to symlink. 
svn path=/nixos/trunk/; revision=23184
 2010-08-16 08:00:18 +00:00
Eelco Dolstra 751ec4f845 * Xfce requires desktop-file-utils to create/update .desktop files. 
svn path=/nixos/trunk/; revision=23183
 2010-08-16 07:48:06 +00:00
Michael Raskin 295df77f21 Move resume section after udev launch - on some systems devices are recognized by kernel only after udev works. 
svn path=/nixos/trunk/; revision=23176
 2010-08-14 20:12:05 +00:00
Yury G. Kudryashov f0eb823a34 Add unix_chkpwd suid wrapper 
svn path=/nixos/trunk/; revision=23165
 2010-08-13 14:07:34 +00:00
Eelco Dolstra cfb465c7a5 svn path=/nixos/trunk/; revision=23115 2010-08-11 15:10:17 +00:00
Eelco Dolstra 2ec105cc85 * Separate building of the NixOS manual and manpages. Usually we only 
need the manpages, and the manual takes much longer to build.

svn path=/nixos/trunk/; revision=23112
 2010-08-11 12:28:53 +00:00
Eelco Dolstra 2e0a569187 * Use InputClass in the synaptics module to automatically use the 
synaptics driver for all touchpads (unless the "dev" option is set).
* Get rid of some synaptics options: SHMConfig, Repeater (obsolete);
  *Edge (usually auto-detected), Protocol (use auto-detect instead).

svn path=/nixos/trunk/; revision=23092
 2010-08-10 14:13:57 +00:00
Eelco Dolstra 5456815016 * Re-enable ctrl-alt-backspace to kill the X server. 
svn path=/nixos/trunk/; revision=23089
 2010-08-10 12:37:39 +00:00
Eelco Dolstra 313629adcf * Add ext4 to the default initrd. 
svn path=/nixos/trunk/; revision=23088
 2010-08-10 10:12:18 +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 cddc67a653 * Try to load the p4_clockmod kernel module, which provides 
CPU frequency scaling on some Intel CPUs.

svn path=/nixos/trunk/; revision=23082
 2010-08-10 01:00:09 +00:00
Eelco Dolstra 163a54886c * Include fontconfig in the system path (for fc-list, fc-match etc.). 
svn path=/nixos/trunk/; revision=23080
 2010-08-10 00:03:36 +00:00
Eelco Dolstra 8de6ab7dff * Enable the Xfce power manager. 
svn path=/nixos/trunk/; revision=23079
 2010-08-09 23:15:39 +00:00
Eelco Dolstra c388446bb0 * Xfce is now more or less functional. 
svn path=/nixos/trunk/; revision=23075
 2010-08-09 21:59:34 +00:00
Eelco Dolstra 31db968be4 * In QEMU, set a higher refresh rate in xorg.conf so that resolutions 
higher than 800x600 work.
* Add a "Monitor" statement to the "Screen" section, because otherwise
  the Monitor section is ignored.

svn path=/nixos/trunk/; revision=23068
 2010-08-09 20:10:16 +00:00
Eelco Dolstra 057602f3f2 * Some subdirectories should always be symlinked in the system path 
when X11 is enabled (e.g. etc/xdg, share/icons...).

svn path=/nixos/trunk/; revision=23062
 2010-08-09 18:04:55 +00:00
Eelco Dolstra f6497fa576 * Use the proper Xfce session start script. Include the desktop and 
the panel.

svn path=/nixos/trunk/; revision=23055
 2010-08-09 11:51:44 +00:00
Eelco Dolstra fc8204c0e4 * Always symlink etc/dbus-1 and share/dbus-1 in the system path, not 
just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
 2010-08-09 11:42:32 +00:00
Eelco Dolstra e41e6a65bb * Make sure that /tmp/.ICE-unix is owned by root and has 1777 
permissions.  Otherwise it ends up being owned by the first user to
  log in, and other users' iceauth calls fail.

svn path=/nixos/trunk/; revision=23052
 2010-08-09 10:59:20 +00:00
Eelco Dolstra 5041cdddbd * Start of an Xfce desktop manager module. Currently it just starts 
Xfwm and Terminal.

svn path=/nixos/trunk/; revision=23048
 2010-08-08 22:45:54 +00:00
Eelco Dolstra 6e118cd66b * Change the default desktop manager from "xterm" to the last imported 
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
  "xterm" if nothing is explicitly enabled).  This means that you
  don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.
  
* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
 2010-08-08 14:05:32 +00:00
Eelco Dolstra 87dcdc05fe * Fix example. 
svn path=/nixos/trunk/; revision=23035
 2010-08-08 13:57:21 +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 622a7d3d46 * If kdm is enabled, disabled slim automatically. This is so that 
users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
 2010-08-08 12:39:00 +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
Michael Raskin 3cab6d3e1c Fixing extra /bin/sh in the shell - noticed by Eelco Dolstra 
svn path=/nixos/trunk/; revision=23021
 2010-08-07 11:16:06 +00:00
Michael Raskin dec8079468 Fix stdenv reference 
svn path=/nixos/trunk/; revision=23020
 2010-08-07 10:26:37 +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 ea49707f85 * Run CUPS' external programs in the "lp" group so that they can 
access printer devices in /dev.  Also use a "cups" user instead of
  "nobody".

svn path=/nixos/trunk/; revision=23003
 2010-08-06 14:52:09 +00:00
David Guibert 6c8c1f935a nixos: authenticate through kerberos 
config.krb5.enable needs to be set as true.
Also use pam_ccreds to cache Kerberos credentials for offline logins.

svn path=/nixos/trunk/; revision=22986
 2010-08-06 08:50:48 +00:00
David Guibert 6436ed1de4 nixos: kerberos services for the server. 
svn path=/nixos/trunk/; revision=22985
 2010-08-06 08:49:08 +00:00
Eelco Dolstra 793767870a * Disable writing dhclient debug info to /tmp/dhcp-exit. 
svn path=/nixos/trunk/; revision=22962
 2010-08-05 13:32:58 +00:00
Michael Raskin 255a56fbc5 allow wildcard Synaptics configuration 
svn path=/nixos/trunk/; revision=22954
 2010-08-04 20:07:58 +00:00
Eelco Dolstra e3c2a1f49e * Fix the dump feature. 
svn path=/nixos/trunk/; revision=22950
 2010-08-04 14:05:14 +00:00
Sander van der Burg 9a94e561a5 The DocumentRoot directory is now automatically created if it does not exists. This will prevent the service from working if a user forgets to create the DocumentRoot directory himself and this also makes automated testing easier. 
svn path=/nixos/trunk/; revision=22929
 2010-08-03 13:48:08 +00:00
Lluís Batlle i Rossell 02bf0db39e Making the X keyboard settings go in xorg.conf, and not in HAL anymore. 
Setting to the synaptics default speeds the speeds I like. I think we were having
defaults still from the time the values meant some different speeds.

The 'synclient' program now does not work, but the 'xinput' program (xorg.xinput)
can modify in runtime the touchpad settings too.


svn path=/nixos/trunk/; revision=22904
 2010-08-02 19:06:42 +00:00
Eelco Dolstra 25fd35862a * Add /nix/var/nix/profiles/default and config.system.path to the list 
of DBus configuration directories.  Thus packages with DBus
  configuration files installed in the default profile will be found
  automatically.  (It would be nice to include $HOME/.nix-profile in
  the session bus search path, but I don't think that's possible.)

svn path=/nixos/trunk/; revision=22737
 2010-07-26 14:10:04 +00:00
Eelco Dolstra c52cbca24d * Set $TZ in the X server job (mostly so that the kdm clock shows the 
right time).

svn path=/nixos/trunk/; revision=22728
 2010-07-25 09:52:20 +00:00
Evgeny Egorochkin 2e9851cec2 Fix udev startup issue in OpenVZ guest environment 
svn path=/nixos/trunk/; revision=22725
 2010-07-24 22:05:27 +00:00
Eelco Dolstra 82be7d8d65 * `pam_console' maintains the set of locally logged in users in 
/var/run/console.  This is obsolete, but D-Bus still uses it for its
  `at_console' feature.  So maintain it using a ConsoleKit session
  script.  Borrowed from
  http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-auth/consolekit/files/pam-foreground-compat.ck

svn path=/nixos/trunk/; revision=22720
 2010-07-23 14:23:08 +00:00
Eelco Dolstra 21e62884e7 * switch-to-configuration.sh: Signal dbus to reload its configuration. 
svn path=/nixos/trunk/; revision=22718
 2010-07-23 10:52:51 +00:00
Evgeny Egorochkin 88a400f578 Fix LVM failing test due to /proc/devices not being available in some of OpenVZ containers 
svn path=/nixos/trunk/; revision=22717
 2010-07-22 22:45:24 +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 e7c0c929ed * Work around a bug in QEMU, which doesn't implement the "READ DISC 
INFORMATION" SCSI command:

    https://bugzilla.redhat.com/show_bug.cgi?id=609049

  As a result, `cdrom_id' doesn't print
  ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
  /dev/disk/by-label symlinks from being created.  We need these in
  the NixOS installation CD, so use ID_CDROM_MEDIA in the
  corresponding udev rules for now.  This was the behaviour in udev <=
  154.  See also
       
    http://www.spinics.net/lists/hotplug/msg03935.html

svn path=/nixos/trunk/; revision=22691
 2010-07-21 21:15:54 +00:00
Eelco Dolstra d7f638da0c * Amazon now supports booting a custom kernel in the AMI using 
pv-grub, so supply a GRUB menu that starts our own kernel and
  initrd.

svn path=/nixos/trunk/; revision=22678
 2010-07-20 13:53:14 +00:00
Eelco Dolstra 1b04d3a813 * Absolutise $systemConfig in case it's a symlink. 
svn path=/nixos/trunk/; revision=22677
 2010-07-20 13:50:10 +00:00
Eelco Dolstra 63962dd7d6 * Disable the test to see whether $stage2Init exists. For some 
unfathomable reason this test fails on EC2 if it's a symlink
  (despite the -L test).  I give up.

svn path=/nixos/trunk/; revision=22676
 2010-07-20 13:49:04 +00:00
Eelco Dolstra 1a5c18d1b6 svn path=/nixos/trunk/; revision=22647 2010-07-18 22:29:40 +00:00
Eelco Dolstra b14f80c89a * The modprobe wrapper nowadays checks whether the version of the 
current kernel module tree matches the booted kernel, so it should
  be safe to use after an upgrade.

svn path=/nixos/trunk/; revision=22627
 2010-07-18 20:19:27 +00:00
Eelco Dolstra b835f7f0dd * Fix PostgreSQL boot. 
svn path=/nixos/trunk/; revision=22615
 2010-07-15 21:21:16 +00:00
Eelco Dolstra f3e1607758 * Don't run the emergency-shell task after nixos-rebuild because it 
screws up the X server (CPU usage goes to 100%, switching virtual
  consoles no longer works, etc.).  TODO: we need some generic way to
  mark jobs that shouldn't be started automatically.

svn path=/nixos/trunk/; revision=22608
 2010-07-15 12:31:18 +00:00
Eelco Dolstra b614179eed * Install a configuration.nix in the AMI. 
svn path=/nixos/trunk/; revision=22607
 2010-07-15 11:09:30 +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 f0b647c326 * Allow the Apache submodules to declare whether they need PHP. 
Don't depend on PHP unless this is the case.

svn path=/nixos/trunk/; revision=22600
 2010-07-14 12:58:38 +00:00
Eelco Dolstra bfe46a653b * Mount /dev, /proc and /sys when booting without a stage 1 (e.g. on 
Amazon).

svn path=/nixos/trunk/; revision=22598
 2010-07-14 10:55:45 +00:00
Eelco Dolstra fb97b5b122 * MediaWiki 1.15.4. 
svn path=/nixos/trunk/; revision=22589
 2010-07-13 21:11:35 +00:00
Eelco Dolstra 4b018d1294 svn path=/nixos/trunk/; revision=22587 2010-07-13 20:47:31 +00:00
Wouter den Breejen e058f7ea45 sabnzbd now really starts at boot 
svn path=/nixos/trunk/; revision=22579
 2010-07-13 14:45:44 +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 2b7ac80b3d * Style changes. 
svn path=/nixos/trunk/; revision=22573
 2010-07-13 09:23:35 +00:00
Eelco Dolstra 44656be396 * dbus-daemon: use /etc/dbus-1/system.conf (i.e. ‘--system’) rather than 
${configDir}/system.conf.  This is necessary to enable dbus to
  reload its configuration on SIGHUP after a nixos-rebuild.  (The
  daemon cannot be restarted because then console-kit-daemon loses its
  state.)
* Generate a proper /etc/dbus-1/session.conf.

svn path=/nixos/trunk/; revision=22572
 2010-07-13 09:22:52 +00:00
Eelco Dolstra 86d53a5b8b * Load the cpufreq modules, since these are not loaded automatically 
by udev.  The kernel can load governors on demand, but if they are
  not loaded, HAL doesn't know about them and they don't show up in
  the KDE System Settings.

svn path=/nixos/trunk/; revision=22567
 2010-07-12 17:50:02 +00:00
Eelco Dolstra dc0db647a9 * Remove a debug line that should not have been committed. 
svn path=/nixos/trunk/; revision=22566
 2010-07-12 16:40:02 +00:00
Eelco Dolstra 158c3daec1 * Don't do the "poweroff -f" fallback because that prevents 
interactive testing ("nix-build tests/ -A nfs.vms;
  ./result/bin/run-vms").

svn path=/nixos/trunk/; revision=22565
 2010-07-12 16:09:02 +00:00
Eelco Dolstra 14ddf8e096 * On an `ip-up' event, notify mountall so that it retries mounting 
remote filesystems.

svn path=/nixos/trunk/; revision=22564
 2010-07-12 16:07:26 +00:00
Eelco Dolstra c50948309d * Add a missing dependency. 
svn path=/nixos/trunk/; revision=22563
 2010-07-12 15:32:23 +00:00
Eelco Dolstra 9600035e02 * Don't use "starting" events because they basically don't work - they 
cause restarting of jobs to hang indefinitely because the required
  "start on" condition never triggers.

  For instance, after "stop nfs-kernel-nfsd", "start nfs-kernel-nfsd"
  will hang until we do "stop portmap; start portmap".  This is due to
  the "starting nfs-kernel-nfsd and started portmap" condition in
  the nfs-kernel-mountd job.  Apparently, because portmap is already
  running, the condition "started portmap" never happens because no
  event is emitted.

svn path=/nixos/trunk/; revision=22562
 2010-07-12 15:14:26 +00:00
Eelco Dolstra ae539b7790 * Oops. 
svn path=/nixos/trunk/; revision=22561
 2010-07-12 13:42:59 +00:00
Eelco Dolstra aa3230979b * Set the priorities right. 
svn path=/nixos/trunk/; revision=22560
 2010-07-12 13:41:22 +00:00
Eelco Dolstra b51e309c89 * `sm-notify' should also run on the server 
(http://hydra.nixos.org/build/483567).  I love regression tests.

svn path=/nixos/trunk/; revision=22559
 2010-07-12 13:03:27 +00:00
Evgeny Egorochkin a86b1bd43d Improved the TOR service to be able to act as a TOR relay and disable the client functionality. Doesn't change the behavior of the existing TOR configurations. 
svn path=/nixos/trunk/; revision=22554
 2010-07-12 06:03:52 +00:00
Eelco Dolstra abbc2f4f2b * Make acpid depend on syslogd (to prevent it printing startup 
messages to the console).

svn path=/nixos/trunk/; revision=22545
 2010-07-09 12:35:06 +00:00
Eelco Dolstra 54a4eead20 * Typos. 
svn path=/nixos/trunk/; revision=22537
 2010-07-08 16:21:55 +00:00
Eelco Dolstra 5c0f6619cf * Idem. 
svn path=/nixos/trunk/; revision=22535
 2010-07-08 15:54:10 +00:00
Eelco Dolstra 7123115d6f * Call update-mime-database. 
svn path=/nixos/trunk/; revision=22528
 2010-07-08 12:55:18 +00:00
Eelco Dolstra b076121430 * Don't use the -v flag because not every fsck backend knows it. 
svn path=/nixos/trunk/; revision=22512
 2010-07-07 14:25:16 +00:00
Eelco Dolstra 6856c60ba3 * There is no "samba-control" job. 
svn path=/nixos/trunk/; revision=22509
 2010-07-07 12:32:56 +00:00
Eelco Dolstra 9ac60a3aa3 * Merge the ‘nfs-kernel-sm-notify’ task into the post-start script of 
the ‘nfs-kernel-statd’ task.
* Work around an apparent bug in Upstart: the ‘mountall’ task cannot
  be restarted because of the ‘starting mountall’ condition in the
  statd task.  So instead make ‘mountall’ depend on ‘started
  nfs-kernel-statd’.

svn path=/nixos/trunk/; revision=22508
 2010-07-07 12:11:29 +00:00
Eelco Dolstra d0342b4cf5 * The network-interfaces' task should wait until udevtrigger' has 
finished, because it loads the kernel modules for the network
  devices.

svn path=/nixos/trunk/; revision=22492
 2010-07-06 11:03:23 +00:00
Eelco Dolstra bb2d97770e * Move the swap module to config/ because it doesn't provide a task 
anymore.  Activating swap devices is now handled by the mountall
  task.

svn path=/nixos/branches/boot-order/; revision=22489
 2010-07-06 09:01:15 +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
Eelco Dolstra da0d5c5645 * Use config.system.build.grub rather than pkgs.grub to get the right 
GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
 2010-07-05 14:33:11 +00:00
Eelco Dolstra 4225181fa1 * Ensure that the ‘mount-failed’ and ‘emergency-shell’ tasks don't get 
started by ‘switch-to-configuration.sh’.

svn path=/nixos/branches/boot-order/; revision=22473
 2010-07-05 09:28:22 +00:00
Wouter den Breejen 2335cb65a3 Added sabnzbd :) 
SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.

http://sabnzbd.org/

svn path=/nixos/trunk/; revision=22446
 2010-07-03 15:10:48 +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
Evgeny Egorochkin ebd9fb6cf3 Added Quassel IRC client service 
svn path=/nixos/trunk/; revision=22425
 2010-06-28 18:36:37 +00:00
Marc Weber 0dd9b4caaf reverting -r22286 
svn path=/nixos/trunk/; revision=22358
 2010-06-21 14:17:19 +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 061ea1674f * Increase the CIFS timeout here as well. 
svn path=/nixos/branches/boot-order/; revision=22348
 2010-06-20 20:52:42 +00:00
Eelco Dolstra 593a110c47 * Make sure that kernel log messages appear in the VM output. The 
comment was incorrect - when klogd is running, kernel messages no
  longer appear on the serial port.

svn path=/nixos/branches/boot-order/; revision=22346
 2010-06-20 19:22:23 +00:00
Eelco Dolstra 20a88efffa * Fix networking in the installer test. 
* If connecting to the host fails in the guest, then shutdown
  immediately.

svn path=/nixos/branches/boot-order/; revision=22341
 2010-06-20 15:33:44 +00:00
Eelco Dolstra 363806e89b * To establish the connection to the root shell in the guest, let the 
guest connect to a Unix domain socket on the host rather than the
  other way around.  The former is a QEMU feature (guestfwd to a
  socket) while the latter requires a patch (which we can now get rid
  of).

svn path=/nixos/branches/boot-order/; revision=22331
 2010-06-18 19:31:02 +00:00
Eelco Dolstra 200a8b9a56 * Change the priority to make the NAT and Bittorrent tests work. 
svn path=/nixos/branches/boot-order/; revision=22329
 2010-06-18 18:53:13 +00:00
Eelco Dolstra ac22e5369f * Prevent tests from accessing the host's network accidentally. For 
instance, `nixos-rebuild' in the installer test does a `nix-pull'
  from nixos.org.

svn path=/nixos/branches/boot-order/; revision=22325
 2010-06-18 13:21:01 +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
Eelco Dolstra 69c7175404 * During shutdown, don't unmount mount points that don't exist (in the 
current namespace).  This prevents warnings about the aufs/tmpfs
  mounts from the initrd used by the installation CD.

svn path=/nixos/branches/boot-order/; revision=22299
 2010-06-16 22:16:43 +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
Marc Weber d0fd8da8f0 example how to pass options to nix-daemon 
svn path=/nixos/trunk/; revision=22286
 2010-06-15 19:04:06 +00:00
Eelco Dolstra 46ac1375a7 * Don't use -smb and -no-kvm-irqchip. Maybe this makes VM builds more 
reliable.

svn path=/nixos/branches/boot-order/; revision=22280
 2010-06-15 16:15:17 +00:00
Eelco Dolstra e2dbfbdcf4 * Use writeback caching for virtual disks instead of writethrough 
caching.  This makes a huge performance difference (e.g. from 4 MB/s
  `dd' throughput to 140 MB/s on the Hydra machines).  As the QEMU
  manual says: "Some block drivers perform badly with
  ‘cache=writethrough’, most notably, qcow2."

svn path=/nixos/branches/boot-order/; revision=22248
 2010-06-13 23:36:55 +00:00
Eelco Dolstra 03f77ca82b * PostgreSQL / MySQL: depend on the "filesystem" event. 
svn path=/nixos/branches/boot-order/; revision=22247
 2010-06-13 20:59:49 +00:00
Lluís Batlle i Rossell b1b73f3c08 Noting the booted-system as a gcroot 
svn path=/nixos/trunk/; revision=22228
 2010-06-12 08:44:51 +00:00
Lluís Batlle i Rossell b25771532a Fixing the postfix start/stop (through an upstart job script code that will 
monitor the life of postfix)

Adding an assert to upstart jobs, so those with preStop will always need an exec or
script, otherwise the preStop will not be run.


svn path=/nixos/trunk/; revision=22225
 2010-06-11 21:44:06 +00:00
Eelco Dolstra a5c433696c * Put all of /var/run (not just /var/run/nscd) on a tmpfs to simplify 
shutdown.  (Portmap and statd are needed during shutdown to unmount
  NFS volumes but have open files in /var/run.)
* In the shutdown job, don't kill PIDs belonging to Upstart jobs that
  are still running.  If they don't stop on the "starting shutdown"
  event, then they're needed during shutdown (such as portmap and
  statd).
* NFS test: test whether the shutdown quickly unmounts NFS volumes
  (i.e. whether portmap and statd are still running).

svn path=/nixos/branches/boot-order/; revision=22204
 2010-06-09 22:29:06 +00:00
Eelco Dolstra 94088e9b48 * Daemonise mountd/statd. 
svn path=/nixos/branches/boot-order/; revision=22198
 2010-06-09 13:45:51 +00:00
Eelco Dolstra 645ed8d3b4 * Start NFS daemons in the right order as described in the nfs-utils 
README (i.e. for the server: exportfs, mountd, statd, nfsd,
  sm-notify; for the client: statd / sm-notify before mountall).  This
  is important to allow locking to work correctly.

svn path=/nixos/branches/boot-order/; revision=22196
 2010-06-09 13:18:01 +00:00
Eelco Dolstra 156ba2def2 * Don't use the "kvm-clock" clock source because it's unreliable. 
When starting multiple VMs, some will have perfectly synchronised
  clocks, while others will have their clocks run much slower (say, a
  factor of 5).

svn path=/nixos/branches/boot-order/; revision=22195
 2010-06-09 13:15:15 +00:00
Eelco Dolstra d837ae4914 * portmap: don't use the -f flag to ensure that when the job reaches 
the "started" state, portmap is actually up.

svn path=/nixos/branches/boot-order/; revision=22192
 2010-06-09 11:15:25 +00:00
Eelco Dolstra c1ecdf708f * Put the hostname of the VM in the window title. 
svn path=/nixos/branches/boot-order/; revision=22191
 2010-06-09 10:51:05 +00:00
Eelco Dolstra 5ddaf9b963 * Set `services.nfsKernel.client.enable' automatically if there is a 
filesystem with type "nfs" or "nfs4".

svn path=/nixos/branches/boot-order/; revision=22189
 2010-06-08 16:14:41 +00:00
Eelco Dolstra a9e8bf6491 * nfsd: run rpc.nfsd from the pre-start script since it's not actually 
a daemon (it just starts some kernel threads).  In the post-stop
  script, stop the kernel threads.
* exportfs: fix the createMountPoints option.
* Mount the nfsd filesystem on /proc/fs/nfsd because mountd prefers
  this.

svn path=/nixos/branches/boot-order/; revision=22187
 2010-06-08 16:01:31 +00:00
Eelco Dolstra 3eac003800 * Maintain /var/log/wtmp correctly during boot/shutdown. 
svn path=/nixos/branches/boot-order/; revision=22182
 2010-06-08 12:48:16 +00:00
Eelco Dolstra 7c3ae9e716 * During shutdown, warn explicitly about filesystems that could not be 
unmounted or remounted read-only.
* Don't try to unmount / or /nix/store.

svn path=/nixos/branches/boot-order/; revision=22181
 2010-06-08 11:52:16 +00:00
Eelco Dolstra 23cc979f61 * Run `swapoff -a' during shutdown. Otherwise filesystems containing 
swapfiles cannot be unmounted or even remounted read-only.
* In the remount, pass `-t none' to get a more informative error
  message if the filesystem is in use.

svn path=/nixos/branches/boot-order/; revision=22179
 2010-06-08 10:06:00 +00:00
Lluís Batlle i Rossell dadd6d63e7 oops. Fixing the cupsd path. How to set a single path there in the job? I don't know. 
svn path=/nixos/trunk/; revision=22174
 2010-06-07 21:44:06 +00:00
Lluís Batlle i Rossell 9e275ffa58 Trying to improve the cups expression a bit, so it can print also with local usb printers. 
(Thank you Oleksandr)


svn path=/nixos/trunk/; revision=22173
 2010-06-07 21:09:27 +00:00
Eelco Dolstra 48fdc931a4 * Run udevtrigger in a separate job. This speeds up booting because 
it allows the `mountall' task to start mounting filesystems as soon
  as udev is running and devices become available (i.e. it doesn't
  have to wait for all devices).  This means that some jobs should
  depend on "stopped udevtrigger" instead of "started udev".

svn path=/nixos/branches/boot-order/; revision=22167
 2010-06-07 12:39:50 +00:00
Eelco Dolstra 085a47c88a * Bind mounts should have filesystem type "none" to prevent an 
invocation of "fsck.auto" at boot time.

svn path=/nixos/branches/boot-order/; revision=22166
 2010-06-07 12:16:59 +00:00
Eelco Dolstra 6290788247 * If mountall fails to mount all filesystems, start an emergency shell 
to allow the user to fix or ignore the problem.

svn path=/nixos/branches/boot-order/; revision=22165
 2010-06-07 12:15:55 +00:00
Eelco Dolstra 5702557a65 * Put e2fsprogs etc. in mountall's $PATH so that fsck works. 
svn path=/nixos/branches/boot-order/; revision=22151
 2010-06-04 15:35:32 +00:00
Eelco Dolstra dbadf6e9c2 * Use mountall to mount all filesystems and activate all swap devices 
during boot.  Mountall ensures that these are done in the right
  order.  It's informed by udev about devices becoming available.  It
  emits some Upstart events upon reaching certain states, in
  particular ‘local-filesystems’ after all local filesystems have been
  mounted successfully, ‘remote-filesystems’ after all network
  filesystems have been mounted, and ‘filesystem’ (sic) when all
  filesystems have been mounted.

  Currently, if a filesystem fails to mount or doesn't exist, then the
  mingettys won't start and the boot will appear to hang.  This is
  because mountall doesn't emit an event for failing filesystems and
  waits indefinitely for the filesystems to become available.

* The ‘filesystems’ and ‘swap’ Upstart jobs are gone.  (Support for
  encrypted swap devices is temporarily gone.)
  
* Generate a proper /etc/fstab from the ‘fileSystems’ and
  ‘swapDevices’ options.

svn path=/nixos/branches/boot-order/; revision=22148
 2010-06-04 14:22:11 +00:00
Eelco Dolstra 5316059442 * Revert an unintended commit. 
svn path=/nixos/trunk/; revision=22145
 2010-06-04 14:00:56 +00:00
Eelco Dolstra 7f41d2bb86 svn path=/nixos/trunk/; revision=22126 2010-06-03 14:32:23 +00:00
Eelco Dolstra 6676bbe61d svn path=/nixos/trunk/; revision=22111 2010-06-02 23:02:09 +00:00
Eelco Dolstra 0cdce12006 * Rename the pwdutils' module to shadow'. 
svn path=/nixos/trunk/; revision=22109
 2010-06-02 21:16:27 +00:00
Eelco Dolstra c089738bdc * Use the shadow' package instead of pwdutils', `pam_login' and 
`su'.
* The `usermod' from `shadow' allows setting a supplementary group
  equal to the user's primary group, so the special hack for the
  `nixbld' group is no longer needed.
* Removed /etc/default/passwd since it's not used by the new passwd.
  The hash is configured in pam_unix.
* Move some values for `security.setuidPrograms' and
  `security.pam.services' to the appropriate modules.

svn path=/nixos/trunk/; revision=22107
 2010-06-02 21:10:48 +00:00
Eelco Dolstra 876954d15d * Use pam_unix (from the PAM package) instead of pam_unix2. All the 
functionality we needed from pam_unix2 (more secure hashes, and,
  uh...) has been merged into pam_unix.

svn path=/nixos/trunk/; revision=22106
 2010-06-02 19:59:44 +00:00
Eelco Dolstra 8b308272df * We don't use pam_console anymore. 
svn path=/nixos/trunk/; revision=22104
 2010-06-02 17:11:20 +00:00
Eelco Dolstra d67e6e6285 * Remove some `stopOn = "ip-down"' declarations since they probably 
don't do the right thing (e.g. they don't distinguish between
  network interfaces).

svn path=/nixos/trunk/; revision=22102
 2010-06-02 16:19:48 +00:00
Eelco Dolstra d317d83ba8 * Remove `stopOn = "shutdown"' which doesn't work. 
svn path=/nixos/trunk/; revision=22101
 2010-06-02 16:05:09 +00:00
Eelco Dolstra 8519e72ccc * Don't stop tty-backgrounds during shutdown. 
svn path=/nixos/trunk/; revision=22100
 2010-06-02 16:04:30 +00:00
Eelco Dolstra ad93acc295 * Make all Upstart jobs shut down on the `starting shutdown' event. 
This ensures that they're gone by the time the shutdown job runs, so
  it doesn't have to stop them itself.
* Don't respawn tasks, as it doesn't seem useful (if they fail they're
  likely to fail again if they're restarted).

svn path=/nixos/trunk/; revision=22099
 2010-06-02 16:04:08 +00:00
Eelco Dolstra b135e38bea * atd's postStop action should be unnecessary. 
svn path=/nixos/trunk/; revision=22095
 2010-06-01 20:42:33 +00:00
Eelco Dolstra 94b2268192 * Start "exec" jobs using the "script" stanza to allow redirects in 
the job's "exec" to work properly.

svn path=/nixos/trunk/; revision=22094
 2010-06-01 20:41:59 +00:00
Eelco Dolstra 95a9c5dd77 * Log the standard output/error of Upstart jobs to 
/var/log/upstart/<jobname> rather than spamming the console with it.

svn path=/nixos/trunk/; revision=22093
 2010-06-01 19:44:23 +00:00
Eelco Dolstra e450e4551f * tty-backgrounds: don't do a setcfg action on the console if the 
current theme is the same.  This prevents the console from being
  blanked during boot.

svn path=/nixos/trunk/; revision=22092
 2010-06-01 18:30:17 +00:00
Eelco Dolstra 18fd0a61de * Add `sleep' to the initrd. 
svn path=/nixos/trunk/; revision=22089
 2010-06-01 17:09:34 +00:00
Eelco Dolstra 9c900ee15c * Updates for the dynamically linked splash helper. 
svn path=/nixos/trunk/; revision=22087
 2010-06-01 16:38:42 +00:00
Eelco Dolstra dc49a0ce3f * Don't use klibc in the initrd. It's simpler (and slightly smaller) 
to use the standard (coreutils) tools.
* Use util-linux's `switch_root' to switch over to the target root
  FS.  It automatically moves over the /dev, /proc and /sys from stage
  1, so stage 2 doesn't need to set them up again.

svn path=/nixos/trunk/; revision=22085
 2010-06-01 15:53:24 +00:00
Eelco Dolstra eb4c33eeca * Added an option to enable support for 32-bit binaries (such as Wine 
or Google Earth) on 64-bit NixOS on NVIDIA hardware.  The 32-bit
  OpenGL library is symlinked from /var/run/opengl-driver-32, which is
  added to the LD_LIBRARY_PATH so that 32-bit binaries can find it.

svn path=/nixos/trunk/; revision=22062
 2010-05-30 22:00:52 +00:00
Eelco Dolstra 540c673364 * Enable the `chfn' program. Note that by default non-root users are 
still not permitted to change their account information, as
  specified in login.defs.

svn path=/nixos/trunk/; revision=22049
 2010-05-28 14:59:34 +00:00
Eelco Dolstra 7d9644f725 svn path=/nixos/trunk/; revision=22045 2010-05-28 11:24:41 +00:00
Eelco Dolstra eade772338 * Don't show the contents of linuxPackages in the manual. 
svn path=/nixos/trunk/; revision=22044
 2010-05-28 11:21:40 +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 32d41f439d Remove KDE3 desktop 
We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed.

svn path=/nixos/trunk/; revision=21996
 2010-05-27 09:35:36 +00:00
Eelco Dolstra fa183e5472 * Expose networking.interfaces as an attribute set keyed on the 
interface name through the derived option networking.ifaces.  This
  makes it easier to get information about specific interfaces
  (e.g. `nodes.router.config.networking.ifaces.eth2.ipAddress').
  Really networking.interfaces should be an attribute set.

svn path=/nixos/trunk/; revision=21938
 2010-05-21 14:12:03 +00:00
Eelco Dolstra 4dac9e5814 * Allow more complex network topologies in distributed tests. Each 
machine can now declare an option `virtualisation.vlans' that causes
  it to have network interfaces connected to each listed virtual
  network.  For instance,

    virtualisation.vlans = [ 1 2 ];

  causes the machine to have two interfaces (in addition to eth0, used
  by the test driver to control the machine): eth1 connected to
  network 1 with IP address 192.168.1.<i>, and eth2 connected to
  network 2 with address 192.168.2.<i> (where <i> is the index of the
  machine in the `nodes' attribute set).  On the other hand,
  
    virtualisation.vlans = [ 2 ];

  causes the machine to only have an eth1 connected to network 2 with
  address 192.168.2.<i>.  So each virtual network <n> is assigned the
  IP range 192.168.<n>.0/24.

  Each virtual network is implemented using a separate multicast
  address on the host, so guests really cannot talk to networks to
  which they are not connected.

* Added a simple NAT test to demonstrate this.

* Added an option `virtualisation.qemu.options' to specify QEMU
  command-line options.  Used to factor out some commonality between
  the test driver script and the interactive test script.

svn path=/nixos/trunk/; revision=21928
 2010-05-20 21:07:32 +00:00
Eelco Dolstra ad8ed39285 * It should not be necessary to run ntpd in the guest. 
svn path=/nixos/trunk/; revision=21925
 2010-05-20 14:51:46 +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
Yury G. Kudryashov 12e43068cf More verbose udev log 
svn path=/nixos/trunk/; revision=21881
 2010-05-19 19:15:49 +00:00
Marc Weber 674d396576 adding initial support for proprietary ati drivers You have to add some impure paths, see: http://thread.gmane.org/gmane.linux.distributions.nixos/4145 
svn path=/nixos/trunk/; revision=21847
 2010-05-18 19:36:11 +00:00
Lluís Batlle i Rossell 7d6db6ac0c Fixing the pcscd job (daemonType) 
svn path=/nixos/trunk/; revision=21845
 2010-05-18 17:57:03 +00:00
Yury G. Kudryashov a0b97de260 Use polkit-agent-helper-1 from libexec/polkit-1 
svn path=/nixos/trunk/; revision=21844
 2010-05-18 16:46:32 +00:00
Eelco Dolstra 1133f664bd * Fix https printing (the symlink to ipp was broken). 
svn path=/nixos/trunk/; revision=21841
 2010-05-18 15:19:52 +00:00
Lluís Batlle i Rossell ee8ba3bb79 Updating bashrc, so it does not leave in PATH (and other environment variables) a void element, which 
the linux kernel would take as '.'.
This fixes the bug of linux looking into '.' for executables.


svn path=/nixos/trunk/; revision=21818
 2010-05-17 14:15:18 +00:00
Lluís Batlle i Rossell f13cf2cee0 Adding example for the fonts.extraFonts 
(thanks roconnor)


svn path=/nixos/trunk/; revision=21817
 2010-05-17 14:09:22 +00:00
Lluís Batlle i Rossell b15e575961 Renaming the tor services lowercase. 
svn path=/nixos/trunk/; revision=21810
 2010-05-16 22:22:34 +00:00
Eelco Dolstra 7484774172 * Activate software RAID devices from udev. This makes the swraid 
Upstart jobs unnecessary.
* Support having the root filesystem on swraid.

svn path=/nixos/trunk/; revision=21807
 2010-05-16 20:40:04 +00:00
Eelco Dolstra edee370883 * The default action for udevadm trigger' changed from add' to 
`change'.  At boot time, however, we want an `add' event to trigger
  certain rules (e.g. LVM and mdadm).

svn path=/nixos/trunk/; revision=21804
 2010-05-16 19:02:45 +00:00
Nicolas Pierron 1f2db38e9a Fix swraid for config which do not have any raid devices. 
svn path=/nixos/trunk/; revision=21800
 2010-05-16 16:36:01 +00:00
Nicolas Pierron 49dcb07bd9 Fix bad substitution of mdadm program name. 
svn path=/nixos/trunk/; revision=21799
 2010-05-16 16:35:51 +00:00
Lluís Batlle i Rossell a862661835 Adding the Tor service 
(patch by roconnor)


svn path=/nixos/trunk/; revision=21795
 2010-05-16 16:20:00 +00:00
Eelco Dolstra 8989d7a3d5 * Udev no longer likes the "%k" name in the kqemu rule, so remove it. 
svn path=/nixos/trunk/; revision=21794
 2010-05-16 09:39:41 +00:00
Yury G. Kudryashov 7836f89242 stage-1.nix: copy libudev.so, verbose log 
svn path=/nixos/trunk/; revision=21793
 2010-05-15 21:28:31 +00:00
Yury G. Kudryashov 7ae39feedb Get rid of extraSetuidPrograms. 
Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
 2010-05-14 21:01:06 +00:00
Yury G. Kudryashov 03caab4572 Enable polkit-1 
Now both polkit-1 and old policykit are enabled. Packages that can use both will
be migrated to new polkit-1, than old one can be disabled.

svn path=/nixos/trunk/; revision=21776
 2010-05-14 20:28:04 +00:00
Marc Weber 680818c2cc postgresql: allow adding plugins ot $libdir 
svn path=/nixos/trunk/; revision=21692
 2010-05-09 20:42:00 +00:00
Lluís Batlle i Rossell 8b69834669 Fixing a syntax error in the vsftpd module I added in a recent commit. 
svn path=/nixos/trunk/; revision=21687
 2010-05-09 15:38:48 +00:00
Lluís Batlle i Rossell 4ee2a8a29a Fixing the UTF-8 in openssh sshd (passing to it the LOCALE_ARCHIVE - that 
requieres a patch in openssh that I just commited to nixpkgs)

Before this, in the shell spawned, backspace could not work over UTF-8 strings in the readline.


svn path=/nixos/trunk/; revision=21679
 2010-05-09 12:45:57 +00:00
Lluís Batlle i Rossell 825923a051 Adding the 'awesome' window manager to nixos. 
I made the system sw path include /etc/xdg - awesome looks for some file
in the XDG_CONFIG_DIRS, which in bashrc is set to point to the profiles/etc/xdg


svn path=/nixos/trunk/; revision=21675
 2010-05-08 23:24:00 +00:00
Ludovic Courtès 4c1af311e1 avahi-daemon: Ensure that /var/run/avahi-daemon exists. 
svn path=/nixos/trunk/; revision=21673
 2010-05-08 22:28:26 +00:00
Lluís Batlle i Rossell 0d92459fb5 Fixing vsftpd regarding the anonymous user (some script lines had to be run 
only in the case the anonymous user service were enabled)


svn path=/nixos/trunk/; revision=21669
 2010-05-08 19:12:36 +00:00
Lluís Batlle i Rossell f8ff75202e Fixing the mountd nfs upstart script (about /etc/exports and its contents) 
svn path=/nixos/trunk/; revision=21668
 2010-05-08 19:02:54 +00:00
Nicolas Pierron 06bfb319fe Add extra module argument to provide a nesting.clone option. This option 
does the same as nesting.children except that each configuration inherits
from the top-level configuration.

svn path=/nixos/trunk/; revision=21663
 2010-05-08 17:18:26 +00:00
Nicolas Pierron 1ba1b66efd Add services.xserver.screenSection to add additional screen options. 
svn path=/nixos/trunk/; revision=21662
 2010-05-08 17:18:22 +00:00
Nicolas Pierron 43fcf8a2b2 Fix swraid device detection on boot. 
svn path=/nixos/trunk/; revision=21661
 2010-05-08 17:18:16 +00:00
Eelco Dolstra c1f7622512 * Improve obsolete/deprecated option warnings. 
svn path=/nixos/trunk/; revision=21653
 2010-05-07 15:14:50 +00:00
Ludovic Courtès 8fcbaefd2e Refer to IceCat instead of Firefox. 
svn path=/nixos/trunk/; revision=21636
 2010-05-06 20:52:06 +00:00
Lluís Batlle i Rossell e4e3789dad Make privoxy run with uid=privoxy. 
Patch by Russell O'Connor, sent to nix-dev.


svn path=/nixos/trunk/; revision=21551
 2010-05-02 04:38:45 +00:00
Lluís Batlle i Rossell b690751956 Fixing the kwm nixos module - the kde3 attribute path changed in nixpkgs. 
svn path=/nixos/trunk/; revision=21549
 2010-05-01 20:25:57 +00:00
Lluís Batlle i Rossell 65a4991eee I forgot the username in the system cron job for logrotate. So it did not work until now. 
svn path=/nixos/trunk/; revision=21479
 2010-05-01 13:23:32 +00:00
Marc Weber 6daed6b8d2 setting default of copySystemConfiguration to false. 
http://thread.gmane.org/gmane.linux.distributions.nixos/3990

svn path=/nixos/trunk/; revision=21450
 2010-04-30 07:43:29 +00:00
Yury G. Kudryashov 0829b8ea8c Link /etc/{xdg,dbus-1} if KDE is enabled 
svn path=/nixos/trunk/; revision=21449
 2010-04-30 07:36:24 +00:00
Yury G. Kudryashov 9d33d05269 Add $profile/lib/qt4/plugins to QT_PLUGIN_PATH 
svn path=/nixos/trunk/; revision=21448
 2010-04-30 07:36:19 +00:00
Lluís Batlle i Rossell 27886d8288 Fixing an xml manual tag (the manual did not validate, so, its build failed) 
svn path=/nixos/trunk/; revision=21440
 2010-04-29 19:06:18 +00:00