Commit Graph
166990 Commits
Author SHA1 Message Date
Marc Weber 3636fa1a04 fixing assertions using new assertion implementation
svn path=/nixos/branches/modular-nixos/; revision=15409
2009-04-30 02:29:58 +00:00
Eelco Dolstra ef64840085 * Don't hardcode values specific to the program transformation / Stratego wikis.
svn path=/nixos/trunk/; revision=15408
2009-04-29 17:03:58 +00:00
Eelco Dolstra a29bfb0d7b * Use the default Subversion (1.6).
svn path=/nixos/trunk/; revision=15407
2009-04-29 17:03:29 +00:00
Lluís Batlle i Rossell 61c20f5a7e Adding Eagle Mode.
svn path=/nixpkgs/trunk/; revision=15404
2009-04-29 16:42:41 +00:00
Eelco Dolstra 210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Eelco Dolstra fc3e7b8f7c * Add to the channel.
svn path=/nixpkgs/trunk/; revision=15402
2009-04-29 16:12:10 +00:00
Eelco Dolstra 4c48605ede * Removed kde-4-old.
svn path=/nixpkgs/trunk/; revision=15401
2009-04-29 16:01:05 +00:00
Eelco Dolstra 3e3cc595b5 * KVM can use the default kernel headers now.
svn path=/nixpkgs/trunk/; revision=15400
2009-04-29 16:00:05 +00:00
Rob Vermaas 9325fa9ccc iwlwifi5000ucode from pkgs
svn path=/nixos/trunk/; revision=15397
2009-04-29 15:10:14 +00:00
Eelco Dolstra d29b8323e1 * Support loading the Intel 5000 firmware.
svn path=/nixos/trunk/; revision=15396
2009-04-29 14:51:17 +00:00
Eelco Dolstra fe1d110fc2 * Firmware for the Intel 5000 wireless cards.
svn path=/nixpkgs/trunk/; revision=15395
2009-04-29 14:50:59 +00:00
Eelco Dolstra 16da00e64d * Doh! Since r15200, modules-closure.sh generated an empty set of
modules for the initial ramdisk if there were no additional kernel
  module packages (such as the NVIDIA driver or AUFS), leading to a
  kernel panic in the initrd.  This was because in that case modprobe
  would print paths referring to the kernel path rather than the
  module aggregation path, and then `sed "s^$kernel^$out^"' would
  silently fail.  Fixed.

* Also, use depmod here rather than doing sed hackery on modules.dep.

* Also, `allowMissing' was broken (missing "$" before the variable
  name).

svn path=/nixpkgs/trunk/; revision=15394
2009-04-29 14:32:04 +00:00
Eelco Dolstra 7d07afc2fa * Re-enable splashutils for x86_64-linux, they work again since we
have Glibc 2.9.

svn path=/nixpkgs/trunk/; revision=15393
2009-04-29 14:24:32 +00:00
Marc Weber 2eaae478af synergy patch making it compile again
svn path=/nixpkgs/trunk/; revision=15392
2009-04-29 13:04:01 +00:00
Rob Vermaas e3ad6a6f59 Added enableTCPIP option for postgresql (defaults to false) to allow tcpip connections
svn path=/nixos/trunk/; revision=15391
2009-04-29 12:25:25 +00:00
Eelco Dolstra 8eaf87a94d * Applied a patch that hopefully fixes the softlockups on our shiny
new servers.  Backported from 2.6.29.2.  Hopefully 2.6.28.10 will
  include this as well.  From http://patchwork.kernel.org/patch/19495/.

svn path=/nixpkgs/trunk/; revision=15390
2009-04-29 12:09:37 +00:00
Marc Weber d804730382 adding assertion support to modular-nixos
problem: the nix language assert function can't be used because
of the fix-style used in modular-nixos. A minimal stripped down version
illustrating the problem looks like this:

fix (x : assert x.cfg.foo; { upstartJob = ...; cfg = ...; } )

Now nix has to evaluate x.cfg.foo in order to check the assertion.
However to do so it has to access x.cfg.foo beeing defined in the body
The body can only be evaluated after the assertion passes.
So in the end you get an infinite recursion error.

pierron mentioned that adding another mkIf like function could
work. Maybe this implementation is even simpler. It adds
another option collecting assertions only.
The evaluation is forced by a function adding an empty list to
extraPackages. extraPackages is evaluated by nixos in all cases.
If there are assertions evaluating to false all assertion messages are
presented to the user using throw.

