From 70acec8ae5555742671b379e32140c29d3c87169 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sat, 30 Jun 2018 19:58:14 -0500 Subject: [PATCH] nodePackages: meguca: use node2nix 1.6.0 --- .../node-packages/composition-v10.nix | 4 +- .../node-packages/composition-v6.nix | 2 +- .../node-packages/composition-v8.nix | 2 +- pkgs/development/node-packages/node-env.nix | 81 +- .../node-packages/node-packages-v10.nix | 64 +- .../node-packages/node-packages-v6.nix | 7235 ++++++++++------- .../node-packages/node-packages-v8.nix | 1166 +-- 7 files changed, 4919 insertions(+), 3635 deletions(-) diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 2eea07b6380..9f723a6da47 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 2252bab3a79..ce42bfa7ba3 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 96266105942..7ca3e6b925a 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index fc118a788ea..720e0cc0850 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -27,7 +27,7 @@ let buildInputs = [ nodejs ]; buildPhase = '' export HOME=$TMPDIR - tgzFile=$(npm pack) + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) ''; installPhase = '' mkdir -p $out/tarballs @@ -309,31 +309,42 @@ let }; # Builds and composes an NPM package including all its dependencies - buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in - stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { + stdenv.mkDerivation ({ name = "node-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; - dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments + ++ buildInputs; - inherit dontNpmInstall preRebuild; - - unpackPhase = args.unpackPhase or "true"; - - buildPhase = args.buildPhase or "true"; + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - installPhase = args.installPhase or '' + installPhase = '' # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -406,27 +417,47 @@ let # Run post install hook, if provided runHook postInstall ''; - }); + } // extraArgs); # Builds a development shell - buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - nodeDependencies = stdenv.mkDerivation { + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - buildCommand = '' + installPhase = '' mkdir -p $out/${packageName} cd $out/${packageName} @@ -438,13 +469,15 @@ let ${stdenv.lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then - cp ${src}/package-lock.json . + cp ${src}/package-lock.json . fi ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + source $pinpointDependenciesScriptPath cd ${packageName} @@ -474,15 +507,17 @@ let ''} cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; - }; + } // extraArgs); in - stdenv.lib.makeOverridable stdenv.mkDerivation { + stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <