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

electron_32: init at 32.1.1, bitwarden-desktop: 2024.8.2 -> 2024.9.0 (#343097)

parents ba0b6c7a f01b6740

pkgs/applications/networking/browsers/chromium/common.nix

+1 −8
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, fetchpatch

{ stdenv, lib, fetchpatch

, recompressTarball

, buildPackages

, buildPlatform
@@ -65,10 +65,6 @@ let 
  python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [

    ply jinja2 setuptools

  ]);

  clangFormatPython3 = fetchurl {

    url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT";

    hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U=";

  };



  # The additional attributes for creating derivations based on the chromium

  # source tree.
@@ -379,9 +375,6 @@ let 
      # Allow to put extensions into the system-path.

      sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc



      # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408:

      base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format



      # Add final newlines to scripts that do not end with one.

      # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged,

      # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final

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

+6 −6
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, cargo

, copyDesktopItems

, dbus

, electron_31

, electron_32

, fetchFromGitHub

, glib

, gnome-keyring
@@ -26,16 +26,16 @@ 
let

  description = "Secure and free password manager for all of your devices";

  icon = "bitwarden";

  electron = electron_31;

  electron = electron_32;

in buildNpmPackage rec {

  pname = "bitwarden-desktop";

  version = "2024.8.2";

  version = "2024.9.0";



  src = fetchFromGitHub {

    owner = "bitwarden";

    repo = "clients";

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

    hash = "sha256-KATT4W2pP7VTcoHeshGx5VrBwlg3UqzKPcRY0Rzo7II=";

    hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w=";

  };



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

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

  npmWorkspace = "apps/desktop";

  npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk=";

  npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk=";



  cargoDeps = rustPlatform.fetchCargoTarball {

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

    patchFlags = [ "-p4" ];

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

    hash = "sha256-MjGKQky6LGtpG1maBWd+WkMZlnZfdl9Sm2dlvdD8ANw=";

    hash = "sha256-y+6vaESiOeVrFJpZoOJ75onOpldqSsT2kqkMMzTDUmM=";

  };

  cargoRoot = "apps/desktop/desktop_native";

pkgs/development/tools/electron/binary/info.json

+11 −0
Original line number Diff line number Diff line
@@ -64,5 +64,16 @@ 
            "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7"

        },

        "version": "31.4.0"

    },

    "32": {

        "hashes": {

            "aarch64-darwin": "b0e04b765702c35341e587e41b01eb9bcb1233953ab243a0c82e9555c04b269b",

            "aarch64-linux": "1bf3b53cba77e070fb0da4b32540fedc29586b2111700b897fd62e3577708d53",

            "armv7l-linux": "6e52f9fd163e54cb482354645dc32d42b24c6624bbb8927d194dbbb9eaf92959",

            "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d",

            "x86_64-darwin": "e3bb68b37e723af4aab8d9694661e5e9ecbe7b1fbc253fe263940dafffd66864",

            "x86_64-linux": "5a9980bc3c80d1d2af0965eba2bc3c0f532b4ccc29194a595cefdd4dbe98e7dc"

        },

        "version": "32.1.1"

    }

}

pkgs/development/tools/electron/chromedriver/info.json

+7 −7
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 
    },

    "32": {

        "hashes": {

            "aarch64-darwin": "8f40b497d21a8b7d2b3df168b1cf4311f6a39acab241f05ffee0dad6409e0801",

            "aarch64-linux": "f92df0fafdf1be14d38a4ed4b1555f71c922ab3c096148c71aef8a46f95e0127",

            "armv7l-linux": "f8c170268d348411fa5d27642327305aeca539459615a5e7648484728f4e0eed",

            "headers": "01wwikj54d3fm6bsz9z61dcl7d5mzbk48mcaycrbmq1rg0h0kk5a",

            "x86_64-darwin": "5efdf72e580336e91d6d696dab79ab9b932a2eaf91ff4da744b63da24f8288ca",

            "x86_64-linux": "f48ca709758744f6c1ab5062444405c1416c27b57143707bfea321116f641cec"

            "aarch64-darwin": "3fff987133294dcc18420500292bdfc32b452cfcf72f2e89af96404aa566aa27",

            "aarch64-linux": "cfd75fdd5ec2bc86483b0779f241f98f775b74e4b75407a08b3755103304421a",

            "armv7l-linux": "469d23434bca0f8bd4def7d3d9d3e9ff30dfa29e65450bac88cbbc0ae1ffc09c",

            "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d",

            "x86_64-darwin": "2b0e23c214580716dbeedd7b6bccc2b8994cbaa7827fa34208ed22ccb4ccdf77",

            "x86_64-linux": "5d824770f97216138a209f268fbcab3de64bc967046ed9ad92ec0059abef184f"

        },

        "version": "32.1.0"

        "version": "32.1.1"

    }

}

pkgs/development/tools/electron/info.json

+941 −0

File changed.

Preview size limit exceeded, changes collapsed.