svn path=/nixos/branches/modular-nixos/; revision=15387
2009-04-28 23:05:03 +00:00
Lluís Batlle i Rossell 7e53d1062f Adding mesa to compile the openchrome driver.
svn path=/nixpkgs/trunk/; revision=15386
2009-04-28 22:15:44 +00:00
Eelco Dolstra 0fc49de3cb * Added hal-info.
svn path=/nixpkgs/trunk/; revision=15385
2009-04-28 21:59:09 +00:00
Eelco Dolstra 1456344494 svn path=/nixpkgs/trunk/; revision=15384 2009-04-28 20:23:17 +00:00
Andres Löh 3202338268 Improved package config installation for gtk2hs (still not working completely).
svn path=/nixpkgs/trunk/; revision=15383
2009-04-28 18:58:34 +00:00
Marc Weber cd9c9a2431 fix broken myEnv
svn path=/nixpkgs/trunk/; revision=15382
2009-04-28 16:52:36 +00:00
Ludovic Courtès c4d720c3d1 Curl: Propagate Zlib and OpenSSL.
svn path=/nixpkgs/trunk/; revision=15381
2009-04-28 15:41:51 +00:00
Marc Weber 48216ba01a fix openvpn making it find ifonfig
svn path=/nixpkgs/trunk/; revision=15380
2009-04-28 15:37:52 +00:00
Eelco Dolstra 955b111f9a svn path=/nixpkgs/trunk/; revision=15378 2009-04-28 14:08:18 +00:00
Marc Weber 84b5d26ffc doh. my typo while merging
svn path=/nixos/branches/modular-nixos/; revision=15376
2009-04-28 14:01:11 +00:00
Eelco Dolstra c718ec217b * X.org generator: specify overrides in a Nix expression rather than
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
2009-04-28 13:58:35 +00:00
Marc Weber 0ba7449c11 * Synced with trunk @ 15348
svn path=/nixos/branches/modular-nixos/; revision=15374
2009-04-28 13:53:04 +00:00
Marc Weber fa9ceac862 * Synced with trunk @ 15346
svn path=/nixos/branches/modular-nixos/; revision=15373
2009-04-28 13:51:58 +00:00
Marc Weber fb1e6d5c80 * Synced with trunk @ 15345
svn path=/nixos/branches/modular-nixos/; revision=15372
2009-04-28 13:49:05 +00:00
Marc Weber addf00b1cf * Synced with trunk @ 15344
svn path=/nixos/branches/modular-nixos/; revision=15371
2009-04-28 13:44:43 +00:00
Eelco Dolstra 0f99f50e34 * Use lib/perl5/site_perl.
svn path=/nixos/trunk/; revision=15370
2009-04-28 13:43:48 +00:00
Eelco Dolstra 114109b709 * The X server now needs HAL running.
svn path=/nixos/trunk/; revision=15369
2009-04-28 13:43:22 +00:00
Eelco Dolstra 2cd1e7239f * Atomically update grub/menu.lst (although we really need an fsync here).
svn path=/nixos/trunk/; revision=15368
2009-04-28 13:43:03 +00:00
Marc Weber 8e5eeccb75 * Synced with trunk @ 15340
svn path=/nixos/branches/modular-nixos/; revision=15367
2009-04-28 13:42:43 +00:00
Marc Weber cc7f5eba97 * Synced with trunk @ 15326
svn path=/nixos/branches/modular-nixos/; revision=15366
2009-04-28 13:40:55 +00:00
Marc Weber e28250470f * Synced with trunk @ 15312
svn path=/nixos/branches/modular-nixos/; revision=15365
2009-04-28 13:38:22 +00:00
Marc Weber 818baa7dd3 * Synced with trunk @ 15274
svn path=/nixos/branches/modular-nixos/; revision=15364
2009-04-28 13:34:47 +00:00
Marc Weber ab9cde5a83 * Synced with trunk @ 15211
svn path=/nixos/branches/modular-nixos/; revision=15363
2009-04-28 13:34:22 +00:00
Marc Weber bb2de6da2e * Synced with trunk @ 15208
svn path=/nixos/branches/modular-nixos/; revision=15362
2009-04-28 13:33:52 +00:00
Marc Weber a9360de947 * Synced with trunk @ 15204
svn path=/nixos/branches/modular-nixos/; revision=15361
2009-04-28 13:32:37 +00:00
Marc Weber e96fada917 * Synced with trunk @ 15192
svn path=/nixos/branches/modular-nixos/; revision=15360
2009-04-28 13:30:31 +00:00
Marc Weber c1bae06376 * Synced with trunk @ 15145
svn path=/nixos/branches/modular-nixos/; revision=15359
2009-04-28 13:29:56 +00:00
Marc Weber 160c7588b3 * Synced with trunk @ 15086
svn path=/nixos/branches/modular-nixos/; revision=15358
2009-04-28 13:29:28 +00:00
Marc Weber 3b934b9d03 * Synced with trunk @ 15074
svn path=/nixos/branches/modular-nixos/; revision=15357
2009-04-28 13:28:38 +00:00
Marc Weber bd6eb4ae29 * Synced with trunk @ 15062
svn path=/nixos/branches/modular-nixos/; revision=15356
2009-04-28 13:27:37 +00:00
Marc Weber 55c787a308 * Synced with trunk @ 15061
svn path=/nixos/branches/modular-nixos/; revision=15355
2009-04-28 13:26:31 +00:00
Marc Weber c4ad0f5454 * Synced with trunk @ 15058
svn path=/nixos/branches/modular-nixos/; revision=15354
2009-04-28 13:18:38 +00:00
Marc Weber 56be444092 * Synced with trunk @ 15032
svn path=/nixos/branches/modular-nixos/; revision=15353
2009-04-28 13:17:04 +00:00
Ludovic Courtès 54d3ce4b61 Agg: Fix compilation.
svn path=/nixpkgs/trunk/; revision=15352
2009-04-28 12:37:09 +00:00