From 3ae597033daf6f5605a1e6c9bcebf61ce807816c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 29 Mar 2011 14:17:19 +0000 Subject: [PATCH] Added tuple and OneTuple. svn path=/nixpkgs/trunk/; revision=26592 --- .../libraries/haskell/OneTuple/default.nix | 13 +++++++++++++ .../libraries/haskell/tuple/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/haskell/OneTuple/default.nix create mode 100644 pkgs/development/libraries/haskell/tuple/default.nix diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix new file mode 100644 index 000000000000..237000e23eaf --- /dev/null +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "OneTuple"; + version = "0.2.1"; + sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; + meta = { + description = "Singleton Tuple"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix new file mode 100644 index 000000000000..dd7fd36089da --- /dev/null +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -0,0 +1,14 @@ +{cabal, OneTuple}: + +cabal.mkDerivation (self : { + pname = "tuple"; + version = "0.2.0.1"; + sha256 = "1c4vf798rjwshnk04avyjp4rjzj8i9qx4yksv00m3rjy6psr57xg"; + propagatedBuildInputs = [OneTuple]; + meta = { + description = "Various functions on tuples"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 77cb6b611da6..5fc42eb204a7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -643,6 +643,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; + OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL { inherit (pkgs) openal; }; @@ -843,6 +845,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers = self.transformers_0_2_2_0; + tuple = callPackage ../development/libraries/haskell/tuple {}; + uniplate = callPackage ../development/libraries/haskell/uniplate {}; uniqueid = callPackage ../development/libraries/haskell/uniqueid {};