JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,538 Commits 2 Branches 0 Tags 13 GiB
d7d2d5e3d5
Commit Graph

422 Commits

Author SHA1 Message Date
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
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
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
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
b15e575961 Renaming the tor services lowercase. 
svn path=/nixos/trunk/; revision=21810
 2010-05-16 22:22:34 +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
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
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
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
1ba1b66efd Add services.xserver.screenSection to add additional screen options. 
svn path=/nixos/trunk/; revision=21662
 2010-05-08 17:18:22 +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
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
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
Lluís Batlle i Rossell
b47c2186f6 Adding logrotate to nixos. Not a very clever logrotate, though: 
options 'enable' (cronjob every hour) and the config flie contents passed
as a string.


svn path=/nixos/trunk/; revision=21438
 2010-04-29 18:54:08 +00:00
Marc Weber
8754644faf add more documentation to distributedBuilds and what can be done if buildmachines are not always up 
svn path=/nixos/trunk/; revision=21409
 2010-04-28 19:52:00 +00:00
Yury G. Kudryashov
ce15e270f2 Fix non-bc change 
svn path=/nixos/trunk/; revision=21326
 2010-04-26 15:57:06 +00:00
Yury G. Kudryashov
69697a35bb Add /root/test-firmware to FIRMWARE_DIRS 
svn path=/nixos/trunk/; revision=21317
 2010-04-26 09:08:05 +00:00
Yury G. Kudryashov
be3df19bd5 Don't try to copy /root/test-firmware to /nix/store 
svn path=/nixos/trunk/; revision=21316
 2010-04-26 09:04:24 +00:00
Yury G. Kudryashov
226a9c8bbb Update CUPS module 
* Create symlinks in cups-progs only if they aren't already here
* add tmpDir option

svn path=/nixos/trunk/; revision=21309
 2010-04-25 18:27:00 +00:00
Yury G. Kudryashov
a5718503e5 Change firmware handling 
This way should work with both old udev and new one.

svn path=/nixos/trunk/; revision=21308
 2010-04-25 18:26:56 +00:00
Sander van der Burg
d9528767af Added preliminary Apache Felix service 
svn path=/nixos/trunk/; revision=21244
 2010-04-22 15:13:50 +00:00
Lluís Batlle i Rossell
41bf426a66 Making the httpd prefork basic settings configurable. 
I kept the defaults as they where, to avoid surprises.
(150 httpd processes simultaneously answering? Too much for my machines)


svn path=/nixos/trunk/; revision=21220
 2010-04-21 20:55:57 +00:00
Eelco Dolstra
8874226fa3 * Add rfkill to the system path. 
svn path=/nixos/trunk/; revision=21201
 2010-04-21 11:37:52 +00:00
Sander van der Burg
2936d7062d Added creation of the disnix group on first startup, if the disnix service is enabled 
svn path=/nixos/trunk/; revision=21164
 2010-04-19 13:26:21 +00:00
Lluís Batlle i Rossell
a008d6b391 Fixing the cups-progs build problems, for the cupsd module. It wrote over other 
store paths.


svn path=/nixos/trunk/; revision=21161
 2010-04-19 10:54:39 +00:00
Sander van der Burg
1c9eb048c9 - Implemented rootPassword option to automatically configure the root password (by default it's empty, which you usually don't want) 
- Implemented initialScript option to configure database properties on first startup (such as granting permissions)


svn path=/nixos/trunk/; revision=21135
 2010-04-16 18:06:23 +00:00
Yury G. Kudryashov
8e8554242f Remove extraLinkPaths, thanks to Pierron for explanation 
Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
 2010-04-16 05:09:10 +00:00
Yury G. Kudryashov
267e0af8db A few typos in previous commits 
svn path=/nixos/trunk/; revision=21105
 2010-04-15 17:02:33 +00:00
Yury G. Kudryashov
1e83fe6122 Remove tabs 
svn path=/nixos/trunk/; revision=21104
 2010-04-15 15:47:26 +00:00
Yury G. Kudryashov
8324ccf755 Add /var/run/current-system/sw to NIX_PROFILES 
Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
 2010-04-15 15:47:15 +00:00
Yury G. Kudryashov
a26d31d04c Add support for custom CUPS drivers 
Use buildEnv for cups-prog.

svn path=/nixos/trunk/; revision=21102
 2010-04-15 15:47:07 +00:00
Yury G. Kudryashov
4d39d70406 Start ssh-agent or gpg-agent even if called by kdm 
svn path=/nixos/trunk/; revision=21100
 2010-04-15 15:46:47 +00:00
Yury G. Kudryashov
916fbfa070 Add xf86-linux-wacom. 
Mostly reverts my previous commit.

svn path=/nixos/trunk/; revision=21099
 2010-04-15 15:46:38 +00:00
