Commit Graph

21878 Commits

Author SHA1 Message Date
Martin Weinelt 0c50198047 nixos/bird: fix bird/bird6 description
(cherry picked from commit d902365913fd65abc2d5d5298c2b9b0beda2f2ca)
2021-07-30 06:44:37 +00:00
Michael Francis 6526d0e5c3
Only include ipsecTools if using ipsec
(cherry picked from commit adc368d2fc7dd74beb8486ff72880ed0212abb0d)
2021-07-27 19:46:56 +02:00
Niklas Hambüchen 0a532d8b22
Merge pull request #128818 from NixOS/backport-128546-to-release-21.05
[Backport release-21.05] kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-07-27 16:18:00 +02:00
Michael Weiss 4e8d55ce61
nixos/tests/chromium: Drop the workaround for Chrome GPU crashes
This regression was fixed by 51d83077ffb.

(cherry picked from commit 4ec2b24603e6eb4a48272678c75d2518de4e2191)
2021-07-25 13:04:53 +02:00
Michael Weiss 6dbb8d5098
nixos/tests/chromium: Check the version and that it's an official build
This also prints and screenshots the output of chrome://version which
contains useful information.

Outputs (stable, beta, ungoogled, chrome-stable, chrome-beta, chrome-dev):
Chromium	92.0.4515.107 (Official Build) (64-bit)
Chromium        92.0.4515.107 (Official Build) (64-bit)
Chromium        91.0.4472.164 (Official Build, ungoogled-chromium) (64-bit)
Google Chrome   92.0.4515.107 (Official Build) (64-bit)
Google Chrome   92.0.4515.107 (Official Build) beta (64-bit)
Google Chrome   93.0.4577.8 (Official Build) dev (64-bit)

(cherry picked from commit 7b3c0545149cb5c67611945d6022b61047439d61)
2021-07-25 13:04:52 +02:00
Michael Weiss a04e7e7ee4
chromium: 91.0.4472.164 -> 92.0.4515.107
https://chromereleases.googleblog.com/2021/07/stable-channel-update-for-desktop_20.html

This update includes 35 security fixes.

CVEs:
CVE-2021-30565 CVE-2021-30566 CVE-2021-30567 CVE-2021-30568
CVE-2021-30569 CVE-2021-30571 CVE-2021-30572 CVE-2021-30573
CVE-2021-30574 CVE-2021-30575 CVE-2021-30576 CVE-2021-30577
CVE-2021-30578 CVE-2021-30579 CVE-2021-30580 CVE-2021-30581
CVE-2021-30582 CVE-2021-30583 CVE-2021-30584 CVE-2021-30585
CVE-2021-30586 CVE-2021-30587 CVE-2021-30588 CVE-2021-30589

Note: This won't be the smoothest update. Chromium seems to be fine but
requires gtk3 in $LD_LIBRARY_PATH to find libgtk-3.so.0 (otherwise it
crashes during startup) but Google Chrome fails to initialize
("GPU process exited unexpectedly: exit_code=132") and requires
"--use-gl=angle --use-angle=swiftshader" for hardware(?) acceleration
(which seems to work work fine and performant but SwiftShader should
actually use the CPU instead of the GPU).

(cherry picked from commit 97570d30c7f632e6ca25cf8e966d2a4b7e5aa546)
2021-07-25 13:04:11 +02:00
Michael Weiss 2eaf9b409a
chromium: Check the text rendering
This should catch regressions like #131074 in the future. In that case a
glibc update caused a regression that caused most of the text to become
invisible (just not the "Web Store" we've already been checking for).

(cherry picked from commit 11400dcd65ed95292d7ac7cb30912e15ec4cf8e1)
2021-07-25 11:37:57 +02:00
Michael Weiss 24599a5ba6
nixos/tests/chromium: Print the content of chrome://{sandbox,gpu}
This can be very useful when running the test headless or e.g. when
looking at Hydra logs. Especially the chrome://gpu content contains a
lot of interesting information.
I also decided to refactor the test_new_win() function to avoid
duplicate code and rely less on xdo.

(cherry picked from commit c33015a0c94777261ef054a3d7dacd53e744ceea)
2021-07-25 11:37:57 +02:00
Michael Weiss 90e44d2f1c
nixos/tests/chromium: Refactor launching the browser process
It should now be more flexible and less error-prone.

(cherry picked from commit 8c52061b1fce2036b70836e5dcdfcf4b702dd405)
2021-07-25 11:37:57 +02:00
Michael Weiss a20f9eb0ec
nixos/tests/chromium: Fix the test for M92+
Unfortunately there are some regressions in the GPU code that cause
Chromium and Google Chrome to crash, e.g.:
machine # [0709/084047.890436:ERROR:process_memory_range.cc(75)] read out of range[   30.153484] show_signal: 20 callbacks suppressed
machine # [   30.153490] traps: chrome[1036] trap invalid opcode ip:55af03357b29 sp:7ffeaa69ad10 error:0 in chrome[55aefe7a4000+81ec000]
machine #
machine # [0709/084047.955039:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq: No such file or directory (2)
machine # [0709/084047.955078:ERROR:file_io_posix.cc(144)] open /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq: No such file or directory (2)
machine # [   30.126905] systemd[1]: Created slice system-systemd\x2dcoredump.slice.
machine # [   30.137012] systemd[1]: Started Process Core Dump (PID 1038/UID 0).
machine # [   30.571987] systemd-coredump[1039]: Process 1036 (chrome) of user 1000 dumped core.
machine # [992:1021:0709/084048.501937:ERROR:gpu_process_host.cc(995)] GPU process exited unexpectedly: exit_code=132
machine # [   30.594747] systemd[1]: systemd-coredump@0-1038-0.service: Succeeded.

Hopefully this'll be fixed upstream before the final release (there are
bug reports for it) but for the meantime we have to launch the beta and
dev versions with "--use-gl=angle --use-angle=swiftshader".

(cherry picked from commit f9645002a2d8615fd608bfdef4f924481dca391e)
2021-07-25 11:37:56 +02:00
Luke Granger-Brown 17b1b28402
Merge pull request #130978 from NixOS/backport-124799-to-release-21.05
[Backport release-21.05] nixos/unbound: fix define-tag option
2021-07-25 10:14:27 +01:00
Maximilian Bosch e94b0c2a22 grocy: 3.0.1 -> 3.1.0
ChangeLog: https://github.com/grocy/grocy/releases/tag/v3.1.0
(cherry picked from commit 07b51f58df6042e0baaff5e10b0ca389f2cac1fe)
2021-07-23 15:57:43 +00:00
Valentin Conrad 6a09c14a33 nextcloud: remove expires header
nextcloud default nginx config did not include the expires config
see: https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html

(cherry picked from commit ceef268c4b8cca80bd8c9b73bc2b323be13e0970)
2021-07-23 10:33:24 +00:00
Timothy DeHerrera 6322c5baf7 zsh: include completions for nix-* commands
(cherry picked from commit 6dbf8c04097c8961bb1cb9cb319fee42eb19ab7a)
2021-07-22 14:29:13 +00:00
Timothy DeHerrera b16eb24c4d zsh: format module with nixpkgs-fmt
(cherry picked from commit 9ad645dce8e11a3ffcf27cd797abc99476c837f0)
2021-07-22 14:29:13 +00:00
Timothy DeHerrera a37709b232 zsh: remove conflicting nixUnstable completions
(cherry picked from commit d687fe88fdbb00b89f4e5b82824c7b187659d648)
2021-07-22 14:29:13 +00:00
Marc 'risson' Schmitt 49cd45c508 nixos/unbound: fix define-tag option
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
(cherry picked from commit 6b12cff0b5746af364066d1bcb2bc2563e978aa8)
2021-07-21 20:12:10 +00:00
Maximilian Bosch 5aefc30fb8
Merge pull request #130797 from NixOS/backport-130538-to-release-21.05
[Backport release-21.05] nixStable: 2.3.12 -> 2.3.14
2021-07-21 13:35:42 +02:00
Jan Tojnar 63ee5cd99a nixos/ddccontrol: init
(cherry picked from commit fc1e0e863c60dc9740304de36ffa883cbaddd760)
2021-07-20 22:32:07 -04:00
Maximilian Bosch 792c0160c6 nixStable: 2.3.12 -> 2.3.14
Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14

Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.

As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.

Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].

[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] 14262b86cc

(cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95)
2021-07-20 15:13:18 +00:00
Kim Lindberger 2fa8b636af
Merge pull request #130271 from NixOS/backport-129464-to-release-21.05
[Backport release-21.05] discourse: Updates and fixes
2021-07-19 08:26:30 +02:00
Robert Scott c6adf089e0
Merge pull request #129336 from NixOS/backport-129239-to-release-21.05
[Backport release-21.05] trafficserver: 9.0.1 -> 9.0.2
2021-07-17 13:35:26 +01:00
talyz 23c806f963 nixos/discourse: Update plugin documentation
Update the documentation regarding plugins to reflect recent changes.

(cherry picked from commit 20548f050e72a789ebbfe413b0fe7aa815e55c27)
2021-07-15 12:54:00 +00:00
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
Thomas Gerbet c57281c274 trafficserver: 9.0.1 -> 9.0.2
Fixes CVE-2021-32566 and CVE-2021-32567.

(cherry picked from commit d41e86c67ff65b898be3952bf66f803a121cd083)
2021-07-05 16:07:35 +00: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
Alexandru Scvortov 3ee32f0ea9 kubernetes: fix conntrack-tools package name, missing dir, and tests
(cherry picked from commit ab1567e8121dfcdb4f7a395b39a3a345f41c7474)
2021-06-30 21:26:24 +00:00