From 1f6463e2914688c7641be4790712c4a3208fc069 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 10 Jul 2025 11:22:03 -0500 Subject: [PATCH] kmetronome: Migrate to by-name --- .../km/kmetronome/package.nix} | 27 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 17 deletions(-) rename pkgs/{applications/audio/kmetronome/default.nix => by-name/km/kmetronome/package.nix} (55%) diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/by-name/km/kmetronome/package.nix similarity index 55% rename from pkgs/applications/audio/kmetronome/default.nix rename to pkgs/by-name/km/kmetronome/package.nix index bcb5914bebf3..bfd408cda384 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/by-name/km/kmetronome/package.nix @@ -5,19 +5,16 @@ cmake, pandoc, pkg-config, - qttools, alsa-lib, - drumstick, - qtbase, - qtsvg, + qt6Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kmetronome"; version = "1.4.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/kmetronome/${finalAttrs.version}/kmetronome-${finalAttrs.version}.tar.bz2"; hash = "sha256-FJVmSMu0KDoq8DHRxxGyHQQflPCvH1h+WdsV9wcPAPA="; }; @@ -25,24 +22,24 @@ stdenv.mkDerivation rec { cmake pandoc pkg-config - qttools + qt6Packages.qttools ]; buildInputs = [ alsa-lib - drumstick - qtbase - qtsvg + qt6Packages.drumstick + qt6Packages.qtbase + qt6Packages.qtsvg ]; dontWrapQtApps = true; - meta = with lib; { + meta = { homepage = "https://kmetronome.sourceforge.io/"; description = "ALSA MIDI metronome with Qt interface"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; mainProgram = "kmetronome"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16a3b83a96c0..c9e41af05e8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12849,8 +12849,6 @@ with pkgs; llvmPackages = llvmPackages_13; }; - kmetronome = qt6Packages.callPackage ../applications/audio/kmetronome { }; - kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };