Unverified Commit ed5cb901 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #303570 from spitulax/brave-fix 

brave: fix overriding and update 1.64.116 -> 1.64.122
parents 1c4b46fc dd6d24ac

pkgs/applications/networking/browsers/brave/default.nix

+22 −19
Original line number Diff line number Diff line 
# Expression generated by update.sh; do not edit it by hand!

{ stdenv, callPackage }:

{ stdenv, callPackage, ... }@args:



callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])

  (

    if stdenv.isAarch64 then

  callPackage ./make-brave.nix { } {

      {

        pname = "brave";

    version = "1.64.116";

    url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_arm64.deb";

    hash = "sha256-XC3GnutiTYdCOJPegj8MRYC5dRrBoKBg4k50ZFrlj4E=";

        version = "1.64.122";

        url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_arm64.deb";

        hash = "sha256-PBYiCTy/QaPfxvWAzUnXLEzBELISNSKX0kG/mYTDDEA=";

        platform = "aarch64-linux";

      }

    else if stdenv.isx86_64 then

  callPackage ./make-brave.nix { } {

      {

        pname = "brave";

    version = "1.64.116";

    url = "https://github.com/brave/brave-browser/releases/download/v1.64.116/brave-browser_1.64.116_amd64.deb";

    hash = "sha256-mnvFPfZu44TZGdUb+AxaJbecQrXkIzJkYvB4GO55uv0=";

        version = "1.64.122";

        url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_amd64.deb";

        hash = "sha256-9tSoOn9XGbX/b8n9vD9Hmpi26jzmUVJomoCFdSJoaoU=";

        platform = "x86_64-linux";

      }

    else

      throw "Unsupported platform."

  )

pkgs/applications/networking/browsers/brave/update.sh

+22 −19
Original line number Diff line number Diff line
@@ -19,18 +19,20 @@ hashAmd64="$(nix hash to-sri --type sha256 \ 


cat > $SCRIPT_DIR/default.nix << EOF

# Expression generated by update.sh; do not edit it by hand!

{ stdenv, callPackage }:

{ stdenv, callPackage, ... }@args:



callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])

  (

    if stdenv.isAarch64 then

  callPackage ./make-brave.nix { } {

      {

        pname = "brave";

        version = "${latestVersionAarch64}";

    url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAarch64}_arm64.deb";

        url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb";

        hash = "${hashAarch64}";

        platform = "aarch64-linux";

      }

    else if stdenv.isx86_64 then

  callPackage ./make-brave.nix { } {

      {

        pname = "brave";

        version = "${latestVersionAmd64}";

        url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb";
@@ -39,4 +41,5 @@ else if stdenv.isx86_64 then 
      }

    else

      throw "Unsupported platform."

  )

EOF