Rob Vermaas
b42c2ecc13 * tomcat module: access logging per virtual host and pass right timezone 
svn path=/nixos/trunk/; revision=21065
 2010-04-14 09:31:23 +00:00
Lluís Batlle i Rossell
4c9ff7f904 Making postfix properly start on boot. 
We could not start on 'filesystems', because filesystems is written as an upstart task.

Additionally, as upstart calls the postfix start/stop script and it does not act as a
daemon, we write it as a preStart/postStop job. Then we don't have monitoring or respawn,
but at least upstart does not get confused on its state.


svn path=/nixos/trunk/; revision=21061
 2010-04-13 22:47:34 +00:00
Yury G. Kudryashov
9cce36182d Remove linuxwacom: it is not compatible with new xserver 
svn path=/nixos/trunk/; revision=21015
 2010-04-11 20:41:06 +00:00
Andres Löh
289dcec9db Make acpid actions configurable. 
svn path=/nixos/trunk/; revision=20986
 2010-04-08 15:27:20 +00:00
Eelco Dolstra
6c710f7d2b * Provide an example for services.printing.cupsdConf. 
* Change the default CUPS log level to "info".

svn path=/nixos/trunk/; revision=20957
 2010-04-06 13:25:00 +00:00
Eelco Dolstra
755ee8bd08 * Add a configuration option `services.printing.cupsdConf' to allow 
appending verbatim text to the CUPS daemon configuration file.
* cupsd.conf: set ErrorLog properly.

svn path=/nixos/trunk/; revision=20954
 2010-04-06 11:57:15 +00:00
Sander van der Burg
b904954793 Updated disnix service for the 0.1 release 
svn path=/nixos/trunk/; revision=20917
 2010-04-01 14:53:17 +00:00
Michael Raskin
6788d457dc Make security type configurable 
svn path=/nixos/trunk/; revision=20667
 2010-03-16 17:17:37 +00:00
Michael Raskin
11f8647d73 Add a default share to Samba to make creating simple fileserver easier 
svn path=/nixos/trunk/; revision=20665
 2010-03-16 16:34:27 +00:00
Eelco Dolstra
bd81b7a173 * Urgh, this should never have been committed. 
svn path=/nixos/trunk/; revision=20660
 2010-03-16 15:15:17 +00:00
Eelco Dolstra
176f6c52dd * Change the name of the SSH privilege separation user account back to 
"sshd" because changing it to "opensshd" causes breakage (like the
  activation script saying "useradd: UID 2 is not unique.").  Also,
  OpenSSH requires it to be named "sshd", I think.

svn path=/nixos/trunk/; revision=20577
 2010-03-11 18:07:20 +00:00
Ludovic Courtès
8e16742b79 Update users of `services.sshd'. 
svn path=/nixos/trunk/; revision=20575
 2010-03-11 17:02:53 +00:00
Ludovic Courtès
d1b4b7fd28 Rename services.sshd' to services.openssh'. 
svn path=/nixos/trunk/; revision=20574
 2010-03-11 17:02:49 +00:00
Eelco Dolstra
a104f07a07 * Move the definition of the Nix build users out of user-groups.nix to 
nix-daemon.nix.
* Add an option ‘nix.nrBuildUsers’ to allow the number of build users
  to be overriden.

svn path=/nixos/trunk/; revision=20571
 2010-03-11 16:50:08 +00:00
Lluís Batlle i Rossell
9f5d77f78d Still problems with nfs-kernel with only the client enabled. 
Fix the upstart script 'start on' part.

svn path=/nixos/trunk/; revision=20555
 2010-03-11 12:56:40 +00:00
Lluís Batlle i Rossell
48e9e1282a Fixing the evaluation of the "system tarball pc", adapting it to the latest 
nixpkgs changes about 'platform'.


svn path=/nixos/trunk/; revision=20494
 2010-03-09 14:37:59 +00:00
Eelco Dolstra
43d6b17d87 * In the NixOS tests, send syslog messages to the serial port (so that 
they appear in the build log of the test).

svn path=/nixos/trunk/; revision=20490
 2010-03-09 13:31:20 +00:00
Lluís Batlle i Rossell
dfb89ec8c3 nfs: the statd daemon should be started after nfs only if the nfs server is 
enabled.

OTH, I don't know why statd may depend at all on nfsd being started.


svn path=/nixos/trunk/; revision=20402
 2010-03-05 11:05:37 +00:00
Sander van der Burg
787b5cd7b9 Implemented enableOSSEmulation option, which can be used to disable OSS emulation. On my home PC OSS emulation gives me a lot of annoying problems 
svn path=/nixos/trunk/; revision=20351
 2010-03-03 14:01:13 +00:00
