From 405965dc7211c20632eaca3545a87a283c16b7f6 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 4 Aug 2023 09:54:23 +0000 Subject: [PATCH] pkgs: add explicit 'meta.mainProgram' Since upstream has decided to deprecate the implied value when using `lib.getExe` (see [1]), we should set it explicitly. [1]: https://github.com/NixOS/nixpkgs/pull/246386 --- pkgs/bw-pass/default.nix | 1 + pkgs/change-audio/default.nix | 1 + pkgs/change-backlight/default.nix | 1 + pkgs/diff-flake/default.nix | 1 + pkgs/dragger/default.nix | 1 + pkgs/drone-rsync/default.nix | 1 + pkgs/drone-scp/default.nix | 1 + pkgs/ff2mpv-go/default.nix | 1 + pkgs/i3-get-window-criteria/default.nix | 1 + pkgs/lohr/default.nix | 1 + pkgs/matrix-notifier/default.nix | 1 + pkgs/osc52/default.nix | 1 + pkgs/rbw-pass/default.nix | 1 + pkgs/wifi-qr/default.nix | 1 + 14 files changed, 14 insertions(+) diff --git a/pkgs/bw-pass/default.nix b/pkgs/bw-pass/default.nix index 4e18c20..9b959f5 100644 --- a/pkgs/bw-pass/default.nix +++ b/pkgs/bw-pass/default.nix @@ -36,6 +36,7 @@ stdenvNoCC.mkDerivation rec { description = "A simple script to query a password from bitwarden"; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "bw-pass"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; }; diff --git a/pkgs/change-audio/default.nix b/pkgs/change-audio/default.nix index d08d60e..12814e1 100644 --- a/pkgs/change-audio/default.nix +++ b/pkgs/change-audio/default.nix @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "change-audio"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; }; diff --git a/pkgs/change-backlight/default.nix b/pkgs/change-backlight/default.nix index d1b8981..1f8c88c 100644 --- a/pkgs/change-backlight/default.nix +++ b/pkgs/change-backlight/default.nix @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "change-backlight"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; }; diff --git a/pkgs/diff-flake/default.nix b/pkgs/diff-flake/default.nix index 0c2600b..9cccd20 100644 --- a/pkgs/diff-flake/default.nix +++ b/pkgs/diff-flake/default.nix @@ -34,6 +34,7 @@ stdenvNoCC.mkDerivation rec { description = "Nix flake helper to visualize changes in closures"; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "diff-flake"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.unix; }; diff --git a/pkgs/dragger/default.nix b/pkgs/dragger/default.nix index 255cc01..9eda7df 100644 --- a/pkgs/dragger/default.nix +++ b/pkgs/dragger/default.nix @@ -23,6 +23,7 @@ qt5.mkDerivation rec { description = "A CLI drag-and-drop tool"; homepage = "https://git.belanyi.fr/ambroisie/dragger"; license = licenses.mit; + mainProgram = "dragger"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; }; diff --git a/pkgs/drone-rsync/default.nix b/pkgs/drone-rsync/default.nix index 1e679a8..a7c2cbc 100644 --- a/pkgs/drone-rsync/default.nix +++ b/pkgs/drone-rsync/default.nix @@ -34,6 +34,7 @@ stdenvNoCC.mkDerivation rec { description = "Helper script to run rsync in a CI pipeline"; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "drone-rsync"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.unix; }; diff --git a/pkgs/drone-scp/default.nix b/pkgs/drone-scp/default.nix index 0affedb..7437b06 100644 --- a/pkgs/drone-scp/default.nix +++ b/pkgs/drone-scp/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { ''; homepage = "https://github.com/appleboy/drone-scp"; license = licenses.mit; + mainProgram = "drone-scp"; }; } diff --git a/pkgs/ff2mpv-go/default.nix b/pkgs/ff2mpv-go/default.nix index fdd9201..8c59bf5 100644 --- a/pkgs/ff2mpv-go/default.nix +++ b/pkgs/ff2mpv-go/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { ''; homepage = "https://git.clsr.net/util/ff2mpv-go/"; license = licenses.publicDomain; + mainProgram = "ff2mpv-go"; }; } diff --git a/pkgs/i3-get-window-criteria/default.nix b/pkgs/i3-get-window-criteria/default.nix index e5f605b..2fc840d 100644 --- a/pkgs/i3-get-window-criteria/default.nix +++ b/pkgs/i3-get-window-criteria/default.nix @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation rec { description = "Helper script to query i3 window criterions"; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "i3-get-window-criteria"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.unix; }; diff --git a/pkgs/lohr/default.nix b/pkgs/lohr/default.nix index 986472a..a83b092 100644 --- a/pkgs/lohr/default.nix +++ b/pkgs/lohr/default.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { description = "Git mirroring daemon"; homepage = "https://github.com/alarsyo/lohr"; license = with licenses; [ mit asl20 ]; + mainProgram = "lohr"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.unix; }; diff --git a/pkgs/matrix-notifier/default.nix b/pkgs/matrix-notifier/default.nix index d4a3844..a96cb61 100644 --- a/pkgs/matrix-notifier/default.nix +++ b/pkgs/matrix-notifier/default.nix @@ -38,6 +38,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://git.belanyi.fr/ambroisie/${pname}"; license = licenses.mit; + mainProgram = "matrix-notifier"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.unix; }; diff --git a/pkgs/osc52/default.nix b/pkgs/osc52/default.nix index e02121b..d4b0c08 100644 --- a/pkgs/osc52/default.nix +++ b/pkgs/osc52/default.nix @@ -34,6 +34,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "osc52"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; }; diff --git a/pkgs/rbw-pass/default.nix b/pkgs/rbw-pass/default.nix index 1767408..6f9ff0a 100644 --- a/pkgs/rbw-pass/default.nix +++ b/pkgs/rbw-pass/default.nix @@ -34,6 +34,7 @@ stdenvNoCC.mkDerivation rec { description = "A simple script to query a password from rbw"; homepage = "https://git.belanyi.fr/ambroisie/nix-config"; license = with licenses; [ mit ]; + mainProgram = "rbw-pass"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; }; diff --git a/pkgs/wifi-qr/default.nix b/pkgs/wifi-qr/default.nix index 79f4109..88164e5 100644 --- a/pkgs/wifi-qr/default.nix +++ b/pkgs/wifi-qr/default.nix @@ -74,6 +74,7 @@ stdenvNoCC.mkDerivation rec { description = "WiFi password sharing via QR codes"; homepage = "https://github.com/kokoye2007/wifi-qr"; license = with licenses; [ gpl3Plus ]; + mainProgram = "wifi-qr"; maintainers = with maintainers; [ ambroisie ]; platforms = platforms.linux; };