From d3da0bd78f1a6e646a9369f32a16a4838a6f5384 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 18 May 2016 13:30:38 +0300
Subject: elm: add documentation on how to use update scripts and run them
 properly

---
 pkgs/development/compilers/elm/default.nix                  |  9 ++++++---
 pkgs/development/compilers/elm/packages/elm-reactor-elm.nix | 10 +++++-----
 pkgs/development/compilers/elm/update-elm.rb                | 12 ++++++------
 3 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'pkgs/development/compilers/elm')

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 87211ff6e6ed..360273a7eca9 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,5 +1,11 @@
 { lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }:
 
+# To update:
+# 1) Update versions in ./update-elm.rb and run it.
+# 2) Checkout elm-reactor and run `elm-package install -y` inside.
+# 3) Run ./elm2nix.rb in elm-reactor's directory.
+# 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'.
+
 let
   makeElmStuff = deps:
     let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps);
@@ -61,9 +67,6 @@ let
       in elmPkgs // {
         inherit elmPkgs;
         elmVersion = elmRelease.version;
-
-        # To unbreak elm-compiler
-        language-ecmascript = self.language-ecmascript_0_17_0_2;
       };
   };
 in hsPkgs.elmPkgs // {
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
index be37b2084f10..a84f9e48ba03 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
@@ -5,18 +5,18 @@
   };
   "evancz/elm-markdown" = {
     version = "3.0.0";
-    sha256 = "1wlr8sgnyq6qgh5rcjy7imfmpqxrxgmmqcfx6p541fs70yiqya12";
+    sha256 = "0r3hcim4mpn46ahv1q6sjp6i2viyp7jik6i71xgwmvfb9drns2p6";
   };
   "elm-lang/html" = {
     version = "1.0.0";
     sha256 = "16cr01yxkpkmgbgclp2p80nd62a6fjw3qipzjsgksrhwv9vv4gm4";
   };
-  "elm-lang/core" = {
-    version = "4.0.0";
-    sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw";
-  };
   "elm-lang/svg" = {
     version = "1.0.0";
     sha256 = "0c29y6c58x2sq1bl29z1hr5gi2rlza8clk7ssgzmsf4xbvcczbjx";
   };
+  "elm-lang/core" = {
+    version = "4.0.0";
+    sha256 = "04qgzgv90qyhjk55yw4szy50h2dqdlm0a2padbgn02yf4bb1b4nw";
+  };
 }
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
index 363655415a95..53dd0f88fa02 100755
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ b/pkgs/development/compilers/elm/update-elm.rb
@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
-$elm_version = "0.16.0"
-$elm_packages = { "elm-compiler" => "0.16",
-                  "elm-package" => "0.16",
-                  "elm-make" => "0.16",
-                  "elm-reactor" => "0.16",
-                  "elm-repl" => "0.16"
+$elm_version = "0.17"
+$elm_packages = { "elm-compiler" => "0.17",
+                  "elm-package" => "0.17",
+                  "elm-make" => "0.17",
+                  "elm-reactor" => "0.17",
+                  "elm-repl" => "0.17"
                 }
 
 for pkg, ver in $elm_packages
-- 
cgit 1.4.1