pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #46710 from jerith666/elm-glsl-fix

Elm: widen language-glsl dependency, pick up minor updates

authored by xeji and committed by GitHub 0e33c566 69b6230c

+11 -3
unified split
+9 -1
pkgs/development/compilers/elm/default.nix
··· 1 - { lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }: 2 3 # To update: 4 ··· 90 export ELM_HOME=`pwd`/.elm 91 '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix)); 92 buildTools = drv.buildTools or [] ++ [ makeWrapper ]; 93 postInstall = '' 94 wrapProgram $out/bin/elm \ 95 --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
··· 1 + { lib, stdenv, buildEnv 2 + , haskell, nodejs 3 + , fetchurl, fetchpatch, makeWrapper, git }: 4 5 # To update: 6 ··· 92 export ELM_HOME=`pwd`/.elm 93 '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix)); 94 buildTools = drv.buildTools or [] ++ [ makeWrapper ]; 95 + patches = [ 96 + (fetchpatch { 97 + url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch"; 98 + sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4"; 99 + }) 100 + ]; 101 postInstall = '' 102 wrapProgram $out/bin/elm \ 103 --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
+2 -2
pkgs/development/compilers/elm/packages/elm.nix
··· 11 version = "0.19.0"; 12 src = fetchgit { 13 url = "https://github.com/elm/compiler"; 14 - sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy"; 15 - rev = "32059a289d27e303fa1665e9ada0a52eb688f302"; 16 }; 17 isLibrary = false; 18 isExecutable = true;
··· 11 version = "0.19.0"; 12 src = fetchgit { 13 url = "https://github.com/elm/compiler"; 14 + sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4"; 15 + rev = "d5cbc41aac23da463236bbc250933d037da4055a"; 16 }; 17 isLibrary = false; 18 isExecutable = true;