Merge pull request #200838 from turboMaCk/update-elm-packages-again

elmPackages: update to nodejs 14
This commit is contained in:
Marek Fajkus 2022-11-12 13:14:17 +01:00 committed by GitHub
commit f685fe84c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 762 additions and 589 deletions

View file

@ -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;
})
)

View file

@ -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 {

File diff suppressed because it is too large Load diff