From 04d8e267b7069c07491e8934d7911cd2a18c8c21 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 15 Sep 2018 12:24:34 -0400 Subject: [PATCH 1/2] elm: pick up some recent minor updates to 0.19.0 --- pkgs/development/compilers/elm/packages/elm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index 1097c8a1e1926..41998f4c9b3d8 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -11,8 +11,8 @@ mkDerivation { version = "0.19.0"; src = fetchgit { url = "https://github.com/elm/compiler"; - sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy"; - rev = "32059a289d27e303fa1665e9ada0a52eb688f302"; + sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4"; + rev = "d5cbc41aac23da463236bbc250933d037da4055a"; }; isLibrary = false; isExecutable = true; From e78f60475b27f4ec1cb7615caa84a9fe2c721cef Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 15 Sep 2018 12:16:13 -0400 Subject: [PATCH 2/2] elm: patch to widen dependency after hackage update 1b1cb6305c works around missing dependency 'language-glsl >=0.0.2 && <0.3' patch from https://github.com/elm/compiler/pull/1784 --- pkgs/development/compilers/elm/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 93deb4a90aff9..692404a19bf65 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }: +{ lib, stdenv, buildEnv +, haskell, nodejs +, fetchurl, fetchpatch, makeWrapper, git }: # To update: @@ -90,6 +92,12 @@ let export ELM_HOME=`pwd`/.elm '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix)); buildTools = drv.buildTools or [] ++ [ makeWrapper ]; + patches = [ + (fetchpatch { + url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch"; + sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4"; + }) + ]; postInstall = '' wrapProgram $out/bin/elm \ --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}