Sander van der Burg
3d87a133a0 Added gstreamer plugins to the systemPackages, so that Phonon does not crash on shutdown when using KDE 4.4.x 
svn path=/nixos/trunk/; revision=20350
 2010-03-03 13:22:06 +00:00
Lluís Batlle i Rossell
bc4e159d0e Fixing a terrible bug in nixos nfs-kernel server, related to the exports file. 
The file contents were taken as a file path. This resulted in a system with a totally broken /etc:
lrwxrwxrwx 1 root nixbld   51 22 feb 21:45 bashrc -> /nix/store/gh71a6w50cxrl4124kxfn24yi0b7aaka-useradd
lrwxrwxrwx 1 root nixbld   44 22 feb 21:45 nix.conf -> 192.168.1.4(rw,no_root_squash,no_all_squash)
lrwxrwxrwx 1 root nixbld   58 22 feb 21:45 inputrc -> /nix/store/1czhdj7q74dc556frqrh51jyshfsxhl3-bashrc-user.sh
lrwxrwxrwx 1 root nixbld   51 22 feb 21:45 nsswitch.conf -> /nix/store/qsgsli992hd1g8245d8am9izn9xmw90x-inputrc
lrwxrwxrwx 1 root nixbld   20 22 feb 21:45 exports -> /home/sheevaplugroot

Notice that the inputrc has strange contents. In my case, that disabled me to type 's' or 'i' (at least) in any new interactive shell.

If you notice, the 'exports' symlink should point to a store file, which contents had to look like:
/home/sheevaplugroot 192.168.1.4(rw,no_root_squash,no_all_squash)

This patch achieves this later behaviour rather than the former.


svn path=/nixos/trunk/; revision=20181
 2010-02-22 21:41:49 +00:00
Eelco Dolstra
cc0a2a6944 * Don't say `jobs.foo = mkIf condition { ... }' because that will 
create an empty job `foo' if the condition is false.  Instead use
  `jobs = optionalAttrs condition { foo = { ... }; }'.
* Enable portmap automatically when using the NFS server or client.

svn path=/nixos/trunk/; revision=20178
 2010-02-22 17:12:26 +00:00
Lluís Batlle i Rossell
0fb8300bb6 Updating the nixos NFS related expressions. Thanks to Oleksandr for the 
help.
I tried not to break the tests.


svn path=/nixos/trunk/; revision=20157
 2010-02-21 16:26:33 +00:00
Rob Vermaas
2b7da40351 revert unintended part of the previous commit 
svn path=/nixos/trunk/; revision=20123
 2010-02-19 09:55:28 +00:00
Rob Vermaas
a87ee76cb3 * hydra: added option to self manage nix.machines (for buildfarm purposes) 
svn path=/nixos/trunk/; revision=20121
 2010-02-19 09:48:24 +00:00
Rob Vermaas
f1438d3d27 tomcat: add option to enable accesslog per virtual host (default: off) 
svn path=/nixos/trunk/; revision=20075
 2010-02-17 12:32:19 +00:00
Rob Vermaas
c17a76279d zabbix agent: extraConfig 
svn path=/nixos/trunk/; revision=20048
 2010-02-16 12:51:28 +00:00
Eelco Dolstra
f013236f1e * Idem for zabbix-agent. 
svn path=/nixos/trunk/; revision=20040
 2010-02-16 10:15:20 +00:00
Eelco Dolstra
9127795e4a * Make sure that Upstart notices when the Zabbix server crashes so 
that it can be restarted.  Zabbix is kind of hard to monitor, so use
  a trick with an open fifo to detect when it goes down.

svn path=/nixos/trunk/; revision=20039
 2010-02-16 10:10:59 +00:00
Eelco Dolstra
97f30fb17b * The Zabbix agent should start after the hostname is set. 
svn path=/nixos/trunk/; revision=20029
 2010-02-15 20:34:01 +00:00
Eelco Dolstra
cc90f62ceb * Use `psql' with an empty command to check whether PostgreSQL is up 
and running.  `pg_ctl status' merely checks whether PostgreSQL is
  running, not whether it is already accepting connections.  This
  causes Upstart jobs that depend on PostgreSQL to fail.

svn path=/nixos/trunk/; revision=20024
 2010-02-15 19:29:54 +00:00
Eelco Dolstra
83b76bc2cf * Option `services.apache.phpIni' (which is of type derivation) 
replaced by `services.apache.phpOptions' (of type string).
* Allow Apache subservices to add to phpOptions.
* Set the TZ environment variable in Apache.
* Updated the Zabbix web interface.

svn path=/nixos/trunk/; revision=20023
 2010-02-15 19:02:42 +00:00
