From 6560f2359d6ee05369d12a6c389b5141ad8ad202 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 20 Dec 2024 20:27:29 +0000
Subject: [PATCH 01/34] openbsd.getent: init, set as default on OpenBSD

---
 pkgs/os-specific/bsd/openbsd/pkgs/getent.nix | 1 +
 pkgs/top-level/unixtools.nix                 | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/getent.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/getent.nix b/pkgs/os-specific/bsd/openbsd/pkgs/getent.nix
new file mode 100644
index 000000000000..4d812f506b4d
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/getent.nix
@@ -0,0 +1 @@
+{ mkDerivation }: mkDerivation { path = "usr.bin/getent"; }
diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index 93bb34bba20d..ad308da838b7 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -88,6 +88,7 @@ let
               else pkgs.netbsd.getent;
       darwin = pkgs.netbsd.getent;
       freebsd = pkgs.freebsd.getent;
+      openbsd = pkgs.openbsd.getent;
     };
     getopt = {
       linux = pkgs.util-linux;

From b5cacdcc0e4e39cffeaf10f0664ebd93ae12a652 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 20 Dec 2024 20:50:18 +0000
Subject: [PATCH 02/34] openbsd.shutdown: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix
new file mode 100644
index 000000000000..15c602455866
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/shutdown.nix
@@ -0,0 +1,8 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "sbin/shutdown";
+
+  preBuild = ''
+    sed -i 's/4550/0550/' Makefile
+  '';
+}

From 4a43978bc9d0c3c68ea15c52608028b501645e7f Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Dec 2024 00:25:16 +0000
Subject: [PATCH 03/34] openbsd.pwd_mkdb: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/pwd_mkdb.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/pwd_mkdb.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/pwd_mkdb.nix b/pkgs/os-specific/bsd/openbsd/pkgs/pwd_mkdb.nix
new file mode 100644
index 000000000000..5329e58e4747
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/pwd_mkdb.nix
@@ -0,0 +1,4 @@
+{ mkDerivation, ... }:
+mkDerivation {
+  path = "usr.sbin/pwd_mkdb";
+}

From 88c61c7a14ff52d7437815c7a5326aec1a612a53 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sun, 22 Dec 2024 09:58:12 -0800
Subject: [PATCH 04/34] openbsd.getty: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
new file mode 100644
index 000000000000..baa50c998235
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "libexec/getty";
+}

From 71665fc90673edd225e6cf426a7a8b1c79177e8f Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sun, 22 Dec 2024 13:27:25 -0800
Subject: [PATCH 05/34] openbsd.sysctl: init

---
 .../bsd/openbsd/pkgs/sysctl/no-perms.patch          | 13 +++++++++++++
 .../os-specific/bsd/openbsd/pkgs/sysctl/package.nix |  7 +++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sysctl/no-perms.patch
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/no-perms.patch b/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/no-perms.patch
new file mode 100644
index 000000000000..f89d9f2f3eef
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/no-perms.patch
@@ -0,0 +1,13 @@
+diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
+index 6454e1dc888..53ddf3f3038 100644
+--- a/sbin/sysctl/Makefile
++++ b/sbin/sysctl/Makefile
+@@ -5,8 +5,4 @@ MAN=	sysctl.8
+ 
+ CPPFLAGS+=	-D_LIBKVM
+ 
+-afterinstall:
+-	ln -sf ../../sbin/sysctl ${DESTDIR}/usr/sbin
+-	chown -h ${BINOWN}:${BINGRP} ${DESTDIR}/usr/sbin/sysctl
+-
+ .include <bsd.prog.mk>
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix
new file mode 100644
index 000000000000..a394b21ccc85
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix
@@ -0,0 +1,7 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "sbin/sysctl";
+  patches = [ ./no-perms.patch ];
+}

From ee56f3d607563b73dc733b904e3c24a4101c63fc Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sun, 22 Dec 2024 13:41:15 -0800
Subject: [PATCH 06/34] openbsd.mtree: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/mtree/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mtree/package.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mtree/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mtree/package.nix
new file mode 100644
index 000000000000..733518920c6e
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mtree/package.nix
@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "usr.sbin/mtree";
+}

From 669fa6145cc44f440c510ef39f56286aecff2d9a Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Dec 2024 21:33:48 +0000
Subject: [PATCH 07/34] openbsd.login: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/login.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/login.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/login.nix b/pkgs/os-specific/bsd/openbsd/pkgs/login.nix
new file mode 100644
index 000000000000..a1d941d2a66a
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/login.nix
@@ -0,0 +1,10 @@
+{
+  mkDerivation,
+  libutil,
+}:
+mkDerivation {
+  path = "usr.bin/login";
+  buildInputs = [
+    libutil
+  ];
+}

