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

461 commits

Author SHA1 Message Date
Marc Weber bca405ae44 Convert "kbd" (i18n) 
svn path=/nixos/branches/fix-style/; revision=14361
 2009-03-06 12:25:38 +00:00
Marc Weber e344a2d055 Convert "unix-odbc-drivers" 
svn path=/nixos/branches/fix-style/; revision=14359
 2009-03-06 12:25:33 +00:00
Marc Weber 1c43b4946b Convert "acpid" 
svn path=/nixos/branches/fix-style/; revision=14358
 2009-03-06 12:25:25 +00:00
Marc Weber 8c5f0522e7 removed new proposal jobs 
the fix-style branch makes them obsolete
It was broken anyway. I'll readd synergy (client, server) jobs again
later

svn path=/nixos/branches/fix-style/; revision=14353
 2009-03-05 17:11:40 +00:00
Nicolas Pierron a3b91410cd Fix kde4 configuration. 
svn path=/nixos/branches/fix-style/; revision=14198
 2009-02-22 23:33:53 +00:00
Nicolas Pierron 357ca60ed7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has 
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/branches/fix-style/; revision=14191
 2009-02-22 16:09:14 +00:00
Nicolas Pierron fd08470a26 * Quick hack to make sure that acpid starts before hal. 
svn path=/nixos/branches/fix-style/; revision=14190
 2009-02-22 16:09:07 +00:00
Nicolas Pierron e79dbaad55 * Support for KDE 4.2. Set services.xserver.desktopManager.kde4.enable to 
true to enable.  It looks great ;-)

svn path=/nixos/branches/fix-style/; revision=14185
 2009-02-22 16:08:46 +00:00
Nicolas Pierron 802d4f02c4 * Generate the acpid configuration properly: each config file 
can only contain one event.

svn path=/nixos/branches/fix-style/; revision=14183
 2009-02-22 16:08:37 +00:00
Nicolas Pierron 094aee7467 * acpid: switch to the ondemand CPU scaling governer when on battery power. 
Disabled acpid by default because it's not configurable enough yet.

svn path=/nixos/branches/fix-style/; revision=14182
 2009-02-22 16:08:33 +00:00
Nicolas Pierron be4a0494b8 * Suspend when the laptop lid is closed. 
svn path=/nixos/branches/fix-style/; revision=14181
 2009-02-22 16:08:28 +00:00
Nicolas Pierron 128699688a * Run the ACPI daemon. This allows the system to respond to ACPI 
events, like pressing the power button.  The NVIDIA X11 driver also
  needs it to respond to the internal/external monitor switch button
  on laptops.  The power actions should of course be made
  configurable.

svn path=/nixos/branches/fix-style/; revision=14180
 2009-02-22 16:08:22 +00:00
Nicolas Pierron 840dac3fec Making the 'via' video module available in the xserver upstart-job. 
svn path=/nixos/branches/fix-style/; revision=14176
 2009-02-22 16:08:05 +00:00
Nicolas Pierron 09bcf1418c * Start mingetty after udev, otherwise /dev/tty* may not exist yet 
(and you get Upstart messages about the ttyN job being restarted).

svn path=/nixos/branches/fix-style/; revision=14174
 2009-02-22 16:07:56 +00:00
Nicolas Pierron d92d0e98f4 PulseAudio Upstart job: honor `enable'. 
svn path=/nixos/branches/fix-style/; revision=14173
 2009-02-22 16:07:52 +00:00
Nicolas Pierron 0c6afe1dd2 Add Upstart job for PulseAudio as a system-wide daemon. 
svn path=/nixos/branches/fix-style/; revision=14171
 2009-02-22 16:07:42 +00:00
Nicolas Pierron 0addac3473 * CUPS: use /etc/cups rather than ${cups}/etc/cups as the ServerRoot, 
because CUPS modifies files in the ServerRoot directory.  Most
  importantly, it stores printer configuration there.  Previously the
  CUPS server modified the files under ${cups}/etc/cups, which is
  impure and caused all configured printers to disappear any time CUPS
  was upgraded.

svn path=/nixos/branches/fix-style/; revision=14169
 2009-02-22 16:07:33 +00:00
Nicolas Pierron 38aac77669 Increased the sleep hack on the Tomcat service 
svn path=/nixos/branches/fix-style/; revision=14168
 2009-02-22 16:07:29 +00:00
Nicolas Pierron 77db653dfe Some fixes to the Apache Tomcat connector 
svn path=/nixos/branches/fix-style/; revision=14167
 2009-02-22 16:07:25 +00:00
Nicolas Pierron 08a18fc863 Update argument syntax of configuration files. 
svn path=/nixos/branches/fix-style/; revision=14166
 2009-02-22 16:07:21 +00:00
Nicolas Pierron 6b1307c6f1 * Remove a stale lock file that may prevent the 
X server from starting.

svn path=/nixos/branches/fix-style/; revision=14165
 2009-02-22 16:07:16 +00:00
Nicolas Pierron 33445eb221 * CUPS daemon: modprobe usblp so that CUPS can find USB printers. 
* CUPS daemon: use Ghostscript to support printing on non-Postscript
  printers.

svn path=/nixos/branches/fix-style/; revision=14163
 2009-02-22 16:07:05 +00:00
Nicolas Pierron 46f1cab80f Added Apache Tomcat proxy to new Apache upstart service 
svn path=/nixos/branches/fix-style/; revision=14162
 2009-02-22 16:07:01 +00:00
Nicolas Pierron d5f3418507 Added guestUsers job for automatical adding guests 
svn path=/nixos/branches/fix-style/; revision=14160
 2009-02-22 16:06:52 +00:00
Nicolas Pierron f824a1e753 Added rogue job used by CD 
svn path=/nixos/branches/fix-style/; revision=14159
 2009-02-22 16:06:47 +00:00
Nicolas Pierron b1eabe2b1b An upstart job to display manual 
svn path=/nixos/branches/fix-style/; revision=14158
 2009-02-22 16:06:42 +00:00
Nicolas Pierron ecc761543c Remove name argument of merge functions. 
svn path=/nixos/branches/fix-style/; revision=13860
 2009-01-25 15:49:23 +00:00
Nicolas Pierron dcc981840e Use the mergeOneOption function instead of duplicated code. 
svn path=/nixos/branches/fix-style/; revision=13859
 2009-01-25 15:49:18 +00:00
Nicolas Pierron b2b6f92d6b Split xserver upstart job into: 
- xserver configuration & job
- display manager (slim)
- window manager (compiz, kwm, metacity, twm, wmii, xmonad)
- desktop manager (kde, gnome, xterm)

Added features:
- Add WM choice in slim (with F1)

svn path=/nixos/branches/fix-style/; revision=13857
 2009-01-25 15:49:08 +00:00
Nicolas Pierron fa3437cb35 Remove enableIntel* and enableGo7007 options. 
Update nixos-hardware-scan.pl to generate files without these options.

svn path=/nixos/branches/fix-style/; revision=13856
 2009-01-25 15:48:59 +00:00
Nicolas Pierron 67edd3720f Update argument syntax of configuration files. 
svn path=/nixos/branches/fix-style/; revision=13852
 2009-01-25 15:48:39 +00:00
Nicolas Pierron 08280c415f Add support for wmii. 
svn path=/nixos/branches/fix-style/; revision=13850
 2009-01-25 15:48:30 +00:00
Nicolas Pierron b92036e803 Fetch the windows manager pid. 
svn path=/nixos/branches/fix-style/; revision=13849
 2009-01-25 15:48:25 +00:00
Nicolas Pierron 7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style 
svn path=/nixos/branches/fix-style/; revision=13688
 2009-01-02 19:41:39 +00:00
Nicolas Pierron d745c21aab Merge system/fontdir.nix and system/fonts.nix into a new configuration file. 
svn path=/nixos/branches/fix-style/; revision=13686
 2009-01-02 16:07:39 +00:00
Nicolas Pierron 1b32260084 Convert "upstart-jobs/xserver.nix" to a configuration file. 
svn path=/nixos/branches/fix-style/; revision=13682
 2009-01-02 16:07:21 +00:00
Nicolas Pierron 79bfab0e07 convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files. 
svn path=/nixos/branches/fix-style/; revision=13680
 2009-01-02 16:07:10 +00:00
Nicolas Pierron c787cb1a0a Replace job tags by a library of function to build upstart jobs. 
svn path=/nixos/branches/fix-style/; revision=13674
 2009-01-02 16:06:41 +00:00
Nicolas Pierron b47e6675b8 Use generated upstart-job's tags for cron. 
svn path=/nixos/branches/fix-style/; revision=13593
 2008-12-07 12:27:46 +00:00
Nicolas Pierron 2f0e8e370a Update argument style. 
svn path=/nixos/branches/fix-style/; revision=13584
 2008-12-04 15:48:27 +00:00
Nicolas Pierron 1236cf61f4 replace ifEnable by mkIf and mkThenElse. 
svn path=/nixos/branches/fix-style/; revision=13382
 2008-11-23 01:29:25 +00:00
Nicolas Pierron 157bb2b71a Convert "alsa" upstart-job to the fix-style. 
svn path=/nixos/branches/fix-style/; revision=13379
 2008-11-23 01:29:05 +00:00
Nicolas Pierron 9c0eef3bae Convert "dbus" & "avahi-deamon" upstart-job to the fix-style. 
svn path=/nixos/branches/fix-style/; revision=13378
 2008-11-23 01:28:58 +00:00
Nicolas Pierron dc634f5297 Convert "hal" upstart-job to the fix-style. 
svn path=/nixos/branches/fix-style/; revision=13377
 2008-11-23 01:28:52 +00:00
Nicolas Pierron 585fd9d911 Convert "gpm" upstart-job to the fix-style. 
svn path=/nixos/branches/fix-style/; revision=13376
 2008-11-23 01:28:45 +00:00
Nicolas Pierron afe160c6b2 Convert "nagios" upstart-job to the fix-style. 
svn path=/nixos/branches/fix-style/; revision=13375
 2008-11-23 01:28:34 +00:00
Nicolas Pierron a63ea50ee9 Fix zabbix-server.nix. 
svn path=/nixos/branches/fix-style/; revision=13374
 2008-11-23 01:28:25 +00:00
Nicolas Pierron 9c751d377d Use the new scheme for zabbix upstart-job. 
svn path=/nixos/branches/fix-style/; revision=13329
 2008-11-18 18:00:21 +00:00
Nicolas Pierron 3a25babf1b Use the new scheme for disnix upstart-job. 
svn path=/nixos/branches/fix-style/; revision=13328
 2008-11-18 18:00:15 +00:00
Nicolas Pierron 892d12bccf - Move some system configuration to options: 
* system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
 2008-11-18 18:00:09 +00:00
Nicolas Pierron 2ed34fae67 Extract "locate" job from the "cron" job. 
svn path=/nixos/trunk/; revision=13236
 2008-11-09 16:44:53 +00:00
Nicolas Pierron 866987a60e cron.nix: Use the new option scheme. 
svn path=/nixos/trunk/; revision=13235
 2008-11-09 16:44:43 +00:00
Nicolas Pierron b73a579d18 Fix previous commit. 
svn path=/nixos/trunk/; revision=13229
 2008-11-08 21:45:58 +00:00
Nicolas Pierron 4a55f02005 "dhclient.nix" is now a self-contained job. 
svn path=/nixos/trunk/; revision=13228
 2008-11-08 21:32:48 +00:00
Eelco Dolstra 1573bdddfb * CUPS: enabled support for printing via SMB. 
svn path=/nixos/trunk/; revision=13218
 2008-11-07 13:37:28 +00:00
Michael Raskin c76632804c meta.function -> passthru.function 
svn path=/nixos/trunk/; revision=13191
 2008-11-04 21:24:58 +00:00
Eelco Dolstra f549ee6009 * Always add "iceauth" to the PATH (not just when sessionType == 
"kde") so that KDE applications work even when not running KDE.

svn path=/nixos/trunk/; revision=13154
 2008-10-29 16:15:58 +00:00
Marc Weber 32b263e429 added system cron mailto option 
svn path=/nixos/trunk/; revision=13114
 2008-10-25 22:03:12 +00:00
Michael Raskin 1d55390e1c An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards. 
svn path=/nixos/trunk/; revision=13109
 2008-10-24 10:30:38 +00:00
Marc Weber a99b82b987 Misspelling the video driver name results in a thrown message now 
small refactorings, list of known drivers is an attr set, optional is imported from lib etc

svn path=/nixos/trunk/; revision=13048
 2008-10-10 16:45:56 +00:00
Eelco Dolstra 5ea24925b5 * Use Subversion 1.5. 
svn path=/nixos/trunk/; revision=12980
 2008-10-06 23:02:20 +00:00
Eelco Dolstra ec1d1ef851 * Urgh, there's got to be a more generic way of dealing 
with the Python version...

svn path=/nixos/trunk/; revision=12972
 2008-10-06 13:40:14 +00:00
Marc Weber 77d1d30e97 doh, removed debug statement and superfluous wrong character 
svn path=/nixos/trunk/; revision=12862
 2008-09-14 13:29:09 +00:00
Marc Weber ca031ce720 httpd.extraModules: now accpets string items loading modules beeing distributed by apache 
removed pkgs : arg

svn path=/nixos/trunk/; revision=12861
 2008-09-14 01:30:45 +00:00
Eelco Dolstra d5da3185fe svn path=/nixos/trunk/; revision=12853 2008-09-12 16:31:39 +00:00
Ludovic Courtès e15ffa9e3c Add `gnunetd' Upstart job. 
svn path=/nixos/trunk/; revision=12802
 2008-09-04 20:28:02 +00:00
Eelco Dolstra ab80a34ea4 * Quick workaround for tty-backgrounds not working on Linux 2.6.26: 
/proc/sys/kernel/fbcondecor is now suddenly named /proc/sys/fbcondecor.
  Might be a bug.

svn path=/nixos/trunk/; revision=12784
 2008-09-02 09:51:44 +00:00
Michael Raskin 0d3cee6247 Typo fixed 
svn path=/nixos/trunk/; revision=12757
 2008-08-27 21:22:49 +00:00
Nicolas Pierron 6e6f867a0a Add pcmcia job. 
Test the new option style.

svn path=/nixos/trunk/; revision=12742
 2008-08-27 14:01:17 +00:00
Eelco Dolstra 1e33c98258 * Doh. 
svn path=/nixos/trunk/; revision=12737
 2008-08-27 10:06:25 +00:00
Eelco Dolstra 618b726542 * Don't put the Adobe bitmap fonts in the fontconfig search path 
because then Helvetica looks horrible.

svn path=/nixos/trunk/; revision=12736
 2008-08-27 10:00:49 +00:00
Sander van der Burg 545406b2e2 Added support for ejabberd virtualhosts 
svn path=/nixos/trunk/; revision=12648
 2008-08-18 14:48:55 +00:00
Sander van der Burg fdc362a726 Fixed a very stupid bug 
svn path=/nixos/trunk/; revision=12611
 2008-08-13 09:44:40 +00:00
