diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-16 13:01:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-16 13:01:50 +0200 |
| commit | 0e33c56662eb3f072e22950ebf8cf8d7969f078d (patch) | |
| tree | 1cef983b5047f2017cf205141d695c49c8ab3032 | |
| parent | 69b6230cee631c7f609549267ee4b81f201b2a7b (diff) | |
| parent | e78f60475b27f4ec1cb7615caa84a9fe2c721cef (diff) | |
| download | nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.tar nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.tar.gz nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.tar.bz2 nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.tar.lz nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.tar.xz nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.tar.zst nixlib-0e33c56662eb3f072e22950ebf8cf8d7969f078d.zip | |
Merge pull request #46710 from jerith666/elm-glsl-fix
Elm: widen language-glsl dependency, pick up minor updates
| -rw-r--r-- | pkgs/development/compilers/elm/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/compilers/elm/packages/elm.nix | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 93deb4a90aff..692404a19bf6 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 ]} diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index 1097c8a1e192..41998f4c9b3d 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; |