alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
2066 commits 217 branches 121 tags 4.5 GiB
Commit graph

484 commits

Author SHA1 Message Date
Lluís Batlle i Rossell de1713a24f Failing when the top level system expression cannot find the kernel image 
svn path=/nixos/trunk/; revision=18291
 2009-11-08 18:32:21 +00:00
Lluís Batlle i Rossell 420639a4b1 Making generations-dir consider the pkgs.platform. 
stdenv-updates stuff. Still to be reviewed, but at least an implementation to have
some different armv5tel-linux platforms: qemu versatile and the sheevaplug.


svn path=/nixos/trunk/; revision=18290
 2009-11-08 17:38:35 +00:00
Nicolas Pierron 616c844336 * Move the default value of videoDrivers into the default field of the 
option.  Otherwise, the system may depends on unused/unsupported
  softwares and users will be force to use properties in their
  configuration.nix file to override this default value. (too complex for
  new users)

svn path=/nixos/trunk/; revision=18288
 2009-11-08 16:01:22 +00:00
Eelco Dolstra 37470cccc5 * Blacklist the "evbug" module. 
svn path=/nixos/trunk/; revision=18285
 2009-11-08 09:08:50 +00:00
Eelco Dolstra 16c2aa734f * Generate /etc/modprobe.conf to allow the setting of module options 
and the blacklisting of modules.

svn path=/nixos/trunk/; revision=18284
 2009-11-08 09:01:53 +00:00
Wouter den Breejen b0ba17873c Fixed hash replace with a variable to the real hash 
svn path=/nixos/trunk/; revision=18268
 2009-11-07 21:03:57 +00:00
Eelco Dolstra 9bf8801dc6 * Use a tmpfs for /var/run/nscd to ensure that / or /var can be 
unmounted or at least remounted read-only during shutdown.  Upstart
  0.6 apparently uses nscd to do some name lookups, resulting in it
  holding some mmap mappings to deleted files in /var/run/nscd.
  E.g. lsof shows:

    init         1 root  DEL       REG              253,0          1850313 /var/run/nscd/dbyn3Piz
    init         1 root  DEL       REG              253,0          1850312 /var/run/nscd/dbt2e8PH

  See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324900.
  This is a workaround - it would be better if Upstart didn't do this.

svn path=/nixos/branches/upstart-0.6/; revision=18258
 2009-11-07 15:29:46 +00:00
Eelco Dolstra 2353e53c5f * /var/run/safemode isn't used anywhere. 
svn path=/nixos/branches/upstart-0.6/; revision=18257
 2009-11-07 15:24:59 +00:00
Eelco Dolstra d9d072a89b * Improve the mysql shutdown. 
svn path=/nixos/branches/upstart-0.6/; revision=18255
 2009-11-07 12:43:32 +00:00
Eelco Dolstra 7aecd0ca53 * hal: depend on both dbus and acpid (if enabled). 
* dbus: don't signal Upstart, since that seems to make it forget about
  pending events or something.  In any case starting dbus after acpid
  was running wouldn't trigger hal to be started (but the other way
  around did work).

svn path=/nixos/branches/upstart-0.6/; revision=18251
 2009-11-07 12:01:12 +00:00
Eelco Dolstra 7d47575a58 * A 15-second timeout to start the X server is too low if there are a 
billion other daemons starting at the same time during the boot.

svn path=/nixos/branches/upstart-0.6/; revision=18250
 2009-11-07 11:32:28 +00:00
Eelco Dolstra b7c519456e * Updated switch-to-configuration for Upstart 0.6. 
svn path=/nixos/branches/upstart-0.6/; revision=18237
 2009-11-07 01:17:56 +00:00
Eelco Dolstra 06fcb121fb * Shut down PostgreSQL cleanly. 
svn path=/nixos/branches/upstart-0.6/; revision=18236
 2009-11-06 23:37:31 +00:00
Eelco Dolstra 18f2d75275 * Set a timezone in the PostgreSQL job. Otherwise database 
initialisation will be incredibly slow (minutes instead of
  seconds).  An strace shows that it's continuously looking up
  timezone information if TZ is empty.

