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
..
default.nix	Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs	2014-12-27 14:35:01 -05:00
ghcjs.nix	purify ghcjs	2014-12-11 20:56:41 -05:00