From f13f6fb7226521132448fd1b68daadb46cee4292 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:05:44 +0200
Subject: [PATCH 1/4] dnf5: use util-linux instead of libsmartcols

---
 pkgs/by-name/dn/dnf5/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix
index a46b70cc0794..4666e1106a13 100644
--- a/pkgs/by-name/dn/dnf5/package.nix
+++ b/pkgs/by-name/dn/dnf5/package.nix
@@ -15,7 +15,7 @@
   json_c,
   libmodulemd,
   librepo,
-  libsmartcols,
+  util-linux,
   libsolv,
   libxml2,
   libyaml,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     json_c
     libmodulemd
     librepo
-    libsmartcols
+    util-linux
     libsolv
     libxml2
     libyaml

From dbb2c294eecf29f842b6d5d64fb063d6588e72d4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:18:14 +0200
Subject: [PATCH 2/4] libdnf: use util-linux instead of libsmartcols

---
 pkgs/by-name/li/libdnf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix
index 37a904e477af..300593dbc6f6 100644
--- a/pkgs/by-name/li/libdnf/package.nix
+++ b/pkgs/by-name/li/libdnf/package.nix
@@ -10,7 +10,7 @@
   check,
   json_c,
   libmodulemd,
-  libsmartcols,
+  util-linux,
   sqlite,
   librepo,
   libyaml,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     cppunit
     openssl
     json_c
-    libsmartcols
+    util-linux
     libyaml
     libmodulemd
     zchunk

From f79c7f1f5783474df1248d296ba79b7087089852 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:19:45 +0200
Subject: [PATCH 3/4] microdnf: use util-linux instead of libsmartcols

---
 pkgs/by-name/mi/microdnf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix
index db9d8910f39f..989eeeed5cbf 100644
--- a/pkgs/by-name/mi/microdnf/package.nix
+++ b/pkgs/by-name/mi/microdnf/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   glib,
   libpeas,
-  libsmartcols,
+  util-linux,
   help2man,
   zchunk,
   pcre2,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libdnf
     glib
     libpeas
-    libsmartcols
+    util-linux
     zchunk
     pcre2.dev
   ];

From 2e5056421265a5ff704fabb7fe7747bfd50b23d4 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Wed, 3 Sep 2025 22:24:24 +0200
Subject: [PATCH 4/4] libsmartcols: drop in favor of util-linux

The libsmartcols package can be replaced by the util-linux
package which is properly kept updated.
---
 pkgs/by-name/li/libsmartcols/package.nix | 50 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/li/libsmartcols/package.nix

diff --git a/pkgs/by-name/li/libsmartcols/package.nix b/pkgs/by-name/li/libsmartcols/package.nix
deleted file mode 100644
index 942b92df5b8b..000000000000
--- a/pkgs/by-name/li/libsmartcols/package.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  pkg-config,
-  python3,
-  gtk-doc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libsmartcols";
-  version = "2.39.3";
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    python3
-    gtk-doc
-  ];
-
-  src = fetchFromGitHub {
-    owner = "karelzak";
-    repo = "util-linux";
-    rev = "v${version}";
-    sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI=";
-  };
-
-  configureFlags = [
-    "--disable-all-programs"
-    "--enable-libsmartcols"
-  ];
-
-  buildPhase = ''
-    make libsmartcols.la
-  '';
-
-  installTargets = [
-    "install-am"
-    "install-pkgconfigDATA"
-  ];
-
-  meta = {
-    description = "Smart column output alignment library";
-    homepage = "https://github.com/karelzak/util-linux/tree/master/libsmartcols";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ rb2k ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 70f61efe6c37..7e5791f3ab1a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1339,6 +1339,7 @@ mapAliases {
   librewolf-wayland = librewolf; # Added 2022-11-15
   libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
   libsForQt515 = libsForQt5; # Added 2022-11-24
+  libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02
   libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
   libtensorflow-bin = libtensorflow; # Added 2022-09-25