1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

21947 commits

Author SHA1 Message Date
talyz 3d9c3e5cfd
nixosTests.*: Don't use the -q flag with grep when used with curl
The `-q` flag makes grep close the pipe early, which curl doesn't
handle gracefully, but exits with an error like "(23) Failed writing
body".
2021-06-05 18:44:54 +02:00
talyz a86853501a
nixosTests.nginx*: nginxUnstable -> nginxMainline
Stop using the old `nginxUnstable` alias, which is invalid in tests
since 3edde6562e.
2021-06-05 18:44:48 +02:00
talyz b7749c7671
nixos/test-driver: Run commands with error handling
Bash's standard behavior of not propagating non-zero exit codes
through a pipeline is unexpected and almost universally
unwanted. Default to setting `pipefail` for the command being run;
it can still be turned off by prefixing the pipeline with
`set +o pipefail` if needed.

Also, set `errexit` and `nonunset` options to make the first command
of consecutive commands separated by `;` fail, and disallow
dereferencing unset variables respectively.
2021-06-05 18:44:42 +02:00
Sandro 9751baf8da
Merge pull request #125303 from Vonfry/fcitx5/autostart
nixos/fcitx5: autostart with xserver
2021-06-05 18:06:12 +02:00
ElXreno 7b9df38982
bees: 0.6.3 -> 0.6.5
Change-Id: I1866eab9c348d9c10219290ecba698121a32d128
2021-06-05 17:39:12 +03:00
ElXreno a3fa2cf7c2
bees: nixpkgs-fmt
Change-Id: If4e9431dad00ffade3316cf22235d8d44d12d149
2021-06-05 17:39:12 +03:00
Malte Voos f41f456422 nixos/roundcube: Use php74 2021-06-05 15:28:29 +02:00
Mewp b00bcf21ab nixos/acme: Remove an incorrect assertion from tests
Commit 3a2e0c36e7 has removed
`--reuse-key` from default renew options, yet the tests still expected
keys not to change. This assertion is now removed, as they are supposed
to change on each renew/change.
2021-06-05 10:38:46 +02:00
Jörg Thalheim 6fdb73a3b4
Merge pull request #118801 from Mic92/k3s
nixos/k3s: improve zfs/docker support
2021-06-05 07:54:54 +02:00
Jörg Thalheim 03582eb6e3
nixos/k3s: add zfs to path 2021-06-05 07:52:53 +02:00
Jörg Thalheim 7c310e8d28
nixos/k3s: add to environment.systemPackages for adminstration 2021-06-05 07:52:48 +02:00
Vonfry 195b26b95e
nixos/fcitx5: autostart with xserver 2021-06-05 09:22:58 +08:00
Edward Tjörnhammar afdb5675a1 nixos/containers: add storage.conf 2021-06-05 10:08:24 +10:00
Maciej Krüger 26b3751de7
Merge pull request #97692 from ryneeverett/lockkernelmodules-lxd 2021-06-05 01:27:27 +02:00
talyz 59e0120aa5
treewide: Fix mysql alias deprecation breakage
62733b37b4 broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.
2021-06-04 21:42:08 +02:00
Kim Lindberger 8960c09eed
Merge pull request #125500 from etu/php-spring-release-cleaning
php: post-release spring cleaning and upgrade to 8.0 as default
2021-06-04 17:48:47 +02:00
Robin Gloster 5433abfd6d
Merge pull request #125483 from Ma27/prometheus-exporter-fixes
nixos/prometheus-exporters: improve docs & fix rspamd exporter
2021-06-04 09:10:34 -05:00
Sandro 29bcf05da7
Merge pull request #125537 from andersk/release-notes-gnome 2021-06-04 11:13:14 +02:00
Luke Granger-Brown 39e225b0f4 nixos/engelsystem: don't rely on mysql alias
Since 3edde6562e, we can no longer use
aliases inside the test framework. This has the implication that we can
no longer use aliases in any NixOS modules used by the test framework as
well (which is good), but does mean we need to clean up any instances
where this is the case.
2021-06-04 08:43:48 +00:00
Maximilian Bosch 951e6988ac
Merge pull request #104543 from chkno/sftpServerExecutable
nixos/sshd: Option to set the sftp server executable
2021-06-04 10:16:20 +02:00
Elis Hirwing c76bebc549
unit: Add php80 and use it as default 2021-06-04 09:27:07 +02:00
Elis Hirwing d0bc04ff70
php: Upgrade from PHP 7.4 to 8.0 as default PHP 2021-06-04 09:27:00 +02:00
Elis Hirwing 68eb5305ac
php: Drop PHP 7.3 support
PHP 7.3 won't be supported by upstream for the entire life cycle of
the 21.11 release.

