Peter Simons
5144e94694
gw6c: fixed faulty path reference
...
svn path=/nixos/trunk/; revision=31657
2012-01-18 20:34:04 +00:00
Sander van der Burg
1e59a18f90
Only use mysqladmin authentication if we have supplied a root password
...
svn path=/nixos/trunk/; revision=31632
2012-01-18 15:21:11 +00:00
Sander van der Burg
d4b6aa3553
The MySQL upstart job does not monitor the mysqld process anymore. Instead it is shut down by mysqladmin tool in the postStop phase. Under high load, upstart may send a KILL signal to the mysql daemon, which may cause data corruption.
...
svn path=/nixos/trunk/; revision=31621
2012-01-18 15:01:44 +00:00
Eelco Dolstra
5d12152b13
* Enable xfce4-appfinder.
...
svn path=/nixos/trunk/; revision=31612
2012-01-17 18:15:20 +00:00
Arie Middelkoop
609a02906e
Another type error fix ("The example shouldn't be a string either").
...
svn path=/nixos/trunk/; revision=31538
2012-01-14 12:24:41 +00:00
Arie Middelkoop
2f49427e4f
Fixed the default value for the palmDetect synaptics option (empty string -> false).
...
svn path=/nixos/trunk/; revision=31529
2012-01-14 09:40:08 +00:00
Arie Middelkoop
4d26262878
Some renaming as was mentioned on the mailinglist.
...
Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise.
svn path=/nixos/trunk/; revision=31527
2012-01-14 09:30:24 +00:00
Arie Middelkoop
50d7a38c82
Added the "conservative" governer to the loaded cpufreq governors when you enable powermanagement.
...
svn path=/nixos/trunk/; revision=31524
2012-01-13 22:25:16 +00:00
Arie Middelkoop
bf1bf4957c
Additional options for synaptics
...
How can you ever work with a touchpad while having finger taps on...
svn path=/nixos/trunk/; revision=31523
2012-01-13 22:23:18 +00:00
Eelco Dolstra
cc41bce79d
* Prevent merging of some options. P.S. maybe string options
...
should be "uniq" by default.
svn path=/nixos/trunk/; revision=31520
2012-01-13 13:26:52 +00:00
Florian Friesdorf
7be82b3f59
fix scsi-link-power-management.nix which broke cpufreq
...
svn path=/nixos/trunk/; revision=31507
2012-01-13 08:46:32 +00:00
Arie Middelkoop
3ef0f14925
Added an option to enable the firmware from 'firmware-linux-nonfree' and 'firmware-linux-free'.
...
svn path=/nixos/trunk/; revision=31502
2012-01-12 17:17:01 +00:00
Florian Friesdorf
0862ca9fa7
sudoers: LOCALE_ARCHIVE, TERMINFO_DIRS for root and %wheel
...
svn path=/nixos/trunk/; revision=31491
2012-01-12 07:54:14 +00:00
Florian Friesdorf
f169f60575
powerManagement.enable sets link_power_management_policy to min_power
...
svn path=/nixos/trunk/; revision=31490
2012-01-12 07:54:09 +00:00
Peter Simons
036e585b42
modules/services/printing/cupsd.nix: tell cups to use 'gstoraster' instead of 'pstoraster'
...
The CUPS filter has been renamed in GNU Ghostscript 9.x. Fortunately,
Ghostscript ships with a MIME conversions file that informs CUPS about this,
so linking that file into /etc/cups works fine. I'm not sure whether it's a
particularly elegant solution, though.
svn path=/nixos/trunk/; revision=31489
2012-01-11 23:17:36 +00:00
Yury G. Kudryashov
98f5e3b3b2
Drop kde4.5-specific code
...
svn path=/nixos/trunk/; revision=31486
2012-01-11 22:58:32 +00:00
Peter Simons
70850268e0
Revert "modules/services/printing/cupsd.nix: fixed path to DataDir"
...
This reverts commit 2a1ce489154c8543bc146a7d99e1a397eb920e1f.
svn path=/nixos/trunk/; revision=31484
2012-01-11 20:48:40 +00:00
Peter Simons
cab4a28361
synaptics: add 'additionalOptions' option
...
svn path=/nixos/trunk/; revision=31469
2012-01-10 18:40:02 +00:00
Peter Simons
6385d51f7e
modules/services/printing/cupsd.nix: fixed path to DataDir
...
svn path=/nixos/trunk/; revision=31457
2012-01-09 16:03:43 +00:00
Florian Friesdorf
66f82c043e
Revert "Revert "add ~/bin to PATH if it exists""
...
sorry m(
svn path=/nixos/trunk/; revision=31246
2012-01-03 17:29:20 +00:00
Florian Friesdorf
68e9f2e09b
Revert "add ~/bin to PATH if it exists"
...
This reverts commit 73bda7c4575b5664d54340db95fec2fa759b6f28.
svn path=/nixos/trunk/; revision=31243
2012-01-03 17:11:21 +00:00
Florian Friesdorf
7b7976ac01
export NIX_PROFILES and NIX_USER_PROFILE_DIR
...
svn path=/nixos/trunk/; revision=31242
2012-01-03 17:11:19 +00:00
Florian Friesdorf
b4765401af
add ~/bin to PATH if it exists
...
svn path=/nixos/trunk/; revision=31235
2012-01-03 14:36:05 +00:00
Florian Friesdorf
007d56b69f
intel-5150.nix: add Intel 5150 wireless firmware support
...
Author: Sergey Mironov <ierton@gmail.com>
svn path=/nixos/trunk/; revision=31231
2012-01-03 14:12:41 +00:00
Peter Simons
8eca4db54a
/etc/profile: do not add ~/bin to $PATH in system-wide init file
...
Users who want a user-specific bin directory to override system paths should
configure that in their user-specific ~/.bashrc, not in the system-wide init
file. The global file shouldn't add directories from user homes to $PATH
without knowing whether those actually exist or whether the users even want
them in $PATH. On my system, for example, there is no ~/bin, so I don't want my
$PATH to look for one. Removing an erroneous entry from $PATH is cumbersome,
but adding one is easy, so it feels better to err on the side of caution.
svn path=/nixos/trunk/; revision=31188
2011-12-31 12:56:45 +00:00
Florian Friesdorf
ea121d0ff9
Revert "EMACSLOADPATH in /etc/profile"
...
svn path=/nixos/trunk/; revision=31187
2011-12-31 06:24:12 +00:00
Florian Friesdorf
a38ca160ec
EMACSLOADPATH in /etc/profile
...
svn path=/nixos/trunk/; revision=31175
2011-12-31 04:14:36 +00:00
Florian Friesdorf
b0fefb876f
unset MOZ_PLUGIN_PATH and TERMINFO_DIRS before setting them
...
svn path=/nixos/trunk/; revision=31174
2011-12-31 04:14:31 +00:00
Florian Friesdorf
221c637356
fix MOZ_PLUGIN_PATH
...
svn path=/nixos/trunk/; revision=31168
2011-12-31 02:57:45 +00:00
Florian Friesdorf
97ce0b1386
MOZ_PLUGIN_PATH based on NIX_PROFILES
...
svn path=/nixos/trunk/; revision=31167
2011-12-31 02:05:51 +00:00
Florian Friesdorf
76986a24f9
enable noX11 on kernel cmdline to suppress start of X
...
xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.
Thanks to viric for the general idea.
svn path=/nixos/trunk/; revision=31166
2011-12-31 00:24:48 +00:00
Florian Friesdorf
5b7e7bb429
services.xserver.xkbVariant
...
svn path=/nixos/trunk/; revision=31165
2011-12-30 23:26:11 +00:00
Florian Friesdorf
da90f06ff8
4965agn was wrongly detected as a 3945abg
...
svn path=/nixos/trunk/; revision=31164
2011-12-30 23:26:06 +00:00
Peter Simons
e91c6ea1ce
modules/system/upstart-events/shutdown.nix: refer to bash binary with full path
...
Upstart won't find a "bash" binary in $PATH when those commands are run, so we
refer to it using an absolute path.
svn path=/nixos/trunk/; revision=31157
2011-12-30 16:57:39 +00:00
Florian Friesdorf
b2eb54ae5a
set TERMINFO_DIRS according to NIX_PROFILES
...
this finally makes rxvt-unicode work without manually linking it's terminfo
svn path=/nixos/trunk/; revision=31145
2011-12-29 19:38:03 +00:00
Florian Friesdorf
05a49f663e
include /share/terminfo into default pathsToLink
...
svn path=/nixos/trunk/; revision=31144
2011-12-29 19:38:00 +00:00
Florian Friesdorf
8ed89125b5
linewrap pathsToLink
...
svn path=/nixos/trunk/; revision=31143
2011-12-29 19:37:54 +00:00
Nicolas Pierron
338bc7b9f8
Fix nixos-option without argument.
...
svn path=/nixos/trunk/; revision=31139
2011-12-29 06:33:34 +00:00
Florian Friesdorf
eb755d4692
switched all mergeOptionString to pkgs.lib.types.string
...
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.
For my system the change evaluated to the exactly same.
svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Florian Friesdorf
3ebc7727f7
Revert "test we have cryptsetup-1.4.1 in initrd"
...
This reverts commit 025f8c40b40fad50086e8761eee61098d8fb2651.
The check was intened for building the initrd of the installer.
svn path=/nixos/trunk/; revision=31137
2011-12-28 22:37:38 +00:00
Florian Friesdorf
0544a008db
Revert "added an "error" to luksroot that should be caught"
...
This reverts commit c7967af35a13f68a8785c142582b639dc8c8e92c.
svn path=/nixos/trunk/; revision=31136
2011-12-28 22:36:26 +00:00
Florian Friesdorf
829bd9a727
added an "error" to luksroot that should be caught
...
svn path=/nixos/trunk/; revision=31135
2011-12-28 22:21:31 +00:00
Florian Friesdorf
c7fd05a650
test we have cryptsetup-1.4.1 in initrd
...
svn path=/nixos/trunk/; revision=31132
2011-12-28 21:46:50 +00:00
Florian Friesdorf
c15aa7aea3
luksroot uses preLVMCommands instead of postDeviceCommands
...
svn path=/nixos/trunk/; revision=31131
2011-12-28 21:46:48 +00:00
Florian Friesdorf
90756a787c
add preLVMCommands hook
...
svn path=/nixos/trunk/; revision=31130
2011-12-28 21:46:45 +00:00
Florian Friesdorf
0a9f3a36ec
luksroot waits for usb drive
...
svn path=/nixos/trunk/; revision=31129
2011-12-28 21:46:42 +00:00
Florian Friesdorf
dd8e725d7d
copy only cryptsetup deps to stage-1 and test cryptsetup
...
popt-0.16 and cryptsetup-1.4.1 both generated pkgconfig (in contrast
to older versions). The pkgconfig files (popt.pc and cryptsetup.pc)
contain references into the store that are not removed by patchelf and
stage-1 fails with errors like: "output is not allowed to refer to
path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'".
Now, only the cryptsetup binaries and its dependencies are copied,
determined by ldd. In addition the cryptsetup binary and lvm are
tested after patchelf has adjusted the library paths.
Thanks to Peter Simons and Eelco Dolstra for giving the rights hints.
svn path=/nixos/trunk/; revision=31128
2011-12-28 21:46:40 +00:00
Florian Friesdorf
d98ecd1d9e
enable testing of extraUtilsCommands after patchelf
...
svn path=/nixos/trunk/; revision=31127
2011-12-28 21:46:35 +00:00
Lluís Batlle i Rossell
5cf6543e6e
Removing unused lines of the nfs-kernel script, and fixing some indentation.
...
svn path=/nixos/trunk/; revision=31120
2011-12-28 09:05:52 +00:00
Lluís Batlle i Rossell
99cca93398
Fixing the race condition on loading nfsd. It was not a modprobe thing like I
...
said on 31113, but again, upstart order.
I restore the usual modprobe procedure.
svn path=/nixos/trunk/; revision=31119
2011-12-28 08:44:24 +00:00
