Rob Vermaas
e9921632ef
Updating EC2 EBS HVM creation script.
...
* Use smaller instances to generate HVM images
* Use HVM base image that has 4 ephemeral disks in device mapping
* As grub is not on the base images anymore, install it first before copying parts of its contents
2013-11-08 12:49:44 +01:00
Rob Vermaas
f3eccb26f7
Fix test deployment in EC2 creation script
2013-11-08 12:49:44 +01:00
Eelco Dolstra
cc65b1015d
vsftpd: Disable seccomp filtering on 64-bit
...
It worked on Linux 3.4 but fails with "500 OOPS: priv_sock_get_cmd"
since we updated the default kernel to 3.10.
http://hydra.nixos.org/build/6715359
https://bugzilla.redhat.com/show_bug.cgi?id=845980
https://bugzilla.novell.com/show_bug.cgi?id=786024
2013-11-07 16:38:57 +01:00
Eelco Dolstra
000962c3fb
vsftpd: Run in the background and log to syslog (i.e. journal)
2013-11-07 16:38:57 +01:00
Eelco Dolstra
10e31f6de7
Clean up the vsftpd module a bit
2013-11-07 16:38:57 +01:00
Eelco Dolstra
8c9c3b628f
Drop the new-kernel ISOs
2013-11-07 16:38:57 +01:00
Eelco Dolstra
0d5ec076d2
Use default kernel for EFI-related stuff
2013-11-07 16:38:56 +01:00
Eelco Dolstra
1e89c720e2
Manual: Port forwarding to VMs
2013-11-07 12:28:45 +01:00
Domen Kožar
a46c71857d
Merge pull request #1172 from zefhemel/patch-1
...
Removed unnecessary mkIf in elasticserach
2013-11-07 03:11:11 -08:00
Michael Raskin
e8b347e6ae
Merge pull request #1167 from grwlf/serverflags
...
Add serverFlagsSection option to the xserver config
2013-11-07 03:00:37 -08:00
Michael Raskin
f8ddc0cbd4
Merge pull request #1099 from offlinehacker/nixos/nginx/package_change_support
...
nixos/nginx: allow to specify which package to use
2013-11-07 02:59:09 -08:00
Michael Raskin
0cfc45c3b9
Merge pull request #1164 from kirelagin/master
...
Make touchpad button mapping configurable
2013-11-07 02:49:44 -08:00
Jaka Hudoklin
50a2f3fdce
nixos/mongodb: set static uid to work with #1076
2013-11-07 11:25:14 +01:00
Sander van der Burg
d31b328d0a
Updated Disnix service definition to support new development version and mongo databases
2013-11-07 10:54:53 +01:00
Zef Hemel
8063382867
Removed unnecessary mkIf
...
The whole block is already wrapped in cfg.enable and this breaks some things.
2013-11-05 08:52:23 +01:00
Eelco Dolstra
d9c13a73c2
gurobi: Remove
...
It's proprietary, non-redistributable software.
2013-11-05 00:07:24 +01:00
Eelco Dolstra
754704ea18
Allow packages to be marked as "broken" by setting meta.broken
...
The effect is that they won't show up in "nix-env -qa" anymore.
2013-11-04 21:11:00 +01:00
Domen Kožar
a734f32fa1
Remove desktopManager.gnome
...
Gnome doesn't work at least since I started using NixOS half a year
ago, let's not give wrong impressions to newcomers. Packaging gnome3
is still something on horizon.
2013-11-04 18:12:38 +01:00
Peter Simons
87c3907c14
Merge pull request #1168 from grwlf/nixos-gnu-screen
...
Add GNU Screen program module
2013-11-04 08:06:59 -08:00
Sergey Mironov
8c1e14e6cc
Add GNU Screen program module
2013-11-04 19:07:51 +04:00
Sergey Mironov
99914f8581
Add serverFlagsSection parameter to the xserver config
2013-11-04 18:54:13 +04:00
Moritz Ulrich
882c2b7278
fcron: Fix error when cron.mailto is null.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-04 11:07:11 +00:00
Kirill Elagin
fce38e454b
Make touchpad button mapping configurable
2013-11-03 13:00:49 +04:00
Eelco Dolstra
eab39f9dda
venus.nix: Fix broken startAt option
2013-11-02 20:43:06 +01:00
Jaka Hudoklin
8b1ab6d912
nixos/logstash: add test
2013-11-01 17:18:57 +01:00
Jaka Hudoklin
1453be4740
nixos/logstash: add option examples
2013-11-01 17:15:54 +01:00
Jaka Hudoklin
10e61f53d8
nixos/logstash: update and simplify to be fully compatible with new version
2013-11-01 17:15:53 +01:00
Eelco Dolstra
9ef07d859b
Include the NixOS version in the manual
...
In particular, this will make it clear what version of the manual is
shown at http://nixos.org/nixos/manual/ .
2013-11-01 16:47:29 +01:00
Shea Levy
cd9786eed2
Fold efi booting into the default livecd
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-01 11:29:36 -04:00
Eelco Dolstra
20093751ec
Print a reminder to users to set or disable the root password
2013-11-01 15:04:21 +01:00
Eelco Dolstra
4ba7dfde5b
Don't set an initial null root password for Amazon / VirtualBox images
...
A null password allows logging into local PAM services such as "login"
(agetty) and KDM. That's not actually a security problem for EC2
machines, since they do not have "local" logins; for VirtualBox
machines, if you local access, you can do anything anyway. But it's
better to be on the safe side and disable password-based logins for
root.
2013-11-01 15:04:21 +01:00
Rob Vermaas
561f56bd2a
Next release will be 14.02 Baboon
2013-11-01 09:16:36 +01:00
Eelco Dolstra
9668294eeb
Mark the value for nixpkgs.system as a default
2013-11-01 00:35:48 +01:00
Eelco Dolstra
444a4fb793
Loosen the type of SSH key files
2013-11-01 00:34:31 +01:00
Eelco Dolstra
6fda96ba10
Set the channel for this release
2013-10-31 23:01:54 +01:00
Eelco Dolstra
4d15ad22a2
Manual: Expand the Development chapter
2013-10-31 23:01:07 +01:00
Eelco Dolstra
8d09a99a3a
Propagate the stableBranch argument
2013-10-31 22:04:26 +01:00
Eelco Dolstra
139ff6d52f
Manual: Don't tell users to delete ~/.nix-defexpr/channels
...
That breaks nix-channel, obviously.
2013-10-31 20:52:40 +01:00
Eelco Dolstra
8e6abe49cd
Manual tweaks
2013-10-31 18:49:04 +01:00
Eelco Dolstra
987641d6ed
Fix mkForce example
2013-10-31 18:43:15 +01:00
Eelco Dolstra
599c32fdba
Document the NixOS configuration syntax
...
...without telling people to read the Nix manual first.
2013-10-31 18:12:57 +01:00
Eelco Dolstra
ca912c79d9
Manual: Document how to use NixOS channels
2013-10-31 14:38:29 +01:00
Eelco Dolstra
ee438d6266
Manual: Mention other ways to get NixOS
2013-10-31 13:46:35 +01:00
Eelco Dolstra
4ccd9fdace
Remove unused file
2013-10-31 13:28:29 +01:00
Eelco Dolstra
c1159edc65
Remove remaining references to Upstart
2013-10-31 13:26:06 +01:00
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
Eelco Dolstra
a40583e7e4
Fix bogus mkOption types
...
Among others, systemd unit options were not being type-checked because
of this. mkOption should really check its arguments better...
2013-10-28 22:45:56 +01:00
Eelco Dolstra
1408ac51a4
Add missing types
2013-10-28 22:45:56 +01:00
Eelco Dolstra
89bd18b3af
Fix manual generation
2013-10-28 22:45:56 +01:00
Eelco Dolstra
7cf0e0bda8
Manual: Fix bad \" characters
2013-10-28 22:45:56 +01:00
Eelco Dolstra
4b1a9dd00b
Remove uses of mkFixStrictness
...
mkFixStrictness is no longer needed, woohoo!
2013-10-28 22:45:55 +01:00