pkgs/psu-simulator: keep meta.mainProgram

This fixes a warning in the StreamDevice check: > Package psu_simulator does not have the meta.mainProgram attribute
epics-extensions · Apr 5, 2024 · f6b9a09 · f6b9a09
1 parent 0eba5e1
commit f6b9a09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 {
-  lib,
   epnix,
   writeShellApplication,
 }: {
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     {
-      lib,
       epnix,
       writeShellApplication,
     }: {
@@ Expand Down @@