From 4ff953a95a63cf5baf3583c515dd387f1e189fb7 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 19 Jan 2024 12:51:09 -0500
Subject: [PATCH] bitwarden-desktop: rename from bitwarden
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream calls it Bitwarden Desktop, and we have other “bitwarden-*”
packages, so having an unsuffixed one can be confusing.

I assume the hash for cargoDeps is changing since it encodes the pname.
---
 pkgs/by-name/bi/{bitwarden => bitwarden-desktop}/package.nix | 4 ++--
 pkgs/top-level/aliases.nix                                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/by-name/bi/{bitwarden => bitwarden-desktop}/package.nix (97%)

diff --git a/pkgs/by-name/bi/bitwarden/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
similarity index 97%
rename from pkgs/by-name/bi/bitwarden/package.nix
rename to pkgs/by-name/bi/bitwarden-desktop/package.nix
index 5ed43dc6b3b6..bbeda629824e 100644
--- a/pkgs/by-name/bi/bitwarden/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -29,7 +29,7 @@ let
   icon = "bitwarden";
   electron = electron_28;
 in buildNpmPackage rec {
-  pname = "bitwarden";
+  pname = "bitwarden-desktop";
   version = "2024.2.0";
 
   src = fetchFromGitHub {
@@ -68,7 +68,7 @@ in buildNpmPackage rec {
       patches;
     patchFlags = [ "-p4" ];
     sourceRoot = "${src.name}/${cargoRoot}";
-    hash = "sha256-KJUz5hvdsurnohUWRZedXvuWMnLtR0dcdTeHtJGrZBs=";
+    hash = "sha256-LjwtOmIJlwtOiy36Y0pP+jJEwfmCGTN4RhqgmD3Yj6E=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5a44235de0c3..2ae67d10a7b9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -102,6 +102,7 @@ mapAliases ({
   beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08
   binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09
   bird2 = bird; # Added 2022-02-21
+  bitwarden = bitwarden-desktop; # Added 2024-02-25
   bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
   bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03
   blender-with-packages = args: