summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-sync: use postFixup instead of fixupPhase•••(cherry picked from commit d804b24b6be14c2d264b7381e32d02401fef3327) origin/backport-130515-to-release-21.05Jörg Thalheim2021-07-231-3/+1
* git-sync: Wrap both binaries•••(cherry picked from commit 633993eee29d4a0092ea12b58741c108718a7308) Ivan Malison2021-07-231-1/+6
* squashfs-tools-ng: 1.1.1 -> 1.1.2•••tar2sqfs seems to work on the source tarball. (cherry picked from commit bbdf2e931a84b9d8a8a03ab508f42e9c2adabf55) Alyssa Ross2021-07-231-2/+2
* Merge pull request #131192 from NixOS/backport-131153-to-release-21.05•••[Backport release-21.05] bemenu: 0.6.2 -> 0.6.3Maximilian Bosch2021-07-231-2/+2
|\
| * bemenu: 0.6.2 -> 0.6.3•••(cherry picked from commit d10ccb2b339257bae7d44af7d024476ec46306e0) R. RyanTM2021-07-231-2/+2
|/
* Merge pull request #130726 from NixOS/backport-128879-to-release-21.05•••[Backport release-21.05] jetbrains: updatesLuke Granger-Brown2021-07-221-10/+10
|\
| * jetbrains: updates•••(cherry picked from commit 41b86910e84c810b36260f2eda717c3ed8e017fd) origin/backport-128879-to-release-21.05Arnout Engelen2021-07-201-10/+10
* | matrix-synapse: 1.38.0 -> 1.38.1•••(cherry picked from commit d9b7e47007249943f4068add429da8443d3c71ee) Sumner Evans2021-07-221-2/+2
* | Merge pull request #131086 from NixOS/backport-128649-to-release-21.05•••[Backport release-21.05] zsh: fix nixUnstable completionsMaximilian Bosch2021-07-221-5/+21
|\ \
| * | zsh: include completions for nix-* commands•••(cherry picked from commit 6dbf8c04097c8961bb1cb9cb319fee42eb19ab7a) Timothy DeHerrera2021-07-221-5/+15
| * | zsh: format module with nixpkgs-fmt•••(cherry picked from commit 9ad645dce8e11a3ffcf27cd797abc99476c837f0) Timothy DeHerrera2021-07-221-4/+10
| * | zsh: remove conflicting nixUnstable completions•••(cherry picked from commit d687fe88fdbb00b89f4e5b82824c7b187659d648) Timothy DeHerrera2021-07-221-1/+1
* | | Merge pull request #130456 from uvNikita/backport-steam-runtime-20210630•••[Backport release-21.05] steamPackages.steam-runtime: 20210527.0 -> 20210630.0Bernardo Meurer2021-07-221-2/+2
|\ \ \
| * | | steamPackages.steam-runtime: 20210527.0 -> 20210630.0•••(cherry picked from commit 7cae0551597ab2129c59fb2c93ca42e51aaf0f72) Herman Fries2021-07-171-2/+2
* | | | Merge pull request #130992 from svanderburg/backport-lha•••[Backport release-21.05] lha: init at 2021-07-01Sander van der Burg2021-07-222-0/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | lha: init at 2021-07-01•••(cherry picked from commit c4508944773a579423c370b81860b175059ab540) Sander van der Burg2021-07-222-0/+29
* | | | Merge pull request #131056 from NixOS/backport-131053-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.9.0 -> 5.10.0Michael Weiss2021-07-221-2/+2
|\ \ \ \
| * | | | signal-desktop: 5.9.0 -> 5.10.0•••(cherry picked from commit 8c1f8ac915ec379872a88b2613718723dc7f6c35) Michael Weiss2021-07-221-2/+2
* | | | | Merge pull request #131052 from NixOS/backport-131015-to-release-21.05•••[Backport release-21.05] redis: 6.2.4 -> 6.2.5Mario Rodas2021-07-221-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | redis: 6.2.4 -> 6.2.5•••https://github.com/redis/redis/releases/tag/6.2.5 (cherry picked from commit b155b06e1dc296b471f0e43e02400c8d9c5af70d) Mario Rodas2021-07-221-2/+2
* | | | | Merge pull request #131010 from asbachb/backport/openjdk11Sandro2021-07-221-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | openjdk: 11.0.11+9 -> 11.0.12+7Benjamin Asbach2021-07-211-3/+3
| * | | | openjdk: 11.0.10+11 -> 11.0.11+9•••fixes #128407 Benjamin Asbach2021-07-211-2/+2
| |/ / /
* | | | Merge pull request #130952 from NixOS/backport-129574-to-release-21.05•••[Backport release-21.05] nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bbRobert Hensing2021-07-222-6/+24
|\ \ \ \ | |/ / / |/| | |
| * | | boehmgc_{nix,nixUnstable}: Move into {nix,nixUnstable}.passthru•••Do not pollute top-level, but do provide allow the derivations to be accessed for debugging and reuse if necessary. (cherry picked from commit 2c2e1db91db465d7a83593d9322aa204c0fa4b43) Robert Hensing2021-07-212-14/+16
| * | | nixUnstable: patch boehmgc (nix#4944)•••As has been done in https://github.com/NixOS/nix/pull/4944 This introduces the boehmgc_nix and boehmgc_nixUnstable attributes which are useful for external packages that link with Nix and its boehmgc. (cherry picked from commit 596ac242af767b38e48af9076887b206dc72e472) Robert Hensing2021-07-212-4/+20
| * | | nixUnstable: 2.4pre20210601_5985b8b -> 2.4pre20210707_02dd6bb•••(cherry picked from commit 2d1568561b80205b89a5b47e892e636441c26720) Jonathan Ringer2021-07-211-3/+3
* | | | linuxPackages_latest: 5.12.12 -> 5.13•••Fixes: 367a53a82b0 ("linux_5_13: init at 5.13") (cherry picked from commit 0c21d0fd7035d65e48d561a64d1ad1454c640aff) Alyssa Ross2021-07-211-1/+1
* | | | systemd: Patch CVE-2021-33910•••(cherry picked from commit b361dcf0bd3610d1fea6b44d72404add188da51d) Janne Heß2021-07-211-0/+7
* | | | linux/hardened/patches/5.4: 5.4.133-hardened1 -> 5.4.134-hardened1•••(cherry picked from commit ac887a4abc6529cf7817539db2709107cfbad573) TredwellGit2021-07-211-3/+3
* | | | linux/hardened/patches/5.12: 5.12.18-hardened1 -> 5.12.19-hardened1•••(cherry picked from commit a718b4ae916113e98a4a113ffc52c53106d1bd97) TredwellGit2021-07-211-3/+3
* | | | linux/hardened/patches/5.10: 5.10.51-hardened1 -> 5.10.52-hardened1•••(cherry picked from commit 60e9f5c2d76c7892b1031884723a6a3f45e7552e) TredwellGit2021-07-211-3/+3
* | | | linux/hardened/patches/4.19: 4.19.197-hardened1 -> 4.19.198-hardened1•••(cherry picked from commit 8bf83e8c874642b020169c201866817bc1c8d402) TredwellGit2021-07-211-3/+3
* | | | linux/hardened/patches/4.14: 4.14.239-hardened1 -> 4.14.240-hardened1•••(cherry picked from commit 02f4b95e1dfde6c71e230e9b4f17ab4323c306dd) TredwellGit2021-07-211-3/+3
* | | | linux: 5.4.133 -> 5.4.134•••(cherry picked from commit ebd057e9efd8e8810c011b0dba9840109bab65f3) TredwellGit2021-07-211-2/+2
* | | | linux: 5.13.3 -> 5.13.4•••(cherry picked from commit 5b3a23670c3bdbd3a4ad7e7fe62c4e4c9e0132d9) TredwellGit2021-07-211-2/+2
* | | | linux: 5.12.18 -> 5.12.19•••(cherry picked from commit a703195804f27720118120bf80fda99531969fe2) TredwellGit2021-07-211-2/+2
* | | | linux: 5.10.51 -> 5.10.52•••(cherry picked from commit f61350ac8916d99611aaf5b8fcb6be120114c7e9) TredwellGit2021-07-211-2/+2
* | | | linux: 4.9.275 -> 4.9.276•••(cherry picked from commit c6eff0d2f599621fa4936e2c605823e3489a7044) TredwellGit2021-07-211-2/+2
* | | | linux: 4.4.275 -> 4.4.276•••(cherry picked from commit 067c21c9647fcc9e38b77b67ad932672374f098f) TredwellGit2021-07-211-2/+2
* | | | linux: 4.19.197 -> 4.19.198•••(cherry picked from commit 9c153cccd2e1dbae481ac1578c36017b742adbd2) TredwellGit2021-07-211-2/+2
* | | | linux: 4.14.239 -> 4.14.240•••(cherry picked from commit 82af4b58ee24caaec68e3803763c0e6dbedf3784) TredwellGit2021-07-211-2/+2
* | | | Merge pull request #130957 from svanderburg/backport-arj•••[Backport release-21.05] arj: init at 3.10.22Sander van der Burg2021-07-212-0/+152
|\ \ \ \ | |/ / / |/| | |
| * | | arj: init at 3.10.22•••(cherry picked from commit 37601fd76d96a8c83a980061adda9529d665d5b9) Sander van der Burg2021-07-212-0/+152
|/ / /
* | | Merge pull request #130784 from NixOS/backport-128568-to-release-21.05•••[Backport release-21.05] hugo: 0.84.1 -> 0.84.2Oleksii Filonenko2021-07-211-3/+3
|\ \ \
| * | | hugo: 0.84.1 -> 0.84.2•••(cherry picked from commit 0432fe1034f8780170157e86b0383f68cb4e2c5e) origin/backport-128568-to-release-21.05R. RyanTM2021-07-201-3/+3
* | | | Merge pull request #130155 from LeSuisse/kimages-CVE-2021-36083-21.05•••[21.05] libsForQt5.kimageformats: fix CVE-2021-36083Thomas Tuegel2021-07-211-1/+14
|\ \ \ \
| * | | | libsForQt5.kimageformats: fix CVE-2021-36083•••Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 3d260a2d0edffce5095a5f813e9227c4864e9715) Thomas Gerbet2021-07-141-1/+14
* | | | | Merge pull request #130797 from NixOS/backport-130538-to-release-21.05•••[Backport release-21.05] nixStable: 2.3.12 -> 2.3.14Maximilian Bosch2021-07-212-6/+7
|\ \ \ \ \
| * | | | | nixStable: 2.3.12 -> 2.3.14•••Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14 Since this is a bugfix release that wasn't pushed to `nixpkgs`, I decided to take care of it. As it's usually done in `upload-release.pl`[1], I updated the fallback-paths accordingly and used eval `1687468`[2] for this with Nix 2.3.14. Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to support this now[3]. [1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl [2] https://hydra.nixos.org/eval/1687468 [3] https://github.com/NixOS/nix/commit/14262b86cc5825deae095c14553d623af498124c (cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95) Maximilian Bosch2021-07-202-6/+7
| | |/ / / | |/| | |