294689 Commits

Author SHA1 Message Date
github-actions[bot]
84bab5e90c
Merge staging-next-21.05 into staging-21.05 2021-09-14 18:02:49 +00:00
github-actions[bot]
7f31a4f82d
Merge release-21.05 into staging-next-21.05 2021-09-14 18:02:14 +00:00
Guillaume Girol
f7c79f29ac
Merge pull request #137311 from symphorien/evolution-stable-update
[21.05] evolution, evolution-ews, evolution-data-server: backport patch release bumps
2021-09-14 17:21:42 +00:00
Bernardo Meurer
f5db08830f
Merge pull request #137683 from NixOS/backport-137671-to-release-21.05
[Backport release-21.05] firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92
2021-09-14 16:24:33 +00:00
github-actions[bot]
de1c435656
Merge staging-next-21.05 into staging-21.05 2021-09-14 12:02:50 +00:00
github-actions[bot]
1d1b9bf49a
Merge release-21.05 into staging-next-21.05 2021-09-14 12:02:14 +00:00
Maximilian Bosch
626ae0eeba element-desktop: apply patch to run on Wayland (#137666)
See upstream PR#261[1] for further reference. Previously, the
`enable-features`-setting was entirely discarded due to an earlier
regression resulting in an attempt to start `element-desktop` in
Wayland-mode without all necessary components.

Closes #137377

[1] https://github.com/vector-im/element-desktop/pull/261

(cherry picked from commit 5a0d0ec1cf90aae4354a97a2afaff079605ffc82)
2021-09-14 10:30:05 +02:00
github-actions[bot]
85e990280d
Merge staging-next-21.05 into staging-21.05 2021-09-14 06:03:14 +00:00
github-actions[bot]
beeed5079f
Merge release-21.05 into staging-next-21.05 2021-09-14 06:02:32 +00:00
Robert Scott
667c06be31
Merge pull request #137428 from risicle/ris-flask-appbuilder-3.3.2-r21.05
[21.05] python3Packages.flask-appbuilder: 3.3.0 -> 3.3.2
2021-09-14 01:20:28 +01:00
github-actions[bot]
c8b84c65f0
Merge staging-next-21.05 into staging-21.05 2021-09-14 00:03:05 +00:00
github-actions[bot]
7206c7cf0b
Merge release-21.05 into staging-next-21.05 2021-09-14 00:02:30 +00:00
Bernardo Meurer
25532a7fbb
firefox-unwrapped: workaround issues on non-Gnome wayland WM's on FF 92
Closes: #137649
(cherry picked from commit dfccb3045e76872eda32cdfa338dbe6aae8ccfcb)
2021-09-13 12:53:50 -07:00
Timothy DeHerrera
f789739acc
Merge pull request #137665 from NixOS/backport-106574-to-release-21.05
[Backport release-21.05] nixos/amazonImageZfs: init
2021-09-13 13:48:12 -06:00
Timothy DeHerrera
bee37e3ee0
Merge pull request #137676 from NixOS/backport-135568-to-release-21.05
[Backport release-21.05] ZFS: expand on boot
2021-09-13 13:48:00 -06:00
github-actions[bot]
5e2307a006
Merge staging-next-21.05 into staging-21.05 2021-09-13 18:03:49 +00:00
github-actions[bot]
fa10ff02d6
Merge release-21.05 into staging-next-21.05 2021-09-13 18:03:02 +00:00
Your Name
76e99647cd services.zfs.expandOnBoot: support expanding pools on boot
Either enumerating a list of pools to expand or expanding
all pools on boot.

(cherry picked from commit 4bb4bcc30c7f481581ef462ed7b1dcca71693717)
2021-09-13 17:42:07 +00:00
Maximilian Bosch
37eb0155b8
Merge pull request #137663 from NixOS/backport-137645-to-release-21.05
[Backport release-21.05] element-{web,desktop}: 1.8.2 -> 1.8.4
2021-09-13 18:58:08 +02:00
Graham Christensen
337eb213cf amazon images: extend the image-info.json to have a disks object
Having a disks object with a dictionary of all the disks and their
properties makes it easier to process multi-disk images.

Note the rename of `label` to `system_label` is because `$label`i
is something of a special token to jq.

(cherry picked from commit 71b3d18181974523ef7264106a4bf213a3103439)
2021-09-13 16:20:47 +00:00
Graham Christensen
a989fd1885 NixOS/amazonImageZfs: init
Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS
root.

This uses `make-zfs-image` which implies two EBS volumes are needed
inside EC2, one for boot, one for root. It should not matter which
is identified `xvda` and which is `xvdb`, though I have always
uploaded `boot` as `xvda`.

(cherry picked from commit bd38b059eae05871579b2dfd51cd41d058b6a1ec)
2021-09-13 16:20:46 +00:00
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]
ecf565257b
Merge staging-next-21.05 into staging-21.05 2021-09-13 12:02:54 +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