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

1630 Commits

Author SHA1 Message Date
Peter Simons
ef932017fc smartd: run the mail notification script with ${pkgs.stdenv.shell} rather than /bin/sh 
svn path=/nixos/trunk/; revision=30568
 2011-11-25 17:09:37 +00:00
Eelco Dolstra
8eba736da9 * Use the ‘path’ attribute in Upstart jobs in more places. It's a bit 
more readable (also in "ps" output).

svn path=/nixos/trunk/; revision=30565
 2011-11-25 16:32:54 +00:00
Eelco Dolstra
1d5d7036d0 * Add a module for managing cgroups. 
svn path=/nixos/trunk/; revision=30551
 2011-11-24 18:28:45 +00:00
Peter Simons
9de905ee61 modules/programs/wvdial.nix: added support for configuring wvdial 
For example, I use the following settings to configure T-Mobile Internet
access on my laptop, which is connected to the cell phone by USB:

 | environment.wvdial.dialerDefaults = ''
 |   Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"
 |   Modem Type = USB Modem
 |   Phone = *99#
 |   ISDN = 0
 |   Username = tm
 |   Password = tm
 |   Modem = /dev/ttyACM0
 |   Baud = 460800
 | '';

svn path=/nixos/trunk/; revision=30489
 2011-11-20 10:38:26 +00:00
Eelco Dolstra
d89f4b6c76 * Revert r30370, it's no longer needed. 
svn path=/nixos/trunk/; revision=30389
 2011-11-11 15:02:30 +00:00
Eelco Dolstra
48adcd5510 * Remove xdpyinfo from the $PATH. 
svn path=/nixos/trunk/; revision=30388
 2011-11-11 03:11:32 +00:00
Eelco Dolstra
da542dc1ae * Added a module for oidentd. 
svn path=/nixos/trunk/; revision=30381
 2011-11-10 23:06:24 +00:00
Eelco Dolstra
21d808ee6c * Add a module that enables a x11vnc-based terminal server, allowing 
users to login via VNC.  Xvfb servers are started as required to
  allow multiple concurrent users.

svn path=/nixos/trunk/; revision=30374
 2011-11-10 20:52:23 +00:00
Evgeny Egorochkin
c1d7c0d6bd Remove swap cipher option because it isn't implemented and is misleading new users 
svn path=/nixos/trunk/; revision=30371
 2011-11-10 16:39:04 +00:00
Evgeny Egorochkin
698a02ee43 PulseAudio: fix config file paths 
svn path=/nixos/trunk/; revision=30370
 2011-11-10 16:37:31 +00:00
Lluís Batlle i Rossell
d9356e9a35 Fixing documentation about the prayer module, and adding a port setting, 
defaulting to something other than 80 at least.


svn path=/nixos/trunk/; revision=30363
 2011-11-09 21:08:50 +00:00
Lluís Batlle i Rossell
de5eedb612 Adding the hostname.domain and localhost.domain to hosts, if possible. 
Postfix likes this.


svn path=/nixos/trunk/; revision=30362
 2011-11-09 21:02:01 +00:00
Lluís Batlle i Rossell
578f83eef4 Adding a module for the prayer webmail. 
svn path=/nixos/trunk/; revision=30361
 2011-11-09 20:48:12 +00:00
Eelco Dolstra
0302e2cc57 * Update AMIs. 
svn path=/nixos/trunk/; revision=30348
 2011-11-08 21:28:42 +00:00
Eelco Dolstra
6b6cee46c7 * By popular demand, provide an ISO with a more recent kernel. 
svn path=/nixos/trunk/; revision=30344
 2011-11-08 19:51:39 +00:00
Eelco Dolstra
fdc51c2c97 * Disable all fbcondecor-related stuff if boot.vesa is disabled. 
svn path=/nixos/trunk/; revision=30343
 2011-11-08 19:43:15 +00:00
Eelco Dolstra
0446f652a2 * Include glxinfo/glxgears in the graphical profile. It's very small. 
svn path=/nixos/trunk/; revision=30342
 2011-11-08 19:18:34 +00:00
Eelco Dolstra
06843a45ef * Fix auto-login. 
svn path=/nixos/trunk/; revision=30341
 2011-11-08 19:02:51 +00:00
Eelco Dolstra
7d68a36851 * Remove rescue.nix (obsolete). 
svn path=/nixos/trunk/; revision=30340
 2011-11-08 19:02:28 +00:00
Eelco Dolstra
e348fbf7a4 * Allow logging in with an empty password in KDE. This is consistent 
with SLiM and local console logins.

svn path=/nixos/trunk/; revision=30339
 2011-11-08 18:50:42 +00:00
Eelco Dolstra
dd28c62879 * My grep skills are lacking. 
svn path=/nixos/trunk/; revision=30335
 2011-11-08 16:39:13 +00:00
Eelco Dolstra
51a5b775a6 * HAL is obsolete and disabling D-Bus is a bad idea. 
svn path=/nixos/trunk/; revision=30334
 2011-11-08 16:32:24 +00:00
Eelco Dolstra
b69dd8759c * minimal.nix: don't include base.nix. Also note it's not currently used. 
svn path=/nixos/trunk/; revision=30333
 2011-11-08 16:29:40 +00:00
Eelco Dolstra
f281207ea2 * Disable the RTL 8192c firmware because it doesn't build. 
svn path=/nixos/trunk/; revision=30332
 2011-11-08 16:21:57 +00:00
Eelco Dolstra
295dafed8a * Refactoring: graphical.nix no longer includes base.nix so that it 
just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD.  The "auto" display manager doesn't
  properly handle shutdowns etc.

svn path=/nixos/trunk/; revision=30331
 2011-11-08 16:17:37 +00:00
Eelco Dolstra
1cfbae6ed4 * Remove empty.nix since it's no longer used. 
svn path=/nixos/trunk/; revision=30328
 2011-11-08 15:59:46 +00:00
