push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,61 @@
{
stdenv,
lib,
fetchzip,
openssl,
enableShared ? !stdenv.hostPlatform.isStatic,
enableManpages ? false,
pandoc,
}:
stdenv.mkDerivation rec {
pname = "fsverity-utils";
version = "1.6";
outputs = [
"out"
"lib"
"dev"
]
++ lib.optional enableManpages "man";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/snapshot/fsverity-utils-v${version}.tar.gz";
sha256 = "sha256-FZN4MKNmymIXZ2Q0woA0SLzPf4SaUJkj4ssKPsY4xXc=";
};
patches = lib.optionals (!enableShared) [
./remove-dynamic-libs.patch
];
enableParallelBuilding = true;
strictDeps = true;
nativeBuildInputs = lib.optional enableManpages pandoc;
buildInputs = [ openssl ];
makeFlags = [
"DESTDIR=$(out)"
"PREFIX="
]
++ lib.optional enableShared "USE_SHARED_LIB=1";
doCheck = true;
installTargets = [ "install" ] ++ lib.optional enableManpages "install-man";
postInstall = ''
mkdir -p $lib
mv $out/lib $lib/lib
'';
meta = with lib; {
homepage = "https://www.kernel.org/doc/html/latest/filesystems/fsverity.html#userspace-utility";
changelog = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/tree/NEWS.md";
description = "Set of userspace utilities for fs-verity";
mainProgram = "fsverity";
license = licenses.mit;
maintainers = with maintainers; [ jk ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,27 @@
diff --git a/Makefile b/Makefile
index 2304a21..697ccd4 100644
--- a/Makefile
+++ b/Makefile
@@ -149,13 +149,11 @@ libfsverity.so.$(SOVERSION):$(SHARED_LIB_OBJ)
$(QUIET_CCLD) $(CC) -o $@ -Wl,-soname=$@ -shared $+ \
$(CFLAGS) $(LDFLAGS) $(LDLIBS)
-DEFAULT_TARGETS += libfsverity.so.$(SOVERSION)
# Create the symlink libfsverity.so => libfsverity.so.$(SOVERSION)
libfsverity.so:libfsverity.so.$(SOVERSION)
$(QUIET_LN) ln -sf $+ $@
-DEFAULT_TARGETS += libfsverity.so
##############################################################################
@@ -263,8 +261,6 @@ install:all
install -d $(DESTDIR)$(LIBDIR)/pkgconfig $(DESTDIR)$(INCDIR) $(DESTDIR)$(BINDIR)
install -m755 $(FSVERITY) $(DESTDIR)$(BINDIR)
install -m644 libfsverity.a $(DESTDIR)$(LIBDIR)
- install -m755 libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)
- ln -sf libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)/libfsverity.so
install -m644 include/libfsverity.h $(DESTDIR)$(INCDIR)
sed -e "s|@PREFIX@|$(PREFIX)|" \
-e "s|@LIBDIR@|$(LIBDIR)|" \