openbsd: many new small packages (NixOS#371699)

pkgs/os-specific/bsd/openbsd/pkgs/cap_mkdb.nix

@@ -0,0 +1,5 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/cap_mkdb";
+  meta.mainProgram = "cap_mkdb";
+}

pkgs/os-specific/bsd/openbsd/pkgs/cat.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/cat";
+}

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>

pkgs/os-specific/bsd/openbsd/pkgs/chmod/package.nix

@@ -0,0 +1,6 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/chmod";
+
+  patches = [ ./no-sbin.patch ];
+}

pkgs/os-specific/bsd/openbsd/pkgs/cmp.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/cmp";
+}

pkgs/os-specific/bsd/openbsd/pkgs/cp.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/cp";
+}

pkgs/os-specific/bsd/openbsd/pkgs/date.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/date";
+}

pkgs/os-specific/bsd/openbsd/pkgs/dd.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/dd";
+}

pkgs/os-specific/bsd/openbsd/pkgs/dev_mkdb.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/dev_mkdb";
+}

pkgs/os-specific/bsd/openbsd/pkgs/df.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/df";
+}

pkgs/os-specific/bsd/openbsd/pkgs/dhcpleasectl.nix

@@ -0,0 +1,7 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/dhcpleasectl";
+
+  extraPaths = [ "sbin/dhcpleased" ];
+
+}

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 ];
+}

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
+  '';
+}

pkgs/os-specific/bsd/openbsd/pkgs/domainname.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/domainname";
+}

pkgs/os-specific/bsd/openbsd/pkgs/echo.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/echo";
+}

pkgs/os-specific/bsd/openbsd/pkgs/ed.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/ed";
+}

pkgs/os-specific/bsd/openbsd/pkgs/expr.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/expr";
+}

pkgs/os-specific/bsd/openbsd/pkgs/getent.nix

@@ -0,0 +1 @@
+{ mkDerivation }: mkDerivation { path = "usr.bin/getent"; }

pkgs/os-specific/bsd/openbsd/pkgs/getty.nix

@@ -0,0 +1,21 @@
+{
+  mkDerivation,
+  login,
+}:
+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
+  '';
+
+  meta.mainProgram = "getty";
+}

pkgs/os-specific/bsd/openbsd/pkgs/hostname.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/hostname";
+}

pkgs/os-specific/bsd/openbsd/pkgs/id.nix

@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "usr.bin/id";
+}

pkgs/os-specific/bsd/openbsd/pkgs/ifconfig.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "sbin/ifconfig";
+}

pkgs/os-specific/bsd/openbsd/pkgs/kdump.nix

@@ -0,0 +1,8 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/kdump";
+  extraPaths = [
+    "sys"
+    "usr.bin/ktrace"
+  ];
+}

pkgs/os-specific/bsd/openbsd/pkgs/kill.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/kill";
+}

pkgs/os-specific/bsd/openbsd/pkgs/ktrace.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/ktrace";
+}

pkgs/os-specific/bsd/openbsd/pkgs/kvm_mkdb.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.sbin/kvm_mkdb";
+}

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)
       );

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"
+  ];
+}

pkgs/os-specific/bsd/openbsd/pkgs/libevent.nix

@@ -0,0 +1,7 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "lib/libevent";
+  preInstall = ''
+    mkdir -p $out/include
+  '';
+}

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;
+}

pkgs/os-specific/bsd/openbsd/pkgs/libkvm.nix

@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "lib/libkvm";
+}

pkgs/os-specific/bsd/openbsd/pkgs/ln.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/ln";
+}

pkgs/os-specific/bsd/openbsd/pkgs/login.nix

@@ -0,0 +1,12 @@
+{
+  mkDerivation,
+  libutil,
+}:
+mkDerivation {
+  path = "usr.bin/login";
+  buildInputs = [
+    libutil
+  ];
+
+  meta.mainProgram = "login";
+}

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
+  '';
+}

pkgs/os-specific/bsd/openbsd/pkgs/ls.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/ls";
+}

pkgs/os-specific/bsd/openbsd/pkgs/md5.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/md5";
+}

pkgs/os-specific/bsd/openbsd/pkgs/mkdir.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/mkdir";
+}

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 ];
+}

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);

pkgs/os-specific/bsd/openbsd/pkgs/mount_ffs/package.nix

@@ -0,0 +1,8 @@
+{
+  mkDerivation,
+}:
+
+mkDerivation {
+  path = "sbin/mount_ffs";
+  extraPaths = [ "sbin/mount" ];
+}

pkgs/os-specific/bsd/openbsd/pkgs/mount_tmpfs/package.nix

@@ -0,0 +1,8 @@
+{
+  mkDerivation,
+}:
+
+mkDerivation {
+  path = "sbin/mount_tmpfs";
+  extraPaths = [ "sbin/mount" ];
+}

pkgs/os-specific/bsd/openbsd/pkgs/mt.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/mt";
+}

pkgs/os-specific/bsd/openbsd/pkgs/mtree/package.nix

@@ -0,0 +1,6 @@
+{
+  mkDerivation,
+}:
+mkDerivation {
+  path = "usr.sbin/mtree";
+}

pkgs/os-specific/bsd/openbsd/pkgs/mv.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "bin/mv";
+}

pkgs/os-specific/bsd/openbsd/pkgs/newsyslog.nix

@@ -0,0 +1,4 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "usr.bin/newsyslog";
+}