From 177d045fb3184e80f90d30c59b0f84155a3a64ce Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Tue, 22 Oct 2024 21:13:41 -0400 Subject: [PATCH 1/2] brave: move to by-name --- .../networking/browsers => by-name/br}/brave/make-brave.nix | 0 .../browsers/brave/default.nix => by-name/br/brave/package.nix} | 0 .../networking/browsers => by-name/br}/brave/update.sh | 2 +- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/networking/browsers => by-name/br}/brave/make-brave.nix (100%) rename pkgs/{applications/networking/browsers/brave/default.nix => by-name/br/brave/package.nix} (100%) rename pkgs/{applications/networking/browsers => by-name/br}/brave/update.sh (97%) diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix similarity index 100% rename from pkgs/applications/networking/browsers/brave/make-brave.nix rename to pkgs/by-name/br/brave/make-brave.nix diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/by-name/br/brave/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/brave/default.nix rename to pkgs/by-name/br/brave/package.nix diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/by-name/br/brave/update.sh similarity index 97% rename from pkgs/applications/networking/browsers/brave/update.sh rename to pkgs/by-name/br/brave/update.sh index d08c1559d0a4..aff0dd552102 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -17,7 +17,7 @@ hashAmd64="$(nix hash to-sri --type sha256 \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) )" -cat > $SCRIPT_DIR/default.nix << EOF +cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6449b5d2e024..2915b63437d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28313,8 +28313,6 @@ with pkgs; buzztrax = callPackage ../applications/audio/buzztrax { }; - brave = callPackage ../applications/networking/browsers/brave { }; - break-time = callPackage ../applications/misc/break-time { }; breezy = with python3Packages; toPythonApplication breezy; From 9922167c894149b4d5d4cc01c9468d3ccf121388 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 23 Oct 2024 17:26:58 -0400 Subject: [PATCH 2/2] brave: 1.70.123 -> 1.71.118 https://community.brave.com/t/release-channel-1-71-118/576979 --- pkgs/by-name/br/brave/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 65d064459e61..50a33da09848 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.hostPlatform.isAarch64 then rec { pname = "brave"; - version = "1.70.123"; + version = "1.71.118"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-YqSZYQinNyQQQds5ACyDCeZA+D4sBxyMvMiOvD6CVeU="; + hash = "sha256-6ERUWUb4GL+kuI0j8VI3vERR3HFfb1gYL4d+hBTcw5w="; platform = "aarch64-linux"; } else if stdenv.hostPlatform.isx86_64 then rec { pname = "brave"; - version = "1.70.123"; + version = "1.71.118"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-Hr7/Yry7fhSDe1gzpZqtjuIDrbB6HuC1PSeBQ3HlAdE="; + hash = "sha256-SnpYAJmqBRfECQrlOvgxwQI1k7j0tfctJG7Tt93afe8="; platform = "x86_64-linux"; } else