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

415 Commits

Author SHA1 Message Date
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
1ef6d0c61b * growisofs needs to be setuid for high priority scheduling. 
svn path=/nixos/trunk/; revision=13220
 2008-11-07 13:38:46 +00:00
Eelco Dolstra
37b57e84cf * Disable the warning about missing wrapped setuid programs for now. 
svn path=/nixos/trunk/; revision=13219
 2008-11-07 13:38:05 +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
4bd1537860 * Create /nix/var/nix/chroots in the activation script 
and re-create it at boot time.

svn path=/nixos/trunk/; revision=13152
 2008-10-29 15:43:37 +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
Michael Raskin
e89cdc0de7 Found it useful to have a place to export assorted things from system configuration.. 
svn path=/nixos/trunk/; revision=12932
 2008-10-01 15:56:01 +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
212d5ceff5 * Don't generate a manifest for the CD anymore, just use the 
copy-from-other-stores substituter to copy paths directly from the
  Nix store on the CD.

svn path=/nixos/trunk/; revision=12826
 2008-09-08 12:40:05 +00:00
Ludovic Courtès
e15ffa9e3c Add `gnunetd' Upstart job. 
svn path=/nixos/trunk/; revision=12802
 2008-09-04 20:28:02 +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
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
Marc Weber
4eceb15830 fix typos, moved nixos-checkout code into its own file 
following some other suggestions made by niksnut
added further PATH hint in repos description of options.nix

svn path=/nixos/trunk/; revision=12730
 2008-08-26 19:45:06 +00:00
Eelco Dolstra
15e77dfb1c * Add some ugly fonts (like adobe-helvetica) required by some 
primitive applications.

svn path=/nixos/trunk/; revision=12700
 2008-08-25 09:07:42 +00:00
Michael Raskin
fe28b75fdd Updated fontdir to match builderDefs changes. 
svn path=/nixos/trunk/; revision=12656
 2008-08-19 05:55:00 +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
Marc Weber
67b1b9af80 rewritten nixos-checkout code. 
You can now define multiple repositories. See options.nix

svn path=/nixos/trunk/; revision=12645
 2008-08-17 01:11:57 +00:00
Marc Weber
f1be382d71 add setuidOwners programs automatically to setuid list 
It should be enough to specify them once

svn path=/nixos/trunk/; revision=12640
 2008-08-16 00:59:23 +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
Marc Weber
44134d90cb added example for extraJobs 
svn path=/nixos/trunk/; revision=12572
 2008-08-10 13:48:21 +00:00
Michael Raskin
acda0c6b27 Typo fix 
svn path=/nixos/trunk/; revision=12569
 2008-08-10 05:44:25 +00:00
Marc Weber
23144fee75 added "from system path" hint to description of setuid options 
svn path=/nixos/trunk/; revision=12568
 2008-08-09 23:26:37 +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
a83becdee8 * When booting from the installation CD, just mount 
/dev/disk/by-label/<label>.  This makes the whole
  autoDetectRootDevice/rootLabel machinery unnecessary.

svn path=/nixos/trunk/; revision=12561
 2008-08-08 23:01:30 +00:00
Eelco Dolstra
1c2d81d93d * Remove "obsolete" notation. 
svn path=/nixos/trunk/; revision=12557
 2008-08-08 19:40:19 +00:00
Eelco Dolstra
a33d2f3adc * Use a klibc-based udev. Hopefully this fixes the problems 
encountered on x86-64 when udev is compiled against dietlibc.

svn path=/nixos/trunk/; revision=12555
 2008-08-08 19:07:07 +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
3fd58f8a03 Declare obsolete: hardware option; options with arguments. 
svn path=/nixos/trunk/; revision=12552
 2008-08-08 18:57:09 +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
Nicolas Pierron
9fc41fc64f Prepare the removal of pkgs arguments. 
If user options are using pkgs arguments, these would be replaced by the pkgs argument given to the whole option component expression instead of the pkgs argument given to the option.

svn path=/nixos/trunk/; revision=12550
 2008-08-08 18:57:04 +00:00
Nicolas Pierron
d63bfe3c31 Use the new configuration scheme for system's options. 
svn path=/nixos/trunk/; revision=12549
 2008-08-08 18:56:58 +00:00
Eelco Dolstra
63e316ecac * Refactoring: move all the initrd-generation related stuff to 
boot-stage-1.nix in order to unclutter system.nix.

svn path=/nixos/trunk/; revision=12547
 2008-08-08 17:34:30 +00:00
Eelco Dolstra
abbe260a80 * Don't use modprobe but insmod in the initrd. This means we don't 
need module-init-tools in the initrd, since insmod is in klibc.
* Give the installation CD a label.

svn path=/nixos/trunk/; revision=12545
 2008-08-08 17:07:04 +00:00
Eelco Dolstra
4d6548e94c * Use the tools from klibc in the initrd instead of the static-tools. 
This makes the initrd a few megabytes smaller.
* Use run-init from klibc to delete everything in the initrd ramfs
  prior to switching to the real root FS.
* Removed the stage2Init argument.

svn path=/nixos/trunk/; revision=12544
 2008-08-08 15:49:57 +00:00
Michael Raskin
2bcb5a8efe Removed tabs in nix-expressions introduced by me in nixos/ tree. 
svn path=/nixos/trunk/; revision=12532
 2008-08-07 10:23:20 +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
Nicolas Pierron
53bdeb43e3 Rewrite the optionDeclarations to collect all options definitions. 
svn path=/nixos/trunk/; revision=12521
 2008-08-06 18:43:53 +00:00
Nicolas Pierron
92560a1dc0 Use the new scheme of configuration evaluation. 
svn path=/nixos/trunk/; revision=12519
 2008-08-06 17:39:05 +00:00
Eelco Dolstra
f5e61dfa0c * Provide a mount command that knows how to mount ntfs-3g and cifs 
file systems.  The main advantage is that this allows mounting of
  such file systems from the `filesystems' configuration option at
  boot time, e.g.

    fileSystems = [
      ...
      { mountPoint = "/windows";
        device = "/dev/disk/by-uuid/9EA4B22EA4B208B3";
        fsType = "ntfs-3g";
      }
    ];

  The list of file system helpers should of course be made
  configurable.