Eelco Dolstra
ba7f635f8b * Move the hardware bits of base.nix into a separate module, 
all-hardware.nix.  This allows base.nix (which should probably be
  renamed to something more descriptive) to be reused without getting
  the hardware configuration of the installation CD.

svn path=/nixos/trunk/; revision=30327
 2011-11-08 15:58:59 +00:00
Shea Levy
7f7eb341c8 Update the comment in the nixos-option generated configuration.nix in light of r30325 
svn path=/nixos/trunk/; revision=30326
 2011-11-08 15:51:39 +00:00
Eelco Dolstra
a76fe106e7 * nixos-hardware-scan: don't emit an include of an "install profile". 
That's confusing and wrong: nixos-hardware-scan should just enable
  support for the detected hardware, not enable lots of software (let
  alone KDE).

svn path=/nixos/trunk/; revision=30325
 2011-11-08 15:39:13 +00:00
Eelco Dolstra
3e30d87c26 * aufs2 -> aufs. 
svn path=/nixos/trunk/; revision=30323
 2011-11-08 15:12:11 +00:00
Eelco Dolstra
848485a043 * Remove installation-cd-rescue as it's not used, and the other CDs 
should also contain all appropriate rescue tools.

svn path=/nixos/trunk/; revision=30320
 2011-11-08 14:29:35 +00:00
Eelco Dolstra
5e5328cb2e * Get the SSH host key from the user data if available. This allows 
the user to create an instance with a known host key, and thus
  permit a secure connection.

svn path=/nixos/trunk/; revision=30242
 2011-11-05 01:44:56 +00:00
Eelco Dolstra
3d5f3aa2b4 * Print the host key after sshd has started to prevent a potential race. 
svn path=/nixos/trunk/; revision=30236
 2011-11-04 20:33:24 +00:00
Eelco Dolstra
8a0a0efb48 * Force getting the hostname from EC2. 
svn path=/nixos/trunk/; revision=30235
 2011-11-04 20:06:59 +00:00
Eelco Dolstra
4abfacb468 * In the initrd, automatically mount all available ephemeral disks. 
This depends on the EC2 instance type, so we have to probe for them.

svn path=/nixos/trunk/; revision=30234
 2011-11-04 18:49:59 +00:00
Eelco Dolstra
6f8e30313f * The "audio" group should always exist, even if the ALSA module is 
disabled, because udev rules refer to it.

svn path=/nixos/trunk/; revision=30229
 2011-11-04 17:40:00 +00:00
Eelco Dolstra
c5955e5474 * In EC2 instances, a kernel panic should cause a reboot, and a 
problem in stage 1 should cause a panic.  (Actually, the latter
  should probably kill the instance since we can't repair it
  anyway...)

svn path=/nixos/trunk/; revision=30215
 2011-11-03 20:11:11 +00:00
Lluís Batlle i Rossell
2825a3a6ae Allowing 'named' to have a config file apart, as it can have passwords. 
svn path=/nixos/trunk/; revision=30213
 2011-11-03 19:13:52 +00:00
Eelco Dolstra
d77fc84d2f * For consistency, use /etc/nix/nix.conf instead of /nix/etc/nix/nix.conf. 
There is really no reason to have a configuration file outside of /etc,
  and it's consistent with what the Fedora/Debian packages for Nix use.

svn path=/nixos/trunk/; revision=30212
 2011-11-03 19:04:54 +00:00
Lluís Batlle i Rossell
efc64042e0 Adding extraConfig to unbound 
svn path=/nixos/trunk/; revision=30211
 2011-11-03 18:49:54 +00:00
Eelco Dolstra
a4d2682238 * Remove loopback devices during shutdown, since they may prevent 
filesystems from being unmounted.

svn path=/nixos/trunk/; revision=30203
 2011-11-03 02:15:33 +00:00
Eelco Dolstra
aac71e8f95 * Add a module for DRBD. 
svn path=/nixos/trunk/; revision=30202
 2011-11-03 02:14:57 +00:00
Eelco Dolstra
0309f02fc5 * Add period. 
svn path=/nixos/trunk/; revision=30201
 2011-11-03 02:14:40 +00:00
Eelco Dolstra
ba1a7188c1 * Don't get the hostname from EC2 if one has been set explicitly. 
svn path=/nixos/trunk/; revision=30200
 2011-11-03 01:29:40 +00:00
Eelco Dolstra
fe566d84ae * Remove references to the "safemode" boot option, which doesn't do 
anything.

svn path=/nixos/trunk/; revision=30199
 2011-11-03 00:46:29 +00:00
Lluís Batlle i Rossell
9489c5a02b Setting default of unbound.enable to disabled. Few may want it enabled. 
svn path=/nixos/trunk/; revision=30198
 2011-11-02 21:04:32 +00:00
Lluís Batlle i Rossell
5cb67ef832 Adding a module for unbound. 
svn path=/nixos/trunk/; revision=30197
 2011-11-02 20:59:12 +00:00
Eelco Dolstra
e0573105b7 * Disable stuff like ALSA and the splash screen in headless setups 
(like EC2 instances).

svn path=/nixos/trunk/; revision=30192
 2011-11-02 16:10:30 +00:00
Eelco Dolstra
3fd482677e * modprobe wants /etc/modprobe.d now. 
svn path=/nixos/trunk/; revision=30164
 2011-11-01 15:39:30 +00:00
Eelco Dolstra
71e6f6ecdc * Start httpd after postgresql since the mediawiki subservice depends 
on it.

svn path=/nixos/trunk/; revision=30161
 2011-11-01 13:44:48 +00:00
Eelco Dolstra
07694cab46 * Doh. Never rename a variable *after* testing. 
svn path=/nixos/trunk/; revision=30160
 2011-11-01 02:53:37 +00:00
Eelco Dolstra
b024940384 * Enable upower on the graphical ISO. 
svn path=/nixos/trunk/; revision=30156
 2011-10-31 21:08:22 +00:00
