Commit Graph

294825 Commits

Author SHA1 Message Date
Graham Christensen 5d0154f812 nixos/make-zfs-image: init
This is a private interface for internal NixOS  use. It is similar
to `make-disk-image` except it is much more opinionated about what
kind of disk image it'll make.

Specifically, it will always create *two* disks:

1. a `boot` disk formatted with FAT in a hybrid GPT mode.
2. a `root` disk which is completely owned by a single zpool.

The partitioning and FAT decisions should make the resulting images
bootable under EFI or BIOS, with systemd-boot or grub.

The root disk's zpools options are highly customizable, including
fully customizable datasets and their options.

Because the boot disk and partition are highly opinionated, it is
expected that the `boot` disk will be mounted at `/boot`. It is
always labeled ESP even on BIOS boot systems.

In order for the datasets to be mounted properly, the `datasets`
passed in to `make-zfs-image` are turned in to NixOS configuration
stored at /etc/nixos/configuration.nix inside the VM.
NOTE: The function accepts a system configuration in the `config`
argument. The *caller* must manually configure the system
in `config` to have each specified `dataset` be represented
by a corresponding `fileSystems` entry.

One way to test the resulting images is with qemu:

```sh
boot=$(find ./result/ -name '*.boot.*');
root=$(find ./result/ -name '*.root.*');

echo '`Ctrl-a h` to get help on the monitor';
echo '`Ctrl-a x` to exit';

qemu-kvm \
    -nographic \
    -cpu max \
    -m 16G \
    -drive file=$boot,snapshot=on,index=0,media=disk \
    -drive file=$root,snapshot=on,index=1,media=disk \
    -boot c \
    -net user \
    -net nic \
    -msg timestamp=on
```

(cherry picked from commit 076f6e2d948259e18ddac8e562c62b5b53de9fe6)
2021-09-13 16:20:46 +00:00
Maximilian Bosch f3510c5ee3 element-desktop: 1.8.2 -> 1.8.4
ChangeLog: https://github.com/vector-im/element-desktop/releases/tag/v1.8.4
(cherry picked from commit c81983ec9f228b9b1405f492429a33cb3976201b)
2021-09-13 16:18:25 +00:00
Maximilian Bosch 9a984970b6 element-web: 1.8.2 -> 1.8.4
ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.8.4
(cherry picked from commit 55d25c13bda5daa4f83f6c1965e4a263a3a84d74)
2021-09-13 16:18:25 +00:00
ajs124 b3083bc693
Merge pull request #137629 from drupol/update/php-7.4.21-to-7.4.23-backport-to-release-21.05
[Backport release-21.05] php74: 7.4.21 -> 7.4.23
2021-09-13 17:06:43 +02:00
ajs124 9544502814
Merge pull request #137655 from talyz/backport-php-8.0.10
[21.05] php80: 8.0.8 -> 8.0.10
2021-09-13 17:05:59 +02:00
Maximilian Bosch 85cdc98680
php80: 8.0.8 -> 8.0.10
ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.10

