From 0736b17460f462642a70ef608f150f1c19c0aec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 16 May 2011 13:48:03 +0000 Subject: [PATCH] Added repa library for Haskell. svn path=/nixpkgs/trunk/; revision=27267 --- .../libraries/haskell/binary/default.nix | 4 ++-- .../development/libraries/haskell/bmp/default.nix | 14 ++++++++++++++ .../libraries/haskell/repa-algorithms/default.nix | 14 ++++++++++++++ .../libraries/haskell/repa-bytestring/default.nix | 14 ++++++++++++++ .../libraries/haskell/repa-examples/default.nix | 15 +++++++++++++++ .../libraries/haskell/repa-io/default.nix | 14 ++++++++++++++ .../libraries/haskell/repa/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 14 +++++++++++++- 8 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/bmp/default.nix create mode 100644 pkgs/development/libraries/haskell/repa-algorithms/default.nix create mode 100644 pkgs/development/libraries/haskell/repa-bytestring/default.nix create mode 100644 pkgs/development/libraries/haskell/repa-examples/default.nix create mode 100644 pkgs/development/libraries/haskell/repa-io/default.nix create mode 100644 pkgs/development/libraries/haskell/repa/default.nix diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index b2f729b25f94..cf501a51d474 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "binary"; - version = "0.5.0.1"; - sha256 = "1j5injgrwkjwl7lv6sqx4m033s3rrkspq690cb0ckfh267vsyig1"; + version = "0.5.0.2"; + sha256 = "02qkybh11psmggkqcs7f8kh4izfj44gq1wk23xhv3jbxc7gdxhp0"; meta = { description = "Efficient, pure binary serialisation using lazy ByteStrings"; }; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix new file mode 100644 index 000000000000..1a56ef2a497b --- /dev/null +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -0,0 +1,14 @@ +{cabal, binary}: + +cabal.mkDerivation (self : { + pname = "bmp"; + version = "1.1.1.2"; + sha256 = "1hxsl9gip5icjbmr5y48nkb10csqwzcswssqfaq6cqwnfhpi7813"; + propagatedBuildInputs = [binary]; + meta = { + description = "Read and write uncompressed BMP image files"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix new file mode 100644 index 000000000000..2849558ef49c --- /dev/null +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -0,0 +1,14 @@ +{cabal, repa, vector}: + +cabal.mkDerivation (self : { + pname = "repa-algorithms"; + version = "2.0.0.3"; + sha256 = "17h5xbn8gy0glryrv7pjdpxaw9adrk0bln683p0xxl6wrx90ngdv"; + propagatedBuildInputs = [repa vector]; + meta = { + description = "Algorithms using the Repa array library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix new file mode 100644 index 000000000000..ae660ab43b25 --- /dev/null +++ b/pkgs/development/libraries/haskell/repa-bytestring/default.nix @@ -0,0 +1,14 @@ +{cabal, repa, vector}: + +cabal.mkDerivation (self : { + pname = "repa-bytestring"; + version = "2.0.0.3"; + sha256 = "05kc5d8j4m5g515syvz5jkbjvhhf3jxkak4w6pvyhx6nmzgywrk5"; + propagatedBuildInputs = [repa vector]; + meta = { + description = "Conversions between Repa Arrays and ByteStrings"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix new file mode 100644 index 000000000000..b5222dcc8877 --- /dev/null +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -0,0 +1,15 @@ +{cabal, repa, repaAlgorithms, repaIO, vector, llvm}: + +cabal.mkDerivation (self : { + pname = "repa-examples"; + version = "2.0.0.3"; + sha256 = "0kj93rrr63x34dcljw6hvqjbz4mfzw00gmbddrqya0dhf9ifjnb9"; + extraBuildInputs = [llvm]; + propagatedBuildInputs = [repa repaAlgorithms repaIO vector]; + meta = { + description = "Examples using the Repa array library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix new file mode 100644 index 000000000000..afb0b99cfa22 --- /dev/null +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -0,0 +1,14 @@ +{cabal, bmp, repa, repaBytestring}: + +cabal.mkDerivation (self : { + pname = "repa-io"; + version = "2.0.0.3"; + sha256 = "1p8h2855jv8nnvf9vq2ywrmm9qk9qdqy6yqr4dj9p90kfcqxgw2g"; + propagatedBuildInputs = [bmp repa repaBytestring]; + meta = { + description = "Read and write Repa arrays in various formats"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix new file mode 100644 index 000000000000..10f40445df38 --- /dev/null +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -0,0 +1,14 @@ +{cabal, QuickCheck, vector}: + +cabal.mkDerivation (self : { + pname = "repa"; + version = "2.0.0.4"; + sha256 = "11cjh4bdwb1kwb6ikig4i6vr3kqs840wdpl22biws16lg74mfxxn"; + propagatedBuildInputs = [QuickCheck vector]; + meta = { + description = "High performance, regular, shape polymorphic parallel arrays"; + 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 c03cf77e8525..90324787314a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -344,13 +344,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bitmap = callPackage ../development/libraries/haskell/bitmap {}; + bktrees = callPackage ../development/libraries/haskell/bktrees {}; + blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {}; blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; - bktrees = callPackage ../development/libraries/haskell/bktrees {}; + bmp = callPackage ../development/libraries/haskell/bmp {}; Boolean = callPackage ../development/libraries/haskell/Boolean {}; @@ -815,6 +817,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regular = callPackage ../development/libraries/haskell/regular {}; + repa = callPackage ../development/libraries/haskell/repa {}; + + repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {}; + + repaBytestring = callPackage ../development/libraries/haskell/repa-bytestring {}; + + repaExamples = callPackage ../development/libraries/haskell/repa-examples {}; + + repaIO = callPackage ../development/libraries/haskell/repa-io {}; + safe = callPackage ../development/libraries/haskell/safe {}; salvia = callPackage ../development/libraries/haskell/salvia {};