Sander van der Burg c5fea583e2 Added disnix hook options 
svn path=/nixos/trunk/; revision=12596
 2008-08-12 13:16:12 +00:00
Sander van der Burg 4c3627f16e Added CATALINA_OPTS parameter 
svn path=/nixos/trunk/; revision=12588
 2008-08-11 21:35:45 +00:00
Eelco Dolstra ffe45949e8 * Use the right mount command in the filesystems job so that 
NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
 2008-08-09 12:03:08 +00:00
Eelco Dolstra b760a4b8d9 * Use the persistent storage udev rules in the initrd so that we can 
use /dev/disk/by-{label,id,...} names for the root FS.
* Kill udevd at the end of stage 1.  Don't know how it got killed
  previously...

svn path=/nixos/trunk/; revision=12560
 2008-08-08 22:44:45 +00:00
Nicolas Pierron 2e9dc1ea47 Rename option: services.xserver.packageFun -> .package 
svn path=/nixos/trunk/; revision=12553
 2008-08-08 18:57:11 +00:00
Nicolas Pierron 51210b1904 Remove pkgs argument of: 
- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551
 2008-08-08 18:57:07 +00:00
Michael Raskin b8ff944cd2 Postfix list separator fix 
svn path=/nixos/trunk/; revision=12548
 2008-08-08 18:51:32 +00:00
