From 1c2e39c9556659ddd4c7ff3b230fe798ec67b109 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:16:44 +0000 Subject: [PATCH 1/4] arc-browser: 1.63.1-54714 -> 1.65.0-54911 Changelog: https://arc.net/e/9381EB14-7838-48AB-941B-82CB5CF94627 --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 39e8d88255f1..edac060c44fb 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.63.1-54714"; + version = "1.65.0-54911"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-jL8iAh+e8Z72VG9XQbswjyTPtjO2Pm8ealRte8xr1PQ="; + hash = "sha256-7p1FizITL4GVvlDTV91nwYQZ7LKEd4snJQX0NvB81Qo="; }; nativeBuildInputs = [ undmg ]; From ef9880fdd6ab7d5532062029c2551472f263aed1 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:21:37 +0300 Subject: [PATCH 2/4] arc-browser: format with nixfmt-rfc-style --- pkgs/by-name/ar/arc-browser/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index edac060c44fb..006f268d4b54 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenvNoCC -, fetchurl -, undmg -, writeShellApplication -, curl -, common-updater-scripts +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + writeShellApplication, + curl, + common-updater-scripts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -33,7 +34,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = lib.getExe (writeShellApplication { name = "arc-browser-update-script"; - runtimeInputs = [ curl common-updater-scripts ]; + runtimeInputs = [ + curl + common-updater-scripts + ]; text = '' set -euo pipefail redirect_url="$(curl -s -L -f "https://releases.arc.net/release/Arc-latest.dmg" -o /dev/null -w '%{url_effective}')" @@ -50,7 +54,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://arc.net/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ donteatoreo ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From bbf17bf314b8fe916c257513ccc946b8dd441472 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:22:07 +0300 Subject: [PATCH 3/4] arc-browser: quote paths --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 006f268d4b54..79c6da9d71d6 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -24,8 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/Applications/Arc.app - cp -R . $out/Applications/Arc.app + mkdir -p "$out/Applications/Arc.app" + cp -R . "$out/Applications/Arc.app" runHook postInstall ''; From 42fbc7de66bc45e49113cef963402fd5463bbafd Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:23:58 +0300 Subject: [PATCH 4/4] arc-browser: remove `set -euo pipefail` `writeShellApplication` already sets `errexit`, `nounset`, and `pipefail` by default Refs: https://nixos.org/manual/nixpkgs/stable/#trivial-builder-writeShellApplication --- pkgs/by-name/ar/arc-browser/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 79c6da9d71d6..00e3e6757d83 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -39,7 +39,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { common-updater-scripts ]; text = '' - set -euo pipefail redirect_url="$(curl -s -L -f "https://releases.arc.net/release/Arc-latest.dmg" -o /dev/null -w '%{url_effective}')" # The url scheme is: https://releases.arc.net/release/Arc-1.23.4-56789.dmg # We strip everything before 'Arc-' and after '.dmg'