Merge pull request #5488 from teh/master

Update elm to 0.14.

5 files changed, 98 insertions, 12 deletions

diff --git a/pkgs/development/compilers/elm/elm-compiler.nix b/pkgs/development/compilers/elm/elm-compiler.nix
new file mode 100644
index 00000000000..f686abbf353
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm-compiler.nix
@@ -0,0 +1,34 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
+, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
+, languageGlsl, mtl, parsec, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
+, unionFind, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "elm-compiler";
+  version = "0.14";
+  sha256 = "1vgbs3navs6dr36k408kc83gkn2ndhmc0b1015zk3jb0wkmvm73y";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath
+    indents languageEcmascript languageGlsl mtl parsec text
+    transformers unionFind unorderedContainers
+  ];
+  testDepends = [
+    aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip
+    filepath HUnit indents languageEcmascript languageGlsl mtl parsec
+    QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text transformers unionFind
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/elm/elm-make.nix b/pkgs/development/compilers/elm/elm-make.nix
new file mode 100644
index 00000000000..1052b16b086
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm-make.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiWlPprint, binary, blazeHtml, blazeMarkup, elmCompiler
+, elmPackage, filepath, mtl, optparseApplicative_0_10_0, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "elm-make";
+  version = "0.1";
+  sha256 = "1hrc8bzfqzrcmkzqcampxkn5m113blfp4095h6c2xnadiicbvwdy";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    ansiWlPprint binary blazeHtml blazeMarkup elmCompiler elmPackage
+    filepath mtl optparseApplicative_0_10_0 text
+  ];
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "A build tool for Elm projects";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/elm/elm-package.nix b/pkgs/development/compilers/elm/elm-package.nix
new file mode 100644
index 00000000000..3cf2ded8ff5
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm-package.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, aesonPretty, ansiWlPprint, binary, elmCompiler
+, filepath, HTTP, httpClient, httpClientTls, httpTypes, mtl
+, network, optparseApplicative, text, time, unorderedContainers
+, vector, zipArchive
+}:
+
+cabal.mkDerivation (self: {
+  pname = "elm-package";
+  version = "0.2.2";
+  sha256 = "0hkcy1mix2rng2k2zhzgb16nd0asfj9rm9ya2by67vjysiz8cmnr";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aesonPretty ansiWlPprint binary elmCompiler filepath HTTP
+    httpClient httpClientTls httpTypes mtl network optparseApplicative
+    text time unorderedContainers vector zipArchive
+  ];
+  meta = {
+    homepage = "http://github.com/elm-lang/elm-package";
+    description = "Package manager for Elm libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/compilers/elm/elm-reactor.nix b/pkgs/development/compilers/elm/elm-reactor.nix
index 7b53d9190d8..280d09f96b4 100644
--- a/pkgs/development/compilers/elm/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/elm-reactor.nix
@@ -1,24 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeHtml, blazeMarkup, cmdargs, Elm, fetchgit, filepath
-, fsnotify, HTTP, mtl, snapCore, snapServer, systemFilepath, time
-, transformers, unorderedContainers, websockets, websocketsSnap
+{ cabal, blazeHtml, blazeMarkup, cmdargs, elmCompiler, elmMake, filepath
+, fsnotify, HTTP, mtl, snapCore, snapServer, systemFilepath, text
+, time, transformers, unorderedContainers, websockets
+, websocketsSnap
 }:
 
 cabal.mkDerivation (self: {
   pname = "elm-reactor";
-  version = "0.1";
-  src = fetchgit {
-    url = "git://github.com/elm-lang/elm-reactor.git";
-    sha256 = "1e45ef26a9b1c1748737dce071a7f2587d0d22643085942a98006f9b11d11dfe";
-    rev = "8715046c5bc8b18f0540069c1a9a65f3aa8332e1";
-  };
+  version = "0.2.0.1";
+  sha256 = "1qnrxr3wayhw92w6lghchz8avxbxg00w7p6d1vs7mq9q56876jgj";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    blazeHtml blazeMarkup cmdargs Elm filepath fsnotify HTTP mtl
-    snapCore snapServer systemFilepath time transformers
-    unorderedContainers websockets websocketsSnap
+    blazeHtml blazeMarkup cmdargs elmCompiler filepath fsnotify HTTP
+    mtl snapCore snapServer systemFilepath text time transformers
+    unorderedContainers websockets websocketsSnap elmMake
   ];
   meta = {
     homepage = "http://elm-lang.org";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fa6e22e1000..802e61f6737 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -755,6 +755,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Elm = callPackage ../development/compilers/elm/elm.nix {};
 
+  elmCompiler = callPackage ../development/compilers/elm/elm-compiler.nix {};
+
+  elmMake = callPackage ../development/compilers/elm/elm-make.nix {};
+
+  elmPackage = callPackage ../development/compilers/elm/elm-package.nix {};
+
   elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
 
   elmRepl = callPackage ../development/compilers/elm/elm-repl.nix {};