From 678c24a5a9906d71256d9cd8bc7aa60b0b564aea Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 17 May 2025 15:18:55 +0200 Subject: [PATCH] dbench: drop Unmaintained for 14 years --- .../db/dbench/fix-missing-stdint.patch | 10 --- pkgs/by-name/db/dbench/package.nix | 63 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 pkgs/by-name/db/dbench/fix-missing-stdint.patch delete mode 100644 pkgs/by-name/db/dbench/package.nix diff --git a/pkgs/by-name/db/dbench/fix-missing-stdint.patch b/pkgs/by-name/db/dbench/fix-missing-stdint.patch deleted file mode 100644 index 96cb28e9e55a..000000000000 --- a/pkgs/by-name/db/dbench/fix-missing-stdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dbench-65b1987.org/libnfs.c 2017-11-08 12:25:39.652147989 +0000 -+++ dbench-65b1987/libnfs.c 2017-11-08 12:26:20.269897054 +0000 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #define discard_const(ptr) ((void *)((intptr_t)(ptr))) - diff --git a/pkgs/by-name/db/dbench/package.nix b/pkgs/by-name/db/dbench/package.nix deleted file mode 100644 index 456d99a66939..000000000000 --- a/pkgs/by-name/db/dbench/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoconf, - popt, - zlib, - rpcsvc-proto, - libtirpc, -}: - -stdenv.mkDerivation rec { - pname = "dbench"; - version = "2013-01-01"; - - src = fetchgit { - url = "git://git.samba.org/sahlberg/${pname}.git"; - rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; - sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; - }; - - nativeBuildInputs = [ - autoconf - rpcsvc-proto - ]; - buildInputs = [ - popt - zlib - libtirpc - ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - patches = [ - # patch has been also sent upstream and might be included in future versions - ./fix-missing-stdint.patch - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray+=("--datadir=$out/share/dbench") - ''; - - postInstall = '' - cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles - - # dbench looks here for the file - ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt - - # backwards compatible to older nixpkgs packaging introduced by - # 3f27be8e5d5861cd4b9487d6c5212d88bf24316d - ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles - ''; - - meta = with lib; { - description = "Filesystem benchmark tool based on load patterns"; - mainProgram = "dbench"; - homepage = "https://dbench.samba.org/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a439c5a67c6..4419b9ea031d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -506,6 +506,7 @@ mapAliases { dat = nodePackages.dat; dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03 dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 + dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17 dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01 deadpixi-sam = deadpixi-sam-unstable;