From abf1b2d976231d59131ab3213a0059589c292937 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:42:09 +0800 Subject: [PATCH 1/4] jamulus: format --- pkgs/applications/audio/jamulus/default.nix | 33 ++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 8ad35f34f7ea..d5b54f04bf2e 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -1,26 +1,31 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, pkg-config -, qtscript -, qmake -, qtbase -, qtmultimedia -, qtdeclarative -, libjack2 +{ + mkDerivation, + lib, + fetchFromGitHub, + pkg-config, + qtscript, + qmake, + qtbase, + qtmultimedia, + qtdeclarative, + libjack2, }: - mkDerivation rec { pname = "jamulus"; version = "3.10.0"; + src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; - rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-uqBre1Hcdmmifm/gii3MlP9LiAovQVsAaPZTmVm1nnM="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ + pkg-config + qmake + ]; + buildInputs = [ qtscript qtbase @@ -38,6 +43,6 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "jamulus"; - maintainers = [ lib.maintainers.seb314 ]; + maintainers = with lib.maintainers; [ seb314 ]; }; } From edde220e33472926173ab77fc402452e1e1bf8b0 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:44:00 +0800 Subject: [PATCH 2/4] jamulus: refactor --- pkgs/applications/audio/jamulus/default.nix | 18 +++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index d5b54f04bf2e..1fd14bf67191 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,11 +3,7 @@ lib, fetchFromGitHub, pkg-config, - qtscript, - qmake, - qtbase, - qtmultimedia, - qtdeclarative, + libsForQt5, libjack2, }: mkDerivation rec { @@ -23,14 +19,14 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake ]; buildInputs = [ - qtscript - qtbase - qtmultimedia - qtdeclarative + libsForQt5.qtscript + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtdeclarative libjack2 ]; @@ -39,7 +35,7 @@ mkDerivation rec { meta = { description = "Enables musicians to perform real-time jam sessions over the internet"; longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; - homepage = "https://github.com/corrados/jamulus/wiki"; + homepage = "https://github.com/corrados/jamulus"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "jamulus"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a8cd0f6f70..5fbfba2edbf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3807,7 +3807,7 @@ with pkgs; iaito = libsForQt5.callPackage ../tools/security/iaito { }; - jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; + jamulus = callPackage ../applications/audio/jamulus { }; icemon = libsForQt5.callPackage ../applications/networking/icemon { }; From a164ceb7f37b42476879795aef86bc3d1afbf5b4 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:35:12 +0000 Subject: [PATCH 3/4] jamulus: 3.10.0 -> 3.11.0 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 1fd14bf67191..9dc1807fec5a 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -8,13 +8,13 @@ }: mkDerivation rec { pname = "jamulus"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uqBre1Hcdmmifm/gii3MlP9LiAovQVsAaPZTmVm1nnM="; + hash = "sha256-YxXSSVm3n96YzE51cXpWf4z2nQBSguvcEp/kU0a6iBA="; }; nativeBuildInputs = [ From cdfe22455a0eb0cc4833726585834b14b144e1e3 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:51:10 +0800 Subject: [PATCH 4/4] jamulus: move to by-name --- .../jamulus/default.nix => by-name/ja/jamulus/package.nix} | 5 +++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/jamulus/default.nix => by-name/ja/jamulus/package.nix} (93%) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/by-name/ja/jamulus/package.nix similarity index 93% rename from pkgs/applications/audio/jamulus/default.nix rename to pkgs/by-name/ja/jamulus/package.nix index 9dc1807fec5a..32166e15f465 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/by-name/ja/jamulus/package.nix @@ -1,12 +1,12 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, pkg-config, libsForQt5, libjack2, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "jamulus"; version = "3.11.0"; @@ -20,6 +20,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fbfba2edbf5..05d45fee21ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3807,8 +3807,6 @@ with pkgs; iaito = libsForQt5.callPackage ../tools/security/iaito { }; - jamulus = callPackage ../applications/audio/jamulus { }; - icemon = libsForQt5.callPackage ../applications/networking/icemon { }; icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;