Commit Graph

21987 Commits

Author SHA1 Message Date
Kim Lindberger a1007637ce
Merge pull request #133624 from talyz/discourse-backports
[21.05] discourse: 2.7.5 -> 2.7.7, plugins and fixes
2021-08-19 15:27:08 +02:00
Wael M. Nasreddine dff77786cf config.hardware.onlykey: update the udev rules for onlykey
The udev rules were updated upstream without an explanation as you can
see in [this comment][commit].

[commit]: 0bcf928ada

(cherry picked from commit eab36fabf6168f8fdbb2b835ce3ab689b9902ab1)
2021-08-19 03:25:13 +00:00
Wael M. Nasreddine 6c50c69d97 config.hardware.onlykey: move the module into its own folder
(cherry picked from commit 1f9e0192603f335e2bf29e7bb2a67acd5c4cb3c9)
2021-08-19 03:25:13 +00:00
Vladimír Čunát 7bbca9877c
Merge #134298: linux_5_12: remove (into release-21.05) 2021-08-18 09:26:59 +02:00
talyz fd169abf9b
discourse.plugins: Make the updater able to package plugins
Let the update.py script handle the initial, repetitive task of
packaging new plugins. With this in place, the plugin only needs to be
added to the list in `update-plugins` and most of the work will be
done automatically when the script is run. Metadata still needs to be
filled in manually and some packages may of course require additional
work/patching.

(cherry picked from commit f8096460bd15d4f13a01cfddf0a30798921fdb42)
2021-08-17 23:16:41 +02:00
talyz 080e4e43fb
discourse.tests: Test the appropriate discourse package
Perform the tests on the package that the `tests` attribute is a child
of, i.e. if `discourseAllPlugins.tests` is built, the tests will run
with the `discourseAllPlugins` package, not the `discourse` package as
previously.

(cherry picked from commit 6fd5a40ccaf0b4da1362803a387bf46d381dd66a)
2021-08-17 23:16:18 +02:00
talyz 639e1d9639
discourse: Remove leftover link to unused plugins directory
(cherry picked from commit bb14315d51a1c35304dfd82ff5c1faeaaf2c450c)
2021-08-17 23:13:55 +02:00
Bjørn Forsman 991e12bfdb nixos: fix release notes about linux_latest version
It's version 5.13, not 5.12.

(cherry picked from commit a37965f7c5d26938774677e97b9f6c9e35bce701)
2021-08-17 07:12:42 +00:00
TredwellGit aa1af91878 linux_5_12: remove
https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/
(cherry picked from commit 957f0485dab604c493d7683b8a57c0679b19e35f)
2021-08-16 09:12:57 +00:00
Maxine Aubrey a657d429c9 nixos/traefik: wait for first success
possible fix for #115418

(cherry picked from commit 34add8ca5994dd594e1070ae93c0f503fd0661bc)
2021-08-14 13:11:54 +00:00
Artturi 7bd542a5e9
Merge pull request #133563 from NixOS/backport-133204-to-release-21.05
[Backport release-21.05] nixos/xserver: fix a display-manager race condition
2021-08-13 00:32:27 +03:00
Artturin 2fac4b6d00 nixos/gdm: disable the gdm services as it is redundant
and causes issues

(cherry picked from commit 47f6591706dcfb699b0e0d9f09a5a10648198d40)
2021-08-12 17:44:00 +00:00
Johannes Arnold 8404ac09e7 nixos/xserver: fix a display-manager race condition
(cherry picked from commit 358ab44a457aba9b227764742badbf1882028676)
2021-08-12 00:40:15 +00:00
Vladimír Čunát 5cd415124f nixos/tests: unbreak the tested job
I expect it suffices that the channel only blocks on one firefox ESR
test - the one for the default ESR.  I didn't want to have the
information about the default in two places, so either of the tests will
be evaluated twice (but to the same *.drv I hope).

