github-actions[bot]
76e9cdbe64
Merge release-21.05 into staging-next-21.05
2021-08-05 18:04:53 +00:00
Wael Nasreddine
34f504c33d
Merge pull request #132789 from NixOS/backport-132780-to-release-21.05
...
[Backport release-21.05] gitlab: 14.1.1 -> 14.1.2
2021-08-05 19:02:10 +03:00
Vladimír Čunát
98d66e4541
Merge #132753 : 'staging-next-21.05' into release-21.05
2021-08-05 17:26:53 +02:00
Yureka
7036ca99ae
gitlab: 14.1.1 -> 14.1.2
...
(cherry picked from commit 5957f4edb9f3a266733c0335dc6ab7f8e674c444)
2021-08-05 14:32:11 +00:00
Martin Weinelt
b2d256095a
Merge pull request #132778 from NixOS/backport-132772-to-release-21.05
...
[Backport release-21.05] mupdf: apply patch for CVE-2021-37220
2021-08-05 14:55:51 +02:00
Michael Weiss
1ce07d770b
Merge pull request #132757 from NixOS/backport-132695-to-release-21.05
...
[Backport release-21.05] ungoogled-chromium: 91.0.4472.164 -> 92.0.4515.131
2021-08-05 14:28:03 +02:00
Yureka
ff1ea3a36c
nixos/tests/gitlab: disable gitlab-pages tests
...
(cherry picked from commit 6b021012c5d8e53a7129c08996aa3d8c7067d407)
2021-08-05 14:17:01 +02:00
Yureka
274b5f5099
gitlab: 14.1.0 -> 14.1.1
...
https://about.gitlab.com/releases/2021/07/28/gitlab-14-1-1-released/
(cherry picked from commit 5a69fb930d7621376a17fb144ba57da99e2814a9)
2021-08-05 14:17:01 +02:00
Frederik Ramcke
5e6c3593d6
mupdf: apply patch for CVE-2021-37220
...
(cherry picked from commit 2ac25f65a491524898f2c28a19699664ed6198b9)
2021-08-05 12:11:27 +00:00
Michael Weiss
8c589a79c8
Merge pull request #132771 from NixOS/backport-132756-to-release-21.05
...
[Backport release-21.05] signal-desktop: 5.12.0 -> 5.12.1
2021-08-05 14:08:44 +02:00
github-actions[bot]
f3cd217988
Merge release-21.05 into staging-next-21.05
2021-08-05 12:03:07 +00:00
Stig
2689e7a5a4
Merge pull request #132664 from NixOS/backport-131414-to-release-21.05
...
[Backport release-21.05] perlPackages.SQLTranslator: fix some scripts issues
2021-08-05 12:50:08 +02:00
Michael Weiss
7df18c5b76
signal-desktop: 5.12.0 -> 5.12.1
...
(cherry picked from commit f11652f0a6ec62eb3b8f0e93db2211a14662c322)
2021-08-05 10:37:19 +00:00
Michael Weiss
fa62bb8fac
ungoogled-chromium: 91.0.4472.164 -> 92.0.4515.131
...
(cherry picked from commit 45c32f59a58b69ca6db8c8c5fdbe0ea9eee02376)
2021-08-05 09:26:03 +00:00
github-actions[bot]
40b757ff44
Merge release-21.05 into staging-next-21.05
2021-08-05 00:02:29 +00:00
Artturin
f187ac728a
gollum: add additional dependencies
...
(cherry picked from commit 3bdccfedaf0078eac4cae00e0646d8f0a8c1cfcf)
2021-08-04 23:44:03 +02:00
Robert Scott
368e8bcf0c
Merge pull request #132671 from NixOS/backport-132594-to-release-21.05
...
[Backport release-21.05] putty: 0.75 -> 0.76
2021-08-04 22:28:34 +01:00
Kerstin Humm
71c30320f9
glimpse: add graphviz as runtime dependency
...
Fixes https://github.com/NixOS/nixpkgs/issues/132405
See also:
https://gitlab.gnome.org/GNOME/gegl/-/issues/279
f83fd22c4b
(cherry picked from commit 8d67153deb7d3a9d45f4735b1ca276de3a9499d6)
2021-08-04 23:22:37 +02:00
Jörg Thalheim
43cea7b6e4
python3Packages.gym: fix build
...
Tested by running one of their code examples
(cherry picked from commit 13cef561850fc6ee01de09f945c0e6047c26ef3c)
2021-08-04 13:44:15 -07:00
Maximilian Bosch
0d70ff95e1
Merge pull request #132630 from NixOS/backport-132471-to-release-21.05
...
[Backport release-21.05] Kernels 2021-08-02
2021-08-04 22:24:30 +02:00
davidak
4e241b6e3f
Merge pull request #132691 from NixOS/backport-131305-to-release-21.05
...
[Backport release-21.05] nixos-icons: fix icons not installed when documentation disabled
2021-08-04 21:51:21 +02:00
Robert Scott
0c98790627
Merge pull request #132662 from NixOS/backport-130833-to-release-21.05
...
[Backport release-21.05] convos: 6.24 -> 6.26
2021-08-04 20:42:19 +01: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
github-actions[bot]
422ead75f0
Merge release-21.05 into staging-next-21.05
2021-08-04 18:02:13 +00:00
Thomas Gerbet
ebb083c259
putty: 0.75 -> 0.76
...
Fixes CVE-2021-36367.
(cherry picked from commit e78c51a0e918cda218ff95b39ddeb7ddff5a5fde)
2021-08-04 14:53:13 +00:00
R. RyanTM
b1ee3bc424
apk-tools: 2.12.6 -> 2.12.7
...
(cherry picked from commit 28b3dc9186f15792896b992f2899a306eccc7fd1)
2021-08-04 14:42:18 +00:00
pacien
eb4a65f315
perlPackages.SQLTranslator: add missing deps
...
This adds missing dependencies for the `sqlt*` scripts provided in
the SQLTranslator package.
(cherry picked from commit d65cee7b07f7dec99472751aa787aa4485d16def)
2021-08-04 14:08:02 +00:00
Stig Palmquist
f344d8ba41
perlPackages.SQLTranslator: fix scripts shebang
...
(cherry picked from commit cc4f71d619ddf6d33da203af3881da9a28b5421e)
2021-08-04 14:08:01 +00:00
Stig Palmquist
4e4300ec8c
perlPackages.LinkEmbedder: 1.18 -> 1.20
...
(cherry picked from commit 38357d7306de6e8178d374a161d1865d4fde6496)
2021-08-04 13:58:50 +00:00
Stig Palmquist
924971d8b8
convos: 6.24 -> 6.26
...
(cherry picked from commit 21ba59294db9a3a0e4f7f1b39400a2f53b1d5186)
2021-08-04 13:58:50 +00:00
Michael Weiss
935e4fafbb
Merge pull request #132644 from NixOS/backport-132639-to-release-21.05
...
[Backport release-21.05] signal-desktop: 5.11.0 -> 5.12.0
2021-08-04 14:10:42 +02:00
github-actions[bot]
0d1b8f5bca
Merge release-21.05 into staging-next-21.05
2021-08-04 12:02:27 +00:00
Domen Kožar
465daf79b4
Merge pull request #132608 from rb2k/21_05_hg_fix_apple_sdk
...
[21.05] nixos/apple-sdk: 11.0 -> 11.1
2021-08-04 13:38:32 +02:00
maralorn
d867206bb8
Merge pull request #132641 from sternenseemann/cabal2nix-2.18.0
...
[21.05] cabal2nix: 2.17.0 -> 2.18.0
2021-08-04 12:06:49 +02:00
Michael Weiss
d10d928193
signal-desktop: 5.11.0 -> 5.12.0
...
(cherry picked from commit f734643f0078b104eb3af9611eb0530a6fb503f3)
2021-08-04 09:54:55 +00:00
sternenseemann
259f027a4b
cabal2nix: 2.17.0 -> 2.18.0
...
https://github.com/NixOS/cabal2nix/blob/v2.18.0/CHANGELOG.md
2.18.0 mostly brings bug fixes, especially the one fixing the unclear
error message if a cabal file was missing (which was forgotten in the
changelog). It is not technically a non-breaking change since the
Haskell API changed.
Since there shouldn't be any breakage for users and all known reverse
dependencies of cabal2nix have been broken for a while, the benefits
of backporting outweigh the risks.
2021-08-04 11:41:08 +02:00
TredwellGit
f8aab36f81
linux_latest-libre: 18191 -> 18210
...
(cherry picked from commit e56d304d73b5415b8b08a91e04dc6807160bc84b)
2021-08-04 07:50:01 +00:00
TredwellGit
31b4f817e8
linux: 5.13.6 -> 5.13.7
...
(cherry picked from commit b4aa8884d19a3a10a57b836a089d0000188f284c)
2021-08-04 07:50:01 +00:00
TredwellGit
2c47a4e052
linux: 4.9.276 -> 4.9.277
...
(cherry picked from commit 32c78c9e12cfe3fed66c81ba47d575f365e25fd7)
2021-08-04 07:50:00 +00:00
TredwellGit
8829f5bf2b
linux: 4.4.276 -> 4.4.277
...
(cherry picked from commit 7d0b3f65aa1eb7500e4638ceaa9770e86c07788c)
2021-08-04 07:50:00 +00:00
Vincent Laporte
ae42a59565
qarte: 4.6.0 → 4.12.0
...
(cherry picked from commit 5af58916df9f9192499263ec2c798a3e1a9218c1)
2021-08-04 09:42:36 +02:00
github-actions[bot]
d57a0c4cd9
Merge release-21.05 into staging-next-21.05
2021-08-04 06:02:02 +00:00
Robert Scott
3e83eba072
rabbitmq-server: add patches for multiple CVEs
...
CVE-2021-22116
CVE-2021-32718
CVE-2021-32719
2021-08-04 12:09:05 +09:00
github-actions[bot]
c65cc9d28b
Merge release-21.05 into staging-next-21.05
2021-08-04 00:02:37 +00:00
Anbang Wen
b13df33199
nixos/apple-sdk: 11.0 -> 11.1
...
The previous URL is a dead link. This commit updates it and bump the
SDK version to 11.1.
(cherry picked from commit 2565e3bba62d8d2f57a975c7ecce97d7c557dfa6)
2021-08-03 15:59:45 -07:00
Silvan Mosberger
6745921e23
Merge pull request #132602 from NixOS/backport-131267-to-release-21.05
...
[Backport release-21.05] lib: fix functionArgs for functors
2021-08-04 00:47:59 +02:00
David Arnold
e07870c95e
lib: fix functionArgs for functors
...
`functionArgs` should give valid results on
functions that have been identified with `lib.isFunction`
instead of erroring out.
(cherry picked from commit cf8e219b7e3c8933d6301175f2611990c5281ae9)
2021-08-03 22:07:22 +00:00
Guillaume Girol
2bd2119bf3
Merge pull request #131938 from chuahou/update-flameshot-backport-21.05
...
[21.05] Backport flameshot update from 0.9.0 -> 0.10.1
2021-08-03 21:46:40 +00:00
davidak
8d5fd4302f
Merge pull request #132577 from NixOS/backport-132575-to-release-21.05
...
[Backport release-21.05] restic: 0.12.0 -> 0.12.1
2021-08-03 21:36:07 +02:00
Serg Nesterov
5bdfd956f1
restic: 0.12.0 -> 0.12.1
...
(cherry picked from commit c69f341a0590f8d0e00a45672bb0cb1c7ea98b56)
2021-08-03 19:11:43 +00:00