Merge pull request #152764 from turboMaCk/fix-elm-packages-post-node-16

elmPackages: fix nodejs packages
This commit is contained in:
Marek Fajkus 2021-12-30 20:22:20 +01:00 committed by GitHub
commit 4a03790765
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 504 additions and 401 deletions

View file

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

View file

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

File diff suppressed because it is too large Load diff