Eelco Dolstra
cf03194d59 * Disable Nepomuk/Strigi by default because they cause problems 
(e.g. segfaults whn loggin in to the NixOS graphical ISO) and don't
  really work very well (e.g. fail to find files).  They can be
  re-enabled in the KDE System Settings.

svn path=/nixos/trunk/; revision=30155
 2011-10-31 21:04:39 +00:00
Evgeny Egorochkin
0d2ef63b84 Quassel: fix package name 
svn path=/nixos/trunk/; revision=30142
 2011-10-31 12:48:59 +00:00
Nicolas Pierron
262e883554 Add more options for LDAP module. (timeLimit, bind.timeLimit, bind.policy) 
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=30138
 2011-10-30 18:46:31 +00:00
Peter Simons
20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc. 
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
 2011-10-30 15:19:58 +00:00
Shea Levy
fe045dc949 sed -i -e 's|/nix/var|@stateDir@|g' -e 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh 
Use configurable storeDir and stateDir in the installer tools

svn path=/nixos/trunk/; revision=30106
 2011-10-29 22:14:27 +00:00
Shea Levy
a16d43a8ac Make the stateDir and storeDir available for substitution into the tools 
svn path=/nixos/trunk/; revision=30105
 2011-10-29 22:00:25 +00:00
Shea Levy
09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g' 
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
 2011-10-29 21:03:57 +00:00
Shea Levy
9d496c77ac nixpkgs: Always set nixpkgs.config.{state,store}Dir 
This will allow NixOS modules to always refer to config.nixpkgs.config.nix to find the store or state
directory

svn path=/nixos/trunk/; revision=30103
 2011-10-29 18:20:02 +00:00
Lluís Batlle i Rossell
035ccb8faf Making dovecot2 authentication work (wrong pam module) 
svn path=/nixos/trunk/; revision=30076
 2011-10-27 22:04:08 +00:00
Lluís Batlle i Rossell
69a31a37e4 Adding a module for dovecot2. I've not tried it much. 
svn path=/nixos/trunk/; revision=30072
 2011-10-27 19:43:20 +00:00
Eelco Dolstra
ce822289c3 * Create /etc/localtime as a symlink to the right zoneinfo file. 
However, this won't do anything until we merge the stdenv branch.

svn path=/nixos/trunk/; revision=30071
 2011-10-27 19:36:03 +00:00
Lluís Batlle i Rossell
1fe1481adf Fixing systemhealth for kernels 3.x 
svn path=/nixos/trunk/; revision=30068
 2011-10-27 18:06:54 +00:00
Eelco Dolstra
3397bc6e09 * Recent kernels need some more modules in the initrd to be able to do 
CIFS mounts.

svn path=/nixos/trunk/; revision=30067
 2011-10-27 17:46:25 +00:00
Eelco Dolstra
926091c265 * Make the permissions on /run less liberal. 
svn path=/nixos/trunk/; revision=30065
 2011-10-27 17:34:16 +00:00
Lluís Batlle i Rossell
c7f568dc06 Fixing the xserver.enableTCP for kdm. 
svn path=/nixos/trunk/; revision=30056
 2011-10-27 15:43:13 +00:00
Eelco Dolstra
564f7358f1 * Fix EC2 terminology: zone -> region. (Availability zones are 
something else.)

svn path=/nixos/trunk/; revision=30050
 2011-10-26 23:44:13 +00:00
Eelco Dolstra
6e809242e9 * Ensure that the "kde" PAM module exists whn KDE is enabled. 
Previously, this was only enabled in the KDM module, so if you were
  using a different display manager than KDM, stuff like getting out
  of the screensaver didn't work correctly.

svn path=/nixos/trunk/; revision=30049
 2011-10-26 21:47:03 +00:00
Eelco Dolstra
021409b21f * Declaring fileSystems as "loa" (list or attribute set) is bad because it can 
cause the filesystems to be reordered.  During stage 1, the ordering of
  filesystems is sensitive.  (In stage 2, mountall ensures that filesystems
  are mounted in the right order.)

svn path=/nixos/trunk/; revision=30046
 2011-10-26 19:37:47 +00:00
Eelco Dolstra
0fce64bb37 * Specify more option types. 
svn path=/nixos/trunk/; revision=30045
 2011-10-26 18:08:58 +00:00
Eelco Dolstra
8137be6f27 * Updated eu-west-1 64-bit image. 
svn path=/nixos/trunk/; revision=30017
 2011-10-25 17:14:22 +00:00
Eelco Dolstra
a9cfde0df1 * securityGroup -> securityGroups. 
svn path=/nixos/trunk/; revision=30014
 2011-10-25 15:27:29 +00:00
Eelco Dolstra
e4a6ea0632 * Add some options that are useful in Charon network specifications. 
svn path=/nixos/trunk/; revision=30006
 2011-10-25 04:01:34 +00:00
Eelco Dolstra
a82bfec343 * Add an option ‘deployment.ec2.zone’. For EC2 deployments, this 
automatically sets ‘deployment.ec2.controller’ and
  ‘deployment.ec2.ami’ to sensible values.

svn path=/nixos/trunk/; revision=30005
 2011-10-25 01:59:39 +00:00
Eelco Dolstra
49adbed510 * Add a module that provides all the Radeon firmwares. 
svn path=/nixos/trunk/; revision=30004
 2011-10-25 00:27:07 +00:00
Eelco Dolstra
0a1fee9ec8 * Add a module for the Broadcom firmware. Also, add it to the 
installation CD (though the kernel on the CD is not recent
  enough yet to actually support the device).  (This is kind of
  an abuse of "not-detected.nix".)

svn path=/nixos/trunk/; revision=30003
 2011-10-24 23:41:33 +00:00
Eelco Dolstra
504f4943a0 * Add a securityGroup attribute for EC2 deployment. 
svn path=/nixos/trunk/; revision=30001
 2011-10-24 19:27:58 +00:00
Eelco Dolstra
5a03989036 * Fix Amazon image generation (there is no $ORIG_TMPDIR in 
runInLinuxVM anymore; use /tmp/xchg instead).

svn path=/nixos/trunk/; revision=29970
 2011-10-21 23:39:05 +00:00
Eelco Dolstra
9076456b15 * Don't restart udevtrigger from the switch script. It's triggered by 
udev.

svn path=/nixos/trunk/; revision=29962
 2011-10-21 16:22:38 +00:00
Lluís Batlle i Rossell
b5baad31d2 The virtual consoles were launching a bash not aware of locales. 
svn path=/nixos/trunk/; revision=29882
 2011-10-18 21:44:35 +00:00
Lluís Batlle i Rossell
62dede7121 The system health url moved. 
svn path=/nixos/trunk/; revision=29881
 2011-10-18 21:44:06 +00:00
Nicolas Pierron
38bc39c299 Add support for NFS root file system. 
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29855
 2011-10-15 21:01:30 +00:00
Joachim Schiele
298186fd06 added cntlm as a system service with its own user 'cntlm' 
svn path=/nixos/trunk/; revision=29737
 2011-10-09 22:34:32 +00:00
Eelco Dolstra
00ce9aaf1a * svn.nixos.org -> nixos.org. 
svn path=/nixos/trunk/; revision=29690
 2011-10-06 11:29:44 +00:00
Eelco Dolstra
0f816374c7 * Use shm and posixsem for the SSL session cache. 
svn path=/nixos/trunk/; revision=29658
 2011-10-05 12:24:53 +00:00
Peter Simons
18d52f8f4b modules/installer/scan/not-detected.nix: don't depend on pkgs.rt73fw 
The rt73 firmware has disappeared from the upstream server, and we don't
have a new URL yet.

svn path=/nixos/trunk/; revision=29620
 2011-10-04 08:45:15 +00:00
Nicolas Pierron
47a1941696 LDAP non-anonymous bind. 
Patch by Rickard Nilsson.

svn path=/nixos/trunk/; revision=29563
 2011-10-02 13:24:10 +00:00
Shea Levy
3a201ef6a7 Enable building ISOs for aufs3 kernels 
svn path=/nixos/trunk/; revision=29538
 2011-09-28 22:43:53 +00:00
Peter Simons
32d6a441a5 modules/tasks/network-interfaces.nix: create network bridges with "forward delay" set to zero 
This change obsoletes the need to increase the IPv6 "router_solicitations" parameter.

svn path=/nixos/trunk/; revision=29493
 2011-09-26 09:41:40 +00:00
Peter Simons
84a37365c2 modules/services/printing/cupsd.nix: ensure that /etc/cups exists before the daemon is run 
CUPS is really unhappy when /etc/cups doesn't exist, and without that
directory it's going to mess up file permissions of /nix/store, the web
front-end won't work, and probably all kinds of other stuff is broken
that I didn't notice yet. :-(

svn path=/nixos/trunk/; revision=29452
 2011-09-23 14:41:22 +00:00
Peter Simons
432d71f3ed modules/programs/bash: major clean-up and re-factoring of /etc/profile and /etc/bashrc 
* Moved bash-specific code from /etc/profile to /etc/bashrc.

 * Moved general Bourne shell code from /etc/bashrc to /etc/profile.

 * Added "include guards" to both files to ensure that they aren't sourced
   multiple times (which would result in lots of redundancy in $PATH, etc.).

 * Both files include each other to make sure that the correct system
   environment is always defined.

 * When the current user has installed the 'bash-completion' package in her
   $HOME/.nix-profile, programmable completion is automatically enabled in
   interactive shells.

 * The /etc/skel/.bashrc we installed has been dropped because it is redundant.

svn path=/nixos/trunk/; revision=29451
 2011-09-23 14:21:36 +00:00
Eelco Dolstra
3fa2bbd029 * Properly shut down udevd in stage 1. Otherwise there is a slight 
possibility that a udevd process survives, preventing udevd from
  starting in stage 2:

  machine# udevd[1421]: bind failed: Address already in use
  machine# udevd[1421]: error binding udev control socket

svn path=/nixos/trunk/; revision=29434
 2011-09-22 08:26:58 +00:00
Marco Maggesi
229b99321f Make blcr module use the configured kernel 
svn path=/nixos/trunk/; revision=29413
 2011-09-21 13:13:36 +00:00
David Guibert
7d982fd1bd cups: fix smb backend 
svn path=/nixos/trunk/; revision=29393
 2011-09-20 07:14:27 +00:00
David Guibert
df1c3dda68 autofs: add sshfs to PATH 
svn path=/nixos/trunk/; revision=29392
 2011-09-20 07:14:24 +00:00
Marco Maggesi
91a6dc6168 Make VirtualBox Guest Additions use the configured kernel. 
svn path=/nixos/trunk/; revision=29346
 2011-09-19 13:20:09 +00:00
Alexander Tsamutali
8e13361521 modules/profiles/base.nix: Added gptfdisk. 
svn path=/nixos/trunk/; revision=29320
 2011-09-17 13:09:38 +00:00
Eelco Dolstra
4fff0d2291 * Log sitecopy runs. 
svn path=/nixos/trunk/; revision=29299
 2011-09-15 15:33:34 +00:00
Eelco Dolstra
61072f8995 * Add a module for a Flash policy server. 
svn path=/nixos/trunk/; revision=29296
 2011-09-15 15:13:46 +00:00
Peter Simons
8abea71eaa modules/services/monitoring/smartd.nix: run the daemon with --no-fork to make life easier for upstart 
svn path=/nixos/trunk/; revision=29287
 2011-09-14 18:30:10 +00:00
Peter Simons
d1cf78c756 modules/services/monitoring/smartd.nix: provide the implicitly set flag '-a' explicitly 
svn path=/nixos/trunk/; revision=29286
 2011-09-14 18:30:07 +00:00
Peter Simons
eb6e1310b8 strip trailing whitespace; no functional change 
svn path=/nixos/trunk/; revision=29285
 2011-09-14 18:20:50 +00:00
Peter Simons
f5e8d35f8e modules/services/printing/cupsd.nix: /etc/cups/mime.{convs,types} are obsolete 
Current versions of CUPS (1.4.7 or later, apparently) load these files
from ${cups}/share/mime, so we no longer need the symlinks in /etc.

svn path=/nixos/trunk/; revision=29284
 2011-09-14 18:20:13 +00:00
Russell O'Connor
1744733be8 Revering CUPS update. 
svn path=/nixos/trunk/; revision=29283
 2011-09-14 17:58:57 +00:00
Peter Simons
02bb4eb289 modules/services/printing/cupsd.nix: MIME related config files have moved to share in cups 1.5 
svn path=/nixos/trunk/; revision=29254
 2011-09-13 20:42:21 +00:00
Peter Simons
a499049ce5 Strip trailing whitespace. 
svn path=/nixos/trunk/; revision=29246
 2011-09-13 18:49:50 +00:00
Peter Simons
d3528a3c4e modules/system/boot/stage-1-init.sh: added "boot.runSize" option to determine the maximum size of the /run tmpfs 
svn path=/nixos/trunk/; revision=29245
 2011-09-13 18:49:47 +00:00
Peter Simons
c01c41e2da modules/system/boot/kernel.nix: disable "elevator=cfq" boot parameter for the time being 
This setting causes the init ram disk to hang indefinitely on some systems.

svn path=/nixos/trunk/; revision=29228
 2011-09-12 18:01:18 +00:00
Eelco Dolstra
64340dc03c * Set OPENSSL_X509_CERT_FILE. 
svn path=/nixos/trunk/; revision=29225
 2011-09-12 17:01:43 +00:00
Eelco Dolstra
7dc59f0bb0 * Zabbix: only enable PostgreSQL if it's on the same machine. 
svn path=/nixos/trunk/; revision=29185
 2011-09-11 15:55:43 +00:00
Yury G. Kudryashov
7a858f2a89 Adjust DM/kde4.nix to latest changes in kde-4.7 
svn path=/nixos/trunk/; revision=29181
 2011-09-11 12:44:54 +00:00
Yury G. Kudryashov
c56a8456ed Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config 
Namely, allow {pkgs}: { packageOverrides = p: ...; };

svn path=/nixos/trunk/; revision=29180
 2011-09-11 12:41:47 +00:00
Yury G. Kudryashov
9a096c9ee7 Partially revert r2903 
The nepomuk&virtuoso problem is solved without polutting $QT_PLUGIN_PATH and/or
$LD_LIBRARY_PATH by patching soprano.

svn path=/nixos/trunk/; revision=29107
 2011-09-07 23:11:04 +00:00
Yury G. Kudryashov
bcee582a74 Preserve <standard_session_service_dirs/> in dbus.conf 
This way *session* dbus daemon loads services from XDG_DATA_DIRS

svn path=/nixos/trunk/; revision=29106
 2011-09-07 23:07:05 +00:00
Peter Simons
6c08bf40a6 modules/system/boot/kernel.nix: stripped trailing whitespace 
svn path=/nixos/trunk/; revision=29101
 2011-09-07 20:36:13 +00:00
Eelco Dolstra
ed1bc1e180 * Handle the case where a symlink in /etc needs to change into a 
directory.  This happened with /etc/polkit-1, which used to be a
  symlink to /etc/static/polkit-1, which was itself a symlink but now
  is a directory.  Not handling this correctly led to /etc/static
  being clobbered with symlinks pointing to themselves.

svn path=/nixos/trunk/; revision=29061
 2011-09-06 12:32:07 +00:00
Eelco Dolstra
4a65eb6830 * Create /var/lib/upower, where upowerd keeps historical battery data. 
svn path=/nixos/trunk/; revision=29057
 2011-09-06 11:18:36 +00:00
Eelco Dolstra
5de82a6802 svn path=/nixos/trunk/; revision=29053 2011-09-05 23:33:29 +00:00
Eelco Dolstra
0de04bd4be * Xfce 4.6 fix. 
svn path=/nixos/trunk/; revision=29046
 2011-09-05 20:50:15 +00:00
Eelco Dolstra
8d8c250b8f * Enable gvfs in Xfce. 
svn path=/nixos/trunk/; revision=29044
 2011-09-05 20:37:06 +00:00
Eelco Dolstra
94014f4adc * Get the Virtuoso backend in Soprano/Nepomuk to work. Soprano tries 
to find virtodbc_r.so in QT_PLUGIN_PATH (among other locations), so
  make sure that Virtuoso can be found there.

svn path=/nixos/trunk/; revision=29033
 2011-09-05 17:55:53 +00:00
Eelco Dolstra
4b8275d2c4 * Force loading of the CFQ module, i.e. don't do it on demand — that 
seems to cause weird modprobe hangs.

svn path=/nixos/trunk/; revision=29027
 2011-09-05 14:58:26 +00:00
Eelco Dolstra
453675c5c1 * Allow literal examples to be included in the manual. 
svn path=/nixos/trunk/; revision=29025
 2011-09-05 10:14:42 +00:00
Eelco Dolstra
5813e99fb3 * Fix description. 
svn path=/nixos/trunk/; revision=29022
 2011-09-05 09:46:14 +00:00
Nicolas Pierron
6669cf61f4 Add merge capabilities to nixpkgs.config option. 
svn path=/nixos/trunk/; revision=29021
 2011-09-05 09:19:59 +00:00
Nicolas Pierron
def746fcdd Add Intel firmwars (iwlwifi-6000g2{a,b}-ucode). 
svn path=/nixos/trunk/; revision=29020
 2011-09-05 09:19:55 +00:00
Eelco Dolstra
0cbdfb2bbf * Use boot.initrd.availableKernelModules for the QEMU modules. 
svn path=/nixos/trunk/; revision=28973
 2011-09-02 13:20:05 +00:00
