From fe90f520aa3ae7505958dc382d5d0b2656cfd0bd Mon Sep 17 00:00:00 2001 From: Locochoco Date: Fri, 8 Mar 2024 23:44:14 -0300 Subject: [PATCH 1/7] owmods-cli: Add mono wrap and fix man pages install --- pkgs/applications/misc/owmods-cli/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix index 44a711dfeec1..e43bf014dd66 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/applications/misc/owmods-cli/default.nix @@ -6,6 +6,10 @@ , pkg-config , installShellFiles , zstd +, libsoup_3 +, makeWrapper +, mono +, wrapWithMono ? true , openssl , Security }: @@ -26,10 +30,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles - ]; + ] ++ lib.optional wrapWithMono makeWrapper; buildInputs = [ zstd + libsoup_3 ] ++ lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ @@ -44,9 +49,11 @@ rustPlatform.buildRustPackage rec { postInstall = '' cargo xtask dist_cli - installManPage man/man*/* + installManPage dist/cli/man/* installShellCompletion --cmd owmods \ - dist/cli/completions/owmods.{bash,fish,zsh} + dist/cli/completions/owmods.{bash,fish,zsh} + '' + lib.optionalString wrapWithMono '' + wrapProgram $out/bin/${meta.mainProgram} --prefix PATH : '${mono}/bin' ''; passthru.updateScript = nix-update-script {}; @@ -58,6 +65,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; mainProgram = "owmods"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ locochoco ]; + maintainers = with maintainers; [ bwc9876 locochoco ]; }; } From cc5e99fb282f7212182ac6896138563adae12ac2 Mon Sep 17 00:00:00 2001 From: Locochoco Date: Sat, 9 Mar 2024 00:28:07 -0300 Subject: [PATCH 2/7] owmods-cli: 0.12.2 -> 0.13.0 --- pkgs/applications/misc/owmods-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix index e43bf014dd66..a2b212a87eb1 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/applications/misc/owmods-cli/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4="; + hash = "sha256-JCPuKGO0pbhQaNmZUcZ95EZbXubrjZnw0qJmKCGuAoQ="; }; - cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU="; + cargoHash = "sha256-dTEEpjonvFYFv16e0eS71B4OMiYueYSfcs8gmSYeHPc="; nativeBuildInputs = [ pkg-config @@ -65,6 +65,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; mainProgram = "owmods"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bwc9876 locochoco ]; + maintainers = with maintainers; [ locochoco ]; }; } From 147344ca8d32d4a28229d6427435291a2d7443b8 Mon Sep 17 00:00:00 2001 From: Locochoco Date: Sat, 9 Mar 2024 00:40:50 -0300 Subject: [PATCH 3/7] owmods-cli: move to pkgs/by-name/ow/owmods-cli --- .../default.nix => by-name/ow/owmods-cli/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/owmods-cli/default.nix => by-name/ow/owmods-cli/package.nix} (97%) diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/by-name/ow/owmods-cli/package.nix similarity index 97% rename from pkgs/applications/misc/owmods-cli/default.nix rename to pkgs/by-name/ow/owmods-cli/package.nix index a2b212a87eb1..18192a5714ff 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -11,7 +11,7 @@ , mono , wrapWithMono ? true , openssl -, Security +, darwin }: rustPlatform.buildRustPackage rec { @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security ]; env = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6de2f99b33..912ee2988b31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40452,10 +40452,6 @@ with pkgs; jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); - owmods-cli = callPackage ../applications/misc/owmods-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - r128gain = callPackage ../applications/audio/r128gain { }; resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; From 0ae30c08a463d7adf743308f17171ab7ab09cb80 Mon Sep 17 00:00:00 2001 From: Locochoco Date: Sat, 9 Mar 2024 01:00:15 -0300 Subject: [PATCH 4/7] maintainers: add bwc9876 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cba31c18d0b..8f7cf03d38b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2930,6 +2930,12 @@ githubId = 37375448; name = "Buildit"; }; + bwc9876 = { + email = "bwc9876@gmail.com"; + github = "Bwc9876"; + githubId = 25644444; + name = "Ben C"; + }; bwlang = { email = "brad@langhorst.com"; github = "bwlang"; From c958512b32bc082f017baccc6059c65b8c3a1528 Mon Sep 17 00:00:00 2001 From: Locochoco Date: Sat, 9 Mar 2024 01:03:10 -0300 Subject: [PATCH 5/7] maintainers: add spoonbaker --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8f7cf03d38b9..2c862ffef5a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18266,6 +18266,11 @@ githubId = 950799; name = "Tomasz Czyż"; }; + spoonbaker = { + github = "Spoonbaker"; + githubId = 47164123; + name = "Spoonbaker"; + }; sprock = { email = "rmason@mun.ca"; github = "sprock"; From 6e11881ea164ffa3e2a70ecc346f277b3d6540cd Mon Sep 17 00:00:00 2001 From: Locochoco Date: Sat, 9 Mar 2024 01:04:20 -0300 Subject: [PATCH 6/7] owmods-cli: add bwc9876 and spoonbaker as maintainers --- pkgs/by-name/ow/owmods-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 18192a5714ff..c5296570abe6 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -65,6 +65,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; mainProgram = "owmods"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ locochoco ]; + maintainers = with maintainers; [ bwc9876 spoonbaker locochoco ]; }; } From e91b378f173c139958ead1ddb5082eb4a5f52a22 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:37:22 +0100 Subject: [PATCH 7/7] owmods-cli: fix build on darwin --- pkgs/by-name/ow/owmods-cli/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index c5296570abe6..19961f193e2a 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = {