Skip to content

Commit

Permalink
elmPackages: fix nodejs packages
Browse files Browse the repository at this point in the history
    Fixes regression caused by
    4c60ee3 (pull: NixOS#142915)
    following patch of nodePackages using nodejs-14_x
    2c3b3e6 (pull: NixOS#149120)

    - clenups and updates in generate-node-packages.sh
    - specify nodejs version in default.nix

    This makes elmPackages.* build with nodejs-14
    which resolves the issue with npm installation failing

(cherry picked from commit 26b74d2)
  • Loading branch information
turboMaCk authored and jerith666 committed Dec 31, 2021
1 parent 8b362c7 commit 122a040
Show file tree
Hide file tree
Showing 3 changed files with 504 additions and 401 deletions.
5 changes: 4 additions & 1 deletion pkgs/development/compilers/elm/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{ lib, stdenv, pkgs
, haskell, haskellPackages, nodejs
, haskell, haskellPackages, nodejs-14_x
, fetchurl, fetchpatch, makeWrapper, writeScriptBin
# Rust dependecies
, curl, rustPlatform, openssl, pkg-config, Security, darwin
}:
let
# To controll nodejs version we pass down
nodejs = nodejs-14_x;

fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };

hsPkgs = haskellPackages.override {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../.

set -eu -o pipefail

rm -f node-env.nix
$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
--nodejs-12 \
-i node-packages.json \
-o node-packages.nix \
-c node-composition.nix \
Expand Down
Loading

0 comments on commit 122a040

Please sign in to comment.