Commit Graph
43498 Commits
Author SHA1 Message Date
Rob Vermaas 9587192c68 * added uptimed module
svn path=/nixos/trunk/; revision=17173
2009-09-16 07:48:47 +00:00
Rob Vermaas 8afb39344e * added uptimed 0.3.16
svn path=/nixpkgs/trunk/; revision=17172
2009-09-16 07:31:16 +00:00
Eelco Dolstra 63dceffb0b * Latest lm_sensors.
svn path=/nixpkgs/trunk/; revision=17170
2009-09-15 22:06:38 +00:00
Michael Raskin b217a6c57b Try enabling VESA framebuffer
svn path=/nixpkgs/trunk/; revision=17169
2009-09-15 19:21:02 +00:00
Nicolas Pierron 10e9705a86 Replace optionDeclarations by options which is directly computed by
moduleMerge.

svn path=/nixos/trunk/; revision=17166
2009-09-15 14:09:18 +00:00
Nicolas Pierron dd40d6196b Use only one merge to compute option definitions and option declarations.
svn path=/nixos/trunk/; revision=17165
2009-09-15 14:09:11 +00:00
Eelco Dolstra 6d3edf1030 * Some Perl updates.
svn path=/nixpkgs/trunk/; revision=17164
2009-09-15 13:47:08 +00:00
Nicolas Pierron 0c16b00cbd Replace the traversal of modules:
- Remove handleOptionSets which used option declarations & definitions
in the same set.
- Add a traversal of modules where "config" and "options" are traverse at
the same time.

This allow to have accruate error messages with the incriminated files
playing a role in the error.

This system add a new restriction compare to the previous system:
- A module with no structure (option definitions & option declarations
& require) should not contain any option declarations.  If such module
exists you must convert it to the following form:

{ imports = <content of the require attribute>;
  options = <set of option declarations>;
  config = <set of option definitions>;
}

svn path=/nixpkgs/trunk/; revision=17163
2009-09-15 13:36:30 +00:00
Michael Raskin 07ed9e4611 Enable FB_CON_DECOR
svn path=/nixpkgs/trunk/; revision=17159
2009-09-15 12:29:15 +00:00
Michael Raskin 2a5e20ae3a Try enabling fbcondecor
svn path=/nixpkgs/trunk/; revision=17158
2009-09-15 11:37:18 +00:00
Rob Vermaas 0f02e39a6e added stratego 0.18 pre release
svn path=/nixpkgs/trunk/; revision=17157
2009-09-15 11:36:41 +00:00
Michael Raskin 0428a7405a Fix aufs utilities for NixOS manual
svn path=/nixpkgs/trunk/; revision=17153
2009-09-15 10:28:40 +00:00
Michael Raskin af269992e1 Update feature set for Zen kernel; also tune HZ settings for BFS scheduler (didn't boot for me last time)
svn path=/nixpkgs/trunk/; revision=17151
2009-09-15 09:16:29 +00:00
Michael Raskin 9ff982e4ab Require AUFS2 support in kernel
svn path=/nixpkgs/trunk/; revision=17150
2009-09-15 08:55:41 +00:00
Michael Raskin a0fbdffaba fix typo
svn path=/nixpkgs/trunk/; revision=17149
2009-09-15 08:45:10 +00:00
Nicolas Pierron 36573e5e5c Convert module which are declaring options into modules separated with an
"options" set to declare options and a "config" set to define options.

svn path=/nixos/trunk/; revision=17148
2009-09-15 08:33:45 +00:00
Michael Raskin 9ebb44e92e AUFS2 utilities
svn path=/nixpkgs/trunk/; revision=17147
2009-09-15 07:58:44 +00:00
Michael Raskin 5c2fbcacd1 Update Nginx because of a vulnerability
svn path=/nixpkgs/trunk/; revision=17146
2009-09-15 07:05:32 +00:00
Nicolas Pierron 37ce2ca949 Handles cases where developers ""cannot"" put their initial modules in
other files.

Imports of imported attribute set are not working anymore because this
feature is hard to maintain and because this a potential source of error.

Imports are only accepted inside named modules where the system has some
control over mutual inclusion.

svn path=/nixpkgs/trunk/; revision=17144
2009-09-15 00:21:39 +00:00
Nicolas Pierron 81ec373e1e Imports of imported attribute set are not working anymore because this
feature is hard to maintain and because this a potential source of error.

Imports are only accepted inside named modules where the system has some
control over mutual inclusion.

svn path=/nixos/trunk/; revision=17143
2009-09-15 00:18:00 +00:00
Michael Raskin a593492d4f Add a version of Zen kernel with Con Kolivas' BFS scheduler
svn path=/nixpkgs/trunk/; revision=17142
2009-09-14 21:56:31 +00:00
Michael Raskin b98b622ef0 Fix NixOS evaluation. As I understand, configuration gets added to the list of modules as an attrSet (not as a file name). Just add a trivial check to passthrough such modules.
svn path=/nixpkgs/trunk/; revision=17116
2009-09-14 20:10:41 +00:00
Lluís Batlle i Rossell da09a4e950 Adding kermit.
svn path=/nixpkgs/trunk/; revision=17114
2009-09-14 18:50:17 +00:00
Michael Raskin b1dd203499 Give up on aufs2 for now
svn path=/nixpkgs/trunk/; revision=17112
2009-09-14 14:23:22 +00:00
Eelco Dolstra 23ece2e968 * Fix for building Perl 5.8 on newer kernel headers. We still need
Perl 5.8 for old GHCs.

svn path=/nixpkgs/trunk/; revision=17111
2009-09-14 13:31:26 +00:00
Michael Raskin 5ea58c412e Fix more problems with aufs2
svn path=/nixpkgs/trunk/; revision=17110
2009-09-14 13:30:33 +00:00
Eelco Dolstra a9eadf9fe6 * Add vfat to the initrd on the CD to enable people to copy the
contents of the CD to a bootable USB stick.

svn path=/nixos/trunk/; revision=17109
2009-09-14 13:19:28 +00:00
Nicolas Pierron 1557cfd0c6 split moduleClosure in two parts:
* unifyModuleSyntax: handle all kind of module syntax to convert them into
  a module which has the following form:

  {
    imports = [ <paths> ];
    options = <attribute set of options declarations>;
    config = <attribute set (with properties) of option definitions>;
  }

  This function assume that there is at most one imported attribute set which
  correspond to option declarations.

* moduleClosure: handle a list of module's paths which are converted with
  the previous function to do the closure of the imports with the function
  lazyGenericClosure (which does the same as builtins.genericClosure except
  that it doesn't evaluate the content of modules).  The "key" and "paths"
  attributes are left to be used as debug information in futur
  implementation(s).

svn path=/nixpkgs/trunk/; revision=17108
2009-09-14 13:19:00 +00:00
Andres Löh 5b20a89f11 Version bumps for a number of Haskell packages.
svn path=/nixpkgs/trunk/; revision=17107
2009-09-14 08:35:39 +00:00
Eelco Dolstra b56fecc83a * env -> envar.
svn path=/nixos/trunk/; revision=17106
2009-09-14 06:56:00 +00:00
Nicolas Pierron a07e90d6f3 Update the documentation:
* Change the module syntax of the example to follow Eelco's suggestions.

* Add a section "Building your own NixOS CD", which explain how to replace
configuration.nix by the configuration file of a live CD/DVD.

* Fix "Testing the installer" and "Testing the initrd" to fit the location
of derivations.

svn path=/nixos/trunk/; revision=17105
2009-09-13 22:13:19 +00:00
Nicolas Pierron ff7e67f2d3 Use the system hostname as default for the avahi daemon.
svn path=/nixos/trunk/; revision=17104
2009-09-13 22:13:07 +00:00
Michael Raskin f4162c9716 Turn off more debug options not needed by default
svn path=/nixpkgs/trunk/; revision=17103
2009-09-13 20:22:37 +00:00
Michael Raskin a8fa3e9cc9 Removing more debugging options from default 2.6.31 config
svn path=/nixpkgs/trunk/; revision=17101
2009-09-13 20:10:19 +00:00
Michael Raskin 125600079d Updating XMoto (and adding some functionality to upstream tracking system)
svn path=/nixpkgs/trunk/; revision=17100
2009-09-13 18:31:33 +00:00
Ludovic Courtès 66ebc25eb9 Bitlbee: Change ownership of `/var/lib/bitlbee'.
svn path=/nixos/trunk/; revision=17099
2009-09-13 18:26:05 +00:00
Eelco Dolstra 00343dac28 * Firefox 3.5.3.
svn path=/nixpkgs/trunk/; revision=17098
2009-09-13 18:17:44 +00:00
Eelco Dolstra 538fd39f44 * Thunderbird 2.0.0.23 doesn't compile, but 2.0.0.22 does.
svn path=/nixpkgs/trunk/; revision=17097
2009-09-13 18:07:10 +00:00
Eelco Dolstra 03c8eb97fb svn path=/nixpkgs/trunk/; revision=17096 2009-09-13 16:40:36 +00:00
Michael Raskin 5d3b1a1b07 Change some options most different from mainline to build a probably bootable kernel
svn path=/nixpkgs/trunk/; revision=17095
2009-09-13 16:37:17 +00:00
Michael Raskin 01063c854b Remove option stopping 2.6.31 from booting
svn path=/nixpkgs/trunk/; revision=17094
2009-09-13 16:24:44 +00:00
Nicolas Pierron 96b1952439 Fix hard-coded value to access gcc libraries.
svn path=/nixpkgs/trunk/; revision=17093
2009-09-13 16:08:55 +00:00
Eelco Dolstra 6ca8fa8949 * Enable Grub support in kdm, i.e., the reboot menu option can be used
to directly boot into any of the Grub menu entries.  This doesn't
  work yet though.  Probably Grub needs some messing with the
  savedefault option.

svn path=/nixos/trunk/; revision=17091
2009-09-13 15:03:07 +00:00
Eelco Dolstra 379778c385 * For X logins, don't use pam_ck_connector since it doesn't really
work for X logins.  (The documentation also says so.)  Instead just
  call ck-launch-session from the xsession script.

svn path=/nixos/trunk/; revision=17090
2009-09-13 14:05:21 +00:00
Nicolas Pierron e84c0eca1f Add a script which generates patchelf command for binary distribution.
This script use your local Nix store to find occurences of similar libraries
name and generate a patchelf command based on the package name found inside
your Nix store.

svn path=/nixpkgs/trunk/; revision=17089
2009-09-13 13:44:58 +00:00
Eelco Dolstra 0806a8e203 * Support the custom session type (i.e. ~/.xsession) in SLiM.
svn path=/nixos/trunk/; revision=17088
2009-09-13 13:40:06 +00:00
Eelco Dolstra 6596a3ec55 * When using kdm, always use our xsession script, even when the
default session is selected.  This is because we always want to run
  our own initialisation (like starting ssh-agent).

* ssh-agent: don't start it is a child but have it re-exec the
  xsession script.  This ensures that ssh-agent quits when we log out.

* In the xsession script, don't redirect output to ~/.xsession-errors
  if the display manager is kdm, since kdm already does that.  In fact
  it uses ~/.xsession-errors<optional number> if there are concurrent
  X sessions.

* For consistency with other distros and the xdm manpage, exec the
  ~/.xsession script instead of sourcing it.  Do this for the "custom"
  session type provided by kdm.

svn path=/nixos/trunk/; revision=17087
2009-09-13 13:34:52 +00:00
Eelco Dolstra d1e7a90277 * KDE likes to have xprop.
svn path=/nixos/trunk/; revision=17086
2009-09-13 13:26:35 +00:00
Eelco Dolstra 6e2914fb9b * Make the KDE modules work with KDE 4.2 and 4.3. Also, when using
KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
2009-09-13 11:09:58 +00:00
Eelco Dolstra 5d0b5d06e9 * qt-4 -> qt-4.4.
* kde-4.2 shouldn't depend on poppler built with qt 4.5.

svn path=/nixpkgs/trunk/; revision=17084
2009-09-13 11:04:54 +00:00