svn path=/nixos/trunk/; revision=12516
 2008-08-06 15:48:12 +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
274c67a363 * Don't create a setuid wrapper for programs that don't exist. 
svn path=/nixos/trunk/; revision=12429
 2008-07-25 13:34:00 +00:00
Eelco Dolstra
339839a134 * Some more programs to make setuid by default. 
svn path=/nixos/trunk/; revision=12427
 2008-07-25 13:33:10 +00:00
Eelco Dolstra
3e8be34fcc * Set $NIX_OTHER_STORES to /var/run/nix/remote-stores to make 
automatic copying of build results from remote Nix stores work
  more-or-less automatically.  All you have to do is mount the remote
  FS on a subdirectory of /var/run/nix/remote-stores, e.g.

    $ sshfs remote_machine:/ /var/run/nix/remote-stores/foo

* Set $NIXPKGS_ALL.

svn path=/nixos/trunk/; revision=12411
 2008-07-23 16:06:03 +00:00
Eelco Dolstra
5ec1fa2060 * Tabs considered harmful. 
svn path=/nixos/trunk/; revision=12407
 2008-07-23 14:13:27 +00:00
Eelco Dolstra
cc902c638c svn path=/nixos/trunk/; revision=12406 2008-07-23 13:47:32 +00:00
Michael Raskin
0ac32cbb99 Added comments about seccureKeys for configuration files encryption 
svn path=/nixos/trunk/; revision=12342
 2008-07-11 08:01:09 +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
6df19e0cbb Added disnix 
svn path=/nixos/trunk/; revision=12282
 2008-07-06 18:34:03 +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
Wouter den Breejen
ab41596a7f Added option boot.extraGrubEntriesBeforeNixos=true/false to boot by default into nixos-default or into your extraGrubEntries 
svn path=/nixos/trunk/; revision=12263
 2008-07-05 00:16:39 +00:00
Eelco Dolstra
1c0aa0fb75 * Create some groups ("disk", "kmem", "tty", ...) that the default 
udev rules expect.

svn path=/nixos/trunk/; revision=12244
 2008-07-02 18:03:43 +00:00
Michael Raskin
7699aaad79 Added BIND 
svn path=/nixos/trunk/; revision=12233
 2008-07-01 12:15:56 +00:00
Eelco Dolstra
eaf6b8eb18 * udevtrigger / udevsettle -> udevadm. 
svn path=/nixos/trunk/; revision=12229
 2008-07-01 08:28:56 +00:00
Michael Raskin
2025d58c2a At least dovecot and postfix work together and with Thunderbird 
svn path=/nixos/trunk/; revision=12223
 2008-06-30 21:12:02 +00:00