svn path=/nixos/branches/upstart-0.6/; revision=18235
 2009-11-06 22:56:47 +00:00
Eelco Dolstra d7342c78d4 * Support pre-stop scripts. These are needed to cleanly shutdown 
daemons such as Apache or PostgreSQL.

svn path=/nixos/branches/upstart-0.6/; revision=18234
 2009-11-06 22:45:19 +00:00
Eelco Dolstra 83a9bf9a6a * Change all the startOn / stopOn attributes to the Upstart 0.6 syntax 
(e.g., startOn = "started foo" instead of startOn = "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
 2009-11-06 22:19:17 +00:00
Eelco Dolstra 6b0842ff52 svn path=/nixos/branches/upstart-0.6/; revision=18229 2009-11-06 21:51:28 +00:00
Eelco Dolstra a60d83d3b4 svn path=/nixos/branches/upstart-0.6/; revision=18228 2009-11-06 21:39:18 +00:00
Eelco Dolstra d545d08461 * In the network-interfaces task, emit an ip-up event if there is a 
statically configured interface (i.e. we're not running dhclient).
  Otherwise the ntpd job won't be triggered.
* Use the "-n" flag of "initctl emit" to send the event
  asynchronously.

svn path=/nixos/branches/upstart-0.6/; revision=18227
 2009-11-06 21:38:40 +00:00
Eelco Dolstra 4b2ff53ec6 * Don't stop jobs that are already stopped. 
svn path=/nixos/branches/upstart-0.6/; revision=18226
 2009-11-06 21:17:11 +00:00
Eelco Dolstra 82c3e2aa50 * Updated poweroff/reboot/maintenance mode for Upstart 0.6. Upstart 
no longer emits specific events for those.  Instead it emits a
  "runlevel" event.  The "runlevel" task starts the "shutdown" task to
  perform the desired action.
* Upstart 0.6 no longer has a "shutdown" event, so "stop on shutdown"
  no longer works.  Therefore the shutdown task explicitly stops all
  running Upstart jobs, before sending a TERM/KILL signal to all
  remaining processes.
* Do a "chvt 1" at the start of the shutdown task to switch to the
  console.
* Use /dev/console instead of /dev/tty1, since if somebody is logged
  in on tty1, bad things will happen.

svn path=/nixos/branches/upstart-0.6/; revision=18224
 2009-11-06 21:08:06 +00:00
Eelco Dolstra 676da4d87d * Updated some more jobs. 
svn path=/nixos/branches/upstart-0.6/; revision=18219
 2009-11-06 19:20:09 +00:00
Eelco Dolstra 3fcb7c2cb5 * Set the nameserver. 
svn path=/nixos/branches/upstart-0.6/; revision=18218
 2009-11-06 19:19:46 +00:00
Eelco Dolstra c0f732f079 * Work around a lack of laziness in the xserver.nix module. 
svn path=/nixos/trunk/; revision=18216
 2009-11-06 16:30:48 +00:00
Nicolas Pierron e07f1e98db * Revert 18115, 18150, 18135, 18112, 18107-18105. 
Revert modifications done on apache-httpd configurations.


svn path=/nixos/trunk/; revision=18215
 2009-11-06 16:23:25 +00:00
Eelco Dolstra b9bfe7ed43 * Connect Upstart to the system bus. 
svn path=/nixos/branches/upstart-0.6/; revision=18213
 2009-11-06 15:59:23 +00:00
Eelco Dolstra 9fa2f12cc2 * Do some more jobs. 
svn path=/nixos/branches/upstart-0.6/; revision=18212
 2009-11-06 15:46:56 +00:00
Eelco Dolstra 903e92bde6 * Use Upstart's "export fork" feature to properly detect when a daemon 
is "ready".  This prevents ugly race conditions, e.g. HAL failing to
  start because dbus hasn't finished starting yet.
* Support post-start scripts.  These are executed after the job's main
  process has started but before the job's "started" event is
  emitted.  For instance, the udev job uses this to perform "udevadm
  trigger / settle" to create all devices.  Previously this had to be
  done in the pre-start script, so the daemon had to started in the
  pre-start script as well.

svn path=/nixos/branches/upstart-0.6/; revision=18211
 2009-11-06 15:23:16 +00:00
Marco Maggesi ae23b68ee8 Add configurations for MIT kerberos. 
svn path=/nixos/trunk/; revision=18203
 2009-11-06 12:58:44 +00:00
Eelco Dolstra 5d240b99d5 * Work around a bug in HAL (it fails to start if $PATH is too long, 
since it uses a 512-byte buffer somewhere).

svn path=/nixos/branches/upstart-0.6/; revision=18198
 2009-11-06 11:31:57 +00:00
Eelco Dolstra 7011a9315f * Use Upstart 0.6. Jobs are now in /etc/init instead of /etc/event.d. 
svn path=/nixos/branches/upstart-0.6/; revision=18192
 2009-11-06 10:43:38 +00:00
Eelco Dolstra b581a56d79 * Define the Upstart package to use in one place. 
svn path=/nixos/branches/upstart-0.6/; revision=18187
 2009-11-06 09:36:35 +00:00
Eelco Dolstra 5fc4590ce5 * Fix indentation. 
svn path=/nixos/branches/upstart-0.6/; revision=18186
 2009-11-06 09:26:36 +00:00
Eelco Dolstra 124096e418 * Remember the original symbolic driver name. 
svn path=/nixos/trunk/; revision=18185
 2009-11-06 09:22:00 +00:00
Eelco Dolstra 3e9665dd96 * X server autoconfiguration. Rather than specifying a fixed video 
driver (in services.xserver.videoDriver), the X server is now given
  a set of drivers, and will use PCI ids to find the right one.

  The only problem is that the choice of OpenGL driver (the
  /var/run/opengl-driver symlink) depends on what driver is selected
  at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
  for all other drivers).  However this isn't a big problem right now
  since "nvidia" isn't included in the default set of drivers anyway
  for legal reasons.
  
* `services.xserver.resolutions' now defaults to [], meaning that the
  X server should figure out the desired resolution(s) itself.
  Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
  server figure it out.

* Removed some options from xorg.conf that no longer appear needed
  ("Composite" and the DRI "Mode").

svn path=/nixos/trunk/; revision=18176
 2009-11-06 00:59:03 +00:00
Lluís Batlle i Rossell fe1f084728 Adding a new xorg driver: unichrome 
svn path=/nixos/trunk/; revision=18163
 2009-11-05 21:35:36 +00:00
Nicolas Pierron 72f804c9b2 * Fix subversion test and change the name of the "config" option to 
"configuration" because it may interfered with sub-modules keywords.

svn path=/nixos/trunk/; revision=18155
 2009-11-05 19:24:02 +00:00
Nicolas Pierron 7571055ad3 * Declare options for sub-services. 
* Add deprecated options for "serviceType", "serviceName", "function" and
  "config" without changing the behavior.

svn path=/nixos/trunk/; revision=18150
 2009-11-05 18:21:03 +00:00
Nicolas Pierron 1952365a51 * Remove unused subservice syntax. 
svn path=/nixos/trunk/; revision=18135
 2009-11-05 13:34:01 +00:00
Eelco Dolstra ad17a6dce3 * Changes related to the xorg-7.5 merge. 
svn path=/nixos/trunk/; revision=18126
 2009-11-04 22:44:40 +00:00
Eelco Dolstra 3f7eb694a9 * CUPS provides a dbus service. 
svn path=/nixos/trunk/; revision=18125
 2009-11-04 22:44:21 +00:00
Nicolas Pierron 8734b7103e * Remove needs to call getPort to access the server port. This is made 
possible by using sub-modules arguments.

svn path=/nixos/trunk/; revision=18112
 2009-11-04 18:14:42 +00:00
Nicolas Pierron 0e22df1587 * Use sub-modules for httpd virtual hosts. This add documentation entries 
and allow non-intrusive extensions of virtual hosts.

svn path=/nixos/trunk/; revision=18107
 2009-11-04 17:00:53 +00:00
Nicolas Pierron ff1d9969fb * re-indent per-server-options.nix content. 
svn path=/nixos/trunk/; revision=18106
 2009-11-04 17:00:48 +00:00
Nicolas Pierron 063224bc84 * Convert per-server-options into a module. 
svn path=/nixos/trunk/; revision=18105
 2009-11-04 17:00:42 +00:00
Sander van der Burg 46558b31a0 Added ejabberd to the systemPackages and fixed some command line arguments. This will make the ejabberd service working again 
svn path=/nixos/trunk/; revision=18070
 2009-11-02 12:13:09 +00:00
Nicolas Pierron 8c5b200164 * boor.loader.grub.device can only be defined once. 
* Replace an obscure piece of code by its equivalent based on the
  recursiveUpdate function.  Undefined the obsolete name of
  boot.grubDevice to avoid conflicts.

svn path=/nixos/trunk/; revision=18049
 2009-10-30 11:57:23 +00:00
Eelco Dolstra b86e8208d5 * Doh! The mount options weren't passed properly. 
svn path=/nixos/trunk/; revision=18047
 2009-10-30 08:49:35 +00:00
Eelco Dolstra 11022e8d9f * Back out r17946 and 17948 because it doesn't work. I've seen it 
fail to update /etc twice now.  It's also unnecessarily complex
  IMHO (see nix-dev).

svn path=/nixos/trunk/; revision=18045
 2009-10-30 08:37:08 +00:00
Nicolas Pierron c195493a32 * Add a hacky for-loop to fix the usage of the continue keyword. (NIXOS-85) 
The continue keyword was previously used to mount the next device, but
  the loop in has been removed. (see r17919)

svn path=/nixos/trunk/; revision=17973
 2009-10-27 10:45:18 +00:00
Michael Raskin ca6f5e6cd4 Further reducing writes on boot.. Do not copy /etc unless it changed 
svn path=/nixos/trunk/; revision=17948
 2009-10-24 00:03:13 +00:00
Michael Raskin 893f13bb14 Some boot optimisations attempted. My system boots a few times faster now, and I cannot see how these can break things. 
svn path=/nixos/trunk/; revision=17946
 2009-10-23 20:30:12 +00:00
Marc Weber 4f006e49bf openvpn was broken by jobAttrs. fixed 
svn path=/nixos/trunk/; revision=17940
 2009-10-23 11:30:54 +00:00
Sander van der Burg ac5bc4a68a Added XDMCP option to KDM 
svn path=/nixos/trunk/; revision=17938
 2009-10-23 10:54:35 +00:00
Rob Vermaas 5103c7a872 list possible logformats for apache and added example 
svn path=/nixos/trunk/; revision=17929
 2009-10-22 17:37:06 +00:00
Rob Vermaas 9e80ca48cb added option to specify logformat to apache httpd, defaults to common (like it was until now) 
svn path=/nixos/trunk/; revision=17923
 2009-10-22 14:36:54 +00:00
Eelco Dolstra 1e1ae9cd1e * Don't squeeze all the filesystem option values into one environment 
variable, since they might get confused (NIXOS-84).

svn path=/nixos/trunk/; revision=17919
 2009-10-22 07:46:30 +00:00
Eelco Dolstra feeff52285 * Ugly hack to get HAL to start at boot time. Sometimes it fails 
without any error message in the log (maybe ConsoleKit related?).

svn path=/nixos/trunk/; revision=17907
 2009-10-21 09:41:32 +00:00
Michael Raskin 35abca4e7a Forward-port sshd fixes to iso-minimal-fresh-kernel. By the way, maybe we should finalyy decide what to do with kernel update and corresponding ISO update (to fresh-kernel proposal or otherwise) 
svn path=/nixos/trunk/; revision=17840
 2009-10-16 04:27:59 +00:00
Marc Weber fceadcbef7 --redo -> --fast 
svn path=/nixos/trunk/; revision=17839
 2009-10-15 23:39:57 +00:00
Eelco Dolstra 5dfaf565bf * On the CD or on a newly installed system, create the root account 
with an empty password, rather than with a hashed empty password.
  The latter is a security risk, because it allows remote root logins
  if a user enables sshd before setting a proper root password.
* Allow empty passwords for login and slim, but nothing else.

svn path=/nixos/trunk/; revision=17833
 2009-10-15 14:41:59 +00:00
Eelco Dolstra 77ec877a8c * Fix the background of the manual. 
svn path=/nixos/trunk/; revision=17832
 2009-10-15 14:35:10 +00:00
Eelco Dolstra da5f745603 * You need an override here, otherwise bad things happen. 
svn path=/nixos/trunk/; revision=17831
 2009-10-15 14:32:15 +00:00
Eelco Dolstra 762c13b83e * Fix the Rogue job. 
svn path=/nixos/trunk/; revision=17830
 2009-10-15 14:02:24 +00:00
Eelco Dolstra e055085ac1 svn path=/nixos/trunk/; revision=17823 2009-10-15 12:32:33 +00:00
Eelco Dolstra f6f5d0414e * Run the nix-daemon with a lower I/O priority so that it doesn't 
interfere with interactive tasks as much (hopefully).

svn path=/nixos/trunk/; revision=17820
 2009-10-15 11:25:15 +00:00
Sander van der Burg f57f344996 Changed vboxvideo identifier to virtualbox for clarity 
svn path=/nixos/trunk/; revision=17816
 2009-10-15 09:31:30 +00:00
Ludovic Courtès 6472ee4d20 X11: Always honor ~/.xsession. 
See http://thread.gmane.org/gmane.linux.distributions.nixos/2879 .

svn path=/nixos/trunk/; revision=17814
 2009-10-15 08:27:51 +00:00
Marc Weber f3472f7163 new nixos-rebuild shortcut for --no-fetch --no-nix-build --show-trace called --redo 
svn path=/nixos/trunk/; revision=17813
 2009-10-14 23:56:11 +00:00
Marc Weber ba496e25c4 allow starting of sshd using "start sshd" - but don't start it on 
startup automatically because root password is empty by default.

svn path=/nixos/trunk/; revision=17811
 2009-10-14 21:48:12 +00:00
Marc Weber e611266285 Revert "add /root/my-firmware to the list of firmware directories" 
This reverts rev 17809  - I missed the update

svn path=/nixos/trunk/; revision=17810
 2009-10-14 21:44:25 +00:00
Marc Weber 70b4e1a371 add /root/my-firmware to the list of firmware directories 
svn path=/nixos/trunk/; revision=17809
 2009-10-14 21:35:39 +00:00
Lluís Batlle i Rossell 336d33e591 Adding the wifi nic rt73 firmware into the nixos cds. 
I'm not sure if I had to add the module file reference in "required", or all
modules are properly loaded.


svn path=/nixos/trunk/; revision=17800
 2009-10-14 13:10:41 +00:00
Eelco Dolstra e4defbe8bd * Bring back loading of firmware from /root/test-firmware. 
svn path=/nixos/trunk/; revision=17797
 2009-10-14 09:38:56 +00:00
Ludovic Courtès 290f41bd9f GRUB: "Grub" -> "GRUB". 
svn path=/nixos/trunk/; revision=17793
 2009-10-13 21:39:23 +00:00
Ludovic Courtès f9541e0d12 Add GRUB 2 support. 
svn path=/nixos/trunk/; revision=17792
 2009-10-13 21:39:18 +00:00
Marc Weber ccd2a0b617 sudo default configFile: replace outdated comment 
svn path=/nixos/trunk/; revision=17790
 2009-10-13 21:29:30 +00:00
Lluís Batlle i Rossell e9702320bf Fixing nvidiaLegacy /var/run/opengl-driver 
svn path=/nixos/trunk/; revision=17786
 2009-10-13 17:52:58 +00:00
Lluís Batlle i Rossell a347979be5 Adding nvidiaLegacy xorg option for suspend to work 
svn path=/nixos/trunk/; revision=17785
 2009-10-13 17:52:49 +00:00
Sander van der Burg 8457873334 The 'resolution section' is not generated in the xorg.conf when using the vboxvideo driver. This allows us to perform dynamic resolution resizing 
svn path=/nixos/trunk/; revision=17784
 2009-10-13 15:16:30 +00:00
Sander van der Burg 4eea2539c1 Added udev permissions for virtualbox guest additions 
svn path=/nixos/trunk/; revision=17783
 2009-10-13 15:05:06 +00:00
Sander van der Burg b9d9802c45 Pass virtualbox package as HAL package, so that the guest mouse cursor will follow the host mouse cursor 
svn path=/nixos/trunk/; revision=17781
 2009-10-13 14:30:37 +00:00
Sander van der Burg 50902d2e58 Added some basic VirtualBox driver support. Input driver and dynamic resizing still remains on my todo list 
svn path=/nixos/trunk/; revision=17779
 2009-10-13 13:56:30 +00:00
Eelco Dolstra 1581d91330 * Fix the job name of the Nix daemon. 
svn path=/nixos/trunk/; revision=17776
 2009-10-13 10:09:06 +00:00
Nicolas Pierron 24cbefd7a8 Fix example value of httpd. 
svn path=/nixos/trunk/; revision=17774
 2009-10-13 09:49:26 +00:00
Eelco Dolstra eba8f94069 * jobAttrs -> jobs. 
svn path=/nixos/trunk/; revision=17769
 2009-10-12 18:09:34 +00:00
Eelco Dolstra 40c9057a49 * Remove the obsolete "jobs" option. 
svn path=/nixos/trunk/; revision=17765
 2009-10-12 17:32:30 +00:00
Eelco Dolstra d982f23f20 * Convert the remaining jobs to jobAttrs style. 
svn path=/nixos/trunk/; revision=17764
 2009-10-12 17:27:57 +00:00
Eelco Dolstra 9943e0762e * Update some more modules. 
svn path=/nixos/trunk/; revision=17763
 2009-10-12 17:09:38 +00:00
Eelco Dolstra e91d882a94 * Converted modules that were still using the old (concrete syntax) 
style of declaring Upstart jobs.  While at it, converted them to the
  current NixOS module style and improved some option descriptions.
  Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761
 2009-10-12 16:36:19 +00:00
Eelco Dolstra 4a78ef25e7 * Start mysql automatically on startup. 
svn path=/nixos/trunk/; revision=17755
 2009-10-12 11:30:43 +00:00
Michael Raskin 32229e0c05 Make NixOS harder to kill on boot by leaving stale locks for mtab 
svn path=/nixos/trunk/; revision=17734
 2009-10-09 16:09:56 +00:00
Eelco Dolstra 679c3f9295 * Fix the xfsprogs/jfsutils attribute names. TODO: these shouldn't be 
listed in three different places.  The set of "rescue" packages
  should be factored out into a separate module.

svn path=/nixos/trunk/; revision=17727
 2009-10-08 13:10:08 +00:00
Rob Vermaas a39b238e69 symlink handling mode for sitecopy backup 
svn path=/nixos/trunk/; revision=17716
 2009-10-08 11:08:45 +00:00
Rob Vermaas 81e37d8475 added deps for activation scripts of backup modules 
svn path=/nixos/trunk/; revision=17714
 2009-10-08 09:29:16 +00:00
Rob Vermaas 8d9c51a991 activation script should have unique name 
svn path=/nixos/trunk/; revision=17706
 2009-10-07 20:05:08 +00:00
Nicolas Pierron 2e34baba3b Rename environment.extraPackages to environment.systemPackages. 
svn path=/nixos/trunk/; revision=17705
 2009-10-07 17:14:25 +00:00
Sander van der Burg 43b3ccc620 remove unnecessary concatstrings 
svn path=/nixos/trunk/; revision=17699
 2009-10-07 13:12:45 +00:00
Rob Vermaas 00668de9f1 removed unnecessary optional 
svn path=/nixos/trunk/; revision=17697
 2009-10-07 13:00:37 +00:00
Rob Vermaas ddf7a784e7 * removed unnecessary comments 
svn path=/nixos/trunk/; revision=17696
 2009-10-07 12:54:22 +00:00