summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* vscode: 1.65.2 -> 1.66.0•••(cherry picked from commit 78a6f5079e971812492c18b13283e421f4aa9e6e) origin/backport-166500-to-release-21.11nixpkgs-upkeep-bot2022-03-311-6/+6
* Merge pull request #166579 from NixOS/backport-162845-to-release-21.11Artturi2022-03-312-7/+6
|\
| * oil-buku: improved syntax•••(cherry picked from commit d530f3d3d22f3c0b50b7515e5bf0fc28cff62408) Átila Saraiva2022-03-312-7/+6
|/
* Merge pull request #162262 from NixOS/backport-160192-to-release-21.11Artturi2022-03-312-0/+47
|\
| * oil-buku: init at 0.3.2•••(cherry picked from commit d3f07498cd422a4af4ddab9694ac88ccc3f9dac8) Átila Saraiva2022-02-282-0/+47
* | Merge pull request #166464 from kini/backport-zoom-us-version-bumpsDoron Behar2022-03-311-2/+2
|\ \
| * | zoom-us: 5.9.3.1911 -> 5.9.6.2225•••(cherry picked from commit ac0dbdcb935e7498c379419ccc963f37e71ee89a) Clemens Lutz2022-03-301-2/+2
| * | zoom-us: 5.9.1.1380 -> 5.9.3.1911•••(cherry picked from commit 940737fcf494df9981f0fbf3e55f352cdb4d543c) Clemens Lutz2022-03-301-2/+2
| * | zoom-us: 5.8.6.739 -> 5.9.1.1380•••(cherry picked from commit 958754bfd5fa702e3c561301ca442e9fc0e80d4f) Clemens Lutz2022-03-301-2/+2
| * | zoom-us: 5.8.4.210 -> 5.8.6.739•••(cherry picked from commit 371082920f97f54f90d8e78fe12e0253ffb2e5bb) Clemens Lutz2022-03-301-2/+2
* | | nixos/manual: Update copyright years, authors, and copyright•••(cherry picked from commit 0ba3874e3a58cdbb7ee91c0bc78f2fa70a98e1d0) Janne Heß2022-03-301-2/+7
* | | Merge pull request #166314 from NixOS/backport-166300-to-release-21.11•••[Backport release-21.11] chromium: 99.0.4844.84 -> 100.0.4896.60Michael Weiss2022-03-301-10/+10
|\ \ \ | |/ / |/| |
| * | chromium: 99.0.4844.84 -> 100.0.4896.60•••https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_29.html This update includes 28 security fixes. CVEs: CVE-2022-1125 CVE-2022-1127 CVE-2022-1128 CVE-2022-1129 CVE-2022-1130 CVE-2022-1131 CVE-2022-1132 CVE-2022-1133 CVE-2022-1134 CVE-2022-1135 CVE-2022-1136 CVE-2022-1137 CVE-2022-1138 CVE-2022-1139 CVE-2022-1141 CVE-2022-1142 CVE-2022-1143 CVE-2022-1144 CVE-2022-1145 CVE-2022-1146 (cherry picked from commit b647d5a49d0ac80512f3169789042ac124e23f2c) Michael Weiss2022-03-291-10/+10
* | | Merge pull request #166131 from NixOS/backport-166051-to-release-21.11•••[Backport release-21.11] Linux kernels 2022-03-28Janne Heß2022-03-308-16/+16
|\ \ \
| * | | linux: 5.4.187 -> 5.4.188•••(cherry picked from commit 566270be89071fcc732d20b5d907794b1f13b2e5) TredwellGit2022-03-281-2/+2
| * | | linux: 5.17 -> 5.17.1•••(cherry picked from commit 2ddb5604db46d2b8e30d49ba5db7c87281afafac) TredwellGit2022-03-281-2/+2
| * | | linux: 5.16.17 -> 5.16.18•••(cherry picked from commit aa374b7acb3119ec7c83f3d564942549e24c9fc0) TredwellGit2022-03-281-2/+2
| * | | linux: 5.15.31 -> 5.15.32•••(cherry picked from commit 6c6a932a9e28ef618fce839d545b6867d533ed40) TredwellGit2022-03-281-2/+2
| * | | linux: 5.10.108 -> 5.10.109•••(cherry picked from commit 2abfedc54c38442a6660c3a5569bd53c0ed5aa18) TredwellGit2022-03-281-2/+2
| * | | linux: 4.9.308 -> 4.9.309•••(cherry picked from commit 61df0a1d7dd69a973913fe98efccc6bbdbd206a6) TredwellGit2022-03-281-2/+2
| * | | linux: 4.19.236 -> 4.19.237•••(cherry picked from commit f77a0e19341a9c1b41d0951f30d732de51530221) TredwellGit2022-03-281-2/+2
| * | | linux: 4.14.273 -> 4.14.274•••(cherry picked from commit 9ee8097b31a2f7aed41b7bc1c15d7f3fbee2bc5f) TredwellGit2022-03-281-2/+2
* | | | Merge pull request #166354 from mweinelt/21.11/twisted•••[21.11] python3Packages.twisted: fix CVE-2022-21712ajs1242022-03-301-0/+10
|\ \ \ \
| * | | | python3Packages.twisted: fix CVE-2022-21712•••Twisted versions before 22.1 would leak cookie and authorization headers when following cross-origin redirects in `twisted.web.client.RedirectAgent` and `twisted.web.client.BrowserLikeRedirectAgent`. Fixes: #CVE-2022-21712 Martin Weinelt2022-03-301-0/+10
* | | | | Merge #166382: knot-resolver: 5.4.4 -> 5.5.0 (into release-21.11)Vladimír Čunát2022-03-301-2/+2
|\ \ \ \ \
| * | | | | knot-resolver: 5.4.4 -> 5.5.0•••https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.5.0 (cherry picked from commit a1a2ae2955ba2a97f4680491cee37975c82c92ac) Vladimír Čunát2022-03-301-2/+2
|/ / / / /
* | | | | Merge pull request #164134 from mweinelt/21.11-weechat-wsa-2022-1Martin Weinelt2022-03-301-0/+12
|\ \ \ \ \
| * | | | | weechat: fix certificate validation with modified gnutls options•••Fixes: https://weechat.org/doc/security/WSA-2022-1/ Martin Weinelt2022-03-141-0/+12
* | | | | | Merge pull request #166322 from NixOS/backport-164533-to-release-21.11Martin Weinelt2022-03-301-0/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | nixos/prometheus-exporters/kea: wait for kea•••Fixes race conditions like this: > systemd[1]: Started prometheus-kea-exporter.service. > kea-exporter[927]: Listening on http://0.0.0.0:9547 > kea-exporter[927]: Socket at /run/kea/dhcp4.sock does not exist. Is Kea running? > systemd[1]: prometheus-kea-exporter.service: Main process exited, code=exited, status=1/FAILURE (cherry picked from commit 8b7ca8bdcb949333c5b64839b660d3d0af68565a) Martin Weinelt2022-03-291-0/+4
|/ / / / /
* | | | | Merge pull request #166305 from primeos/chromium-backport•••[21.11] Prepare for backporting Chromium M100Michael Weiss2022-03-294-34/+56
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | chromium: honor systemdSupport•••This commit exposes that support for compilation without systemd, controlled by the global systemdSupport argument. This argument is understood by many other nixpkgs expressions and can be set globally in ~/.config/nixpkgs/config.nix. (cherry picked from commit 5f9ce130b2f99f6cc818428913b1929519757089) Adam Joseph2022-03-291-4/+8
| * | | | chromiumDev: 101.0.4947.0 -> 101.0.4951.7•••(cherry picked from commit a29f5a2eb3c6fecbbf743391e130ef6ebe910863) Michael Weiss2022-03-291-3/+3
| * | | | chromiumBeta: 100.0.4896.46 -> 100.0.4896.56•••(cherry picked from commit ab49a71ae0d7f5d7e4bb5128f6e16ea84f2d6759) Michael Weiss2022-03-291-3/+3
| * | | | chromiumDev: 101.0.4929.5 -> 101.0.4947.0•••(cherry picked from commit 93edc87eac3ba3599ddf0314ac0a05014a8d2045) Michael Weiss2022-03-291-6/+6
| * | | | chromiumBeta: 100.0.4896.30 -> 100.0.4896.46•••(cherry picked from commit 3e7268af67af97ee109b96f0ddba652c08854d99) Michael Weiss2022-03-291-3/+3
| * | | | chromiumDev: 101.0.4919.0 -> 101.0.4929.5•••(cherry picked from commit 7d5373b0bab22db3e708fe9dc3cfbdf5d9b0982e) Michael Weiss2022-03-291-3/+3
| * | | | chromiumBeta: 100.0.4896.20 -> 100.0.4896.30•••(cherry picked from commit 7d5e470e1fdd564d725f1b8db82fe126efcd649f) Michael Weiss2022-03-291-3/+3
| * | | | ungoogled-chromium: inherit upstream's build flags•••This ensures that our build flags for ungoogled-chromium will remain up-to-date with upstream's defaults (also important for avoiding build errors). Co-authored-by: Michael Weiss <dev.primeos@gmail.com> (cherry picked from commit 1122130c6f5b1bd388334ba02f06383ab4ceffa6) Samuel Gräfenstein2022-03-293-18/+36
| * | | | chromiumDev: 100.0.4896.20 -> 101.0.4919.0•••(cherry picked from commit e1185bdd8ffe0e376cb43ab21652a2bc23246042) Michael Weiss2022-03-291-6/+6
| * | | | chromiumDev: 100.0.4896.12 -> 100.0.4896.20•••(cherry picked from commit 691919bf0003817a02fa0c4bb3210a6aa633f03a) Michael Weiss2022-03-291-3/+3
| * | | | chromiumBeta: 99.0.4844.51 -> 100.0.4896.20•••(cherry picked from commit 05aa1711fd50a5fec1eb8397b7616f1cad622e15) Michael Weiss2022-03-291-6/+6
|/ / / /
* | | | Merge pull request #166148 from blaggacao/release-21.11•••[21.11] nixos/default.nix: Use extendModulesRobert Hensing2022-03-291-1/+1
|\ \ \ \
| * | | | nixos/default.nix: Use extendModules•••(cherry picked from commit 8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2) Robert Hensing2022-03-281-1/+1
* | | | | Merge pull request #166204 from NixOS/backport-163914-to-release-21.11•••[Backport release-21.11] sops: 3.7.1 -> 3.7.2Jörg Thalheim2022-03-291-3/+3
|\ \ \ \ \
| * | | | | sops: 3.7.1 -> 3.7.2•••(cherry picked from commit 1a0517507818f0ca726f8daf3708e732e8511ccd) R. Ryantm2022-03-291-3/+3
|/ / / / /
* | | | | Merge pull request #165929 from NixOS/backport-163485-to-release-21.11•••[Backport release-21.11] warzone2100: 4.2.6 -> 4.2.7ajs1242022-03-291-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | warzone2100: 4.2.6 -> 4.2.7•••(cherry picked from commit 997fa335c372056667502a2d877b326fecb79850) Francesco Gazzetta2022-03-271-2/+2
* | | | | Merge pull request #166136 from Flakebi/salt-backportMartin Weinelt2022-03-281-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | salt: 3003.3 -> 3003.4•••Fix some CVEs: https://saltproject.io/security_announcements/salt-security-advisory-release/ Flakebi2022-03-281-2/+2
|/ / / /