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

Merge pull request #256420 from dotlambda/bitwarden-2023.9.0 

bitwarden: 2023.8.3 -> 2023.9.0
parents 649a8bf8 7c5f79e5

pkgs/tools/security/bitwarden/cli.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,16 +12,16 @@ let 
  buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };

in buildNpmPackage' rec {

  pname = "bitwarden-cli";

  version = "2023.8.2";

  version = "2023.9.0";



  src = fetchFromGitHub {

    owner = "bitwarden";

    repo = "clients";

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

    hash = "sha256-v9ql01dwWf9kBxw75n9svQousrnbUi8NY1wkJx06teg=";

    hash = "sha256-s9jj1qmh4aCvtVY85U4AU7pcc8ABu9essFYqwf64dns=";

  };



  npmDepsHash = "sha256-RvkauNvt6MZxWMssEtaCjXP1z/3NsReywUgCefV/jjM=";

  npmDepsHash = "sha256-0q3XoC87kfC2PYMsNse4DV8M8OXjckiLTdN3LK06lZY=";



  nativeBuildInputs = [

    python3

pkgs/tools/security/bitwarden/default.nix

+67 −67
Original line number Diff line number Diff line 
{ lib

, applyPatches

, buildNpmPackage

, cargo

, dbus

, electron_24

, fetchFromGitHub
@@ -12,11 +13,12 @@ 
, makeDesktopItem

, makeWrapper

, moreutils

, napi-rs-cli

, nodejs_18

, pkg-config

, python3

, rustc

, rustPlatform

, wrapGAppsHook

}:



let
@@ -26,27 +28,50 @@ let 
  buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };

  electron = electron_24;



  version = "2023.8.3";

  src = applyPatches {

  desktopItem = makeDesktopItem {

    name = "bitwarden";

    exec = "bitwarden %U";

    inherit icon;

    comment = description;

    desktopName = "Bitwarden";

    categories = [ "Utility" ];

  };

in buildNpmPackage' rec {

  pname = "bitwarden";

  version = "2023.9.0";



  src = fetchFromGitHub {

    owner = "bitwarden";

    repo = "clients";

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

      hash = "sha256-ZsAc9tC087Em/VzgaVm5fU+JnI4gIsSAphxicdJWztU=";

    hash = "sha256-8rNJmDpKLzTre5c2wktle7tthp1owZK5WAQP80/2R0g=";

  };



    patches = [ ];

  makeCacheWritable = true;

  npmWorkspace = "apps/desktop";

  npmDepsHash = "sha256-0q3XoC87kfC2PYMsNse4DV8M8OXjckiLTdN3LK06lZY=";



  cargoDeps = rustPlatform.fetchCargoTarball {

    name = "${pname}-${version}";

    inherit src;

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

    hash = "sha256-YF3UHQWCSuWAg2frE8bo1XrLn44P6+1A7YUh4RZxwo0=";

  };

  cargoRoot = "apps/desktop/desktop_native";



  desktop-native = rustPlatform.buildRustPackage {

    pname = "bitwarden-desktop-native";

    inherit src version;

    sourceRoot = "${src.name}/apps/desktop/desktop_native";

    cargoHash = "sha256-iBZvdBfuZtcoSgyU4B58ARIBplqUuT5bRev9qnk9LpE=";

  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";



  nativeBuildInputs = [

    cargo

    jq

    makeWrapper

    moreutils

    napi-rs-cli

    pkg-config

      wrapGAppsHook

    python3

    rustc

    rustPlatform.cargoCheckHook

    rustPlatform.cargoSetupHook

  ];



  buildInputs = [
@@ -55,6 +80,29 @@ let 
    libsecret

  ];



  preBuild = ''

    if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then

      echo 'ERROR: electron version mismatch'

      exit 1

    fi

  '';



  postBuild = ''

    pushd apps/desktop



    # desktop_native/index.js loads a file of that name regarldess of the libc being used

    mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node



    npm exec electron-builder -- \

      --dir \

      -c.electronDist=${electron}/libexec/electron \

      -c.electronVersion=${electron.version}



    popd

  '';



  doCheck = true;



  nativeCheckInputs = [

    dbus

    (gnome.gnome-keyring.override { useWrappedDaemon = false; })
@@ -67,65 +115,16 @@ let 
  checkPhase = ''

    runHook preCheck



    pushd ${cargoRoot}

    export HOME=$(mktemp -d)

    export -f cargoCheckHook runHook _eval _callImplicitHook

    export cargoCheckType=release

    dbus-run-session \

      --config-file=${dbus}/share/dbus-1/session.conf \

      -- bash -e -c cargoCheckHook

      runHook postCheck

    '';

  };



  desktopItem = makeDesktopItem {

    name = "bitwarden";

    exec = "bitwarden %U";

    inherit icon;

    comment = description;

    desktopName = "Bitwarden";

    categories = [ "Utility" ];

  };



in



buildNpmPackage' {

  pname = "bitwarden";

  inherit src version;



  makeCacheWritable = true;

  npmBuildFlags = [

    "--workspace apps/desktop"

  ];

  npmDepsHash = "sha256-ARq6iYOkL9CMyAX37g8+Wf+UQsH7hU1jCq/52I1qS9A=";



  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";



  nativeBuildInputs = [

    jq

    makeWrapper

    moreutils

    python3

  ];



  preBuild = ''

    if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then

      echo 'ERROR: electron version mismatch'

      exit 1

    fi



    jq 'del(.scripts.postinstall)' apps/desktop/package.json | sponge apps/desktop/package.json

    jq '.scripts.build = ""' apps/desktop/desktop_native/package.json | sponge apps/desktop/desktop_native/package.json

    cp ${desktop-native}/lib/libdesktop_native.so apps/desktop/desktop_native/desktop_native.linux-x64-musl.node

  '';



  postBuild = ''

    pushd apps/desktop



    npm exec electron-builder -- \

      --dir \

      -c.electronDist=${electron}/libexec/electron \

      -c.electronVersion=${electron.version}



    popd



    runHook postCheck

  '';



  installPhase = ''
@@ -154,11 +153,12 @@ buildNpmPackage' { 
    popd

  '';



  meta = with lib; {

  meta = {

    changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";

    inherit description;

    homepage = "https://bitwarden.com";

    license = lib.licenses.gpl3;

    maintainers = with maintainers; [ amarshall kiwi ];

    maintainers = with lib.maintainers; [ amarshall kiwi ];

    platforms = [ "x86_64-linux" ];

  };

}