Commit graph

1671 commits

Author SHA1 Message Date
Nicolas Pierron
e6ae383b9b Add a temporary work-around to be able to use non-us keyboard layout.
xkbcomp does not look inside the directory specified with the option -xkbdir.

svn path=/nixos/branches/modular-nixos/; revision=15752
2009-05-27 20:27:59 +00:00
Nicolas Pierron
b022f2e95a Generate the module-list.nix which index all valid modules.
Non-valid modules are commented inside the generated list.

Move module paths which are not the module directory into the legacy.nix file.

svn path=/nixos/branches/modular-nixos/; revision=15751
2009-05-27 20:27:54 +00:00
Nicolas Pierron
054528b28d Move hardware modules outside of the module directory because these are modules which should be imported only when you need to support some of them.
svn path=/nixos/branches/modular-nixos/; revision=15750
2009-05-27 20:27:46 +00:00
Eelco Dolstra
c3fb0387b4 * Moved the expressions for generating Upstart jobs.
svn path=/nixos/branches/modular-nixos/; revision=15748
2009-05-27 10:32:30 +00:00
Eelco Dolstra
700a1f8f21 * Move the modulesTree and modprobe options to the kernel.nix module.
svn path=/nixos/branches/modular-nixos/; revision=15747
2009-05-27 09:57:30 +00:00
Eelco Dolstra
690416cf1a * Move initrd-related options to the appropriate module.
svn path=/nixos/branches/modular-nixos/; revision=15746
2009-05-27 09:46:50 +00:00
Eelco Dolstra
68c3132f46 * Move the activation scripts to the appropriate module.
svn path=/nixos/branches/modular-nixos/; revision=15745
2009-05-27 09:40:55 +00:00
Eelco Dolstra
5b7f7d2de1 * Move the config evaluation into a separate expression so that it can
be reused, e.g. for building the CD/DVD.

svn path=/nixos/branches/modular-nixos/; revision=15744
2009-05-27 09:16:56 +00:00
Eelco Dolstra
cfa218a26b * Move the list of modules into a separate file. This file could be
generated by some find/grep hackery as Nicolas suggested.

svn path=/nixos/branches/modular-nixos/; revision=15743
2009-05-27 09:09:17 +00:00
Eelco Dolstra
8e98dc33f5 svn path=/nixos/branches/modular-nixos/; revision=15742 2009-05-27 09:03:07 +00:00
Eelco Dolstra
6d2ca42b30 svn path=/nixos/branches/modular-nixos/; revision=15741 2009-05-27 09:01:45 +00:00
Eelco Dolstra
98cce35041 * Turn the top-level derivation of a NixOS configuration ("system")
into a NixOS module (modules/system/activation/top-level.nix -
  couldn't think of a better name).  The top-level derivation is
  returned in config.system.build.system.
* Inlined system.sh in top-level.nix so that we don't have to pass
  everything through environment variables.

svn path=/nixos/branches/modular-nixos/; revision=15740
2009-05-27 09:00:45 +00:00
Eelco Dolstra
7ac0b3aaea * Make modules/system/boot/stage-1.nix a proper module that exports
the initial ramdisk as config.system.build.bootStage1.

svn path=/nixos/branches/modular-nixos/; revision=15739
2009-05-27 08:14:06 +00:00
Nicolas Pierron
47f70fda2f Fix fullDepEntry location in setuid-wrappers.nix.
svn path=/nixos/branches/modular-nixos/; revision=15733
2009-05-26 14:10:20 +00:00
Eelco Dolstra
af07eae056 * This config.system.build.system thing doesn't seem to be used.
svn path=/nixos/branches/modular-nixos/; revision=15730
2009-05-25 18:42:44 +00:00
Eelco Dolstra
d4a87dd5e2 svn path=/nixos/branches/modular-nixos/; revision=15728 2009-05-25 17:52:43 +00:00
Eelco Dolstra
60b3f95ad8 * Move the definition of the set of system packages to
modules/config/system-path.nix.  system/system.nix is now almost
  empty.
* Removed the cleanStart option - it should be possible to get the
  same functionality by overriding config.system.path (or defining
  config.system.systemPackages with a higher priority - don't know if
  that works though).

svn path=/nixos/branches/modular-nixos/; revision=15727
2009-05-25 17:41:03 +00:00
Eelco Dolstra
c96f0d75f0 * Move the setuid wrappers activation scriptlet to
modules/security/setuid-wrappers.nix.
* Removed the "path" activation scriptlet.  The partial ordering was
  underspecified (there was nothing ensuring that it came near the end
  of the activation script), and it wasn't needed in any case.

svn path=/nixos/branches/modular-nixos/; revision=15726
2009-05-25 15:36:57 +00:00
Eelco Dolstra
278b15d840 * More moving.
svn path=/nixos/branches/modular-nixos/; revision=15725
2009-05-25 14:19:33 +00:00
Eelco Dolstra
6e066c8e1d * Idem.
svn path=/nixos/branches/modular-nixos/; revision=15724
2009-05-25 13:55:36 +00:00
Eelco Dolstra
94993518d7 * I'm pretty sure the i18n module shouldn't be conditional on
pulseaudio :-)

svn path=/nixos/branches/modular-nixos/; revision=15723
2009-05-25 13:52:18 +00:00
Eelco Dolstra
a65aae0140 * Moved more modules.
svn path=/nixos/branches/modular-nixos/; revision=15722
2009-05-25 13:42:46 +00:00
Eelco Dolstra
f1fb3b45cf * No camelCase in filenames. Also pluralise the *-manager directories
for consistency.

svn path=/nixos/branches/modular-nixos/; revision=15719
2009-05-25 09:02:29 +00:00
Eelco Dolstra
5ebdee3577 * Continued refactoring the tree: moved most Upstart jobs (namely
those that run daemons) to modules/services.  This probably broke
  some things since there are a few relative paths in modules
  (e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
  modules that use them.

svn path=/nixos/branches/modular-nixos/; revision=15717
2009-05-24 23:13:23 +00:00
Eelco Dolstra
f86e2e5d01 * Typo.
svn path=/nixos/branches/modular-nixos/; revision=15716
2009-05-24 22:49:06 +00:00
Marc Weber
dc707dff08 job openvpn: modprobe tun
svn path=/nixos/branches/modular-nixos/; revision=15714
2009-05-24 22:13:27 +00:00
Michael Raskin
debbb8a199 Made example of configurable DVD working with aby common base dir for NixOS/NixPkgs/Nix/configurations checkout
svn path=/nixos/trunk/; revision=15705
2009-05-24 20:30:02 +00:00
Michael Raskin
575631b72a I officially abandon old RescueCD rewrite. I made official version tunable by a small patch..
svn path=/nixos/trunk/; revision=15704
2009-05-24 20:28:09 +00:00
Eelco Dolstra
c0209d000a svn path=/nixos/branches/modular-nixos/; revision=15703 2009-05-24 18:49:10 +00:00
Eelco Dolstra
c66094a310 * Filenames should generally be in lowercase.
svn path=/nixos/branches/modular-nixos/; revision=15702
2009-05-24 18:36:32 +00:00
Eelco Dolstra
d6b30cd513 * Include the Glibc locales.
svn path=/nixos/branches/modular-nixos/; revision=15701
2009-05-24 18:34:31 +00:00
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