adisbladis
0dc3e485a1
Merge pull request #85822 from zowoq/cni-collision
...
nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages
2020-04-23 11:22:01 +02:00
Florian Klink
04e308a496
Merge pull request #85815 from arianvp/fix-85800
...
Fix networkd not restarting on unit changes
2020-04-23 10:36:57 +02:00
Arian van Putten
f332109ebf
nixos/datadog-agent: Fix restartTriggers
...
Fixes #85800
1d61efb7f1
accidentially changed the
restartTriggers of `datadog-agent.service` to point to the attribute
name (in this case, a location relative to `/etc`), instead of the
location of the config files in the nix store.
This caused datadog to not get restarted on activation of new
config, if the file name hasn't changed.
Fix this, by pointing this back to the location in the nix store.
2020-04-23 09:58:18 +02:00
Arian van Putten
14395cc687
nixos/networkd: Fix restartTriggers
...
1d61efb7f1
accidentially changed the
restartTriggers of systemd-networkd.service` to point to the attribute
name (in this case, a location relative to `/etc`), instead of the
location of the network-related unit files in the nix store.
This caused systemd-networkd to not get restarted on activation of new
networking config, if the file name hasn't changed.
Fix this, by pointing this back to the location in the nix store.
2020-04-23 09:53:44 +02:00
Frederik Rietdijk
cff0669a48
Merge master into staging-next
2020-04-23 08:11:16 +02:00
zowoq
4102db2127
nixos/podman: remove cni-plugins from environment.systemPackages
2020-04-23 10:29:17 +10:00
zowoq
54b59dd6c0
nixos/cri-o: remove cni-plugins from environment.systemPackages
2020-04-23 10:29:11 +10:00
Florian Klink
32516e4fee
Merge pull request #80103 from tfc/port-systemd-confinement-test
...
nixosTests.systemd-confinement: Port to Python
2020-04-23 01:00:51 +02:00
Piotr Bogdan
830733db24
nixos/manual: fix build
2020-04-22 16:56:44 +01:00
Frederik Rietdijk
8374a2a0ee
Merge master into staging-next
2020-04-22 17:20:20 +02:00
Bas van Dijk
784aa2913a
Merge pull request #79840 from knl/update-oauth2_proxy-to-5.0.0
...
oauth2_proxy: 3.2.0 -> 5.1.0
2020-04-22 12:15:07 +02:00
Jörg Thalheim
6eb1020cbf
Merge pull request #85746 from iblech/patch-11
2020-04-22 10:47:28 +01:00
Jacek Galowicz
0b1bef70a9
nixosTests.redmine: Port to python
2020-04-22 08:36:27 +02:00
Ingo Blechschmidt
2e2da182fe
nixos-containers: add docs about nested containers
2020-04-22 05:30:48 +02:00
Jan Tojnar
b231ac2101
Merge pull request #85402 from jtojnar/httpd-php
2020-04-22 04:23:24 +02:00
Alexandre Esteves
4cc383dd9a
Fix typos ( #85693 )
2020-04-22 01:02:11 +02:00
worldofpeace
af2009a800
Merge pull request #85710 from worldofpeace/gnome-iso-wayland-default
...
installation-cd-graphical-gnome: don't run xorg default
2020-04-21 18:19:44 -04:00
davidak
6a7e0562de
Update link in /etc/os-release ( #85723 )
2020-04-22 00:16:22 +02:00
Ismaël Bouya
3dbd3f2651
rl-2003: Update the release documentation
...
It currently says that everything will be backward compatible between lego and simp-le certificates, but it’s not.
(cherry picked from commit 21c4a33cee
)
2020-04-21 23:51:12 +02:00
adisbladis
2d91da909e
Merge pull request #85604 from adisbladis/podman-module
...
nixos/virtualisation.podman: Init module
2020-04-21 23:48:48 +02:00
Florian Klink
c1a6e60335
Merge pull request #85598 from danderson/tailscale-fix-cachedir
...
nixos/tailscale: set a CacheDir in the systemd unit.
2020-04-21 22:38:32 +02:00
Florian Klink
6ba4ef6580
Merge pull request #85708 from Beskhue/fix-documentation
...
nixos/phpfpm: fix erroneous pools example
2020-04-21 22:16:15 +02:00
Florian Klink
cece19e0d8
Merge pull request #73505 from tomfitzhenry/networkd-dhcp-server-test
...
systemd-networkd: add DHCPServer test
2020-04-21 21:49:47 +02:00
worldofpeace
37e146c255
nixos/manual: fix build
2020-04-21 15:43:20 -04:00
worldofpeace
1f12a07179
installation-cd-graphical-gnome: don't run xorg default
...
If for some reason the Wayland session fails to start
it will just start the Xorg session.
2020-04-21 15:26:25 -04:00
Florian Klink
91e3358f62
Merge pull request #85692 from nh2/systemd-update-default-rate-limit
...
journald service: Increase default rate limit 1000 -> 10000.
2020-04-21 21:06:48 +02:00
Thomas Churchman
8880957042
nixos/phpfpm: fix erroneous pools example
2020-04-21 20:59:52 +02:00
Frederik Rietdijk
23be4a8b4d
Merge master into staging-next
2020-04-21 19:59:56 +02:00
worldofpeace
9b20a24d4d
Merge pull request #85643 from petabyteboy/feature/generate-config
...
nixos/tools: adapt for renamed console options
2020-04-21 12:50:55 -04:00
Niklas Hambüchen
d16d34732c
journald service: Increase default rate limit 1000 -> 10000.
...
Follows the upstream change of this default:
https://github.com/systemd/systemd/pull/8660
2020-04-21 18:29:03 +02:00
Domen Kožar
a85868fee9
Merge pull request #85685 from nh2/remove-unused-allSupportedNixpkgs
...
release-combined: Remove unused value `allSupportedNixpkgs`
2020-04-21 17:01:30 +02:00
Niklas Hambüchen
1da6613de1
release-combined: Remove unused value allSupportedNixpkgs
.
...
It was made obsolete by commit
2de3caf0
- nixos/release-combined.nix: List constituents of the 'tested' job by name
see also f996744fd3 (r38642487)
.
2020-04-21 16:41:41 +02:00
Tom Fitzhenry
0a49d329cb
systemd-networkd: add DHCPServer test
2020-04-22 00:12:00 +10:00
adisbladis
43f383c464
nixos.virtualisation.containers: Init common /etc/containers configuration module
...
What's happening now is that both cri-o and podman are creating
/etc/containers/policy.json.
By splitting out the creation of configuration files we can make the
podman module leaner & compose better with other container software.
2020-04-21 10:38:39 +01:00
adisbladis
650df709fb
nixos.virtualisation: Move containers.nix to nixos-containers.nix
...
In anticipation of the new containers module.
2020-04-21 10:36:56 +01:00
adisbladis
f0a92ef1d9
nixos/podman: Add maintainer team & add myself to podman team
2020-04-21 10:03:22 +01:00
adisbladis
b512a788a4
nixos/virtualisation.podman: Init module
2020-04-21 10:03:18 +01:00
Dominik Xaver Hörl
0412bde942
treewide: add bool type to enable options, or make use of mkEnableOption
...
Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate.
2020-04-21 08:55:36 +02:00
Frederik Rietdijk
803b3d296c
Merge staging-next into staging
2020-04-21 08:29:51 +02:00
Milan Pässler
d19089e1e7
nixos/tools: adapt for renamed console options
2020-04-21 02:07:53 +02:00
David Anderson
cee5ddbb28
nixos/tailscale: set a CacheDir in the systemd unit.
...
Fixes a bug where tailscaled drops some files into / when CacheDir
is unset.
Signed-off-by: David Anderson <dave@natulte.net>
2020-04-20 15:35:55 -07:00
Marek Mahut
60100a7c92
Merge pull request #83769 from dadada/nixos/dokuwiki-multi-server
...
nixos/dokuwiki: add support for multi-site, additional plugins and templates
2020-04-20 19:39:48 +02:00
worldofpeace
e9e9582986
Merge pull request #85186 from worldofpeace/20.03-readme
...
README.md: 20.03 release
2020-04-20 11:57:45 -04:00
worldofpeace
6380be302a
rl-2003: release date
2020-04-20 11:52:57 -04:00
Eelco Dolstra
f76d7b5e41
Merge pull request #85620 from matthewbauer/use-modulesPath-for-nixos-generate-config
...
nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs>
2020-04-20 17:25:17 +02:00
Matthew Bauer
c45295d47e
nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs>
...
For imports, it is better to use ‘modulesPath’ than rely on <nixpkgs>
being correctly set. Some users may not have <nixpkgs> set correctly.
In addition, when ‘pure-eval=true’, <nixpkgs> is unset.
2020-04-20 09:57:17 -05:00
Léo Gaspard
203955fa0c
Merge pull request #82714 from delroth/s3tc
...
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options
2020-04-20 13:41:47 +02:00
Jörg Thalheim
2f0ee4bd0b
Merge pull request #85371 from Mic92/tmpfiles
2020-04-20 10:32:58 +01:00
Nikola Knezevic
3c551848be
oauth2_proxy: Update NixOS module
...
Update to match the current flags and apply fixes to all breaking changes.
2020-04-20 10:11:46 +02:00
adisbladis
ab37d7e7ea
nixos-containers: Add support for custom nixpkgs argument
2020-04-20 07:33:46 +01:00