summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2022-04-06prometheus-node-exporter: Remove backslashes in ExecStart scriptfix-node-exporter-backslash-in-exec-tmpMatthias Beyer
According to 41c6d7adfcad4ed4fc6f22140ab6c4285348d89c and https://github.com/NixOS/nixpkgs/issues/63533 having backslashes prevents systemd from successfully parsing the unit file and therefore results in prometheus-node-exporter not starting. This patch removes the backslashes from the ExecStart script. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2022-03-30Merge pull request #166354 from mweinelt/21.11/twistedajs124
[21.11] python3Packages.twisted: fix CVE-2022-21712
2022-03-30Merge #166382: knot-resolver: 5.4.4 -> 5.5.0 (into release-21.11)Vladimír Čunát
2022-03-30knot-resolver: 5.4.4 -> 5.5.0Vladimír Čunát
https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.5.0 (cherry picked from commit a1a2ae2955ba2a97f4680491cee37975c82c92ac)
2022-03-30Merge pull request #164134 from mweinelt/21.11-weechat-wsa-2022-1Martin Weinelt
2022-03-30python3Packages.twisted: fix CVE-2022-21712Martin Weinelt
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
2022-03-30Merge pull request #166322 from NixOS/backport-164533-to-release-21.11Martin Weinelt
2022-03-29nixos/prometheus-exporters/kea: wait for keaMartin Weinelt
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)
2022-03-29Merge pull request #166305 from primeos/chromium-backportMichael Weiss
[21.11] Prepare for backporting Chromium M100
2022-03-29chromium: honor systemdSupportAdam Joseph
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)
2022-03-29chromiumDev: 101.0.4947.0 -> 101.0.4951.7Michael Weiss
(cherry picked from commit a29f5a2eb3c6fecbbf743391e130ef6ebe910863)
2022-03-29chromiumBeta: 100.0.4896.46 -> 100.0.4896.56Michael Weiss
(cherry picked from commit ab49a71ae0d7f5d7e4bb5128f6e16ea84f2d6759)
2022-03-29chromiumDev: 101.0.4929.5 -> 101.0.4947.0Michael Weiss
(cherry picked from commit 93edc87eac3ba3599ddf0314ac0a05014a8d2045)
2022-03-29chromiumBeta: 100.0.4896.30 -> 100.0.4896.46Michael Weiss
(cherry picked from commit 3e7268af67af97ee109b96f0ddba652c08854d99)
2022-03-29chromiumDev: 101.0.4919.0 -> 101.0.4929.5Michael Weiss
(cherry picked from commit 7d5373b0bab22db3e708fe9dc3cfbdf5d9b0982e)
2022-03-29chromiumBeta: 100.0.4896.20 -> 100.0.4896.30Michael Weiss
(cherry picked from commit 7d5e470e1fdd564d725f1b8db82fe126efcd649f)
2022-03-29ungoogled-chromium: inherit upstream's build flagsSamuel Gräfenstein
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)
2022-03-29chromiumDev: 100.0.4896.20 -> 101.0.4919.0Michael Weiss
(cherry picked from commit e1185bdd8ffe0e376cb43ab21652a2bc23246042)
2022-03-29chromiumDev: 100.0.4896.12 -> 100.0.4896.20Michael Weiss
(cherry picked from commit 691919bf0003817a02fa0c4bb3210a6aa633f03a)
2022-03-29chromiumBeta: 99.0.4844.51 -> 100.0.4896.20Michael Weiss
(cherry picked from commit 05aa1711fd50a5fec1eb8397b7616f1cad622e15)
2022-03-29Merge pull request #166148 from blaggacao/release-21.11Robert Hensing
[21.11] nixos/default.nix: Use extendModules
2022-03-29Merge pull request #166204 from NixOS/backport-163914-to-release-21.11Jörg Thalheim
[Backport release-21.11] sops: 3.7.1 -> 3.7.2
2022-03-29sops: 3.7.1 -> 3.7.2R. Ryantm
(cherry picked from commit 1a0517507818f0ca726f8daf3708e732e8511ccd)
2022-03-29Merge pull request #165929 from NixOS/backport-163485-to-release-21.11ajs124
[Backport release-21.11] warzone2100: 4.2.6 -> 4.2.7
2022-03-28nixos/default.nix: Use extendModulesRobert Hensing
(cherry picked from commit 8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2)
2022-03-28Merge pull request #166136 from Flakebi/salt-backportMartin Weinelt
2022-03-28salt: 3003.3 -> 3003.4Flakebi
Fix some CVEs: https://saltproject.io/security_announcements/salt-security-advisory-release/
2022-03-28gitlab: 14.8.4 -> 14.9.1 (#166079)Yaya
2022-03-28linux_latest: 5.16.14 -> 5.17Alyssa Ross
(cherry picked from commit 58ae11758e853ac307b4cd1032d2f0436a77bc50)
2022-03-28linuxPackages.openafs: mark broken on Linux 5.17Alyssa Ross
(cherry picked from commit 3a06e285c9ec97a32c8f3fc93cc6dfe0c902f8ed)
2022-03-28linuxPackages.rtl8821ce: mark broken on Linux 5.17Alyssa Ross
(cherry picked from commit 2f9822b6593444ad55c255068e0f11f673fcd346)
2022-03-28linuxPackages.r8168: mark broken on Linux 5.17Alyssa Ross
(cherry picked from commit 6d43305b8987fea18a0c2fe7a5625acd63a57278)
2022-03-28linuxPackages.virtualboxGuestAdditions: mark broken on Linux 5.17Alyssa Ross
This package is slightly out of date, but 6.1.32 doesn't fix 5.17 compatibility either. (cherry picked from commit 69af0d17174ee60f75e6e9f4d74c2152f4e7968e)
2022-03-28Merge pull request #166095 from helsinki-systems/upd/pdns-recursorMichele Guerini Rocco
[21.11] pdns-recursor: 4.5.7 -> 4.5.8
2022-03-28pdns-recursor: 4.5.7 -> 4.5.8ajs124
corresponds to e501354c13f89ac0671883ade1459b3353c39121 on master
2022-03-28Merge pull request #166082 from mweinelt/21.11/pdnsMartin Weinelt
2022-03-28powerdns: apply patch for ixfr validation issueMartin Weinelt
The PowerDNS version we ship on release-21.11 went EOL in january, so there are no explicit patches for 4.3.1, however the patches for 4.4.2 apply cleanly and the tests are still passing. https://blog.powerdns.com/2022/03/25/security-advisory-2022-01-for-powerdns-authoritative-server-4-4-2-4-5-3-4-6-0-and-powerdns-recursor-4-4-7-4-5-7-4-6-0/ Fixes: CVE-2022-27227
2022-03-28Merge pull request #166042 from NixOS/backport-165946-to-release-21.11Maximilian Bosch
[Backport release-21.11] strace: 5.16 -> 5.17
2022-03-28Merge pull request #165847 from lheckemann/nix-backportMaximilian Bosch
[21.11] nix_2_7: init
2022-03-28strace: 5.16 -> 5.17Maximilian Bosch
ChangeLog: https://github.com/strace/strace/releases/tag/v5.17 (cherry picked from commit df698858835ebd614d15773267fc4071c8da1139)
2022-03-28Merge pull request #166000 from NixOS/backport-165995-to-release-21.11Michael Weiss
[Backport release-21.11] ungoogled-chromium: 99.0.4844.82 -> 99.0.4844.84
2022-03-27Merge pull request #165953 from NixOS/backport-165933-to-release-21.11Maximilian Bosch
[Backport release-21.11] Linux kernels 2022-03-23
2022-03-27ungoogled-chromium: 99.0.4844.82 -> 99.0.4844.84Michael Weiss
(cherry picked from commit d037e72af94319c963d09f793ea5a9a2878c2d7f)
2022-03-27Merge pull request #165941 from NixOS/backport-165437-to-release-21.11Sandro
2022-03-27linux_latest-libre: 18635 -> 18664TredwellGit
(cherry picked from commit 00e6bef2a6c0ef03e288d99ba61d3827d16edbc5)
2022-03-27linux: 5.4.186 -> 5.4.187TredwellGit
(cherry picked from commit bc04900afa1eef46fbfc1b1cef8ca0194b269c39)
2022-03-27linux: 5.16.16 -> 5.16.17TredwellGit
(cherry picked from commit 0cbdca520de04ca16a6c2b5b76ce0ee72f2ba970)
2022-03-27linux: 5.15.30 -> 5.15.31TredwellGit
(cherry picked from commit a8443f0ce49e841b1c6f06c6fd42646263abca50)
2022-03-27linux: 5.10.107 -> 5.10.108TredwellGit
(cherry picked from commit 7bfe0eec2b7abae215b55604852852865e2fb1e5)
2022-03-27linux: 4.9.307 -> 4.9.308TredwellGit
(cherry picked from commit 2dec7aec6d5f5837276f6638c3da5e55df95993c)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 19:02:06 +0000