From 015bd4d0de149fabf57a4e63101313a8c895b8c9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 20 Jun 2025 05:57:17 -0700 Subject: [PATCH] sfwbar: 1.0_beta16 -> 1.0_beta16.1 This fixes the build after NixOS/nixpkgs#409607 broke it. Diff: https://github.com/LBCrion/sfwbar/compare/refs/tags/v1.0_beta16...refs/tags/v1.0_beta16.1 Changelog: https://github.com/LBCrion/sfwbar/releases/tag/v1.0_beta16.1 Also, switch to finalAttrs style. --- pkgs/by-name/sf/sfwbar/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sf/sfwbar/package.nix b/pkgs/by-name/sf/sfwbar/package.nix index f862473a27ec..8f832c00e8c8 100644 --- a/pkgs/by-name/sf/sfwbar/package.nix +++ b/pkgs/by-name/sf/sfwbar/package.nix @@ -16,18 +16,16 @@ docutils, wayland-scanner, }: -let - version = "1.0_beta16"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation (finalAttrs: { pname = "sfwbar"; - inherit version; + version = "1.0_beta16.1"; src = fetchFromGitHub { owner = "LBCrion"; repo = "sfwbar"; - rev = "v${version}"; - hash = "sha256-jMEbw3Xla2cod/oKFQ4bD3sTHi7DZ0deG0H0Yt0Y7ck="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WA9BXX+0VR8eSdHOYLs+DoazBqVwMllQSxkubq4SkWo="; }; buildInputs = [ @@ -57,7 +55,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/LBCrion/sfwbar"; description = "Flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; - changelog = "https://github.com/LBCrion/sfwbar/releases/tag/v${version}"; + changelog = "https://github.com/LBCrion/sfwbar/releases/tag/v${finalAttrs.version}"; mainProgram = "sfwbar"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ @@ -66,4 +64,4 @@ stdenv.mkDerivation { ]; license = lib.licenses.gpl3Only; }; -} +})