Michael Raskin 014b33637c Added an option to easily allow everyone to use "at". 
svn path=/nixos/trunk/; revision=12531
 2008-08-07 10:09:17 +00:00
Nicolas Pierron 791d8bbc66 Add udev extra option (addUdevPkgs). 
Add some merge functions.

svn path=/nixos/trunk/; revision=12523
 2008-08-06 19:26:47 +00:00
Sander van der Burg f652a0836a Added support for custom context.xml 
svn path=/nixos/trunk/; revision=12513
 2008-08-06 15:07:29 +00:00
Sander van der Burg afdfff7ed8 Added common lib support for tomcat 
svn path=/nixos/trunk/; revision=12511
 2008-08-06 13:41:08 +00:00
Michael Raskin cb8067cdb5 More configuratbility for vsFTPd upstart job. 
svn path=/nixos/trunk/; revision=12472
 2008-08-04 09:36:11 +00:00
Eelco Dolstra e40d6858d9 * udev: create symlinks /dev/{cd,dvd,cdrw,dvdrw}. 
svn path=/nixos/trunk/; revision=12456
 2008-07-31 14:13:35 +00:00
Eelco Dolstra 5ec1fa2060 * Tabs considered harmful. 
svn path=/nixos/trunk/; revision=12407
 2008-07-23 14:13:27 +00:00
Ludovic Courtès 8eb0444ab8 lshd: Explicitly pass all options to the daemon. 
svn path=/nixos/trunk/; revision=12319
 2008-07-08 07:24:28 +00:00
Sander van der Burg 6a2600c0a2 Added some more features to the tomcat service 
svn path=/nixos/trunk/; revision=12284
 2008-07-06 19:55:34 +00:00
Sander van der Burg 82ddadc27c Added disnix service 
svn path=/nixos/trunk/; revision=12283
 2008-07-06 18:34:19 +00:00
Sander van der Burg 045ae06092 Updated ejabberd service to make it work 
svn path=/nixos/trunk/; revision=12270
 2008-07-06 10:30:53 +00:00
Sander van der Burg 7813be5e54 Updated tomcat service with a more sophisticated model 
svn path=/nixos/trunk/; revision=12268
 2008-07-05 22:27:36 +00:00
Michael Raskin 2c56d137ee I hope that hardwareScan = false now works as expected again... 
svn path=/nixos/trunk/; revision=12253
 2008-07-03 18:54:16 +00:00
Eelco Dolstra 6ed65c2d95 * Removing hardware-scan.nix also removed the loading of the 
kernel modules listed in config.boot.kernelModules.  So do
  that in the udev job for lack of a better place.

svn path=/nixos/trunk/; revision=12249
 2008-07-03 10:45:14 +00:00
Eelco Dolstra 5f60393ffe * Let udev call modprobe to load modules for all known hardware. This 
makes the `hardware-scan' job unnecessary.  (In fact the new
  approach appears to be more thorough; it loads some drivers that
  were not previously loaded.)

svn path=/nixos/trunk/; revision=12248
 2008-07-02 21:19:04 +00:00
Eelco Dolstra 96cfd4105e * Revert accidental commit. 
svn path=/nixos/trunk/; revision=12247
 2008-07-02 21:16:29 +00:00
Eelco Dolstra 49b9662e31 * Use most of the default rules from the udev distribution 
rather than supplying our own (less maintenance...).
  This takes care, among other things, of populating
  /dev/disk, which is useful.

svn path=/nixos/trunk/; revision=12246
 2008-07-02 18:06:34 +00:00
Eelco Dolstra ed1029092b * Udev jobs can now declare a passthru attribute which is 
useful for testing the building of specific parts of
  a service, e.g. you can do
  
    $ nix-build /etc/nixos/nixos/ -A upstartJobs.udev.passthru.udevRules

  to build the udev rules directory of the udev service.

svn path=/nixos/trunk/; revision=12243
 2008-07-02 18:02:24 +00:00
Michael Raskin 4d0645acb1 Fixed authoritative zone ACL, enabled IPv6 
svn path=/nixos/trunk/; revision=12234
 2008-07-01 12:31:47 +00:00
Michael Raskin 7699aaad79 Added BIND 
svn path=/nixos/trunk/; revision=12233
 2008-07-01 12:15:56 +00:00