diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 591496c8851b..bbca52b5ad5a 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -1,24 +1,32 @@ # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) - ( - if stdenv.hostPlatform.isAarch64 then - rec { - pname = "brave"; - version = "1.71.121"; - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk="; - platform = "aarch64-linux"; - } - else if stdenv.hostPlatform.isx86_64 then - rec { - pname = "brave"; - version = "1.71.121"; - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0="; - platform = "x86_64-linux"; - } +let + pname = "brave"; + version = "1.71.121"; + + allArchives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk="; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0="; + }; + }; + + archive = + if builtins.hasAttr stdenv.system allArchives then + allArchives.${stdenv.system} else - throw "Unsupported platform." - ) + throw "Unsupported platform."; + +in +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( + archive + // { + inherit pname version; + platform = stdenv.system; + } +) diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index aff0dd552102..306f4d12e53b 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -1,17 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix +#!nix-shell -i bash -p curl gnused nix jq SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -latestVersionAarch64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ - | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" + hashAarch64="$(nix hash to-sri --type sha256 \ $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) )" -latestVersionAmd64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ - | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" hashAmd64="$(nix hash to-sri --type sha256 \ $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) @@ -21,25 +19,33 @@ cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) - ( - if stdenv.hostPlatform.isAarch64 then - rec { - pname = "brave"; - version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; - hash = "${hashAarch64}"; - platform = "aarch64-linux"; - } - else if stdenv.hostPlatform.isx86_64 then - rec { - pname = "brave"; - version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; - hash = "${hashAmd64}"; - platform = "x86_64-linux"; - } +let + pname = "brave"; + version = "${latestVersion}"; + + allArchives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; + hash = "${hashAarch64}"; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; + hash = "${hashAmd64}"; + }; + }; + + archive = + if builtins.hasAttr stdenv.system allArchives then + allArchives.\${stdenv.system} else - throw "Unsupported platform." - ) + throw "Unsupported platform."; + +in +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( + archive + // { + inherit pname version; + platform = stdenv.system; + } +) EOF