mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
aefs: drop
Depends on unsupported fuse2 and unmaintained upstream.
This commit is contained in:
@@ -1,75 +0,0 @@
|
||||
From 5fbcd63a4fb8baca13184a2cc718ebf3ebbef245 Mon Sep 17 00:00:00 2001
|
||||
From: Moraxyc <i@qaq.li>
|
||||
Date: Sun, 28 Dec 2025 00:24:11 +0800
|
||||
Subject: [PATCH] fix build with c23
|
||||
|
||||
---
|
||||
emxdoc/input.c | 10 +++++-----
|
||||
system/types.h | 5 +----
|
||||
2 files changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/emxdoc/input.c b/emxdoc/input.c
|
||||
index 50fd7a0..7d9ad4a 100644
|
||||
--- a/emxdoc/input.c
|
||||
+++ b/emxdoc/input.c
|
||||
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA. */
|
||||
struct cond
|
||||
{
|
||||
int start_line;
|
||||
- int true;
|
||||
+ int is_true;
|
||||
int else_seen;
|
||||
};
|
||||
|
||||
@@ -225,7 +225,7 @@ redo:
|
||||
if (cond_sp + 1 >= COND_STACK_SIZE)
|
||||
fatal ("%s:%d: Conditional stack overflow", input_fname, line_no);
|
||||
++cond_sp;
|
||||
- cond_stack[cond_sp].true = c1;
|
||||
+ cond_stack[cond_sp].is_true = c1;
|
||||
cond_stack[cond_sp].start_line = line_no;
|
||||
cond_stack[cond_sp].else_seen = FALSE;
|
||||
goto redo;
|
||||
@@ -240,7 +240,7 @@ redo:
|
||||
input_fname, line_no, escape, escape,
|
||||
cond_stack[cond_sp].start_line);
|
||||
cond_stack[cond_sp].else_seen = TRUE;
|
||||
- cond_stack[cond_sp].true = !cond_stack[cond_sp].true;
|
||||
+ cond_stack[cond_sp].is_true = !cond_stack[cond_sp].is_true;
|
||||
goto redo;
|
||||
}
|
||||
else if (strcmp (p, "endif") == 0)
|
||||
@@ -254,12 +254,12 @@ redo:
|
||||
else if (p[0] == 'h' && p[1] >= '1' && p[1] <= '0' + SECTION_LEVELS)
|
||||
{
|
||||
/* Support h1 inside if */
|
||||
- if (cond_sp >= 0 && !cond_stack[cond_sp].true)
|
||||
+ if (cond_sp >= 0 && !cond_stack[cond_sp].is_true)
|
||||
++ref_no;
|
||||
}
|
||||
}
|
||||
|
||||
- if (cond_sp >= 0 && !cond_stack[cond_sp].true)
|
||||
+ if (cond_sp >= 0 && !cond_stack[cond_sp].is_true)
|
||||
goto redo;
|
||||
|
||||
p = input;
|
||||
diff --git a/system/types.h b/system/types.h
|
||||
index 48b8013..327833f 100644
|
||||
--- a/system/types.h
|
||||
+++ b/system/types.h
|
||||
@@ -21,10 +21,7 @@
|
||||
#define _TYPES_H
|
||||
|
||||
#include "config.h"
|
||||
-
|
||||
-
|
||||
-/* Booleans (C++/C99) style. */
|
||||
-typedef int bool;
|
||||
+#include <stdbool.h>
|
||||
|
||||
#ifndef true
|
||||
#define true 1
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
autoreconfHook,
|
||||
fuse,
|
||||
git,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "aefs";
|
||||
version = "0-unstable-2015-05-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edolstra";
|
||||
repo = "aefs";
|
||||
rev = "e7a9bf8cfa9166668fe1514cc1afd31fc4e10e9a";
|
||||
hash = "sha256-a3YQWxJ7+bYhf1W1kdIykV8U1R4dcDZJ7K3NvNxbF0s=";
|
||||
};
|
||||
|
||||
# fix build with c23
|
||||
# ../system/types.h:27:13: error: 'bool' cannot be defined via 'typedef'
|
||||
# input.c:228:31: error: expected identifier before 'true'
|
||||
patches = [ ./fix-build-with-c23.patch ];
|
||||
|
||||
# autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on
|
||||
# Darwin if FUSE_USE_VERSION isn't set at configure time.
|
||||
#
|
||||
# NOTE: Make sure the value of FUSE_USE_VERSION specified here matches the
|
||||
# actual version used in the source code:
|
||||
#
|
||||
# $ tar xf "$(nix-build -A aefs.src)"
|
||||
# $ grep -R FUSE_USE_VERSION
|
||||
configureFlags = lib.optional stdenv.hostPlatform.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
git
|
||||
];
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
hardcodeZeroVersion = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/edolstra/aefs";
|
||||
description = "Cryptographic filesystem implemented in userspace using FUSE";
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -275,6 +275,7 @@ mapAliases {
|
||||
adminer-pematon = throw "'adminer-pematon' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27
|
||||
adminerneo = throw "'adminerneo' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27
|
||||
adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # Added 2025-05-31
|
||||
aefs = throw "'aefs' has been removed, as it depends on unsupported fuse2 and unmaintained upstream"; # Added 2026-05-30
|
||||
afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
|
||||
agrep = throw "'agrep' has been removed due to lack of upstream maintenance. Consider using 'tre' or 'ugrep' instead."; # Added 2025-12-28
|
||||
akkoma-emoji = throw "'akkoma-emoji' has been renamed to/replaced by 'blobs_gg'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user