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
Lluís Batlle i Rossell
cf3f1e9f23
INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,
...
because the bashrc already cares on that, even taking into account all the usual
nixos profiles.
As a side change, I changed a tab to spaces in bashrc.
svn path=/nixos/trunk/; revision=21439
2010-04-29 18:59:05 +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
Rob Vermaas
310eefffe7
added virtualisation.diskSize option to specify default image size of disk in qemu-kvm vm
...
svn path=/nixos/trunk/; revision=21422
2010-04-29 12:37:26 +00:00
Marc Weber
ce642f0cc2
nixos-rebuild: accept both: -jn and -j n
...
svn path=/nixos/trunk/; revision=21410
2010-04-28 19:52:03 +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
Marc Weber
d1e87dfc86
adding two new options:
...
- system.copySystemConfiguration (requested by Ludovic Courtès)
- system.extraSystemBuilderCmds
svn path=/nixos/trunk/; revision=21406
2010-04-28 14:55:26 +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
Yury G. Kudryashov
a30637aba5
Really use nix-worker in nixos-rebuild
...
svn path=/nixos/trunk/; revision=21307
2010-04-25 18:26:51 +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
a37743794d
I forgot a 'toString' in front of an integer
...
svn path=/nixos/trunk/; revision=21242
2010-04-22 14:54:09 +00:00
Lluís Batlle i Rossell
d7406769ac
Making /var/run/utmp writable by the 'utmp' group.
...
Then, people can choose a setgid utmp for their xterm, konsole or whatever to get the terminals
reported there.
svn path=/nixos/trunk/; revision=21238
2010-04-22 13:56:26 +00:00
Lluís Batlle i Rossell
b7dab319e5
Fixing the tty group and permissions for vt consoles
...
svn path=/nixos/trunk/; revision=21231
2010-04-22 10:11:32 +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
Eelco Dolstra
6c16ff29a5
* Don't do "kbd_mode -u" because it kicks the X server out of raw
...
mode, and isn't needed anyway.
svn path=/nixos/trunk/; revision=21182
2010-04-20 14:35:12 +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
Lluís Batlle i Rossell
33ed225a84
Making the /dev and /dev/shm tmpfs sizes configurable.
...
By default, they take the usual value of "50% of physical RAM".
As /dev/shm can be filled by anyone, and tmpfs does not trigger the OOM killer (and
can hang the machine due to a lack of RAM), I need to configure that down
in order to avoid crashes.
There is still left the /var/run/nscd tmpfs filesystem, also created with 50%
of the RAM, but at least not writeable by anyone. We could find a reasonable
low value for that, or allow configuration.
svn path=/nixos/trunk/; revision=21140
2010-04-17 15:20:13 +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
Rob Vermaas
94e36ec1c7
virtualisation/qemu-kvm.nix: use noacl option for hostfs mount
...
svn path=/nixos/trunk/; revision=21129
2010-04-16 15:53:54 +00:00
Rob Vermaas
46b109e97e
revert previous commit
...
svn path=/nixos/trunk/; revision=21128
2010-04-16 15:45:59 +00:00
Rob Vermaas
b75d15a9a8
virtualisation: add option to switch off readonly host fs in vm
...
svn path=/nixos/trunk/; revision=21126
2010-04-16 15:09:47 +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
Marco Maggesi
c423f16f69
Fix job name in nixos/modules/programs/blcr.nix
...
svn path=/nixos/trunk/; revision=21106
2010-04-15 17:14:44 +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