From 7eddea0c28a7d637a1342373515daff9709259a0 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 01:14:45 -0400 Subject: [PATCH 1/3] git-standup: remove from nodePackages The package is already in-tree, this is just maintainance --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 9b182a1bb7bd..7f853358c164 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 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c8fe6573dc4e..003445804e73 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" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7f7049db4762..82d127df70f2 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"; From f4bd45f2ca2a26f3e7c04cd69b6381d0bbfd1a5a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:08:39 +0200 Subject: [PATCH 2/3] modrinth-app-unwrapped: replace nodePackages.pnpm with pnpm_8 --- pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 121d9072ab09..7814ec363dce 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -15,7 +15,8 @@ jq, libsoup, moreutils, - nodePackages, + pnpm_8, + nodejs, openssl, pkg-config, webkitgtk, @@ -51,7 +52,7 @@ rustPlatform.buildRustPackage { cacert jq moreutils - nodePackages.pnpm + pnpm_8 ]; # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 @@ -77,7 +78,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cargo-tauri desktop-file-utils - nodePackages.pnpm + pnpm_8 + nodejs pkg-config ]; From ffa77cec627b69ffdfb8c1780963d45ba1ddf448 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 01:28:46 -0400 Subject: [PATCH 3/3] nodePackages.pnpm: alias Sets it to be an alias of the pkgs/by-name pnpm package. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ pkgs/development/node-packages/overrides.nix | 19 ------------------- 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 7f853358c164..c89a8b709df0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -119,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 003445804e73..0d2a10d51da8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -181,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 82d127df70f2..761085cc1f63 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -85656,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 7f56b6d74c51..c725197bddb6 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 = {