Alyssa Ross 
							
						 
					 
					
						
						
						
						
							
						
						
							3893d6c6d7 
							
						 
					 
					
						
						
							
							gitAndTools: move everything to the top level  
						
						 
						
						... 
						
						
						
						The comment at the top of git-and-tools/default.nix said:
    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.
but unfortunately that hasn't actually held up in practice.
Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c34901969).
So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.
The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal. 
						
						
					 
					
						2021-01-14 21:27:48 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0f0c250967 
							
						 
					 
					
						
						
							
							Merge pull request  #109284  from fabaff/gps3  
						
						 
						
						
						
						
					 
					
						2021-01-14 21:18:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22d184ae8d 
							
						 
					 
					
						
						
							
							Merge pull request  #108866  from markuskowa/new-targetisns  
						
						 
						
						... 
						
						
						
						target-isns: init at 0.6.8 
						
						
					 
					
						2021-01-14 21:06:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7cb3bffc34 
							
						 
					 
					
						
						
							
							Merge pull request  #103030  from tadfisher/remarkable-2-toolchain  
						
						 
						
						... 
						
						
						
						remarkable2-toolchain: init at 2.5.2 
						
						
					 
					
						2021-01-14 21:03:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Weiss 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							76fe724675 
							
						 
					 
					
						
						
							
							chromium: Extend update.py to print a summary of the updates  
						
						 
						
						... 
						
						
						
						As a first step to automate the commit messages as well. 
						
						
					 
					
						2021-01-14 21:02:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1fa1ae39f5 
							
						 
					 
					
						
						
							
							Merge pull request  #108563  from mkuettel/plantuml-1.2020.26  
						
						 
						
						... 
						
						
						
						plantuml: 1.2020.19 -> 1.2020.26 
						
						
					 
					
						2021-01-14 20:58:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							aa39134ed5 
							
						 
					 
					
						
						
							
							Merge pull request  #109053  from astro/json-schema-for-humans  
						
						 
						
						... 
						
						
						
						python3Packages.json-schema-for-humans: 0.27.0 -> 0.27.1 
						
						
					 
					
						2021-01-14 20:57:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6e7846bc89 
							
						 
					 
					
						
						
							
							Merge pull request  #105843  from HectorAE/quickfix-init  
						
						 
						
						
						
						
					 
					
						2021-01-14 20:56:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Weiss 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0e177d09f 
							
						 
					 
					
						
						
							
							chromiumBeta: 88.0.4324.79 -> 88.0.4324.87  
						
						 
						
						
						
						
					 
					
						2021-01-14 20:36:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zowoq 
							
						 
					 
					
						
						
						
						
							
						
						
							2299a66b88 
							
						 
					 
					
						
						
							
							gdu: 2.2.0 -> 2.3.0  
						
						 
						
						... 
						
						
						
						https://github.com/dundee/gdu/releases/tag/v2.3.0  
						
						
					 
					
						2021-01-15 05:36:04 +10:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Weiss 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7fb79605a7 
							
						 
					 
					
						
						
							
							inxi: 3.2.02-1 -> 3.2.02-2  
						
						 
						
						
						
						
					 
					
						2021-01-14 20:32:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							983cd52d2f 
							
						 
					 
					
						
						
							
							Merge pull request  #108225  from avnik/wine-update  
						
						 
						
						... 
						
						
						
						Wine update 
						
						
					 
					
						2021-01-14 19:22:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jörg Thalheim 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							257170ca27 
							
						 
					 
					
						
						
							
							Merge pull request  #109387  from fabaff/waterfurnace  
						
						 
						
						... 
						
						
						
						python3Packages.waterfurnace: init at 1.1.0 
						
						
					 
					
						2021-01-14 19:15:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zowoq 
							
						 
					 
					
						
						
						
						
							
						
						
							8a4b39330f 
							
						 
					 
					
						
						
							
							Revert "conmon: 2.0.22 -> 2.0.23"  
						
						 
						
						... 
						
						
						
						This reverts commit 59d4583cf3c9025372f7174fe16a30044eccff6b.
Broken release. 
						
						
					 
					
						2021-01-15 04:44:13 +10:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jörg Thalheim 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4d3e71cc9e 
							
						 
					 
					
						
						
							
							Merge pull request  #109388  from jumper149/master  
						
						 
						
						... 
						
						
						
						idris2: 0.2.2 -> 0.3.0 
						
						
					 
					
						2021-01-14 18:38:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cbadccb0cf 
							
						 
					 
					
						
						
							
							Merge pull request  #109376  from B4dM4n/nixpart0-eval-error  
						
						 
						
						... 
						
						
						
						nixpart0: stdenv.lib -> lib 
						
						
					 
					
						2021-01-14 19:38:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jörg Thalheim 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e1ac6eba34 
							
						 
					 
					
						
						
							
							Merge pull request  #109324  from tpwrules/lxqt-fix-locations  
						
						 
						
						... 
						
						
						
						lxqt: fix themes and translations 
						
						
					 
					
						2021-01-14 18:25:26 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felix Springer 
							
						 
					 
					
						
						
						
						
							
						
						
							b77c2c5a89 
							
						 
					 
					
						
						
							
							idris2: 0.2.2 -> 0.3.0  
						
						 
						
						
						
						
					 
					
						2021-01-14 19:11:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2416b9da70 
							
						 
					 
					
						
						
							
							Merge pull request  #109381  from lucasew/fix/zgrviewer  
						
						 
						
						... 
						
						
						
						zgrviewer: fix java jre binary path 
						
						
					 
					
						2021-01-14 19:05:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabian Affolter 
							
						 
					 
					
						
						
						
						
							
						
						
							c5bcd25773 
							
						 
					 
					
						
						
							
							home-assistant: update component-packages  
						
						 
						
						
						
						
					 
					
						2021-01-14 19:05:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabian Affolter 
							
						 
					 
					
						
						
						
						
							
						
						
							3a072e45b9 
							
						 
					 
					
						
						
							
							python3Packages.waterfurnace: init at 1.1.0  
						
						 
						
						
						
						
					 
					
						2021-01-14 19:02:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Watson 
							
						 
					 
					
						
						
						
						
							
						
						
							b6779d541a 
							
						 
					 
					
						
						
							
							lxqt: fix themes and translations  
						
						 
						
						... 
						
						
						
						LXQt binaries look for their themes and translations based on the name of the binary, which is changed by the wrapper script. This patches liblxqt to recover the original name from the wrapped binary name. 
						
						
					 
					
						2021-01-14 11:21:36 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eduardo Sánchez Muñoz 
							
						 
					 
					
						
						
						
						
							
						
						
							80badc893d 
							
						 
					 
					
						
						
							
							webbrowser: mark as broken  
						
						 
						
						... 
						
						
						
						https://github.com/NixOS/nixpkgs/issues/108615  
						
						
					 
					
						2021-01-14 09:00:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cad4d1cd38 
							
						 
					 
					
						
						
							
							Merge pull request  #109379  from B4dM4n/salut-a-toi-eval-error  
						
						 
						
						
						
						
					 
					
						2021-01-14 17:59:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lucas Eduardo 
							
						 
					 
					
						
						
						
						
							
						
						
							ebdf3cf3cb 
							
						 
					 
					
						
						
							
							zgrviewer: fix java jre binary path  
						
						 
						
						... 
						
						
						
						Signed-off-by: GitHub <noreply@github.com> 
						
						
					 
					
						2021-01-14 16:50:34 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							ec2681260f 
							
						 
					 
					
						
						
							
							vscode-extensions.ocamllabs.ocaml-platform: init at 1.5.1  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							09576efea7 
							
						 
					 
					
						
						
							
							vscode-extensions.jnoortheen.nix-ide: updated metadata  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							81897656f2 
							
						 
					 
					
						
						
							
							vscode-extensions.freebroccolo.reasonml: init at 1.0.38  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							108b471a83 
							
						 
					 
					
						
						
							
							vscode-extensions.file-icons.file-icons: init at 1.0.28  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							232120d32b 
							
						 
					 
					
						
						
							
							vscode-extensions.esbenp.prettier-vscode: init at 5.8.0  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							75af2699b5 
							
						 
					 
					
						
						
							
							vscode-extensions.donjayamanne.githistory: init at 0.6.14  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							161a9d16b2 
							
						 
					 
					
						
						
							
							vscode-extensions.CoenraadS.bracket-pair-colorizer: init at 1.0.61  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								superherointj 
							
						 
					 
					
						
						
						
						
							
						
						
							160df52c0f 
							
						 
					 
					
						
						
							
							maintainers: add superherointj  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:37:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabian Möller 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							745ce45b28 
							
						 
					 
					
						
						
							
							salut_a_toi: fix evaluation error + stdenv.lib -> lib  
						
						 
						
						
						
						
					 
					
						2021-01-14 17:32:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cfbebe08f5 
							
						 
					 
					
						
						
							
							Merge pull request  #109374  from alyssais/notmuch  
						
						 
						
						... 
						
						
						
						notmuch: skip T568-lib-thread 
						
						
					 
					
						2021-01-14 17:30:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alyssa Ross 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a438086650 
							
						 
					 
					
						
						
							
							notmuch: skip T568-lib-thread  
						
						 
						
						... 
						
						
						
						Fixes: https://github.com/NixOS/nixpkgs/issues/109092 
Thanks-to: Puck Meerburg <puck@puckipedia.com> 
						
						
					 
					
						2021-01-14 16:06:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								R. RyanTM 
							
						 
					 
					
						
						
						
						
							
						
						
							2085e1d092 
							
						 
					 
					
						
						
							
							python37Packages.azure-mgmt-recoveryservicesbackup: 0.10.0 -> 0.11.0  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:06:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sascha Grunert 
							
						 
					 
					
						
						
						
						
							
						
						
							59d4583cf3 
							
						 
					 
					
						
						
							
							conmon: 2.0.22 -> 2.0.23  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sascha Grunert <sgrunert@suse.com> 
						
						
					 
					
						2021-01-14 08:03:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabian Affolter 
							
						 
					 
					
						
						
						
						
							
						
						
							a2f611d01a 
							
						 
					 
					
						
						
							
							python3Packages.colorlog: switch to pytestCheckHook  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:00:31 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabian Affolter 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a260ea4a 
							
						 
					 
					
						
						
							
							python3Packages.colorlog: 4.6.2 -> 4.7.2  
						
						 
						
						
						
						
					 
					
						2021-01-14 08:00:31 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabian Möller 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f213aa3ae0 
							
						 
					 
					
						
						
							
							nixpart0: stdenv.lib -> lib  
						
						 
						
						... 
						
						
						
						This fixes an evaluation error indroduced by #108978  
						
						
					 
					
						2021-01-14 16:57:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Euan Kemp 
							
						 
					 
					
						
						
						
						
							
						
						
							5ecaaf1ba8 
							
						 
					 
					
						
						
							
							libvirt: fixups for meson build  
						
						 
						
						... 
						
						
						
						The previous commit updates to a newer libvirt with a newer build setup.
This commit carries forward that work into a mergeable state.
Based on the suggestion in
https://github.com/NixOS/nixpkgs/pull/103309#issuecomment-724958608 , I
did a fwupd-like patch for the various meson.build files. 
						
						
					 
					
						2021-01-14 07:57:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthieu Coudron 
							
						 
					 
					
						
						
						
						
							
						
						
							cc29c62867 
							
						 
					 
					
						
						
							
							libvirt: 6.6.0 -> 6.8.0  
						
						 
						
						
						
						
					 
					
						2021-01-14 07:57:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							805108e6cf 
							
						 
					 
					
						
						
							
							Merge pull request  #102421  from freezeboy/remove-opensmt  
						
						 
						
						... 
						
						
						
						opensmt: 20101017 -> 2.0.1 
						
						
					 
					
						2021-01-14 15:51:35 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2fec2de389 
							
						 
					 
					
						
						
							
							Merge pull request  #109355  from alyssais/cpan  
						
						 
						
						... 
						
						
						
						nix-generate-from-cpan: stdenv.lib -> lib in expr 
						
						
					 
					
						2021-01-14 16:31:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3b0035a292 
							
						 
					 
					
						
						
							
							Merge pull request  #109369  from devhell/update-profanity  
						
						 
						
						... 
						
						
						
						profanity: 0.9.5 -> 0.10.0 
						
						
					 
					
						2021-01-14 16:28:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ee5df449db 
							
						 
					 
					
						
						
							
							Merge pull request  #109373  from stigtsp/package/perl-net-https-nb-fix-stdenv-lib  
						
						 
						
						... 
						
						
						
						perlPackages.NetHTTPSNB: fix stdenv.lib -> lib 
						
						
					 
					
						2021-01-14 16:28:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d714c53f17 
							
						 
					 
					
						
						
							
							fix mis-merge  
						
						 
						
						
						
						
					 
					
						2021-01-14 15:26:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							792103c8bd 
							
						 
					 
					
						
						
							
							Merge pull request  #109365  from joulaud/upgrade-argo  
						
						 
						
						... 
						
						
						
						argo: 2.11.8 -> 2.12.4 
						
						
					 
					
						2021-01-14 16:25:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sandro 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4eeab9284c 
							
						 
					 
					
						
						
							
							Merge pull request  #109366  from lukegb/factorio  
						
						 
						
						... 
						
						
						
						factorio-headless-experimental, factorio-experimental, factorio-demo-experimental: 1.1.8 -> 1.1.10 
						
						
					 
					
						2021-01-14 16:24:30 +01:00