(cherry picked from commit c0097aa84adb19a9e5d947487c118505faf98bc0)
2021-08-10 14:34:09 +00:00
Martin Weinelt 6c6d0f971f firefox-esr-91: init at 91.0esr
(cherry picked from commit d5f7fc95a9ec5798618d10fd04a3ef91aa08de76)
2021-08-10 14:54:58 +09:00
Martin Weinelt 23d5366206
Merge pull request #129436 from NixOS/backport-121750-to-release-21.05
[Backport release-21.05] nixos/acme: Ensure certs are always protected
2021-08-09 16:15:37 +02:00
Domen Kožar 8485c05212
Merge pull request #133116 from NixOS/pipewire-21.05-backport
Pipewire 21.05 backport: 0.3.30 -> 0.3.33
2021-08-08 23:15:18 +02:00
Ilan Joselevich 45ea565f6d pipewire: updated JSON configs
(cherry picked from commit a876500f5db7f7827c14d1d5b195186613c20a29)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 21:56:57 +02:00
Martin Weinelt e78cb53f25
Merge pull request #133000 from NixOS/backport-132735-to-release-21.05
[Backport release-21.05] nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
2021-08-08 14:36:00 +02:00
arcnmx 7be67825c8 nixos/pipewire: add bluez hardware database
(cherry picked from commit ef532a04436001249a7c24e13c628e970791dc7f)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 12:39:11 +02:00
arcnmx 4ef889251c pipewire: 0.3.30 -> 0.3.31
(cherry picked from commit eb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 12:38:52 +02:00
Jörg Thalheim 7174a61367
Merge pull request #130269 from NixOS/backport-125205-to-release-21.05
[Backport release-21.05] k3s: token file
2021-08-08 11:09:03 +01:00
Ivan Kozik b047dfa13d nixos/victoriametrics: set LimitNOFILE=1048576 to fix panic and restart loop
This fixes:

```
systemd[1]: Started VictoriaMetrics time series database.
victoria-metrics[379550]: 2021-08-04T19:33:39.833Z        panic        VictoriaMetrics/lib/storage/partition.go:954        FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": cannot open source part for merging: cannot open metaindex file in stream mode: cannot open file "/var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin": open /var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin: too many open files
victoria-metrics[379550]: panic: FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": cannot open source part for merging: cannot open metaindex file in stream mode: cannot open file "/var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin": open /var/lib/victoriametrics/data/small/2021_08/1228_1228_20210804184120.712_20210804184121.899_16982E83CD7A763A/metaindex.bin: too many open files
victoria-metrics[379550]: goroutine 629 [running]:
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logMessage(0xbb3ea1, 0x5, 0xc001113800, 0x1e7, 0x4)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:270 +0xc69
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logLevelSkipframes(0x1, 0xbb3ea1, 0x5, 0xbe3f8b, 0x4b, 0xc000bb3f88, 0x2, 0x2)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:138 +0xd1
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.logLevel(...)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:130
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/logger.Panicf(...)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/logger/logger.go:126
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).smallPartsMerger(0xc0014d7980)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:954 +0x145
victoria-metrics[379550]: github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).startMergeWorkers.func1(0xc0014d7980)
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:933 +0x2b
victoria-metrics[379550]: created by github.com/VictoriaMetrics/VictoriaMetrics/lib/storage.(*partition).startMergeWorkers
victoria-metrics[379550]:         github.com/VictoriaMetrics/VictoriaMetrics/lib/storage/partition.go:932 +0x6c
systemd[1]: victoriametrics.service: Main process exited, code=exited, status=2/INVALIDARGUMENT
systemd[1]: victoriametrics.service: Failed with result 'exit-code'.
systemd[1]: victoriametrics.service: Consumed 587ms CPU time, received 6.5K IP traffic, sent 1.7K IP traffic.
systemd[1]: victoriametrics.service: Scheduled restart job, restart counter is at 2064.
systemd[1]: Stopped VictoriaMetrics time series database.
systemd[1]: victoriametrics.service: Consumed 587ms CPU time, received 6.5K IP traffic, sent 1.7K IP traffic.
systemd[1]: Starting VictoriaMetrics time series database...
```

(cherry picked from commit fb6fbcb85cd0167c9759b82f16013777327c07e5)
2021-08-07 10:39:13 +00:00
Artturi a870b495c3
Merge pull request #128977 from NixOS/backport-128865-to-release-21.05 2021-08-07 00:17:26 +03:00
Artturi c46a7373e7
Merge pull request #129438 from NixOS/backport-126158-to-release-21.05
[Backport release-21.05] nixos/btrfs: handle new checksum types in initrd
2021-08-07 00:10:39 +03:00
Artturi 739b046784
Merge pull request #130178 from NixOS/backport-129978-to-release-21.05 2021-08-06 20:05:54 +03:00
Artturi af5f7e15a0
Merge pull request #125224 from NixOS/backport-124991-to-release-21.05
[Backport release-21.05] nixos/pam: use new plasma5Packages, fixes #124973
2021-08-06 17:17:39 +03:00
Yureka ff1ea3a36c nixos/tests/gitlab: disable gitlab-pages tests
(cherry picked from commit 6b021012c5d8e53a7129c08996aa3d8c7067d407)
2021-08-05 14:17:01 +02:00
davidak 3f0926f6b5 nixos-icons: fix icons not installed when documentation disabled
(cherry picked from commit aa8373ab1b98b700c411eac1fe9e3d858a802909)
2021-08-04 19:39:21 +00:00
Jörg Thalheim 51cfc3c6db
Merge pull request #132536 from NixOS/backport-129413-to-release-21.05
[Backport release-21.05] nixos/binfmt: run binfmt activation script after mounting /run
2021-08-03 17:35:01 +01:00
Silvan Mosberger 6f2e900e10
Merge pull request #132482 from Infinisil/vbox-size-backport
[backport] vbox-image: add new option to set free space in image
2021-08-03 17:38:11 +02:00
Kazutoshi Noguchi 3d3ced33c9 nixos/binfmt: run binfmt activation script after mounting /run
binfmt activation script creates /run/binfmt before mounting /run
when system activation.

To fix it I added dependency to specialfs to binfmt activation
script.

(cherry picked from commit bf227785854c9fd4a14c20db12dd6d3ebaf02981)
2021-08-03 11:24:05 +00:00
davidak 1fb9572267
Merge pull request #125221 from NixOS/backport-124404-to-release-21.05
[Backport release-21.05] Small option type adjustments
2021-08-03 06:33:12 +02:00
Luke Granger-Brown 2194711ae0 nixos/virtualbox-image: cast baseImageFreeSpace into str
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328).

