Author: andres Date: Wed May 9 16:19:52 2012 New Revision: 34030 URL: https://nixos.org/websvn/nix/?rev=34030&sc=1
Log: Added haskell-mpi and dependencies. Added: nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/ nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/default.nix nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/ nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/default.nix nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/ nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Added: nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/default.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/default.nix Wed May 9 16:19:52 2012 (r34030) @@ -0,0 +1,17 @@ +{ cabal, filepath, languageC }: + +cabal.mkDerivation (self: { + pname = "c2hs"; + version = "0.16.3"; + sha256 = "1qqsxfdkf5sfj3mvk265dbng3br9w633y8v1piajqaidki7vwqm5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath languageC ]; + meta = { + homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) Added: nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/default.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/default.nix Wed May 9 16:19:52 2012 (r34030) @@ -0,0 +1,19 @@ +{ cabal, c2hs, cereal, extensibleExceptions, mpi }: + +cabal.mkDerivation (self: { + pname = "haskell-mpi"; + version = "1.2.1"; + sha256 = "1d3xlwz3sx1m7iyf67cfr1vsp3w4iz9mmqvmvdiblj4569hxblr5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ cereal extensibleExceptions ]; + buildTools = [ c2hs ]; + extraLibraries = [ mpi ]; + meta = { + homepage = "http://github.com/bjpop/haskell-mpi"; + description = "Distributed parallel programming in Haskell using MPI"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) Added: nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix Wed May 9 16:19:52 2012 (r34030) @@ -0,0 +1,16 @@ +{ cabal, alex, filepath, happy, syb }: + +cabal.mkDerivation (self: { + pname = "language-c"; + version = "0.3.2.1"; + sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx"; + buildDepends = [ filepath syb ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.sivity.net/projects/language.c/"; + description = "Analysis and generation of C code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 13:42:46 2012 (r34029) +++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 16:19:52 2012 (r34030) @@ -526,6 +526,8 @@ bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; + c2hs = callPackage ../development/libraries/haskell/c2hs {}; + Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC @@ -814,6 +816,10 @@ haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {}; + haskellMpi = callPackage ../development/libraries/haskell/haskell-mpi { + mpi = pkgs.openmpi; + }; + haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; @@ -969,6 +975,8 @@ jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; + languageC = callPackage ../development/libraries/haskell/language-c {}; + languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits