Skip to content

Comments

bitwarden-desktop: 2025.5.1 -> 2025.6.0#420516

Merged
SuperSandro2000 merged 2 commits intoNixOS:masterfrom
SuperSandro2000:bitwarden-desktop
Jun 28, 2025
Merged

bitwarden-desktop: 2025.5.1 -> 2025.6.0#420516
SuperSandro2000 merged 2 commits intoNixOS:masterfrom
SuperSandro2000:bitwarden-desktop

Conversation

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jun 27, 2025

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 27, 2025
@SuperSandro2000 SuperSandro2000 marked this pull request as ready for review June 27, 2025 13:09
@TomaSajt
Copy link
Contributor

I manually cloned the repo and ran npm ci --ignore-scripts in the apps/cli directory.

In 2025.5.1, the root node_modules directory gets generated, but I don't get an apps/cli/node_modules directory.

In 2025.6.0, apps/cli/node_modules gets generated, and the only thing inside is the open package.
This is what we see from the error logs.

In the current main branch, even more things get placed under apps/cli/node_modules:
(define-lazy-prop, is-docker, is-wsl, open)

I am not yet sure what is going on

@SuperSandroBot
Copy link

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 420516

Logs: https://github.com/SuperSandro2000/nixpkgs-review-gha/actions/runs/15927076071


x86_64-linux (sandbox = true)

✅ 1 package built:
  • bitwarden-desktop

aarch64-linux (sandbox = true)

✅ 1 package built:
  • bitwarden-desktop

x86_64-darwin (sandbox = true)

✅ 1 package built:
  • bitwarden-desktop

aarch64-darwin (sandbox = true)

✅ 1 package built:
  • bitwarden-desktop

@TomaSajt
Copy link
Contributor

TomaSajt commented Jun 27, 2025

This is also a good enough solution for the package-lock patch:

diff --git a/package-lock.json b/package-lock.json
index 5df63a79dd..3e28aeaaa9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -237,23 +237,6 @@
         "bw": "build/bw.js"
       }
     },
-    "apps/cli/node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "license": "MIT",
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
       "version": "2025.6.0",

open@8.4.2 isn't even mentioned in apps/cli anymore, so why is it here?
I have no idea...
There are some packages that depend on open@8.4.2, but those put it in their own sub-node_modules directory.

@SuperSandro2000
Copy link
Member Author

All the workspaces share their package-lock.file and in the error that npm wrote to the tmp file, it explicitly mentioned that it tried to download the older version. I really don't care what exactly is wrong in the workspace setup if the fix generated by the ecosystem package manager is so small.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 27, 2025
"serde_repr",
"tokio",
"url",
- "zbus 5.6.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In bitwarden/clients@fc9ce26 basically the same change happened

@SuperSandro2000 SuperSandro2000 merged commit 5324873 into NixOS:master Jun 28, 2025
27 of 28 checks passed
@SuperSandro2000 SuperSandro2000 deleted the bitwarden-desktop branch June 28, 2025 20:29
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jul 1, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-420516-to-release-25.05 origin/release-25.05
cd .worktree/backport-420516-to-release-25.05
git switch --create backport-420516-to-release-25.05
git cherry-pick -x 7dab3f1b3662b5b43bbb1e3a10f40b8c3fb9521b 52f1b45583d1877ca09e522c0928bd7b3370c775

@teutat3s
Copy link
Member

teutat3s commented Jul 1, 2025

A manual backport for #421203 would be nice.

@teutat3s teutat3s added 9.needs: port to stable A PR needs a backport to the stable release. and removed backport release-25.05 labels Jul 1, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jul 1, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-420516-to-release-25.05 origin/release-25.05
cd .worktree/backport-420516-to-release-25.05
git switch --create backport-420516-to-release-25.05
git cherry-pick -x 7dab3f1b3662b5b43bbb1e3a10f40b8c3fb9521b 52f1b45583d1877ca09e522c0928bd7b3370c775

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants