From 0eff84bc006626b986437ae72dae22de601e0f23 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:39:48 -0400
Subject: [PATCH 1/4] efibootmgr: add updateScript

---
 pkgs/by-name/ef/efibootmgr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ef/efibootmgr/package.nix b/pkgs/by-name/ef/efibootmgr/package.nix
index c81f5123c67a..e88936cc0863 100644
--- a/pkgs/by-name/ef/efibootmgr/package.nix
+++ b/pkgs/by-name/ef/efibootmgr/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   efivar,
+  nix-update-script,
   popt,
 }:
 
@@ -32,6 +33,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "prefix=${placeholder "out"}" ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
     homepage = "https://github.com/rhboot/efibootmgr";

From c003cbebe391f56230e169af5a5b532850d29ecd Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:41:45 -0400
Subject: [PATCH 2/4] efibootmgr: add meta.mainProgram

---
 pkgs/by-name/ef/efibootmgr/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ef/efibootmgr/package.nix b/pkgs/by-name/ef/efibootmgr/package.nix
index e88936cc0863..51f8391d37f7 100644
--- a/pkgs/by-name/ef/efibootmgr/package.nix
+++ b/pkgs/by-name/ef/efibootmgr/package.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${src.rev}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "efibootmgr";
     platforms = lib.platforms.linux;
   };
 }

From 5b71d6c0d083c969ce9660f3be0c0dc57d4995ac Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:42:00 -0400
Subject: [PATCH 3/4] efibootmgr: add version test

---
 pkgs/by-name/ef/efibootmgr/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ef/efibootmgr/package.nix b/pkgs/by-name/ef/efibootmgr/package.nix
index 51f8391d37f7..c4bf04b5db32 100644
--- a/pkgs/by-name/ef/efibootmgr/package.nix
+++ b/pkgs/by-name/ef/efibootmgr/package.nix
@@ -2,20 +2,21 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pkg-config,
   efivar,
   nix-update-script,
+  pkg-config,
   popt,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "efibootmgr";
   version = "18";
 
   src = fetchFromGitHub {
     owner = "rhboot";
     repo = "efibootmgr";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg=";
   };
 
@@ -34,16 +35,17 @@ stdenv.mkDerivation rec {
   installFlags = [ "prefix=${placeholder "out"}" ];
 
   passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script { };
   };
 
   meta = {
     description = "Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
     homepage = "https://github.com/rhboot/efibootmgr";
-    changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${src.rev}";
+    changelog = "https://github.com/rhboot/efibootmgr/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "efibootmgr";
     platforms = lib.platforms.linux;
   };
-}
+})

From 612f242c1d2d7299b96269fad951e2cef3d417c6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 19 Jul 2024 22:07:20 -0400
Subject: [PATCH 4/4] efibootmgr: split man output

---
 pkgs/by-name/ef/efibootmgr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ef/efibootmgr/package.nix b/pkgs/by-name/ef/efibootmgr/package.nix
index c4bf04b5db32..f53ea4a6abf5 100644
--- a/pkgs/by-name/ef/efibootmgr/package.nix
+++ b/pkgs/by-name/ef/efibootmgr/package.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "efibootmgr";
   version = "18";
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   src = fetchFromGitHub {
     owner = "rhboot";
     repo = "efibootmgr";