From ba828700e58af49345a799f57a4e7fa995d7359e Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Dec 2024 21:47:34 +0000
Subject: [PATCH 08/34] openbsd.getty: Fix paths

---
 pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
index baa50c998235..f646740c7fc4 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
@@ -1,6 +1,13 @@
 {
   mkDerivation,
+  login,
 }:
 mkDerivation {
   path = "libexec/getty";
+
+  postPatch = ''
+    substituteInPlace $BSDSRCDIR/libexec/getty/pathnames.h \
+        --replace-fail "/usr/libexec/getty" "$out/bin/getty" \
+        --replace-fail "/usr/bin/login" "${login}/bin/login"
+  '';
 }

From 07084bf46e2f5cf98cbdc43d5c36c28fd09a034a Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Dec 2024 21:58:42 +0000
Subject: [PATCH 09/34] openbsd.getty: copy out gettytab

---
 .../bsd/openbsd/pkgs/{getty/package.nix => getty.nix}       | 6 ++++++
 1 file changed, 6 insertions(+)
 rename pkgs/os-specific/bsd/openbsd/pkgs/{getty/package.nix => getty.nix} (68%)

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/getty.nix
similarity index 68%
rename from pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
rename to pkgs/os-specific/bsd/openbsd/pkgs/getty.nix
index f646740c7fc4..b93acd016721 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/getty/package.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/getty.nix
@@ -4,10 +4,16 @@
 }:
 mkDerivation {
   path = "libexec/getty";
+  extraPaths = [ "etc/gettytab" ];
 
   postPatch = ''
     substituteInPlace $BSDSRCDIR/libexec/getty/pathnames.h \
         --replace-fail "/usr/libexec/getty" "$out/bin/getty" \
         --replace-fail "/usr/bin/login" "${login}/bin/login"
   '';
+
+  postInstall = ''
+    mkdir -p $out/etc
+    cp $BSDSRCDIR/etc/gettytab $out/etc/gettytab
+  '';
 }

From 5aa4ceff8c8673b14a8c48f1701e8e00f53c77f5 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sun, 22 Dec 2024 14:12:52 -0800
Subject: [PATCH 10/34] openbsd.sysctl: set mainProgram

---
 pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix
index a394b21ccc85..b351a477f35b 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sysctl/package.nix
@@ -4,4 +4,5 @@
 mkDerivation {
   path = "sbin/sysctl";
   patches = [ ./no-perms.patch ];
+  meta.mainProgram = "sysctl";
 }

From 1bb583af619cb39d9eef665bc1de3a0367ddfa10 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Dec 2024 22:38:35 +0000
Subject: [PATCH 11/34] openbsd.cap_mkdb: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix b/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix
new file mode 100644
index 000000000000..34b818af1d7d
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/cap_mkdb";
+}

From 5b2e940a00115bb6ad19b895535a482ca873a9cd Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 22 Dec 2024 23:56:39 +0000
Subject: [PATCH 12/34] openbsd.{cap_mkdb,getty,login}: set meta.mainProgram

---
 pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix | 1 +
 pkgs/os-specific/bsd/openbsd/pkgs/getty.nix    | 2 ++
 pkgs/os-specific/bsd/openbsd/pkgs/login.nix    | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix b/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix
index 34b818af1d7d..9fc457d1645a 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix
@@ -1,4 +1,5 @@
 { mkDerivation }:
 mkDerivation {
   path = "usr.bin/cap_mkdb";
+  meta.mainProgram = "cap_mkdb";
 }
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/getty.nix b/pkgs/os-specific/bsd/openbsd/pkgs/getty.nix
index b93acd016721..d01aad009558 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/getty.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/getty.nix
@@ -16,4 +16,6 @@ mkDerivation {
     mkdir -p $out/etc
     cp $BSDSRCDIR/etc/gettytab $out/etc/gettytab
   '';
+
+  meta.mainProgram = "getty";
 }
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/login.nix b/pkgs/os-specific/bsd/openbsd/pkgs/login.nix
index a1d941d2a66a..79204735387b 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/login.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/login.nix
@@ -7,4 +7,6 @@ mkDerivation {
   buildInputs = [
     libutil
   ];
+
+  meta.mainProgram = "login";
 }

From 5c8d4f083908736c6172c542b4f3e5f18b7f4d96 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Mon, 23 Dec 2024 01:41:21 +0000
Subject: [PATCH 13/34] openbsd.login_passwd: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/login_passwd.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/login_passwd.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/login_passwd.nix b/pkgs/os-specific/bsd/openbsd/pkgs/login_passwd.nix
new file mode 100644
index 000000000000..20a37e33a4ab
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/login_passwd.nix
@@ -0,0 +1,10 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "libexec/login_passwd";
+
+  postPatch = ''
+    sed -i 's/4555/0555/' $BSDSRCDIR/libexec/login_passwd/Makefile
+  '';
+}

