From 1f5af4a485de1cd28769372879a94f7e174fbfb3 Mon Sep 17 00:00:00 2001
From: Tobias Poschwatta <poschwatta@zib.de>
Date: Fri, 9 Sep 2022 16:42:58 +0200
Subject: [PATCH 1/2] maintainers: add posch

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 651341a6ede..2b6748409af 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10636,6 +10636,12 @@
       fingerprint = "48AD DE10 F27B AFB4 7BB0  CCAF 2D25 95A0 0D08 ACE0";
     }];
   };
+  posch = {
+    email = "tp@fonz.de";
+    github = "posch";
+    githubId = 146413;
+    name = "Tobias Poschwatta";
+  };
   ppenguin = {
     name = "Jeroen Versteeg";
     email = "hieronymusv@gmail.com";

From 9d8ebb0b58668620e759e575509d77e492024fde Mon Sep 17 00:00:00 2001
From: Tobias Poschwatta <poschwatta@zib.de>
Date: Thu, 8 Sep 2022 12:46:49 +0200
Subject: [PATCH 2/2] hostname-debian: init at 3.23

The Debian version of hostname is widely used on other distros.
It offers a few more options (-I, -A).
---
 .../networking/hostname-debian/default.nix    | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/networking/hostname-debian/default.nix

diff --git a/pkgs/tools/networking/hostname-debian/default.nix b/pkgs/tools/networking/hostname-debian/default.nix
new file mode 100644
index 00000000000..07135b35cc5
--- /dev/null
+++ b/pkgs/tools/networking/hostname-debian/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "hostname-debian";
+  version = "3.23";
+
+  src = fetchurl {
+    url = "https://deb.debian.org/debian/pool/main/h/hostname/hostname_${version}.tar.gz";
+    sha256 = "sha256-vG0ZVLIoSYaf+LKmAuOfCLFwL2htS1jdeSfN61tIdu8=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile --replace 'install -o root -g root' 'install'
+  '';
+  makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
+
+  meta = with lib; {
+    description = "Utility to set/show the host name or domain name";
+    longDescription = ''
+      This package provides commands which can be used to display the system's
+      DNS name, and to display or set its hostname or NIS domain name.
+    '';
+    homepage = "https://tracker.debian.org/pkg/hostname";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ posch ];
+    platforms = platforms.gnu;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6ff2f9b031..5e68f7c9006 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7464,6 +7464,8 @@ with pkgs;
 
   hostess = callPackage ../development/tools/hostess {};
 
+  hostname-debian = callPackage ../tools/networking/hostname-debian { };
+
   hotpatch = callPackage ../development/libraries/hotpatch { };
 
   hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };