summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* qutebrowser: 2.3.1 -> 2.4.0•••(cherry picked from commit ba4c80bcec1bdff0a517aed5bca206684208b167) origin/backport-142535-to-release-21.05Charlotte Van Petegem2021-11-301-2/+2
* Merge pull request #147951 from NixOS/backport-147894-to-release-21.05•••[Backport release-21.05] fira-code: 5.2 → 6Thiago Kenji Okada2021-11-291-2/+2
|\
| * fira-code: 5.2 → 6•••(cherry picked from commit 4d3ed16dd8182d647abb7735912bdf61088aa2b9) Fabián Heredia Montiel2021-11-291-2/+2
|/
* Merge pull request #147940 from NixOS/backport-134485-to-release-21.05•••[Backport release-21.05] uclibc: 1.0.37 -> 1.0.38Ryan Burns2021-11-291-2/+2
|\
| * uclibc: 1.0.37 -> 1.0.38•••(cherry picked from commit 925fc9c700b112ce2c77d53d013adef147d30a63) R. RyanTM2021-11-291-2/+2
|/
* Merge pull request #147876 from NixOS/backport-143974-to-release-21.05Artturi2021-11-295-5/+58
|\
| * freeswitch: 1.10.6 -> 1.10.7•••(cherry picked from commit 88f3af6d1e961a273af99a3c050737f090ee3fbe) misuzu2021-11-292-3/+6
| * libks: init at 1.7.0•••(cherry picked from commit 40b22c0172ee6602e440b65a376b47ce483bb2f3) misuzu2021-11-292-0/+50
| * sofia-sip: 1.13.3 -> 1.13.6•••(cherry picked from commit a74bb811a11a18d576397411ec24b0c20f974ec0) misuzu2021-11-291-2/+2
* | Merge pull request #147919 from 0x4A6F/backport-145348-to-release-21.05Martin Weinelt2021-11-291-6/+9
|\ \ | |/ |/|
| * routinator: 0.10.1 -> 0.10.2•••(cherry picked from commit a5f1139b5423c818b8fd5fe58c6cff43ae29a134) 0x4A6F2021-11-291-6/+9
|/
* Merge pull request #147723 from helsinki-systems/bkp/21.05/php•••[21.05] php74: 7.4.25 -> 7.4.26, php80: 8.0.12 -> 8.0.13Maximilian Bosch2021-11-293-4/+5
|\
| * php80Extensions.xmlreader: fix build•••manual backport of cede244af9bbda364b2f27892984d78923d5a6ed ajs1242021-11-281-0/+1
| * php80: 8.0.12 -> 8.0.13•••Fixes CVE-2021-21707 (cherry picked from commit 6dfffc7d4918560eb3015a6e90e8e1b7959f16bf) ajs1242021-11-281-2/+2
| * php74: 7.4.25 -> 7.4.26•••Fixes CVE-2021-21707 (cherry picked from commit 183cc6ea800548e6b62bd1f972caee25813b3904) ajs1242021-11-281-2/+2
* | Merge pull request #147796 from mweinelt/21.05/mediawikiMartin Weinelt2021-11-291-2/+2
|\ \ | |/ |/|
| * mediawiki: 1.35.2 -> 1.35.4Martin Weinelt2021-11-291-2/+2
|/
* Merge pull request #142029 from risicle/ris-libressl-CVE-2021-41581-r21.05Martin Weinelt2021-11-282-0/+56
|\
| * libressl_3_2: add patch for CVE-2021-41581•••(cherry picked & modified from commit 01cc988d9669f29855d82175a4614d90aa4bfe75) Robert Scott2021-10-172-0/+56
* | Merge pull request #139965 from risicle/ris-wolfssl-CVE-2021-38597-r21.05•••[21.05] wolfssl: add patch for CVE-2021-38597Robert Scott2021-11-271-0/+5
|\ \
| * | wolfssl: add patch for CVE-2021-38597Robert Scott2021-09-291-0/+5
* | | org-packages 2021-09-29 (#143880)•••(cherry picked from commit a9dffd937eeb152630938b9b3c9328192e1334be) Co-authored-by: AndersonTorres <torres.anderson.85@protonmail.com>Benjamin Staffin2021-11-261-6/+6
* | | Merge pull request #147518 from NixOS/backport-147382-to-release-21.05•••[Backport release-21.05] varnish60: 6.0.8 -> 6.0.9Thiago Kenji Okada2021-11-261-2/+2
|\ \ \
| * | | varnish60: 6.0.8 -> 6.0.9•••(cherry picked from commit 31fdf8b75e8fb9b5593644405d650d0ad8341a6f) ajs1242021-11-261-2/+2
|/ / /
* | | Merge pull request #134956 from NixOS/backport-134829-to-release-21.05Janne Heß2021-11-252-11/+11
|\ \ \
| * | | sogo: 5.1.1 -> 5.2.0•••https://github.com/inverse-inc/sogo/releases/tag/SOGo-5.2.0 (cherry picked from commit 5fdc39a49dbc39f044bfe2d86e3cfe697e5e60e3) origin/backport-134829-to-release-21.05ajs1242021-08-201-7/+7
| * | | sope: 5.1.1 -> 5.2.0•••(cherry picked from commit 794ebddc8895fa591b1cd0c9763d40d97ac5fc4f) ajs1242021-08-201-4/+4
* | | | Merge pull request #142842 from NixOS/backport-118960-to-release-21.05Artturi2021-11-251-0/+16
|\ \ \ \
| * | | | nixos/nix-daemon: assert system or systems for buildMachines.•••Commit 5395397f removed the assertions from the buildMachines to ensure that either system or systems is set for each buildmachine. This patch re-implements those assertions. The symptom is that if both system and systems are omitted, then the /etc/machines file has the wrong number of columns and any attempt to run a `nix` operation that has to perform a build will fail with a `strtoull` exception. (cherry picked from commit 58921a49040285b76da8575fc3dd3d41fc42f895) Kevin Quick2021-10-251-0/+16
* | | | | Merge pull request #147283 from NixOS/backport-147097-to-release-21.05•••[Backport release-21.05] bazel_4: Fix Bazel-built protoc segfault on macOS MontereyWael Nasreddine2021-11-251-1/+9
|\ \ \ \ \
| * | | | | bazel_4: Fix Bazel-built protoc segfault on macOS Monterey•••This was fixed by enabling the user_link_flags_feature for macosx cc_toolchain_config. References: - https://github.com/bazelbuild/bazel/issues/14216 - https://github.com/bazelbuild/bazel/pull/14275 (cherry picked from commit dc8d4f31132eece959b481e30949ba5e3308e5ea) Wael M. Nasreddine2021-11-241-1/+9
* | | | | | Merge pull request #146978 from blitz/onedrive-backport•••[21.05] onedrive: 2.4.11 -> 2.4.13Jacek Galowicz2021-11-251-8/+20
|\ \ \ \ \ \
| * | | | | | onedrive: 2.4.12 -> 2.4.13•••(cherry picked from commit daae03bb4fa8d65486ed9b9b36a9b8f871ddc2a2) R. RyanTM2021-11-221-2/+2
| * | | | | | onedrive: 2.4.11 -> 2.4.12•••(cherry picked from commit 4489d3e844ef848b1eeb88804a3e81637e47a06a) Peter Hoeg2021-11-221-8/+20
* | | | | | | Merge pull request #147317 from NixOS/backport-145107-to-release-21.05•••[Backport release-21.05] build-support/rust: Fix sysroot for crossJohn Ericson2021-11-247-46/+95
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | build-support/rust/sysroot/src: Use `dont*` instead of phase list•••Making this separate commit because the original was moved out just the way it was done before. (cherry picked from commit 05efb8ed913d5b0eee3736652fb91befc5e04233) John Ericson2021-11-241-1/+5
| * | | | | | Update script as rust-src layout has changed•••Use stub lib so `core` and `alloc` are handled symmetrically. (cherry picked from commit c9c3de0131c565bf5a7f0e2249cd26f6e7acb172) John Ericson2021-11-244-19/+41
| * | | | | | build-support/rust: Split out sysroot src derivation•••Hoping to make it usable for `buildRustCrate` too. (cherry picked from commit cbd00bab803b03cacbea27d442c60e719a804992) John Ericson2021-11-245-11/+23
| * | | | | | rustcSrc: Reduce duplication•••(cherry picked from commit 2c7f62379f7c65d573892ba89eefb5631d721ba8) John Ericson2021-11-241-5/+16
|/ / / / / /
* | | | | | Merge pull request #146640 from imlonghao/borgmatic/release-21.05•••[Backport release-21.05] borgmatic: 1.5.12 -> 1.5.18Janne Heß2021-11-241-8/+4
|\ \ \ \ \ \
| * | | | | | borgmatic: 1.5.12 -> 1.5.18imlonghao2021-11-191-8/+4
* | | | | | | Merge pull request #147258 from NixOS/backport-146322-to-release-21.05•••[Backport release-21.05] translate-shell: added missing (runtime) dependency on hexdumpThiago Kenji Okada2021-11-241-1/+2
|\ \ \ \ \ \ \
| * | | | | | | translate-shell: fixed indentation in default.nix•••(cherry picked from commit 907ac61491a228a85d7669b9e6b518af9b370fdd) GOKOP2021-11-241-1/+1
| * | | | | | | translate-shell: added missing dependency on hexdump•••(cherry picked from commit 9e2669e4cdafaa28d444793cfb9031188b2ead59) GOKOP2021-11-241-1/+2
* | | | | | | | Merge pull request #145677 from yayayayaka/gitlab-14.4.2-21.05•••[Backport release-21.05] gitlab: 14.4.1 -> 14.4.2Kim Lindberger2021-11-243-8/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [Backport release-21.05] gitlab: 14.4.1 -> 14.4.2Lara2021-11-123-8/+8
* | | | | | | | Merge pull request #147137 from Ma27/backport-kernels•••[21.05] Kernel backportsThiago Kenji Okada2021-11-236-10/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | linux: do not build in DRM_SIMPLEDRM on newer kernels•••After linux 5.14.11 FB_SIMPLE conflicts with DRM_SIMPLEDRM, which will fail configuration, when DRM_SIMPLEDRM is configured as a module and FB_SIMPLE gets requested as builtin. Do not enable DRM_SIMPLEDRM as a temporary workaround, until good enough migration path is found. (cherry picked from commit 2ef28fb77d9f307a152468106be26204e22dd325) Emil Karlson2021-11-231-0/+2
| * | | | | | | | linux_latest-libre: 18473 -> 18484•••(cherry picked from commit 541a3a73327ae9a9169e67b586880198ce14faef) TredwellGit2021-11-231-2/+2
| * | | | | | | | linux: 5.4.160 -> 5.4.161•••(cherry picked from commit 392ccc54319d5330e43348e721c10a988e527be5) TredwellGit2021-11-231-2/+2