Michael Raskin
eb79938997 Added Postfix; handles at least local delivery with maildir/ 
svn path=/nixos/trunk/; revision=12221
 2008-06-30 15:13:02 +00:00
Eelco Dolstra
90acbf9509 * mysql: merged the mysql expression in the services tree. 
* mysql: run under a separate user ("mysql"), not under "nobody".
* mysql: put the PID under /var/run.

svn path=/nixos/trunk/; revision=12189
 2008-06-25 21:58:51 +00:00
Eelco Dolstra
314ab9774f * Put gorecord in PATH. 
svn path=/nixos/trunk/; revision=12173
 2008-06-20 18:17:51 +00:00
Eelco Dolstra
91e2083d32 * Load the wis-go7007 firmware automatically. 
svn path=/nixos/trunk/; revision=12170
 2008-06-20 16:10:20 +00:00
Eelco Dolstra
8c7859f7fb * Make kdesktop_lock work by providing a PAM configuration for KDE 
and making kcheckpass setuid root.

svn path=/nixos/trunk/; revision=12166
 2008-06-20 13:32:39 +00:00
Marc Weber
216e3b73f4 added support for unixODBC in configuration.nix writing /etc/odbcinst.ini 
svn path=/nixos/trunk/; revision=12045
 2008-06-11 23:06:53 +00:00
Eelco Dolstra
a20f4aff60 * Updated the splash screen support for Linux >= 2.6.25. 
svn path=/nixos/trunk/; revision=12030
 2008-06-10 16:10:23 +00:00
Eelco Dolstra
deaf99ca92 * Added a subservices for the Zabbix PHP frontend. 
* Apache subservices: missing declarations are filled in with defaults.

svn path=/nixos/trunk/; revision=12022
 2008-06-09 15:52:02 +00:00
Eelco Dolstra
6d380a8ce8 * Option to set the Zabbix server IP. 
svn path=/nixos/trunk/; revision=12012
 2008-06-08 22:21:56 +00:00
Eelco Dolstra
96a8dbfd58 * Upstart jobs for the Zabbix agent and server daemons. 
svn path=/nixos/trunk/; revision=11998
 2008-06-06 09:13:16 +00:00
Eelco Dolstra
ebb43a3f67 * Make the location of Nixpkgs a function argument (defaulting 
to ../../nixpkgs).  This makes the "pkgs" symlink under the 
  nixos checkout unnecessary.

svn path=/nixos/trunk/; revision=11989
 2008-06-05 15:33:17 +00:00
Michael Raskin
eff945115b Added gpm service 
svn path=/nixos/trunk/; revision=11952
 2008-06-03 07:06:35 +00:00
Michael Raskin
ecef3b1f61 Passing packages list to extraModulePackages 
svn path=/nixos/trunk/; revision=11884
 2008-05-22 19:30:00 +00:00
Eelco Dolstra
bb1ee3f190 * boot.kernel renamed to boot.kernelPackages (see the help for a 
description) to allow all kernel-related packages to be overriden
  easily.  For instance, you can now say in configuration.nix

    boot = {
      kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
    };

  to use Linux 2.6.25.x.  Externel kernel module packages (like
  the NVIDIA drivers) appropriate for this kernel will then be used
  automatically.

svn path=/nixos/trunk/; revision=11880
 2008-05-22 11:59:46 +00:00
Michael Raskin
27fced519e Forgot description is mandatory for all options. Added description to synaptics fine-tune settings. 
svn path=/nixos/trunk/; revision=11857
 2008-05-20 14:59:27 +00:00
Eelco Dolstra
3ed80192c0 * Every option needs a description, otherwise the manual can't be 
built...

svn path=/nixos/trunk/; revision=11856
 2008-05-20 14:53:55 +00:00
Michael Raskin
b5451023a2 Applied patch sent by justbeingglad long ago.. 
svn path=/nixos/trunk/; revision=11833
 2008-05-16 07:32:00 +00:00
Eelco Dolstra
cc7f3c7aaa * URL updates. 
svn path=/nixos/trunk/; revision=11801
 2008-05-09 15:08:43 +00:00
Eelco Dolstra
3e087c0f73 * Include "dm_mod" in the initrd by default for LVM users. 
svn path=/nixos/trunk/; revision=11795
 2008-05-09 10:46:10 +00:00
Eelco Dolstra
8583c52c2c * Enable lvm by default. 
svn path=/nixos/trunk/; revision=11794
 2008-05-09 10:08:21 +00:00
