From dd4feba205556412799f6328fb55ec88ec5d03ea Mon Sep 17 00:00:00 2001 From: magnouvean Date: Fri, 26 Jul 2024 11:55:05 +0200 Subject: [PATCH 1/3] g4music: rename to gapless and move to pkgs/by-name --- .../g4music/default.nix => by-name/ga/gapless/package.nix} | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/g4music/default.nix => by-name/ga/gapless/package.nix} (93%) diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/by-name/ga/gapless/package.nix similarity index 93% rename from pkgs/applications/audio/g4music/default.nix rename to pkgs/by-name/ga/gapless/package.nix index cbf5aef45c27..4df77bb601a3 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -14,7 +14,7 @@ , wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { - pname = "g4music"; + pname = "gapless"; version = "3.7.2"; src = fetchFromGitLab { @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "g4music"; homepage = "https://gitlab.gnome.org/neithern/g4music"; license = licenses.gpl3Only; - maintainers = with maintainers; [ magnouvean ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99116ed6f119..81004e5303b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -460,6 +460,7 @@ mapAliases ({ ### G ### + g4music = gapless; # Added 2024-07-26 g4py = python3Packages.geant4; # Added 2020-06-06 garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965fa97f3885..fbf2eb057ace 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30910,8 +30910,6 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; - g4music = callPackage ../applications/audio/g4music { }; - genesys = callPackage ../applications/misc/genesys { }; giada = callPackage ../applications/audio/giada { }; From 2677665935c408b655d70dee6c8b44f87565ed8b Mon Sep 17 00:00:00 2001 From: magnouvean Date: Fri, 26 Jul 2024 11:57:34 +0200 Subject: [PATCH 2/3] gapless: 3.7.2 -> 3.8 --- pkgs/by-name/ga/gapless/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 4df77bb601a3..136afb521110 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "3.7.2"; + version = "3.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-fG8OBAzdCdr3Yo8Vei93HlNa2TIL5gxWG+0jFYjSDZ8="; + hash = "sha256-AZoMAbQ3foW2jx+mBam925a8ykMtGvaiVg9N8/Ggny0="; }; nativeBuildInputs = [ From d99035decc3dc184a49539e5feb5093bcf41f571 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Fri, 26 Jul 2024 22:17:50 +0800 Subject: [PATCH 3/3] gapless: add aleksana to maintainers --- pkgs/by-name/ga/gapless/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 136afb521110..9852ab96a125 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "g4music"; homepage = "https://gitlab.gnome.org/neithern/g4music"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; })