Commit Graph

1640 Commits

Author SHA1 Message Date
Eelco Dolstra
3f03fbe278 * lib.getAttr renamed.
svn path=/nixos/branches/modular-nixos/; revision=15700
2009-05-24 18:28:30 +00:00
Marc Weber
dafb4b8c5d removed all __primops from nixos
svn path=/nixos/trunk/; revision=15696
2009-05-24 10:58:28 +00:00
Marc Weber
6b2f1a0ce9 lib.getAttr -> lib.attrByPath
svn path=/nixos/trunk/; revision=15695
2009-05-24 10:58:24 +00:00
Nicolas Pierron
e563c97ceb Add support for Hal FDI extensions. This should be helpful to change keymap
inside the X server.

svn path=/nixos/branches/modular-nixos/; revision=15678
2009-05-20 15:43:43 +00:00
Nicolas Pierron
91387275ee Remove unused require.
svn path=/nixos/branches/modular-nixos/; revision=15677
2009-05-20 15:43:31 +00:00
Nicolas Pierron
72e4b7e18d fix documentation issue: ${map} in a quoted-quote is not escaped as expected.
svn path=/nixos/branches/modular-nixos/; revision=15676
2009-05-20 15:43:22 +00:00
Eelco Dolstra
be85fd2500 * "hardware" belongs in the NixOS tree, not in the configurations
tree.  (The configurations tree is not for general use.)

svn path=/nixos/branches/modular-nixos/; revision=15672
2009-05-20 10:44:50 +00:00
Eelco Dolstra
f99fe41f65 svn path=/nixos/branches/modular-nixos/; revision=15670 2009-05-20 10:18:54 +00:00
Eelco Dolstra
0792719b90 * Urgh, forgot to commit.
svn path=/nixos/trunk/; revision=15669
2009-05-20 10:16:13 +00:00
Marc Weber
eb91b27809 adoptadopt modular-nixos to stringsWithDeps changes in nixpkgs.
You can boot again. Also simplified some small code pieces

svn path=/nixos/branches/modular-nixos/; revision=15668
2009-05-20 01:35:46 +00:00
Marc Weber
c2362f1bf1 Synced with trunk @ 15661
svn path=/nixos/branches/modular-nixos/; revision=15667
2009-05-19 23:51:13 +00:00
Marc Weber
224931fc9c Synced with trunk @ 15656
svn path=/nixos/branches/modular-nixos/; revision=15665
2009-05-19 23:46:25 +00:00
Marc Weber
fe16ffc552 Synced with trunk @ 15633 (patch was merged previously)
svn path=/nixos/branches/modular-nixos/; revision=15664
2009-05-19 23:43:24 +00:00
Marc Weber
2dbc8d7549 FullDepEntry -> fullDepEntry
svn path=/nixos/trunk/; revision=15661
2009-05-19 23:25:13 +00:00
Nicolas Pierron
bb8fc2646e Substitute the "require" of imported modules by module paths.
$ sed -i '/require =/ { :b; s,(import \([^)]*\)),\1,; /];/ { b e }; n; b b; :e }' *.nix


svn path=/nixos/branches/modular-nixos/; revision=15660
2009-05-19 23:14:45 +00:00
Nicolas Pierron
393cc8e8b9 Substitute the "require" of imported modules by module paths.
$ sed -i '/require =/ { :b; s,(import \([^)]*\)),\1,; /];/ { b e }; n; b b; :e }' *.nix


