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

	Commit message (Expand)	Author	Age	Files	Lines
*	nixos/tests/test-driver: make it clear when shell is ready•••Co-authored-by: Domen Kožar <domen@enlambda.com> (cherry picked from commit fd739c4dee12fbe57199f73c44ec22db2355028e) origin/backport-125372-to-release-21.05	Patrick Hilhorst	2021-06-03	1	-0/+1
*	nixos/tests/test-driver: mention drawback•••(cherry picked from commit 287144273162acd869f514f7770a3daae4649d37)	Patrick Hilhorst	2021-06-03	1	-0/+1
*	nixos/tests/test-driver: document shell_interact•••(cherry picked from commit 9469433e341f7337308468bb4b9ccfff84b2951b)	Patrick Hilhorst	2021-06-03	2	-1/+12
*	nixos/tests/test-driver: add shell_interact•••(cherry picked from commit 5a589b5ba8941d734e9c3aebbf2be2f50d7c32a5)	Patrick Hilhorst	2021-06-03	1	-0/+10
*	blender: fix darwin build•••(cherry picked from commit dca87350f4e00539e52731628b98cbcc15c4319a)	Dmitry Kalinkin	2021-06-03	2	-14/+9
*	blender: 2.92.0 -> 2.93.0•••(cherry picked from commit ff60dfcc7f700a9f60c5ff3ebbcf61781c17671e)	Jonas Carpay	2021-06-03	1	-9/+9
*	redis: 6.2.3 -> 6.2.4 (#125444)•••https://github.com/redis/redis/releases/tag/6.2.4 (cherry picked from commit 8d34fb204ce256c124b35968f6bf3ee940bb36fc) Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>	github-actions[bot]	2021-06-03	1	-2/+2
*	Merge pull request #125336 from NixOS/backport-125306-to-release-21.05•••[Backport release-21.05] firefox-esr: 78.10.1esr -> 78.11.0esr	Martin Weinelt	2021-06-03	1	-2/+2
\|\
\| *	firefox-esr: 78.10.1esr -> 78.11.0esr•••https://www.mozilla.org/en-US/firefox/78.11.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-24/ (cherry picked from commit f42ea75dec8fff9becbdf2094044485ec103dcd1) origin/backport-125306-to-release-21.05	Martin Weinelt	2021-06-02	1	-2/+2
* \|	Merge pull request #125406 from eduardosm/dr14_tmeter•••[21.05] dr14_tmeter: use ffmpeg 4	adisbladis	2021-06-02	1	-1/+1
\|\ \
\| * \|	dr14_tmeter: use ffmpeg 4•••migrate away from ffmpeg_3 (https://github.com/NixOS/nixpkgs/issues/120705) (cherry picked from commit 0b32978596d24542e6561a31b5f134ddcc6b811c)	Eduardo Sánchez Muñoz	2021-06-02	1	-1/+1
* \| \|	Merge pull request #125433 from sternenseemann/greenclip-fix•••[21.05] haskellPackages.greenclip: unbreak	Dennis Gosnell	2021-06-03	3	-14/+11
\|\ \ \
\| * \| \|	haskellPackages.greenclip: unmark as broken•••libXScrnSaver is passed correctly now, so greenclip builds again.	sternenseemann	2021-06-03	2	-3/+0
\| * \| \|	hackage-packages.nix: Regenerate based on current config•••This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh Main point here is to apply the new cabal2nix-unstable generation with a libNixName entry for libXScrnSaver, so greenclip builds again.	sternenseemann	2021-06-03	1	-8/+8
\| * \| \|	haskellPackages.cabal2nix-unstable: update to latest version from github•••(cherry picked from commit 259177f1097be0f8de5969242e98f8e026df8037)	(cdep)illabout	2021-06-03	1	-3/+3
\|/ / /
* \| \|	Merge pull request #125425 from NixOS/backport-124407-to-release-21.05•••[Backport release-21.05] synapse: 1.34.0 -> 1.35.0	Maximilian Bosch	2021-06-03	1	-7/+7
\|\ \ \
\| * \| \|	synapse: 1.34.0 -> 1.35.0•••(cherry picked from commit c6a546e996d7dce5a688a6718ee7baeca694ddde)	Sumner Evans	2021-06-02	1	-7/+7
\| \|/ /
* \| \|	Merge pull request #125411 from NixOS/backport-125392-to-release-21.05•••[Backport release-21.05] pdns-recursor: disable on i686-linux	Michele Guerini Rocco	2021-06-02	1	-0/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	pdns-recursor: disable on i686-linux•••Support for 32-bit platforms with no 64-bit time_t has ended. See https://mailman.powerdns.com/pipermail/pdns-users/2021-May/027220.html (cherry picked from commit cbfd8831a1082f6bea819f92c8bfd6ec688c9fc4) origin/backport-125392-to-release-21.05	rnhmjoj	2021-06-02	1	-0/+3
\|/ /
* \|	Merge pull request #125341 from hercules-ci/backport-podman-improvements•••[Backport release-21.05] podman improvements	Robert Hensing	2021-06-02	16	-11/+552
\|\ \
\| * \|	nixos/podman-network-socket-ghostunnel: move condition to include socket•••(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)	zowoq	2021-06-02	1	-2/+2
\| * \|	podman: Add nixosTests.podman-dnsname to tests•••(cherry picked from commit 1d781e5c80d3c392933479a114e9e3857a1d9529)	Robert Hensing	2021-06-02	1	-1/+4
\| * \|	nixos/podman-dnsname: init•••(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)	Robert Hensing	2021-06-02	5	-0/+84
\| * \|	nixos/podman: Add defaultNetwork.extraPlugins•••(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)	Robert Hensing	2021-06-02	1	-1/+22
\| * \|	nixos/containers: Add virtualisation.containers.containersConf.cniPlugins•••(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)	Robert Hensing	2021-06-02	1	-1/+21
\| * \|	dnsname-cni: Use wrapper instead of patch for dnsmasq•••The patch proved to be an incomplete solution while developing nixosTests.podman-dnsname (cherry picked from commit 651777934941480a36f7df9c434e6044957d045d)	Robert Hensing	2021-06-02	2	-24/+11
\| * \|	podman: Add iproute2, fixing docker network rm•••(cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)	Robert Hensing	2021-06-02	2	-0/+3
\| * \|	nixos/podman-network-socket-ghostunnel: init•••(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)	Robert Hensing	2021-06-02	5	-1/+191
\| * \|	nixos/podman: Add generic networkSocket interface•••(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)	Robert Hensing	2021-06-02	2	-0/+92
\| * \|	nixos/podman: Add dockerSocket.enable•••(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)	Robert Hensing	2021-06-02	2	-2/+60
\| * \|	nixos/podman: Change podman socket to new podman group•••(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)	Robert Hensing	2021-06-02	1	-1/+12
\| * \|	nixos/podman: install cni config from package•••(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)	zowoq	2021-06-02	1	-2/+2
\| * \|	podman: install cni config•••(cherry picked from commit fd59022ee9eb8d08b65df563c65e4218a68fca3c)	zowoq	2021-06-02	2	-0/+2
\| * \|	podman: add systemd to rpath•••(cherry picked from commit ada45ac3aee664265759611d09443d549250bd70)	Nick Cao	2021-06-02	1	-0/+5
\| * \|	dnsname-cni: init at 1.1.1•••(cherry picked from commit 5826e9020636c8ba3bc311294ce78b6466fd2b24)	Mark Vainomaa	2021-06-02	3	-0/+53
\| * \|	maintainers: add mikroskeem•••(cherry picked from commit f830b000fc8aafd14bf3151178919378584e87c9)	Mark Vainomaa	2021-06-02	1	-0/+10
\| * \|	docker: add clientOnly / docker-client•••Currently the docker client is only available on non-linux platforms as `docker`, this makes the client available on linux and other platforms as `docker-client`. (cherry picked from commit 7233acd515546107e5902a8fef6832f4f319390c)	zowoq	2021-06-02	2	-4/+6
\| \|/
* \|	Merge pull request #125388 from NixOS/backport-125216-to-release-21.05•••[Backport release-21.05] dockerTools: Fix passthru image tag	Robert Hensing	2021-06-02	1	-1/+1
\|\ \
\| * \|	dockerTools: Fix passthru image tag•••It should match the actual image tag. This fixes the problem introduced in 00996b5e03f33bebafc2b17c41a175d3726a9bde https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901 (cherry picked from commit ff55c41facaa6812f9cc879a49f6929321881d4f) origin/backport-125216-to-release-21.05	Robert Hensing	2021-06-02	1	-1/+1
\|/ /
* \|	Merge pull request #125368 from NixOS/backport-125289-to-release-21.05•••[Backport release-21.05] qutebrowser: 2.2.2 -> 2.2.3	Michele Guerini Rocco	2021-06-02	2	-4/+5
\|\ \
\| * \|	python3Packages.adblock: fix build on Darwin•••(cherry picked from commit 9f9de0069cf323533375286468e44f134c117234)	Robert Schütz	2021-06-02	1	-2/+3
\| * \|	qutebrowser: 2.2.2 -> 2.2.3•••https://github.com/qutebrowser/qutebrowser/releases/tag/v2.2.3 (cherry picked from commit 29043644b0119bd3c5e695fb90ea5e52b4656045)	Robert Schütz	2021-06-02	1	-2/+2
* \| \|	Merge branch 'staging-21.05' into release-21.05•••It's a bit older version of the branch, as it has binaries from https://hydra.nixos.org/eval/1674261	Vladimír Čunát	2021-06-02	1	-0/+13
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'release-21.05' into staging-21.05	Vladimír Čunát	2021-05-30	146	-3422/+2543
\| \|\ \
\| * \| \|	lz4: patch CVE-2021-3520 and null pointer dereference•••(cherry picked from commit 2acd087dca93a3b589721b3ec32d13d9150684bb)	TredwellGit	2021-05-30	1	-0/+13
* \| \| \|	beam-packages: drop erlang R18 R19 R20 and cuter•••(cherry picked from commit f55c3e2f21073be564fed477847ad5bd649c9fb9)	Thomas Depierre	2021-06-02	9	-165/+14
* \| \| \|	Merge pull request #125343 from NixOS/backport-124891-to-release-21.05•••[Backport release-21.05] antimony: add desktop item	Michele Guerini Rocco	2021-06-02	2	-1/+32
\|\ \ \ \
\| * \| \| \|	antimony: add desktop item•••(cherry picked from commit b80463f8d574bb4efff0392c94d63021c63916b9) origin/backport-124891-to-release-21.05	cwyc	2021-06-02	2	-1/+32
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #125338 from NixOS/backport-124494-to-release-21.05•••[Backport release-21.05] dockerTools: Allow omitting all store paths	Robert Hensing	2021-06-02	3	-2/+51
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	dockerTools: Allow omitting all store paths•••Adds includeStorePaths, allowing the omission of the store paths. You generally want to leave it on, but tooling may disable this to insert the store paths more efficiently via other means, such as bind mounting the host store. (cherry picked from commit 5259d66b7487b94233821e28aafb0683ae3f1df6) origin/backport-124494-to-release-21.05	Robert Hensing	2021-06-02	3	-1/+50