From 8e0774954d1bc7efe0bb91facaaa757313b5910b Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sun, 22 Dec 2024 18:28:10 -0800
Subject: [PATCH 14/34] openbsd.pfctl: init

---
 .../bsd/openbsd/pkgs/pfctl/package.nix           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/pfctl/package.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/pfctl/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/pfctl/package.nix
new file mode 100644
index 000000000000..3754218f80be
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/pfctl/package.nix
@@ -0,0 +1,16 @@
+{
+  mkDerivation,
+  byacc,
+}:
+mkDerivation {
+  path = "sbin/pfctl";
+  extraPaths = [
+    "sys/net"
+  ];
+
+  extraNativeBuildInputs = [
+    byacc
+  ];
+
+  meta.mainProgram = "pfctl";
+}

From 36289258dd83c9eefc0137602844cdb54355a450 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 2 Jan 2025 00:41:48 +0000
Subject: [PATCH 15/34] openbsd.ifconfig: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/ifconfig.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ifconfig.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ifconfig.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ifconfig.nix
new file mode 100644
index 000000000000..b47c28b9c165
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ifconfig.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "sbin/ifconfig";
+}

From 7a2b09814e44c9438b8b6b75bd7d673d2b1d8719 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 2 Jan 2025 00:45:17 +0000
Subject: [PATCH 16/34] openbsd.swapctl: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/swapctl.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/swapctl.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/swapctl.nix b/pkgs/os-specific/bsd/openbsd/pkgs/swapctl.nix
new file mode 100644
index 000000000000..7474c9bf1780
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/swapctl.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "sbin/swapctl";
+}

From 529dea124a2b5141270ba60048463f5978cea992 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 2 Jan 2025 01:03:31 +0000
Subject: [PATCH 17/34] openbsd.sed: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/sed.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sed.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sed.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sed.nix
new file mode 100644
index 000000000000..e26700688fad
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sed.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/sed";
+}

From 2ad0fca9cdfa06fe717039e28f8c18b1a3124975 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 2 Jan 2025 01:03:43 +0000
Subject: [PATCH 18/34] openbsd.cmp: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/cmp.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/cmp.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/cmp.nix b/pkgs/os-specific/bsd/openbsd/pkgs/cmp.nix
new file mode 100644
index 000000000000..7664d9e2e6c9
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/cmp.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/cmp";
+}

From 76c3f74ea6c1e7017cd7e52dae02712ee007282c Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 2 Jan 2025 01:46:24 +0000
Subject: [PATCH 19/34] openbsd.dev_mkdb: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/dev_mkdb.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/dev_mkdb.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dev_mkdb.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dev_mkdb.nix
new file mode 100644
index 000000000000..ac400e511106
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/dev_mkdb.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/dev_mkdb";
+}

From 069d41d9719f3f6f0e92b6d4ed8633df35c0bcbf Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 2 Jan 2025 01:46:35 +0000
Subject: [PATCH 20/34] openbsd.kvm_mkdb: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/kvm_mkdb.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/kvm_mkdb.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/kvm_mkdb.nix b/pkgs/os-specific/bsd/openbsd/pkgs/kvm_mkdb.nix
new file mode 100644
index 000000000000..c8c279f1f6a9
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/kvm_mkdb.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/kvm_mkdb";
+}

From c08ca11683f983246f13cf3aa913483e9d1185dd Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sun, 22 Dec 2024 18:27:56 -0800
Subject: [PATCH 21/34] openbsd.ttyflags: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/ttyflags/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ttyflags/package.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ttyflags/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ttyflags/package.nix
new file mode 100644
index 000000000000..da0099b6bceb
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ttyflags/package.nix
@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "sbin/ttyflags";
+}

From 8607e0063b1540a9045b019d6ad1c8eac2783da0 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Thu, 2 Jan 2025 12:50:42 -0800
Subject: [PATCH 22/34] openbsd.libexecinfo: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/libc.nix    |  2 ++
 .../bsd/openbsd/pkgs/libexecinfo.nix          | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/libexecinfo.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix
index db49e28ec7e3..7bb0516729d0 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix
@@ -7,6 +7,7 @@
   libm,
   librpcsvc,
   libutil,
+  libexecinfo,
   rtld,
   version,
 }:
@@ -36,6 +37,7 @@ symlinkJoin rec {
           librthread
           librpcsvc
           libutil
+          libexecinfo
         ]
         ++ (lib.optional (!stdenvNoLibc.hostPlatform.isStatic) rtld)
       );
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libexecinfo.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libexecinfo.nix
new file mode 100644
index 000000000000..245615cc8d87
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/libexecinfo.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  mkDerivation,
+}:
+
+mkDerivation {
+  path = "gnu/lib/libexecinfo";
+  extraPaths = [
+    "gnu/llvm/libunwind"
+    "gnu/llvm/libcxx"
+    "gnu/lib/libcxx"
+  ];
+
+  libcMinimal = true;
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  meta.platforms = lib.platforms.openbsd;
+}

From e54ba62f327bf2855697eca9ec5e4b098a7c4db9 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jan 2025 03:31:00 +0000
Subject: [PATCH 23/34] openbsd.route: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/route.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/route.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/route.nix b/pkgs/os-specific/bsd/openbsd/pkgs/route.nix
new file mode 100644
index 000000000000..dcf6b66c50e1
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/route.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "sbin/route";
+}

From 4042d960c3ff318809ff91e5afb50a0e5ab99a0e Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jan 2025 04:36:51 +0000
Subject: [PATCH 24/34] openbsd.{dhcpleasectl,dhcpleased}: init

---
 .../os-specific/bsd/openbsd/pkgs/dhcpleasectl.nix |  7 +++++++
 pkgs/os-specific/bsd/openbsd/pkgs/dhcpleased.nix  | 15 +++++++++++++++
 pkgs/os-specific/bsd/openbsd/pkgs/libevent.nix    |  7 +++++++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/dhcpleasectl.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/dhcpleased.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/libevent.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dhcpleasectl.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dhcpleasectl.nix
new file mode 100644
index 000000000000..dff762ab7580
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/dhcpleasectl.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/dhcpleasectl";
+
+  extraPaths = [ "sbin/dhcpleased" ];
+
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dhcpleased.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dhcpleased.nix
new file mode 100644
index 000000000000..5431e89c6c2a
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/dhcpleased.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation,
+  libevent,
+  byacc,
+}:
+mkDerivation {
+  path = "sbin/dhcpleased";
+
+  postPatch = ''
+    sed -i 's/DPADD/#DPADD/' $BSDSRCDIR/sbin/dhcpleased/Makefile
+  '';
+
+  buildInputs = [ libevent ];
+  extraNativeBuildInputs = [ byacc ];
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libevent.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libevent.nix
new file mode 100644
index 000000000000..9c98075f529c
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/libevent.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "lib/libevent";
+  preInstall = ''
+    mkdir -p $out/include
+  '';
+}

From 49f416fc6355221fd9de0777e8eb7b4b7c17a546 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jan 2025 04:39:28 +0000
Subject: [PATCH 25/34] openbsd.slaac{d,ctl}: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/slaacctl.nix |  7 +++++++
 pkgs/os-specific/bsd/openbsd/pkgs/slaacd.nix   | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/slaacctl.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/slaacd.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/slaacctl.nix b/pkgs/os-specific/bsd/openbsd/pkgs/slaacctl.nix
new file mode 100644
index 000000000000..89f7d8c3328d
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/slaacctl.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/slaacctl";
+
+  extraPaths = [ "sbin/slaacd" ];
+
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/slaacd.nix b/pkgs/os-specific/bsd/openbsd/pkgs/slaacd.nix
new file mode 100644
index 000000000000..aa74b40de9e2
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/slaacd.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation,
+  libevent,
+  byacc,
+}:
+mkDerivation {
+  path = "sbin/slaacd";
+
+  postPatch = ''
+    sed -i 's/DPADD/#DPADD/' $BSDSRCDIR/sbin/slaacd/Makefile
+  '';
+
+  buildInputs = [ libevent ];
+  extraNativeBuildInputs = [ byacc ];
+}

From 2e1652a44cbc5d864f90acd2d673b0e28ba9a184 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Thu, 2 Jan 2025 23:22:39 -0800
Subject: [PATCH 26/34] openbsd.{id,libkvm,pkill,su}: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/id.nix     |  6 ++++++
 pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix |  6 ++++++
 pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix  | 15 +++++++++++++++
 pkgs/os-specific/bsd/openbsd/pkgs/su.nix     | 12 ++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/id.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/su.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/id.nix b/pkgs/os-specific/bsd/openbsd/pkgs/id.nix
new file mode 100644
index 000000000000..97addccf8329
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/id.nix
@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "usr.bin/id";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix
new file mode 100644
index 000000000000..3fe8a1b2fdd2
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix
@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "lib/libkvm";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix b/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix
new file mode 100644
index 000000000000..b217de6a7b00
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/pkill.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation,
+  libkvm,
+}:
+mkDerivation {
+  path = "usr.bin/pkill";
+
+  buildInputs = [
+    libkvm
+  ];
+
+  postPatch = ''
+    sed -i /DPADD/d $BSDSRCDIR/usr.bin/pkill/Makefile
+  '';
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/su.nix b/pkgs/os-specific/bsd/openbsd/pkgs/su.nix
new file mode 100644
index 000000000000..d25db35d3e51
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/su.nix
@@ -0,0 +1,12 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "usr.bin/su";
+
+  postPatch = ''
+    sed -i /BINMODE/d $BSDSRCDIR/usr.bin/su/Makefile
+  '';
+
+  meta.mainProgram = "su";
+}

