Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							c45372f038 
							
						 
					 
					
						
						
							
							Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'  
						
						 
						
						... 
						
						
						
						Partial staging merge, including cc-wrapper fixes
Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix 
						
						
					 
					
						2015-02-02 21:14:28 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sou Bunnbu 
							
						 
					 
					
						
						
						
						
							
						
						
							7861c25eb0 
							
						 
					 
					
						
						
							
							Merge pull request  #6093  from nckx/update-stress-ng  
						
						 
						
						... 
						
						
						
						Update stress-ng 0.03.11 -> 0.03.13 
						
						
					 
					
						2015-02-02 13:06:30 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							b7a4231be7 
							
						 
					 
					
						
						
							
							Update stress-ng 0.03.11 -> 0.03.13  
						
						 
						
						
						
						
					 
					
						2015-02-02 00:15:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							71797af73f 
							
						 
					 
					
						
						
							
							Update pipelight Wine  
						
						 
						
						
						
						
					 
					
						2015-02-01 18:41:33 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							a8e7a3ac86 
							
						 
					 
					
						
						
							
							Update glusterfs  
						
						 
						
						
						
						
					 
					
						2015-02-01 18:41:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Raskin 
							
						 
					 
					
						
						
						
						
							
						
						
							b09b841dc4 
							
						 
					 
					
						
						
							
							Update ZPAQ  
						
						 
						
						
						
						
					 
					
						2015-02-01 18:41:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							87377cec15 
							
						 
					 
					
						
						
							
							Merge pull request  #6064  from ktosiek/sstp  
						
						 
						
						... 
						
						
						
						Add sstp client. 
						
						
					 
					
						2015-01-31 13:30:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								koral 
							
						 
					 
					
						
						
						
						
							
						
						
							6d7e09602f 
							
						 
					 
					
						
						
							
							youtube-dl: 2015.01.25 -> 2015.01.30.2  
						
						 
						
						
						
						
					 
					
						2015-01-31 11:09:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Kontusz 
							
						 
					 
					
						
						
						
						
							
						
						
							99c0af0d73 
							
						 
					 
					
						
						
							
							Add sstp client.  
						
						 
						
						
						
						
					 
					
						2015-01-30 20:09:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							9ecafbe366 
							
						 
					 
					
						
						
							
							ethtool: update to 3.18  
						
						 
						
						
						
						
					 
					
						2015-01-30 13:23:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e7fada66 
							
						 
					 
					
						
						
							
							Merge pull request  #5951  from arno01/socat  
						
						 
						
						... 
						
						
						
						socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack 
						
						
					 
					
						2015-01-30 11:31:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lluís Batlle i Rossell 
							
						 
					 
					
						
						
						
						
							
						
						
							adf6ef3865 
							
						 
					 
					
						
						
							
							cjdns: updating with bugfix, and readd nodejs tools  
						
						 
						
						... 
						
						
						
						(cherry picked from commit cd80d050cb8145d45c56533625beb82f37177fae) 
						
						
					 
					
						2015-01-30 09:26:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shea Levy 
							
						 
					 
					
						
						
						
						
							
						
						
							52d4b9d982 
							
						 
					 
					
						
						
							
							Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs  
						
						 
						
						
						
						
					 
					
						2015-01-30 01:07:59 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wout Mertens 
							
						 
					 
					
						
						
						
						
							
						
						
							f736843200 
							
						 
					 
					
						
						
							
							Merge pull request  #6061  from wmertens/fortune-darwin  
						
						 
						
						... 
						
						
						
						fortune: fix Darwin build 
						
						
					 
					
						2015-01-29 19:56:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lluís Batlle i Rossell 
							
						 
					 
					
						
						
						
						
							
						
						
							8ea408be56 
							
						 
					 
					
						
						
							
							Update cjdns to v15  
						
						 
						
						... 
						
						
						
						(cherry picked from commit aeefbe552adda2b3191bbd48cd7cf79ad9425d94) 
						
						
					 
					
						2015-01-29 19:50:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lluís Batlle i Rossell 
							
						 
					 
					
						
						
						
						
							
						
						
							7f29d1882e 
							
						 
					 
					
						
						
							
							Install more rkflashtools.  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 56e0562cdb41c160825c700bb0873625db985d55) 
						
						
					 
					
						2015-01-29 19:50:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wout Mertens 
							
						 
					 
					
						
						
						
						
							
						
						
							bc6a35c92d 
							
						 
					 
					
						
						
							
							fortune: fix Darwin build  
						
						 
						
						
						
						
					 
					
						2015-01-29 19:14:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							857f32dfe7 
							
						 
					 
					
						
						
							
							Merge pull request  #5967  from k0ral/rmlint  
						
						 
						
						... 
						
						
						
						rmlint: 1.0.8 -> 2.0.0 
						
						
					 
					
						2015-01-29 10:48:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							45c52b7312 
							
						 
					 
					
						
						
							
							Merge pull request  #6040  from ambrop72/gawk-cross  
						
						 
						
						... 
						
						
						
						gawk: Fix cross compiling. 
						
						
					 
					
						2015-01-29 10:42:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ambroz Bizjak 
							
						 
					 
					
						
						
						
						
							
						
						
							6837efe3bb 
							
						 
					 
					
						
						
							
							gawk: Fix cross compiling.  
						
						 
						
						... 
						
						
						
						Note that this does not trigger rebuild for native builds. 
						
						
					 
					
						2015-01-29 00:19:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Domen Kožar 
							
						 
					 
					
						
						
						
						
							
						
						
							1cb02a448a 
							
						 
					 
					
						
						
							
							Merge pull request  #6000  from k0ral/moreutils  
						
						 
						
						... 
						
						
						
						moreutils: 0.54 -> 0.55 
						
						
					 
					
						2015-01-28 22:36:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								koral 
							
						 
					 
					
						
						
						
						
							
						
						
							3544c17df5 
							
						 
					 
					
						
						
							
							moreutils: 0.54 -> 0.55  
						
						 
						
						
						
						
					 
					
						2015-01-28 22:30:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								koral 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed8c422a5 
							
						 
					 
					
						
						
							
							rmlint: 1.0.8 -> 2.0.0  
						
						 
						
						
						
						
					 
					
						2015-01-28 17:35:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrey Arapov 
							
						 
					 
					
						
						
						
						
							
						
						
							2695233823 
							
						 
					 
					
						
						
							
							Adds a new package: ent - A Pseudorandom Number Sequence Test Program  
						
						 
						
						... 
						
						
						
						The program is useful for evaluating pseudorandom number generators
