Ryan Trinkle 92f8d68b99 Merge branch 'master' of https://github.com/NixOS/nixpkgs ... Conflicts: pkgs/development/libraries/haskell/ghcjs-dom/default.nix pkgs/top-level/haskell-packages.nix		2014-10-06 13:12:58 -04:00
..
4.2.nix	Merge branch 'master' of https://github.com/NixOS/nixpkgs	2014-10-06 13:12:58 -04:00
4.4.nix