Commit Graph

1872 Commits

Author SHA1 Message Date
Rob Vermaas
e3ad6a6f59 Added enableTCPIP option for postgresql (defaults to false) to allow tcpip connections
svn path=/nixos/trunk/; revision=15391
2009-04-29 12:25:25 +00:00
Marc Weber
d804730382 adding assertion support to modular-nixos
problem: the nix language assert function can't be used because
of the fix-style used in modular-nixos. A minimal stripped down version
illustrating the problem looks like this:

fix (x : assert x.cfg.foo; { upstartJob = ...; cfg = ...; } )

Now nix has to evaluate x.cfg.foo in order to check the assertion.
However to do so it has to access x.cfg.foo beeing defined in the body
The body can only be evaluated after the assertion passes.
So in the end you get an infinite recursion error.

pierron mentioned that adding another mkIf like function could
work. Maybe this implementation is even simpler. It adds
another option collecting assertions only.
The evaluation is forced by a function adding an empty list to
extraPackages. extraPackages is evaluated by nixos in all cases.
If there are assertions evaluating to false all assertion messages are
presented to the user using throw.

svn path=/nixos/branches/modular-nixos/; revision=15387
2009-04-28 23:05:03 +00:00
Marc Weber
84b5d26ffc doh. my typo while merging
svn path=/nixos/branches/modular-nixos/; revision=15376
2009-04-28 14:01:11 +00:00
Marc Weber
0ba7449c11 * Synced with trunk @ 15348
svn path=/nixos/branches/modular-nixos/; revision=15374
2009-04-28 13:53:04 +00:00
Marc Weber
fa9ceac862 * Synced with trunk @ 15346
svn path=/nixos/branches/modular-nixos/; revision=15373
2009-04-28 13:51:58 +00:00
Marc Weber
fb1e6d5c80 * Synced with trunk @ 15345
svn path=/nixos/branches/modular-nixos/; revision=15372
2009-04-28 13:49:05 +00:00
Marc Weber
addf00b1cf * Synced with trunk @ 15344
svn path=/nixos/branches/modular-nixos/; revision=15371
2009-04-28 13:44:43 +00:00
Eelco Dolstra
0f99f50e34 * Use lib/perl5/site_perl.
svn path=/nixos/trunk/; revision=15370
2009-04-28 13:43:48 +00:00
Eelco Dolstra
114109b709 * The X server now needs HAL running.
svn path=/nixos/trunk/; revision=15369
2009-04-28 13:43:22 +00:00
Eelco Dolstra
2cd1e7239f * Atomically update grub/menu.lst (although we really need an fsync here).
svn path=/nixos/trunk/; revision=15368
2009-04-28 13:43:03 +00:00
Marc Weber
8e5eeccb75 * Synced with trunk @ 15340
svn path=/nixos/branches/modular-nixos/; revision=15367
2009-04-28 13:42:43 +00:00
Marc Weber
cc7f5eba97 * Synced with trunk @ 15326
svn path=/nixos/branches/modular-nixos/; revision=15366
2009-04-28 13:40:55 +00:00
Marc Weber
e28250470f * Synced with trunk @ 15312
svn path=/nixos/branches/modular-nixos/; revision=15365
2009-04-28 13:38:22 +00:00
Marc Weber
818baa7dd3 * Synced with trunk @ 15274
svn path=/nixos/branches/modular-nixos/; revision=15364
2009-04-28 13:34:47 +00:00
Marc Weber
ab9cde5a83 * Synced with trunk @ 15211
svn path=/nixos/branches/modular-nixos/; revision=15363
2009-04-28 13:34:22 +00:00
Marc Weber
bb2de6da2e * Synced with trunk @ 15208
svn path=/nixos/branches/modular-nixos/; revision=15362
2009-04-28 13:33:52 +00:00
Marc Weber
a9360de947 * Synced with trunk @ 15204
svn path=/nixos/branches/modular-nixos/; revision=15361
2009-04-28 13:32:37 +00:00
Marc Weber
e96fada917 * Synced with trunk @ 15192
svn path=/nixos/branches/modular-nixos/; revision=15360
2009-04-28 13:30:31 +00:00
Marc Weber
c1bae06376 * Synced with trunk @ 15145
svn path=/nixos/branches/modular-nixos/; revision=15359
2009-04-28 13:29:56 +00:00
Marc Weber
160c7588b3 * Synced with trunk @ 15086
svn path=/nixos/branches/modular-nixos/; revision=15358
2009-04-28 13:29:28 +00:00
Marc Weber
3b934b9d03 * Synced with trunk @ 15074
svn path=/nixos/branches/modular-nixos/; revision=15357
2009-04-28 13:28:38 +00:00
Marc Weber
bd6eb4ae29 * Synced with trunk @ 15062
svn path=/nixos/branches/modular-nixos/; revision=15356
2009-04-28 13:27:37 +00:00
Marc Weber
55c787a308 * Synced with trunk @ 15061
svn path=/nixos/branches/modular-nixos/; revision=15355
2009-04-28 13:26:31 +00:00
Marc Weber
c4ad0f5454 * Synced with trunk @ 15058
svn path=/nixos/branches/modular-nixos/; revision=15354
2009-04-28 13:18:38 +00:00
Marc Weber
56be444092 * Synced with trunk @ 15032
svn path=/nixos/branches/modular-nixos/; revision=15353
2009-04-28 13:17:04 +00:00
Lluís Batlle i Rossell
38d7e7b780 Sorry, I disabled X hal config in my last commit, thinking it was still not usable.
I see the problem rests only in configuring the keyboard layout in hal, for X.
Nevertheless, using the client "setxkbmap" works, which can help until we
can configure the keyboard layout in configuration.nix.


