From f6b9a09fae4fec9740f821b35ec79c89c433f7a8 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 5 Apr 2024 10:31:14 +0200 Subject: [PATCH] pkgs/psu-simulator: keep meta.mainProgram This fixes a warning in the StreamDevice check: > Package psu_simulator does not have the meta.mainProgram attribute --- pkgs/doc-support/psu-simulator/default.nix | 9 ++++++--- pkgs/epnix/tools/lewis/lib.nix | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/doc-support/psu-simulator/default.nix b/pkgs/doc-support/psu-simulator/default.nix index 2a850e08..ec2776ec 100644 --- a/pkgs/doc-support/psu-simulator/default.nix +++ b/pkgs/doc-support/psu-simulator/default.nix @@ -3,12 +3,15 @@ epnix, epnixLib, }: +# Use recursiveUpdate so that it doesn't override meta.mainProgram +lib.recursiveUpdate (epnix.mkLewisSimulator { - name = "psu_simulator"; - package = "psu_simulator"; + name = "psu-simulator"; source = ./.; + package = "psu_simulator"; + device = "psu_simulator"; }) -// { +{ pname = "psu_simulator"; version = "0.2.0"; diff --git a/pkgs/epnix/tools/lewis/lib.nix b/pkgs/epnix/tools/lewis/lib.nix index f6a61586..e90fd59e 100644 --- a/pkgs/epnix/tools/lewis/lib.nix +++ b/pkgs/epnix/tools/lewis/lib.nix @@ -1,5 +1,4 @@ { - lib, epnix, writeShellApplication, }: {