Moritz Ulrich 
							
						 
					 
					
						
						
						
						
							
						
						
							5890215501 
							
						 
					 
					
						
						
							
							windowManager.xmonad: Make it configurable and extensible.  
						
						... 
						
						
						
						PR #1366 
The previous windowManager.xmonad option only starts xmonad and
doesn't make ghc available. This assumes that the user has GHC with
access to the xmonad package in his PATH when using xmonad.
Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE}
environment variables which define the path to either ghc or xmessage.
These are set automatically when using xmonad through
windowManager.xmonad.
My (or specific: @aristidb and my) changes make it possible to use
Xmonad without adding GHC to any profile. This is useful if you want
to add a different GHC to your profile.
This commit introduces some options:
- xmonad.haskellPackages: Controls which Haskell package set & GHC set
  is used to (re)build Xmonad
- xmonad.extraPackages: Function returning a list of additional
  packages to make available to GHC when rebuilding Xmonad
- xmonad.enableContribExtras: Boolean option to build xmonadContrib
  and xmonadExtras.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de> 
						
						
					 
					
						2013-12-28 09:29:53 +01:00 
						 
				 
			
				
					
						
							
							
								Moritz Ulrich 
							
						 
					 
					
						
						
						
						
							
						
						
							5331088ba1 
							
						 
					 
					
						
						
							
							ledger3: Update to latest git (8d38060968)  
						
						
						
						
					 
					
						2013-12-28 00:57:17 +00:00 
						 
				 
			
				
					
						
							
							
								Song Wenwu 
							
						 
					 
					
						
						
						
						
							
						
						
							9b273eb971 
							
						 
					 
					
						
						
							
							midori: build with webkit2 to support GTK+2 plugins ( close   #1412 )  
						
						
						
						
					 
					
						2013-12-26 18:14:45 +01:00 
						 
				 
			
				
					
						
							
							
								Song Wenwu 
							
						 
					 
					
						
						
						
						
							
						
						
							55a49a3f93 
							
						 
					 
					
						
						
							
							midori: fix file chooser dialog (Ctrl+o)  
						
						... 
						
						
						
						vcunat: change to double-prefix of the variable, instead of clearing it. 
						
						
					 
					
						2013-12-26 18:14:45 +01:00 
						 
				 
			
				
					
						
							
							
								Song Wenwu 
							
						 
					 
					
						
						
						
						
							
						
						
							0889c86b86 
							
						 
					 
					
						
						
							
							midori: update from 0.4.4 to 0.5.6 ( close   #1411 )  
						
						
						
						
					 
					
						2013-12-26 09:19:19 +01:00 
						 
				 
			
				
					
						
							
							
								Florian Friesdorf 
							
						 
					 
					
						
						
						
						
							
						
						
							7a988c62af 
							
						 
					 
					
						
						
							
							git-repo-1.20, update and pin python  
						
						
						
						
					 
					
						2013-12-26 01:01:01 +01:00 
						 
				 
			
				
					
						
							
							
								Florian Friesdorf 
							
						 
					 
					
						
						
						
						
							
						
						
							46f627e8f7 
							
						 
					 
					
						
						
							
							git-repo-1.19  
						
						
						
						
					 
					
						2013-12-26 00:45:21 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Tjörnhammar 
							
						 
					 
					
						
						
						
						
							
						
						
							01c39bdefc 
							
						 
					 
					
						
						
							
							Adding IntelliJ IDEA13 Community and Ultimate  
						
						
						
						
					 
					
						2013-12-26 00:12:19 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							b80d1c5923 
							
						 
					 
					
						
						
							
							Merge x-updates  
						
						
						
						
					 
					
						2013-12-25 23:56:41 +01:00 
						 
				 
			
				
					
						
							
							
								AndersonTorres 
							
						 
					 
					
						
						
						
						
							
						
						
							378f962c0e 
							
						 
					 
					
						
						
							
							Aegisub: New Package  
						
						... 
						
						
						
						Adding Aegisub: an advanced movie subtitle editor 
						
						
					 
					
						2013-12-25 22:24:19 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							a4462d9a03 
							
						 
					 
					
						
						
							
							git-annex: fix build some more  
						
						
						
						
					 
					
						2013-12-23 22:30:43 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							47a3ece984 
							
						 
					 
					
						
						
							
							git-annex: disable test suite to fix build  
						
						... 
						
						
						
						The "lock" test fails. Upstream knows this, and apparently the failure
is caused by a bug in the test suite -- not in the application code. 
						
						
					 
					
						2013-12-23 22:30:43 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							2ac0fedb60 
							
						 
					 
					
						
						
							
							haskell-git-annex: update to version 5.20131221  
						
						
						
						
					 
					
						2013-12-23 22:30:42 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							50ac037864 
							
						 
					 
					
						
						
							
							Merge master into x-updates  
						
						
						
						
					 
					
						2013-12-23 19:27:14 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							939a0d3b4a 
							
						 
					 
					
						
						
							
							firefox: enable gstreamer for h.264 support in HTML5 video  
						
						
						
						
					 
					
						2013-12-23 15:48:36 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							82131d5013 
							
						 
					 
					
						
						
							
							clucene_core: switch to versioning scheme to make overriding easier  
						
						
						
						
					 
					
						2013-12-23 15:48:35 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							e966ebd5e1 
							
						 
					 
					
						
						
							
							kdesvn: upgrade to 1.6.0  
						
						
						
						
					 
					
						2013-12-23 10:25:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							c5d05a5652 
							
						 
					 
					
						
						
							
							jigdo: depend on db4 instead of db45  
						
						
						
						
					 
					
						2013-12-23 10:25:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							a508d30c53 
							
						 
					 
					
						
						
							
							openimageio: hash change  
						
						
						
						
					 
					
						2013-12-23 10:25:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							34527353b5 
							
						 
					 
					
						
						
							
							conkeror: upgrade to more recent git "release"  
						
						
						
						
					 
					
						2013-12-23 10:25:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							e9a61d523e 
							
						 
					 
					
						
						
							
							firefox: use system icu  
						
						... 
						
						
						
						- cleanup of debug/optimize flags 
						
						
					 
					
						2013-12-23 10:25:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							56cf3c115f 
							
						 
					 
					
						
						
							
							mplayer2: upgrade to git 04/28  
						
						
						
						
					 
					
						2013-12-23 10:21:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							1b9884b7ae 
							
						 
					 
					
						
						
							
							opusfile: new package  
						
						
						
						
					 
					
						2013-12-23 10:21:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							64266a2197 
							
						 
					 
					
						
						
							
							opus-tools: upgrade to 0.1.8  
						
						
						
						
					 
					
						2013-12-23 10:21:18 +01:00 
						 
				 
			
				
					
						
							
							
								Mathijs Kwik 
							
						 
					 
					
						
						
						
						
							
						
						
							5771888f4e 
							
						 
					 
					
						
						
							
							wireshark: upgrade to 1.10.3  
						
						... 
						
						
						
						- cleaned up dependencies
- python support is deprecated (upstream) in favor of pyreshark 
						
						
					 
					
						2013-12-23 10:21:18 +01:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							786b828f33 
							
						 
					 
					
						
						
							
							ngspice: update from 24 to 25  
						
						
						
						
					 
					
						2013-12-23 05:27:10 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							f3c93eaa1e 
							
						 
					 
					
						
						
							
							pidginmsnpecan: update from 0.1.0 to 0.1.4  
						
						
						
						
					 
					
						2013-12-23 05:24:47 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							7e3e830e81 
							
						 
					 
					
						
						
							
							qjackctl: update from 0.3.9 to 0.3.10  
						
						
						
						
					 
					
						2013-12-23 05:21:36 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							ab32224e7b 
							
						 
					 
					
						
						
							
							smplayer: update from 0.8.5 to 0.8.6  
						
						
						
						
					 
					
						2013-12-23 05:19:26 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							e36a27155d 
							
						 
					 
					
						
						
							
							vacuum: update from 1.2.0 to 1.2.3  
						
						
						
						
					 
					
						2013-12-23 03:30:33 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							c23bf0548e 
							
						 
					 
					
						
						
							
							xterm: update from 281 to 300  
						
						
						
						
					 
					
						2013-12-23 03:27:46 +02:00 
						 
				 
			
				
					
						
							
							
								Lluís Batlle i Rossell 
							
						 
					 
					
						
						
						
						
							
						
						
							a7a7e414f0 
							
						 
					 
					
						
						
							
							Updating mpv, and making it use ffmpeg_2  
						
						
						
						
					 
					
						2013-12-22 19:00:05 +01:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							78ad8b0a38 
							
						 
					 
					
						
						
							
							telepathy_salut: update from 0.8.0 to 0.8.1  
						
						
						
						
					 
					
						2013-12-22 01:29:01 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							49060a6ade 
							
						 
					 
					
						
						
							
							telepathy_rakia: update from 0.7.4 to 0.8.0  
						
						
						
						
					 
					
						2013-12-22 01:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							907788ffd7 
							
						 
					 
					
						
						
							
							telepathy_mission_control: update from 5.14.1 to 5.16.0  
						
						
						
						
					 
					
						2013-12-22 01:27:16 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							4c71072c35 
							
						 
					 
					
						
						
							
							telepathy_haze: update from 0.7.0 to 0.8.0  
						
						
						
						
					 
					
						2013-12-22 01:26:16 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							270acdc682 
							
						 
					 
					
						
						
							
							gnumeric: update from 1.12.0 to 1.12.9, potentially fixes CVE-2013-6836  
						
						
						
						
					 
					
						2013-12-21 18:13:03 +02:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							2b24f1349a 
							
						 
					 
					
						
						
							
							Merge master into x-updates  
						
						
						
						
					 
					
						2013-12-21 10:20:55 +01:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							458decf6c4 
							
						 
					 
					
						
						
							
							mhwaveedit: update from 1.4.21 to 1.4.23  
						
						
						
						
					 
					
						2013-12-21 04:05:17 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							64bdbc9271 
							
						 
					 
					
						
						
							
							samplv1: update from 0.3.2 to 0.3.5  
						
						
						
						
					 
					
						2013-12-21 02:28:28 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							59c3fb01f5 
							
						 
					 
					
						
						
							
							scribus: update from 1.4.1 to 1.4.3  
						
						
						
						
					 
					
						2013-12-21 02:28:28 +02:00 
						 
				 
			
				
					
						
							
							
								Evgeny Egorochkin 
							
						 
					 
					
						
						
						
						
							
						
						
							c4c10e8826 
							
						 
					 
					
						
						
							
							ufraw: add missing lensfun dependency  
						
						
						
						
					 
					
						2013-12-21 02:28:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e950867c 
							
						 
					 
					
						
						
							
							ufraw: update from 0.18 to 0.19.2  
						
						
						
						
					 
					
						2013-12-21 02:28:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							bb1b1bb1a5 
							
						 
					 
					
						
						
							
							xchm: update from 1.18 to 1.23  
						
						
						
						
					 
					
						2013-12-21 02:28:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							3e2fc2338c 
							
						 
					 
					
						
						
							
							xfontsel: update from 1.0.2 to 1.0.5  
						
						
						
						
					 
					
						2013-12-21 02:28:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							102a88e469 
							
						 
					 
					
						
						
							
							xsane: update from 0.998 to 0.999  
						
						
						
						
					 
					
						2013-12-21 02:28:26 +02:00 
						 
				 
			
				
					
						
							
							
								Nixpkgs Monitor 
							
						 
					 
					
						
						
						
						
							
						
						
							7289affced 
							
						 
					 
					
						
						
							
							pari: update from 2.5.4 to 2.5.5  
						
						
						
						
					 
					
						2013-12-21 02:28:25 +02:00 
						 
				 
			
				
					
						
							
							
								Evgeny Egorochkin 
							
						 
					 
					
						
						
						
						
							
						
						
							c857d90619 
							
						 
					 
					
						
						
							
							nut: update from 2.6.5 to 2.7.1; fix nut-scanner  
						
						
						
						
					 
					
						2013-12-21 02:28:24 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Simons 
							
						 
					 
					
						
						
						
						
							
						
						
							778a55d352 
							
						 
					 
					
						
						
							
							ess-mode: enable Hydra builds on Linux  
						
						
						
						
					 
					
						2013-12-21 00:05:29 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimír Čunát 
							
						 
					 
					
						
						
						
						
							
						
						
							4c5a71f777 
							
						 
					 
					
						
						
							
							Merge master into x-updates  
						
						... 
						
						
						
						Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix 
						
						
					 
					
						2013-12-18 23:21:29 +01:00