From c59049bc04fbb564371a6bbfe27af6302358082d Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:34:22 +0100 Subject: [PATCH 1/2] freedv: use finalAttrs pattern --- pkgs/by-name/fr/freedv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 91bfa5a71c0b..57e325b268d0 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -20,14 +20,14 @@ pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freedv"; version = "1.9.9.2"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "freedv"; }; -} +}) From 9a52b65360026b3e4496378fa40a7000cf5e01f2 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Feb 2025 12:35:06 +0100 Subject: [PATCH 2/2] freedv: provide update script --- pkgs/by-name/fr/freedv/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 57e325b268d0..7a01ca62e4c6 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -18,6 +18,7 @@ wxGTK32, sioclient, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -75,6 +76,14 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + # avoid pre‐releases + "--version-regex" + ''^v(\d\.\d\.\d(\.\d)?)$'' + ]; + }; + meta = { homepage = "https://freedv.org/"; description = "Digital voice for HF radio";