Unverified Commit c04952a6 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #302670 from dotlambda/bitwarden 

bitwarden-cli: 2024.2.1 -> 2024.3.1, bitwarden-desktop: 2024.3.0 -> 2024.4.1
parents 6ed984be 244b791b

pkgs/by-name/bi/bitwarden-cli/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,18 +10,18 @@ 


buildNpmPackage rec {

  pname = "bitwarden-cli";

  version = "2024.2.1";

  version = "2024.3.1";



  src = fetchFromGitHub {

    owner = "bitwarden";

    repo = "clients";

    rev = "cli-v${version}";

    hash = "sha256-g9enDEIdVj9R3xkx5qllf7aTDa6F+MvozhwbJn9w/VY=";

    hash = "sha256-JBEP4dNGL4rYKl2qNyhB2y/wZunikaGFltGVXLxgMWI=";

  };



  nodejs = nodejs_18;



  npmDepsHash = "sha256-fkoI8a8iVMWxtXAj5zNg2xwK/ZPyRZGPo7rnxHpKV7k=";

  npmDepsHash = "sha256-vNudSHIMmF7oXGz+ZymQahyHebs/CBDc6Oy1g0A5nqA=";



  nativeBuildInputs = [

    python3

pkgs/by-name/bi/bitwarden-desktop/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ let 
  electron = electron_28;

in buildNpmPackage rec {

  pname = "bitwarden-desktop";

  version = "2024.3.0";

  version = "2024.4.1";



  src = fetchFromGitHub {

    owner = "bitwarden";

    repo = "clients";

    rev = "desktop-v${version}";

    hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g=";

    hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q=";

  };



  patches = [
@@ -60,7 +60,7 @@ in buildNpmPackage rec { 
  makeCacheWritable = true;

  npmFlags = [ "--legacy-peer-deps" ];

  npmWorkspace = "apps/desktop";

  npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc=";

  npmDepsHash = "sha256-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM=";



  cargoDeps = rustPlatform.fetchCargoTarball {

    name = "${pname}-${version}";
@@ -76,7 +76,7 @@ in buildNpmPackage rec { 
      patches;

    patchFlags = [ "-p4" ];

    sourceRoot = "${src.name}/${cargoRoot}";

    hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI=";

    hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo=";

  };

  cargoRoot = "apps/desktop/desktop_native";