292043 Commits

Author SHA1 Message Date
lsix
65a1f5fbdc
Merge pull request #125436 from NixOS/backport-125375-to-staging-21.05
[Backport staging-21.05] python3Packages.django: 2.2.22 -> 2.2.24; python3Packages.django3_: 3.2.2 -> 3.2.4
2021-06-04 12:03:03 +01:00
Martin Weinelt
db7ab2c8d2 python3Packages.django_3: 3.2.2 -> 3.2.4
https://docs.djangoproject.com/en/dev/releases/3.2.4/
https://www.djangoproject.com/weblog/2021/jun/02/security-releases/

Fixes: CVE-2021-33203, CVE-2021-33571
(cherry picked from commit 794c6633b6396a0a3c2a5d54c52e629403f0672e)
2021-06-03 00:21:45 +00:00
Martin Weinelt
781ccf32d0 python3Packages.django: 2.2.22 -> 2.2.24
https://docs.djangoproject.com/en/dev/releases/2.2.24/
https://www.djangoproject.com/weblog/2021/jun/02/security-releases/

Fixes: CVE-2021-33203, CVE-2021-33571
(cherry picked from commit 6c7db95feac1200c98614b5a5cd1a84d40252e70)
2021-06-03 00:21:44 +00:00
Martin Weinelt
bbdaa7f504
Merge pull request #125309 from NixOS/backport-124982-to-staging-21.05
[Backport staging-21.05] curl: add patches for CVE-2021-22897, CVE-2021-22898 & CVE-2021-22901
2021-06-02 17:12:13 +02:00
Martin Weinelt
3308be986a
Merge pull request #125344 from helsinki-systems/bkp/21.05/cacert 2021-06-02 15:47:27 +02:00
Andreas Rammhold
e2960f429b cacerts: Make updater script aware of the nss_latest attribute
Usually, on the stable channel, we have a nss_latest attribute that is
more up to date than the nss attribute (which is usually frozen during
branch-off and only receives security updates). Cacerts are a sensitive
matter and should be updated more frequently than the stable NSS package,
if required. By making the update script aware of the nss_latest
attribute we can prefer that when it exists.

By having this change in the unstable branch of Nixpgks we can carry it
from release to release without requiring more churn from those doing
the stable release maintenance.

(cherry picked from commit 4e318bcca19e7972d1fa8b15c4eadf85e3d5a6a1)
2021-06-02 15:17:44 +02:00
ajs124
ffcb3c66fa cacert: 3.63 -> 3.66
mozilla says this is CA version 2.50, up from 2.48 in nss 3.63

(cherry picked from commit e579e93b6517c29af8b84641d2ec16a064d34c8b)
2021-06-02 10:55:51 +02:00
Robert Scott
1e0edddaff curl: add patches for CVE-2021-22897, CVE-2021-22898 & CVE-2021-22901
(cherry picked from commit 742c60f6f839e23822d29b668071baa653253656)
2021-06-02 00:35:37 +00:00
davidak
890d9c809c
Merge pull request #125143 from NixOS/backport-124971-to-staging-21.05
[Backport staging-21.05] kbd: patch paths to decompressors
2021-06-01 20:06:53 +02:00
Konstantin Alekseev
7f0f0b2807 sqlite: 3.35.2 -> 3.35.5
(cherry picked from commit 3c1bcd240bb437680b69775d5c324449a02dd135)
2021-05-31 18:19:48 -07:00
oxalica
a9f685005e nixos/tests/kbd-setfont-decompress: init
(cherry picked from commit 7fb927c9e54170c43e2579d1f0f20efd719ca7e8)
2021-06-01 00:13:53 +00:00
oxalica
b35b0a5f04 kbd: patch paths to decompressors
(cherry picked from commit 449132738dc3128f664772f571ae2f39a17b39ab)
2021-06-01 00:13:53 +00:00
Vladimír Čunát
013a9ad03b
Merge branch 'release-21.05' into staging-21.05 2021-05-30 20:21:58 +02:00
Robert Scott
0e2b7ebdde
Merge pull request #124822 from NixOS/backport-124792-to-release-21.05
[Backport release-21.05] b3sum: 0.3.7 -> 0.3.8
2021-05-30 17:32:04 +01:00
TredwellGit
35b4a78d9a lz4: patch CVE-2021-3520 and null pointer dereference
(cherry picked from commit 2acd087dca93a3b589721b3ec32d13d9150684bb)
2021-05-30 16:06:32 +00:00
Robert Scott
a74605831e
Merge pull request #124830 from NixOS/backport-124065-to-release-21.05
[Backport release-21.05] bjumblr: 1.4.2 -> 1.6.6
2021-05-30 16:24:28 +01:00
Robert Scott
439b6d5c2c
Merge pull request #124825 from NixOS/backport-124784-to-release-21.05
[Backport release-21.05] corerad: 0.3.0 -> 0.3.1
2021-05-30 16:22:25 +01:00
Martin Weinelt
4cd3fd238d
Merge pull request #124968 from NixOS/backport-124947-to-release-21.05 2021-05-30 17:21:40 +02:00
Robert Scott
95d4bdbaae
Merge pull request #124832 from NixOS/backport-124109-to-release-21.05
[Backport release-21.05] tellico: 3.4 -> 3.4.1
2021-05-30 16:21:01 +01:00
Janne Heß
4f9eadefdc Update nixos/modules/virtualisation/libvirtd.nix
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
(cherry picked from commit 964fc7cfef94bd598d816979a4ca1a42d9753d23)
2021-05-30 14:56:41 +00:00
Janne Heß
c072a18797 nixos/libvirtd: Take ethertypes from iptables-nftables-compat
iptables is currently defined in `all-packages.nix` to be
iptables-compat. That package does however not contain `ethertypes`.
Only `iptables-nftables-compat` contains this file so the symlink
dangles.

(cherry picked from commit 2eeecef3fc70e35b2f4c6d8424e4c726c140e330)
2021-05-30 14:56:41 +00:00
Robert Scott
0c39e877ec
Merge pull request #124908 from NixOS/backport-124859-to-release-21.05
[Backport release-21.05] python3Packages.smhi-pkg: 1.0.14 -> 1.0.15
2021-05-30 14:42:15 +01:00
Robert Scott
ab9f3f2f9e
Merge pull request #124922 from NixOS/backport-124911-to-release-21.05
[Backport release-21.05] catgirl: 1.7 -> 1.8
2021-05-30 13:54:29 +01:00
Robert Scott
9fd05bb58f
Merge pull request #124937 from NixOS/backport-124066-to-release-21.05
[Backport release-21.05] Gxplugins-Lv2: 0.8 -> 0.9
2021-05-30 13:51:08 +01:00
Robert Scott
d9df705215
Merge pull request #124933 from NixOS/backport-124575-to-release-21.05
[Backport release-21.05] goattracker,goattracker-stereo: 2.75 -> 2.76, 2.76 -> 2.77
2021-05-30 13:39:13 +01:00
Robert Scott
6ca456a1c9
Merge pull request #124934 from NixOS/backport-124325-to-release-21.05
[Backport release-21.05] babashka: 0.4.1 -> 0.4.3
2021-05-30 13:30:34 +01:00
Robert Scott
a33878b687
Merge pull request #124930 from NixOS/backport-124222-to-release-21.05
[Backport release-21.05] kooha: 1.1.3 -> 1.2.1
2021-05-30 12:52:07 +01:00
Robert Scott
07796133d4
Merge pull request #124931 from NixOS/backport-124904-to-release-21.05
[Backport release-21.05] gitRepo: 2.14.5 -> 2.15.3
2021-05-30 12:49:41 +01:00
Robert Scott
bae3f3be2a
Merge pull request #124928 from NixOS/backport-124713-to-release-21.05
[Backport release-21.05] getdata: add security patch from Debian
2021-05-30 12:46:21 +01:00
Robert Scott
60c22bd341
Merge pull request #124929 from NixOS/backport-124918-to-release-21.05
[Backport release-21.05] newsflash: fix build
2021-05-30 12:44:32 +01:00
Robert Scott
2063939edd
Merge pull request #124940 from NixOS/backport-124351-to-release-21.05
[Backport release-21.05] sacad: 2.3.4 -> 2.4.0
2021-05-30 12:33:13 +01:00
Michele Guerini Rocco
c399b0f178
Merge pull request #124946 from NixOS/backport-123253-to-release-21.05
[Backport release-21.05] vapoursynth: improve plugin dependency resolution
2021-05-30 11:31:35 +02:00
Kim Lindberger
4c4a45e284
Merge pull request #124945 from NixOS/backport-124472-to-release-21.05
[Backport release-21.05] keycloak: 13.0.0 -> 13.0.1
2021-05-30 10:47:01 +02:00
Robert Schütz
f63370194e
Merge pull request #124926 from NixOS/backport-124874-to-release-21.05
[Backport release-21.05] pika-backup: 0.3.1 -> 0.3.2
2021-05-30 10:40:04 +02:00
markuskowa
3d7ced7b59
Merge pull request #124923 from NixOS/backport-124893-to-release-21.05
[Backport release-21.05] welle-io: 2.2 -> 2.3
2021-05-30 10:37:47 +02:00
Simon Bruder
bad208a3e6 vapoursynth: improve plugin dependency resolution
Some python packages (e.g. functools32) are conditionally disabled for
certain interpreter versions by having them return null instead of a
derivation. `getRecursivePropagatedBuildInputs` fails if such a package
is part of the dependency tree. This commit makes it only recurse into
derivations and ignore everything else.

