Commit graph

2923 commits

Author SHA1 Message Date
Peter Simons
ab6c8643d4 nix-gc.nix: prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"
Works around https://github.com/NixOS/nix/issues/609.
2015-08-20 22:56:41 +02:00
Eelco Dolstra
401782cb67 Revert "openssh: 6.9p1 -> 7.0p1"
This reverts commit a8eb2a6a81. OpenSSH
7.0 is causing too many interoperability problems so soon before the
15.08 release.

For instance, it causes NixOps EC2 initial deployments to fail with
"REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client
knows the server's ssh-dss host key, but this key is no longer
accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does
not work because it causes ssh-dss to be ordered after
"ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh
prioritizes host key algorithms for which the client has a known host
key, but not if you set HostKeyAlgorithms.)
2015-08-20 14:08:18 +02:00
Jaka Hudoklin
d06eb2951b Merge pull request #9355 from offlinehacker/nixos/etcd/fixstart
etcd service: do not wait for cluster up
2015-08-20 02:26:49 +02:00
Jaka Hudoklin
40582b68f4 Merge pull request #9354 from offlinehacker/nixos/skydns/fixdns
skydns service: fix skydns nameservers env option
2015-08-20 02:26:33 +02:00
Jaka Hudoklin
e057cbe580 Merge pull request #9352 from offlinehacker/nixos/racoon/fix_start
nixos/racoon: create /var/racoon upon start
2015-08-20 02:26:17 +02:00
Jaka Hudoklin
86ee6c2512 etcd service: do not wait for cluster up 2015-08-20 00:02:27 +02:00
Jaka Hudoklin
ed356eefa6 skydns service: fix skydns nameservers env option 2015-08-19 23:54:54 +02:00
Jaka Hudoklin
c33d282278 kubernetes service: fix for 1.0.3 2015-08-19 23:52:19 +02:00
Jaka Hudoklin
c171cfabed nixos/racoon: create /var/racoon upon start 2015-08-19 23:38:44 +02:00
Luca Bruno
e53e1c7070 nixos xfs_quota: simplify restartTriggers 2015-08-19 20:04:20 +02:00
Luca Bruno
bc46013ac1 nixos xfs_quota: set default projects to {} 2015-08-19 18:03:42 +02:00
Luca Bruno
d8b9521d64 nixos xfs_quota: add new module for managing xfs_quota projects 2015-08-19 16:09:35 +02:00
Eelco Dolstra
a47fef4d9e Merge pull request #9326 from oxij/fix-info
Documentation indexes
2015-08-19 13:46:47 +02:00
Arseniy Seroka
b9a174b9e3 Merge pull request #9340 from obadz/ecryptfs
ecryptfs
2015-08-19 14:37:36 +03:00
obadz
172522e153 ecryptfs:
- upgrade 106 -> 108
- fix passphrase rewrapper (password changing should now work fine) as
  discussed on https://bugs.launchpad.net/ecryptfs/+bug/1486470
- add lsof dependency so ecryptfs-migrate-home should work out of the
  box
2015-08-19 12:16:57 +01:00
Jan Malakhovski
c6256c0e3e nixos: generate infodirs directly in system-path
`man 1 info` says:

   The first non-option argument, if present, is the menu entry to
   start from; it is searched for in all `dir' files along INFOPATH.
   If it is not present, info merges all `dir' files and shows the
   result. Any remaining arguments are treated as the names of menu
   items relative to the initial node visited.