Eelco Dolstra
014ffaac5d * Update the Zabbix agent module. 
svn path=/nixos/trunk/; revision=20019
 2010-02-15 17:13:43 +00:00
Ludovic Courtès
b7b1f5d1cc X11: Add a few more basic X clients to `systemPackages'. 
svn path=/nixos/trunk/; revision=19902
 2010-02-10 13:22:38 +00:00
Eelco Dolstra
07cc5ac2fd * "python2.5" -> ${pkgs.python.libPrefix} 
svn path=/nixos/trunk/; revision=19901
 2010-02-10 12:39:47 +00:00
Eelco Dolstra
051e9342b3 * Use the moduli file. This shuts up the "WARNING: /etc/ssh/moduli 
does not exist, using fixed modulus" message in /var/log/messages.

svn path=/nixos/trunk/; revision=19754
 2010-02-01 17:05:02 +00:00
Marco Maggesi
86b42fdfbf Fix bugs and improve modules/services/network-filesystems/openafs-client 
svn path=/nixos/trunk/; revision=19751
 2010-02-01 16:29:15 +00:00
Ludovic Courtès
06aeb7d87f GNUnet: Add options; add as a system package; provide /etc/gnunetd.conf. 
svn path=/nixos/trunk/; revision=19630
 2010-01-23 15:47:33 +00:00
Eelco Dolstra
50430f19e1 * Only run dhclient on interfaces of type 1, otherwise it fails to 
start if the machine has weird network devices (e.g. "eql").

svn path=/nixos/trunk/; revision=19623
 2010-01-22 20:34:32 +00:00
Lluís Batlle i Rossell
d45a3fbdc9 Adding the pcscd daemon (this daemon manages smartcard reader drivers), and offers 
a common interface to programs dealing with smartcards (like users of the opensc lib).


svn path=/nixos/trunk/; revision=19360
 2010-01-11 21:56:01 +00:00
Eelco Dolstra
ee005424bf * Doh, subtle race condition: STARTUP must be cleared after "udevadm 
settle".  Otherwise some rules may be processed with STARTUP
  cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341
 2010-01-10 20:08:35 +00:00
Eelco Dolstra
6f8a3ba7c7 * Create devicemapper/lvm device nodes from udev (using the rules 
supplied by the lvm package).  This makes the "lvm" Upstart task
  unnecessary.  Also, we now get /dev/disk/by-{label,uuid} symlinks
  for LVM logical disks.

svn path=/nixos/trunk/; revision=19300
 2010-01-07 22:39:35 +00:00
Lluís Batlle i Rossell
fa2a6f835f Adding wicd, taking in the patch sent by roconnor to nix-dev on 2010-01-07. 
svn path=/nixos/trunk/; revision=19298
 2010-01-07 17:53:03 +00:00
Marc Weber
fdc63c54e4 enhance phpIni documentation 
readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
 2010-01-07 09:01:40 +00:00
Eelco Dolstra
ac7c404deb * Revert r19267 - it causes a corrupt Apache Upstart job to be 
generated.  E.g. in
  http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
 2010-01-06 23:37:30 +00:00
Marc Weber
99644df67a customizable PHPRC 
svn path=/nixos/trunk/; revision=19267
 2010-01-06 17:05:57 +00:00
Eelco Dolstra
73668f41da * Added an "auto" pseudo display manager that logs in a user 
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
 2010-01-05 15:32:14 +00:00
Eelco Dolstra
62476f2816 * Added a module for IceWM. 
svn path=/nixos/trunk/; revision=19238
 2010-01-05 15:30:56 +00:00
Marc Weber
c0c4d575d2 autofs job fixes: 
use exec so that upstart knows when automount shuts down.
If a mount is used upstart will send SIGKILL.
Automount doesn't clean up. So unmount everything using a post script.

svn path=/nixos/trunk/; revision=19105
 2009-12-25 06:39:43 +00:00
Lluís Batlle i Rossell
aaac043ae5 Making an explicit dependency for nfs-kernel on portmap 
svn path=/nixos/trunk/; revision=19090
 2009-12-24 12:05:34 +00:00
Eelco Dolstra
9c465fedfa * Reinstate the -s flag. 
svn path=/nixos/trunk/; revision=19055
 2009-12-20 22:03:32 +00:00
Eelco Dolstra
57f70db611 * Revert r19003 for now, because wpa_supplicant 0.6.9 (in the Nixpkgs 
trunk) doesn't have a -s flag.  0.7.0 in the stdenv branch
  presumably does, but it's marked as unstable upstream.

svn path=/nixos/trunk/; revision=19047
 2009-12-20 16:51:22 +00:00
Lluís Batlle i Rossell
3f6ca96967 Adding an option to disable nscd. 
svn path=/nixos/trunk/; revision=19004
 2009-12-16 20:51:25 +00:00