svn path=/nixos/trunk/; revision=15660
2009-05-19 23:14:45 +00:00
Michael Raskin
88e136954a Export all needed PATH elements
svn path=/nixos/trunk/; revision=15656
2009-05-19 17:08:32 +00:00
Eelco Dolstra
8ff00dd4c5 svn path=/nixos/branches/modular-nixos/; revision=15653 2009-05-19 14:55:17 +00:00
Marc Weber
cb411d1a3d Synced with trunk @ 15580
svn path=/nixos/branches/modular-nixos/; revision=15645
2009-05-18 12:59:01 +00:00
Marc Weber
908e8fe2d4 Synced with trunk @ 15577
svn path=/nixos/branches/modular-nixos/; revision=15644
2009-05-18 12:57:01 +00:00
Marc Weber
7dc33353c4 Synced with trunk @ 15548
svn path=/nixos/branches/modular-nixos/; revision=15643
2009-05-18 12:54:54 +00:00
Marc Weber
5cff1db403 Synced with trunk @ 15509
svn path=/nixos/branches/modular-nixos/; revision=15642
2009-05-18 12:03:11 +00:00
Marc Weber
f51620cdff Synced with trunk @ 15508
svn path=/nixos/branches/modular-nixos/; revision=15641
2009-05-18 12:02:27 +00:00
Marc Weber
81d6032c43 Synced with trunk @ 15505
svn path=/nixos/branches/modular-nixos/; revision=15640
2009-05-18 12:01:31 +00:00
Marc Weber
1d0c0a4291 Synced with trunk @ 15480
svn path=/nixos/branches/modular-nixos/; revision=15639
2009-05-18 11:59:40 +00:00
Marc Weber
c14ccdae91 Synced with trunk @ 15469
svn path=/nixos/branches/modular-nixos/; revision=15638
2009-05-18 11:58:45 +00:00
Marc Weber
bbeb12b77d Synced with trunk @ 15468
svn path=/nixos/branches/modular-nixos/; revision=15637
2009-05-18 11:58:02 +00:00
Marc Weber
56e78c810a Synced with trunk @ 15430
svn path=/nixos/branches/modular-nixos/; revision=15636
2009-05-18 11:55:32 +00:00
Eelco Dolstra
551c80db47 * Sync.
svn path=/nixos/branches/modular-nixos/; revision=15635
2009-05-18 11:36:01 +00:00
Marc Weber
65908cccd1 Synced with trunk @ 15428, 15620
svn path=/nixos/branches/modular-nixos/; revision=15634
2009-05-18 11:30:33 +00:00
Eelco Dolstra
168268ba28 svn path=/nixos/trunk/; revision=15633 2009-05-18 11:27:20 +00:00
Eelco Dolstra
4dc9b6d378 * Function renamed.
svn path=/nixos/branches/modular-nixos/; revision=15631
2009-05-18 10:49:28 +00:00
Marc Weber
9dc4edbd4d Synced with trunk @ 15427
svn path=/nixos/branches/modular-nixos/; revision=15630
2009-05-18 10:25:36 +00:00
Marc Weber
fa32ac7fb6 follow -r15428 and move the comment as well
svn path=/nixos/trunk/; revision=15620
2009-05-15 16:07:27 +00:00
Marc Weber
3148755063 * Synced with trunk @ 15424
svn path=/nixos/branches/modular-nixos/; revision=15619
2009-05-15 15:21:33 +00:00
Marc Weber
aacdff7ad9 * Synced with trunk @ 15413
svn path=/nixos/branches/modular-nixos/; revision=15618
2009-05-15 15:19:59 +00:00
Marc Weber
7ef8db8aad * Synced with trunk @ 15408
svn path=/nixos/branches/modular-nixos/; revision=15617
2009-05-15 15:16:58 +00:00
Marc Weber
d26f944b98 * Synced with trunk @ 15406
svn path=/nixos/branches/modular-nixos/; revision=15616
2009-05-15 15:15:59 +00:00
Marc Weber
d29eaa100e * Synced with trunk @ 15396, 15397 (-> configurations repo)
svn path=/nixos/branches/modular-nixos/; revision=15615
2009-05-15 15:12:46 +00:00
Marc Weber
d44206d2c4 * Synced with trunk @ 15391
svn path=/nixos/branches/modular-nixos/; revision=15612
2009-05-15 08:00:20 +00:00
Marc Weber
48e4b8f573 * Synced with trunk @ 15370
svn path=/nixos/branches/modular-nixos/; revision=15611
2009-05-15 07:55:47 +00:00
Marc Weber
1e16e6dee4 * Synced with trunk @ 15369
also adding missing assertion fixed in 15609

svn path=/nixos/branches/modular-nixos/; revision=15610
2009-05-15 07:51:51 +00:00
Marc Weber
3f79e158ba add missing assertion catching enabled xserver but disabled hal service
svn path=/nixos/trunk/; revision=15609
2009-05-15 07:39:36 +00:00
Marc Weber
ecff4f580c * Synced with trunk @ 15368
svn path=/nixos/branches/modular-nixos/; revision=15608
2009-05-15 06:43:02 +00:00
Michael Raskin
60060261a0 Catch duplicate entries
svn path=/nixos/trunk/; revision=15580
2009-05-13 06:10:21 +00:00
Ludovic Courtès
52889b2323 Run `fsck' when on AC power.
In practice, it should only run once in a while, and should help
find inconsistencies or corruptions sooner.

See https://mail.cs.uu.nl/pipermail/nix-dev/2009-February/001827.html
for a discussion.


svn path=/nixos/trunk/; revision=15577
2009-05-12 17:46:51 +00:00
Ludovic Courtès
018cb283f2 Fix `grub-menu-builder.sh'.
Previously, since `nullglob' is active, `$(ls /boot/kernels/*)'
would translate into `$(ls)' when `/boot/kernels' is empty, which
would then lead to the removal of all the files under $PWD.

Additionally, if `/boot/kernels' was not empty, `$fn' would contain
only the basename of the files, whereas `$filesCopied' is indexed
by full paths.


svn path=/nixos/trunk/; revision=15548
2009-05-11 11:54:18 +00:00
Sander van der Burg
7aa1c2439c Some kdm fixes
svn path=/nixos/trunk/; revision=15519
2009-05-09 21:00:02 +00:00
Michael Raskin
5b368b22bf An option for times when I only want to init Nix in chroot and build system semi-manually.
svn path=/nixos/trunk/; revision=15509
2009-05-09 07:34:20 +00:00
Michael Raskin
5cbcb9762d More correct handling of services tarball
svn path=/nixos/trunk/; revision=15508
2009-05-09 07:31:56 +00:00