From 0fc7bf4f000c82962e0d4f2706898f77261514b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 20 Apr 2009 00:18:51 +0000 Subject: [PATCH] Added vacuum plus deps. svn path=/nixpkgs/trunk/; revision=15166 --- .../haskell/haskell-src-exts/default.nix | 13 +++++++++++++ .../haskell/haskell-src-meta/default.nix | 12 ++++++++++++ .../libraries/haskell/vacuum/default.nix | 12 ++++++++++++ pkgs/development/tools/misc/cpphs/default.nix | 10 ++++++++++ pkgs/top-level/haskell-packages.nix | 15 +++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/default.nix create mode 100644 pkgs/development/libraries/haskell/haskell-src-meta/default.nix create mode 100644 pkgs/development/libraries/haskell/vacuum/default.nix create mode 100644 pkgs/development/tools/misc/cpphs/default.nix diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix new file mode 100644 index 000000000000..ad372e6ef7c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix @@ -0,0 +1,13 @@ +{cabal, cpphs, happy}: + +cabal.mkDerivation (self : { + pname = "haskell-src-exts"; + version = "0.4.8"; + sha256 = "f059f698681b262b2a4725735b99ecbafec721ccadab65fcf075c2fc5d346dec"; + extraBuildInputs = [happy]; + propagatedBuildInputs = [cpphs]; + meta = { + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix new file mode 100644 index 000000000000..b6cb87155cc6 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -0,0 +1,12 @@ +{cabal, haskellSrcExts}: + +cabal.mkDerivation (self : { + pname = "haskell-src-meta"; + version = "0.0.3.1"; + sha256 = "74d450fd9d50edfd3cdad5c2860da2af3454b280bd37b401e16e2f492bfb5e15"; + propagatedBuildInputs = [haskellSrcExts]; + meta = { + description = "Parse source to template-haskell abstract syntax"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix new file mode 100644 index 000000000000..75ac4778ed0e --- /dev/null +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -0,0 +1,12 @@ +{cabal, ghcPaths, haskellSrcMeta}: + +cabal.mkDerivation (self : { + pname = "vacuum"; + version = "0.0.91"; + sha256 = "9240ec35b39d60928a73469893adf1d2aa742b9a781dbc6dcdaa54e96d9bf1af"; + propagatedBuildInputs = [ghcPaths haskellSrcMeta]; + meta = { + description = "Generic programming with systems of recursive datatypes"; + }; +}) + diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix new file mode 100644 index 000000000000..9b806ff474f1 --- /dev/null +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -0,0 +1,10 @@ +{cabal} : + +cabal.mkDerivation (self : { + pname = "cpphs"; + version = "1.6"; + sha256 = "2e7c430fde17adbb3905e6d2a3c3845a40349c61a53fcfa40c733e8b43e73295"; + meta = { + description = "A liberalised re-implementation of cpp, the C pre-processor"; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e7386ffbbae9..179c84ac2a51 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -65,6 +65,14 @@ rec { haskellSrc = import ../development/libraries/haskell/haskell-src { inherit cabal happy; }; + + haskellSrcExts = import ../development/libraries/haskell/haskell-src-exts { + inherit cabal cpphs happy; + }; + + haskellSrcMeta = import ../development/libraries/haskell/haskell-src-meta { + inherit cabal haskellSrcExts; + }; haskellPlatform = import ../development/libraries/haskell/haskell-platform { inherit cabal GLUT HTTP HUnit OpenAL OpenGL QuickCheck cgi fgl @@ -232,6 +240,10 @@ rec { inherit (pkgs) perl; }; + cpphs = import ../development/tools/misc/cpphs { + inherit cabal; + }; + frown = import ../development/tools/parsing/frown { inherit ghc; inherit (pkgs) fetchurl stdenv; @@ -270,6 +282,9 @@ rec { inherit cabal uulib; }; + vacuum = import ../development/libraries/haskell/vacuum { + inherit cabal ghcPaths haskellSrcMeta; + }; # Applications.