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

256 Commits

Author SHA1 Message Date
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
c1f619a087 Added tomcat service to NixOS 
svn path=/nixos/trunk/; revision=10403
 2008-01-30 11:00:59 +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
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
f38ed802a6 Added MySQL to NixOS 
svn path=/nixos/trunk/; revision=10306
 2008-01-28 14:34:29 +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
01004362f2 Now xfs job fails without enableFontDir. 
svn path=/nixos/trunk/; revision=10279
 2008-01-24 21:35:24 +00:00
Yury G. Kudryashov
8f503d7302 typo in upstart-jobs/xfs.nix fixed 
svn path=/nixos/trunk/; revision=10278
 2008-01-24 20:37:27 +00:00
Michael Raskin
7749d93524 Added extraInitrdKernelModules option to CD 
svn path=/nixos/trunk/; revision=10182
 2008-01-16 21:56:31 +00:00
Andres Löh
e893328176 * added xmonad to possible windowManager choices in xserver.nix 
svn path=/nixos/trunk/; revision=10180
 2008-01-16 16:49:22 +00:00
Eelco Dolstra
d9ffa7f72e * Manual bug. 
svn path=/nixos/trunk/; revision=10179
 2008-01-16 15:33:09 +00:00
Eelco Dolstra
622734b58b * Generate /etc/ssh/ssh_config, set ForwardX11 and XAuthLocation. 
svn path=/nixos/trunk/; revision=10177
 2008-01-16 13:59:03 +00:00
Michael Raskin
e8ddb6fd2d Samba service; httpd/xfs dependencies changed to know about gw6c.autorun option. 
svn path=/nixos/trunk/; revision=10140
 2008-01-14 11:24:36 +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
a4ff40b158 Added kqemu 0666 permissions 
svn path=/nixos/trunk/; revision=10097
 2008-01-08 00:16:49 +00:00
Eelco Dolstra
a2c1282ebc * Get rid of some unnecessary xorg.conf statements. 
svn path=/nixos/trunk/; revision=10096
 2008-01-07 23:12:02 +00:00
Eelco Dolstra
c71e8dc314 * Load the NVIDIA kernel module automatically and some more cleanups. 
svn path=/nixos/trunk/; revision=10095
 2008-01-07 22:56:16 +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
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
Eelco Dolstra
48142d8135 * Use the '' string syntax, it cleans up xserver.nix a lot. 
svn path=/nixos/trunk/; revision=10066
 2008-01-04 10:28:12 +00:00
Eelco Dolstra
3da504ab6a * Disable mod_unique_id because it fails when the machine doesn't have 
an IP address yet.
* Create /var/run/httpd, /var/log/httpd automatically.

svn path=/nixos/trunk/; revision=10064
 2008-01-03 17:11:36 +00:00
Marc Weber
598848d6af patches provided by Tobias Hammerschmidt 
svn path=/nixos/trunk/; revision=10055
 2008-01-02 21:16:58 +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
55b977dcbf Changes to xserver to export configuration and to allow not to run the job on boot, changes to filesystems job to autocreate some mountpoints (/dev/shm..) 
svn path=/nixos/trunk/; revision=9987
 2007-12-31 08:55:40 +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
4892139b38 Added ATI card support to xserver.conf 
svn path=/nixos/trunk/; revision=9951
 2007-12-18 22:43:17 +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
Michael Raskin
3ba09e4004 Changed Postgresql upstart job not to stop on network down 
svn path=/nixos/trunk/; revision=9867
 2007-12-06 03:50:15 +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
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
524f1fa376 svn path=/nixos/trunk/; revision=9756 2007-11-19 15:50:26 +00:00
Eelco Dolstra
4de273e376 * Set the To: field. 
* Doh! copy the actual Nagios config files to the store, 
  not symlinks to the sources outside of the store.

svn path=/nixos/trunk/; revision=9755
 2007-11-19 15:50:02 +00:00
Eelco Dolstra
d53c726cbb * Make the Nagios configuration visible in /etc/nagios.cfg. 
svn path=/nixos/trunk/; revision=9753
 2007-11-19 15:31:28 +00:00
Marc Weber
bb08b8ff48 ; bug fix 
svn path=/nixos/trunk/; revision=9701
 2007-11-15 23:57:20 +00:00
Marc Weber
d7eb1006bb added driver nv as suggested by niksnut 
svn path=/nixos/trunk/; revision=9700
 2007-11-15 23:52:53 +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
Wouter den Breejen
14c2bb437d svn path=/nixos/trunk/; revision=9665 2007-11-13 16:38:39 +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
2fc94b76fe * Eliminate all calls to config.get. 
svn path=/nixos/trunk/; revision=9619
 2007-11-09 18:49:45 +00:00
Michael Raskin
c4ad7b56d1 Added a silent mention of evdev in xorg.conf, but removed actual dependency on it. 
svn path=/nixos/trunk/; revision=9614
 2007-11-09 13:55:07 +00:00
Eelco Dolstra
e6b8dd5b25 * Cleanup. 
svn path=/nixos/trunk/; revision=9593
 2007-11-06 00:00:29 +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
Wouter den Breejen
f7fd4c9a6d Fixed ../ to ../../services reference 
svn path=/nixos/trunk/; revision=9552
 2007-10-29 14:24:24 +00:00
Michael Raskin
a357a601bf Enable composite extension for i810. 
svn path=/nixos/trunk/; revision=9541
 2007-10-27 17:47:54 +00:00
Wouter den Breejen
8881c10ca4 Dont let the 'normal' fsck check a ext3cow partitions anymore since it thinks it fixes inodes but it will actually cause ext3cow to loose data ..... 
svn path=/nixos/trunk/; revision=9537
 2007-10-27 13:04:00 +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
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
Eelco Dolstra
48acdef3c9 * Use the stdenv that does support \n in replacements. 
svn path=/nixos/trunk/; revision=9399
 2007-10-03 14:48:41 +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
Michael Raskin
51626b0b66 Added checking of unkonwn options in configuration.nix and a system-wide font set changer. 
svn path=/nixos/trunk/; revision=9370
 2007-09-25 19:00:20 +00:00
Michael Raskin
07fd13f20e Added keyboard layout to options and internal AGPGART option 
svn path=/nixos/trunk/; revision=9369
 2007-09-24 19:32:21 +00:00
Michael Raskin
2cf1edf365 Added language switch support to xserver.nix 
svn path=/nixos/trunk/; revision=9367
 2007-09-24 09:19:34 +00:00
Michael Raskin
a34885af7e Added synaptics support to xserver upstart-job. 
svn path=/nixos/trunk/; revision=9366
 2007-09-24 09:02:43 +00:00
Michael Raskin
8f126de2fb Changed X server upstart expression a bit, now works for my Intel 915GM notebook (with vesa at least). 
svn path=/nixos/trunk/; revision=9364
 2007-09-24 05:16:15 +00:00
Eelco Dolstra
f2780fdc62 * Add a top-level default.nix for NixOS which has attributes useful 
for building parts of the system.  E.g.

  $ nix-build /etc/nixos/nixos -A upstartJobs.xserver

  to build the Upstart job for the X server, or

  $ nix-build /etc/nixos/nixos -A kernel

  to build the NixOS kernel.

* /etc/profile.sh: if ~/.nix-defexpr doesn't exist yet, create it as a
  directory and add links to root's channels, /etc/nixos/nixos and
  /etc/nixos/install-source.nix (as "nixpkgs_sys").
  
* boot.useKernel -> boot.kernel.

svn path=/nixos/trunk/; revision=9334
 2007-09-18 15:06:24 +00:00
Marc Weber
53a8d28f06 added udev rule to move /dev/tun to the place /dev/net/tun which most distros are using by default as well as tunctl 
svn path=/nixos/trunk/; revision=9252
 2007-09-04 13:44:26 +00:00
Yury G. Kudryashov
0c4a936419 Added .xsession support 
If user have ~/.xsession file it will be sourced.

svn path=/nixos/trunk/; revision=9231
 2007-09-01 17:57:04 +00:00
Michael Raskin
f7d2ccdb87 Added mod_php option for httpd. 
svn path=/nixos/trunk/; revision=9155
 2007-08-18 15:19:27 +00:00
Eelco Dolstra
ad22e587ab * nixos-rebuild: do a nix-pull on the Nixpkgs channel manifest. I.e., you 
don't need to be subscribed to the Nixpkgs channel to get binary downloads.
  This is possible because nix-pull is now pretty fast.

svn path=/nixos/trunk/; revision=9133
 2007-08-15 12:01:20 +00:00
Eelco Dolstra
cc3803f207 * An Upstart job for ifplugd, which monitors Ethernet interfaces 
for cables being plugged in or unplugged.  When this occurs, the
  dhclient service is restarted to automatically obtain a new IP 
  address.  This is useful for roaming users (laptops).

svn path=/nixos/trunk/; revision=9124
 2007-08-14 16:43:56 +00:00
Michael Raskin
45c9f350b1 Corrected ircd-hybrid to fix the problem with finishing terminal-keeping thread. 
svn path=/nixos/trunk/; revision=9107
 2007-08-13 10:45:16 +00:00
Michael Raskin
db3e598ba9 Corrected IRCD. 
svn path=/nixos/trunk/; revision=9103
 2007-08-11 21:48:08 +00:00
Michael Raskin
02c3fc72d8 Made ircd-hybrid wait gw6c coming up if it is enabled at all. 
svn path=/nixos/trunk/; revision=9096
 2007-08-10 18:52:35 +00:00
Eelco Dolstra
9cb4834270 * Add the default profile and the user's profile to $KDEDIRS. 
This is necessary for some KDE applications.

svn path=/nixos/trunk/; revision=9087
 2007-08-09 19:59:48 +00:00
Michael Raskin
bb25a6ef96 Added short keep-alive period to gw6c, added ircd-hybrid service. 
svn path=/nixos/trunk/; revision=9071
 2007-08-08 20:42:25 +00:00
Michael Raskin
8843f3c287 Corrected dependencies for gw6c; also made httpd depend on gw6c if needed. 
svn path=/nixos/trunk/; revision=9029
 2007-08-02 21:26:38 +00:00
Eelco Dolstra
333d0dfe17 * Forward udev events to HAL. 
svn path=/nixos/trunk/; revision=9016
 2007-07-22 02:07:02 +00:00
Michael Raskin
055a950331 Apache httpd customization - extraDirectories & noUserDir . 
svn path=/nixos/trunk/; revision=8985
 2007-07-15 11:16:01 +00:00
Michael Raskin
bf1033d2cb Added Gateway6 upstart-job and options for it. Sudo configuration for PAM 
is added (it is needed anyway), but still only NOPASSWD entries work.

svn path=/nixos/trunk/; revision=8966
 2007-07-09 11:21:04 +00:00
Yury G. Kudryashov
cd1023c50d * Added boot.initrd.lvm flag for use NixOS with LVM2 root partition. 
* Added sis support for xserver.

svn path=/nixos/trunk/; revision=8924
 2007-06-28 09:57:36 +00:00
Eelco Dolstra
f3f16dc169 * ALSA requires a group named "audio". 
svn path=/nixos/trunk/; revision=8863
 2007-06-10 20:17:51 +00:00
Eelco Dolstra
4d4387a70e * Allow jobs to specify groups. 
svn path=/nixos/trunk/; revision=8862
 2007-06-10 20:13:12 +00:00
Eelco Dolstra
ea9e6bdbac * Re-enable some essential X server modules (in particular 
extmod, which contains XVideo).