From 195f62db64f61805bf00bb8ac54a51de8c94d992 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jan 2025 19:48:11 +0000
Subject: [PATCH 27/34] openbsd.dmesg: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix
new file mode 100644
index 000000000000..d4f9430c8b31
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/dmesg.nix
@@ -0,0 +1,10 @@
+{ mkDerivation, libkvm }:
+mkDerivation {
+  path = "sbin/dmesg";
+
+  buildInputs = [ libkvm ];
+
+  postPatch = ''
+    sed -i /DPADD/d $BSDSRCDIR/sbin/dmesg/Makefile
+  '';
+}

From 7e447e6b5f2a3978a0c0c3a8752e86a239e18d7f Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jan 2025 20:23:22 +0000
Subject: [PATCH 28/34] openbsd: Add most packages from src/bin

---
 pkgs/os-specific/bsd/openbsd/pkgs/cat.nix     |  4 ++++
 .../bsd/openbsd/pkgs/chmod/no-sbin.patch      | 24 +++++++++++++++++++
 .../bsd/openbsd/pkgs/chmod/package.nix        |  6 +++++
 pkgs/os-specific/bsd/openbsd/pkgs/cp.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/date.nix    |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/dd.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/df.nix      |  4 ++++
 .../bsd/openbsd/pkgs/domainname.nix           |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/echo.nix    |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/ed.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/expr.nix    |  4 ++++
 .../os-specific/bsd/openbsd/pkgs/hostname.nix |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/kill.nix    |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/ln.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/ls.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/md5.nix     |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/mkdir.nix   |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/mt.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/mv.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/ps.nix      |  9 +++++++
 pkgs/os-specific/bsd/openbsd/pkgs/pwd.nix     |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/rm.nix      |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/rmdir.nix   |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/sleep.nix   |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/stty.nix    |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/sync.nix    |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/test.nix    |  4 ++++
 27 files changed, 135 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/cat.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/chmod/no-sbin.patch
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/chmod/package.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/cp.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/date.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/dd.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/df.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/domainname.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/echo.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ed.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/expr.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/hostname.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/kill.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ln.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ls.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/md5.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mkdir.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mt.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mv.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ps.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/pwd.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/rm.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/rmdir.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sleep.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/stty.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sync.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/test.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/cat.nix b/pkgs/os-specific/bsd/openbsd/pkgs/cat.nix
new file mode 100644
index 000000000000..da33a76ebcbd
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/cat.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/cat";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/chmod/no-sbin.patch b/pkgs/os-specific/bsd/openbsd/pkgs/chmod/no-sbin.patch
new file mode 100644
index 000000000000..df982c99d80e
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/chmod/no-sbin.patch
@@ -0,0 +1,24 @@
+diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
+index 82854bae3a3..39813dc8882 100644
+--- a/bin/chmod/Makefile
++++ b/bin/chmod/Makefile
+@@ -3,17 +3,8 @@
+ PROG=	chmod
+ MAN=	chmod.1 chgrp.1 chown.8 chflags.1
+ LINKS=	${BINDIR}/chmod ${BINDIR}/chgrp \
+-	${BINDIR}/chmod /sbin/chown
+-
+-# XXX compatibility
+-afterinstall:
+-	(cd ${DESTDIR}/usr/sbin && \
+-	    ln -sf ../../sbin/chown . && \
+-	    ln -sf ../../bin/chgrp . && \
+-	    chown -h ${BINOWN}:${BINGRP} chown chgrp)
+-	(cd ${DESTDIR}/usr/bin && \
+-	    ln -sf ../../bin/chmod chflags && \
+-	    chown -h ${BINOWN}:${BINGRP} chflags)
++	${BINDIR}/chmod ${BINDIR}/chown \
++	${BINDIR}/chmod ${BINDIR}/chflags
+ 
+ 
+ .include <bsd.prog.mk>
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/chmod/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/chmod/package.nix
new file mode 100644
index 000000000000..79a75ecc1d94
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/chmod/package.nix
@@ -0,0 +1,6 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/chmod";
+
+  patches = [ ./no-sbin.patch ];
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/cp.nix b/pkgs/os-specific/bsd/openbsd/pkgs/cp.nix
new file mode 100644
index 000000000000..97bea47f2159
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/cp.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/cp";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/date.nix b/pkgs/os-specific/bsd/openbsd/pkgs/date.nix
new file mode 100644
index 000000000000..a72871eaa2c5
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/date.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/date";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/dd.nix b/pkgs/os-specific/bsd/openbsd/pkgs/dd.nix
new file mode 100644
index 000000000000..48c26288a7f0
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/dd.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/dd";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/df.nix b/pkgs/os-specific/bsd/openbsd/pkgs/df.nix
new file mode 100644
index 000000000000..5563e13408b1
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/df.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/df";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/domainname.nix b/pkgs/os-specific/bsd/openbsd/pkgs/domainname.nix
new file mode 100644
index 000000000000..e486133050e5
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/domainname.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/domainname";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/echo.nix b/pkgs/os-specific/bsd/openbsd/pkgs/echo.nix
new file mode 100644
index 000000000000..438a7b552db3
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/echo.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/echo";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ed.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ed.nix
new file mode 100644
index 000000000000..d897b5f8f122
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ed.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/ed";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/expr.nix b/pkgs/os-specific/bsd/openbsd/pkgs/expr.nix
new file mode 100644
index 000000000000..e79efb0da57e
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/expr.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/expr";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/hostname.nix b/pkgs/os-specific/bsd/openbsd/pkgs/hostname.nix
new file mode 100644
index 000000000000..d6433e4fc600
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/hostname.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/hostname";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/kill.nix b/pkgs/os-specific/bsd/openbsd/pkgs/kill.nix
new file mode 100644
index 000000000000..62fe71e879e9
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/kill.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/kill";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ln.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ln.nix
new file mode 100644
index 000000000000..e4479146da63
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ln.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/ln";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ls.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ls.nix
new file mode 100644
index 000000000000..814064ceaddf
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ls.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/ls";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/md5.nix b/pkgs/os-specific/bsd/openbsd/pkgs/md5.nix
new file mode 100644
index 000000000000..784f150c2622
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/md5.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/md5";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkdir.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkdir.nix
new file mode 100644
index 000000000000..3f17118a3d81
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkdir.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/mkdir";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mt.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mt.nix
new file mode 100644
index 000000000000..e9be285a4636
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mt.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/mt";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mv.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mv.nix
new file mode 100644
index 000000000000..ffdce887d6e5
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mv.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/mv";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix
new file mode 100644
index 000000000000..402d86b723eb
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ps.nix
@@ -0,0 +1,9 @@
+{ mkDerivation, libkvm }:
+mkDerivation {
+  path = "bin/ps";
+
+  buildInputs = [ libkvm ];
+  postPatch = ''
+    sed -i /DPADD/d $BSDSRCDIR/bin/ps/Makefile
+  '';
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/pwd.nix b/pkgs/os-specific/bsd/openbsd/pkgs/pwd.nix
new file mode 100644
index 000000000000..aeafbb9b2f2b
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/pwd.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/pwd";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/rm.nix b/pkgs/os-specific/bsd/openbsd/pkgs/rm.nix
new file mode 100644
index 000000000000..f96d361368d4
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/rm.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/rm";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/rmdir.nix b/pkgs/os-specific/bsd/openbsd/pkgs/rmdir.nix
new file mode 100644
index 000000000000..c716c585a579
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/rmdir.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/rmdir";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sleep.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sleep.nix
new file mode 100644
index 000000000000..fcfc313e15a4
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sleep.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/sleep";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/stty.nix b/pkgs/os-specific/bsd/openbsd/pkgs/stty.nix
new file mode 100644
index 000000000000..79d5132043a7
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/stty.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/stty";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sync.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sync.nix
new file mode 100644
index 000000000000..20ce42be239d
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/sync.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/sync";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/test.nix b/pkgs/os-specific/bsd/openbsd/pkgs/test.nix
new file mode 100644
index 000000000000..d8d7baae1ad2
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/test.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/test";
+}