(cherry picked from commit ab8017a2dd84af08ebfb4b9e43964013b3351f65)
2021-09-13 16:09:39 +02:00
Maciej Krüger f35f8db4b8
Merge pull request #137648 from NixOS/backport-137642-to-release-21.05
[Backport release-21.05] rPackages.RMySQL: fix package
2021-09-13 15:11:19 +02:00
Maciej Krüger f5fb1a3080 rPackages.RMySQL: fix package
(cherry picked from commit a286dc9ef2fcc0748796c460f4a3ca169801b160)
2021-09-13 12:51:07 +00:00
github-actions[bot] 0a354b4c0c
Merge release-21.05 into staging-next-21.05 2021-09-13 12:02:22 +00:00
Vladimír Čunát e9e40f6873
Merge #137572: Kernels 2021-09-12 (into staging-21.05) 2021-09-13 11:11:17 +02:00
Pol Dellaiera 72eba819ce php74: 7.4.21 -> 7.4.23
(cherry picked from commit 3fbb55710d31b27c8fa5897e4e7714ea54ce06e5)
2021-09-13 10:56:56 +02:00
Vladimír Čunát 9a3277af47
Merge #132287: jetty: 9.4.41.v20210516 -> 9.4.43.v20210629
...into release-21.05
2021-09-13 10:53:15 +02:00
Vladimír Čunát dc5ab54b55
Merge #137455: go_1_16: 1.16.7 -> 1.16.8 (into staging-21.05) 2021-09-13 10:43:57 +02:00
Vladimír Čunát 99ee77dd6d
Merge #137574: libexif: 0.6.22 -> 0.6.23 (into staging-21.05) 2021-09-13 10:40:25 +02:00
Vladimír Čunát 2082c70be4
Merge #137548: ghostscript: add passthru.tests (into staging-21.05) 2021-09-13 10:34:20 +02:00
Vladimír Čunát 4333ebdb1e
Merge #137042: libgcrypt: 1.9.3 -> 1.9.4 (into staging-21.05) 2021-09-13 10:32:57 +02:00
Vladimír Čunát 52f01f7af7
Merge #136785: libarchive: 3.5.1 -> 3.5.2 (into staging-21.05) 2021-09-13 10:29:27 +02:00
Vladimír Čunát 1455454a93
Merge #136770: python3Packages.pillow: 8.3.1 -> 8.3.2 (into staging-21.05) 2021-09-13 10:24:37 +02:00
Vladimír Čunát dd00c92fba
Merge #135655: spidermonkey_78: fix build on armv7l (into staging-21.05) 2021-09-13 10:22:02 +02:00
github-actions[bot] 920bbd58f0
Merge staging-next-21.05 into staging-21.05 2021-09-13 00:03:38 +00:00
github-actions[bot] 45dff769df
Merge release-21.05 into staging-next-21.05 2021-09-13 00:03:00 +00:00
Mario Rodas 53c72f9981
Merge pull request #137374 from risicle/ris-flask-restx-CVE-2021-32838
[21.05] python38Packages.flask-restx: add patch for CVE-2021-32838
2021-09-12 17:00:54 -05:00
Kerstin Humm f569e48576 libexif: 0.6.22 -> 0.6.23
(cherry picked from commit 139cfd80d052b85d9dd364c1858bbcd5b9c6fe17)
2021-09-12 21:24:44 +00:00
Maximilian Bosch 042bd4f47b
nixos/kernel: add 5.14 to kernel test-suite
Same as 2444c11431a37e04de025b63f6a12bdd05d2f4c1 on master.
2021-09-12 23:15:14 +02:00
Kerstin Humm 91fd4cf610 imagemagick: 7.1.0-5 -> 7.1.0-6
(cherry picked from commit 3e0e70d1d3f2d642534a21dfaa6a0b3bd3a78f2f)
2021-09-12 22:56:31 +02:00
Maximilian Bosch 92109a3f58
Merge pull request #137554 from NixOS/backport-137132-to-release-21.05
[Backport release-21.05] nixos/privacyidea: use `sudo(8)` that's configured via the module
2021-09-12 22:54:39 +02:00
TredwellGit 34570a89c0 linux-rt_5_4: 5.4.143-rt63 -> 5.4.143-rt64
(cherry picked from commit 5698fc0dfc669166371b07a12ed6908696b2776c)
2021-09-12 20:28:59 +00:00
TredwellGit 6541cd74b4 linux: 5.4.144 -> 5.4.145
(cherry picked from commit be590b86e26f9144e7c2719650c57772bb797ed9)
2021-09-12 20:28:59 +00:00
TredwellGit 316e874406 linux: 5.14.2 -> 5.14.3
(cherry picked from commit b81ac24356c60e63c7daccedf278c500f1ca5179)
2021-09-12 20:28:58 +00:00
TredwellGit e8a16eaa0d linux: 5.13.15 -> 5.13.16
(cherry picked from commit f0878c65eb8824957a2eabb863cefac5b09df3b3)
2021-09-12 20:28:58 +00:00
TredwellGit 551b0b44c9 linux: 5.10.63 -> 5.10.64
(cherry picked from commit 71348196a0aa2ca74487c7f8e24a02aad5ae42ab)
2021-09-12 20:28:57 +00:00
TredwellGit 0d85dce13f steam: fix steamwebhelper
Fixes https://github.com/NixOS/nixpkgs/issues/137279 and https://github.com/ValveSoftware/steam-runtime/issues/462.

