From 932c6d886100b81bafce430a982eb1ed4fac9f2c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 08:23:42 -0400 Subject: [PATCH 1/7] dogdns: set meta.mainProgram, format --- pkgs/tools/networking/dogdns/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 1374e4473c07..c101615855f6 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv -, fetchFromGitHub +{ lib , rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv , pkg-config , openssl , Security -, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -34,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://dns.lookup.dog"; license = licenses.eupl12; maintainers = with maintainers; [ bbigras ]; + mainProgram = "dog"; }; } From 0473477f998f15bc867d6c6e7129330581ae84d9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 08:27:13 -0400 Subject: [PATCH 2/7] mustache-go: set meta.mainProgram --- pkgs/development/tools/mustache-go/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index ddf2a851b7d4..7e21d415c79b 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { homepage = "https://github.com/cbroglie/mustache"; description = "The mustache template language in Go"; license = [ licenses.mit ]; - maintainers = [ maintainers.Zimmi48 ]; + maintainers = with maintainers; [ Zimmi48 ]; + mainProgram = "mustache"; }; } From a3e639c784ad9293f15461b9b7f072bd045d943c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 08:55:33 -0400 Subject: [PATCH 3/7] sensu-go-{cli,backend,agent}: set meta.mainProgram, format --- pkgs/servers/monitoring/sensu-go/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 6358fa753916..9b07f299f729 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: let - generic = { subPackages, pname, postInstall ? "" }: + generic = { subPackages, pname, postInstall ? "", mainProgram }: buildGoModule rec { inherit pname; version = "6.4.1"; @@ -16,9 +16,9 @@ let inherit subPackages postInstall; - vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU="; + vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU="; - doCheck = false; + doCheck = false; ldflags = let versionPkg = "github.com/sensu/sensu-go/version"; @@ -28,6 +28,7 @@ let ]; meta = { + inherit mainProgram; homepage = "https://sensu.io"; description = "Open source monitoring tool for ephemeral infrastructure & distributed applications"; license = lib.licenses.mit; @@ -54,15 +55,18 @@ in ) > ''${!outputBin}/share/zsh/site-functions/_sensuctl ''; + mainProgram = "sensuctl"; }; sensu-go-backend = generic { pname = "sensu-go-backend"; subPackages = [ "cmd/sensu-backend" ]; + mainProgram = "sensu-backend"; }; sensu-go-agent = generic { pname = "sensu-go-agent"; subPackages = [ "cmd/sensu-agent" ]; + mainProgram = "sensu-agent"; }; } From 909ae835cf50500df695fb8769958071bfd43849 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 09:08:50 -0400 Subject: [PATCH 4/7] dpt-rp1-py: set meta.mainProgram --- pkgs/tools/misc/dpt-rp1-py/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 52038c8efa9c..4fb7acb188ad 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -32,5 +32,6 @@ python3Packages.buildPythonApplication rec { description = "Python script to manage Sony DPT-RP1 without Digital Paper App"; license = licenses.mit; maintainers = with maintainers; [ mt-caret ]; + mainProgram = "dptrp1"; }; } From 37a494975fdea01886b6c77402f5f20d4770c3fc Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 09:12:30 -0400 Subject: [PATCH 5/7] z-lua: set meta.mainProgram --- pkgs/tools/misc/z-lua/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index cee704e93812..751f68bf089d 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/skywind3000/z.lua"; description = "A new cd command that helps you navigate faster by learning your habits"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; + mainProgram = "z.lua"; }; } From 203ef7ca55409027dbabf0052eaca8efd06846a5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 09:13:57 -0400 Subject: [PATCH 6/7] orca-c: set meta.mainProgram --- pkgs/applications/audio/orca-c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 2c3a8fb1390f..4bad49603373 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ netcrns ]; + mainProgram = "orca"; }; } From 18335b226e67bb5dc54e3f493329e8a024255afd Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 21 Oct 2021 09:17:40 -0400 Subject: [PATCH 7/7] editorconfig-core-c: set meta.mainProgram --- pkgs/development/tools/misc/editorconfig-core-c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index f48ba999d868..eb2e124a35e9 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 bsd3 ]; maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; + mainProgram = "editorconfig"; }; }