Also drop the pcre' alias since it isn't needed anymore since we don't
need different pcre versions anymore.
2021-06-04 09:26:54 +02:00
Eelco Dolstra c0a9458083
Merge pull request #125535 from edolstra/no-show-trace
nixos-rebuild --fast: Don't imply --show-trace
2021-06-04 07:28:55 +02:00
Ryan Mulligan 591105e838 nixos/doc: convert abstractions section to CommonMark 2021-06-03 20:28:55 -07:00
Kim Lindberger bd1630ed0a
Merge pull request #121145 from talyz/geoipupdate
nixos/geoipupdate: Replace the old `geoip-updater` module
2021-06-03 21:13:45 +02:00
talyz f5f8341c76
nixos/geoipupdate: Replace the old geoip-updater module
Our old bespoke GeoIP updater doesn't seem to be working
anymore. Instead of trying to fix it, replace it with the official
updater from MaxMind.
2021-06-03 20:57:25 +02:00
Martin Weinelt 64f1254248
Merge pull request #125532 from petabyteboy/feature/snapcast-0-25 2021-06-03 20:41:53 +02:00
Martin Weinelt 6d27068d7c
nixos/tests/snapcast: minor polish to make the tests more expressive 2021-06-03 20:29:02 +02:00
Frederik Rietdijk 3edde6562e make-test-python: disallow aliases
When importing Nixpkgs within Nixpkgs, we should not consider aliases
to ensure we don't rely on them internally.

There are probably more places that need to be converted.
2021-06-03 11:03:31 -07:00
Michael Weiss 049bbd281b
Merge pull request #124582 from primeos/nixos-tests-sway-tested
release-combined.tested: Add the Sway test
2021-06-03 20:02:19 +02:00
Bjørn Forsman 4bcb22e17a nixos/jenkins-job-builder: add support for folder jobs
Add support for folder jobs
(https://plugins.jenkins.io/cloudbees-folder/) by reworking the service
to support nested jobs.

This also fixes this deprecation warning (as a happy side effect):

  WARNING:jenkins_jobs.cli.subcommand.test:(Deprecated) The default output behavior of `jenkins-jobs test` when given the --output flag will change in JJB 3.0. Instead of writing jobs to OUTPUT/jobname; they will be written to OUTPUT/jobname/config.xml. The new behavior can be enabled by the passing `--config-xml` parameter
2021-06-03 19:29:57 +02:00
Anders Kaseorg a681951902 nixos/release-notes: Fix link to GNOME 40 release notes
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-06-03 10:14:06 -07:00
Eelco Dolstra 4cffb1212a nixos-rebuild --fast: Don't imply --show-trace
There is no logical reason for --fast to imply --show-trace, and this
seems to be a historical accident. Using --show-trace by default is
bad UX since it can give very long error messages (e.g. 550 lines for
a non-existent attribute in environment.systemPackages).
2021-06-03 19:01:09 +02:00
Maximilian Bosch ba9768f314
nixos/mail-exporter: add note about rspamd marking probe mails as spam 2021-06-03 13:10:23 +02:00
Maximilian Bosch 6fb847c556
nixos/dovecot-exporter: fix documentation for old stats 2021-06-03 13:01:11 +02:00
Maximilian Bosch 976d668e5c
nixos/rspamd-exporter: fix metrics
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0
2021-06-03 12:37:48 +02:00
Domen Kožar f88be6e55c
Merge pull request #125372 from Synthetica9/shell_interact
nixos/tests/test-driver: add shell_interact
2021-06-03 11:46:01 +02:00
Patrick Hilhorst fd739c4dee
nixos/tests/test-driver: make it clear when shell is ready
Co-authored-by: Domen Kožar <domen@enlambda.com>
2021-06-03 11:20:26 +02:00
Linus Heckemann 19cd7343fd
Merge pull request #125331 from wentasah/fix-mailman-serivce
nixos/mailman: Fix mailman-settings.service configuration
2021-06-03 10:34:45 +02:00
zowoq 3cf17240f0 Revert "nixos/containers: add storage.conf"
This file requires some defaults to be set otherwise podman, etc errors.
It also broke the podman nixos tests.

This reverts commit 7a4de9a983.
2021-06-03 13:56:17 +10:00
Jonathan Ringer 0520141db0 nixos/release-notes: Improve 21.11 stub 2021-06-02 12:18:34 -07:00
Patrick Hilhorst 2871442731
nixos/tests/test-driver: mention drawback 2021-06-02 14:58:51 +02:00
Patrick Hilhorst 9469433e34
nixos/tests/test-driver: document shell_interact 2021-06-02 14:49:59 +02:00
Patrick Hilhorst 5a589b5ba8
nixos/tests/test-driver: add shell_interact 2021-06-02 14:20:04 +02:00
Maximilian Bosch cc88797ce0 plausible: minor polishing 2021-06-02 19:21:31 +09:00
Maximilian Bosch 6bc72cdd4a plausiblew: cleanup build & update script 2021-06-02 19:21:31 +09:00
Maximilian Bosch 02b15d0f5b plausible: first review fix iteration
* Most significant is probably the patching necessary to run plausible
  with postgres without superuser privilege. This change includes:
  * updating ecto_sql to 3.6 where `CREATE DATABASE` is only executed if
    it doesn't exist[1].
  * patching a migration to only modify the `users.email` column (to use
    `citext` rather than creating the extension. `plausible-postgres`
    takes care of that).
* Correctly declare dependencies in systemd.
* A few minor fixes.

[1] 051baf669e
2021-06-02 19:21:31 +09:00
Maximilian Bosch b06ea1146c plausible: init at 1.3.0 2021-06-02 19:21:31 +09:00
Edward Tjörnhammar 7a4de9a983 nixos/containers: add storage.conf 2021-06-02 19:03:53 +10:00
Michal Sojka 2a4755e1d4 nixos/mailman: Fix mailman-settings.service configuration
Without this change, mailman-settings.service is not guaranteed to
complete before dependent services. This can lead to various errors
like:

    mailman-web-setup.service: Changing to the requested working directory failed: No such file or directory
2021-06-02 08:20:08 +02:00
Robert Hensing d9e4512443
Merge pull request #124589 from hercules-ci/containers-dnsname
nixos/podman-dnsname: init
2021-06-02 08:18:48 +02:00
Kira Bruneau caac437b9b nixos/gamemode: add module 2021-06-01 21:03:34 -04:00
rnhmjoj 030a521adc
nixos/wireless: make wireless.interfaces mandatory
This is the only way to solve issue #101963, for now.
2021-06-01 23:19:40 +02:00
Jörg Thalheim 79ef19e02b
Merge pull request #125169 from Mic92/containerd-zfs
nixos/containerd: improve zfs support
2021-06-01 20:43:11 +02:00
Jörg Thalheim f2e4cb7f20
nixos/containerd: improve zfs support 2021-06-01 20:41:42 +02:00
Jan Tojnar ab0d28758e
Merge pull request #125180 from chpatrick/gnome-flashback-panel-modules
gnome-flashback: add module support to gnome-panel for installing applets
2021-06-01 19:34:36 +02:00
Sandro 8217ea5000
changelog: fix typo 2021-06-01 15:45:47 +02:00
Sandro 44327ab7dc
Merge pull request #124991 from ju1m/apparmor 2021-06-01 15:26:30 +02:00
Patrick Chilton 6bcd4fe4ef gnome-flashback: add module support to gnome-panel for installing applets
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2021-06-01 14:04:30 +02:00
Jörg Thalheim 846f44e880
Merge pull request #121667 from Mic92/buildkite
nixos/buildkite-agents: fix race-condition when installing secrets
2021-06-01 09:31:23 +02:00
Jörg Thalheim 049dc4c452
Merge pull request #125121 from ztzg/x-16304-sd-image-slack
nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack
2021-06-01 06:54:22 +02:00
Jonathan Ringer 40b2ca3570 nixos/doc/releases: update stable release info to 21.05 2021-05-31 19:42:40 -07:00
Jonathan Ringer 8815e601dd nixos/release-notes: move non-highlights to other mentions 2021-05-31 19:22:35 -07:00
Jonathan Ringer d823c24094 nixos/release-notes: Initial grooming of release notes 2021-05-31 19:22:35 -07:00
Martin Weinelt e09bfc5d1c
Merge pull request #124950 from vincentbernat/fix/acme-no-reuse-key
nixos/acme: don't use --reuse-key
2021-06-01 00:59:09 +02:00
Vincent Bernat 632c8e1d54
nixos/acme: don't use --reuse-key
Reusing the same private/public key on renewal has two issues:

 - some providers don't accept to sign the same public key
   again (Buypass Go SSL)

 - keeping the same private key forever partly defeats the purpose of
   renewing the certificate often

Therefore, let's remove this option. People wanting to keep the same
key can set extraLegoRenewFlags to `[ --reuse-key ]` to keep the
previous behavior. Alternatively, we could put this as an option whose
default value is true.
2021-06-01 00:43:45 +02:00
Damien Diederen 7c2adb1d5c nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack
The root filesystem resizing step, `resize2fs -M', does not provide any
control over the amount of slack left in the result.  It can produce an
arbitrarily tight fit, depending on how well the payload aligns with
ext4 data structures.

This is problematic, as NixOS must create a few files and directories
during its first boot, before the root is enlarged to match the size of
the containing SD card.

An overly tight fit can cause failures in the first stage:

    mkdir: can't create directory '/mnt-root/proc': No space left on device

or in the second stage:

    install: cannot create directory '/var': No space left on device

A previous version of `make-ext4-fs' (before PR #79368) was explicitly
"reserving" 16 MiB of free space in the final filesystem.  Manually
calculating the size of an ext4 filesystem is a perilous endeavor,
however, and the method it employed was apparently unreliable.

Reverting is consequently not a good option.

A solution would be to create some sort of "balloon" occupying inodes
and blocks in the image prior to invoking `resize2fs -M', and to remove
these temporary files/directories before the compression step.

This changeset takes the simpler approach of simply dropping the
resizing step.

Note that this does *not* result in a larger image in general, as the
current procedure does not truncate the `.img' file anyway.  In fact, it
has been observed to yield *smaller* compressed images---probably
because of some "noise" left after resizing.  E.g., before-vs-after:

    -r--r--r-- 2 root root 607M  1. Jan 1970  nixos-sd-image-21.11pre-git-x86_64-linux.img.zst

    -r--r--r-- 2 root root 606M  1. Jan 1970  nixos-sd-image-21.11pre-git-x86_64-linux.img.zst
2021-05-31 21:35:51 +02:00
Maciej Krüger ef555f6a0b
Merge pull request #123426 from mattchrist/brscan5 2021-05-31 17:52:16 +02:00
zowoq 72f54c32a6 nixos/podman-network-socket-ghostunnel: move condition to include socket 2021-05-31 23:38:31 +10:00
Robert Hensing 54f2f1e5f1 nixos/podman-dnsname: init 2021-05-31 14:31:09 +02:00
Robert Hensing d81631fb98 nixos/podman: Add defaultNetwork.extraPlugins 2021-05-31 14:31:09 +02:00
Robert Hensing efba949352 nixos/containers: Add virtualisation.containers.containersConf.cniPlugins 2021-05-31 14:29:57 +02:00
Robert Hensing 3600a82711
Merge pull request #124921 from zowoq/podman-cni-conf
podman: install cni config
2021-05-31 14:27:10 +02:00
Robert Hensing 5699d027ec nixos/metricbeat: init 2021-05-31 10:42:08 +02:00
Julien Moutinho 61654ca131 nixos/pam: use new plasma5Packages, fixes #124973 2021-05-30 21:44:25 +02:00
Andreas Rammhold 614c0b2bf3
Merge pull request #124979 from jojosch/trilium-bool
nixos/trilium: use boolToString for noBackup
2021-05-30 18:40:54 +02:00
Andreas Rammhold fcbfb5037b
Merge pull request #124972 from andir/nixos-test-driver-timeout-error
nixos/test-driver: mention the elapsed time when it times out
2021-05-30 18:30:12 +02:00
Johannes Schleifenbaum 878103ce55
nixos/trilium: use boolToString for noBackup 2021-05-30 18:16:13 +02:00
Andreas Rammhold d07f52bf81
nixos/test-driver: mention the elapsed time when it times out
For now you had to know that the actions are retried for 900s when
seeing an error like

> Traceback (most recent call last):
>   File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 927, in run_tests
>     exec(tests, globals())
>   File "<string>", line 1, in <module>
>   File "<string>", line 31, in <module>
>   File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 565, in wait_for_file
>     retry(check_file)
>   File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 142, in retry
>     raise Exception("action timed out")
> Exception: action timed out

in your (hydra) build failure. Due to the absence of timestamps you were
left guessing if the machine was just slow, someone passed a low timeout
value (which they couldn't until now) or whatever might have happened.

By making this error a bit more descriptive (by including the elapsed
time) these hopefully become more useful.
2021-05-30 17:26:13 +02:00
Martin Weinelt 219d8381bd
Merge pull request #124947 from helsinki-systems/fix/libvirtd-ethertypes 2021-05-30 16:52:46 +02:00
Janne Heß 964fc7cfef
Update nixos/modules/virtualisation/libvirtd.nix
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2021-05-30 16:00:50 +02:00
Janne Heß 2eeecef3fc
nixos/libvirtd: Take ethertypes from iptables-nftables-compat
iptables is currently defined in `all-packages.nix` to be
iptables-compat. That package does however not contain `ethertypes`.
Only `iptables-nftables-compat` contains this file so the symlink
dangles.
2021-05-30 11:55:19 +02:00
Robert Hensing db31d8354d podman: Add iproute2, fixing docker network rm 2021-05-30 11:23:25 +02:00
Robert Hensing b6570e7238 nixos/podman-network-socket-ghostunnel: init 2021-05-30 11:23:24 +02:00
Robert Hensing 52844efcd6 nixos/podman: Add generic networkSocket interface 2021-05-30 11:21:05 +02:00
Robert Hensing ff4d83a667 nixos/podman: Add dockerSocket.enable 2021-05-30 11:21:05 +02:00
Robert Hensing fb8b0a3843 nixos/podman: Change podman socket to new podman group 2021-05-30 11:21:05 +02:00
zowoq 30ae7e4ba9 nixos/podman: install cni config from package 2021-05-30 11:40:36 +10:00
markuskowa f188138af3
Merge pull request #124181 from pmenke-de/sdrplay
sdrplay: init at 3.07.1
2021-05-29 22:21:10 +02:00
Martin Weinelt ee8cf6a664
Merge pull request #124839 from mweinelt/wordpress/secret-key-regen
nixos/wordpress: regenerate secret keys if misspelled key name is found
2021-05-29 22:13:03 +02:00
Martin Weinelt 724ed08df0
nixos/wordpress: regenerate secret keys if misspelled key name is found
A secret key generated by the nixos module was misspelled, which could
possibly impact the security of session cookies.

To recover from this situation we will wipe all security keys that were
previously generated by the NixOS module, when the misspelled one is
found. This will result in all session cookies being invalidated. This
is confirmed by the wordpress documentation:

> You can change these at any point in time to invalidate all existing
> cookies. This does mean that all users will have to login again.

https://wordpress.org/support/article/editing-wp-config-php/#security-keys

Meanwhile this issue shouldn't be too grave, since the salting function
of wordpress will rely on the concatenation of both the user-provided
and automatically generated values, that are stored in the database.

> Secret keys are located in two places: in the database and in the
> wp-config.php file. The secret key in the database is randomly
> generated and will be appended to the secret keys in wp-config.php.

https://developer.wordpress.org/reference/functions/wp_salt/

Fixes: 2adb03fdae ("nixos/wordpress:
generate secrets locally")

Reported-by: Moritz Hedtke <Moritz.Hedtke@t-online.de>
2021-05-29 04:24:42 +02:00
Matt Christ dd54ac5648 brscan5: simplify mkEnableOption 2021-05-28 20:55:55 -05:00
Dominik Xaver Hörl b7630d5591 rl-2105: mention linux_latest and potential zfs issues 2021-05-28 18:10:43 -07:00
Niklas Hambüchen d344dccf3d nixos/wireguard: Remove .path systemd unit for privkey. Fixes #123203
As per `man systemd.path`:

> When a service unit triggered by a path unit terminates
> (regardless whether it exited successfully or failed),
> monitored paths are checked immediately again,
> **and the service accordingly restarted instantly**.

Thus the existence of the path unit made it impossible to stop the
wireguard service using e.g.

    systemctl stop wireguard-wg0.service

Systemd path units are not intended for program inputs such
as private key files.
This commit simply removes this usage; the private key is still
generated by the `generateKeyServiceUnit`.
2021-05-28 17:44:19 -07:00
talyz cb80b67993 nixos/discourse: Assert deployed PostgreSQL version
Assert that the PostgreSQL version being deployed is the one used
upstream. Allow the user to override this assertion, since it's not
always possible or preferable to use the recommended one.
2021-05-28 17:43:02 -07:00
talyz 1f6b48be74 discourse: 2.6.5 -> 2.7.0 2021-05-28 17:43:02 -07:00
Antoine R. Dumont (@ardumont) 38cfb84ff0 mediatomb/gerbera: Add release note information for 21.03
Note that it made into 2 entries, one about new options in the first section.
Another in the breaking compatibility section due to the openFirewall option
which changes the behavior.

Co-authored-by: schmittlauch <t.schmittlauch+nixos@orlives.de>
2021-05-28 10:56:19 -07:00
pmenke 9e0ed182aa
sdrplay: init at 3.07.1
this adds support for software defined radio (SDR) devices by SDRplay.
SDRplay provides an unfree binary library and api-service as well
as a MIT licensed adapter library for SoapySDR for integration
with many popular SDR applications.
2021-05-28 15:40:04 +02:00
Jan Tojnar b2f86e6662
nixos/gnome: Do not enable metacity by default
Did not realize this is not conditional on gnome-flashback being enabled.

Partially reverts https://github.com/NixOS/nixpkgs/pull/113957
2021-05-28 14:57:36 +02:00