Eelco Dolstra
6d2c1eb838 * module_aggregation -> aggregateModules (naming convention). 
svn path=/nixos/trunk/; revision=11785
 2008-05-08 15:36:56 +00:00
Marc Weber
7a7582ec01 * added extraModules apache configuration option 
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
 2008-04-27 23:56:51 +00:00
Eelco Dolstra
5dbe45bfea * Modified the SSL configuration a bit. Instead of having a httpPort 
and a httpsPort, there are now options "port" and "enableSSL".  So
  to get https you should typically set up a vhost like this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
 2008-04-24 11:56:38 +00:00
Nicolas Pierron
38874d8025 Add options to hide the cursor and define the default user. 
svn path=/nixos/trunk/; revision=11664
 2008-04-21 13:05:35 +00:00
Michael Raskin
5e1ee10f3c HTTPS support in httpd upstart job fixed. 
svn path=/nixos/trunk/; revision=11613
 2008-04-12 20:08:35 +00:00
Michael Raskin
bfa0e51ee5 Added possibility to modify Xorg passed to upstart-job and xlaunch 
svn path=/nixos/trunk/; revision=11555
 2008-04-11 09:20:39 +00:00
Eelco Dolstra
99480990f6 * Added ncurses to the system path (mostly for the "clear" and "reset" commands). 
svn path=/nixos/trunk/; revision=11528
 2008-04-10 07:43:49 +00:00
Michael Raskin
8c4ebbd24a Some tweaks for Gateway6 job 
svn path=/nixos/trunk/; revision=11496
 2008-04-08 21:41:01 +00:00
Ludovic Courtès
a0fc21eda3 Add `atd' Upstart job. 
svn path=/nixos/trunk/; revision=11435
 2008-04-01 10:16:35 +00:00
Ludovic Courtès
3957962cf9 BitlBee: Run as bitlbee' instead of root'. 
svn path=/nixos/trunk/; revision=11292
 2008-03-26 16:42:57 +00:00
Ludovic Courtès
1a75f0a5a8 Add nssModules' to systemPathsList', add /lib' to systemPath', and 
add `/var/run/current-system/sw/lib' to `LD_LIBRARY_PATH'.  This should allow
NSS modules to be added and taken into account by applications without
the need to reboot.

svn path=/nixos/trunk/; revision=11290
 2008-03-26 16:23:52 +00:00
Michael Raskin
dc27e80fad Changes to support swsusp and custom kernels. 
svn path=/nixos/trunk/; revision=11272
 2008-03-24 19:37:32 +00:00
Michael Raskin
9ab654a6c4 Fix regexp to determine xserver and dbus correctly 
svn path=/nixos/trunk/; revision=11265
 2008-03-22 18:53:55 +00:00
Eelco Dolstra
d6e1828c13 * Speed up activating the configuration: don't do a find 
on all of /etc, skip /etc/nixos.  (Actually, the NixOS/Nixpkgs
  sources probably shouldn't be stored in /etc...)

svn path=/nixos/trunk/; revision=11261
 2008-03-22 16:04:38 +00:00
Eelco Dolstra
047241dd5d * When restarting a job, *really* wait until the job has 
stopped before starting it again.

svn path=/nixos/trunk/; revision=11232
 2008-03-20 14:44:36 +00:00
Ludovic Courtès
79ffaeb2e7 activate-configuration: Look for setuid executables in the default profile. 
svn path=/nixos/trunk/; revision=11202
 2008-03-19 12:34:39 +00:00
Ludovic Courtès
d1f29d328d Add support for `nss-mdns'. 
Currently, the solution is a bit hackish since running applications
will not work after a `nixos-rebuild' because `libnss_mdns' is not
in their `LD_LIBRARY_PATH'.

svn path=/nixos/trunk/; revision=11162
 2008-03-17 13:58:57 +00:00
Eelco Dolstra
52aed402db * Moved to Nixpkgs. 
svn path=/nixos/trunk/; revision=11155
 2008-03-17 10:51:09 +00:00
Ludovic Courtès
6354623143 Add known setuid programs to the path' variable passed to activate-configuration'. 
This is really a hack since programs not known to `system.nix' will not be in the path
of `activate-configuration', which consequently creates empty `.real' files under
`/var/setuid-wrappers'.  I don't know what the best way to address this is: let admins
write `.real' files by hand?  Add a `setuidPackages' attribute, listing the names of
packages that contain the binaries listed in `setuidPrograms'?

svn path=/nixos/trunk/; revision=11153
 2008-03-17 10:31:40 +00:00