Bas van Dijk 6fa969839a Merge branch 'master' of https://github.com/NixOS/nixpkgs into update ... Conflicts: pkgs/development/libraries/haskell/text-binary/default.nix pkgs/top-level/haskell-defaults.nix pkgs/top-level/haskell-packages.nix		2014-12-05 07:54:48 +01:00
..
default.nix	Merge branch 'master' of https://github.com/NixOS/nixpkgs into update	2014-12-05 07:54:48 +01:00
ghcjs.nix	Use mkdir -p instead of deprecated ensureDir	2014-11-29 14:24:31 +01:00