summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* udisks2: Add freedesktop team to maintainers•••(cherry picked from commit c0bd9a8b4618955a13e6c8ee7cab36cc3f9f50ca) origin/backport-163926-to-release-21.11Jan Tojnar2022-03-161-1/+1
* udisks2: correct patch•••This was forgotten during https://github.com/NixOS/nixpkgs/pull/147606 (cherry picked from commit 39f7bd4d6957c9a45a86b86c7389eec5de0ae03c) Jan Tojnar2022-03-162-17/+22
* Merge branch 'staging-21.11' into release-21.11•••It's very simple change, so let's utilize the fact that we're rebuilding due to openssl already. Vladimír Čunát2022-03-151-2/+2
|\
| * Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-158-35/+85
| |\
| | * Merge release-21.11 into staging-next-21.11github-actions[bot]2022-03-158-35/+85
| | |\
| * | \ Merge pull request #163984 from NixOS/backport-155261-to-staging-21.11Sandro2022-03-141-2/+2
| |\ \ \
| | * | | udisks: move util-linux to buildInputs•••This fixes cross compilation. (cherry picked from commit 9742335d83c2784980d8adb5630689efd87e6c5b) Joerie de Gram2022-03-131-2/+2
| * | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-145-5/+33
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-03-145-5/+33
| | |\ \
| * | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-1324-1249/+1178
| |\| | |
| | * | | Merge release-21.11 into staging-next-21.11github-actions[bot]2022-03-1324-1249/+1178
| | |\ \ \
| * | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-1211-32/+32
| |\| | | |
| * | | | | Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-1122-285/+291
| |\ \ \ \ \
| * \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-105-405/+405
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-095-10/+44
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0811-286/+372
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-077-54/+66
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0622-709/+749
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-055-17/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-047-134/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0342-37/+2458
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-024-26/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next-21.11 into staging-21.11github-actions[bot]2022-03-0137-394/+505
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #164303: openssl*: 1.1.1m -> 1.1.1.n; 3.0.1 -> 3.0.2•••...into release-21.11. High-severity security fixes. Vladimír Čunát2022-03-151-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | openssl_1_1: 1.1.1m -> 1.1.1n•••https://github.com/openssl/openssl/blob/OpenSSL_1_1_1n/CHANGES#L10 Fixes: CVE-2022-0778 (cherry picked from commit 72bb369245a84beaa5596f8ed551be470a20d6b2) Martin Weinelt2022-03-151-2/+2
| * | | | | | | | | | | | | | | | | openssl_3_0: 3.0.1 -> 3.0.2•••https://github.com/openssl/openssl/blob/openssl-3.0.2/CHANGES.md#changes-between-301-and-302-15-mar-2022 Fixes: CVE-2022-0778 (cherry picked from commit 384a708e6dca86ceda3d4867233153e781ad052c) Martin Weinelt2022-03-151-2/+2
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #164250 from NixOS/backport-164108-to-release-21.11•••[Backport release-21.11] wiki-js: 2.5.274 -> 2.5.276Maximilian Bosch2022-03-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | wiki-js: 2.5.274 -> 2.5.276•••ChangeLog: * https://github.com/Requarks/wiki/releases/tag/v2.5.275 * https://github.com/Requarks/wiki/releases/tag/v2.5.276 (cherry picked from commit 024abf923b256921e47143237f7d73c1e3846911) Maximilian Bosch2022-03-151-3/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | nheko: 0.9.1 -> 0.9.2•••(cherry picked from commit a8927248984fd57a9540ebb673a851c54f9033e3) (integrating 7e2fbbfb2480eb1d40a0e91dd5032ba147cb565c as well) Francesco Gazzetta2022-03-141-4/+16
* | | | | | | | | | | | | | | | | Update pkgs/applications/virtualization/open-vm-tools/default.nix•••(cherry picked from commit 435a197faa52844b1d101c12f1be6214ac8a729f) Sandro2022-03-141-1/+1
* | | | | | | | | | | | | | | | | open-vm-tools: 11.3.5 -> 12.0.0•••Switches to fuse3 and applies a patch for array out of bounds See https://github.com/vmware/open-vm-tools/blob/master/ReleaseNotes.md (cherry picked from commit ff614973c5889f4308e92d39a8c2f70626d0ec5a) Jeremy Kolb2022-03-141-5/+20
* | | | | | | | | | | | | | | | | vscodium: 1.65.1 -> 1.65.2•••(cherry picked from commit f03b1a937e3bfd692ae5154a1eb5245810b269cc) nixpkgs-upkeep-bot2022-03-141-5/+5
* | | | | | | | | | | | | | | | | Merge pull request #164173 from risicle/ris-nats-streaming-server-CVE-2022-26...Martin Weinelt2022-03-152-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | nats-streaming-server: add patch for CVE-2022-26652Robert Scott2022-03-142-0/+43
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #164137 from NixOS/backport-164126-to-release-21.11Martin Weinelt2022-03-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | firefox: 98.0 -> 98.0.1•••https://www.mozilla.org/en-US/firefox/98.0.1/releasenotes/ (cherry picked from commit 552cfc008a9a07690f5f07c5f9002d717b71f537) Martin Weinelt2022-03-141-2/+2
* | | | | | | | | | | | | | | | | Merge pull request #164138 from NixOS/backport-164056-to-release-21.11Martin Weinelt2022-03-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | firefox-esr-91-unwrapped: 91.7.0esr -> 91.7.1esr•••(cherry picked from commit 7f25d6e079104fb574b4b505218709c06bfb3229) R. Ryantm2022-03-141-2/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #164031 from Mic92/nix-eval-jobs•••[21.11] nix-eval-jobs: fix buildJörg Thalheim2022-03-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | nix-eval-jobs: fix buildJörg Thalheim2022-03-131-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | wget: 1.21.2 -> 1.21.3•••(cherry picked from commit 1d76c5b6696e4202852310c84d3c35675ebc9113) Alyssa Ross2022-03-141-2/+2
* | | | | | | | | | | | | | | | tuxguitar: 1.5.4 -> 1.5.5•••Fixes: CVE-2020-14940 (cherry picked from commit ce6c41ac6deecc8e5ae3c2ca8fed8bbf2edd70ea) Alyssa Ross2022-03-141-3/+3
* | | | | | | | | | | | | | | | obsidian: 0.13.23 -> 0.13.30 (#160469)•••(cherry picked from commit 64a0f750dba08e09a10c91f7f06ff0cd3ecbf93a) Dmitriy2022-03-141-4/+5
* | | | | | | | | | | | | | | | factorio-experimental: 1.1.53 -> 1.1.56•••(cherry picked from commit 90aa1ce3cc6571c78eb3e29caef14f22079bfa8b) Philipp Riegger2022-03-141-12/+12
* | | | | | | | | | | | | | | | factorio-*: 1.1.50->1.1.53•••(cherry picked from commit 5cfcd0b5b28d3f62c0e6a0a59878613b9f03c4dc) Charlotte 🦝 Delenk2022-03-141-20/+28
* | | | | | | | | | | | | | | | factorio-experimental: 1.1.48 -> 1.1.50•••(cherry picked from commit c813baeb0fc79db0cf8f5e4fd4cb8132a4e4aaf9) Raito Bezarius2022-03-141-20/+20
* | | | | | | | | | | | | | | | factorio: 1.1.46 -> 1.1.48•••(cherry picked from commit 62363f5e19d3297813fd933a092e304f1bf1b416) Luke Granger-Brown2022-03-141-8/+8
* | | | | | | | | | | | | | | | factorio-experimental: 1.1.45 -> 1.1.48•••(cherry picked from commit 0d0763c9518d9d39859475f824518a644ef9e573) Luke Granger-Brown2022-03-141-8/+8
* | | | | | | | | | | | | | | | Merge pull request #164009 from risicle/ris-nats-server-CVE-2022-26652-r21.11•••[21.11] nats-server: add patch for CVE-2022-26652Robert Scott2022-03-142-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | nats-server: add patch for CVE-2022-26652Robert Scott2022-03-142-0/+41