Commit Graph
17418 Commits
Author SHA1 Message Date
Alyssa Ross 1872bbdae5 Revert "nix: 2.3.10 -> 2.3.11"
This reverts commit 6f6b2cdc98.

Version wasn't updated, and apparently a patch didn't apply.  Let's do
this upgrade properly, in a PR, but for now I'm reverting so we don't
have a broken nix package in master.
2021-05-14 11:30:55 +00:00
Eelco Dolstra 6f6b2cdc98 nix: 2.3.10 -> 2.3.11 2021-05-14 13:11:26 +02:00
zowoq 004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
Yarny0 4415846d5c nixos/hylafax: use runtimeShell where possible
According to
https://github.com/NixOS/nixpkgs/pull/84556
this effort helps with cross-compilation.

This commit also renames a substituted variable `hylafax`
to `hylafaxplus` to permit substitution with `inherit`.
2021-05-14 05:42:18 +02:00
Yarny0 89df33f882 nixos/hylafax: replace a nested expression with lib.pipe
This avoids a tripple-nested function call,
and it looks slightly simpler (at least to me).
2021-05-14 05:42:18 +02:00
Yarny0 449647daf5 nixos/hylafax: use lib.types.ints.positive
I haven't realized earlier that there is
already an option type for postive integers.
2021-05-14 05:42:17 +02:00
github-actions[bot] bf5d8bb531 Merge master into staging-next 2021-05-14 00:58:11 +00:00
Jan Tojnar ac6a4f7cf5 Merge branch 'staging-next' into staging 2021-05-14 01:40:09 +02:00
Samuel Dionne-Riel 12ede41735 Merge pull request #110435 from superloach/patch-2
nixos/modules: add "sdhci_pci" to availableKernelModules
2021-05-13 17:45:22 -04:00
Jens Nolte 22e797947b nixos/zfs: Add defaultText for 'boot.zfs.package'-option (#122002) 2021-05-13 17:40:10 -04:00
Maximilian Bosch bfd4c121ff Merge pull request #122637 from mayflower/prometheus-2.26.0
Prometheus 2.26.0 + exporter updates
2021-05-13 23:05:29 +02:00
Michael Weiss 60f2af5938 Merge pull request #122605 from primeos/nixos-sway-extend-default-configuration
nixos/sway: Extend the default configuration for NixOS
2021-05-13 20:48:55 +02:00
github-actions[bot] 39e3f7c2cc Merge master into staging-next 2021-05-13 18:32:50 +00:00
Janne Heß 672e64701c nixos/prometheus: Add support for metric relabeling 2021-05-13 15:59:46 +02:00
Izorkin feebe402f5 treewide: remove duplicates SystemCallFilters 2021-05-13 15:44:56 +03:00
Luke Granger-Brown ca6255bf0b nixos/docker: fix evaluation when NAT is enabled too
Both networking.nat.enable and virtualisation.docker.enable now want to
make sure that the IP forwarding sysctl is enabled, but the module
system dislikes that both modules contain this option.

Realistically this should be refactored a bit, so that the Docker module
automatically enables the NAT module instead, but this is a more obvious
fix.
2021-05-13 10:26:45 +00:00
Martin Weinelt bc4a80979b nixos/prometheus-kea-exporter: init 2021-05-12 21:51:44 +02:00
github-actions[bot] b057978bb2 Merge staging-next into staging 2021-05-12 18:32:29 +00:00
github-actions[bot] f214722172 Merge master into staging-next 2021-05-12 18:32:26 +00:00
midchildan 6567031111 nixos/mirakurun: add polkit rule for smart card access (#122066)
Fixes #122039
2021-05-12 13:57:49 -04:00
Aaron Andersen f20aa073e1 nixos/httpd: provide a stable path stable path to the configuration file for reloads 2021-05-11 22:36:55 -04:00
Robin Gloster 9438b12f99 prometheus-collectd-exporter: fix options for new version 2021-05-11 17:57:46 -05:00
Robin Gloster b2956ce654 prometheus-bind-exporter: fix options for new version 2021-05-11 17:57:46 -05:00
Robin Gloster da85657a6c prometheus-rspamd-exporter: fix for new json exporter syntax 2021-05-11 17:57:46 -05:00
Thomas Tuegel 799f351997 KDE Applications 20.12.3 -> KDE Gear 21.04.0 2021-05-11 12:14:58 -05:00
Michael Weiss 00e8e5b123 nixos/sway: Extend the default configuration for NixOS
The default config.in template contains
"include @sysconfdir@/sway/config.d/*" but we've dropped it to better
support non-NixOS (which seems like a mistake in retrospect).
This restores that behaviour and extends the default configuration via
nixos.conf to fix #119445.

Note: The security configurations (security.d) where dropped entirely
(but maybe they'll return).
2021-05-11 18:53:49 +02:00
Jan Tojnar 8380ceb766 nixos/gnome: Allow disabling sysprof 2021-05-11 18:11:01 +02:00
worldofpeaceandJan Tojnar 8ad5d65d09 nixos/gnome: add user docs
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2021-05-11 18:10:53 +02:00
github-actions[bot] 1e7a48b474 Merge master into staging-next 2021-05-11 12:24:28 +00:00
Tom 33a4c43126 nixos/tor: fix HidServAuth (#122439)
* add an example for services.tor.settings.HidServAuth

* fix HidServAuth validation to require ".onion"
  Per https://manpages.debian.org/testing/tor/torrc.5.en.html :
  > Valid onion addresses contain 16 characters in a-z2-7 plus ".onion"
2021-05-11 10:10:32 +02:00
github-actions[bot] 10e16ec9ab Merge master into staging-next 2021-05-11 06:20:33 +00:00
Jörg Thalheim 8af4bf61fd Merge pull request #122423 from Izorkin/update-netdata
nixos/netdata: update configuration
2021-05-11 06:07:48 +01:00
github-actions[bot] 49b8e6f7d4 Merge master into staging-next 2021-05-11 00:48:15 +00:00
Robert Schütz 7217b2d85e Merge pull request #121785 from dotlambda/dendrite-rename
matrix-dendrite: rename to dendrite
2021-05-10 23:30:12 +02:00
Joe DeVivo bf92d0ec37 nixos/ssm-agent: conf files written to /etc
ssm-agent expects files in /etc/amazon/ssm. The pkg substitutes a location in
the nix store for those default files, but if we ever want to adjust this
configuration on NixOS, we'd need the ability to modify that file.

This change to the nixos module writes copies of the default files from the nix
store to /etc/amazon/ssm. Future versions can add config, but right now this
would allow users to at least write out a text value to
environment.etc."amazon/ssm/amazon-ssm-agent.json".text to provide
their own config.
2021-05-10 13:16:41 -07:00
Samuel Dionne-Riel 37f14fa4d9 Merge pull request #121450 from samueldr/feature/cross-uefi-iso
iso-image: Fixes for cross-compilation
2021-05-10 14:42:59 -04:00
github-actions[bot] 61fa3fdde8 Merge master into staging-next 2021-05-10 18:28:17 +00:00
Samuel Dionne-Riel 79752e2310 Merge pull request #121834 from samueldr/feature/raspberrypi4-image-cleanup
sd_image_raspberrypi4: Remove, as planned initially
2021-05-10 14:05:02 -04:00
Sandro f0bb4f066a Merge pull request #95050 from paumr/bind-fmt 2021-05-10 19:06:00 +02:00
github-actions[bot] 115881e756 Merge master into staging-next 2021-05-10 12:24:32 +00:00
Izorkin 85914bc01d nixos/netdata: change wrappers permissions 2021-05-10 10:35:51 +03:00
Izorkin 859633ee43 nixos/netdata: use cgroup v2 2021-05-10 10:24:31 +03:00
Izorkin 58497175be nixos/netdata: cgroup-network: don't use AmbientCapabilities 2021-05-10 10:19:57 +03:00
Michele Guerini Rocco 4cbe186a8a Merge pull request #121394 from bjornfor/atd-file-creation
nixos/atd: prefer 'install' over 'mkdir/chmod/chown'
2021-05-10 08:43:57 +02:00
github-actions[bot] f4d69ad1f2 Merge master into staging-next 2021-05-10 06:20:28 +00:00
Michele Guerini Rocco d0cbcce8d4 Merge pull request #121395 from bjornfor/nixos-wpa-supplicant
nixos/wpa_supplicant: prefer 'install' over 'touch/chmod/mkdir/chgrp'
2021-05-10 08:16:39 +02:00
hyperfekt 3e3e763a07 nixos/systemd: enable systemd-pstore.service
As described in issue #81138, the Install section of upstream units is
currently ignored, so we make it part of the sysinit.target manually.
2021-05-09 23:21:51 +02:00
hyperfekt 870fa77ff6 nixos/filesystems: mount persistent storage to /sys/fs/pstore 2021-05-09 23:21:32 +02:00
github-actions[bot] bc1f4b790e Merge master into staging-next 2021-05-09 12:23:16 +00:00
Luke Granger-Brown 491216df02 Merge pull request #122099 from alekna/fix/docker
nixos/docker: ensure ipv4 forwarding is enabled
2021-05-09 12:15:16 +01:00