Files
nixpkgs/pkgs
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
..
2014-11-25 00:42:22 +01:00
2014-12-04 10:22:27 +02:00
2014-12-04 13:44:30 +00:00
2014-12-03 17:32:58 +01:00
2014-12-03 22:22:30 +01:00
2014-12-03 16:56:44 +00:00
2014-11-14 14:28:23 +01:00