diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 7261073e3522..e89a2ae6f39d 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -80,6 +80,8 @@ - `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md) +- `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/). + - `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default. - `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`. diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix index 9047bf89bf0c..63460778435c 100644 --- a/pkgs/by-name/ba/bartender/package.nix +++ b/pkgs/by-name/ba/bartender/package.nix @@ -1,8 +1,7 @@ { lib, stdenvNoCC, - fetchurl, - _7zz, + fetchzip, curl, cacert, xmlstarlet, @@ -12,14 +11,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bartender"; - version = "5.3.7"; + version = "6.4.1"; - src = fetchurl { - name = "Bartender ${lib.versions.major finalAttrs.version}.dmg"; + src = fetchzip { url = "https://www.macbartender.com/B2/updates/${ builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version - }/Bartender%20${lib.versions.major finalAttrs.version}.dmg"; - hash = "sha256-8hOe8MTDGyxEZTv0QndjkD3BEJ6kOHcbeU0uhat/N1s="; + }/Bartender%20${lib.versions.major finalAttrs.version}.zip"; + hash = "sha256-UtLTfRhL7JTYzQXf7kyYyGZXy1TLJ0ODk1nRs2pLfQ4="; }; dontPatch = true; @@ -27,15 +25,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; dontFixup = true; - nativeBuildInputs = [ _7zz ]; - - sourceRoot = "Bartender ${lib.versions.major finalAttrs.version}.app"; + appName = "Bartender ${lib.versions.major finalAttrs.version}.app"; installPhase = '' runHook preInstall - mkdir -p "$out/Applications/${finalAttrs.sourceRoot}" - cp -R . "$out/Applications/${finalAttrs.sourceRoot}" + mkdir -p "$out/Applications/${finalAttrs.appName}" + cp -R . "$out/Applications/${finalAttrs.appName}" runHook postInstall '';