Commit Graph

21853 Commits

Author SHA1 Message Date
Kim Lindberger 5fd730e210
Merge pull request #128823 from NixOS/backport-127931-to-release-21.05
[Backport release-21.05] discourse: Fix plugin support
2021-07-15 14:50:11 +02:00
Yureka d36cd9e039 nixos/gitlab: improve psql assertion message
(cherry picked from commit c5a0551dc49b287d12d043298f9b7a4c8c355885)
2021-07-13 15:27:21 +02:00
Yureka 7b1021ce28 nixos/tests/gitlab: use postgresql 13
Since 21.05 still defaults to 11, we need to set this (as does every
user).
2021-07-13 15:27:21 +02:00
Yureka e4deb36262 nixos/gitlab: require at least postgresql 12
(cherry picked from commit 2297eb35e5b92f657b85dfe4ee535e2323e360c1)
2021-07-13 15:27:21 +02:00
Maximilian Bosch f8b79de69e
nextcloud22: init at 22.0.0
Simplified, non-breaking version of e05f4101c16f08058a14ac4335886567e1ffe987.
2021-07-12 23:27:57 +02:00
github-actions[bot] 6500937b9b
Merge release-21.05 into staging-next-21.05 2021-07-10 12:02:59 +00:00
Jörg Thalheim 54db964a8b
Merge pull request #125159 from NixOS/backport-125121-to-release-21.05
[Backport release-21.05] nixos/lib/make-ext4-fs: Fix: `resize2fs -M' can leave insufficient slack
2021-07-10 09:28:17 +01:00
github-actions[bot] 9b0fff08dc
Merge release-21.05 into staging-next-21.05 2021-07-10 00:02:34 +00:00
illustris 8b5fcedfc9 nixos/jitsi-meet: update nixos tests
- remove check for `connected .JID: focus@auth.server` because
	- log format was changed in c1945ea6cb
	- connection.getUser() in jicofo also appears to be broken, returning null instead of username
	- testing for this log line shouldn't be necessary, as we also test for "Authenticated as focus@auth.server"

- remove check for `External component successfully authenticated` because
	- [JVB no longer uses component](https://community.jitsi.org/t/jvb-not-connecting/91157/2)

- increase VM memory

(cherry picked from commit 85aa4bf92b34a4774f7443a87ab3524bfd152002)
2021-07-10 00:02:59 +02:00
illustris fa8a6d7e0a nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths
(cherry picked from commit e0089c38ca2f9f2b9a46ffcf74a9908f53d51459)
2021-07-10 00:02:59 +02:00
illustris 27d38294c6 nixos/jitsi-meet: Update jitsi prosody configs
Changes made as per b6f7f8fba7

(cherry picked from commit 34b9ba2e6161e68febe4312c96c089d707472d5e)
2021-07-10 00:02:59 +02:00
Anderson Torres 5436a1fd65
Merge pull request #128459 from Ma27/backport-sway
[21.05] sway: 1.6 -> 1.6.1, wlroots: 0.13.0 -> 0.14.0
2021-07-08 11:30:06 -03:00
Lara b7853679fc nixos/doc: Fix synopsis for nixos-rebuild(8)
(cherry picked from commit 22a78740241d8c35bf8c43c4731bc5b84386b5ea)
2021-07-08 04:48:04 +00:00
Robert Hensing 809cc5bf28 nixos/postgresqlBackup: Only replace backup when successful
Previously, a failed backup would always overwrite ${db}.sql.gz,
because the bash `>` redirect truncates the file; even if the
backup was going to fail.
On the next run, the ${db}.prev.sql.gz backup would be
overwritten by the bad ${db}.sql.gz.

Now, if the backup fails, the ${db}.in-progress.sql.gz is in an
unknown state, but ${db}.sql.gz will not be written.
On the next run, ${db}.prev.sql.gz (our only good backup) will
not be overwritten because ${db}.sql.gz does not exist.

(cherry picked from commit 81c8189a841728a813bcde8604b80427fcf33522)
2021-07-07 23:45:22 +00:00
Robert Hensing 44c232bbeb nixos/postgresqlBackup: Use PATH for readability
(cherry picked from commit c586e42763e0f093d16b4b655759cb340171ad42)
2021-07-07 23:45:22 +00:00
Bruno Bigras 97554dd958
yggdrasil: 0.3.16 -> 0.4.0 (#129326)
The global yggdrasil network had a breaking protocol change

(cherry picked from commit 7265334f1ab7726e8cbda4670e77c31b42fb5665)
2021-07-07 13:22:28 -04:00
Bjørn Forsman 688f6ec8d7 nixos/hamster: fix programs.hamster.enable text
mkEnableOption already adds "Whether to enable" and ends with a ".", so
remove that duplication from the help text.

Also reword it slightly while at it.

(cherry picked from commit 5d3dca497ba7d20c662e8144c0bedb69433a9e4a)
2021-07-05 14:32:16 +02:00
Aaron Andersen 806c01c9f9
Merge pull request #128840 from NixOS/backport-126284-to-release-21.05
[Backport release-21.05] zabbixAgent: add bash to $PATH
2021-07-03 15:12:06 -04:00
Jörg Thalheim 9143023abb
Merge pull request #129159 from NixOS/backport-129155-to-release-21.05
[Backport release-21.05] doc: point out that nixos-21.05 has gnuradio 3.9
2021-07-03 18:58:39 +01:00
Bjørn Forsman 5ca9576f49 doc: point out that nixos-21.05 has gnuradio 3.9
Logically re-apply 64c70a8c4c ("doc: point out that nixos-21.05 has gnuradio
3.9"), because it was lost in the conversion from docbook to markdown, in
commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)").

(Apparently we have both .md and .xml release notes now, and CI fails
unless they have the same content (after .md processing), so update the
.xml file to match...)

(cherry picked from commit cfe8c3a75eaa427f48bc93b15c65b826c00d7401)
2021-07-03 17:44:27 +00:00
Bjørn Forsman 950142c900 doc: fix link to kodi-19.0 announcement
Logically re-apply 7afaacf9a8 ("doc: fix link to kodi-19.0 announcement"),
because it was lost in the conversion from docbook to markdown, in commit
32c2dd304d ("docs: nixos release notes to CommonMark (2105)").

(Hm, apparently we have *both* docbook and markdown? CI failed before I
updated the .xml file.)

(cherry picked from commit c2a3ff28be9712b598d84cdc94a7894ca59c772c)
2021-07-03 17:44:02 +00:00
Luke Granger-Brown 917357a287 nixos/tests/kernel-generic: fix evaluation
This is breaking the tarball build, because #128502 depends on this test
existing. After this commit, nixpkgs.tarball once again evaluates.

(cherry picked from commit 0dccbe2729efbaee995605bff8de3c83ca61860f)
2021-07-02 13:50:19 -07:00
Jonathan Ringer acc107f4be nixos/test/vault: fix assertion logic
"vault status" now returns exit code 2 when the
vault is still unsealed.

(cherry picked from commit 7737a0fc9c890bca80cd42d898f04edf6bf8f850)
2021-07-01 08:40:14 -07:00
Aaron Andersen 0315b6a3c7 zabbixAgent: add bash to $PATH
(cherry picked from commit a0a11fd22c5786aa7c0f025115506c6a83221951)
2021-07-01 03:11:24 +00:00
talyz 3b84448e67 discourse: Fix plugin support
For plugins to work properly, their assets need to be precompiled
along with the rest of Discourse's assets. This means we need to build
new packages when the list of plugins change.

(cherry picked from commit 9af3672f4faaafba0ce0129a87fc7925c14eeb61)
2021-06-30 22:07:25 +00:00
Dima 892a6d4ce6 nixos/duplicity: fix typo in subcommand
In https://github.com/NixOS/nixpkgs/pull/120622 cleanup options were
added, but `remove-all-inc-of-but-n-full` was misspelled and as such
was not functioning.

(cherry picked from commit 0a977cf125a86b5580de6e05bfeaa07aa54c4a78)
2021-06-27 16:38:12 +00:00
Niklas Hambüchen df8bcca5fb
Merge pull request #128161 from NixOS/backport-128150-to-release-21.05
[Backport release-21.05] etcd: refactor the service to add etcd to systemPackages instead of the etcdctl alias
2021-06-27 14:28:07 +02:00
Michael Weiss a563a3c2d1
sway: 1.6 -> 1.6.1
Since wlroots 0.14 setting WLR_RENDERER_ALLOW_SOFTWARE=1 to allow
software rendering is now enforced [0].

[0]: https://github.com/swaywm/wlroots/pull/2810

(cherry picked from commit 73d7f08b4d89b1af213db5db34e6f39518d88634)
2021-06-26 13:46:17 +02:00
Alexandru Scvortov 733b7eedff etcd: fix old aliased package name to make tests pass
(cherry picked from commit e08b3f0c8580d1944c1e5a64d44b965c1499ddda)
2021-06-26 01:36:30 +00:00
Florian Klink f4b92c2975 nixos/getty: add missing --keep-baud
systemd ships `units/serial-getty@.service.m4` with the `--keep-baud`
option.

We override that unit, and didn't add the `--keep-baud` option. (We have
it in our other getty options there).

Having `--keep-baud` in `serial-getty@` makes a lot of sense - the
console keeps working if it's initialized with a less standard baud
rate, such as the [Helios64](https://wiki.kobol.io/helios64/intro/).

(cherry picked from commit ba42d639f16dc774f4fa661243b640b034d7be0a)
2021-06-25 23:32:04 +02:00
Florian Klink e453a9ed9b nixos/sdcard: make firmware partition offset configurable
Different boards using u-boot SPL require to write to different
locations. Sometimes, the 8MiB gap isn't sufficient - rk3399 boards
write to 0x16384 for example, which is at 8MiB, thus overriding the
fat32 partition with the SPL.

(cherry picked from commit 1db54a5522a2d523e406ce8713bfe88bb9e3f657)
2021-06-25 20:55:28 +00:00
David Arnold 8f89e4b6a1 docs: nixos release notes to CommonMark (2105)
docs: nixos release notes (revise code blocks)

docs: nixos release notes (fix opt links outside of code blocks)

docs: nixos release notes (fix opt links inside of code blocks)

went fishing with:

```console
rg -A1 \
   --multiline \
   --multiline-dotall \
   '<programlisting>[^</programlisting>]+' \
