From f378595fd32b825dc9e53eb89da5676657606dbf Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 6 Jul 2022 01:23:24 +0200 Subject: [PATCH 1/3] jfsutils: keep include files and libfs.a --- pkgs/tools/filesystems/jfsutils/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 52b8fc4c3c28..9b7b520ce3aa 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.15"; src = fetchurl { - url = "http://jfs.sourceforge.net/project/pub/jfsutils-${version}.tar.gz"; + url = "mirror://sourceforge/jfs/jfsutils-${version}.tar.gz"; sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"; }; @@ -31,6 +31,14 @@ stdenv.mkDerivation rec { # `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here NIX_CFLAGS_COMPILE = "-fcommon"; + # this required for wipefreespace + postInstall = '' + mkdir -p $out/include + cp include/*.h $out/include + mkdir -p $out/lib + cp ./libfs/libfs.a $out/lib + ''; + meta = with lib; { description = "IBM JFS utilities"; homepage = "http://jfs.sourceforge.net"; From 651842bd856effbcdbbd888b704613547a1c89cb Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 6 Jul 2022 13:21:11 +0200 Subject: [PATCH 2/3] reiser4progs: share libreiser4misc.a.la --- pkgs/tools/filesystems/reiser4progs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index cef1af964b02..9f9b3bd5c2ed 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace ./run-ldconfig true ''; + # this required for wipefreespace + postInstall = '' + mkdir -p $out/lib + cp ./libmisc/.libs/libmisc.a $out/lib/libreiser4misc.a.la + ''; + meta = with lib; { inherit version; homepage = "https://sourceforge.net/projects/reiser4/"; From 9573c61a7ce2e4e98a8f16103f90566735b04200 Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 6 Jul 2022 13:22:08 +0200 Subject: [PATCH 3/3] wipefreespace: init at 2.5 --- .../filesystems/wipefreespace/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/filesystems/wipefreespace/default.nix diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/tools/filesystems/wipefreespace/default.nix new file mode 100644 index 000000000000..885d64f7c41f --- /dev/null +++ b/pkgs/tools/filesystems/wipefreespace/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, pkgs +, lib +, fetchurl +, e2fsprogs +, ntfs3g +, xfsprogs +, reiser4progs +, libaal +, jfsutils +, libuuid +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "wipefreespace"; + version = "2.5"; + + src = fetchurl { + url = "mirror://sourceforge/project/wipefreespace/wipefreespace/${version}/wipefreespace-${version}.tar.gz"; + hash = "sha256-wymV6G4Et5TCoIztZfdb3xuzjdBHFyB5OmI4EcsJKwQ="; + }; + + nativeBuildInputs = [ + texinfo + ]; + + # missed: Reiser3 FAT12/16/32 MinixFS HFS+ OCFS + buildInputs = [ + e2fsprogs + 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 = "A program which will securely wipe the free space"; + homepage = "https://wipefreespace.sourceforge.io"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ catap ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3770016107c5..27e40a7d132e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11971,6 +11971,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; }; + wipefreespace = callPackage ../tools/filesystems/wipefreespace {}; + woeusb = callPackage ../tools/misc/woeusb { }; woeusb-ng = callPackage ../tools/misc/woeusb-ng { };