dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #233296 from R-VdP/elmPackages_nodejs_18

Browse Source 
elmPackages: nodejs_14 -> nodejs_18.
This commit is contained in:
Ryan Lahfa 2023-05-22 00:58:16 +02:00 committed by GitHub
commit c831cb672d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/compilers/elm/default.nix
View File

@ -1,10 +1,10 @@
{ pkgs, lib, makeWrapper }:
{ pkgs
, lib
, makeWrapper
, nodejs ? pkgs.nodejs_18
}:
let
# To control nodejs version we pass down
nodejs = pkgs.nodejs_18;
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
# Haskell packages that require ghc 8.10
@ -115,8 +115,7 @@ let
};
nodePkgs = pkgs.callPackage ./packages/node-composition.nix {
inherit pkgs;
nodejs = pkgs.nodejs_14;
inherit pkgs nodejs;
inherit (pkgs.stdenv.hostPlatform) system;
};
@ -152,7 +151,8 @@ in lib.makeScope pkgs.newScope (self: with self; {
};
};
} // (hs810Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (with elmLib; with (hs810Pkgs self).elmPkgs; {
elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // {
elm-verify-examples = let
patched = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // {
meta = with lib; nodePkgs.elm-verify-examples.meta // {
description = "Verify examples in your docs";
homepage = "https://github.com/stoeffel/elm-verify-examples";
@ -160,6 +160,14 @@ in lib.makeScope pkgs.newScope (self: with self; {
maintainers = [ maintainers.turbomack ];
};
};
in patched.override (old: {
preRebuild = (old.preRebuild or "") + ''
# This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
# in case of just this package
# TODO: investigate, same as for elm-coverage below
sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
'';
});
elm-coverage = let
patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage);