From 36426f2b49c9c709eba6363841c89674544502e4 Mon Sep 17 00:00:00 2001 From: tomberek Date: Fri, 4 Jul 2014 09:10:57 -0400 Subject: [PATCH 1/2] Initial additions --- .../haskell/haste-compiler/default.nix | 25 +++++++++++++++++++ .../libraries/haskell/haste-perch/default.nix | 14 +++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/development/libraries/haskell/haste-compiler/default.nix create mode 100644 pkgs/development/libraries/haskell/haste-perch/default.nix diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix new file mode 100644 index 000000000000..0f0af455c27e --- /dev/null +++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix @@ -0,0 +1,25 @@ +{ cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754 +, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf +, mtl, network, random, shellmate, systemFileio, tar, temporary +, time, transformers, utf8String, websockets, zipArchive +}: + +cabal.mkDerivation (self: { + pname = "haste-compiler"; + version = "0.3"; + sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary blazeBuilder bzlib dataBinaryIeee754 dataDefault + executablePath filepath ghcPaths HTTP monadsTf mtl network random + shellmate systemFileio tar temporary time transformers utf8String + websockets zipArchive + ]; + meta = { + homepage = "http://github.com/valderman/haste-compiler"; + description = "Haskell To ECMAScript compiler"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix new file mode 100644 index 000000000000..e9e1dfb6a259 --- /dev/null +++ b/pkgs/development/libraries/haskell/haste-perch/default.nix @@ -0,0 +1,14 @@ +{ cabal, hasteCompiler, mtl }: + +cabal.mkDerivation (self: { + pname = "haste-perch"; + version = "0.1.0.0"; + sha256 = "0g2ijb0mzqs2iq4i47biaxbsg4v15w9ky6yyz6wmngwf06rg4iwj"; + buildDepends = [ hasteCompiler mtl ]; + meta = { + homepage = "https://github.com/agocorona/haste-perch"; + description = "Create dynamic HTML in the browser using blaze-html-style notation with Haste"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd8255a87b33..b9740e509ee3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1016,6 +1016,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hastache = callPackage ../development/libraries/haskell/hastache {}; + hasteCompiler = callPackage ../development/libraries/haskell/haste-compiler {}; + + hastePerch = callPackage ../development/libraries/haskell/haste-perch {}; + hcltest = callPackage ../development/libraries/haskell/hcltest {}; hedis = callPackage ../development/libraries/haskell/hedis {}; From ce5c883ecfad7b837c16c6da0c48902371c17fea Mon Sep 17 00:00:00 2001 From: tomberek Date: Fri, 4 Jul 2014 12:16:12 -0400 Subject: [PATCH 2/2] jailbreak haste-perch for base==4.6 req --- pkgs/development/libraries/haskell/haste-perch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix index e9e1dfb6a259..3fb7f0499c03 100644 --- a/pkgs/development/libraries/haskell/haste-perch/default.nix +++ b/pkgs/development/libraries/haskell/haste-perch/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.0"; sha256 = "0g2ijb0mzqs2iq4i47biaxbsg4v15w9ky6yyz6wmngwf06rg4iwj"; buildDepends = [ hasteCompiler mtl ]; + jailbreak = true; meta = { homepage = "https://github.com/agocorona/haste-perch"; description = "Create dynamic HTML in the browser using blaze-html-style notation with Haste";