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,46 @@
diff -ur a/src/malloc.c b/src/malloc.c
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,6 @@
#include "signals.h"
#include "malloc.h"
-caddr_t mmalloc_base = NULL;
int low_memory_warning = 0;
static char *reserve = NULL;
diff -ur a/src/malloc.h b/src/malloc.h
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -34,6 +34,8 @@
# define realloc(ptr, size) mrealloc(NULL, ptr, size)
# define free(ptr) mfree(NULL, ptr)
#else
+# include <stdlib.h>
+# include <sys/types.h>
# define mmalloc(md, size) malloc(size)
# define mcalloc(md, size) calloc(size)
# define mrealloc(md, ptr, size) realloc(ptr, size)
diff -ur a/src/socket.c b/src/socket.c
--- a/src/socket.c
+++ b/src/socket.c
@@ -2600,7 +2600,7 @@
socks_with_lines--;
if (line->attrs & (F_TFPROMPT)) {
- incoming_text = line;
+ incoming_text = (String*)line;
handle_prompt(incoming_text, 0, TRUE);
continue;
}
diff -ur a/src/tfio.c b/src/tfio.c
--- a/src/tfio.c
+++ b/src/tfio.c
@@ -70,6 +70,7 @@
static void filenputs(const char *str, int n, FILE *fp);
static void queueputline(conString *line, TFILE *file);
+extern void main_loop(void);
void init_tfio(void)
{

View File

@@ -0,0 +1,62 @@
{
lib,
stdenv,
fetchurl,
ncurses,
zlib,
openssl,
sslSupport ? true,
}:
assert sslSupport -> openssl != null;
let
inherit (lib)
licenses
maintainers
optional
platforms
;
in
stdenv.mkDerivation rec {
pname = "tinyfugue";
version = "50b8";
verUrl = "5.0%20beta%208";
src = fetchurl {
url = "mirror://sourceforge/project/tinyfugue/tinyfugue/${verUrl}/tf-${version}.tar.gz";
sha256 = "12fra2fdwqj6ilv9wdkc33rkj343rdcf5jyff4yiwywlrwaa2l1p";
};
patches = [
./fix-build.patch
];
configureFlags = optional (!sslSupport) "--disable-ssl";
buildInputs = [
ncurses
zlib
]
++ optional sslSupport openssl;
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: world.o:/build/tf-50b8/src/socket.h:24: multiple definition of
# `world_decl'; command.o:/build/tf-50b8/src/socket.h:24: first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon";
meta = {
homepage = "https://tinyfugue.sourceforge.net/";
description = "Terminal UI, screen-oriented MUD client";
mainProgram = "tf";
longDescription = ''
TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use
with any type of text MUD.
'';
license = licenses.gpl2Only;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.KibaFox ];
};
}