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

haskellPackages.diff3: New expression

This commit is contained in:
Oliver Charles 2014-02-09 12:12:31 +00:00
parent c3df9e21c0
commit cf5513f240
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/haskell/diff3/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ cabal, Diff, QuickCheck, testFramework, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "diff3";
version = "0.2.0.3";
sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
buildDepends = [ Diff ];
testDepends = [
QuickCheck testFramework testFrameworkQuickcheck2
];
meta = {
homepage = "http://github.com/ocharles/diff3.git";
description = "Perform a 3-way difference of documents";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

2
pkgs/top-level/haskell-packages.nix
View File

@ -944,6 +944,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
Diff = callPackage ../development/libraries/haskell/Diff {}; Diff = callPackage ../development/libraries/haskell/Diff {};
diff3 = callPackage ../development/libraries/haskell/diff3 {};
digest = callPackage ../development/libraries/haskell/digest { digest = callPackage ../development/libraries/haskell/digest {
inherit (pkgs) zlib; inherit (pkgs) zlib;
}; };