This also deduplicates the final plugin list to improve startup time.

(cherry picked from commit 9b3a2e66b141733fe7cb5372f64d30b66445cccd)
2021-05-30 08:26:24 +00:00
R. RyanTM
b3197b1334 keycloak: 13.0.0 -> 13.0.1
(cherry picked from commit 153eed52048365b0c91be1346dd566a41710eb69)
2021-05-30 07:41:53 +00:00
Robert Schütz
e3ddcfdf2c capture: use ffmpeg instead of ffmpeg_3
(cherry picked from commit 36f7a012b798b90ac05b1d31bd7c468d01a6b327)
2021-05-29 23:58:51 -04:00
Sandro
2a0ab9f511
Merge pull request #124924 from NixOS/backport-124898-to-release-21.05
[Backport release-21.05] gotty: 2.0.0-alpha.3 -> 1.2.0
2021-05-30 05:29:23 +02:00
fortuneteller2k
0659aeb14f sacad: 2.3.4 -> 2.4.0
(cherry picked from commit 753452f8084a9e151d8c2118d11f327cbd42b315)
2021-05-30 03:20:42 +00:00
Sandro
04d804d0ab
Merge pull request #124932 from NixOS/backport-124920-to-release-21.05
[Backport release-21.05] twine: add top-level entry
2021-05-30 05:07:27 +02:00
Bart Brouns
9b98f80829 Gxplugins-Lv2: 0.8 -> 0.9
(cherry picked from commit a9c375563e8c82a582ffeeed7dd257833109c72f)
2021-05-30 02:32:21 +00:00
Thiago Kenji Okada
e04a17a37e babashka: add thiagokokada as maintainer
(cherry picked from commit 9eee935ec232fffeda4917dba800967cf222eb0c)
2021-05-30 02:30:26 +00:00
Thiago Kenji Okada
20387998ce babashka: 0.4.1 -> 0.4.3
(cherry picked from commit 113fc7d71c1797983b4f3c40cf470befacb7fc04)
2021-05-30 02:30:26 +00:00
Francesco Gazzetta
0557b7bfb1 goattracker,goattracker-stereo: 2.75 -> 2.76, 2.76 -> 2.77
(cherry picked from commit 70dc16dec8d78b0aef50d069c5801a5be5f95eb1)
2021-05-30 02:29:54 +00:00
Sandro
52223c3d1d
Merge pull request #124827 from NixOS/backport-124685-to-release-21.05
[Backport release-21.05] terraria-server: 1.4.2.2 -> 1.4.2.3
2021-05-30 04:23:30 +02:00
Sandro Jäckel
c99249df0f twine: add top-level entry
(cherry picked from commit 166e67b4de27a25e56f8abb791e965bfed512496)
2021-05-30 02:20:11 +00:00
Otavio Salvador
1f6295e555 gitRepo: Add updateScript support for easier upgrade in future
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit ee498167d0f1d4825baa0d7d6f98bb7424db19e8)
2021-05-30 02:20:06 +00:00
Otavio Salvador
042c54b758 gitRepo: add missing preInstall and postInstall hooks calls
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 9d161bd45c40168a8aa83667fa4bf1b600ccc262)
2021-05-30 02:20:06 +00:00
Otavio Salvador
a5a6efd9b4 gitRepo: Drop unnecessary patch
The import-ssl-module.patch does not seem to be need and the tool seem
to be working just fine. Drop the patch.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 94d5fd438d6df069d6d303fb046e430f6118a93a)
2021-05-30 02:20:06 +00:00