Eelco Dolstra
2b1f212494
Disable various services when running inside a container
2013-11-26 18:19:45 +01:00
Vladimír Čunát
b5fba47147
Merge branch master into x-updates
...
Conflicts (not used, deleted):
pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Rob Vermaas
a383fe887f
Make dd-agent services restart when killed.
2013-11-22 15:23:45 +01:00
William A. Kennington III
f48af13c5a
Add a nix module for AMD Hybrid Graphics
2013-11-20 11:27:28 -06:00
Eelco Dolstra
4df8a04f14
Don't include the code name in the EBS AMI name
2013-11-19 19:09:48 +01:00
Vladimír Čunát
c33c2e68e4
xfce4notifyd: minor update, add to the default installation
2013-11-18 21:08:25 +01:00
Eelco Dolstra
bc56bb7546
polkit: Add some examples
2013-11-18 18:04:17 +01:00
Eelco Dolstra
7ea47df0a4
polkit: Fix authenticating as a wheel user
...
In Javascript-based PolKit, "unix-user:0;unix-group:wheel" is not
valid; it should be a list "unix-user:0", "unix-group:wheel".
2013-11-18 18:04:17 +01:00
Eelco Dolstra
1ce709ee00
polkit: The rule file needs to end in .rules
...
Otherwise it's ignored.
2013-11-18 18:04:17 +01:00
Eelco Dolstra
886b9e27a6
httpd.nix: Support non-root operation
2013-11-18 18:04:17 +01:00
Eelco Dolstra
2b0aea1793
Allow running NixOS services outside of systemd
...
The attribute ‘config.systemd.services.<service-name>.runner’
generates a script that runs the service outside of systemd. This is
useful for testing, and also allows NixOS services to be used outside
of NixOS. For instance, given a configuration file foo.nix:
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92;
services.postgresql.dataDir = "/tmp/postgres";
}
you can build and run PostgreSQL as follows:
$ nix-build -A config.systemd.services.postgresql.runner -I nixos-config=./foo.nix
$ ./result
This will run the service's ExecStartPre, ExecStart, ExecStartPost and
ExecStopPost commands in an appropriate environment. It doesn't work
well yet for "forking" services, since it can't track the main
process. It also doesn't work for services that assume they're always
executed by root.
2013-11-18 18:04:17 +01:00
Eelco Dolstra
dc87f8e080
Check whether fileSystems defines the root FS
2013-11-18 18:04:16 +01:00
Eelco Dolstra
8951be2d80
Allow overrides to work for unit options
2013-11-18 18:04:16 +01:00
Eelco Dolstra
33cb0bbb4b
Use types.lines for script/preStart/postStart/postStop
2013-11-18 18:04:16 +01:00
Eelco Dolstra
5620e69b5d
Apply better type checking to unitConfig/serviceConfig/...
...
In particular, complain if two modules define the same systemd option.
2013-11-18 18:04:16 +01:00
Eelco Dolstra
f8a034172a
Fix broken Conflicts options
2013-11-18 18:04:16 +01:00
Eelco Dolstra
08a85c2152
Allow building/testing individual systemd units
2013-11-18 18:04:16 +01:00
Sergey Mironov
d8b0c942a1
xfce: enable tumbler the thumbnail manager ( close #1206 )
2013-11-16 16:58:08 +01:00
Ricardo M. Correia
36a05c7b15
systemd: Add systemd.extraConfig option for /etc/systemd/system.conf
2013-11-16 16:50:59 +01:00
Ricardo M. Correia
e0171ef026
systemd: Change services.logind.extraConfig type to types.lines
2013-11-16 16:50:59 +01:00
Shea Levy
cc69da4314
Put /efi and /loader on the main livecd partition for efi booting with unetbootin
...
Fixes #248 , mostly
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-14 18:18:46 -05:00
Eelco Dolstra
e815e4026a
mediawiki: Update to 1.20.7
2013-11-13 17:33:58 +01:00
Rickard Nilsson
26d7598d46
networkmanager NixOS service: Make it possible to append or insert name servers in /etc/resolv.conf
2013-11-13 01:52:57 +01:00
Eelco Dolstra
4cada34b7f
Properly handle unit names with dashes in them
...
We ended up with files in /etc/systemd/system called
"bigx2ddata.mount.wants" rather than "big\x2ddata.mount.wants".
2013-11-12 16:58:36 +01:00
Eelco Dolstra
785eaf2cea
Add some primops to lib
2013-11-12 13:48:30 +01:00
Domen Kožar
cee0f6c708
Merge pull request #1196 from bjornfor/capitalize-service-descriptions
...
nixos: capitalize a bunch of service descriptions
2013-11-12 01:25:18 -08:00
Eelco Dolstra
6441a9c1d0
Don't set the default channel to 13.10 when installing from master
...
Partial revert of 619a1f5614
.
2013-11-11 11:26:15 +01:00
Alex Berg
da654ed9a0
Check empty stringfor globalRedirect. It breaks RedirectPermanent.
2013-11-11 15:18:46 +08:00
Alex Berg
df5f491893
Add HTTPD SSH assertion to check null cert/key.
2013-11-11 12:08:36 +08:00
Bjørn Forsman
b9f5b880e7
nixos/libvirtd-service: fix for dnsmasq (dir perms 700 -> 755)
...
Fixes this:
Nov 09 16:18:54 nixos-laptop systemd[1]: Starting Libvirt Virtual Machine Management Daemon...
Nov 09 16:18:54 nixos-laptop dnsmasq[15809]: read /etc/hosts - 2 addresses
Nov 09 16:18:54 nixos-laptop dnsmasq[15809]: failed to load names from /var/lib/libvirt/dnsmasq/default.addnhosts: Permission denied
Nov 09 16:18:54 nixos-laptop dnsmasq[15809]: cannot read /var/lib/libvirt/dnsmasq/default.hostsfile: Permission denied
Nov 09 16:18:55 nixos-laptop systemd[1]: Started Libvirt Virtual Machine Management Daemon.
I don't understand the reason for the original 700 permission bits.
Apparently read-access is needed and Ubuntu also use 755 perms.
Use "chmod" instead of "mkdir -m" to set permissions because mkdir doesn't
modify permissions on existing directories.
2013-11-10 14:07:29 +01:00
Bjørn Forsman
dc352536a8
nixos: capitalize a bunch of service descriptions
...
(systemd service descriptions that is, not service descriptions in "man
configuration.nix".)
Capitalizing each word in the description seems to be the accepted
standard.
Also shorten these descriptions:
* "Munin node, the agent process" => "Munin Node"
* "Planet Venus, an awesome ‘river of news’ feed reader" => "Planet Venus Feed Reader"
2013-11-09 20:45:50 +01:00
Vladimír Čunát
619a1f5614
changes proposed for 13-10 update
...
One feature change: polkit update 8d14c7ba
2013-11-09 18:41:42 +01:00
Jaka Hudoklin
673fc81337
nixos/graphite: fix storage dir for carbon
2013-11-09 17:36:05 +01:00
Vladimír Čunát
8d14c7baa6
polkit: major update 0.105 -> 0.112
...
- It now uses JavaScript for configuration (only),
so I had to "convert" config for NetworkManager.
- I tested suspend/restart/(un)mount on KDE/Xfce,
Phreedom tested NetworkManager config conversion.
2013-11-09 16:29:18 +01:00
Domen Kožar
b3ea42462c
Merge pull request #1182 from offlinehacker/nixos/mongodb/userfix
...
nixos/mongodb: set static uid to work with #1076
2013-11-08 12:56:00 -08:00
Domen Kožar
a623cc96e3
Merge pull request #1066 from offlinehacker/nixos/logstash/update
...
nixos/logstash: update and simplify to be fully compatible with new version
2013-11-08 11:44:17 -08:00
Eelco Dolstra
065493284f
Update the X11 terminal server module for systemd
...
Yay, we no longer need inetd!
2013-11-08 16:39:22 +01:00
Eelco Dolstra
e62e15b2f9
Only run systemd-inhibit for local X11 sessions
2013-11-08 16:39:22 +01:00
Rob Vermaas
001550d5fe
Adapt S3 ami creation script to new nixpkgs structure
2013-11-08 12:49:44 +01:00
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
Alex Berg
0427e7fbf2
Check for SSL Cert value before building with SSL support.
2013-11-06 11:20:14 +08: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
Eelco Dolstra
0e333688ce
Big cleanup of the NixOS module system
...
The major changes are:
* The evaluation is now driven by the declared options. In
particular, this fixes the long-standing problem with lack of
laziness of disabled option definitions. Thus, a configuration like
config = mkIf false {
environment.systemPackages = throw "bla";
};
will now evaluate without throwing an error. This also improves
performance since we're not evaluating unused option definitions.
* The implementation of properties is greatly simplified.
* There is a new type constructor "submodule" that replaces
"optionSet". Unlike "optionSet", "submodule" gets its option
declarations as an argument, making it more like "listOf" and other
type constructors. A typical use is:
foo = mkOption {
type = type.attrsOf (type.submodule (
{ config, ... }:
{ bar = mkOption { ... };
xyzzy = mkOption { ... };
}));
};
Existing uses of "optionSet" are automatically mapped to
"submodule".
* Modules are now checked for unsupported attributes: you get an error
if a module contains an attribute other than "config", "options" or
"imports".
* The new implementation is faster and uses much less memory.
2013-10-28 22:45:55 +01:00
Eelco Dolstra
f4dadc5df8
rename.nix: Don't use the extraConfigs feature
2013-10-28 22:45:55 +01:00
Eelco Dolstra
2cc37c17d9
openvpn.nix: Improve types
2013-10-28 22:45:55 +01:00
Eelco Dolstra
5b8c4d2a7d
Get rid of the only use of mkNotdef
2013-10-28 22:45:54 +01:00
Eelco Dolstra
335422f7be
Get rid of the only use of mkDefaultValue
2013-10-28 22:45:54 +01:00
Eelco Dolstra
41c8f9598e
Remove dead code
2013-10-28 22:45:54 +01:00
Jaka Hudoklin
d28a9619a1
nixos/redis: log to syslog by default
2013-10-28 18:18:24 +01:00
Jaka Hudoklin
b20c08d2cb
nixos/redis: user set uid, make it compatible #1076
2013-10-28 18:18:13 +01:00
Jaka Hudoklin
c1ad189295
nixos/graphite: limit amount of log message defaults
2013-10-28 17:09:53 +01:00
Jaka Hudoklin
0229f45cf3
nixos/graphite: graphite requires pidfile set for startup
2013-10-28 17:08:33 +01:00
Michael Raskin
3022fff7db
Adding Quantum Minigolf game
2013-10-28 00:09:46 +04:00
Evgeny Egorochkin
5580abd60a
nixos manual: fix references to obsolete nixos repository
2013-10-27 08:53:47 +02:00
Evgeny Egorochkin
9cb699f587
nixos manual: replace /etc/nixos/nixos which no longer exists with more generic and more
...
correct /path/to/nixpkgs/nixos
2013-10-27 08:39:32 +02:00
Eelco Dolstra
f79a7359b0
firebird.nix: Fix a misplaced } that causes "users" to be outside "config"
2013-10-25 15:52:52 +02:00
Eelco Dolstra
72ca782044
Fix an assertion set in the wrong place
2013-10-25 15:47:30 +02:00
Eelco Dolstra
22db003f91
Add the NixOS manpages to the channel
2013-10-25 00:06:24 +02:00
Eelco Dolstra
b5cfb8c120
Put the manual in the NixOS channel
2013-10-24 20:06:02 +02: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
d5af9bc583
Simplify manual generation
2013-10-24 19:56:16 +02:00
Eelco Dolstra
373c14614b
Put the NixOS channel in an option
2013-10-24 15:09:00 +02:00
Jaka Hudoklin
ad3a0dd8fb
nixos/libvirtd: fix remote ssh managment by adding netcat-openbsd in system packages
...
Virsh/virt-manager uses ssh to connect to master, there it expects openbsd netcat(which
has support for unix sockets) to be avalible, to make a tunnel.
Close #1087 .
2013-10-24 11:01:43 +03:00
Eelco Dolstra
49e73ea117
nixos-generate-config: Don't suggest setting fileSystems in configuration.nix
...
It's already set in hardware-configuration.nix so this just confuses
people.
Also get rid of boot.initrd.kernelModules, since
hardware-configuration.nix is supposed to figure that out as well.
2013-10-24 05:28:37 +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
c4149c7b56
Fix evaluation error in the ISOs
2013-10-24 02:03:10 +02:00
Eelco Dolstra
a3777ba4f9
Remove dependencies on the Nixpkgs location
2013-10-23 20:08:23 +02:00
Eelco Dolstra
8166b12f0c
Manual: Check that we don't depend on the Nixpkgs location
2013-10-23 20:08:23 +02:00
Eelco Dolstra
fad83a9560
Allow literalExample in subexpressions of examples
2013-10-23 20:08:22 +02:00
Eelco Dolstra
0def73f390
Manual: Don't depend on the absolute path of modules
...
This ensures that the manual has the same store path regardless of the
directory in which Nixpkgs is stored, and thus can be fetched from the
channel.
2013-10-23 20:08:22 +02:00
Eelco Dolstra
caf18545a4
Do show aliases in the manual.
2013-10-23 20:08:22 +02:00
Eelco Dolstra
b218c02a3c
rename.nix: Don't use splitString
...
It's very slow.
2013-10-23 20:08:22 +02:00
Eelco Dolstra
8f4c5b05d5
Add a way to define obsolete options that have no replacement
2013-10-23 20:08:22 +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
0ec10c57df
Fix style
2013-10-23 20:08:21 +02:00
Eelco Dolstra
ec0911ce7f
Manual: Don't show obsolete/deprecated options
2013-10-23 20:08:21 +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
e29b51bfb1
Improve option description
2013-10-23 20:08:21 +02:00
Eelco Dolstra
441dcd68d8
Get rid of special-casing of system.path in the manual generation
2013-10-23 20:08:21 +02:00
aszlig
19b00be0a0
nixos-rebuild: Drop references to <nixos>.
...
Commit 31203732b3
dropped the reference to
<nixos> from NIX_PATH (nixos/modules/programs/environment.nix) and thus
prevents systems that are not using channels from rebuilding.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-23 17:16:17 +02:00
aszlig
f182fdf6ed
nixos-generate-config: Add --show-hardware-config.
...
So, we get the old behaviour of nixos-hardware-scane if we run the
following command:
nixos-generate-config --no-filesystems --show-hardware-config
This allows to use scripts in order to fetch NixOS specific hardware
information, without the need to duplicate code elsewhere.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-23 17:16:17 +02:00
aszlig
e2c546ce4a
nixos-generate-config: Remove unnecessary spaces.
...
The attributes swapDevices and imports add a space character after the
eqals sign, which is unnecessary. I know, I'm a pedantic douche bag but
it hurts my eyes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-23 17:16:16 +02:00
aszlig
a546069ad3
nixos-generate-config: Add --no-filesystems flag.
...
This is to get back the old behavior of nixos-hardware-scan, which
didn't include fileSystems and swapDevices.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-23 17:16:16 +02:00
Domen Kožar
03e1178f80
munin: fix documentation links
2013-10-23 13:54:46 +02:00
Domen Kožar
897329fc47
Merge pull request #1106 from ocharles/redshift
...
services.redshift: New service
2013-10-22 01:33:08 -07:00
Oliver Charles
d792544802
services.redshift: New service
2013-10-22 09:03:06 +01:00
Marc Weber
6cb91c33d0
Firebird service:
...
* simplify directory layout
* clean up option descriptions
* let the user override Firebird package
* create firebird user
* clarify TODO comment
Close # 1061.
2013-10-21 20:33:11 +03:00
Evgeny Egorochkin
d2f612b1b6
postgresql.authMethod: remove unimplemented option.
...
close #1104 .
2013-10-21 19:26:26 +03:00
Evgeny Egorochkin
4732f59226
xserver.s3tcSupport: fix typo, improve description.
2013-10-21 19:11:17 +03:00
Eelco Dolstra
65277727e8
nix-gc: Revert to "script" instead of ExecStart
...
There is an assumption that cfg.options can contain shell code, so
ExecStart doesn't work here.
2013-10-21 11:22:27 +02:00
Eelco Dolstra
375c395d12
Manual: Update installation section
2013-10-21 10:50:08 +02:00
Jaka Hudoklin
c7429711b8
nixos/nginx: allow to specify which package to use
...
This enables to override which plugins to include with nginx by allowing to change
nginx package. I also removed webdav option in nginx nixos module, because you
can now specify this by overriding nginx package.
2013-10-20 22:52:02 +02:00
Domen Kožar
aeff0028bf
munin: add test and fix a bug
2013-10-20 21:16:24 +02:00
Michael Raskin
f88aa22706
Allow non-SSL connections to vsftpd by default to let tests not specify certificate
2013-10-20 21:16:12 +04:00
Michael Raskin
a0bbc3e838
Add apparently missing option to vsftpd configuration
2013-10-20 20:39:37 +04:00
Michael Raskin
9b6f7c14ec
Merge pull request #1060 from MarcWeber/submit/vsftpd
...
small vsftpd improvements
2013-10-20 08:58:21 -07:00
Domen Kožar
c1b9775821
Merge pull request #1090 from NixOS/munin-rework
...
munin: refactor package and add nixos service
2013-10-20 08:10:28 -07:00
Domen Kožar
9230ae6522
munin: refactor package and add nixos service
2013-10-20 15:08:07 +02:00
Rok Garbas
af0e2ccf45
zope2 service... indentation fix
2013-10-20 01:35:09 +02:00
aszlig
1fc7d6ddb2
nixos/tests: Temporarily deactivate nixpart tests.
...
Those tests are flapping and redundant to some degree, as two
configurations are tested in NixOps as well. So, let's deactivate them
until the 1.0 release of nixpart, which has a more general approach for
automatically partitioning NixOS installations.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-19 23:34:20 +02:00
Evgeny Egorochkin
89854548e7
Add services.xserver.s3tcSupport option
2013-10-19 00:40:45 +03:00
Eelco Dolstra
2087f8dec3
Remove unused manual file
2013-10-18 13:45:18 +02:00