diff options
author | Christian Friedow <christian@friedow.com> | 2024-06-16 08:38:56 +0200 |
---|---|---|
committer | Christian Friedow <christian@friedow.com> | 2024-06-16 08:38:56 +0200 |
commit | 6443d95bda5103bd598f09fc84b9ffc7ae2636c0 (patch) | |
tree | 7d11327f86fd4a7e597bd2107ae023b91c6caf2d /pkgs/development/node-packages/node-env.nix | |
parent | f77f9f5645fb32dd11c206bd255c89b72d997aa7 (diff) |
nodePackages.@volar/vue-language-server: remove deprecated package
Diffstat (limited to 'pkgs/development/node-packages/node-env.nix')
-rw-r--r-- | pkgs/development/node-packages/node-env.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 5400fc63588ee..bc1e36628ac8a 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -109,7 +109,7 @@ let ); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }: + composePackage = { name, packageName, src, dependencies ? [], ... }@args: builtins.addErrorContext "while evaluating node package '${packageName}'" '' installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} @@ -194,7 +194,7 @@ let # dependencies in the package.json file to the versions that are actually # being used. - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }: + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: '' if [ -d "${packageName}" ] then @@ -496,7 +496,7 @@ let let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in - stdenv.mkDerivation (finalAttrs: { + stdenv.mkDerivation ({ name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -508,9 +508,8 @@ let inherit dontStrip; # Stripping may fail a build for some package deployments inherit dontNpmInstall preRebuild unpackPhase buildPhase; - # TODO: enable overriding dependencies too? - compositionScript = composePackage { inherit packageName dependencies; inherit (finalAttrs) name src; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage { inherit packageName dependencies production; }; + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; |