(cherry picked from commit 64c6851fd3acb13440bbffccf1fe386702725291)
2021-09-12 12:13:37 -07:00
Maximilian Bosch 5a17bb5d2b nixos/privacyidea: use `sudo(8)` that's configured via the module
(cherry picked from commit 69e75754d57b4c9785058d663daa3817745930aa)
2021-09-12 18:13:58 +00:00
github-actions[bot] 6a4d524347
Merge staging-next-21.05 into staging-21.05 2021-09-12 18:02:51 +00:00
github-actions[bot] 6f77cc7a91
Merge release-21.05 into staging-next-21.05 2021-09-12 18:02:21 +00:00
Maximilian Bosch cedaaad5f5
Merge pull request #137545 from NixOS/backport-135751-to-release-21.05
[Backport release-21.05] nixos/promtail: Allow write access to positions file if not in CacheDirectory
2021-09-12 18:56:08 +02:00
Robert Scott bf76456a65 ghostscript: add passthru.tests.test-corpus-render
this simply attempts rendering every ps/eps/pdf file in the ghostscript
test corpus

(cherry picked from commit 57692f6d3e48766a7c50fa00f6157ece953595ca)
2021-09-12 16:40:49 +00:00
Maximilian Bosch bb1ccebd17
Merge pull request #137434 from NixOS/backport-137281-to-release-21.05
[Backport release-21.05] Kernels 2021-09-10
2021-09-12 18:22:24 +02:00
Maximilian Bosch ee5a613395
Merge pull request #137266 from NixOS/backport-137187-to-release-21.05
[Backport release-21.05] Kernels 2021-09-09
2021-09-12 18:21:53 +02:00
Zhaofeng Li f69c32ec21 nixos/promtail: Allow write access to positions file if not in CacheDirectory
Because of `ProtectSystem=strict`, Promtail cannot write to the positions
file if it's not in its `CacheDirectory` (the default value).

(cherry picked from commit b6ad701a2c6bf619fa9418a8e27c4940ce921456)
2021-09-12 16:21:38 +00:00
Maximilian Bosch 1c67ae83db
Merge pull request #137409 from NixOS/backport-136463-to-release-21.05
[Backport release-21.05] nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62
2021-09-12 18:20:13 +02:00
Maximilian Bosch bad0efd147
Merge pull request #137524 from NixOS/backport-137510-to-release-21.05
[Backport release-21.05] wiki-js: 2.5.201 -> 2.5.214
2021-09-12 18:19:27 +02:00
Vladimír Čunát e85f0175e3
Merge #137522: qt514.qt3d: fix upstream URL (into release-21.05) 2021-09-12 15:14:23 +02:00
Maximilian Bosch caef9da135 wiki-js: 2.5.201 -> 2.5.214
ChangeLog: https://github.com/Requarks/wiki/releases/tag/2.5.214
(cherry picked from commit 75eaccdcbc79f908902638bbea4aef33ebdad712)
2021-09-12 12:51:18 +00:00
Sergei Trofimovich ad6e478766 qt514.qt3d: fix upstream URL
hydra can't build qt514.qt3d binary as it fails to fetch the tarball
from outdated source from:
    https://download.qt.io/official_releases/qt/
as it only contains `5.12`, `5.15`, `6.0` and `6.2`.

`/archive` still has the releases:
    https://download.qt.io/archive/qt/5.14/5.14.2/submodules/

Let's use those instead.

(cherry picked from commit 042119cadebeea9034aa517b46d8ef4fd359a087)
2021-09-12 12:48:55 +00:00
github-actions[bot] 4c43ed426c
Merge staging-next-21.05 into staging-21.05 2021-09-12 12:03:41 +00:00
github-actions[bot] 605a18a027
Merge release-21.05 into staging-next-21.05 2021-09-12 12:03:10 +00:00
Vladimír Čunát f9aaed3713
Merge #137298: thunderbird-bin: 91.0.3 -> 91.1.0 (into release-21.05) 2021-09-12 10:50:41 +02:00
Pavol Rusnak a414ce0044
Merge pull request #136676 from prusnak/electron-21.05
[21.05] Electron updates
2021-09-12 10:13:03 +02:00
zowoq c05d4e82d3 go_1_16: 1.16.7 -> 1.16.8
(cherry picked from commit a9dd9983de642b0d4522f2dc3cafa2be65562f7c)
2021-09-12 00:57:11 +00:00