From 9c5e2eab95b0a0c85f2138c2b4dda4a0ae9d9426 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 29 Aug 2025 12:35:16 +0800 Subject: [PATCH 1/4] wipefreespace: 2.6 -> 3.0 Diff: https://github.com/bogdro/wipefreespace/compare/2.6...3.0 --- pkgs/by-name/wi/wipefreespace/package.nix | 43 ++++++++++------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/wi/wipefreespace/package.nix b/pkgs/by-name/wi/wipefreespace/package.nix index 111453bc5765..3b56b2026837 100644 --- a/pkgs/by-name/wi/wipefreespace/package.nix +++ b/pkgs/by-name/wi/wipefreespace/package.nix @@ -1,49 +1,42 @@ { - stdenv, lib, - fetchurl, - e2fsprogs, - ntfs3g, - xfsprogs, - reiser4progs, - libaal, - jfsutils, - libuuid, + stdenv, + fetchFromGitHub, + gettext, texinfo, + xfsprogs, + e2fsprogs, + libcap, + ntfs3g, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wipefreespace"; - version = "2.6"; + version = "3.0"; - src = fetchurl { - url = "mirror://sourceforge/project/wipefreespace/wipefreespace/${version}/wipefreespace-${version}.tar.gz"; - hash = "sha256-Pt6MDQ9wSJbL4tW/qckTpFsvE9FdXIkp/QmnYSlWR/M="; + src = fetchFromGitHub { + owner = "bogdro"; + repo = "wipefreespace"; + tag = finalAttrs.version; + hash = "sha256-zWjMCWQNPPly8xJ7jQraGHi4OLuNrnpNVQC2CRyHUlw="; }; nativeBuildInputs = [ + gettext texinfo + xfsprogs ]; # missed: Reiser3 FAT12/16/32 MinixFS HFS+ OCFS buildInputs = [ e2fsprogs + libcap ntfs3g xfsprogs - reiser4progs - libaal - jfsutils - libuuid ]; strictDeps = true; - preConfigure = '' - export PATH=$PATH:${xfsprogs}/bin - export CFLAGS=-I${jfsutils}/include - export LDFLAGS="-L${jfsutils}/lib -L${reiser4progs}/lib" - ''; - meta = with lib; { description = "Program which will securely wipe the free space"; homepage = "https://wipefreespace.sourceforge.io"; @@ -52,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ catap ]; mainProgram = "wipefreespace"; }; -} +}) From 04c3daae6c126f1b44f284b560d2463df9458193 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 29 Aug 2025 12:36:19 +0800 Subject: [PATCH 2/4] wipefreespace: remove with lib --- pkgs/by-name/wi/wipefreespace/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wipefreespace/package.nix b/pkgs/by-name/wi/wipefreespace/package.nix index 3b56b2026837..b913d55a8000 100644 --- a/pkgs/by-name/wi/wipefreespace/package.nix +++ b/pkgs/by-name/wi/wipefreespace/package.nix @@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - meta = with lib; { + meta = { description = "Program which will securely wipe the free space"; homepage = "https://wipefreespace.sourceforge.io"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ catap ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ catap ]; mainProgram = "wipefreespace"; }; }) From c776a13c8d6f43c07c60e03bf7a45b7251f5df45 Mon Sep 17 00:00:00 2001 From: kyehn <228304369+kyehn@users.noreply.github.com> Date: Sun, 31 Aug 2025 23:51:44 +0000 Subject: [PATCH 3/4] wipefreespace: remove catap as maintainer --- pkgs/by-name/wi/wipefreespace/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/wipefreespace/package.nix b/pkgs/by-name/wi/wipefreespace/package.nix index b913d55a8000..e8e906a57220 100644 --- a/pkgs/by-name/wi/wipefreespace/package.nix +++ b/pkgs/by-name/wi/wipefreespace/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wipefreespace.sourceforge.io"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ catap ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "wipefreespace"; }; }) From 18057b5e4783693b70514df29bb36b0a7f798b2f Mon Sep 17 00:00:00 2001 From: kyehn <228304369+kyehn@users.noreply.github.com> Date: Sun, 31 Aug 2025 23:52:50 +0000 Subject: [PATCH 4/4] wipefreespace: add kyehn as maintainer --- pkgs/by-name/wi/wipefreespace/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/wipefreespace/package.nix b/pkgs/by-name/wi/wipefreespace/package.nix index e8e906a57220..36680cb33354 100644 --- a/pkgs/by-name/wi/wipefreespace/package.nix +++ b/pkgs/by-name/wi/wipefreespace/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wipefreespace.sourceforge.io"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ kyehn ]; mainProgram = "wipefreespace"; }; })