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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| * \| \|	dockerTools: Format•••(cherry picked from commit 69de7cc12abfa1d0434750e5d346c299992a57ec)	Robert Hensing	2021-06-02	1	-1/+1
\|/ / /
* \| \|	Merge pull request #125305 from NixOS/backport-125300-to-release-21.05•••[Backport release-21.05] botamusique: unstable-2021-05-19 -> unstable-2021-06-01	Martin Weinelt	2021-06-02	2	-5/+5
\|\ \ \
\| * \| \|	botamusique: unstable-2021-05-19 -> unstable-2021-06-01•••(cherry picked from commit dbb7e6bc8a6d35f8da7e74e5c47dce18a51955af)	Martin Weinelt	2021-06-02	2	-5/+5
\|/ / /
* \| \|	Merge pull request #125219 from NixOS/backport-125178-to-release-21.05•••[Backport release-21.05] deno: 1.10.2 -> 1.10.3	Robert Scott	2021-06-02	1	-3/+3
\|\ \ \
\| * \| \|	deno: 1.10.2 -> 1.10.3•••(cherry picked from commit c89224c2d351fa860fe7703aba498b6f64e28f41)	R. RyanTM	2021-06-01	1	-3/+3
* \| \| \|	Merge pull request #125277 from NixOS/backport-125148-to-release-21.05•••[Backport release-21.05] stagit: 0.9.5 → 0.9.6	Robert Scott	2021-06-01	1	-2/+2
\|\ \ \ \
\| * \| \| \|	stagit: 0.9.5 → 0.9.6•••(cherry picked from commit dd068ab0e09ffb311d1ab43a25f390497bd26810)	Nikolay Korotkiy	2021-06-01	1	-2/+2
* \| \| \| \|	Merge pull request #125230 from NixOS/backport-124603-to-release-21.05•••[Backport release-21.05] php.buildPecl: Add checkPhase	Robert Scott	2021-06-01	2	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	php.buildPecl: Add checkPhase•••Also update phpPackages' to use NO_INTERACTION (cherry picked from commit 3a66432f2616484c880b6daea2393bf1e9425a33)	Marco Sirabella	2021-06-01	2	-1/+2
* \| \| \| \|	Merge pull request #125269 from NixOS/backport-125245-to-release-21.05•••[Backport release-21.05] warzone2100: fix build	Michele Guerini Rocco	2021-06-01	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	warzone2100: fix build•••I'm not sure how the build broke[1] or how it worked before, but the problem is zip is being used in place of p7zip, which obviously fail as the flags have different meanings. [1]: https://hydra.nixos.org/build/143354937 (cherry picked from commit 302d6b1b8b94f2082f9937d04e27c2aaefb93aa2)	rnhmjoj	2021-06-01	1	-2/+2
* \| \| \| \| \|	Merge pull request #125126 from NixOS/backport-125111-to-release-21.05•••[Backport release-21.05] lua5_4: 5.4.2 -> 5.4.3	Robert Scott	2021-06-01	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	lua5_4: 5.4.2 -> 5.4.3•••(cherry picked from commit 490970ae8b34107aa5e092629271ac7739407478)	Janne Heß	2021-05-31	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #125249 from NixOS/backport-124995-to-release-21.05•••[Backport release-21.05] ijq: 0.2.3 → 0.3.4	Robert Scott	2021-06-01	1	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	ijq: 0.2.3 → 0.3.4•••https://github.com/gpanders/ijq/compare/v0.2.3...v0.3.4 (cherry picked from commit 691a876749de1029f150b3ff7e23cf92403510a4)	Jan Tojnar	2021-06-01	1	-3/+3
* \| \| \| \| \| \| \|	Merge pull request #125248 from NixOS/backport-124986-to-release-21.05•••[Backport release-21.05] libccd: fix pkgconfig file paths	Robert Scott	2021-06-01	1	-1/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	libccd: fix pkgconfig file paths•••libccd has the common bug of assuming CMAKE_INSTALL_*DIR is relative. I have submitted the fix upstream, but don't have much hope of getting it merged because there have been no updates since 2018. (cherry picked from commit 3d2092ab58fe83e89a3162728e9d4b733295b561)	Ben Wolsieffer	2021-06-01	1	-1/+10
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #125247 from NixOS/backport-124996-to-release-21.05•••[Backport release-21.05] schismtracker: 20200412 -> 20210525	Robert Scott	2021-06-01	1	-6/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	schismtracker: 20200412 -> 20210525•••(cherry picked from commit 20b1b6e68ba4db1b39ac49280c0d83e811a5c19a) origin/backport-124996-to-release-21.05	Pavol Rusnak	2021-06-01	1	-6/+11
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #125229 from NixOS/backport-125225-to-release-21.05•••[Backport release-21.05] changelog: fix typo	Fabian Affolter	2021-06-01	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	changelog: fix typo•••(cherry picked from commit 8217ea50000728c55fe8b21454ca2572743d8302)	Sandro	2021-06-01	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #125164 from NixOS/backport-125160-to-release-21.05•••[Backport release-21.05] delve: disable source fortify at runtime	Robert Scott	2021-06-01	1	-1/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Update pkgs/development/tools/delve/default.nix•••Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> (cherry picked from commit c9927ba895f17ae58dfe8dc736a9ba8508e623ee) origin/backport-125160-to-release-21.05	Jörg Thalheim	2021-06-01	1	-1/+1
\| * \| \| \| \| \|	delve: disable source fortify at runtime•••(cherry picked from commit b48e56c74634757b4f85e06377dd4f89c85d9a26)	Jörg Thalheim	2021-06-01	1	-1/+11
* \| \| \| \| \| \|	Merge pull request #125226 from NixOS/backport-124892-to-release-21.05•••[Backport release-21.05] yara: 4.0.5 -> 4.1.1	Robert Scott	2021-06-01	1	-16/+6
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	yara: add enableStatic mode•••useful because tests can be enabled in this mode (cherry picked from commit 8cda1cc59e7cd01ce2ff18bc78f6b7a0e7faed19)	Robert Scott	2021-06-01	1	-0/+4
\| * \| \| \| \| \|	yara: 4.0.5 -> 4.1.1•••(cherry picked from commit 2d7f554229393ddb0441dd31e37db7ad7b48dab0)	Robert Scott	2021-06-01	1	-16/+2
* \| \| \| \| \| \|	Merge #125185: zstd: patch test flakiness on i686	Vladimír Čunát	2021-06-01	1	-2/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	zstd: patch test flakiness on i686•••https://hydra.nixos.org/build/143933617/nixlog/246/tail The last attempt I see on 21.05 has failed: https://hydra.nixos.org/build/144447049#tabs-buildsteps	Vladimír Čunát	2021-06-01	1	-2/+8
* \| \| \| \| \| \| \|	Merge branch 'discord-backport' into release-21.05	Shea Levy	2021-06-01	2	-9/+9
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	discord: fix runtime linking•••(cherry picked from commit c5bed409b29dfbf467a71fab9679cf189ccfa428)	Jonathan Ringer	2021-06-01	1	-3/+3
\| * \| \| \| \| \| \|	discord: 0.0.14 -> 0.0.15•••(cherry picked from commit 501e54080dfc82c41011d371677a7390eab61586)	wearemnr	2021-06-01	1	-6/+6
* \| \| \| \| \| \| \|	Merge pull request #124818 from NixOS/backport-124200-to-release-21.05	Sandro	2021-06-01	3	-0/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	mx-puppet-discord: set pname•••(cherry picked from commit 166aabe0c7ccd972ea3be092ab900d3a637216ef)	Pacman99	2021-05-29	1	-0/+3
\| * \| \| \| \| \| \|	matrix-appservice-slack: set pname•••(cherry picked from commit a811e7385c6a4dd8eeb871f994939ff99260fa75)	Pacman99	2021-05-29	1	-0/+2
\| * \| \| \| \| \| \|	matrix-appservice-irc: set pname•••(cherry picked from commit 41e46599ea2b6b947e14ccb3f1d38326bced3585)	Pacman99	2021-05-29	1	-0/+2
* \| \| \| \| \| \| \|	haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm•••(cherry picked from commit b401b432099d174dadd26a4c00f5afb62d7c2e01)	Kerstin Humm	2021-06-01	3	-11/+4
* \| \| \| \| \| \| \|	haskellPackages.hakyll: unbreak, jailbreak, patch for pandoc version•••(cherry picked from commit 8f33bb975daf526d916035413b67fcc939f09c5c)	Kerstin Humm	2021-06-01	3	-3/+17
\| \|/ / / / / / \|/\| \| \| \| \| \|