philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

772 commits

Author SHA1 Message Date
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 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 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
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
Lluís Batlle i Rossell ef1755f3c0 I had a bug in my nfs server... just after boot, all clients were receiving 
"Permission denied" until I run "restart nfs-kernel-exports". "exportfs -ra" did not help.

I tracked that down to some race condition between loading the module nfsd and
starting the daemons. Therefore, I decided to add nfsd to the boot.kernelModules instead
of using modprove with it.

Now it works for my server. No more Permission denied after reboot.


svn path=/nixos/trunk/; revision=31113
 2011-12-27 18:08:05 +00:00
Lluís Batlle i Rossell 8bc381c4cd Fixing the boot sequence in case of only having nfsKernel.client.enable = true, and not server. 
svn path=/nixos/trunk/; revision=31109
 2011-12-27 16:33:10 +00:00
Lluís Batlle i Rossell 2c77b292a6 I reworked the nfs upstart jobs, so they work better on the events of interest of nixos. 
Related to http://yellowgrass.org/issue/NixOS/109 .


svn path=/nixos/trunk/; revision=31103
 2011-12-26 16:06:20 +00:00
Yury G. Kudryashov a87a1bca04 wpa_supplicant: add D-Bus interface 
svn path=/nixos/trunk/; revision=30972
 2011-12-19 23:16:32 +00:00
Shea Levy e87764e327 Apply mornfall's SANE patches 
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixos/trunk/; revision=30764
 2011-12-05 17:32:45 +00:00
Shea Levy 72d7401976 udev: Ignore commented lines when populating run_progs. 
Patch by mornfall

svn path=/nixos/trunk/; revision=30763
 2011-12-05 16:53:58 +00:00
Shea Levy 868c60c92b Add mpd module 
There is room for improvement here. The options in conffile could be broken out into individual options and an extraConfig option added. But I think this looks right.
Patch by mornfall, slightly modified by me

svn path=/nixos/trunk/; revision=30731
 2011-12-05 01:51:05 +00:00
Nicolas Pierron e264d1ab79 Convert users.extraUsers to an option set and add support for openssh 
authorized_keys file generation.

svn path=/nixos/trunk/; revision=30611
 2011-11-29 06:08:55 +00:00
Peter Simons 0cd9ff9fcc smartd: run smartd daemon using the given search path to improve readability of ps output 
svn path=/nixos/trunk/; revision=30569
 2011-11-25 17:09:44 +00:00
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
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
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 578f83eef4 Adding a module for the prayer webmail. 
svn path=/nixos/trunk/; revision=30361
 2011-11-09 20:48:12 +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 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
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 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 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 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 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
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 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
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
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
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 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
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
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 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 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
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
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
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 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
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
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
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 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
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
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 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 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 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 1df952182a * Only flush the POSTROUTING chain. 
svn path=/nixos/trunk/; revision=28153
 2011-08-04 15:33:40 +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 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 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 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