github-actions[bot]
08374b2bd8
Merge release-21.05 into staging-next-21.05
2021-09-17 12:02:25 +00:00
happysalada
30d0257247
vscodium: fix sha256 on linux
...
(cherry picked from commit 65a010bcead26c971fe5b01bb02c4a9f02d02271)
2021-09-17 19:10:27 +09:00
nixpkgs-upkeep-bot
5f4c5d41ea
vscodium: 1.60.0 -> 1.60.1
...
(cherry picked from commit 4828eb7ae4f1105dcebf7245f453c607b9c77c1d)
2021-09-17 19:10:27 +09:00
R. RyanTM
912279a742
symfony-cli: 4.26.0 -> 4.26.3
...
(cherry picked from commit ff6fb898ac11223e281cffac992246e3b6c31a97)
2021-09-17 09:25:41 +02:00
github-actions[bot]
719329b2d9
Merge release-21.05 into staging-next-21.05
2021-09-17 00:04:13 +00:00
Pavol Rusnak
ebf419e737
Merge pull request #137988 from prusnak/electron-21.05
...
[21.05] electron_12: 12.1.0 -> 12.1.1
2021-09-17 00:21:07 +02:00
Luke Granger-Brown
6ffcbaf54d
Merge pull request #138171 from NixOS/backport-136194-to-release-21.05
...
[Backport release-21.05] apr: add patch for CVE-2021-35940
2021-09-16 21:06:57 +01:00
Luke Granger-Brown
b9e98053fe
Merge pull request #138170 from NixOS/backport-138136-to-release-21.05
...
[Backport release-21.05] apacheHttpd: 2.4.48 -> 2.4.49
2021-09-16 21:05:50 +01:00
Robert Scott
ef698f793f
apr: add patch for CVE-2021-35940
...
(cherry picked from commit c6c39b5944d1ebc7f294ea9b78350beec67b21a8)
2021-09-16 18:45:22 +00:00
Aaron Andersen
6fbf63ac60
apacheHttpd: 2.4.48 -> 2.4.49
...
(cherry picked from commit 0518560cf13e1a08a93de6b562d6326c19a3294f)
2021-09-16 18:34:07 +00:00
TredwellGit
6c5790dfb6
linux/hardened/patches/5.4: 5.4.144-hardened1 -> 5.4.146-hardened1
...
(cherry picked from commit 00c500e9fc975957b4357ce46d5f10e8bf2cd1ba)
2021-09-16 16:18:21 +00:00
TredwellGit
fbc340ce50
linux/hardened/patches/5.14: 5.14.2-hardened1 -> 5.14.4-hardened1
...
(cherry picked from commit 60b711316445f580345d815cfd04be592b136b8a)
2021-09-16 16:18:20 +00:00
TredwellGit
cc619f3c02
linux/hardened/patches/5.13: 5.13.15-hardened1 -> 5.13.17-hardened1
...
(cherry picked from commit a8de1dcd2b5896d141bc89e0fc2cc665cd9581d7)
2021-09-16 16:18:19 +00:00
TredwellGit
a1b9329753
linux/hardened/patches/5.10: 5.10.63-hardened1 -> 5.10.65-hardened1
...
(cherry picked from commit 48e902a2efa3bb149d4526125e57c1429af95014)
2021-09-16 16:18:19 +00:00
TredwellGit
49d3b04cd9
linux: 5.4.145 -> 5.4.147
...
(cherry picked from commit 100f0569b54abaf1ed49ed8f525678a7eb02ab9a)
2021-09-16 16:18:18 +00:00
TredwellGit
9b42fb070f
linux: 5.14.3 -> 5.14.5
...
(cherry picked from commit 4a05e7297cc766a2e295725bb991a50605cebbea)
2021-09-16 16:18:17 +00:00
TredwellGit
2521537c8f
linux: 5.13.16 -> 5.13.18
...
(cherry picked from commit 4954336e2b81ebcc108ffae0bf3a0a39d301030b)
2021-09-16 16:18:16 +00:00
TredwellGit
a3a2df2aaa
linux: 5.10.64 -> 5.10.66
...
(cherry picked from commit 6c829ce0830528f8e0ea78acfedec8a345b1f81b)
2021-09-16 16:18:15 +00:00
github-actions[bot]
0d2ff3fbab
Merge release-21.05 into staging-next-21.05
2021-09-16 12:02:44 +00:00
Patrick Hilhorst
4d71703763
Merge pull request #137439 from NixOS/backport-137328-to-release-21.05
2021-09-16 13:34:36 +02:00
Jan Solanti
66528906a5
pipewire: enable manpages
...
(cherry picked from commit 044da009d172482fc8b748bcc92cced3c915bb0e)
2021-09-16 09:48:45 +00:00
Jan Solanti
eae9551832
pipewire: 0.3.34 -> 0.3.35
...
(cherry picked from commit f4fbb211765c265203004014e63a4e149520f6b9)
2021-09-16 09:48:45 +00:00
github-actions[bot]
b4cf42c516
Merge release-21.05 into staging-next-21.05
2021-09-15 12:02:09 +00:00
Jörg Thalheim
8dd8bd8be7
Merge pull request #137984 from NixOS/backport-137673-to-release-21.05
...
[Backport release-21.05] github-runner: 2.281.1 -> 2.282.0, prevent self-update
2021-09-15 12:44:29 +01:00
TredwellGit
e6b75fcb70
electron_12: 12.1.0 -> 12.1.1
...
https://github.com/electron/electron/releases/tag/v12.1.1
(cherry picked from commit 40d83a9a2159809d2d47fc6598665c184578f1cf)
2021-09-15 11:58:00 +02:00
Vincent Haupert
d58baa249b
github-runner: 2.281.1 -> 2.282.0
...
(cherry picked from commit cd641476cfcf8d5494e661debac9a3fe40f4cf32)
2021-09-15 09:50:00 +00:00
Vincent Haupert
ca41e07801
github-runner: prevent self-updates
...
As of yet, a patch caused the runner to discard update messages.
Unfortunately, GitHub keeps sending update messages to outdated runners
causing them to no longer pick up jobs.
This commit causes the runner to send a high version to GitHub which
should be more recent for quite a time. That way, GitHub does not send
update message and keeps scheduling jobs even for outdated runners.
Naturally, an oudated runner can still break at any time as GitHub's
current approach assumes that all runners are always up-to-date. We
should still strive for quick nixpkgs updates but this patch should give
us some time.
(cherry picked from commit e8bbcc79fd07014b146835dfd7f5eba2079d9a55)
2021-09-15 09:49:59 +00:00
Vincent Haupert
04e8a8cd56
github-runner: use dummy SHA-1 as `GitInfoCommitHash`
...
The runner only references `GitInfoCommitHash`/`CommitHash` to print
informational log entries. To allow for just referencing the tag of a
version instead of the commit hash, this commit sets the value of the
`GitInfoCommitHash` to a static dummy value.
(cherry picked from commit cc5c902fdf94b798c3b68e55ebb7e1a1185113a1)
2021-09-15 09:49:58 +00:00
Jörg Thalheim
cffe74fead
Merge pull request #137162 from NixOS/backport-136988-to-release-21.05
...
[Backport release-21.05] github-runner: 2.279.0 -> 2.281.1
2021-09-15 10:45:26 +01:00
Michael Weiss
4c2e7becf1
Merge pull request #137889 from NixOS/backport-137759-to-release-21.05
...
[Backport release-21.05] signal-desktop: 5.17.0 -> 5.17.1
2021-09-15 10:54:25 +02:00
github-actions[bot]
1158f0ecc1
Merge release-21.05 into staging-next-21.05
2021-09-15 00:02:46 +00:00
Vladimír Čunát
a59d9b39f1
Merge branch 'staging-next-21.05' into release-21.05
2021-09-14 23:10:11 +02:00
Michael Weiss
762bb52325
chromium: 93.0.4577.63 -> 93.0.4577.82
...
https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop.html
This update includes 11 security fixes. Google is aware that exploits
for CVE-2021-30632 and CVE-2021-30633 exist in the wild.
CVEs:
CVE-2021-30625 CVE-2021-30626 CVE-2021-30627 CVE-2021-30628
CVE-2021-30629 CVE-2021-30630 CVE-2021-30631 CVE-2021-30632
CVE-2021-30633
(cherry picked from commit 61e54424baa413ca1a8efa805813d07e3f1ff00f)
2021-09-14 21:06:36 +00:00
R. RyanTM
224196a661
signal-desktop: 5.17.0 -> 5.17.1
...
(cherry picked from commit e3c0374da4ff8c9a0ad65a429c6ab030e4ae8cc3)
2021-09-14 20:46:52 +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]
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]
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]
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]
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