Which means that this does what previous programs/info did and #8519
(on-the-fly infodir generation for Emacs) wanted to do, but for both
programs.
2015-08-18 18:42:57 +00:00
Jan Malakhovski
fea03379d6 nixos: add /share/doc and /share/nano (for symmetry) to environment.pathsToLink
and sort all of them
2015-08-18 18:38:48 +00:00
Eelco Dolstra
1f2eef5ae9 openssh: Re-enable DSA client keys
This was broken by a8eb2a6a81.
2015-08-18 13:11:45 +02:00
Jan Malakhovski
2a9dbf36b3 nixos: make services.smartd much more helpful
Now it generates notifications for auto-detected devices as well as
for explicitly configured ones, sends well formed e-mails and supports
immediate `wall` and `xmessage` notifications.
2015-08-16 22:36:13 +00:00
Tuomas Tynkkynen
8914e1af6d nixos-generate-config: Don't enable vbox guest via deprecated option
Avoids this warning when running `nixos-rebuild switch`:
````
building Nix...
building the system configuration...
trace: Obsolete option `services.virtualboxGuest.enable' is used. It was renamed to `virtualisation.virtualbox.guest.enable'.
````
2015-08-16 00:32:37 +02:00
Benno Fünfstück
e6f1e1e5db Merge pull request #6272 from NixOS/types-path-better-error
types.nix: better error message for non-paths
2015-08-15 13:16:00 +02:00
Benno Fünfstück
691f683c8c types.nix: better error message for non-paths
This improves error messages when a set or a list is used where a path
was expected. For an example, if you used a package set (as opposed to a
single package) in systemPackages before this commit, the error was:

```
cannot coerce a list to a string, at "/home/nixpkgs/lib/types.nix":103:37
```

Now, the error message reads:

```
The option value `environment.systemPackages' in `/etc/nixos/configuration.nix' is not a list of paths.
```
2015-08-15 13:05:57 +02:00
Bjørn Forsman
7d414a0646 nixos: add services.printing.snmpConf option
And set the default value to "Address @LOCAL". This change is needed to
find printers at my workplace (with "lpinfo -v" or the
"system-config-printer" GUI). Ubuntu 14.04 also has this as default.

snmp.conf does not seem to be needed in restartTriggers, because it is
not the cups daemon itself that reads it, but some helper programs that
it spawns on demand.
2015-08-13 22:05:09 +02:00
Charles Strahan
c1ee8fefd4 nixos: add support for Ubuntu Fan Networking
This provides support for Ubuntu Fan Networking [1].

This includes:

* The fanctl package, and a corresponding NixOS service.
* iproute patches.
* kernel patches.

closes #9188

1: https://wiki.ubuntu.com/FanNetworking
2015-08-13 14:27:14 -04:00
aszlig
6440e9bbfd
nixos/vbox: Move all options to virtualisation.*.
Commit 687caeb renamed services.virtualboxHost to programs.virtualbox,
but according to the discussion on the commit, it's probably a better to
put it into virtualisation.virtualbox instead.

The discussion can be found here:

https://github.com/NixOS/nixpkgs/commit/687caeb#commitcomment-12664978

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-13 12:28:24 +02:00
Luca Bruno
36f4e0e2e7 gnome3: set desktopManagerHandlesLidAndPower to false 2015-08-13 01:39:52 +02:00
Eelco Dolstra
687caebfcb Rename services.virtualboxHost -> programs.virtualbox
VirtualBox is an application, not a system service.
2015-08-12 14:12:21 +02:00
Rickard Nilsson
3afc387b4a scollector: Update from 20150506172827 to 0.3.0 2015-08-11 13:46:17 +02:00
Joachim Fasting
2c5775b141 i2p service: use mkEnableOption 2015-08-09 02:29:35 +02:00
Rob Vermaas
715e772667 Add initial Brightbox expression.
(cherry picked from commit 55d97862890350a3cc069d547114c1a880f2e583)
2015-08-08 19:50:22 +00:00
lethalman
076e90c67a Merge pull request #9150 from tomberek/gateone_setup
gateone: Fix startup
2015-08-08 15:35:08 +02:00
Thomas Bereknyei
6b280b648f kippo: fix check for pidPath 2015-08-07 01:01:22 -04:00
Thomas Bereknyei
825b8403a2 Check for pidDir and create 2015-08-07 00:43:29 -04:00
Eelco Dolstra
43c4756090 Add auto update feature
You can now keep your system up to date automatically by setting:

  system.autoUpgrade.enable = true;

Fixes #7369.
2015-08-07 05:37:31 +02:00
Eelco Dolstra
80d9b42663 Allow units to specify that they shouldn't be stopped when removed 2015-08-07 05:37:23 +02:00
Vladimír Čunát
7dc9450ed2 nixos/ISO profile: fix defaultLocales :-)
https://github.com/NixOS/nixpkgs/commit/eb4a88d8fd2#commitcomment-12527102
2015-08-06 12:30:38 +02:00
Eelco Dolstra
2cd7c1f198 Unify NixOS and Nixpkgs channel structure
This is primarily to ensure that

  -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz

and

  -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz

and

  -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz

behave consistently.

It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.

Fixes #7659.
2015-08-05 17:37:11 +02:00
Eelco Dolstra
91e71725d4 Remove some obsolete references to <nixos> 2015-08-05 17:37:08 +02:00
Eelco Dolstra
bb38d9974b Update fallback Nix store paths 2015-08-05 14:34:57 +02:00
Eelco Dolstra
b3d8d750de Remove /etc/nixos/nixpkgs from $NIX_PATH
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
2015-08-05 14:34:33 +02:00
Eelco Dolstra
699ba71b50 nixos-install: Source the profile when running inside the chroot 2015-08-05 14:33:18 +02:00
Eelco Dolstra
3f1354a3cd Add an option ‘nix.nixPath’ for specifying $NIX_PATH 2015-08-05 14:33:15 +02:00
Anders Papitto
4f7819b89c dnsmasq restarts if /etc/hosts file is changed by nixos-rebuild 2015-08-05 03:36:19 -07:00
Tobias Geerinckx-Rice
c22c874aeb nixos: freefall service: run ASAP 2015-08-04 19:48:08 +02:00
Thomas Tuegel
ba59ff2160 nixos/fontconfig: separate rendering and alias configuration
Fixes #9110. Fontconfig recommends different precedence for rendering
settings and generic alias settings. To comply with the recommendations,
`98-nixos.conf` has been separated into `10-nixos-rendering.conf` and
`60-nixos-generic-alias.conf`.
2015-08-04 12:15:29 -05:00
Eelco Dolstra
c9e46da86b cups-browsed: Only enable if avahi is enabled
This gets rid of

  systemd[1]: Cannot add dependency job for unit avahi-daemon.service, ignoring: Unit avahi-daemon.service failed to load: No such file or directory.
2015-08-04 16:41:18 +02:00
Arseniy Seroka
a5b976e8d3 Merge pull request #9061 from tomberek/add_gateone
GateOne: init at 1.2
2015-08-04 07:16:21 +03:00
aszlig
07edb2483d
Merge branch 'vboxguest-sbin-removal'.
This removes all references to .../sbin for the guest additions and also
installs all binaries to .../bin instead (so no more .../sbin).

The main motivation for doing this is commit 98cedb3 (which
unfortunately had to be reverted in a9f2e10) and pull request #9063,
where the latter is an initial effort to move mount.vboxsf to .../bin
instead of .../sbin.

The commit I made afterwards is finishing the removal of .../sbin
entirely.
2015-08-04 04:00:09 +02:00
aszlig
6c50714222
nixos: Give virtualbox-host.nix a better location.
In 14f09e0, I've introduced the module under modules/programs, because
the legacy virtualbox.nix was also under that path. But because we
already have modules/virtualisation/virtualbox-guest.nix, it really
makes sense to put this module alongside of it as well.

This module thus has no change in functionality and I've tested
evaluation against nixos/tests/virtualbox.nix and the manual.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-04 03:59:52 +02:00
aszlig
86b695a18e
vbox-guest: Remove all references to sbin/.
Using $storepath/sbin is deprecated according to commit 98cedb3, so
let's avoid putting anything in .../sbin for the guest additions.

This is a continuation of the initial commit done by @ctheune at
1fb1360, which unfortunately broke VM tests and only changed the path of
the mount.vboxsf helper.

With this commit, the VM test is fixed and I've also verified on my
machine that it is indeed working again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-04 03:03:24 +02:00
William A. Kennington III
736552b7e5 nixos: Fix manpages from 8c652379df 2015-08-03 16:19:12 -07:00
Edward Tjörnhammar
727e2b5237 nixos: gitit service, add all different repo initalizers 2015-08-03 22:29:47 +02:00
Edward Tjörnhammar
1e2d3f3b5f nixos: gitit service, use list of strings for plugins 2015-08-03 22:29:41 +02:00
Edward Tjörnhammar
6d23f43b30 nixos: gitit service, use proper documentation formatting in examples 2015-08-03 22:29:30 +02:00
Edward Tjörnhammar
4802a277a4 nixos: gitit service, change yesNo to bool and add toYesNo from bool 2015-08-03 22:29:23 +02:00
Nikolay Amiantov
a8788c4d6a bumblebee: remove redundant bash process 2015-08-03 23:26:23 +03:00
Thomas Bereknyei
cb6dc71599 GateOne: init at 1.2 2015-08-03 11:01:05 -04:00
Sander van der Burg
5bbed3d52d dd-agent: if nginx and mongodb integrations are enabled, then disk and network settings are not gathered anymore. This fixes the problem 2015-08-03 14:27:23 +00:00
Eelco Dolstra
ff4e92f2cc Spelling etc 2015-08-03 13:48:43 +02:00
Sander van der Burg
dc2a6e3d3d dd-agent: Add support for MongoDB monitoring 2015-08-03 09:09:52 +00:00
lethalman
fa7860f84d Merge pull request #8036 from Profpatsch/locate
locate: option includeStore
2015-08-03 10:23:30 +02:00
Thomas Strobel
6193f5260c tcsd module: adjust default value of kernelPCRs 2015-08-02 22:55:45 +02:00
Arseniy Seroka
372e5a7dcf Merge pull request #9072 from benley/shout
Shout: new package and nixos module
2015-08-02 16:07:36 +03:00
Arseniy Seroka
b563775994 Merge pull request #9077 from ts468/upstream.tcsd
tcsd module: expose firmwarePCRs and kernelPCRs
2015-08-02 03:47:06 +03:00
Profpatsch
8c652379df locate: option includeStore 2015-08-02 01:04:13 +02:00
ts468
2b284a3d1d Merge pull request #8833 from ts468/upstream.xen
xen: fixes (authored by michalpalka)
2015-08-01 16:59:40 +02:00
Thomas Strobel
aa63d4299f tcsd module: expose firmwarePCRs and kernelPCRs 2015-08-01 16:56:06 +02:00
Benjamin Staffin
ad4c957163 shout service: New module. 2015-08-01 03:36:45 -07:00
Thomas Tuegel
ebe0befd86 Merge branch 'quassel' 2015-07-30 21:51:37 -05:00
Thomas Tuegel
e5a93ab201 Revert "nixos/quassel: Temporarily switch back to qt4 since qt5 tls in quassel is broken"
This reverts commit c61d048427.
2015-07-30 21:24:11 -05:00
Jan Malakhovski
967088e002 nixos: let's not forget types in the timezone module 2015-07-31 01:57:47 +00:00
Spencer Janssen
2a31397f53 stage-1: fix typo that breaks resume
$d should be $sd, this causes resume from hibernate to fail if
resumeDevice is not explicitly set in config.  Introduced in commit:
'stage-1: Shut up warnings about swap devices that don't exist yet'
2015-07-30 16:30:20 -05:00
Tobias Geerinckx-Rice
c78fd07460 nixos: nix-daemon: update maxJobs description
I bought an X2 in 2006. It was awesome.
Use a more contemporary and model-agnostic example.
2015-07-30 19:06:45 +02:00
Jascha Geerds
2c9a97ee14 gnome3: Refactor default screensaver setting 2015-07-30 18:05:42 +02:00
Jascha Geerds
97dd0dae74 gnome3: Set nixos desktop background and screensaver 2015-07-30 17:56:01 +02:00
Eelco Dolstra
f463d24903 Add read-only options
These are options that can have only one definition, regardless of
priority.
2015-07-30 13:44:50 +02:00
Kamil Chmielewski
2cf8d9b0ef xserver: qtile as windowManager 2015-07-30 07:31:53 +02:00
viric
982ce5ed58 Merge pull request #8978 from dezgeg/pr-arm-images
ARM SD card image expressions
2015-07-29 14:13:57 +02:00
Luca Bruno
203dad10fe Revert "Merge pull request #9034 from kamilchm/qtile-wm"
This reverts commit 27c73e252a, reversing
changes made to 9430294114.
2015-07-29 12:30:01 +02:00
Kamil Chmielewski
68976a15e8 xserver: qtile as desktopManager 2015-07-28 23:39:57 +02:00
Vladimír Čunát
dbe12b643f nixos/xfce: replace old gnome2 icons by gnome3 2015-07-28 17:05:08 +02:00
Nikolay Amiantov
dea8ebcfc5 dovecot: add lmtp support 2015-07-28 12:33:29 +03:00
Eelco Dolstra
99750d89dd Don't evaluate haskellPackages when gitit is disabled
This cuts evaluation time of my NixOS configuration from 1.76s to
1.36s, and RSS from 443 MiB to 368 MiB.

Issue #8152.
2015-07-28 10:25:31 +02:00
Eelco Dolstra
ace332eb36 Set a default value for services.postgresql.package
This is finally possible now that we have ‘system.stateVersion’
(allowing the default package to change over time).
2015-07-27 20:30:10 +02:00
Eelco Dolstra
a5b83c3573 sshd: Use RSA and ED25519 host keys
Closes #7939.
2015-07-27 20:30:10 +02:00
Eelco Dolstra
d166c854b6 Add option system.stateVersion
This option requests compatibility with older NixOS releases with
respect to stateful data, in cases where new releases have defaults
that might be incompatible with system state of existing NixOS
deployments. For instance, if we change the default version of
PostgreSQL, existing deployments will break if the new version can't
read databases created by the old version.

So for example, setting

  system.stateVersion = "15.07";

requests that options like services.postgresql.package use defaults
corresponding to the 15.07 release branch. Note that
nixos-generate-config emits this option. (In the future, NixOps may
set system.stateVersion to the NixOS release in use when the machine
was created.)

See also #7939 for another motivating example.
2015-07-27 20:30:09 +02:00
Eelco Dolstra
e3a5bca4ae Require signed binary caches by default 2015-07-27 20:30:09 +02:00
Mateusz Kowalczyk
4984bfe807 redshift: fix evaluation
Broken by 77d33f77d7 , cc @nckx
2015-07-27 16:46:57 +01:00
Eelco Dolstra
709470f2c0 Fix tests 2015-07-27 12:47:21 +02:00
Tobias Geerinckx-Rice
77d33f77d7 nixos: redshift service: add extraOptions 2015-07-27 01:54:07 +02:00
William A. Kennington III
abc7c1b013 nixos/firewall: Add the ability to specify additional packages for extraCommands 2015-07-26 16:33:03 -07:00
Eelco Dolstra
f07b2121f9 Fix grub-reboot 2015-07-27 01:07:38 +02:00
Eelco Dolstra
f64589b2ef firewall: Don't depend on ipset
NixOS doesn't use it, so no reason to include it.
2015-07-26 22:45:39 +02:00
Arseniy Seroka
adedca45d5 Merge pull request #8994 from AndersonTorres/icewm
IceWM: 1.3.8 -> 1.3.10
2015-07-26 20:04:54 +03:00
Arseniy Seroka
558dbbc7f3 Merge pull request #8947 from AndersonTorres/oroborus
Oroborus (2.0.20): New Package
2015-07-26 20:03:47 +03:00
AndersonTorres
bdd20cedc1 IceWM: 1.3.8 -> 1.3.10
A complete rewrite in comparision to previous expression.
2015-07-26 01:08:05 -03:00
Tuomas Tynkkynen
df86813d97 nixos: Add derivations for SD card installation images on ARM
The resulting image can be copied to a SD card with `dd` and is directly
bootable by a suitably configured U-Boot. Though depending on the board, some
extra steps are required for copying U-Boot itself to the SD card.

Inside the image is a partition table, with a FAT32 /boot and a normal
writable EXT4 rootfs. It's possible to directly reuse the SD image's
partition layout and "install" NixOS on the same SD card by replacing
the default configuration.nix and nixos-rebuild, and actually is the
preferred way to use these images. To assist in this installation
method, the boot scripts on the image automatically resize the rootfs
partition to fit the SD card on the first boot.

The SD images come in two flavors; one for the ARMv6 Raspberry Pi,
and one multiplatform image for all the boards supported by the
mainline kernel's multi_v7_defconfig config target. At the moment, these
have been tested on:
    - Raspberry Pi Model B (512MB model)
    - NVIDIA Jetson TK1
    - Linksprite pcDuino3 Nano

To build, run:

nix-build '<nixpkgs/nixos>' -A config.system.build.sdImage \
    -I nixos-config='<nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix>'
2015-07-26 00:31:20 +03:00
Tuomas Tynkkynen
8665b0d8b1 extlinux-conf-builder: Fix warning when building in chroot
When using extlinux-conf-builder in a nix build using chroots, the
following error message could be seen:

/nix/store/XXX-extlinux-conf-builder.sh: line 121: cd: /nix/var/nix/profiles: No such file or directory

To avoid this, just skip the code path parsing /nix/var/nix/profiles
when $numGenerations (passed from the command line) is 0 (which is the
only legal value of $numGenerations in a nix build context).
2015-07-26 00:31:20 +03:00
Eelco Dolstra
6948c3ab80 Installer: Add nomodeset and blacklist the nouveau driver
I observed a hang at the moment the nouveau driver gets loaded on a
GTX 970.
2015-07-25 19:06:07 +02:00
Eelco Dolstra
c49b24c940 Fix capitalisation 2015-07-25 19:06:07 +02:00
Eelco Dolstra
174dd0eae7 Fix description of boot.consoleLogLevel 2015-07-25 19:06:07 +02:00
Tobias Geerinckx-Rice
078ee4ac55 copy-com: 1.47.0410 -> 3.2.01.0481 + several fixes
The graphical UI (the largest part of this package) never worked; fixed.

Added myself as a maintainer.
2015-07-25 04:39:02 +02:00
Shea Levy
e3c374fac4 cron: Actually enable the service if enabled 2015-07-24 12:15:37 -04:00
Jascha Geerds
3d9a4d79cf gnome3: Include gnome-shell-extensions in session path 2015-07-24 12:41:20 +02:00
lethalman
636f9ac0ed Merge pull request #8799 from ryantm/master
heyefi service: init
2015-07-24 10:11:26 +02:00
danbst
26d5a1fc62 postgresql: add reload command 2015-07-24 01:41:32 +00:00
AndersonTorres
d004ac6857 Oroborus: init at 2.0.20
Oroborus (named after the self-eating snake) is a minimalistic window manager.
2015-07-23 13:50:26 -03:00
Eelco Dolstra
e2b25f9434 Use environment.etc to manage /etc/crontab
Otherwise, /etc/crontab won't be deleted when cron is disabled.
2015-07-22 15:15:09 +02:00
Eelco Dolstra
201f9beddb Don't enable cron by default
The rationale for disabling this is: 1) systemd timers are better; 2)
it gets rid of one usually unnecessary process, which makes containers
more light-weight.

Note that cron is still enabled if services.cron.systemCronJobs is
non-empty, so this only matters if you have no declarative cron jobs
but do have user cron jobs.
2015-07-22 15:15:09 +02:00
Tuomas Tynkkynen
a6c95a3f7d extlinux-conf-builder: Set menu title to force prompt display
Without a menu title, U-Boot's distro scripts just autoboot the first
entry by default.

When I initially wrote this, my board wasn't apparently running stock
U-Boot but had some local hacks saved in the U-Boot's environment
which made it always display the prompt.
2015-07-22 16:08:18 +03:00
Tuomas Tynkkynen
8496f71e92 extlinux-conf-builder: Make it work on non-DTB systems
With this, boot.loader.generic-extlinux-compatible can be used with
linuxPackages_rpi on the Raspberry Pi.
2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
6147909f8e extlinux-conf-builder: Properly copy kernels for the default entry
When calling addEntry inside a subshell, the filesCopied array would
be updated only in the subshell's environment. This would only cause an
issue if no -g flag was passed to the script, causing no kernels
to be copied.
2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
1947179036 nixos/rogue: Set WorkingDirectory to /tmp
Otherwise we can get an ugly /rogue.scr in the root of the filesystem
hierarchy.
2015-07-22 16:08:17 +03:00
Eelco Dolstra
fab3090693 Don't include wireless tools in containers 2015-07-22 12:51:21 +02:00
Tuomas Tynkkynen
5d02c02a9b systemd: Use upstream tmpfiles.d rules
This fixes a failing assert in systemd-timesyncd (issue #5913) as it
expects the directory /run/systemd/netif/links/ to exist, and nothing in
NixOS currently creates it.

Also we get a net reduction in our code as rules for /run/utmp and
/var/log/journal are also provided by the same upstream file.

(cherry picked from commit a278a9224a)
2015-07-22 12:27:05 +02:00
Eelco Dolstra
925e1f91c5 Set up /etc/machine-id before starting systemd
Otherwise, systemd will try to populate /etc, which we don't want.

(cherry picked from commit c8501a4218)
2015-07-22 12:24:32 +02:00
Eelco Dolstra
0ab320a884 stage-1: Shut up warnings about swap devices that don't exist yet
(cherry picked from commit 388dac478d)
2015-07-22 12:24:06 +02:00
Eelco Dolstra
ec82157ac5 stage-2: Don't run hwclock in containers
(cherry picked from commit b978df019a)
2015-07-22 12:23:52 +02:00
Eelco Dolstra
9647609e3e stage-1: Don't mount /dev/shm if it's already mounted
(cherry picked from commit c8ef598945)
2015-07-22 12:23:48 +02:00
Eelco Dolstra
6bd4e0b8cd Create systemd-{network,resolve} user/group unconditionally
This shuts up this error from dbus:

May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-network" in message bus configuration file
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-resolve" in message bus configuration file

which happens because the D-Bus config for networkd/resolved is
enabled unconditionally, and we don't have an easy way to turn it off.

(cherry picked from commit f19b58fb6a)
2015-07-22 12:23:45 +02:00
Eelco Dolstra
65700b435c Use ConditionVirtualization to disable some services in containers
(cherry picked from commit c52a983806)
2015-07-22 12:23:40 +02:00
Mateusz Kowalczyk
8d70b5cd91 Merge pull request #8904 from Fuuzetsu/docker-custom-postStart
docker: allow the user to override postStart
2015-07-21 19:13:54 +01:00
Charles Strahan
babb744b71 riak: new nixos service 2015-07-21 09:25:41 -04:00
Mateusz Kowalczyk
23187c3431 docker: allow the user to override postStart
My use-case: passing -H SOM.EIP.ADD.RES:PORT doesn't result in a .sock
file so the service would never go up.
2015-07-20 14:28:49 +01:00
Austin Seipp
0c4fca7d61 Merge pull request #8690 from laMudri/synaptics
synaptics: fix to allow for more scrolling choices
2015-07-19 12:50:33 -05:00
Oliver Charles
08c192a40b devmon: New service 2015-07-19 13:39:00 +01:00
Vladimír Čunát
9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Luca Bruno
883517f37c phpfpm: use latest php 2015-07-17 18:09:50 +02:00
Arseniy Seroka
19e5fd60b3 slim: use nixos theme by default 2015-07-17 17:01:07 +03:00
Eelco Dolstra
b1623385d0 nixos-generate-config: Container improvements 2015-07-17 11:27:33 +02:00
Vladimír Čunát
9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
tv
1306c11b94 bitlbee service: fix typo 2015-07-16 02:43:27 +02:00
William A. Kennington III
6281c618cf lightdm: Fix location of loaders.cache after 4982143324 2015-07-15 15:30:39 -07:00
Joachim Fasting
2e0933787b nixos: add AppArmor PAM support
Enables attaching AppArmor profiles at the user/group level.

This is not intended to be used directly, but as part of a
role-based access control scheme. For now, profile attachment
is 'session optional', but should be changed to 'required' once
a more comprehensive solution is in place.
2015-07-15 12:40:06 +02:00
Thomas Strobel
2ff9129337 xen: fixes (authored by michalpalka)
Xen required a few changes in order to be usable:
* Include xenfs module in initrd as loading it in the activation
  script was failing.
* Include /etc/default/xendomains, which is needed by
  xen-domains service.
* Create /var/log/xen and /var/lib/xen directories in
  the xen-store service, which are needed by the xl command.
  The directories could be created by any other script as long as
  they are guaranteed to exist before xl is called.
* Fix a reference to /bin/ls in the xendomains script.
2015-07-15 12:38:37 +02:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
James Felix Black
be5ad1d07c window-manager service: add notion
Add the notion window manager to the windowManager service definition.
2015-07-14 12:36:59 -04:00
Ryan Mulligan
9d485d9433 heyefi service: make uploadDir path more generic and a string 2015-07-14 06:56:30 -07:00
Ryan Mulligan
d11edff860 heyefi service: use mkEnableOption 2015-07-14 06:54:51 -07:00
Ryan Mulligan
d6cee31b04 heyefi service: init 2015-07-14 06:42:02 -07:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Eelco Dolstra
fd06533def nixos-install: Don't barf if btrfs is missing 2015-07-13 17:55:49 +02:00
Eelco Dolstra
7b38cb699d services.openssh.knownHosts.*.publicKey: Update description and add example
Note that it's no longer allowed to have multiple public keys
separated by a newline.
2015-07-13 16:21:57 +02:00
tv
baab714b2e charybdis service: fix preStart script 2015-07-13 15:11:18 +02:00
Leroy Hopson
2e49828d9c firefox sync-server service: make path to paster executable absolute
The systemd service was ignoring ExecStart because the path to the
paster executable was not absolute. Because ExecStart was ignored, the
service would not start.
2015-07-12 20:43:52 +12:00
James Cook
a456168e5b Merge pull request #6702 from joachifm/dnscrypt-proxy
nixos: some improvements for dnscrypt-proxy
2015-07-12 00:17:46 -07:00
Eelco Dolstra
dc62669335 Set ‘allowSubstitutes = false’ on various derivations
This reduces the number of binary cache requests. See
b64988bb35.
2015-07-09 15:10:37 +02:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Pascal Wittmann
1e4483b1ec nixos/bitlbee: fixed protocols option 2015-07-08 19:30:20 +02:00
Pascal Wittmann
c0de3b306b nixos/bitlbee: add hostname, config dir and protocols options 2015-07-08 19:14:36 +02:00