From cec5030c0ba696d97effca8c37680c015b39be1e Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Sat, 11 Apr 2026 09:26:26 -0700 Subject: [PATCH] fldigi: migrate to by-name --- .../default.nix => by-name/fl/fldigi/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{applications/radio/fldigi/default.nix => by-name/fl/fldigi/package.nix} (86%) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/by-name/fl/fldigi/package.nix similarity index 86% rename from pkgs/applications/radio/fldigi/default.nix rename to pkgs/by-name/fl/fldigi/package.nix index 99a47f15b7f2..ce45fc6315ab 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/by-name/fl/fldigi/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - hamlib, + hamlib_4, fltk_1_3, libjpeg, libpng, @@ -17,12 +17,12 @@ udev, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fldigi"; version = "4.2.11"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-dis3D/6crnc6KgO1EtC3JC5+kEB8EdWrvS0xrmUBZk8="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxinerama gettext - hamlib + hamlib_4 fltk_1_3 libjpeg libpng @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 019be4c8520e..190019dcc06a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9343,10 +9343,6 @@ with pkgs; firewalld-gui = firewalld.override { withGui = true; }; - fldigi = callPackage ../applications/radio/fldigi { - hamlib = hamlib_4; - }; - fossil = callPackage ../applications/version-management/fossil { sqlite = sqlite.override { enableDeserialize = true; }; };