21929 Commits

Author SHA1 Message Date
Michael Weiss
89cc391728
Merge pull request #122877 from primeos/nixos-tests-sway-gpg-agent-pinentry
nixos/tests/sway: test GPG's pinentry pop-up
2021-05-14 14:45:56 +02:00
WilliButz
94b2848559
Merge pull request #91663 from mweinelt/kea-exporter
prometheus-kea-exporter: init at 0.4.1
2021-05-14 14:38:08 +02:00
Eelco Dolstra
b08e223a04 nix: 2.3.10 -> 2.3.11
The patch is included in the new release, so can be dropped.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
2021-05-14 12:24:54 +00:00
Martin Weinelt
dd7e1834ca
nixos/tests/prometheus-exporters.kea: init 2021-05-14 14:09:19 +02:00
Alyssa Ross
195d532a63
Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""
This reverts commit 66fc303070a8ed731ffcb8733b825a03d5a2babe.

There is still a patch that doesn't apply.
2021-05-14 11:35:18 +00:00
Eelco Dolstra
66fc303070
Revert "Revert "nix: 2.3.10 -> 2.3.11""
This reverts commit 1872bbdae55ffc82bbbe632e50fcea0e2bb5fcea.
2021-05-14 13:33:05 +02:00
Alyssa Ross
1872bbdae5
Revert "nix: 2.3.10 -> 2.3.11"
This reverts commit 6f6b2cdc98f93701caf74e512ac0e3fe68730c23.

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
Michael Lingelbach
46284492f4
nixos/tests/dendrite: init (#121777) 2021-05-14 13:11:22 +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
Michael Weiss
940dfa9940
signal-desktop: Fix the database encryption by preloading SQLCipher
AFAIK this is the only reliable way for us to ensure SQLCipher will be
loaded instead of SQLite. It feels like a hack/workaround but according
to the SQLCipher developers [0] "this issue can and should be handled
downstream at the application level: 1. While it may feel like a
workaround, using LD_PRELOAD is a legitimate approach here because it
will substitute the system SQLite with SQLCipher which is the intended
usage model;".

This fixes #108772 for NixOS 20.09 users who upgrade to NixOS 21.05 and
replaces #117555.

For nixos-unstable users this will unfortunately break everything again
so we should add a script to ease the transition (in a separate commit
so that we can revert it for NixOS 21.05).

[0]: https://github.com/sqlcipher/sqlcipher/issues/385#issuecomment-802874340
2021-05-14 02:33:42 +02: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
28a1e9516d
Merge pull request #122627 from primeos/nixos-tests-signal-desktop-db-encryption
nixos/tests/signal-desktop: test if the SQLite DB is (un)encrypted
2021-05-13 21:40:07 +02:00
Michael Weiss
217f268534
nixos/tests/signal-desktop: test if the SQLite DB is (un)encrypted
Well, this should test if the database is encrypted but currently it is
still unencrypted and we need to notice if this behaviour changes in the
future (as it will cause data loss, see e.g. #108772).
Anyway, this doesn't really matter for security reasons but we need this
test to prevent data loss (unfortunately Signal-Desktop and SQLCipher
handle this badly... :o).
2021-05-13 21:18:28 +02:00
Michael Weiss
03808546e5
nixos/tests/sway: test GPG's pinentry pop-up
This test is important to confirm that $WAYLAND_DISPLAY is correctly
imported via "dbus-update-activation-environment --systemd" which is
done by default since #122605 (00e8e5b123f).
It ensures that the gnome3-pinentry pop-ups work as expected to avoid
regressions like #119445 (which also broke screen sharing).
2021-05-13 20:51:31 +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
Jonas Chevalier
c6b62f2381
mkShell: introduce packages argument (#122180)
The distinction between the inputs doesn't really make sense in the
mkShell context.  Technically speaking, we should be using the
nativeBuildInputs most of the time.

So in order to make this function more beginner-friendly, add "packages"
as an attribute, that maps to nativeBuildInputs.

This commit also updates all the uses in nixpkgs.
2021-05-13 19:17:29 +02: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
Robert Hensing
7b0e0ca35e nixos-install-tools: init
The essential commands from the NixOS installer as a package

With this package, you get the commands like nixos-generate-config and
nixos-install that you would otherwise only find on a NixOS system, such
as an installer image.

This way, you can install NixOS using a machine that only has Nix.

It also includes the manpages, which are important because the commands
rely on those for providing --help.
2021-05-13 01:29:02 +02: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
Thomas Tuegel
f99ac85c52
Merge pull request #120514 from ttuegel/kde-gear-21.04.0
KDE Gear 21.04.0
2021-05-12 05:58:30 -05:00
github-actions[bot]
d8fb37f470
Merge master into staging-next 2021-05-12 06:21:33 +00: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
davidak
afc1b5220e
Merge pull request #122438 from xaverdh/linux-5.12
linux_5_12: init at 5.12.2
2021-05-12 02:58:55 +02:00
Robin Gloster
b3d30fac67
prometheus-exporter tests: fix eval/deprecation
lnd exporter test still fails but evaluates now
2021-05-11 17:57:47 -05: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
af8532eee9
Add KDE Gear 21.04 to the release notes 2021-05-11 12:15:51 -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
worldofpeace
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