13 commits

Author	SHA1	Message	Date
Eelco Dolstra	73f32d0375	Show precise error messages in option merge failures ... For instance, if time.timeZone is defined multiple times, you now get the error message: error: user-thrown exception: The unique option `time.timeZone' is defined multiple times, in `/etc/nixos/configurations/misc/eelco/x11vnc.nix' and `/etc/nixos/configuration.nix'. while previously you got: error: user-thrown exception: Multiple definitions of string. Only one is allowed for this option. and only an inspection of the stack trace gave a clue as to what option caused the problem.	2013-10-28 22:45:57 +01:00
Eelco Dolstra	d5047faede	Remove uses of the "merge" option attribute ... It's redundant because you can (and should) specify an option type, or an apply function.	2013-10-28 22:45:56 +01:00
Jaka Hudoklin	b20c08d2cb	nixos/redis: user set uid, make it compatible #1076	2013-10-28 18:18:13 +01:00
Eelco Dolstra	20150b1cee	Ensure that the manual job gets build with the right revision info	2013-10-24 19:58:34 +02:00
Eelco Dolstra	373c14614b	Put the NixOS channel in an option	2013-10-24 15:09:00 +02:00
Eelco Dolstra	d49f141a79	Manual: When building from the channel, link to the exact Git revision	2013-10-24 02:03:10 +02:00
Eelco Dolstra	b5d5afd99a	Allow modules to define warnings to be shown during evaluation	2013-10-23 20:08:22 +02:00
Eelco Dolstra	29014a47fb	Allow options to be marked as "internal" ... This means they're not for end users. Currently they're filtered from the manual, but we could include them in a separate section.	2013-10-23 20:08:21 +02:00
Eelco Dolstra	b19d8e0fcd	Remove obsolete pre-systemd compat stuff	2013-10-17 14:57:20 +02:00
Eelco Dolstra	84d4358635	Fix compatibility with Nix < 1.6 ... Nix 1.6 (accidentally) changed the semantics of strings like "${path}/bla", so this happened to work on 1.6 but not before.	2013-10-16 23:07:47 +02:00
Eelco Dolstra	ceb8ab7ffa	Really fix use of NixOps with the merged Nixpkgs/NixOS tree ... Note that there is a subtle difference in Nix that causes nixos-rebuild to work and NixOps to fail: $ nix-instantiate '<nixos>' -A config.system.nixosVersion --eval-only "13.10pre34915.50f4822" $ nix-instantiate '<nixos/default.nix>' -A config.system.nixosVersion --eval-only error: opening file `/nix/var/nix/profiles/per-user/root/channels/nixos/.version': No such file or directory Fixes NixOS/nixops#145.	2013-10-15 17:50:09 +02:00
Eelco Dolstra	041da5a6f9	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00