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

456 Commits

Author SHA1 Message Date
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
95ef8b1694 Option for proxy usage in Nix daemon 
Signed-off-by: Nicolas Pierron <nicolas.pierron@lrde.epita.fr>

svn path=/nixos/branches/fix-style/; revision=14156
 2009-02-22 16:06:27 +00:00
Nicolas Pierron
639be32a8a Remove obsolete notation. (backwardPkgsFun*) 
svn path=/nixos/branches/fix-style/; revision=13858
 2009-01-25 15:49:12 +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
6086aee542 * The Linux kernel >= 2.6.27 provides firmware, so add it to the 
firmware search path.

(Patch from Eelco Dolstra)

svn path=/nixos/branches/fix-style/; revision=13855
 2009-01-25 15:48:53 +00:00
Nicolas Pierron
9cdfe5a711 Extract kernel configuration from options.nix. 
svn path=/nixos/branches/fix-style/; revision=13854
 2009-01-25 15:48:48 +00:00
Nicolas Pierron
9fa758c657 Update the function used to merge option sets. 
svn path=/nixos/branches/fix-style/; revision=13853
 2009-01-25 15:48:43 +00:00
Nicolas Pierron
bb56774a54 Fix hostname (inverse test). 
svn path=/nixos/branches/fix-style/; revision=13851
 2009-01-25 15:48:35 +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
e4b0134a43 Add a grub configuration file. 
svn path=/nixos/branches/fix-style/; revision=13685
 2009-01-02 16:07:34 +00:00
Nicolas Pierron
b67e2a12aa Convert "boot/boot-stage-2.nix" to a configuration file. 
svn path=/nixos/branches/fix-style/; revision=13684
 2009-01-02 16:07:30 +00:00
Nicolas Pierron
7cdb7d38ef Replace the activation script by one which is completely generated. 
svn path=/nixos/branches/fix-style/; revision=13683
 2009-01-02 16:07:24 +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
44f1d9f0bf Extra sudo configuration file from: 
- system/options.nix
- system/system.nix
- etc/default.nix

svn path=/nixos/branches/fix-style/; revision=13681
 2009-01-02 16:07:15 +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
86ad3e36d5 Move Nix setup from system/active-configuration.sh to system/system-options.nix. 
svn path=/nixos/branches/fix-style/; revision=13679
 2009-01-02 16:07:05 +00:00
Nicolas Pierron
145345c307 system/users-groups.nix is now a configuration file. 
Remove user & group references from system/system.nix.

svn path=/nixos/branches/fix-style/; revision=13678
 2009-01-02 16:07:01 +00:00
Nicolas Pierron
8d5553a4d5 move some command to activate the configuration from activate-configuration.sh to system-options.nix. 
svn path=/nixos/branches/fix-style/; revision=13677
 2009-01-02 16:06:56 +00:00
Nicolas Pierron
1533dec09d * etc/default.nix is now a configuration file. 
* the script used to build the etc directory in stored in config.system.build.etc.
* The activation script is defined inside etc/Default.nix instead of system/activate-configuration.sh

svn path=/nixos/branches/fix-style/; revision=13676
 2009-01-02 16:06:52 +00:00
Nicolas Pierron
e7e45dbd2c Start moving the "activate configuration" script to be extensible. 
svn path=/nixos/branches/fix-style/; revision=13675
 2009-01-02 16:06: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
205a7431ac Remove extra arguments comming from config.*. 
svn path=/nixos/branches/fix-style/; revision=13381
 2008-11-23 01:29:20 +00:00
Nicolas Pierron
3b2016569a Replace some ${nixpkgsPath}/pkgs by ${pkgs.path}. 
svn path=/nixos/branches/fix-style/; revision=13380
 2008-11-23 01:29:13 +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
2e6c2f9aaf Add config.etc option to add extra /etc/* files. 
svn path=/nixos/trunk/; revision=13234
 2008-11-09 16:44:37 +00:00
Nicolas Pierron
92f790036c Replace obsolete name. 
svn path=/nixos/trunk/; revision=13233
 2008-11-09 16:44:31 +00:00
Nicolas Pierron
ed1df64e2a fix typo in the upstart jobs example. 
svn path=/nixos/trunk/; revision=13232
 2008-11-09 16:44:22 +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
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