diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-06-26 12:28:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-26 12:28:22 +0200 |
commit | 04720c01b085aa475ef789bebd3c4ee0b04487f7 (patch) | |
tree | 914f5a0df154aba8e0223235f36b15283b262024 /pkgs/development | |
parent | c414599dfae92540ccc0c7d5d49f6cf6dc5b7fc8 (diff) | |
parent | ffa77cec627b69ffdfb8c1780963d45ba1ddf448 (diff) |
Merge pull request #322580 from pyrox0/nodepackages-drop-git-standup
nodePackages.{git-standup, pnpm}: Remove from nodePackages
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/node-packages/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.json | 2 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.nix | 36 | ||||
-rw-r--r-- | pkgs/development/node-packages/overrides.nix | 19 |
4 files changed, 2 insertions, 57 deletions
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 9b182a1bb7bde..c89a8b709df0f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -84,6 +84,7 @@ mapAliases { flood = pkgs.flood; # Added 2023-07-25 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) git-standup; # added 2024-06-26 inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 @@ -118,6 +119,7 @@ mapAliases { parcel-bundler = parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 + inherit (pkgs) pnpm; # added 2024-06-26 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c8fe6573dc4ef..0d2a10d51da8c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -114,7 +114,6 @@ , "gatsby-cli" , "get-graphql-schema" , "git-run" -, "git-standup" , "@gitbeaker/cli" , "gramma" , "grammarly-languageserver" @@ -182,7 +181,6 @@ , "patch-package" , "peerflix" , "peerflix-server" -, "pnpm" , "poor-mans-t-sql-formatter-cli" , "postcss" , "postcss-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7f7049db4762a..761085cc1f639 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -74299,24 +74299,6 @@ in bypassCache = true; reconstructLock = true; }; - git-standup = nodeEnv.buildNodePackage { - name = "git-standup"; - packageName = "git-standup"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.2.tgz"; - sha512 = "vDYicak+2y+u6TCtneCx/j6LuT9WhJShyWjTB5dhjXqTB9TJ/uF444OmYwrMlaT0/CqxHOV9NXlML+CR8AJxdA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)"; - homepage = "https://github.com/kamranahmedse/git-standup#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; @@ -85674,24 +85656,6 @@ in bypassCache = true; reconstructLock = true; }; - pnpm = nodeEnv.buildNodePackage { - name = "pnpm"; - packageName = "pnpm"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-9.3.0.tgz"; - sha512 = "7nuT4MK9EUCcZCT5K4ZvMdPqG+9fvkfTx1AM3DyWaIM9LlVoGtZt9bZAxh+p3CXVRu+lTXbX+L9UsTYUrCk2MQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage { name = "poor-mans-t-sql-formatter-cli"; packageName = "poor-mans-t-sql-formatter-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 7f56b6d74c515..c725197bddb66 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -217,25 +217,6 @@ final: prev: { ''; }; - pnpm = prev.pnpm.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - - preRebuild = '' - sed 's/"link:/"file:/g' --in-place package.json - ''; - - postInstall = let - pnpmLibPath = lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; - postcss-cli = prev.postcss-cli.override (oldAttrs: let esbuild-version = (lib.findFirst (dep: dep.name == "esbuild") null oldAttrs.dependencies).version; esbuild-linux-x64 = { |