(cherry picked from commit b5fab53628e8f080bae24ea1396f72d9d21e1f9b)
2021-08-03 02:47:14 +02:00
lassulus a2a5df1e63 vbox-image: add new option to set free space in image
(cherry picked from commit a6700d75f38cda83367a8af84651a2a72ce0f3ef)
2021-08-03 02:45:28 +02:00
Maximilian Bosch 985d2d0dec nixos/captive-browser: fix startup
It seems as since Chromium 92, `chromium` crashes on startup if
`XDG_CONFIG_HOME` points to a read-only (store-)path.

(cherry picked from commit 8c35a69a6ea206204ddfd3116c4497020b9f2724)
2021-08-02 18:22:00 +00:00
Domen Kožar 07255eea7b enableRedistributableFirmware: add rtw89-firmware
(cherry picked from commit 749620cd4f8001d1509c6af150814515003f3e72)
2021-08-02 15:56:36 +00:00
David Arnold a791442a31 nixos/nix-daemon: fix registry flake type
Before this commit, the `flake` option was typed with `types.unspecified`.

This type get's merged via [`mergeDefaultOption`](ebb592a04c/lib/options.nix (L119-L128)), which has a line
```nix
else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
```

`lib.isFunction` detects an attrs in the shape of `{__functor = ...}` as
a function and hence this line substitutes such attrs with a function
(f: f x).