Eelco Dolstra
8b3fd3ed49 * Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This 
was already the case on Linux 2.6.32, but in newer kernels the CFQ
  scheduler is built as a module, so all block devices got the ‘none’
  scheduler instead.

svn path=/nixos/trunk/; revision=28972
 2011-09-02 13:19:45 +00:00
Lluís Batlle i Rossell
8138feb630 The VM did not want to mount the CIFS without these two modules available in stage1. 
svn path=/nixos/trunk/; revision=28947
 2011-08-31 21:20:48 +00:00
Eelco Dolstra
bd5ca54584 * Add fsck.vfat etc. to the default install. Useful for USB sticks 
and stuff like that.

svn path=/nixos/trunk/; revision=28934
 2011-08-30 18:25:54 +00:00
Yury G. Kudryashov
5ee15d4986 Fix hal evaluation 
svn path=/nixos/trunk/; revision=28842
 2011-08-26 17:30:53 +00:00
Yury G. Kudryashov
c174554ad7 polkit_kde_agent is now kde4.polkit_kde_agent 
svn path=/nixos/trunk/; revision=28834
 2011-08-26 13:50:03 +00:00
Yury G. Kudryashov
42a03ef0eb Sync with dbus changes in nixpkgs 
svn path=/nixos/trunk/; revision=28832
 2011-08-26 13:46:59 +00:00
Yury G. Kudryashov
ea4630bf97 Allow RUN+="socket:..." in udev rules 
svn path=/nixos/trunk/; revision=28808
 2011-08-25 08:06:09 +00:00
Shea Levy
25594961ad modprobe.nix: Blacklist snd_pcsp by default 
svn path=/nixos/trunk/; revision=28805
 2011-08-24 23:37:40 +00:00
Yury G. Kudryashov
e5917ea6fc Merge with udev-173 
The only conflict was the addition of two different options at the same place.

svn path=/nixos/trunk/; revision=28801
 2011-08-24 21:24:39 +00:00
Eelco Dolstra
1aa1c86afc * Enable upower and udisks for Xfce 4.8. 
svn path=/nixos/trunk/; revision=28764
 2011-08-22 23:10:24 +00:00
Eelco Dolstra
3b1c741f3f * Xfce 4.8 doesn't need HAL anymore. 
svn path=/nixos/trunk/; revision=28762
 2011-08-22 22:52:13 +00:00
Eelco Dolstra
ecbfe0d9c0 * Cause KDE's Polkit authentication agent to be started at login. 
You now get a nice popup window asking for the appropriate password
  if you try to do something that requires administrative privilege
  (e.g. "pkexec ls" in a terminal, unmounting devices that don't
  belong to you in Dolphin, or killing other people's processes in
  ksysguard).

svn path=/nixos/trunk/; revision=28735
 2011-08-22 11:51:03 +00:00
Eelco Dolstra
d1ae2c2ac1 * Polkit: remove the wrapper since it's no longer needed (and didn't 
really work as far as I can tell).

svn path=/nixos/trunk/; revision=28734
 2011-08-22 11:46:32 +00:00
Eelco Dolstra
13a2563d02 * Create /var/lib/udisks because that's where udisks keeps its mtab 
file.  Without this, users are not able to unmount their own
  devices (because udisks doesn't remember who mounted them).

svn path=/nixos/trunk/; revision=28730
 2011-08-21 21:03:02 +00:00
Eelco Dolstra
7980c71d9c * Add some options to allow setting PolKit permissions. 
svn path=/nixos/trunk/; revision=28729
 2011-08-21 20:38:45 +00:00
Peter Simons
a84ada1d92 modules/services/monitoring/smartd.nix: pass TZ variable to smartd to ensure that notification e-mails have a proper time zone 
svn path=/nixos/trunk/; revision=28702
 2011-08-19 20:44:12 +00:00
Yury G. Kudryashov
9177fc455d Adjust nixos to latest changes in kde-4.7 in nixpkgs 
svn path=/nixos/trunk/; revision=28598
 2011-08-15 18:08:12 +00:00
Eelco Dolstra
4790c147bf * Revert r28400 because ConsoleKit got reverted to 0.4.1. 
svn path=/nixos/trunk/; revision=28587
 2011-08-15 14:48:32 +00:00
Lluís Batlle i Rossell
4bc0bfec4c Making the system-tarball-pc boot fine with PXE, and include help files and a 
readme file as examples for an easy PXE setup.

This allows booting the NixOS in the system tarball, and thus allows installing nixos.


svn path=/nixos/trunk/; revision=28585
 2011-08-15 14:37:00 +00:00
Lluís Batlle i Rossell
8f6a4be721 Trying to make the system tarball for pc closer to PXE boot. 
svn path=/nixos/trunk/; revision=28573
 2011-08-14 22:01:58 +00:00
Eelco Dolstra
7e2ea4df32 * Xsession script: set the current directory to $HOME. 
svn path=/nixos/trunk/; revision=28511
 2011-08-12 10:04:43 +00:00
Shea Levy
38cab9070f synaptics module: By default, disable edge drag scrolling if two finger scrolling is enabled 
svn path=/nixos/trunk/; revision=28472
 2011-08-10 22:14:46 +00:00
David Guibert
96304c9afc make the virtualbox guest module loadable by modprobe. 
svn path=/nixos/trunk/; revision=28436
 2011-08-09 19:53:01 +00:00
Eelco Dolstra
74586fd2bb * Fix the permissions on /tmp. 
svn path=/nixos/trunk/; revision=28435
 2011-08-09 15:32:39 +00:00
Eelco Dolstra
d75efe4aa1 * For security, don't mount the entire host filesystem. 
svn path=/nixos/trunk/; revision=28429
 2011-08-09 14:07:44 +00:00
Eelco Dolstra
45d8c418b5 * Some hackery to get ConsoleKit to work with the SLIM and "auto" 
display managers.  This was broken due to a change in ConsoleKit
  0.4.2:

    https://bugs.freedesktop.org/show_bug.cgi?id=28377

  Using ConsoleKit's pam-ck-connector helps in that it creates local
  sessions; however, they're not marked as active because the
  x11-display-device property is not set.  As a workaround, calling
  ck-launch-session seems to work.

  More details:

    https://bugs.gentoo.org/show_bug.cgi?id=336634
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150
    https://bugzilla.redhat.com/show_bug.cgi?id=585952

svn path=/nixos/trunk/; revision=28400
 2011-08-08 19:28:17 +00:00
Eelco Dolstra
eba6e0456b * Use the VESA driver. It seems to work better now. In particular, 
it doesn't turn blue backgrounds into yellow (see
  e.g. http://hydra.nixos.org/build/1232626/download/1/screen.png).

svn path=/nixos/trunk/; revision=28395
 2011-08-08 15:16:42 +00:00
Eelco Dolstra
8b30a8f23f * In the VM tests, add "-m 0" to syslogd to kill the "-- MARK --" 
messages.  These prevent hanging tests from being killed after 1
  hour of silence.

svn path=/nixos/trunk/; revision=28393
 2011-08-08 14:40:16 +00:00
Shea Levy
843ccae5d5 multitouch: Use the right package name 
svn path=/nixos/trunk/; revision=28375
 2011-08-08 01:39:26 +00:00
Shea Levy
b17bb81765 multitouch: Actually add it to the module list 
svn path=/nixos/trunk/; revision=28374
 2011-08-08 01:37:49 +00:00
Shea Levy
9464c99ce2 First attempt at a multitouch touchpad module. 
Note that the Multitouch X Driver currently has no configuration beyond editing the source code, so the only option is enable or disable

svn path=/nixos/trunk/; revision=28373
 2011-08-08 01:34:36 +00:00
Shea Levy
30861ecbc8 Create multitouch module based off synaptics module 
svn path=/nixos/trunk/; revision=28372
 2011-08-08 01:27:44 +00:00
Karn Kallio
c36cf7b591 Reflect kdegraphics organization. 
svn path=/nixos/trunk/; revision=28214
 2011-08-07 00:52:35 +00:00
Eelco Dolstra
2af368279c * Set NIX_PATH to something reasonable. 
svn path=/nixos/trunk/; revision=28202
 2011-08-06 18:55:00 +00:00
Eelco Dolstra
1df952182a * Only flush the POSTROUTING chain. 
svn path=/nixos/trunk/; revision=28153
 2011-08-04 15:33:40 +00:00
Eelco Dolstra
3fb6026191 * Add smartmontools. 
svn path=/nixos/trunk/; revision=28121
 2011-08-02 06:53:09 +00:00
Eelco Dolstra
8aad8c536f * Make virtualisation.qemu.options a list. 
svn path=/nixos/trunk/; revision=28120
 2011-08-02 06:52:10 +00:00
Eelco Dolstra
d890e74d9c * Hacks to keep KDE 4.5 working. The latest D-Bus is more strict in 
checking function arguments, so DBUS_FATAL_WARNINGS=0 is necessary
  to prevent KDE from aborting.  Also put the Phonon gstreamer backend
  in the environment if available.

svn path=/nixos/trunk/; revision=28113
 2011-08-01 14:28:28 +00:00
Eelco Dolstra
7a7d781e6a * Allow the PulseAudio server to be overriden. 
svn path=/nixos/trunk/; revision=28112
 2011-08-01 13:26:51 +00:00
Eelco Dolstra
44725e50f0 * Apply the resource limits set by security.pam.loginLimits to all PAM 
services (rather than just login(1)).  It's rather unexpected if
  resource limits are not applied to (say) users logged in via SSH or
  X11.

svn path=/nixos/trunk/; revision=28105
 2011-08-01 10:17:18 +00:00
Eelco Dolstra
af22531d38 * Remove the hydra-mirror module from NixOS, it's too specialised. 
svn path=/nixos/trunk/; revision=28024
 2011-07-31 22:00:29 +00:00
Eelco Dolstra
7d69a82b55 * Put the CA certificate bundle in /etc/ssl/certs because Qt expects 
them there.

svn path=/nixos/trunk/; revision=28009
 2011-07-29 19:06:27 +00:00
Rob Vermaas
d0ad799582 bind mount /proc in chroot dureing image creation, to prevent some error 
svn path=/nixos/trunk/; revision=28002
 2011-07-29 14:55:42 +00:00
Eelco Dolstra
fc9f6d0395 svn path=/nixos/trunk/; revision=27991 2011-07-28 16:35:13 +00:00
Eelco Dolstra
31afd2bb2e * vsftpd: use /var/empty instead of /var/ftp/empty as the empty 
chroot (the latter doesn't exist).
* vsftpd: make the anonymous user's home read-only, otherwise vsftpd
  will fail.

svn path=/nixos/trunk/; revision=27983
 2011-07-28 09:42:20 +00:00
Nicolas Pierron
66ffeb3fd9 UPS: Make sure the driver pid files can be stored. 
svn path=/nixos/trunk/; revision=27979
 2011-07-27 20:55:39 +00:00
Nicolas Pierron
ef63ea98f4 Experiment with dual option types (list & attribute sets). 
svn path=/nixos/trunk/; revision=27978
 2011-07-27 20:55:35 +00:00
Nicolas Pierron
e231543033 Add new services: freepops, fuppes and ups. 
svn path=/nixos/trunk/; revision=27977
 2011-07-27 20:55:28 +00:00
Eelco Dolstra
abb2779840 * The write_cd_rules script in udev needs udev in its $PATH. 
svn path=/nixos/trunk/; revision=27970
 2011-07-26 21:01:36 +00:00
Eelco Dolstra
d1f1cfcd41 * Don't make PulseAudio a requirement for KDE, it works fine without 
it (especially now that KDE doesn't try to start PulseAudio
  automatically).

svn path=/nixos/trunk/; revision=27969
 2011-07-26 18:34:59 +00:00
Eelco Dolstra
3b374ea326 * Move PulseAudio initialisation below the re-exec to prevent it from 
being started twice.

svn path=/nixos/trunk/; revision=27968
 2011-07-26 18:34:10 +00:00
Eelco Dolstra
3fdc209978 * Start PulseAudio from the X session script. 
svn path=/nixos/trunk/; revision=27967
 2011-07-26 18:16:24 +00:00
Eelco Dolstra
77c85b1de7 * Install /etc/pulse/default.pa and /etc/pulse/system.pa. 
* If PulseAudio is disabled in the NixOS config, then disable
  autospawning of the PulseAudio server in /etc/pulse/client.conf.

svn path=/nixos/trunk/; revision=27966
 2011-07-26 17:35:47 +00:00
Eelco Dolstra
aa5f5ed2e5 * I should test first. 
svn path=/nixos/trunk/; revision=27964
 2011-07-26 14:19:06 +00:00
Eelco Dolstra
645205b600 * Add a module for rtkit. The PulseAudio module enables rtkit to 
acquire real-time priority.

svn path=/nixos/trunk/; revision=27963
 2011-07-26 14:14:10 +00:00
Eelco Dolstra
2aaff3aa06 * Restart polkitd in the activation script to force its configuration 
to be reloaded.

svn path=/nixos/trunk/; revision=27962
 2011-07-26 14:13:07 +00:00
Eelco Dolstra
8bf3c2c1bf * The implementation of the ALSA_PLUGIN_DIRS variable is buggy: 
because it uses strtok() to modify the environment variable in
  place, it only works correctly the first time it's called.
  Subsequent calls only see the first directory listed in the
  variable.  This causes applications such as Audacious to fail
  because the Pulse plugin is not in the first directory.  However, we
  don't actually need $ALSA_PLUGIN_DIRS, because /etc/asound.conf
  allows the full path to the Pulse plugin to be specified.

svn path=/nixos/trunk/; revision=27960
 2011-07-26 13:00:43 +00:00
Eelco Dolstra
7bdaedb465 * Add a module to enable PulseAudio. It causes all ALSA applications 
to be rerouted to PulseAudio.

  Note that this is distinct from the already existing module
  ‘services/audio/pulseaudio.nix’ that provides a system-wide
  PulseAudio daemon, which is usually not what you want.

svn path=/nixos/trunk/; revision=27958
 2011-07-26 01:51:56 +00:00
Eelco Dolstra
a1df35a590 * Don't enable HAL by default anymore. It's obsolete. It's still 
enabled by modules that need it (KDE < 4.7, Xfce).
* Don't enable the PolicyKit module by default either, it's also
  obsolete (replaced by PolKit).  It's still enabled if HAL is
  enabled.

svn path=/nixos/trunk/; revision=27933
 2011-07-25 00:52:59 +00:00
Eelco Dolstra
38fddb2243 * The X server doesn't actually depend on HAL anymore. 
svn path=/nixos/trunk/; revision=27932
 2011-07-25 00:50:46 +00:00
Eelco Dolstra
2e4acbcf8b * Add a NixOS module for upower. 
svn path=/nixos/trunk/; revision=27931
 2011-07-25 00:45:52 +00:00
Eelco Dolstra
fcc9cf2d85 svn path=/nixos/trunk/; revision=27930 2011-07-25 00:36:41 +00:00
Eelco Dolstra
1e5bd11a53 * Create /run in the initrd and bind-mount it into the target root. 
This allows Udev to share its database between stage 1 and 2, which
  in turn is expected by the LVM Udev rules.

svn path=/nixos/trunk/; revision=27926
 2011-07-24 23:36:30 +00:00
Eelco Dolstra
a9f599154a * Remove stupid ‘libraryPath’ entries from ~/.config/Trolltech.conf 
that can randomly cause KDE to fail.

svn path=/nixos/trunk/; revision=27925
 2011-07-24 22:07:58 +00:00
Shea Levy
d121bb15b5 Add a NixOS module for the rtl8192c firmware 
svn path=/nixos/trunk/; revision=27913
 2011-07-23 23:01:39 +00:00
Shea Levy
e5dacbe6a8 Only turn ttyBackgrounds on by default when the kernel has splashutils 
This way users won't need to add ttyBackgrounds.enable = false when upgrading to a new kernel, and if the kernel gets splashutils in the future ttyBackgrounds will be enabled automatically.

svn path=/nixos/trunk/; revision=27911
 2011-07-23 18:46:16 +00:00
Shea Levy
5a2d438f24 splashutils is already let-bound to kernelPackages.splashutils, so let's take advantage of it. 
svn path=/nixos/trunk/; revision=27910
 2011-07-23 18:15:55 +00:00
Eelco Dolstra
83846d8417 * NixOS module for Udisks. 
svn path=/nixos/trunk/; revision=27909
 2011-07-23 01:30:36 +00:00
Peter Simons
3a1b6266e4 modules/services/monitoring/smartd.nix: added services.smartd.devices option to configure list of devices to monitor 
By default -- if this option is unset --, all connected devices will be
monitored. Hard-coding the list of devices is worth-while, though, because this
will also configure smartd to send e-mail messages to 'root' when a test fails.

svn path=/nixos/trunk/; revision=27888
 2011-07-21 19:32:15 +00:00
Eelco Dolstra
7c6c50a3bf * Nuke the KDE icon cache on login. 
svn path=/nixos/trunk/; revision=27867
 2011-07-21 11:16:46 +00:00
Lluís Batlle i Rossell
4e73287456 Adding a syslog parameter to receive log from other devices through the network. 
svn path=/nixos/trunk/; revision=27866
 2011-07-21 07:42:05 +00:00
Eelco Dolstra
68350e646d * Support KDE 4.7. 
svn path=/nixos/trunk/; revision=27818
 2011-07-18 12:37:13 +00:00