nixos/nixpkgs - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	linux: 5.4.168 -> 5.4.169•••(cherry picked from commit 5e8e09d3a3153fbc9e623bc71dc1803d7214fc0a) origin/backport-152597-to-release-21.05	TredwellGit	2021-12-30	1	-2/+2
*	linux: 5.15.11 -> 5.15.12•••(cherry picked from commit fcbeb9432324e0bd5bbac7387ce1e8a20339ac19)	TredwellGit	2021-12-30	1	-2/+2
*	linux: 5.10.88 -> 5.10.89•••(cherry picked from commit 6504d5dae6f3f81380dba36d7dfbfe612fdf477a)	TredwellGit	2021-12-30	1	-2/+2
*	linux: 4.9.294 -> 4.9.295•••(cherry picked from commit 8ad124f2b0ea917d283cad73a4ec0ed931c2b4ea)	TredwellGit	2021-12-30	1	-2/+2
*	linux: 4.4.296 -> 4.4.297•••(cherry picked from commit 2f1863ce774670ac6a34e6f826107c608f9ca4bd)	TredwellGit	2021-12-30	1	-2/+2
*	linux: 4.19.222 -> 4.19.223•••(cherry picked from commit e1dd7fb45f68b1871df01ba5a2ca12781642c2f5)	TredwellGit	2021-12-30	1	-2/+2
*	linux: 4.14.259 -> 4.14.260•••(cherry picked from commit e3d0e08e8ebc0f2323df655a60bb7797fae8917c)	TredwellGit	2021-12-30	1	-2/+2
*	Merge pull request #152075 from NixOS/backport-151792-to-release-21.05•••[Backport release-21.05] Kernels 2021-12-22	Maximilian Bosch	2021-12-30	9	-19/+19
\|\
\| *	linux_latest-libre: 18484 -> 18517•••(cherry picked from commit 387250dce577597ea0517bb5d838a439df5bcc3a)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux-rt_5_10: 5.10.83-rt58 -> 5.10.87-rt59•••(cherry picked from commit 0cb00d51f7c135416e09b341324cbe14c368bc16)	TredwellGit	2021-12-25	1	-3/+3
\| *	linux: 5.4.167 -> 5.4.168•••(cherry picked from commit fbd944d91d118d147783b589d3bdba4b1ed1189f)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux: 5.15.10 -> 5.15.11•••(cherry picked from commit fa7b4952392b8fe090fd716b24a4f54ec8eff78d)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux: 5.10.87 -> 5.10.88•••(cherry picked from commit 9b43bf552f81a0c99ce223787bac80389e73ced6)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux: 4.9.293 -> 4.9.294•••(cherry picked from commit 2ccbef604f538a8a8d776840dafcbd8469e56c69)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux: 4.4.295 -> 4.4.296•••(cherry picked from commit 11486e8377e819f05bba67a29418b38538b287ff)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux: 4.19.221 -> 4.19.222•••(cherry picked from commit 545cffb0b55b8d47ab96a5e64a00a65dcdc74430)	TredwellGit	2021-12-25	1	-2/+2
\| *	linux: 4.14.258 -> 4.14.259•••(cherry picked from commit b37597025635c6e85b63d9c22f03f7a4d7e68331)	TredwellGit	2021-12-25	1	-2/+2
* \|	Merge pull request #150295 from ius/zap-2.11.1_21.05•••[21.05] zap: 2.10.0 -> 2.11.1	Robert Scott	2021-12-28	1	-2/+2
\|\ \
\| * \|	zap: 2.11.0 -> 2.11.1•••Fixes CVE-2021-44228 #150288	Joerie de Gram	2021-12-11	1	-2/+2
\| * \|	zap: 2.10.0 -> 2.11.0	R. Ryantm	2021-12-11	1	-2/+2
* \| \|	imagemagick: 7.1.0-17 -> 7.1.0-19•••(cherry picked from commit 2c526159cf348026233b67f239f9d80f6131d3b9)	Robert Schütz	2021-12-27	1	-7/+5
* \| \|	imagemagick: 7.1.0-16 -> 7.1.0-17•••(cherry picked from commit 7617df63c2869e51cbbb323078c2c8e0c93b9d2c)	Kerstin Humm	2021-12-27	1	-2/+2
* \| \|	imagemagick: 7.1.0-15 -> 7.1.0-16•••(cherry picked from commit 63ea61bcf0be615562d7d8f982c005d6c52d6118)	Kerstin Humm	2021-12-27	1	-2/+2
* \| \|	imagemagick: 7.1.0-14 -> 7.1.0-15•••(cherry picked from commit d3c7e5801f572697f0483436dff80fc4ffa1658d)	Kerstin Humm	2021-12-27	1	-2/+2
* \| \|	imagemagick: 7.1.0-13 -> 7.1.0-14•••(cherry picked from commit 4d5800ed103555675b600b9688c1733df6bf1e51)	Kerstin Humm	2021-12-27	1	-2/+2
\| \|/ \|/\|
* \|	Merge pull request #151889 from thiagokokada/backport-151384-to-release-21.05•••[Backport release-21.05] firefox-unwrapped: 95.0.1 -> 95.0.2	Thiago Kenji Okada	2021-12-23	1	-2/+2
\|\ \
\| * \|	firefox-unwrapped: 95.0.1 -> 95.0.2•••(cherry picked from commit a233df3bc97aebbbd95e20171549d321dc2b35a6)	R. Ryantm	2021-12-23	1	-2/+2
* \| \|	Merge pull request #151459 from risicle/ris-flask-appbuilder-3.3.4-r21.05•••[21.05] python3Packages.flask-appbuilder: 3.3.2 -> 3.3.4	Thiago Kenji Okada	2021-12-23	1	-4/+4
\|\ \ \
\| * \| \|	python3Packages.flask-appbuilder: 3.3.3 -> 3.3.4•••addressing CVE-2021-41265 (cherry picked from commit 948a3e264a3e6e7d35ca4d61b00495f54b0df752)	Robert Scott	2021-12-20	1	-2/+2
\| * \| \|	python3Packages.flask-appbuilder: 3.3.2 -> 3.3.3•••(cherry picked from commit 0aca277bfb5df300030c9d664c03b38bc4da67b4)	Fabian Affolter	2021-12-20	1	-4/+4
* \| \| \|	Merge pull request #151392 from NixOS/backport-151063-to-release-21.05•••[Backport release-21.05] graylog: 3.3.15 -> 3.3.16	Thiago Kenji Okada	2021-12-23	1	-2/+2
\|\ \ \ \
\| * \| \| \|	graylog: 3.3.15 -> 3.3.16•••Bump log4j 2 to 2.6.0. https://www.graylog.org/post/announcing-graylog-v3-3-16 (cherry picked from commit ea5bc4fe75cb6695d446c026a8dd3ec7e54b1f9f)	Thomas Gerbet	2021-12-20	1	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #151781 from ius/ghidra-21.05•••[21.05] ghidra: fix CVE-2021-45046, CVE-2021-45105	Thiago Kenji Okada	2021-12-23	1	-5/+5
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	ghidra: fix CVE-2021-45046, CVE-2021-45105•••Upgrade bundled log4j to 2.12.3 (#150288)	Joerie de Gram	2021-12-22	1	-5/+5
* \| \| \|	Merge pull request #151451 from NixOS/backport-151279-to-release-21.05•••[Backport release-21.05] firefox-bin: 95.0 -> 95.0.2	Thiago Kenji Okada	2021-12-23	1	-393/+393
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	firefox-bin: 95.0.1 -> 95.0.2•••(cherry picked from commit cd2e8e29498d5ba910f28773773c76892be137fb)	taku0	2021-12-20	1	-393/+393
\| * \| \|	firefox-bin: 95.0 -> 95.0.1•••(cherry picked from commit 3ee12cf5287be7c50fb16e5428373cebf9eb9dd1)	taku0	2021-12-20	1	-393/+393
* \| \| \|	Merge pull request #150353 from NixOS/backport-149989-to-release-21.05•••[Backport release-21.05] papermc: 1.17.1r97 -> 1.17.1r399	Bobby Rong	2021-12-22	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Update pkgs/games/papermc/default.nix•••Co-authored-by: Joel <jyooru+github@protonmail.ch> (cherry picked from commit 53d7554d151c54489175fedca7f45a85d72ee59f) origin/backport-149989-to-release-21.05	Aaron Janse	2021-12-12	1	-1/+1
\| * \| \| \|	Update pkgs/games/papermc/default.nix•••Co-authored-by: Joel <jyooru+github@protonmail.ch> (cherry picked from commit 86f325b117bcc45d44f05a5a4da89c2d03bb41c4)	Aaron Janse	2021-12-12	1	-1/+1
\| * \| \| \|	papermc: 1.17.1r97 -> 1.17.1r399•••(cherry picked from commit f994bbb83f3d2fe3053b9bd16f25689b76e9356f)	Aaron Janse	2021-12-12	1	-2/+2
* \| \| \| \|	Merge pull request #151611 from NixOS/backport-148711-to-release-21.05•••[Backport release-21.05] pure-ftpd: add patch for CVE-2021-40524	Robert Scott	2021-12-21	1	-0/+5
\|\ \ \ \ \
\| * \| \| \| \|	pure-ftpd: add patch for CVE-2021-40524•••(cherry picked from commit 82f811e6ede5b137c2102167037308ae903fc0b4)	Robert Scott	2021-12-21	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #149426 from risicle/ris-zydis-3.1.0-CVE-2021-41253-r21.05•••[21.05] zydis: add patch for CVE-2021-41253	Robert Scott	2021-12-21	1	-1/+9
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	zydis: add patch for CVE-2021-41253	Robert Scott	2021-12-06	1	-1/+9
* \| \| \| \|	Merge pull request #151376 from mweinelt/21.05/firefox	Martin Weinelt	2021-12-20	1	-4/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	firefox-esr-91-unwrapped: 91.4.0esr -> 91.4.1esr•••(cherry picked from commit 5ae25b97ad658d5c2f5f65cb8558af9c7cd96924)	R. Ryantm	2021-12-20	1	-2/+2
\| * \| \| \|	firefox-unwrapped: 95.0 -> 95.0.1•••(cherry picked from commit d76ff3c3f190ee35a4f103aa0510ff087952375c)	R. Ryantm	2021-12-20	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #151326 from mweinelt/21.05/virtiokb•••[21.05] nixos/qemu-vm: add -device virtio-keyboard to opts	Artturi	2021-12-20	1	-0/+1
\|\ \ \ \
\| * \| \| \|	nixos/qemu-vm: add -device virtio-keyboard to opts•••by default a ps/2 keyboard input is used which seems to cause issues on aarch64-linux when the machine is used high load, causing the keymap qwertz test to always fail and azerty to sometimes fail See https://github.com/NixOS/nixpkgs/issues/147294 (cherry picked from commit 39c5525cb157b09dc5eae482bcff82a1c477ad2f)	Artturin	2021-12-19	1	-0/+1
\|/ / / /