Unverified Commit b293c4ec authored by Marek Fajkus's avatar Marek Fajkus
Browse files

elmPackages: update to nodejs 14

parent 65929285

pkgs/development/compilers/elm/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ in lib.makeScope pkgs.newScope (self: with self; { 


      elm-pages = nodePkgs."elm-pages".overrideAttrs (

        old: {

          nativeBuildInputs = [ makeWrapper ];

          nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ];



          # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation;

          # need to patch in one of the build phases instead.
@@ -240,6 +240,10 @@ in lib.makeScope pkgs.newScope (self: with self; { 


      lamdera = callPackage ./packages/lamdera.nix {};



      inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install;

      elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: {

        nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ old.nodejs.pkgs.node-gyp-build ];

      });



      inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install;

    })

  )

pkgs/development/compilers/elm/packages/node-composition.nix

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


{pkgs ? import <nixpkgs> {

    inherit system;

  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:

  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:



let

  nodeEnv = import ../../../node-packages/node-env.nix {

pkgs/development/compilers/elm/packages/node-packages.nix

+754 −585

File changed.

Preview size limit exceeded, changes collapsed.