Charles Strahan a188373640 Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs ... Conflicts: pkgs/development/libraries/haskell/ghcjs-dom/default.nix pkgs/top-level/haskell-packages.nix		2014-12-27 14:35:01 -05:00
..
applications	Missed gcc refs	2014-12-26 12:28:15 -05:00
build-support	Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs	2014-12-27 14:35:01 -05:00
data	include version number in name	2014-12-20 14:45:26 +00:00
desktops	xfce4-task-manager: update (features and bugfixes)	2014-12-25 11:30:04 +01:00
development	Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs	2014-12-27 14:35:01 -05:00
games	Missed gcc refs	2014-12-26 12:28:15 -05:00
misc	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
os-specific	Bumb BLCR	2014-12-27 14:56:21 +01:00
servers	nixpkgs: openresty 1.7.4.1rc2 -> 1.7.7.1	2014-12-27 12:43:52 -06:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	I think this should fix the evaluation errors in hydra	2014-12-27 12:02:58 -05:00
test
tools	nixpkgs: afl 0.89b -> 1.04b	2014-12-26 21:43:05 -06:00
top-level	Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs	2014-12-27 14:35:01 -05:00