public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NixOS/nixpkgs into update

Browse Source 
Conflicts:
	pkgs/development/libraries/haskell/text-binary/default.nix
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
This commit is contained in:
Bas van Dijk
2014-12-05 07:54:48 +01:00
parent 21566e7c56 e51ece3a65
commit 6fa969839a
3039 changed files with 70304 additions and 43065 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/cpphs/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
version = "1.18.5";
sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7";
version = "1.18.6";
sha256 = "0ds712zabigswf3cljzh7f2ys4rl1fj2cf76lbw856adm8514gxc";
isLibrary = true;
isExecutable = true;
buildDepends = [ oldTime polyparse ];