Author: andres
Date: Fri Feb 3 12:15:00 2012
New Revision: 31991
URL: https://nixos.org/websvn/nix/?rev=31991&sc=1
Log:
Added haskell-{bitarray,containers-deepseq,gd}.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/bitarray/
nixpkgs/trunk/pkgs/development/libraries/haskell/bitarray/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/containers-deepseq/
nixpkgs/trunk/pkgs/development/libraries/haskell/containers-deepseq/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/gd/
nixpkgs/trunk/pkgs/development/libraries/haskell/gd/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/bitarray/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/bitarray/default.nix
Fri Feb 3 12:15:00 2012 (r31991)
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "bitarray";
+ version = "0.0.1";
+ sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb";
+ meta = {
+ homepage = "http://code.haskell.org/~bkomuves/";;
+ description = "Mutable and immutable bit arrays";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/containers-deepseq/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/containers-deepseq/default.nix
Fri Feb 3 12:15:00 2012 (r31991)
@@ -0,0 +1,17 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+ pname = "containers-deepseq";
+ version = "0.1.0.1";
+ sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
+ buildDepends = [ deepseq ];
+ meta = {
+ description = "Provide orphan NFData instances for containers as needed.
(deprecated)";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/gd/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/gd/default.nix Fri Feb
3 12:15:00 2012 (r31991)
@@ -0,0 +1,19 @@
+{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }:
+
+cabal.mkDerivation (self: {
+ pname = "gd";
+ version = "3000.7.1";
+ sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50";
+ extraLibraries = [
+ expat fontconfig freetype gd libjpeg libpng zlib
+ ];
+ meta = {
+ description = "A Haskell binding to a subset of the GD graphics library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Feb 2 22:41:21
2012 (r31990)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Feb 3 12:15:00
2012 (r31991)
@@ -466,6 +466,8 @@
binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
+ bitarray = callPackage ../development/libraries/haskell/bitarray {};
+
bitmap = callPackage ../development/libraries/haskell/bitmap {};
bktrees = callPackage ../development/libraries/haskell/bktrees {};
@@ -540,6 +542,8 @@
ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
+ containersDeepseq = callPackage
../development/libraries/haskell/containers-deepseq {};
+
controlMonadAttempt = callPackage
../development/libraries/haskell/control-monad-attempt {};
convertible = callPackage ../development/libraries/haskell/convertible {
@@ -678,6 +682,10 @@
gamma = callPackage ../development/libraries/haskell/gamma {};
+ gd = callPackage ../development/libraries/haskell/gd {
+ inherit (pkgs) gd zlib;
+ };
+
gdiff = callPackage ../development/libraries/haskell/gdiff {};
genericDeriving = callPackage
../development/libraries/haskell/generic-deriving {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
