From 387e804c99d576911dcb0c9a02ad0eeb6cb7966d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jul 2025 06:51:50 +0200 Subject: [PATCH 1/6] hostname-debian: set main program --- pkgs/by-name/ho/hostname-debian/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ho/hostname-debian/package.nix b/pkgs/by-name/ho/hostname-debian/package.nix index ca2c7866ef4b..143a25339731 100644 --- a/pkgs/by-name/ho/hostname-debian/package.nix +++ b/pkgs/by-name/ho/hostname-debian/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://tracker.debian.org/pkg/hostname"; license = licenses.gpl2Plus; + mainProgram = "hostname"; maintainers = with maintainers; [ posch ]; platforms = platforms.gnu; }; From c21be3563ed335e85ed205183c181abfb32aa37c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jul 2025 06:53:11 +0200 Subject: [PATCH 2/6] nixos/ec2-data: use hostname-debian to set hostname from metadata This is the simpler, more lightweight and better maintained version of the hostname utility. --- nixos/modules/virtualisation/ec2-data.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 84508da0c5a0..63fc61f12a78 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -34,7 +34,7 @@ with lib; ${optionalString (config.networking.hostName == "") '' echo "setting host name..." if [ -s /etc/ec2-metadata/hostname ]; then - ${pkgs.nettools}/bin/hostname $(cat /etc/ec2-metadata/hostname) + ${lib.getExe hostname-debian} -F /etc/ec2-metadata/hostname fi ''} From 87a13967025fb6a7f75eec638e97323c9e30531f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jul 2025 06:57:54 +0200 Subject: [PATCH 3/6] nixos/zfs: use hostname-debian for hostname lookups This is the simpler, more lightweight and better maintained version of the hostname utility. --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index f8e36eb1646c..b57b44414d21 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -832,7 +832,7 @@ in pkgs.gawk pkgs.gnugrep pkgs.gnused - pkgs.nettools + pkgs.hostname-debian pkgs.util-linux ]; }; From d4f6298831fc22279ac6da1c0bbf31395c361836 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Jul 2025 16:59:29 +0200 Subject: [PATCH 4/6] xdg-utils: use hostname-debian for hostname lookups This is the simpler, more lightweight and better maintained version of the hostname utility. --- pkgs/by-name/xd/xdg-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index 60ab18c0e4a7..d7b695e8c354 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/pkgs/by-name/xd/xdg-utils/package.nix @@ -21,8 +21,8 @@ glib, gnugrep, gnused, + hostname-debian, jq, - nettools, procps, which, xdg-user-dirs, @@ -166,7 +166,7 @@ let scripts = [ "bin/xdg-open" ]; interpreter = "${bash}/bin/bash"; inputs = commonDeps ++ [ - nettools + hostname-debian glib.bin "${placeholder "out"}/bin" ]; @@ -206,7 +206,7 @@ let scripts = [ "bin/xdg-screensaver" ]; interpreter = "${bash}/bin/bash"; inputs = commonDeps ++ [ - nettools + hostname-debian perl procps ]; From b840814fe5ab7c611a245e720c27329214652040 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Jul 2025 01:54:25 +0200 Subject: [PATCH 5/6] hostname-debian: 3.23 -> 3.25 https://salsa.debian.org/meskes/hostname/-/blob/debian/3.25/debian/changelog --- pkgs/by-name/ho/hostname-debian/package.nix | 25 ++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ho/hostname-debian/package.nix b/pkgs/by-name/ho/hostname-debian/package.nix index 143a25339731..631a7c7a98e7 100644 --- a/pkgs/by-name/ho/hostname-debian/package.nix +++ b/pkgs/by-name/ho/hostname-debian/package.nix @@ -1,27 +1,32 @@ { stdenv, lib, - fetchurl, + fetchFromGitLab, }: stdenv.mkDerivation rec { pname = "hostname-debian"; - version = "3.23"; + version = "3.25"; - src = fetchurl { - url = "https://deb.debian.org/debian/pool/main/h/hostname/hostname_${version}.tar.gz"; - sha256 = "sha256-vG0ZVLIoSYaf+LKmAuOfCLFwL2htS1jdeSfN61tIdu8="; + outputs = [ + "out" + "man" + ]; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "meskes"; + repo = "hostname"; + tag = "debian/${version}"; + hash = "sha256-Yq8P5bF/RRZnWuFW0y2u08oZrydAKfopOtbrwbeIu3w="; }; - postPatch = '' - substituteInPlace Makefile --replace 'install -o root -g root' 'install' - ''; makeFlags = [ - "BINDIR=$(out)/bin" - "MANDIR=$(out)/share/man" + "prefix=${placeholder "out"}" ]; meta = with lib; { + changelog = "https://salsa.debian.org/meskes/hostname/-/blob/${src.tag}/debian/changelog"; 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 From 5dc1fe7af35a1f6c6a149a15fef3cbe734ed4a73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Jul 2025 14:04:29 +0200 Subject: [PATCH 6/6] xdg-utils: drop kernelkisser.png mirror that redirects to archive.org This leads to a different hash, thereby breaking the test. --- pkgs/by-name/xd/xdg-utils/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index d7b695e8c354..0b26dfd1b128 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/pkgs/by-name/xd/xdg-utils/package.nix @@ -340,7 +340,6 @@ stdenv.mkDerivation (self: { preferLocalBuild = true; xenias = lib.mapAttrsToList (hash: urls: fetchurl { inherit hash urls; }) { "sha256-SL95tM1AjOi7vDnCyT10s0tvQvc+ZSZBbkNOYXfbOy0=" = [ - "https://staging.cohostcdn.org/attachment/0f5d9832-0cda-4d07-b35f-832b287feb6c/kernelkisser.png" "https://static1.e621.net/data/0e/76/0e7672980d48e48c2d1373eb2505db5a.png" ]; "sha256-Si9AtB7J9o6rK/oftv+saST77CNaeWomWU5ECfbRioM=" = [