svn path=/nixos/trunk/; revision=8857
 2007-06-09 21:12:48 +00:00
Eelco Dolstra
258ef4bf19 * Upstart job for HAL. 
svn path=/nixos/trunk/; revision=8854
 2007-06-09 20:05:04 +00:00
Eelco Dolstra
02514fc802 * /var/state -> /var/run. 
svn path=/nixos/trunk/; revision=8852
 2007-06-09 19:46:57 +00:00
Eelco Dolstra
f70df0b275 * Added a job to start the D-Bus system-wide message bus daemon. 
svn path=/nixos/trunk/; revision=8848
 2007-06-08 18:56:55 +00:00
Eelco Dolstra
29c5178bdf * Declarative specification of user accounts. Jobs can now specify a 
list of user accounts that the job needs to run.  For instance, the
  SSH daemon job says:

    { name = "sshd";
      uid = (import ../system/ids.nix).uids.sshd;
      description = "SSH privilege separation user";
      home = "/var/empty";
    }

  The activation script creates the system users/groups and updates
  them as well.  So a change in the Nix expression can be realised in
  /etc/{group,passwd} by running nixos-rebuild.

svn path=/nixos/trunk/; revision=8846
 2007-06-08 15:41:12 +00:00
Eelco Dolstra
566c723986 * Allow the SLiM theme to be overriden. 
* Delete the SLiM log file on X startup.

svn path=/nixos/trunk/; revision=8832
 2007-06-05 11:51:59 +00:00
Eelco Dolstra
c76fa154a6 * Fix the xserver job on non-nvidia cards. 
svn path=/nixos/trunk/; revision=8800
 2007-05-29 19:53:03 +00:00
Wouter den Breejen
f8d77aa58e samba fix and xserver cleanup 
svn path=/nixos/trunk/; revision=8791
 2007-05-28 15:39:25 +00:00
Wouter den Breejen
2e50d9cd58 nixos dir: Xserver and samba nixos 
svn path=/nixos/trunk/; revision=8784
 2007-05-28 14:09:04 +00:00
Eelco Dolstra
aab8fda25a * Option `networking.localCommands' to specify shell commands to be 
executed after the network interfaces have been initialised.

svn path=/nixos/trunk/; revision=8752
 2007-05-24 14:50:17 +00:00
Eelco Dolstra
bec6f8a516 * Ignore modprobe errors. 
svn path=/nixos/trunk/; revision=8713
 2007-05-16 19:43:28 +00:00
Eelco Dolstra
66f0d29a48 * Use the new Intel driver. 
svn path=/nixos/trunk/; revision=8633
 2007-05-01 15:27:50 +00:00
Eelco Dolstra
719112e7bb * Add ~/bin to the PATH. 
svn path=/nixos/trunk/; revision=8557
 2007-04-10 14:18:15 +00:00
Eelco Dolstra
6113da3ce1 * Set the permissions of /dev/fuse to 0666. 
svn path=/nixos/trunk/; revision=8547
 2007-04-07 21:41:29 +00:00
Eelco Dolstra
174f4f2c99 * Set the console font, the keymap, and Unicode/ASCII mode. 
svn path=/nixos/trunk/; revision=8542
 2007-04-04 17:10:38 +00:00
Eelco Dolstra
a9635d3b73 * Upstart job for the CUPS daemon. 
svn path=/nixos/trunk/; revision=8534
 2007-04-02 17:31:58 +00:00
Eelco Dolstra
e312a8ef64 * Start the SSH agent on X11 login. 
svn path=/nixos/trunk/; revision=8531
 2007-04-02 15:01:09 +00:00
Eelco Dolstra
3e71bd9731 * Quick hack to prevent the udev job from messing up the device 
ownership of logged-in users.

svn path=/nixos/trunk/; revision=8530
 2007-04-02 15:00:31 +00:00