 985d1ac425
			
		
	
	
		985d1ac425
		
			
		
	
	
	
	
		
			
			There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
 985d1ac425
			
		
	
	
		985d1ac425
		
			
		
	
	
	
	
		
			
			There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611