for encryption and statistical sampling applications, compression
algorithms, and other applications where the information density of a
file is of interest.
Official page http://www.fourmilab.ch/random/  
						
						
					 
					
						2015-01-28 16:45:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							22244aba42 
							
						 
					 
					
						
						
							
							Merge pull request  #5972  from nckx/update-exfat  
						
						 
						
						... 
						
						
						
						Update fuse-exfat 1.0.1 -> 1.1.0 
						
						
					 
					
						2015-01-28 14:44:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paho Lurie-Gregg 
							
						 
					 
					
						
						
						
						
							
						
						
							f504d12b29 
							
						 
					 
					
						
						
							
							add xflux  
						
						 
						
						
						
						
					 
					
						2015-01-28 12:33:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edward Tjörnhammar 
							
						 
					 
					
						
						
						
						
							
						
						
							da91fff493 
							
						 
					 
					
						
						
							
							Merge pull request  #5959  from malyn/fix-rcm-paths  
						
						 
						
						... 
						
						
						
						rcm: Use Nix store path for RCM_LIB 
						
						
					 
					
						2015-01-28 11:36:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							79d5d95a53 
							
						 
					 
					
						
						
							
							Merge pull request  #5973  from nckx/add-exfat-utils  
						
						 
						
						... 
						
						
						
						Add exfat-utils 1.1.1: free exFAT file system utilities 
						
						
					 
					
						2015-01-28 10:40:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lethalman 
							
						 
					 
					
						
						
						
						
							
						
						
							7be008e166 
							
						 
					 
					
						
						
							
							Merge pull request  #5970  from nckx/add-clex  
						
						 
						
						... 
						
						
						
						Add clex 4.6.patch6: full-screen terminal file manager 
						
						
					 
					
						2015-01-28 10:30:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								宋文武 
							
						 
					 
					
						
						
						
						
							
						
						
							e772707042 
							
						 
					 
					
						
						
							
							ostree: Update to 2015.3  
						
						 
						
						
						
						
					 
					
						2015-01-28 10:39:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							6f8fad2253 
							
						 
					 
					
						
						
							
							Remove executable bits from non-executable files  
						
						 
						
						
						
						
					 
					
						2015-01-27 18:54:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							7e1e553cb8 
							
						 
					 
					
						
						
							
							nixui: update to 0.1.2 ( close   #6005 )  
						
						 
						
						
						
						
					 
					
						2015-01-27 18:19:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							520cba52fc 
							
						 
					 
					
						
						
							
							pigz: update from 2.3.1 to 2.3.3, potentially fixes CVE-2015-1191  
						
						 
						
						
						
						
					 
					
						2015-01-27 14:04:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							7185c6150c 
							
						 
					 
					
						
						
							
							ipmitool: update from 1.8.14 to 1.8.15  
						
						 
						
						
						
						
					 
					
						2015-01-27 14:04:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas Tuegel 
							
						 
					 
					
						
						
						
						
							
						
						
							dfe1dc0c02 
							
						 
					 
					
						
						
							
							xdg-utils: patch xdg-open to use KDE 5 tools  
						
						 
						
						
						
						
					 
					
						2015-01-26 21:01:06 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mateusz Kowalczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							edae98d029 
							
						 
					 
					
						
						
							
							youtube-dl: update to 2015.01.25  
						
						 
						
						
						
						
					 
					
						2015-01-27 00:46:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eelco Dolstra 
							
						 
					 
					
						
						
						
						
							
						
						
							0caae022fd 
							
						 
					 
					
						
						
							
							xz: Update to 5.2.0  
						
						 
						
						
						
						
					 
					
						2015-01-26 23:48:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							220c578f76 
							
						 
					 
					
						
						
							
							Update gparted 0.19.1 -> 0.21.0  
						
						 
						
						
						
						
					 
					
						2015-01-26 19:50:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cillianderoiste 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c1d73aec 
							
						 
					 
					
						
						
							
							Merge pull request  #5987  from k0ral/swftools  
						
						 
						
						... 
						
						
						
						swftools: 0.8.1 -> 0.9.2 
						
						
					 
					
						2015-01-26 13:26:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Georges Dubus 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e7fd8384 
							
						 
					 
					
						
						
							
							Merge pull request  #5969  from nckx/update-stress-ng  
						
						 
						
						... 
						
						
						
						Update stress-ng 0.03.10 -> 0.03.11 
						
						
					 
					
						2015-01-26 12:07:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								koral 
							
						 
					 
					
						
						
						
						
							
						
						
							0490d597df 
							
						 
					 
					
						
						
							
							swftools: 0.8.1 -> 0.9.2  
						
						 
						
						
						
						
					 
					
						2015-01-26 12:05:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							f550c76d0e 
							
						 
					 
					
						
						
							
							nixui: update to 0.1.1  
						
						 
						
						
						
						
					 
					
						2015-01-26 10:21:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							3ea2b48fe6 
							
						 
					 
					
						
						
							
							Update fuse-exfat 1.0.1 -> 1.1.0  
						
						 
						
						
						
						
					 
					
						2015-01-26 04:43:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							65c21a71bb 
							
						 
					 
					
						
						
							
							Add exfat-utils 1.1.1: free exFAT file system utilities  
						
						 
						
						
						
						
					 
					
						2015-01-26 04:24:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Alyn Miller 
							
						 
					 
					
						
						
						
						
							
						
						
							41de5f60cd 
							
						 
					 
					
						
						
							
							rcm: Use Nix store path for RCM_LIB  
						
						 
						
						... 
						
						
						
						The shell scripts in the rcm package use a relative path in order to
find the rcm.sh library.  That works fine when rcm is installed with
nix-env -- ~/.nix-profile/share/rcm exists as expected -- but does not
work when installed via /etc/nixos/configuration.nix.  In the
system-wide case, /run/current-system/sw/share does not contain the rcm
directory. 
						
						
					 
					
						2015-01-25 14:59:04 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							f59ba9a4a6 
							
						 
					 
					
						
						
							
							Update stress-ng 0.03.10 -> 0.03.11  
						
						 
						
						
						
						
					 
					
						2015-01-25 23:40:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Moritz Ulrich 
							
						 
					 
					
						
						
						
						
							
						
						
							54cfcbc826 
							
						 
					 
					
						
						
							
							isync: update from 1.1.1 to 1.1.2  
						
						 
						
						
						
						
					 
					
						2015-01-25 22:37:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charles Strahan 
							
						 
					 
					
						
						
						
						
							
						
						
							1057f2e8ad 
							
						 
					 
					
						
						
							
							gist: fix evaluation  
						
						 
						
						
						
						
					 
					
						2015-01-25 16:22:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benno Fünfstück 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9af69347 
							
						 
					 
					
						
						
							
							kpcli: XMLParser is required for KeePass2 format  
						
						 
						
						
						
						
					 
					
						2015-01-25 22:10:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Geerinckx-Rice 
							
						 
					 
					
						
						
						
						
							
						
						
							c052751aba 
							
						 
					 
					
						
						
							
							Add clex 4.6.patch6: full-screen terminal file manager  
						
						 
						
						
						
						
					 
					
						2015-01-25 20:56:28 +01:00