summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixup! texlive: allow substitutes for texlive packages•••(cherry picked from commit 54cd3b840d4043322da7cfefd3a7d8ee80d68bc4) origin/backport-126458-to-release-21.05Vincenzo Mantova2021-06-141-0/+1
* texlive: allow substitutes for texlive packages•••(cherry picked from commit 0f1e7e09b56cc8d98c5d02b87dd2626be9456d9c) Vincenzo Mantova2021-06-141-2/+1
* Merge pull request #126824 from NixOS/backport-126812-to-release-21.05•••[Backport release-21.05] gitlab: 13.12.2 -> 13.12.3Kim Lindberger2021-06-146-26/+24
|\
| * gitlab: 13.12.2 -> 13.12.3•••(cherry picked from commit d62aac819bc3140514098f646cdca8999938b194) Milan Pässler2021-06-146-26/+24
|/
* sqlite tools: fix download hash after update•••Clearly a copy&paste error in commit 14a274763e. Now it builds. (cherry picked from commit 34c88a4d5c6e530ac2516b8e54b016696fd8995e) Vladimír Čunát2021-06-141-1/+1
* nvidia-optical-flow-sdk: 1.0 -> 2.0•••(cherry picked from commit 04e8ab8fdf8c8009741a8ebb26e4cd8e2cb6bd61) Artturin2021-06-131-4/+3
* opencv: update cuda_opt_flow.patch•••(cherry picked from commit e3ec283df10cbe5e87c240d28afd81c72f8226b2) Artturin2021-06-132-25/+26
* ocamlPackages.ppx_import: disable checks•••(cherry picked from commit ecf820740a0b576361dac53778a4e6e2e6338287) Vincent Laporte2021-06-142-13/+1
* Merge pull request #126502 from NixOS/backport-126468-to-release-21.05•••[Backport release-21.05] tmux: 3.2 -> 3.2aMaximilian Bosch2021-06-131-12/+2
|\
| * tmux: 3.2 -> 3.2a•••(cherry picked from commit a192797f61e149864de36144541ce73f0f2d70a8) Mario Rodas2021-06-101-12/+2
* | imagemagick6: 6.9.12-14 -> 6.9.12-15•••(cherry picked from commit 929ddc6fa567c99bfaeada7927f6e52ef4de5025) Robert Schütz2021-06-131-2/+2
* | Merge branch 'staging-next-21.05' into release-21.05•••PR #126251. I think it's high time. Hydra's eval https://hydra.nixos.org/eval/1677846 isn't perfect yet, but there doesn't seem to be anything really risky. Vladimír Čunát2021-06-1317-38/+624
|\ \
| * \ Merge branch 'release-21.05' into staging-next-21.05•••This brings not that many rebuilds but still some. Vladimír Čunát2021-06-1241-177/+300
| |\ \
| * \ \ Merge branch 'staging-next-21.05' into staging-21.05Jonathan Ringer2021-06-0885-1633/+1142
| |\ \ \
| * | | | nixos/gnome: fix option label•••It is no longer GNOME 3. (cherry picked from commit 99fcca7b6bc850e1c1c47e9fbad41fc3264170f6) Jan Tojnar2021-06-071-2/+2
| * | | | Merge pull request #125996 from NixOS/backport-125632-to-staging-21.05•••[Backport staging-21.05] python3Packages.certifi: 2020.12.5 -> 2021.05.30Luke Granger-Brown2021-06-061-10/+15
| |\ \ \ \
| | * | | | python3Packages.certifi: enable tests•••(cherry picked from commit 19f90b99e7451160d3a13a404d5a8194ef60a27a) Fabian Affolter2021-06-061-7/+12
| | * | | | python3Packages.certifi: 2020.12.5 -> 2021.05.30•••(cherry picked from commit 32e061be5275054fa6cc227d0ebaf76fd0288e02) Fabian Affolter2021-06-061-5/+5
| |/ / / /
| * | | | Merge pull request #125820 from NixOS/backport-125751-to-staging-21.05•••[Backport staging-21.05] postgresql: 9.6.21 -> 9.6.22, 10.16 -> 10.17, 11.11 -> 11.12, 12.6 -> 12.7, 13.2 -> 13.3Mario Rodas2021-06-051-10/+10
| |\ \ \ \
| | * | | | postgresql_9_6: 9.6.21 -> 9.6.22•••Fixes: CVE-2021-32027, CVE-2021-32028 (cherry picked from commit 062e1e595fe8bde889c73c2954fb2c5617dcf42c) Martin Weinelt2021-06-051-2/+2
| | * | | | postgresql_10: 10.16 -> 10.17•••Fixes: CVE-2021-32027, CVE-2021-32028 (cherry picked from commit 376197bc5e9501febea4b6ab46b8073374d52c08) Martin Weinelt2021-06-051-2/+2
| | * | | | postgresql_11: 11.11 -> 11.12•••Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029 (cherry picked from commit daedf20fa605c859a3c4b4c60d1ad0ba88261d4e) Martin Weinelt2021-06-051-2/+2
| | * | | | postgresql_12: 12.6 -> 12.7•••Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029 (cherry picked from commit b786157de875702c9a40b0945597ba25e83d918c) Martin Weinelt2021-06-051-2/+2
| | * | | | postgresql_13: 13.2 -> 13.3•••Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029 (cherry picked from commit 3318a937ef800d2ba7818dc50be01bc4319dc0ad) Martin Weinelt2021-06-051-2/+2
| |/ / / /
| * | | | zstd.patches: clean up•••This was discussed on PR #125185. Vladimír Čunát2021-06-051-4/+5
| * | | | Merge branch 'release-21.05' into staging-21.05Vladimír Čunát2021-06-05123-721/+1573
| |\ \ \ \
| * \ \ \ \ Merge pull request #125436 from NixOS/backport-125375-to-staging-21.05•••[Backport staging-21.05] python3Packages.django: 2.2.22 -> 2.2.24; python3Packages.django3_: 3.2.2 -> 3.2.4lsix2021-06-042-4/+4
| |\ \ \ \ \
| | * | | | | python3Packages.django_3: 3.2.2 -> 3.2.4•••https://docs.djangoproject.com/en/dev/releases/3.2.4/ https://www.djangoproject.com/weblog/2021/jun/02/security-releases/ Fixes: CVE-2021-33203, CVE-2021-33571 (cherry picked from commit 794c6633b6396a0a3c2a5d54c52e629403f0672e) origin/backport-125375-to-staging-21.05Martin Weinelt2021-06-031-2/+2
| | * | | | | python3Packages.django: 2.2.22 -> 2.2.24•••https://docs.djangoproject.com/en/dev/releases/2.2.24/ https://www.djangoproject.com/weblog/2021/jun/02/security-releases/ Fixes: CVE-2021-33203, CVE-2021-33571 (cherry picked from commit 6c7db95feac1200c98614b5a5cd1a84d40252e70) Martin Weinelt2021-06-031-2/+2
| |/ / / / /
| * | | | | Merge pull request #125309 from NixOS/backport-124982-to-staging-21.05•••[Backport staging-21.05] curl: add patches for CVE-2021-22897, CVE-2021-22898 & CVE-2021-22901Martin Weinelt2021-06-024-0/+532
| |\ \ \ \ \
| | * | | | | curl: add patches for CVE-2021-22897, CVE-2021-22898 & CVE-2021-22901•••(cherry picked from commit 742c60f6f839e23822d29b668071baa653253656) Robert Scott2021-06-024-0/+532
| * | | | | | Merge pull request #125344 from helsinki-systems/bkp/21.05/cacertMartin Weinelt2021-06-022-3/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | cacerts: Make updater script aware of the nss_latest attribute•••Usually, on the stable channel, we have a nss_latest attribute that is more up to date than the nss attribute (which is usually frozen during branch-off and only receives security updates). Cacerts are a sensitive matter and should be updated more frequently than the stable NSS package, if required. By making the update script aware of the nss_latest attribute we can prefer that when it exists. By having this change in the unstable branch of Nixpgks we can carry it from release to release without requiring more churn from those doing the stable release maintenance. (cherry picked from commit 4e318bcca19e7972d1fa8b15c4eadf85e3d5a6a1) Andreas Rammhold2021-06-021-1/+9
| | * | | | | cacert: 3.63 -> 3.66•••mozilla says this is CA version 2.50, up from 2.48 in nss 3.63 (cherry picked from commit e579e93b6517c29af8b84641d2ec16a064d34c8b) ajs1242021-06-021-2/+2
| |/ / / / /
| * | | | | Merge pull request #125143 from NixOS/backport-124971-to-staging-21.05•••[Backport staging-21.05] kbd: patch paths to decompressorsdavidak2021-06-013-1/+36
| |\ \ \ \ \
| | * | | | | nixos/tests/kbd-setfont-decompress: init•••(cherry picked from commit 7fb927c9e54170c43e2579d1f0f20efd719ca7e8) oxalica2021-06-013-1/+25
| | * | | | | kbd: patch paths to decompressors•••(cherry picked from commit 449132738dc3128f664772f571ae2f39a17b39ab) oxalica2021-06-011-0/+11
| * | | | | | sqlite: 3.35.2 -> 3.35.5•••(cherry picked from commit 3c1bcd240bb437680b69775d5c324449a02dd135) Konstantin Alekseev2021-05-312-4/+9
| |/ / / / /
* | | | | | Merge pull request #126740 from NixOS/backport-126662-to-release-21.05•••[Backport release-21.05] ungoogled-chromium: 91.0.4472.77 -> 91.0.4472.101Michael Weiss2021-06-131-5/+5
|\ \ \ \ \ \
| * | | | | | ungoogled-chromium: 91.0.4472.77 -> 91.0.4472.101•••(cherry picked from commit 3952d191751df8313e0ba0e17ea4818ded20e027) Michael Weiss2021-06-131-5/+5
|/ / / / / /
* | | | | | Merge pull request #126736 from Lassulus/weechat-matrix•••[21.05] weechatScripts.weechat-matrix: fix matrix_sso_helper pathMartin Weinelt2021-06-131-0/+1
|\ \ \ \ \ \
| * | | | | | weechatScripts.weechat-matrix: fix matrix_sso_helper path•••server.py tries to launch a matrix_sso_helper binary when connecting to a homeserver that uses some SSO mechanism instead of plain login and password, but doesn't have $out/bin in $PATH. Using substituteInPlace to patch server.py so that the helper process is started by using its actual filesystem location instead of relying on $PATH. Fixes: https://github.com/NixOS/nixpkgs/issues/124186 (cherry picked from commit f7ccc5f35d0e1fe11a7e01e3dddd1ff28566ba1d) Robert Gerus2021-06-131-0/+1
|/ / / / / /
* | | | | | pythonPackages: set mainProgram to pname by default•••Calling `nix run poetry` or another python package usually fails because of the "pythonX" prefix in name. Adjust mainProgram to ignore that prefix. (cherry picked from commit b59875ef23dabddceda3673a7559ebbede9ab6aa) Matthieu Coudron2021-06-131-0/+2
* | | | | | Merge pull request #126716 from risicle/ris-envoy-1.16.4-r21.05•••[21.05] envoy: 1.16.2 -> 1.16.4, addressing CVE-2021-29258Luke Granger-Brown2021-06-131-3/+3
|\ \ \ \ \ \
| * | | | | | envoy: 1.16.2 -> 1.16.4•••resolving CVE-2021-29258 Robert Scott2021-06-121-3/+3
|/ / / / / /
* | | | | | Merge pull request #126528 from NixOS/backport-126303-to-release-21.05•••[Backport release-21.05] deno: 1.10.3 -> 1.11.0Sandro2021-06-122-8/+8
|\ \ \ \ \ \
| * | | | | | deno: 1.10.3 -> 1.11.0•••(cherry picked from commit c374fd03ffd37d400c6bad69a4cd386749df803b) R. RyanTM2021-06-102-8/+8
* | | | | | | Merge #126619: knot-resolver: skip tests on aarch64-darwin•••(cherry picked from commit 9affc60b0cd7575c075a7be13d500928b0909fd1) It looks good on nixpkgs master (and other platforms don't even rebuild): https://hydra.nixos.org/build/145261694 Vladimír Čunát2021-06-121-1/+2
| |_|_|_|/ / |/| | | | |
* | | | | | sbt: 1.5.1 -> 1.5.3•••(cherry picked from commit 7c74293590f5ff12920d9a46da84983b6c156e04) Timothy Klim2021-06-111-2/+2
* | | | | | qcachegrind: license gpl2 -> gpl2Plus•••According to https://apps.kde.org/kcachegrind/. (cherry picked from commit 1b1f196fe6f46e6f713946e5c423bbbc90771328) Bjørn Forsman2021-06-111-1/+1
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:08:12 +0000