svn path=/nixos/trunk/; revision=15348
2009-04-28 08:47:13 +00:00
Lluís Batlle i Rossell
bf04b4c7dc Making xserver cope with new evdev input device, and the proper dri mesa driver directory.
svn path=/nixos/trunk/; revision=15346
2009-04-28 07:58:20 +00:00
Eelco Dolstra
1723eaec3d * Use evdev instead of the deprecated keyboard/mouse drivers. Note:
evdev gets the keyboard layout / model from HAL (`lshal | grep
  xkb'), but we don't yet have a way to override the default (`us').

svn path=/nixos/trunk/; revision=15345
2009-04-27 23:19:31 +00:00
Eelco Dolstra
dca7981111 * Make sure that the FDI cache is flushed on startup. Mine had a
timestamp somewhere in 2008, so apparently it's not getting
  updated.

svn path=/nixos/trunk/; revision=15344
2009-04-27 23:09:25 +00:00
Eelco Dolstra
7da8137f18 * Re-enable Glibc locales.
svn path=/nixos/trunk/; revision=15340
2009-04-27 21:52:10 +00:00
Eelco Dolstra
b891792ddd * Hack to make desktop locking in KDE 3 work.
svn path=/nixos/trunk/; revision=15326
2009-04-26 21:06:00 +00:00
Eelco Dolstra
d9f4475dd5 * Be able to cope with future changes to Upstart.
svn path=/nixos/trunk/; revision=15312
2009-04-25 22:36:56 +00:00
Eelco Dolstra
5ac2532cc7 * Add GNU parted to the CD.
svn path=/nixos/trunk/; revision=15274
2009-04-23 12:56:17 +00:00
Marc Weber
7cb7349747 fix copy paste error
reported by Nicolas

svn path=/nixos/branches/modular-nixos/; revision=15221
2009-04-21 19:26:47 +00:00
Marc Weber
8ddf34fa3d adding kernel nfs daemon upstart job
svn path=/nixos/branches/modular-nixos/; revision=15219
2009-04-21 16:34:56 +00:00
Marc Weber
8237528c4a samba job: put each daemon into its own job file
use start/stop samba-control to start/stop them all

You can enable syncing samba passwords when using passwd as well now.
However you still have to add a user to the samba user database once
using smbpasswd -a username.

svn path=/nixos/branches/modular-nixos/; revision=15218
2009-04-21 16:30:32 +00:00
Marc Weber
9f8aa03168 don't run portmap as daemon
if you do upstart can't know (yet) when it exits

svn path=/nixos/branches/modular-nixos/; revision=15217
2009-04-21 16:25:37 +00:00
Eelco Dolstra
3a7834dcac * Use perlPackages.
svn path=/nixos/trunk/; revision=15211
2009-04-21 12:38:13 +00:00
Andres Löh
31ff856a52 Updated reference to xmonad.
svn path=/nixos/trunk/; revision=15208
2009-04-21 11:29:40 +00:00
Eelco Dolstra
9940de0088 * After upgrading to X.org server 1.5.3, we suddenly need to set
"AllowEmptyInput" to "off", otherwise we get no keyboard or mouse.
  The logfile then says:

    (WW) AllowEmptyInput is on, devices using drivers 'kbd' or 'mouse'
      will be disabled.
    (WW) Disabling Keyboard[0]
    (WW) Disabling Mouse[0]

  which seems rather weird.

svn path=/nixos/trunk/; revision=15204
2009-04-21 08:03:05 +00:00
Eelco Dolstra
453e9abc9e * Work around an apparent bug in Bash 4.0. It no longer accepts this:
echo $(cat <<EOF
    bla
    EOF)

  It does accept backticks:

    echo `cat <<EOF
    bla
    EOF`

svn path=/nixos/trunk/; revision=15192
2009-04-20 16:26:50 +00:00
Marc Weber
ed43363e2a following renaming whatis -> showVal
svn path=/nixos/trunk/; revision=15145
2009-04-19 10:36:30 +00:00
Nicolas Pierron
aac4fb7321 Temporary work-around to inherit configuration settings.
svn path=/nixos/branches/modular-nixos/; revision=15133
2009-04-18 17:16:46 +00:00
Eelco Dolstra
4f3d55232a * Don't do a sync, they're incredibly expensive. (I just had one that took
25 minutes to complete...)

svn path=/nixos/trunk/; revision=15086
2009-04-16 13:29:22 +00:00
Eelco Dolstra
760f484e4d * Removed some more stuff from the CD because the x86_64-linux ISO is
over 700 MB.  (Maybe vim could be replaced by a smaller vi?)
  Note that the main size problem for the x86_64-linux ISO is that it
  contains two Glibcs - Grub has a dependency on the 32-bit Glibc.  It
  would be nice to get rid of that.

svn path=/nixos/trunk/; revision=15074
2009-04-16 08:24:38 +00:00
Eelco Dolstra
723be3579d * Remove gdb from the CD.
svn path=/nixos/trunk/; revision=15062
2009-04-15 11:51:37 +00:00
Eelco Dolstra
7409bb9ec1 * Use Linux 2.6.28 on the installation CD.
svn path=/nixos/trunk/; revision=15061
2009-04-15 10:13:37 +00:00
Eelco Dolstra
ee3393df8d * Creating /var/spool/whatever fails if /var/spool doesn't exist.
svn path=/nixos/trunk/; revision=15058
2009-04-15 09:57:38 +00:00
Sander van der Burg
5c165ad815 Added vboxdrv to udev in order to have proper permissions
svn path=/nixos/trunk/; revision=15032
2009-04-14 13:45:57 +00:00
Nicolas Pierron
47b61bdd4a * upstart-jobs/manual.nix:
- Replace "optional" function by one "mkIf".
  - Pretty-print (indentation, extra lines, no trailing-whitespaces).

svn path=/nixos/branches/modular-nixos/; revision=15025
2009-04-14 12:31:08 +00:00