If now, a flake input has a `__functor` as it's output, this will
coerce the once attrs to a function. This breaks a lot of things later
in the stack, for example a later `lib.filterAttrs seive <LAMBDA>` will
fail for obious reasons.

According to @infinisil, `types.unspecified` is due to deprecation. In
the meantime this PR provides a specific fix for the specific problem
discovered.

(cherry picked from commit ecae25c3ef137d972e909eb0e85960d90481789e)
2021-08-01 22:09:08 +00:00
Robert Hensing 3ed3b163aa
Merge pull request #131876 from NixOS/backport-131760-to-release-21.05
[Backport release-21.05] nixos/installer: force root fs type
2021-08-01 23:06:37 +02:00
Vladimír Čunát 11c662074e
Merge #131892: nix-fallback-paths.nix: 2.3.14 -> 2.3.15
... into release-21.05 as a part of fixing #126141.
(I think; I don't know how often the fallback gets used in practice.)
2021-07-31 08:57:18 +02:00
Martin Weinelt 0c50198047 nixos/bird: fix bird/bird6 description
(cherry picked from commit d902365913fd65abc2d5d5298c2b9b0beda2f2ca)
2021-07-30 06:44:37 +00:00
Eelco Dolstra 3460fd6959 nix-fallback-paths.nix: Update to 2.3.15
(cherry picked from commit 512ee6db3997920c51b2a15c3510683aac934b31)
2021-07-28 21:52:32 +00:00
David Arnold f6754032ee nixos/installer: force root fs type
installer media can be used on top of existing host configs. In such
scenarions, root fs types will already be defined.

Before this change, this will inevitably lead to the following error:
```console
error: The option `fileSystems./.fsType' has conflicting definition values:
       - In `/nix/store/2nl5cl4mf6vnldpbxhrbzfh0n8rsv9fm-source/DevOS/os/hardware/common.nix': "ext4"
       - In `/nix/store/jbch90yqx6gg1h3fq30jjj2b6h6jfjgs-source/nixos/modules/installer/cd-dvd/iso-image.nix': "tmpfs"
```

With this patch, the installers will override those values according to
their own local requirement.

Use `mkOverride 60` so that conscientious overriding specially targeted
at the installer, e.g. with `mkForce` is still straight forward.

(cherry picked from commit c219fdffad3fa76c43824bee34d5fb424ff95b87)
2021-07-28 20:27:51 +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
Jörg Thalheim eacc0f7750 k3s: add tokenFile option
To avoid having secrets in the nix store.

(cherry picked from commit 11a38f62f0bfcb655e339498897b0d25ac37fa97)
2021-07-15 12:40:46 +00:00
Jörg Thalheim d15de4c6db nixos/k3s: add to environment.systemPackages for adminstration
(cherry picked from commit 852739337bd5ab4c57fd1eab9e62e76ac2f1a7cc)
2021-07-15 12:40:46 +00:00
Jeremy Kolb 94f0dea33b open-vm-tools: Copy the udev files over correctly
(cherry picked from commit 42ea61bc7dacc8360eb87152635f5f14f003c18d)
2021-07-14 13:18:01 +00: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
Atemu 95fc4eb09d nixos/btrfs: handle new checksum types in initrd
Can't mount a root formatted with those otherwise

(cherry picked from commit e85f2f43bda6e0fe245005b710091f854a7f0200)
2021-07-06 14:00:40 +00:00
Lucas Savva c192fd5d4c nixos/acme: Ensure certs are always protected
As per #121293, I ensured the UMask is set correctly
and removed any unnecessary chmod/chown/chgrp commands.
The test suite already partially covered permissions
checking but I added an extra check for the selfsigned
cert permissions.

(cherry picked from commit 083aba4f83b105c30a1386bdb214cb6c85e119e6)
2021-07-06 13:14:03 +00: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
Philipp Hausmann d2352585bc slimserver: Fix user creation
(cherry picked from commit 8bfd84cf3c63b32299430cb15e53501922af893c)
2021-07-02 10:58:22 +00: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
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