From cf5513f2409ae0cd46a69f3dcc65e880305c8ed5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sun, 9 Feb 2014 12:12:31 +0000 Subject: [PATCH] haskellPackages.diff3: New expression --- .../libraries/haskell/diff3/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diff3/default.nix diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix new file mode 100644 index 000000000000..60f27e89d58f --- /dev/null +++ b/pkgs/development/libraries/haskell/diff3/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a599b48f0650..0d457bbbb513 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -944,6 +944,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Diff = callPackage ../development/libraries/haskell/Diff {}; + diff3 = callPackage ../development/libraries/haskell/diff3 {}; + digest = callPackage ../development/libraries/haskell/digest { inherit (pkgs) zlib; };