summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* spice: 0.14.2 -> 0.15.0•••Fixes CVE-2021-20201. (cherry picked from commit 05c0b157dca604b98d057951715cb01cdfe0e1af) origin/backport-126745-to-release-21.05Thomas Gerbet2021-06-192-34/+3
* Merge pull request #127184 from NixOS/backport-127155-to-release-21.05•••[Backport release-21.05] Kernels 2021-06-17Maximilian Bosch2021-06-198-29/+29
|\
| * linux/hardened/patches/5.4: 5.4.125-hardened1 -> 5.4.126-hardened1•••(cherry picked from commit 98642dcfd9c281266605e672e87552ea65e7f914) TredwellGit2021-06-171-3/+3
| * linux/hardened/patches/5.12: 5.12.10-hardened1 -> 5.12.11-hardened1•••(cherry picked from commit ec53be76f2b5738e6ea66cdf064ab67df3f15ca8) TredwellGit2021-06-171-3/+3
| * linux/hardened/patches/5.10: 5.10.43-hardened1 -> 5.10.44-hardened1•••(cherry picked from commit 9e42f0075a28940382f424121a355449c066ee50) TredwellGit2021-06-171-3/+3
| * linux/hardened/patches/4.19: 4.19.194-hardened1 -> 4.19.195-hardened1•••(cherry picked from commit 00eb48b68b2aff0cb2de7dee6880ed39d5423950) TredwellGit2021-06-171-3/+3
| * linux/hardened/patches/4.14: 4.14.236-hardened1 -> 4.14.237-hardened1•••(cherry picked from commit a7b1c72c5ec814f49dea2bae5e6f413dfbec9efb) TredwellGit2021-06-171-3/+3
| * linux: 5.4.125 -> 5.4.126•••(cherry picked from commit d0860fef8831535bccae0273bfde5eb19841acfc) TredwellGit2021-06-171-2/+2
| * linux: 5.12.10 -> 5.12.11•••(cherry picked from commit 14510ff4ea93d95103e9bf6b189490067caf0f2f) TredwellGit2021-06-171-2/+2
| * linux: 5.10.43 -> 5.10.44•••(cherry picked from commit 5382c2856df5a504650428177d75a40f307c1f66) TredwellGit2021-06-171-2/+2
| * linux: 4.9.272 -> 4.9.273•••(cherry picked from commit b9d8e45251917f347e31fff301ac416f705ed1a0) TredwellGit2021-06-171-2/+2
| * linux: 4.4.272 -> 4.4.273•••(cherry picked from commit ecf27f78d32098e791d2d9944f13eb27d6741924) TredwellGit2021-06-171-2/+2
| * linux: 4.19.194 -> 4.19.195•••(cherry picked from commit c6e07a72e7327407e73287bd531222656ae38bee) TredwellGit2021-06-171-2/+2
| * linux: 4.14.236 -> 4.14.237•••(cherry picked from commit 5efcab85a67f25cdb597ccf860f5751c7b8272d5) TredwellGit2021-06-171-2/+2
* | Merge pull request #127409 from NixOS/backport-127380-to-release-21.05•••[Backport release-21.05] gitea: 1.14.2 -> 1.14.3Maximilian Bosch2021-06-191-2/+2
|\ \
| * | gitea: 1.14.2 -> 1.14.3•••ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.3 (cherry picked from commit d5edee8113b7b0567492568e1c0552b4c7d22771) Maximilian Bosch2021-06-181-2/+2
* | | Merge pull request #126613 from NixOS/backport-125472-to-release-21.05•••[Backport release-21.05] llvmPackages_12.compiler-rt: fix build on darwinRobert Scott2021-06-182-0/+73
|\ \ \
| * | | llvmPackages_12.compiler-rt: fix build on darwin•••``` /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:7: error: use of undeclared identifier 'TARGET_OS_IOS' if (TARGET_OS_IOS || TARGET_OS_TV) return 6; ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:24: error: use of undeclared identifier 'TARGET_OS_TV' if (TARGET_OS_IOS || TARGET_OS_TV) return 6; ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:618:7: error: use of undeclared identifier 'TARGET_OS_WATCH' if (TARGET_OS_WATCH) return 13; ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:7: error: use of undeclared identifier 'TARGET_OS_IOS' if (TARGET_OS_IOS || TARGET_OS_TV) ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:24: error: use of undeclared identifier 'TARGET_OS_TV' if (TARGET_OS_IOS || TARGET_OS_TV) ^ /tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:689:12: error: use of undeclared identifier 'TARGET_OS_WATCH' else if (TARGET_OS_WATCH) ^ 6 errors generated. ``` (cherry picked from commit cf4e1b9e62ab987552eb676f7618ea085f12a751) Dmitry Kalinkin2021-06-112-0/+73
* | | | Merge pull request #127403 from NixOS/backport-127159-to-release-21.05•••[Backport release-21.05] bosh-cli: 6.4.3 -> 6.4.4Robert Scott2021-06-181-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | bosh-cli: 6.4.3 -> 6.4.4•••(cherry picked from commit dd1b9306467d6ad3cfaabfb0d8d5a79c8c76404b) R. RyanTM2021-06-181-2/+2
|/ / /
* | | Merge pull request #126631 from NixOS/backport-126601-to-release-21.05•••[Backport release-21.05] bosh-cli: init at 6.4.3Robert Scott2021-06-182-0/+45
|\ \ \
| * | | bosh-cli: init at 6.4.3•••(cherry picked from commit 8f3bf74e1c1689e8c04f83a2c4cf58b38c17ab33) Robert Scott2021-06-112-0/+45
* | | | makeDBusConf: make apparmor argument optional•••The only in-tree use of this is the DBus NixOS module, which always passes apparmor (but the services.dbus.apparmor option defaults to "disabled"). Set the default in the function as well so other users of the function can take advantage of it. (cherry picked from commit e9f45cc69d6fb2a2e2446ce9606eb7e9c376959f) Alyssa Ross2021-06-171-1/+1
| |_|/ |/| |
* | | Merge pull request #126553 from NixOS/backport-126422-to-release-21.05•••[Backport release-21.05] apacheHttpd: 2.4.47 -> 2.4.48Martin Weinelt2021-06-171-2/+2
|\ \ \
| * | | apacheHttpd: 2.4.47 -> 2.4.48•••(cherry picked from commit 8da3370dbd62379bbc14fc57ba04a10f7456690f) Alyssa Ross2021-06-111-2/+2
* | | | Merge pull request #127141 from NixOS/backport-125770-to-release-21.05•••[Backport release-21.05] nixos/acme: Remove an incorrect assertion from testsMartin Weinelt2021-06-171-3/+0
|\ \ \ \
| * | | | nixos/acme: Remove an incorrect assertion from tests•••Commit 3a2e0c36e79cecaf196cbea23e75e74710140ea4 has removed `--reuse-key` from default renew options, yet the tests still expected keys not to change. This assertion is now removed, as they are supposed to change on each renew/change. (cherry picked from commit b00bcf21abc392ecb1d93bd49f7a5ffbc8524ecf) Mewp2021-06-161-3/+0
|/ / / /
* | | | Merge pull request #127122 from NixOS/backport-123843-to-release-21.05Sandro2021-06-161-0/+10
|\ \ \ \
| * | | | Update pkgs/misc/emulators/ppsspp/default.nix•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 89cbb28f64b3406164e61cd1fcd7504a89b6e8fd) lunik12021-06-161-1/+2
| * | | | ppsspp: fix build against ffmpeg 4.4•••(cherry picked from commit babd906230da851b27fb66f18b90a2beac4c7ddd) lunik12021-06-161-0/+9
* | | | | microcodeIntel: 20210216 -> 20210608•••(cherry picked from commit d94f35f69bff4eff7655279d45793003338f5c3c) Martin Weinelt2021-06-161-2/+2
* | | | | discord-canary: 0.0.124 -> 0.0.125•••(cherry picked from commit 7c7adc7b20aaf99b611b3ce666616f776bd21fee) Artturin2021-06-161-2/+2
* | | | | doc/gnome: document GIO modules•••In particular, that glib-networking is required for TLS support. (cherry picked from commit 653bd18d5192d79254ef6961a54dea01f7bb11f2) Jan Tojnar2021-06-161-1/+19
* | | | | ptcollab: 0.4.0 -> 0.4.1•••(cherry picked from commit dffffdc912c6dfc3690f31edb55a51c2becffa6a) OPNA26082021-06-161-8/+4
|/ / / /
* | | | Merge pull request #127113 from NixOS/backport-127109-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.4.1 -> 5.5.0Michael Weiss2021-06-161-2/+2
|\ \ \ \
| * | | | signal-desktop: 5.4.1 -> 5.5.0•••(cherry picked from commit fcda0d80a392240abdf12351b78ab32c6eaff62e) Michael Weiss2021-06-161-2/+2
|/ / / /
* | | | Merge pull request #127105 from NixOS/backport-127050-to-release-21.05Sandro2021-06-161-3/+3
|\ \ \ \
| * | | | deno: 1.11.0 -> 1.11.1•••(cherry picked from commit a58e5facde96ec107ac4b92cffbd48a231a75fc5) 06kellyjac2021-06-161-3/+3
|/ / / /
* | | | ocamlPackages.lwt: 5.4.0 → 5.4.1•••(cherry picked from commit 13e6c217524f53e44e65a55d58461b12fadc2043) Vincent Laporte2021-06-161-2/+2
* | | | Merge pull request #127076 from NixOS/backport-127044-to-release-21.05Martin Weinelt2021-06-161-3/+5
|\ \ \ \
| * | | | knot-dns: add passthru.tests•••I hope I got the conventions right (found in doc/stdenv/meta.chapter.md) (cherry picked from commit cf0b179b5ea78ff8fd34763c48da4323739fa5fb) Vladimír Čunát2021-06-161-1/+3
| * | | | knot-dns: 3.0.6 -> 3.0.7•••Fixes various bugs and introduces a few requested features. https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.7 (cherry picked from commit 28dd3b6177dae61005cfdaebac405e8dbf70b2dc) Vladimír Čunát2021-06-161-2/+2
|/ / / /
* | | | Merge pull request #125567 from risicle/ris-python-websockets-CVE-2018-100051...•••[21.05] python3Packages.websockets: add patch for CVE-2021-33880Robert Schütz2021-06-161-0/+10
|\ \ \ \
| * | | | python3Packages.websockets: add patch for CVE-2021-33880•••this is a reintroduction of CVE-2018-1000518 which i had been calling CVE-2018-1000518-redux before it got its own CVE assigned (cherry picked from commit aba83e7f878d6c48e781a3934a79f98b072bb659) (yes, a forward cherry-pick because i fully expected the websockets 9.1 to make it into 21.05) Robert Scott2021-06-091-0/+10
* | | | | Merge pull request #126933 from NixOS/backport-126924-to-release-21.05•••[Backport release-21.05] chromium: 91.0.4472.101 -> 91.0.4472.106Michael Weiss2021-06-161-6/+6
|\ \ \ \ \
| * | | | | chromium: 91.0.4472.101 -> 91.0.4472.106•••https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop_14.html (cherry picked from commit 8540133fb7db4ad988ea2844c429b8b547dde370) Michael Weiss2021-06-151-6/+6
* | | | | | Merge pull request #127016 from mweinelt/21.05/solanumMartin Weinelt2021-06-163-19/+11
|\ \ \ \ \ \
| * | | | | | solanum: clarify license to be gpl2 or later•••(cherry picked from commit 2441e82399ad349bac570cbbe72cfe1b3158cc59) Martin Weinelt2021-06-161-1/+1
| * | | | | | nixos/solanum: implement reload and allow config changes•••Reload only works with a static configuration path as there is no way to pass the dynamically generated config path to a running solanum instance, therefore we symlink the configuration to /etc/solanum/ircd.conf. But that will prevent reloads of the ircd, because the systemd unit wouldn't change when the configuration changes. That is why we add the actual location of the config file to restartTriggers and enable reloadIfChanged, so changes will not restart, but reload on changes. (cherry picked from commit 60c62214f5a3c7db6aa30d8a8e02c863b6abcf0a) Martin Weinelt2021-06-161-2/+10
| * | | | | | solanum: remove obsolete BANDB settings/patches•••(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80) lassulus2021-06-163-16/+0
generated by cgit v1.2.3 (git 2.52.0) at 2026-08-19 23:49:40 +0000