Eelco Dolstra
456d8ec52b
Clean up Synergy option descriptions a bit
2013-10-31 13:18:00 +01:00
Eelco Dolstra
7083607e12
Generate manual for i686-linux as well as x86_64-linux
2013-10-31 08:48:57 +01:00
Eelco Dolstra
a840dae935
Improve description of the users.extraUsers.*.description option
...
Fixes NixOS/nixos#278 .
2013-10-31 08:43:10 +01:00
Eelco Dolstra
f3cdf9b477
Make update-mime-database less verbose
2013-10-30 18:47:44 +01:00
Eelco Dolstra
244cf195c8
Use the "assertions" option instead of mkAssert
2013-10-30 18:47:44 +01:00
Eelco Dolstra
c7171b2c8f
Comment out nixos-gui
...
It hasn't built in over 2 years.
2013-10-30 18:47:43 +01:00
Eelco Dolstra
7d5152964c
Drop environment.x11Packages
...
It doesn't do anything useful compared to environment.systemPackages.
2013-10-30 18:47:43 +01:00
Eelco Dolstra
408b8b5725
Add lots of missing option types
2013-10-30 18:47:43 +01:00
Eelco Dolstra
d882e19662
Shut up "failed to resume" warning if there is no resume device
2013-10-30 18:47:43 +01:00
Eelco Dolstra
be5d3a59dd
Clean up some option examples
2013-10-30 18:47:43 +01:00
Eelco Dolstra
70a2c54527
Strictly check the arguments to mkOption
...
And fix various instances of bad arguments.
2013-10-30 15:35:09 +01:00
Eelco Dolstra
db2a9afb75
Remove obsolete xfceutils attribute
2013-10-30 15:35:09 +01:00
William A. Kennington III
c2f35087d2
Add ZFS dependencies to the initrd so that the zpool command works.
...
Remove unneeded zfs mount, since zpool automatically mounts everything.
Close #1128 .
2013-10-30 16:17:44 +02:00
Eelco Dolstra
e3e3666e24
smartd.nix: Fix broken option type
2013-10-30 14:57:43 +01:00
Eelco Dolstra
800f9c2037
Show correct position info for errors in submodules
...
E.g.
The unique option `fileSystems./.device' is defined multiple times, in `/etc/nixos/configuration.nix' and `/etc/nixos/foo.nix'.
This requires passing file/value tuples to the merge functions.
2013-10-30 14:57:43 +01:00
Eelco Dolstra
4680af6a93
Add some option types
2013-10-30 14:57:42 +01:00
Eelco Dolstra
ac68d326b9
Manual: Fix -I flag
2013-10-30 14:57:42 +01:00
Eelco Dolstra
862e3dd977
Substitute "types.uniq types.string" -> "types.str"
2013-10-30 14:57:42 +01:00
Eelco Dolstra
972d9974c6
Decrease verbosity of VirtualBox image generation
2013-10-29 21:15:11 +01:00
Eelco Dolstra
1d104c792b
Remove the dhclient module
...
It's no longer used by NixOS (replaced by dhcpcd).
2013-10-29 17:39:32 +01:00
Eelco Dolstra
0695b68c8c
Manual: Render multi-line strings properly
2013-10-29 17:39:31 +01:00
Eelco Dolstra
bfaa6b7352
Manual: Escape $
2013-10-29 17:39:31 +01:00
Eelco Dolstra
60c4c468f1
Manual: Render strings containing special characters as indented strings
2013-10-29 17:39:31 +01:00
Eelco Dolstra
b64f43cdbd
Manual: Don't show "Default: none"
2013-10-29 17:39:31 +01:00
Eelco Dolstra
89b1dd8dde
Fix environment.checkConfigurationOptions
...
This requires delaying the declaredness check until later, otherwise
we get an infinite recursion querying
environment.checkConfigurationOptions.
2013-10-29 16:18:23 +01:00
Eelco Dolstra
c407db6316
Manual: Render null values
2013-10-29 16:18:23 +01:00
Rok Garbas
562b453b93
nixos: haproxy module
2013-10-29 15:55:25 +01:00
Eelco Dolstra
985f1f2d8a
Give types to the Apache httpd options
2013-10-29 14:03:39 +01:00
Eelco Dolstra
473a870a64
nixos-rebuild build-vm: Ignore the user's LUKS devices
2013-10-29 13:31:01 +01:00
Eelco Dolstra
976355f63d
Drop the EFI installer tests from the release-critical builds for now
...
They fail randomly due to a hard-coded 30-second timeout in udev
waiting for /dev/sda1 to appear:
systemd-udevd[1151]: worker [1168] /devices/pci0000:00/0000:00:04.0/host2/target2:0:0/2:0:0:0/block/sda/sda1 timeout; kill it
systemd-udevd[1151]: seq 1059 '/devices/pci0000:00/0000:00:04.0/host2/target2:0:0/2:0:0:0/block/sda/sda1' killed
Hopefully we can use virtio in the future for the EFI tests.
http://hydra.nixos.org/build/6695897
2013-10-29 13:14:30 +01:00
Eelco Dolstra
adc1b38b85
Add a priority level for overrides in VM tests
...
Now that overriding fileSystems in qemu-vm.nix works again, it's
important that the VM tests that add additional file systems use the
same override priority. Instead of using the same magic constant
everywhere, they can now use mkVMOverride.
http://hydra.nixos.org/build/6695561
2013-10-29 13:14:30 +01:00
Eelco Dolstra
f0b7b0af12
wpa_supplicant.nix: Add option types
2013-10-29 13:14:30 +01:00
Rok Garbas
38df1d24c4
nixos: zope2 service: adding clientHome option
2013-10-29 12:53:08 +01:00
Eelco Dolstra
98ae32286f
Fix evaluation error in the tomcat test
2013-10-29 01:26:51 +01:00
Eelco Dolstra
738a6c173a
Don't copy Nix expressions to the store while processing Apache subservices
2013-10-29 01:20:33 +01:00
Eelco Dolstra
760d0a00dc
Fix mkOverride call
2013-10-29 01:15:17 +01:00
Eelco Dolstra
3115addf4c
Fix nixos-option
...
In particular, it no longer produces an "infinite recursion" error
when run with no arguments.
2013-10-28 22:45:58 +01:00
Eelco Dolstra
c9dad37f01
Remove obsolete function addDefaultOptionValues
2013-10-28 22:45:58 +01:00
Eelco Dolstra
f8a9eb9f00
Implement services.httpd.virtualHosts using the module system
2013-10-28 22:45:58 +01:00
Eelco Dolstra
30a36f9a80
Remove remaining uses of mkOverrideTemplate
2013-10-28 22:45:58 +01:00
Eelco Dolstra
621f4c42f5
Disable the OpenStack (Nova) module
...
This hasn't been worked on in over two years, so we shouldn't give the
impression that it works.
2013-10-28 22:45:58 +01:00
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
dbefab9cf4
Do not allow multiple definitions of IP addresses etc. within an interface
2013-10-28 22:45:57 +01:00
Eelco Dolstra
92ef9d6b46
nixos-rebuild: Ignore failure from get-version-suffix
2013-10-28 22:45:57 +01:00
Eelco Dolstra
657c8d9ea7
Hack to work around the lack of isPath
2013-10-28 22:45:57 +01:00
Eelco Dolstra
e28ea1239f
Fix evaluation of environment.variables
2013-10-28 22:45:57 +01:00
Eelco Dolstra
9a8516438e
Fix NixOps evaluation
2013-10-28 22:45:57 +01:00
Eelco Dolstra
259f7a93b1
Rename environment.nix -> nix.package
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
Eelco Dolstra
f4a418761b
Check for undeclared options
2013-10-28 22:45:56 +01:00