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

297 commits

Author SHA1 Message Date
Eelco Dolstra 8a1d362447 * Postgres job: start postgres directly, don't use the old control 
script from the services tree.

svn path=/nixos/trunk/; revision=10722
 2008-02-18 11:56:43 +00:00
Ludovic Courtès b98cb9a770 Add BitlBee Upstart job in deamon mode. 
svn path=/nixos/trunk/; revision=10720
 2008-02-18 09:15:10 +00:00
Eelco Dolstra b9d01830d3 * In a vhost, merge in the robots.txt for the main server. 
svn path=/nixos/trunk/; revision=10688
 2008-02-14 14:14:39 +00:00
Eelco Dolstra 94937ba2aa * Support for declaring virtual hosts, like 
httpd = {
      ...
      virtualHosts = [
        { hostName = "foo";
          documentRoot = "/data/webroot-foo";
          ...
        }
        { hostName = "bar";
          documentRoot = "/data/webroot-bar";
          ...
        }
      ];
    };

  Each virtual host can specify almost any option also permitted in
  the top-level httpd configuration.

svn path=/nixos/trunk/; revision=10682
 2008-02-14 13:20:26 +00:00
Eelco Dolstra f6fce91cb2 * Allow httpd subservices to declare options locally. 
* Allow multiple instantiations of a subservice (for instance,
  multiple Subversion subservices in the same Apache server).

svn path=/nixos/trunk/; revision=10675
 2008-02-14 09:54:25 +00:00
Eelco Dolstra 18123c08ca * Refactoring. 
svn path=/nixos/trunk/; revision=10671
 2008-02-14 07:42:52 +00:00
Eelco Dolstra 0efc29afa4 * Manual updates. 
svn path=/nixos/trunk/; revision=10560
 2008-02-08 22:43:59 +00:00
Eelco Dolstra ce250ffb37 * Installation CD: include a lot of modules (SATA, PATA, Firewire, 
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
 2008-02-08 15:59:15 +00:00
Eelco Dolstra 1f81bcae40 svn path=/nixos/trunk/; revision=10548 2008-02-07 14:39:32 +00:00
Eelco Dolstra b510189674 svn path=/nixos/trunk/; revision=10545 2008-02-07 14:15:13 +00:00
Sander van der Burg 390d2adb91 Modified variable names to follow the standard convention 
svn path=/nixos/trunk/; revision=10544
 2008-02-07 14:02:38 +00:00
Sander van der Burg 7fad8dc1b9 Changed some variable names to follow the standard convention 
svn path=/nixos/trunk/; revision=10542
 2008-02-07 13:37:20 +00:00
Sander van der Burg 76897682c4 Added vsftpd upstart job 
svn path=/nixos/trunk/; revision=10540
 2008-02-07 12:41:18 +00:00
Eelco Dolstra 65c1f9882c * Less verbosity. 
svn path=/nixos/trunk/; revision=10506
 2008-02-05 14:33:21 +00:00
Sander van der Burg 90f34e204d Added ejabberd service 
svn path=/nixos/trunk/; revision=10495
 2008-02-04 13:40:01 +00:00
Eelco Dolstra 707e515f82 * Option to enable support for the WIS GO7007. 
svn path=/nixos/trunk/; revision=10491
 2008-02-04 10:52:58 +00:00
Eelco Dolstra c30e7b0f13 * Determine networking.enableIntel3945ABGFirmware. 
svn path=/nixos/trunk/; revision=10490
 2008-02-04 10:39:06 +00:00
Eelco Dolstra 0d50031a0a * Periodically update the locate database from cron when 
config.services.locate.enable is set.

svn path=/nixos/trunk/; revision=10448
 2008-02-01 12:35:51 +00:00
Eelco Dolstra 9f62e1a6a5 * Declarative specification of the system cron jobs. Ideally 
this would abstract over the Crontab syntax though.

svn path=/nixos/trunk/; revision=10447
 2008-02-01 12:01:27 +00:00
Sander van der Burg 406d3aafc5 Added deploydir to tomcat service 
svn path=/nixos/trunk/; revision=10407
 2008-01-30 14:38:27 +00:00
Sander van der Burg b3ff0f8a59 Added tomcat service to NixOS 
svn path=/nixos/trunk/; revision=10402
 2008-01-30 11:00:00 +00:00
Eelco Dolstra 9fd5d70968 * The CD is now a true live CD: you can run Nix operations in it 
thanks to unionfs.  For instance, nix-env and nixos-rebuild work.
  The tricky part was to build a Nix database (in the tmpfs/unionfs)
  which is now necessary to prevent store paths on the CD from being
  deleted right away because they otherwise wouldn't be valid.
  
* nixos-install: use the /etc/nixos/configuration.nix from the target
  file system (don't copy it anymore).  Since the user is supposed to
  mount the target file system on /mnt anyway, we may as well require
  that configuration.nix is placed in /mnt/etc/nixos.  This also makes
  upgrading / reinstalling much easier, since it will automatically
  use the right configuration.nix.

svn path=/nixos/trunk/; revision=10399
 2008-01-30 01:28:56 +00:00
Eelco Dolstra 34e63da53b * Make nixUnstable the default again. 
svn path=/nixos/trunk/; revision=10398
 2008-01-30 01:14:03 +00:00
Eelco Dolstra 2da50038e4 * Use aufs instead of unionfs, it seems to be more stable. 
svn path=/nixos/trunk/; revision=10390
 2008-01-29 18:53:15 +00:00
Michael Raskin 6f0772d9f0 JBoss job fix 
svn path=/nixos/trunk/; revision=10367
 2008-01-28 20:04:48 +00:00
Sander van der Burg 6e96e0a87d Fixed syntax error 
svn path=/nixos/trunk/; revision=10311
 2008-01-28 15:44:59 +00:00
Sander van der Burg 1727c4bd3b Added mod_jk module to apache httpd 
svn path=/nixos/trunk/; revision=10310
 2008-01-28 15:40:29 +00:00
Sander van der Burg 8d5884e01f Added JBoss service 
svn path=/nixos/trunk/; revision=10309
 2008-01-28 15:16:14 +00:00
Sander van der Burg 4341ef80d8 Fixed MySQL option 
svn path=/nixos/trunk/; revision=10307
 2008-01-28 14:55:12 +00:00
Sander van der Burg a73c26875a Added MySQL service to NixOS 
svn path=/nixos/trunk/; revision=10305
 2008-01-28 14:30:18 +00:00
Michael Raskin e5025996ca fontDir compatible with both trunk and (hopefully) stdenv-updates 
svn path=/nixos/trunk/; revision=10293
 2008-01-25 13:31:59 +00:00
Yury G. Kudryashov e914d28638 Using default stdenv in fontdir.nix 
svn path=/nixos/trunk/; revision=10289
 2008-01-25 12:54:32 +00:00
Yury G. Kudryashov 3166d9f687 Made iwlwifi optional, with false default 
svn path=/nixos/trunk/; revision=10288
 2008-01-25 12:54:27 +00:00
Eelco Dolstra 49e8829053 * Use unionfs to provide a real Live CD, i.e., the files on the CD 
appear writable (though all writes go to a tmpfs).  This allows you
  to run Nix operations on the Live CD.  However, we're not quite
  there yet since the CD doesn't have a valid Nix database.  So for
  instance a garbage collect will cause everything to be deleted,
  hanging the system.

svn path=/nixos/trunk/; revision=10276
 2008-01-24 16:56:09 +00:00
Michael Raskin 7fa31be440 Tried to do offline install CD, not DVD. Failure, but some parts could be useful. 
svn path=/nixos/trunk/; revision=10248
 2008-01-22 17:55:57 +00:00
Eelco Dolstra 86484779c7 * Mount usbfs on /proc/bus/usb. 
svn path=/nixos/trunk/; revision=10220
 2008-01-18 15:18:32 +00:00
Andres Löh 563a6240a3 * updated docs to reflect new xmonad choice 
svn path=/nixos/trunk/; revision=10181
 2008-01-16 16:53:32 +00:00
Eelco Dolstra d9ffa7f72e * Manual bug. 
svn path=/nixos/trunk/; revision=10179
 2008-01-16 15:33:09 +00:00
Michael Raskin d69cc82771 Moved configuration check option into configuration.nix (environment.checkConfigurationOptions) 
svn path=/nixos/trunk/; revision=10157
 2008-01-15 16:05:51 +00:00
Eelco Dolstra 26e0f711a9 * Use the aggregator to combine the kernel modules tree with 
externally-built modules so that (e.g.) "modprobe nvidia" Just
  Works.

svn path=/nixos/trunk/; revision=10129
 2008-01-12 23:37:17 +00:00
Eelco Dolstra cfed953b5f * Option to enable the Intel 3945 firmware. (It's enabled by 
default since it doesn't seem to have the legal issues of
  the Intel 2200 firmware.)
* Firmware loader: don't write in /tmp.  Also a hack to quickly
  test new firmwares.
* Revert r10105 since the build fails if configuration.nix 
  is a symlink.  Anyway copying configuration.nix does not
  necessarily make sense since it can import other expressions,
  which would also have to be copied.  Perhaps a better 
  approach would be to write a serialisation of the config
  to a file (maybe with builtins.toXML).

svn path=/nixos/trunk/; revision=10127
 2008-01-12 22:53:13 +00:00
Michael Raskin 4475a74fb8 LiveDVD with X and sources made. 
svn path=/nixos/trunk/; revision=10119
 2008-01-11 16:59:39 +00:00
Michael Raskin a11779f912 Gw6c now can be configured not to start automatically 
svn path=/nixos/trunk/; revision=10116
 2008-01-11 06:36:15 +00:00
Michael Raskin 99a2f550c0 Modifications to grub-menu-builder: copy default kernel and initrd to /boot/nixos-.. , limit menu size 
svn path=/nixos/trunk/; revision=10106
 2008-01-10 04:43:19 +00:00
Michael Raskin f667e94752 Now configuration.nix is copied into shared. 
svn path=/nixos/trunk/; revision=10105
 2008-01-09 16:08:15 +00:00
Eelco Dolstra fec916552c * Add $prefix/info, set $INFOPATH. 
svn path=/nixos/trunk/; revision=10087
 2008-01-07 11:46:17 +00:00
Eelco Dolstra a00f463ffa * Symlink /man in /var/run/current-system/sw so that for 
example "man bash" works.  Ideally of course all packages
  should put their man pages under $out/share/man.

svn path=/nixos/trunk/; revision=10086
 2008-01-07 11:24:02 +00:00
Michael Raskin 5a29acf6a0 Added module aggregation, also changed non-root shell prompt colour to green 
svn path=/nixos/trunk/; revision=10084
 2008-01-06 18:45:13 +00:00
Eelco Dolstra 9e00dfe107 * Add a bunch of common SATA modules to the default initrd. 
svn path=/nixos/trunk/; revision=10083
 2008-01-06 00:51:07 +00:00
Eelco Dolstra 56107c81b0 * Put some help text in /etc/issue on the CD. 
svn path=/nixos/trunk/; revision=10076
 2008-01-04 17:05:48 +00:00
Eelco Dolstra 3abf5072ce * Installation CD: start a web browser showing the NixOS manual on 
tty7.
* Add w3m to the installation CD's path since it's needed for the
  manual anyway.

svn path=/nixos/trunk/; revision=10074
 2008-01-04 16:11:12 +00:00
Eelco Dolstra f4399a1883 * Option to set the Grub background image. To 
get the background image to work, you may need
  to set NIXOS_INSTALL_GRUB=1 when calling
  nixos-rebuild to force Grub to be reinstalled
  with splashimage support.

svn path=/nixos/trunk/; revision=10071
 2008-01-04 15:02:31 +00:00
Eelco Dolstra 8f0e88d4e5 * Just pass all of Nixpkgs to xserver.nix. 
svn path=/nixos/trunk/; revision=10068
 2008-01-04 10:54:33 +00:00
Eelco Dolstra b73424833a * xserver.nix: remove some unnecessary function arguments. 
* isClone: changed into a boolean rather than a string "on" or "off".

svn path=/nixos/trunk/; revision=10067
 2008-01-04 10:36:14 +00:00
Marc Weber 598848d6af patches provided by Tobias Hammerschmidt 
svn path=/nixos/trunk/; revision=10055
 2008-01-02 21:16:58 +00:00
Eelco Dolstra 90a0d64bcd svn path=/nixos/trunk/; revision=10051 2008-01-02 15:31:04 +00:00
Eelco Dolstra 5ec82632f2 * Use Nix 0.11. 
svn path=/nixos/trunk/; revision=10048
 2008-01-02 13:05:24 +00:00
Eelco Dolstra 0cb6f3e5c3 * Missing description. 
svn path=/nixos/trunk/; revision=10047
 2008-01-02 12:50:46 +00:00
Michael Raskin 27d5e93920 Added choice of sound devices mode. 
svn path=/nixos/trunk/; revision=10045
 2008-01-02 10:07:52 +00:00
Michael Raskin ae6104ae59 Fixed a bit about child configurations, added an option to not run X job, but create it, and to export configuration files from it. 
svn path=/nixos/trunk/; revision=9986
 2007-12-31 08:52:59 +00:00
Michael Raskin b3fa4f1e4e Added some xfs and general font changes. 
svn path=/nixos/trunk/; revision=9966
 2007-12-25 12:16:38 +00:00
Michael Raskin f81bebe2d7 Added possibility of building multiple configurations by one nixos-rebuild. 
svn path=/nixos/trunk/; revision=9959
 2007-12-20 11:36:30 +00:00
Michael Raskin 6733486ec8 Corrected fontDir builder; beginning of changes to allow configuration having multiple variaions in GRUB menu/ 
svn path=/nixos/trunk/; revision=9957
 2007-12-20 04:36:30 +00:00
Michael Raskin 189a608cf5 Now copyKernels allows both /nix/store and /boot be on separate partitions (you need to specify where /boot is for this). 
svn path=/nixos/trunk/; revision=9949
 2007-12-16 18:56:36 +00:00
Eelco Dolstra 4ef15fc095 * Statically check whether the generated httpd.conf is correct. 
* Option `noUserDir' -> `enableUserDir', negatives are bad :-)

svn path=/nixos/trunk/; revision=9927
 2007-12-12 15:30:17 +00:00
Eelco Dolstra 6f5da72337 * Start of a nicer Apache configuration than the old stuff in the 
services tree.  This one does the generation of httpd.conf in
  the Nix expression language instead of in a builder.

svn path=/nixos/trunk/; revision=9926
 2007-12-12 13:58:15 +00:00
Eelco Dolstra becb4b69c1 Allow the hostname to be empty (to obtain it using dhcp). 
svn path=/nixos/trunk/; revision=9857
 2007-12-04 15:02:48 +00:00
Eelco Dolstra d987b16112 * More declarative specification of the DHCPD config. 
svn path=/nixos/trunk/; revision=9856
 2007-12-04 14:53:37 +00:00
Michael Raskin aeced64d0e Added PostgreSQL job. 
svn path=/nixos/trunk/; revision=9830
 2007-12-03 04:48:31 +00:00
Yury G. Kudryashov 5cd638aad8 new option: paths to link to /var/run/current-system/sw 
svn path=/nixos/trunk/; revision=9828
 2007-12-01 20:44:27 +00:00
Eelco Dolstra 9dd7891820 * Options for configuring the (mail) domain. 
svn path=/nixos/trunk/; revision=9785
 2007-11-23 17:12:37 +00:00
Eelco Dolstra e7e685e4ce * Allow Upstart jobs to declare extra configuration for Apache. 
Did this for Nagios.  Soon we can rename upstart-jobs to 
  services/plugins/whatever (i.e. an Upstart job will just be 
  one kind of configuration item that a plugin can declare).

svn path=/nixos/trunk/; revision=9778
 2007-11-23 10:56:12 +00:00
Eelco Dolstra 1089c1f7fa * Fix the manual. 
svn path=/nixos/trunk/; revision=9769
 2007-11-21 14:39:52 +00:00
Eelco Dolstra b880647870 * Options users.extraUsers and users.extraGroups to specify additional 
users and groups that the system should create automatically.

svn path=/nixos/trunk/; revision=9705
 2007-11-16 13:26:34 +00:00
Eelco Dolstra f6fd10cbd8 * Support for system-wide distributed / multi-platform builds. 
Just set nix.distributedBuilds to true and nix.buildMachines 
  to a list of machines that can perform Nix builds via SSH,
  and local builds will be forwarded appropriately.  So now
  any user can say something like

    nix-build /etc/nixos/nixpkgs/ --arg system '"powerpc-linux"' -A libxml2

  and the build for powerpc-linux will be forwarded to a machine 
  of that type.

svn path=/nixos/trunk/; revision=9696
 2007-11-15 17:16:16 +00:00
Michael Raskin de01f56b42 Corrected some SVN service glitches; added switchable Nix 
svn path=/nixos/trunk/; revision=9662
 2007-11-13 15:51:24 +00:00
Eelco Dolstra 8b85db0728 * Upstart job for Nagios (system/network monitoring daemon). 
svn path=/nixos/trunk/; revision=9658
 2007-11-12 16:43:35 +00:00
Eelco Dolstra 646c2e4dec * Put user "root" in the group "root". 
svn path=/nixos/trunk/; revision=9654
 2007-11-12 14:59:23 +00:00
Eelco Dolstra a0f5a93229 * Create /var/tmp. 
svn path=/nixos/trunk/; revision=9653
 2007-11-12 14:45:26 +00:00
Michael Raskin 7d94e2ed4d Removed bad characters in descriptions, changed system.nix checker invokation 
svn path=/nixos/trunk/; revision=9620
 2007-11-10 13:35:15 +00:00
Eelco Dolstra 2fc94b76fe * Eliminate all calls to config.get. 
svn path=/nixos/trunk/; revision=9619
 2007-11-09 18:49:45 +00:00
Eelco Dolstra 62c1f0ddcc * Converted the option declarations in options.nix to nested attribute 
sets that match the hierarchical structure of the options.  So
  instead of

    {
      name = ["time" "timeZone"];
      default = "CET";
      example = "America/New_York";
      description = "The time zone used when displaying times and dates.";
    }

  we have

    time = {
      timeZone = {
        default = "CET";
        example = "America/New_York";
        description = "The time zone used when displaying times and dates.";
      };
    };

  And instead of `config.get ["time" "timeZone"]' you can now just say
  `config.time.timeZone'.  Furthermore, this option representation
  will allow option structures with repetition (such as in
  networking.interfaces or services.httpd.subservices) to be defined.

svn path=/nixos/trunk/; revision=9618
 2007-11-09 18:12:23 +00:00
Eelco Dolstra 5bb4e343b4 * Configuration options networking.defaultMailServer to enable direct mail 
delivery without a local mail server (via ssmtp).
* Add vimDiet to the CD, not the system path in general.

svn path=/nixos/trunk/; revision=9607
 2007-11-08 18:15:12 +00:00
Marc Weber 89670079ab vimDiet and reiserfsprogs added to systemPathList 
svn path=/nixos/trunk/; revision=9600
 2007-11-07 22:00:05 +00:00
Eelco Dolstra 81c7e17e02 * An option nix.useChroot to enable chroot builds in NixOS. 
svn path=/nixos/trunk/; revision=9583
 2007-11-05 11:19:51 +00:00
Michael Raskin 8c9d312e21 Added xfs; fixed nixos-checkout 
svn path=/nixos/trunk/; revision=9579
 2007-11-05 08:54:30 +00:00
Michael Raskin b494c20cb5 Small correction to xserver.nix for compiz; also nixos-checkout now creates services where it should be. 
svn path=/nixos/trunk/; revision=9578
 2007-11-05 08:33:12 +00:00
Michael Raskin 0ff3fc1882 Added option tcpEnable for X server. Needed for xmove. 
svn path=/nixos/trunk/; revision=9532
 2007-10-26 05:52:35 +00:00
Michael Raskin b4be8e3b92 Added a way to add arbitrary entries in /etc/hosts . 
svn path=/nixos/trunk/; revision=9528
 2007-10-26 04:49:44 +00:00
Michael Raskin e4626e0f0d Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. 
svn path=/nixos/trunk/; revision=9527
 2007-10-26 04:28:01 +00:00
Yury G. Kudryashov 607a32c86f Fixed typo in options.nix 
svn path=/nixos/trunk/; revision=9494
 2007-10-19 19:15:48 +00:00
Eelco Dolstra 2cc89b09e6 * Create /dev/{stdin,stdout,stderr}. 
svn path=/nixos/trunk/; revision=9416
 2007-10-06 18:53:50 +00:00
Michael Raskin 5c08d306e5 Some more corrections to fontDir; now suitable as fontPath for Xvnc 
svn path=/nixos/trunk/; revision=9410
 2007-10-05 12:51:05 +00:00
Michael Raskin 9ce2dbf8d3 Corrected X11-fonts, now it is linked in /var/run/current-system 
svn path=/nixos/trunk/; revision=9409
 2007-10-05 07:45:56 +00:00
Michael Raskin 44d09afffb Added dir option to link all fonts into share. 
svn path=/nixos/trunk/; revision=9407
 2007-10-05 07:25:13 +00:00
Eelco Dolstra 94b7b9377c * Option fonts.enableGhostscriptFonts to make the Ghostscript fonts 
available to X11 apps.

svn path=/nixos/trunk/; revision=9401
 2007-10-03 15:44:30 +00:00
Eelco Dolstra f402fd73f2 * Print a sensible error message if there are multiple declarations 
for an option.
* Removed double declaration for services.xserver.layout.

svn path=/nixos/trunk/; revision=9398
 2007-10-03 13:27:45 +00:00
Michael Raskin 33aa5d2d74 Separated keep-alive and additional keep-alive ping frequency. 
svn path=/nixos/trunk/; revision=9384
 2007-09-30 21:10:11 +00:00
Michael Raskin cf1140ee11 Added option for external firmware. 
svn path=/nixos/trunk/; revision=9379
 2007-09-28 07:58:40 +00:00
Eelco Dolstra c43dc7b013 * Allow Upstart's init to be upgraded in a running system. 
svn path=/nixos/trunk/; revision=9375
 2007-09-27 12:24:05 +00:00