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,31 @@
diff --git a/fuse-ext2/Makefile.am b/fuse-ext2/Makefile.am
index 9d3a065..c73f337 100644
--- a/fuse-ext2/Makefile.am
+++ b/fuse-ext2/Makefile.am
@@ -113,7 +113,7 @@ fuse_ext2_CFLAGS = \
-DHAVE_CONFIG_H \
-I/usr/local/include
-if DARWIN
+if FALSE
bin_PROGRAMS += \
fuse-ext2.wait \
fuse-ext2.install \
@@ -151,9 +151,6 @@ endif
if DARWIN
install-exec-local:
$(INSTALL) -d "$(DESTDIR)/$(sbindir)"
- $(LN_S) -f "/Library/Filesystems/fuse-ext2.fs/Contents/Resources/mount_fuse-ext2" "$(DESTDIR)/$(sbindir)/mount_fuse-ext2"
- $(LN_S) -f "/usr/local/opt/e2fsprogs/sbin/e2label" "$(DESTDIR)/$(sbindir)/e2label"
- $(LN_S) -f "/usr/local/opt/e2fsprogs/sbin/mke2fs" "$(DESTDIR)/$(sbindir)/mke2fs"
endif
if LINUX
install-data-hook:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 52f81e1..78c418f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = macosx
+SUBDIRS =

View File

@@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
e2fsprogs,
fuse,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fuse-ext2";
version = "0.0.11";
src = fetchFromGitHub {
owner = "alperakcan";
repo = "fuse-ext2";
rev = "v${finalAttrs.version}";
hash = "sha256-VQMftlnd6q1PdwhSIQwjffjnkhupY8MUc8E+p1tgvUM=";
};
patches = [
# Remove references to paths outside the nix store
./remove-impure-paths.patch
# Don't build macOS desktop installer
./darwin-no-installer.patch
];
nativeBuildInputs = [
autoreconfHook
];
buildInputs = [
e2fsprogs
fuse
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
meta = with lib; {
description = "FUSE module to mount ext2, ext3 and ext4 with read write support";
homepage = "https://github.com/alperakcan/fuse-ext2";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ emilytrau ];
platforms = platforms.unix;
mainProgram = "fuse-ext2";
};
})

View File

@@ -0,0 +1,35 @@
diff --git a/fuse-ext2/Makefile.am b/fuse-ext2/Makefile.am
index 9d3a065..0bb4341 100644
--- a/fuse-ext2/Makefile.am
+++ b/fuse-ext2/Makefile.am
@@ -17,8 +17,7 @@ fuse_ext2_probe_SOURCES = \
fuse_ext2_probe_CFLAGS = \
-Wall \
- -DHAVE_CONFIG_H \
- -I/usr/local/include
+ -DHAVE_CONFIG_H
fuse_ext2_SOURCES = \
fuse-ext2.h \
@@ -98,9 +97,7 @@ umfuseext2_la_CFLAGS = \
-Wall \
-DHAVE_CONFIG_H \
-D_GNU_SOURCE \
- $(DEVELFLAGS) \
- -I$(includedir)/umview \
- -I/usr/local/include
+ $(DEVELFLAGS)
umfuseext2_la_LDFLAGS = \
-module \
@@ -110,8 +107,7 @@ umfuseext2_la_LDFLAGS = \
fuse_ext2_CFLAGS = \
-Wall \
- -DHAVE_CONFIG_H \
- -I/usr/local/include
+ -DHAVE_CONFIG_H
if DARWIN
bin_PROGRAMS += \