From 775ba62998c4d603d9a300cb04175a19f114ac0d Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 22 Jul 2025 18:12:35 +0200 Subject: [PATCH] spek: move to by-name --- .../audio => by-name/sp}/spek/autoconf.patch | 0 .../sp/spek/package.nix} | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 9 insertions(+), 11 deletions(-) rename pkgs/{applications/audio => by-name/sp}/spek/autoconf.patch (100%) rename pkgs/{applications/audio/spek/default.nix => by-name/sp/spek/package.nix} (67%) diff --git a/pkgs/applications/audio/spek/autoconf.patch b/pkgs/by-name/sp/spek/autoconf.patch similarity index 100% rename from pkgs/applications/audio/spek/autoconf.patch rename to pkgs/by-name/sp/spek/autoconf.patch diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/by-name/sp/spek/package.nix similarity index 67% rename from pkgs/applications/audio/spek/default.nix rename to pkgs/by-name/sp/spek/package.nix index 721afb7766d4..0ebaefd3550f 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/by-name/sp/spek/package.nix @@ -11,15 +11,15 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spek"; version = "0.8.5"; src = fetchFromGitHub { owner = "alexkay"; repo = "spek"; - rev = "v${version}"; - sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg="; }; patches = [ @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { gtk3 ]; - meta = with lib; { + meta = { description = "Analyse your audio files by showing their spectrogram"; - mainProgram = "spek"; homepage = "http://spek.cc/"; - license = licenses.gpl3; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bjornfor ]; + platforms = lib.platforms.all; + mainProgram = "spek"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdbc642c239a..cd6cc1852054 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13758,8 +13758,6 @@ with pkgs; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; - spek = callPackage ../applications/audio/spek { }; - squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; };