From 5586cef733aa27a3d390b2a73f4f58fbd3ca7e7b Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 3 Jan 2025 20:44:07 +0000
Subject: [PATCH 29/34] openbsd.{newsyslog,syslogd}: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/newsyslog.nix |  4 ++++
 pkgs/os-specific/bsd/openbsd/pkgs/syslogd.nix   | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/newsyslog.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/syslogd.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/newsyslog.nix b/pkgs/os-specific/bsd/openbsd/pkgs/newsyslog.nix
new file mode 100644
index 000000000000..177170edb8f8
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/newsyslog.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/newsyslog";
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/syslogd.nix b/pkgs/os-specific/bsd/openbsd/pkgs/syslogd.nix
new file mode 100644
index 000000000000..340b08adba33
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/syslogd.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation,
+  libressl,
+  libevent,
+}:
+mkDerivation {
+  path = "usr.sbin/syslogd";
+
+  buildInputs = [
+    libressl
+    libevent
+  ];
+
+  postPatch = ''
+    sed -i /DPADD/d $BSDSRCDIR/usr.sbin/syslogd/Makefile
+  '';
+}

From f91116ab40adc6827d058308a5cecc74d928d8c8 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 4 Jan 2025 00:48:59 +0000
Subject: [PATCH 30/34] openbsd.top: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/libcurses.nix | 13 +++++++++++++
 pkgs/os-specific/bsd/openbsd/pkgs/top.nix       |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/libcurses.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/top.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libcurses.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libcurses.nix
new file mode 100644
index 000000000000..11185d75261a
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/libcurses.nix
@@ -0,0 +1,13 @@
+{
+  lib,
+  mkDerivation,
+  buildPackages,
+}:
+mkDerivation {
+  path = "lib/libcurses";
+
+  makeFlags = [
+    "AWK=${lib.getBin buildPackages.gawk}/bin/awk"
+    "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+  ];
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/top.nix b/pkgs/os-specific/bsd/openbsd/pkgs/top.nix
new file mode 100644
index 000000000000..3cd374fd6161
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/top.nix
@@ -0,0 +1,6 @@
+{ mkDerivation, libcurses }:
+mkDerivation {
+  path = "usr.bin/top";
+
+  buildInputs = [ libcurses ];
+}

From 0b2aafdd112258d437532aed25089c0257d6e8a0 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 4 Jan 2025 01:08:45 +0000
Subject: [PATCH 31/34] unixtools: Add some values for OpenBSD

---
 pkgs/top-level/unixtools.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index ad308da838b7..32ca64052369 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -111,11 +111,13 @@ let
       linux = pkgs.nettools;
       darwin = pkgs.darwin.shell_cmds;
       freebsd = pkgs.freebsd.bin;
+      openbsd = pkgs.openbsd.hostname;
     };
     ifconfig = {
       linux = pkgs.nettools;
       darwin = pkgs.darwin.network_cmds;
       freebsd = pkgs.freebsd.ifconfig;
+      openbsd = pkgs.openbsd.ifconfig;
     };
     killall = {
       linux = pkgs.psmisc;
@@ -142,6 +144,7 @@ let
       linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
       freebsd = freebsd.mount;
+      openbsd = pkgs.openbsd.mount;
       # technically just targeting the darwin version; binlore already
       # ids the util-linux copy as 'cannot'
       # no obvious exec in manpage args; I think binlore flags 'can'
@@ -164,6 +167,7 @@ let
       linux = pkgs.procps;
       darwin = pkgs.darwin.ps;
       freebsd = pkgs.freebsd.bin;
+      openbsd = pkgs.openbsd.ps;
       # technically just targeting procps ps (which ids as can)
       # but I don't see obvious exec in args; have yet to look
       # for underlying cause in source
@@ -179,6 +183,7 @@ let
       linux = pkgs.nettools;
       darwin = pkgs.darwin.network_cmds;
       freebsd = pkgs.freebsd.route;
+      openbsd = pkgs.openbsd.route;
     };
     script = {
       linux = pkgs.util-linux;
@@ -188,11 +193,13 @@ let
       linux = pkgs.procps;
       darwin = pkgs.darwin.system_cmds;
       freebsd = pkgs.freebsd.sysctl;
+      openbsd = pkgs.openbsd.sysctl;
     };
     top = {
       linux = pkgs.procps;
       darwin = pkgs.darwin.top;
       freebsd = pkgs.freebsd.top;
+      openbsd = pkgs.openbsd.top;
       # technically just targeting procps top; haven't needed this in
       # any scripts so far, but overriding it for consistency with ps
       # override above and in procps. (procps also overrides 'free',
@@ -219,6 +226,7 @@ let
       # Darwin/FreeBSD. Unfortunately no other implementations exist currently!
       darwin = pkgs.callPackage ../os-specific/linux/procps-ng {};
       freebsd = pkgs.callPackage ../os-specific/linux/procps-ng {};
+      openbsd = pkgs.callPackage ../os-specific/linux/procps-ng {};
     };
     write = {
       linux = pkgs.util-linux;

From a62ed0e93d038057c2f865f411321a535a64d98a Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 4 Jan 2025 02:41:58 +0000
Subject: [PATCH 32/34] openbsd.vmstat: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix b/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix
new file mode 100644
index 000000000000..bc654ad650e6
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/vmstat.nix
@@ -0,0 +1,9 @@
+{ mkDerivation, libkvm }:
+mkDerivation {
+  path = "usr.bin/vmstat";
+
+  buildInputs = [ libkvm ];
+  postPatch = ''
+    sed -i /DPADD/d $BSDSRCDIR/usr.bin/vmstat/Makefile
+  '';
+}

From bffd9c03d1b45551572b9438712ecfe6d68dc5a1 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 4 Jan 2025 03:08:27 +0000
Subject: [PATCH 33/34] openbsd.{ktrace,kdump}: init

---
 pkgs/os-specific/bsd/openbsd/pkgs/kdump.nix  | 8 ++++++++
 pkgs/os-specific/bsd/openbsd/pkgs/ktrace.nix | 4 ++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/kdump.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/ktrace.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/kdump.nix b/pkgs/os-specific/bsd/openbsd/pkgs/kdump.nix
new file mode 100644
index 000000000000..6248db492ceb
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/kdump.nix
@@ -0,0 +1,8 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/kdump";
+  extraPaths = [
+    "sys"
+    "usr.bin/ktrace"
+  ];
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/ktrace.nix b/pkgs/os-specific/bsd/openbsd/pkgs/ktrace.nix
new file mode 100644
index 000000000000..88258006e262
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/ktrace.nix
@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/ktrace";
+}

From dd9e65d1b90714480ce69ad8a4994fe981842f5c Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 22 Nov 2024 16:11:32 -0700
Subject: [PATCH 34/34] openbsd.mount: init

---
 .../bsd/openbsd/pkgs/mount/package.nix        |  9 +++++
 .../bsd/openbsd/pkgs/mount/search-path.patch  | 39 +++++++++++++++++++
 .../bsd/openbsd/pkgs/mount_ffs/package.nix    |  8 ++++
 .../bsd/openbsd/pkgs/mount_tmpfs/package.nix  |  8 ++++
 4 files changed, 64 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mount/package.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mount/search-path.patch
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mount_ffs/package.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/mount_tmpfs/package.nix

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mount/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mount/package.nix
new file mode 100644
index 000000000000..1fd2d02bf899
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mount/package.nix
@@ -0,0 +1,9 @@
+{
+  mkDerivation,
+}:
+
+mkDerivation {
+  path = "sbin/mount";
+  meta.mainProgram = "mount";
+  patches = [ ./search-path.patch ];
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mount/search-path.patch b/pkgs/os-specific/bsd/openbsd/pkgs/mount/search-path.patch
new file mode 100644
index 000000000000..f764ef3f67c5
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mount/search-path.patch
@@ -0,0 +1,39 @@
+diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
+index eaff190b572..4bce21559f6 100644
+--- a/sbin/mount/mount.c
++++ b/sbin/mount/mount.c
+@@ -338,12 +338,6 @@ mountfs(const char *vfstype, const char *spec, const char *name,
+ {
+ 	char *cp;
+ 
+-	/* List of directories containing mount_xxx subcommands. */
+-	static const char *edirs[] = {
+-		_PATH_SBIN,
+-		_PATH_USRSBIN,
+-		NULL
+-	};
+ 	const char **argv, **edir;
+ 	struct statfs sf;
+ 	pid_t pid;
+@@ -427,15 +421,12 @@ mountfs(const char *vfstype, const char *spec, const char *name,
+ 		return (1);
+ 	case 0:					/* Child. */
+ 		/* Go find an executable. */
+-		edir = edirs;
+-		do {
+-			(void)snprintf(execname,
+-			    sizeof(execname), "%s/mount_%s", *edir, vfstype);
+-			argv[0] = execname;
+-			execv(execname, (char * const *)argv);
+-			if (errno != ENOENT)
+-				warn("exec %s for %s", execname, name);
+-		} while (*++edir != NULL);
++		(void)snprintf(execname,
++		    sizeof(execname), "mount_%s", vfstype);
++		argv[0] = execname;
++		execvp(execname, (char * const *)argv);
++		if (errno != ENOENT)
++			warn("exec %s for %s", execname, name);
+ 
+ 		if (errno == ENOENT)
+ 			warn("no mount helper program found for %s", vfstype);
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mount_ffs/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mount_ffs/package.nix
new file mode 100644
index 000000000000..ca00207f3efd
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mount_ffs/package.nix
@@ -0,0 +1,8 @@
+{
+  mkDerivation,
+}:
+
+mkDerivation {
+  path = "sbin/mount_ffs";
+  extraPaths = [ "sbin/mount" ];
+}
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mount_tmpfs/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mount_tmpfs/package.nix
new file mode 100644
index 000000000000..641efd6df4ed
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mount_tmpfs/package.nix
@@ -0,0 +1,8 @@
+{
+  mkDerivation,
+}:
+
+mkDerivation {
+  path = "sbin/mount_tmpfs";
+  extraPaths = [ "sbin/mount" ];
+}