| rg linkend
```

docs: nixos release notes (prettier)

docs: nixos release notes (restore admonition from prettier destriction)

docs: nixos release notes (recreate xml files)

docs: nixos release notes (fix code block indentation)

docs: nixos release notes (diff after converting with https://github.com/NixOS/nixpkgs/pull/127270)
(cherry picked from commit 32c2dd304d5e1b2a48a0772f906d0cc86332992e)
2021-06-23 10:56:48 -07:00
David Arnold 1fd5950faa nixosTest: Force system.nixos.revision constant
nixos tests are blended with other system configurations, hence
their settings must be either enforced or defaulted.

This particular setting is set via lib.nixosSystem as
`system.nixos.revision = final.mkIf (self ? rev) self.rev;` which would
mean that without this change no flake generated nixos could be blended
with nixos testing.

This setting was made previously constant in
169c6b4b14 in order to avoid pointless
rebuilds of the testing VMs, but was set without enforcing it.

(cherry picked from commit 8bbdff45816c657f679cd77c0a0dbca534a85bf3)
2021-06-21 20:41:47 +00:00
Bjørn Forsman d99688bba4 doc: point out that nixos-21.05 has gnuradio 3.9
Reading the release notes I got the impression that the latest (and
default) was GR3.8, but it is in fact 3.9. Make that more obvioius.

(cherry picked from commit c789c53ce55d26d4963b48cb109fd3f02838fa11)
2021-06-21 10:24:50 +02:00
Bjørn Forsman c40c611ff9 doc: fix link to kodi-19.0 announcement
(cherry picked from commit 14c8246c0c69e3cf48d332ede319238ec36247ed)
2021-06-20 20:10:29 +02:00
talyz d726b9c204 nixos/fail2ban: Remove `reloadIfChanged = true`
This makes the service fail when upgrading the package, so let's
properly restart it instead.

(cherry picked from commit b4c069b1476a92a540e906ef95cd7fb380d29c63)
2021-06-20 16:01:18 +00:00
Mewp 38088e7229 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.

(cherry picked from commit b00bcf21abc392ecb1d93bd49f7a5ffbc8524ecf)
2021-06-16 22:03:03 +00:00
Martin Weinelt 6ee61426da nixos/solanum: implement reload and allow config changes
Reload only works with a static configuration path as there is no way to
pass the dynamically generated config path to a running solanum
instance, therefore we symlink the configuration to
/etc/solanum/ircd.conf.

But that will prevent reloads of the ircd, because the systemd unit
wouldn't change when the configuration changes. That is why we add the
actual location of the config file to restartTriggers and enable
reloadIfChanged, so changes will not restart, but reload on changes.

(cherry picked from commit 60c62214f5a3c7db6aa30d8a8e02c863b6abcf0a)
2021-06-16 02:09:04 +02:00
lassulus 0a8684cadd solanum: remove obsolete BANDB settings/patches
(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80)
2021-06-16 02:09:00 +02:00
Christine Dodrill f5c9fcff45 solanum: fix MOTD
Previously this defaulted to the default MOTD in the solanum source
tree, and I don't want my friends to laugh at me. Includes a patch to
the tests to ensure that the MOTD is actually set.

This replicates the fix done in #109705 (solanum is a fork of charybdis,
so they share fundamental logic for this).

Signed-off-by: Christine Dodrill <me@christine.website>
(cherry picked from commit b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8)
2021-06-15 22:54:15 +00:00
Robert Hensing 91d03cd360 nixos/ssh: Document authorizedKeysFiles properly
(cherry picked from commit dab747106e20268e6d3a7c1a758185bc75507bef)
2021-06-15 19:42:28 +00:00
Robert Hensing 89ecb51a6a nixos/ssh: Add an example of verbatim keys
This confused someone on SO.

(cherry picked from commit 8352cc9a23a5fea11d467a5b8341b24cd162c62a)
2021-06-15 19:42:27 +00:00
Domen Kožar 57606ed0af
Merge pull request #126605 from NixOS/backport-125311-to-release-21.05
[Backport release-21.05] pipewire: 0.3.27 -> 0.3.30
2021-06-15 18:44:16 +02:00
talyz d3d1674b3f gitlab: Make sure the FOSS version isn't identified as EE
(cherry picked from commit 8f16b1629155ad0022bb7830739081532d1bae50)
2021-06-15 15:16:10 +00:00
Vladimír Čunát 6d286be97a
Merge branch 'release-21.05' into staging-next-21.05
This brings not that many rebuilds but still some.
2021-06-12 07:21:42 +02:00
Bjørn Forsman 0d417a343c nixos/jenkins: test declarative jobs
(cherry picked from commit a655b712015f1a37466371234620b8958887e9bf)
2021-06-11 23:08:41 +02:00
Bjørn Forsman a0fc6a7861 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

(cherry picked from commit 4bcb22e17aa8677c6b3fc4625732d4da791a576f)
2021-06-11 23:08:41 +02:00
Jan Solanti c2628780fc pipewire: 0.3.27 -> 0.3.30
(cherry picked from commit c702cc43213dce2573adb924ab9c67522616aea6)
2021-06-11 14:52:30 +00:00
Maximilian Bosch 1ccfdad225
Merge pull request #126239 from NixOS/backport-125469-to-release-21.05
[Backport release-21.05] Kernels 2021-06-03
2021-06-09 15:14:32 +02:00
Martin Weinelt e9434d6728 nixos/tests/custom-ca: disable firefox test integration
Firefox has been decoupled from the system certificate store since the
nss p11-kit integration in combination with our cacert package does not
expose CKA_NSS_MOZILLA_CA_POLICY, which among other things is required
for addon updates.

(cherry picked from commit 2d4ed9bae6f9c80d75cf5ef18ccdac85cf889ff3)
2021-06-09 12:55:23 +00:00