From 873fec39eb14a010cedc475b2d69655c2ed6b724 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 30 Aug 2025 01:27:43 -0400 Subject: [PATCH] minimal-bootstrap.mes.nyacc: 1.00.2 -> 2.02.2; minimal-bootstrap.mes: 0.25 -> 0.27.1 --- .../linux/minimal-bootstrap/mes/default.nix | 17 +- .../linux/minimal-bootstrap/mes/nyacc.nix | 8 +- .../linux/minimal-bootstrap/mes/sources.nix | 192 +++++++++++++----- 3 files changed, 158 insertions(+), 59 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix index f704204f365d..fe507e985aa7 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix @@ -13,11 +13,11 @@ let pname = "mes"; - version = "0.25"; + version = "0.27.1"; src = fetchurl { url = "mirror://gnu/mes/mes-${version}.tar.gz"; - hash = "sha256-MlJQs1Z+2SA7pwFhyDWvAQeec+vtl7S1u3fKUAuCiUA="; + hash = "sha256-GDpA6kfqSfih470bnRLmdjdNZNY7x557wa59Zz398l0="; }; nyacc = callPackage ./nyacc.nix { inherit nyacc; }; @@ -28,6 +28,7 @@ let ''; sources = (import ./sources.nix).x86.linux.mescc; + inherit (sources) libc_mini_SOURCES libmescc_SOURCES @@ -43,7 +44,9 @@ let homepage = "https://www.gnu.org/software/mes"; license = lib.licenses.gpl3Plus; teams = [ lib.teams.minimal-bootstrap ]; - platforms = [ "i686-linux" ]; + platforms = [ + "i686-linux" + ]; }; srcPost = @@ -69,8 +72,9 @@ let cp ${config_h} include/mes/config.h mkdir include/arch - cp include/linux/x86/syscall.h include/arch/syscall.h cp include/linux/x86/kernel-stat.h include/arch/kernel-stat.h + cp include/linux/x86/signal.h include/arch/signal.h + cp include/linux/x86/syscall.h include/arch/syscall.h # Remove pregenerated files rm mes/module/mes/psyntax.pp mes/module/mes/psyntax.pp.header @@ -81,9 +85,9 @@ let # Remove environment impurities __GUILE_LOAD_PATH="\"''${MES_PREFIX}/mes/module:''${MES_PREFIX}/module:${nyacc.guilePath}\"" - boot0_scm=mes/module/mes/boot-0.scm + guile_module_scm=mes/module/mes/guile-module.mes guile_mes=mes/module/mes/guile.mes - replace --file ''${boot0_scm} --output ''${boot0_scm} --match-on "(getenv \"GUILE_LOAD_PATH\")" --replace-with ''${__GUILE_LOAD_PATH} + replace --file ''${guile_module_scm} --output ''${guile_module_scm} --match-on "(getenv \"GUILE_LOAD_PATH\")" --replace-with ''${__GUILE_LOAD_PATH} replace --file ''${guile_mes} --output ''${guile_mes} --match-on "(getenv \"GUILE_LOAD_PATH\")" --replace-with ''${__GUILE_LOAD_PATH} module_mescc_scm=module/mescc/mescc.scm @@ -127,7 +131,6 @@ let "-e" "main" "${srcPost.bin}/bin/mescc.scm" - "--" "-D" "HAVE_CONFIG_H=1" "-I" diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/nyacc.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/nyacc.nix index 6332fc15f257..69ce93995b82 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/nyacc.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/nyacc.nix @@ -7,13 +7,13 @@ let pname = "nyacc"; # NYACC is a tightly coupled dependency of mes. This version is known to work - # with mes 0.25. - # https://git.savannah.gnu.org/cgit/mes.git/tree/INSTALL?h=v0.25#n31 - version = "1.00.2"; + # with mes 0.27.1. + # https://git.savannah.gnu.org/cgit/mes.git/tree/INSTALL?h=v0.27.1#n31 + version = "2.02.2"; src = fetchurl { url = "mirror://savannah/nyacc/nyacc-${version}.tar.gz"; - sha256 = "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk"; + hash = "sha256-aRpTcKU6c6Lc+onZL4EbPlZIOmf5IZnNAGGUTQRLAgU="; }; in kaem.runCommand "${pname}-${version}" diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/sources.nix index 4b5d3b336575..c9220a69c67c 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/mes/sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/sources.nix @@ -55,6 +55,9 @@ "lib/posix/write.c" "lib/stdlib/atoi.c" "lib/linux/lseek.c" + "lib/dirent/__getdirentries.c" + "lib/dirent/closedir.c" + "lib/dirent/opendir.c" "lib/mes/__assert_fail.c" "lib/mes/__buffered_read.c" "lib/mes/__mes_debug.c" @@ -74,6 +77,7 @@ "lib/stdio/putc.c" "lib/stdio/putchar.c" "lib/stdio/ungetc.c" + "lib/stdlib/calloc.c" "lib/stdlib/free.c" "lib/stdlib/realloc.c" "lib/string/memchr.c" @@ -87,21 +91,39 @@ "lib/posix/raise.c" "lib/linux/access.c" "lib/linux/brk.c" + "lib/linux/chdir.c" "lib/linux/chmod.c" "lib/linux/clock_gettime.c" + "lib/linux/close.c" "lib/linux/dup.c" "lib/linux/dup2.c" "lib/linux/execve.c" + "lib/linux/fcntl.c" "lib/linux/fork.c" + "lib/linux/fstat.c" "lib/linux/fsync.c" "lib/linux/_getcwd.c" + "lib/linux/getdents.c" "lib/linux/gettimeofday.c" "lib/linux/ioctl3.c" + "lib/linux/link.c" + "lib/linux/lstat.c" "lib/linux/_open3.c" "lib/linux/malloc.c" + "lib/linux/mkdir.c" + "lib/linux/nanosleep.c" + "lib/linux/pipe.c" "lib/linux/_read.c" + "lib/linux/readdir.c" + "lib/linux/rename.c" + "lib/linux/rmdir.c" + "lib/linux/stat.c" + "lib/linux/symlink.c" "lib/linux/time.c" + "lib/linux/umask.c" + "lib/linux/uname.c" "lib/linux/unlink.c" + "lib/linux/utimensat.c" "lib/linux/wait4.c" "lib/linux/waitpid.c" "lib/linux/x86-mes-mescc/syscall.c" @@ -142,6 +164,9 @@ "lib/posix/write.c" "lib/stdlib/atoi.c" "lib/linux/lseek.c" + "lib/dirent/__getdirentries.c" + "lib/dirent/closedir.c" + "lib/dirent/opendir.c" "lib/mes/__assert_fail.c" "lib/mes/__buffered_read.c" "lib/mes/__mes_debug.c" @@ -161,6 +186,7 @@ "lib/stdio/putc.c" "lib/stdio/putchar.c" "lib/stdio/ungetc.c" + "lib/stdlib/calloc.c" "lib/stdlib/free.c" "lib/stdlib/realloc.c" "lib/string/memchr.c" @@ -174,21 +200,39 @@ "lib/posix/raise.c" "lib/linux/access.c" "lib/linux/brk.c" + "lib/linux/chdir.c" "lib/linux/chmod.c" "lib/linux/clock_gettime.c" + "lib/linux/close.c" "lib/linux/dup.c" "lib/linux/dup2.c" "lib/linux/execve.c" + "lib/linux/fcntl.c" "lib/linux/fork.c" + "lib/linux/fstat.c" "lib/linux/fsync.c" "lib/linux/_getcwd.c" + "lib/linux/getdents.c" "lib/linux/gettimeofday.c" "lib/linux/ioctl3.c" + "lib/linux/link.c" + "lib/linux/lstat.c" "lib/linux/_open3.c" "lib/linux/malloc.c" + "lib/linux/mkdir.c" + "lib/linux/nanosleep.c" + "lib/linux/pipe.c" "lib/linux/_read.c" + "lib/linux/readdir.c" + "lib/linux/rename.c" + "lib/linux/rmdir.c" + "lib/linux/stat.c" + "lib/linux/symlink.c" "lib/linux/time.c" + "lib/linux/umask.c" + "lib/linux/uname.c" "lib/linux/unlink.c" + "lib/linux/utimensat.c" "lib/linux/wait4.c" "lib/linux/waitpid.c" "lib/linux/x86-mes-mescc/syscall.c" @@ -222,7 +266,6 @@ "lib/stdio/vsnprintf.c" "lib/stdio/vsprintf.c" "lib/stdio/vsscanf.c" - "lib/stdlib/calloc.c" "lib/stdlib/qsort.c" "lib/stdlib/strtod.c" "lib/stdlib/strtof.c" @@ -243,11 +286,10 @@ "lib/stub/ldexp.c" "lib/stub/mprotect.c" "lib/stub/localtime.c" + "lib/stub/putenv.c" + "lib/stub/realpath.c" "lib/stub/sigemptyset.c" "lib/x86-mes-mescc/setjmp.c" - "lib/linux/close.c" - "lib/linux/rmdir.c" - "lib/linux/stat.c" ]; libc_gnu_SOURCES = [ "lib/mes/__init_io.c" @@ -283,6 +325,9 @@ "lib/posix/write.c" "lib/stdlib/atoi.c" "lib/linux/lseek.c" + "lib/dirent/__getdirentries.c" + "lib/dirent/closedir.c" + "lib/dirent/opendir.c" "lib/mes/__assert_fail.c" "lib/mes/__buffered_read.c" "lib/mes/__mes_debug.c" @@ -302,6 +347,7 @@ "lib/stdio/putc.c" "lib/stdio/putchar.c" "lib/stdio/ungetc.c" + "lib/stdlib/calloc.c" "lib/stdlib/free.c" "lib/stdlib/realloc.c" "lib/string/memchr.c" @@ -315,21 +361,39 @@ "lib/posix/raise.c" "lib/linux/access.c" "lib/linux/brk.c" + "lib/linux/chdir.c" "lib/linux/chmod.c" "lib/linux/clock_gettime.c" + "lib/linux/close.c" "lib/linux/dup.c" "lib/linux/dup2.c" "lib/linux/execve.c" + "lib/linux/fcntl.c" "lib/linux/fork.c" + "lib/linux/fstat.c" "lib/linux/fsync.c" "lib/linux/_getcwd.c" + "lib/linux/getdents.c" "lib/linux/gettimeofday.c" "lib/linux/ioctl3.c" + "lib/linux/link.c" + "lib/linux/lstat.c" "lib/linux/_open3.c" "lib/linux/malloc.c" + "lib/linux/mkdir.c" + "lib/linux/nanosleep.c" + "lib/linux/pipe.c" "lib/linux/_read.c" + "lib/linux/readdir.c" + "lib/linux/rename.c" + "lib/linux/rmdir.c" + "lib/linux/stat.c" + "lib/linux/symlink.c" "lib/linux/time.c" + "lib/linux/umask.c" + "lib/linux/uname.c" "lib/linux/unlink.c" + "lib/linux/utimensat.c" "lib/linux/wait4.c" "lib/linux/waitpid.c" "lib/linux/x86-mes-mescc/syscall.c" @@ -363,7 +427,6 @@ "lib/stdio/vsnprintf.c" "lib/stdio/vsprintf.c" "lib/stdio/vsscanf.c" - "lib/stdlib/calloc.c" "lib/stdlib/qsort.c" "lib/stdlib/strtod.c" "lib/stdlib/strtof.c" @@ -384,11 +447,10 @@ "lib/stub/ldexp.c" "lib/stub/mprotect.c" "lib/stub/localtime.c" + "lib/stub/putenv.c" + "lib/stub/realpath.c" "lib/stub/sigemptyset.c" "lib/x86-mes-mescc/setjmp.c" - "lib/linux/close.c" - "lib/linux/rmdir.c" - "lib/linux/stat.c" "lib/ctype/isalnum.c" "lib/ctype/isalpha.c" "lib/ctype/isascii.c" @@ -396,10 +458,6 @@ "lib/ctype/isgraph.c" "lib/ctype/isprint.c" "lib/ctype/ispunct.c" - "lib/dirent/__getdirentries.c" - "lib/dirent/closedir.c" - "lib/dirent/opendir.c" - "lib/dirent/readdir.c" "lib/math/ceil.c" "lib/math/fabs.c" "lib/math/floor.c" @@ -408,6 +466,7 @@ "lib/posix/execl.c" "lib/posix/execlp.c" "lib/posix/mktemp.c" + "lib/posix/pathconf.c" "lib/posix/sbrk.c" "lib/posix/sleep.c" "lib/posix/unsetenv.c" @@ -479,12 +538,7 @@ "lib/stub/system.c" "lib/stub/times.c" "lib/stub/ttyname.c" - "lib/stub/umask.c" "lib/stub/utime.c" - "lib/linux/chdir.c" - "lib/linux/fcntl.c" - "lib/linux/fstat.c" - "lib/linux/getdents.c" "lib/linux/getegid.c" "lib/linux/geteuid.c" "lib/linux/getgid.c" @@ -492,20 +546,13 @@ "lib/linux/getrusage.c" "lib/linux/getuid.c" "lib/linux/ioctl.c" - "lib/linux/link.c" - "lib/linux/lstat.c" - "lib/linux/mkdir.c" "lib/linux/mknod.c" - "lib/linux/nanosleep.c" - "lib/linux/pipe.c" "lib/linux/readlink.c" - "lib/linux/rename.c" "lib/linux/setgid.c" "lib/linux/settimer.c" "lib/linux/setuid.c" "lib/linux/signal.c" "lib/linux/sigprogmask.c" - "lib/linux/symlink.c" ]; mes_SOURCES = [ "src/builtins.c" @@ -526,6 +573,7 @@ "src/string.c" "src/struct.c" "src/symbol.c" + "src/variable.c" "src/vector.c" ]; }; @@ -583,6 +631,9 @@ "lib/posix/write.c" "lib/stdlib/atoi.c" "lib/linux/lseek.c" + "lib/dirent/__getdirentries.c" + "lib/dirent/closedir.c" + "lib/dirent/opendir.c" "lib/mes/__assert_fail.c" "lib/mes/__buffered_read.c" "lib/mes/__mes_debug.c" @@ -602,6 +653,7 @@ "lib/stdio/putc.c" "lib/stdio/putchar.c" "lib/stdio/ungetc.c" + "lib/stdlib/calloc.c" "lib/stdlib/free.c" "lib/stdlib/realloc.c" "lib/string/memchr.c" @@ -615,21 +667,39 @@ "lib/posix/raise.c" "lib/linux/access.c" "lib/linux/brk.c" + "lib/linux/chdir.c" "lib/linux/chmod.c" "lib/linux/clock_gettime.c" + "lib/linux/close.c" "lib/linux/dup.c" "lib/linux/dup2.c" "lib/linux/execve.c" + "lib/linux/fcntl.c" "lib/linux/fork.c" + "lib/linux/fstat.c" "lib/linux/fsync.c" "lib/linux/_getcwd.c" + "lib/linux/getdents.c" "lib/linux/gettimeofday.c" "lib/linux/ioctl3.c" + "lib/linux/link.c" + "lib/linux/lstat.c" "lib/linux/_open3.c" "lib/linux/malloc.c" + "lib/linux/mkdir.c" + "lib/linux/nanosleep.c" + "lib/linux/pipe.c" "lib/linux/_read.c" + "lib/linux/readdir.c" + "lib/linux/rename.c" + "lib/linux/rmdir.c" + "lib/linux/stat.c" + "lib/linux/symlink.c" "lib/linux/time.c" + "lib/linux/umask.c" + "lib/linux/uname.c" "lib/linux/unlink.c" + "lib/linux/utimensat.c" "lib/linux/wait4.c" "lib/linux/waitpid.c" "lib/linux/x86-mes-gcc/syscall.c" @@ -670,6 +740,9 @@ "lib/posix/write.c" "lib/stdlib/atoi.c" "lib/linux/lseek.c" + "lib/dirent/__getdirentries.c" + "lib/dirent/closedir.c" + "lib/dirent/opendir.c" "lib/mes/__assert_fail.c" "lib/mes/__buffered_read.c" "lib/mes/__mes_debug.c" @@ -689,6 +762,7 @@ "lib/stdio/putc.c" "lib/stdio/putchar.c" "lib/stdio/ungetc.c" + "lib/stdlib/calloc.c" "lib/stdlib/free.c" "lib/stdlib/realloc.c" "lib/string/memchr.c" @@ -702,21 +776,39 @@ "lib/posix/raise.c" "lib/linux/access.c" "lib/linux/brk.c" + "lib/linux/chdir.c" "lib/linux/chmod.c" "lib/linux/clock_gettime.c" + "lib/linux/close.c" "lib/linux/dup.c" "lib/linux/dup2.c" "lib/linux/execve.c" + "lib/linux/fcntl.c" "lib/linux/fork.c" + "lib/linux/fstat.c" "lib/linux/fsync.c" "lib/linux/_getcwd.c" + "lib/linux/getdents.c" "lib/linux/gettimeofday.c" "lib/linux/ioctl3.c" + "lib/linux/link.c" + "lib/linux/lstat.c" "lib/linux/_open3.c" "lib/linux/malloc.c" + "lib/linux/mkdir.c" + "lib/linux/nanosleep.c" + "lib/linux/pipe.c" "lib/linux/_read.c" + "lib/linux/readdir.c" + "lib/linux/rename.c" + "lib/linux/rmdir.c" + "lib/linux/stat.c" + "lib/linux/symlink.c" "lib/linux/time.c" + "lib/linux/umask.c" + "lib/linux/uname.c" "lib/linux/unlink.c" + "lib/linux/utimensat.c" "lib/linux/wait4.c" "lib/linux/waitpid.c" "lib/linux/x86-mes-gcc/syscall.c" @@ -750,7 +842,6 @@ "lib/stdio/vsnprintf.c" "lib/stdio/vsprintf.c" "lib/stdio/vsscanf.c" - "lib/stdlib/calloc.c" "lib/stdlib/qsort.c" "lib/stdlib/strtod.c" "lib/stdlib/strtof.c" @@ -771,11 +862,10 @@ "lib/stub/ldexp.c" "lib/stub/mprotect.c" "lib/stub/localtime.c" + "lib/stub/putenv.c" + "lib/stub/realpath.c" "lib/stub/sigemptyset.c" "lib/x86-mes-gcc/setjmp.c" - "lib/linux/close.c" - "lib/linux/rmdir.c" - "lib/linux/stat.c" ]; libc_gnu_SOURCES = [ "lib/mes/__init_io.c" @@ -811,6 +901,9 @@ "lib/posix/write.c" "lib/stdlib/atoi.c" "lib/linux/lseek.c" + "lib/dirent/__getdirentries.c" + "lib/dirent/closedir.c" + "lib/dirent/opendir.c" "lib/mes/__assert_fail.c" "lib/mes/__buffered_read.c" "lib/mes/__mes_debug.c" @@ -830,6 +923,7 @@ "lib/stdio/putc.c" "lib/stdio/putchar.c" "lib/stdio/ungetc.c" + "lib/stdlib/calloc.c" "lib/stdlib/free.c" "lib/stdlib/realloc.c" "lib/string/memchr.c" @@ -843,21 +937,39 @@ "lib/posix/raise.c" "lib/linux/access.c" "lib/linux/brk.c" + "lib/linux/chdir.c" "lib/linux/chmod.c" "lib/linux/clock_gettime.c" + "lib/linux/close.c" "lib/linux/dup.c" "lib/linux/dup2.c" "lib/linux/execve.c" + "lib/linux/fcntl.c" "lib/linux/fork.c" + "lib/linux/fstat.c" "lib/linux/fsync.c" "lib/linux/_getcwd.c" + "lib/linux/getdents.c" "lib/linux/gettimeofday.c" "lib/linux/ioctl3.c" + "lib/linux/link.c" + "lib/linux/lstat.c" "lib/linux/_open3.c" "lib/linux/malloc.c" + "lib/linux/mkdir.c" + "lib/linux/nanosleep.c" + "lib/linux/pipe.c" "lib/linux/_read.c" + "lib/linux/readdir.c" + "lib/linux/rename.c" + "lib/linux/rmdir.c" + "lib/linux/stat.c" + "lib/linux/symlink.c" "lib/linux/time.c" + "lib/linux/umask.c" + "lib/linux/uname.c" "lib/linux/unlink.c" + "lib/linux/utimensat.c" "lib/linux/wait4.c" "lib/linux/waitpid.c" "lib/linux/x86-mes-gcc/syscall.c" @@ -891,7 +1003,6 @@ "lib/stdio/vsnprintf.c" "lib/stdio/vsprintf.c" "lib/stdio/vsscanf.c" - "lib/stdlib/calloc.c" "lib/stdlib/qsort.c" "lib/stdlib/strtod.c" "lib/stdlib/strtof.c" @@ -912,11 +1023,10 @@ "lib/stub/ldexp.c" "lib/stub/mprotect.c" "lib/stub/localtime.c" + "lib/stub/putenv.c" + "lib/stub/realpath.c" "lib/stub/sigemptyset.c" "lib/x86-mes-gcc/setjmp.c" - "lib/linux/close.c" - "lib/linux/rmdir.c" - "lib/linux/stat.c" "lib/ctype/isalnum.c" "lib/ctype/isalpha.c" "lib/ctype/isascii.c" @@ -924,10 +1034,6 @@ "lib/ctype/isgraph.c" "lib/ctype/isprint.c" "lib/ctype/ispunct.c" - "lib/dirent/__getdirentries.c" - "lib/dirent/closedir.c" - "lib/dirent/opendir.c" - "lib/dirent/readdir.c" "lib/math/ceil.c" "lib/math/fabs.c" "lib/math/floor.c" @@ -936,6 +1042,7 @@ "lib/posix/execl.c" "lib/posix/execlp.c" "lib/posix/mktemp.c" + "lib/posix/pathconf.c" "lib/posix/sbrk.c" "lib/posix/sleep.c" "lib/posix/unsetenv.c" @@ -1007,12 +1114,7 @@ "lib/stub/system.c" "lib/stub/times.c" "lib/stub/ttyname.c" - "lib/stub/umask.c" "lib/stub/utime.c" - "lib/linux/chdir.c" - "lib/linux/fcntl.c" - "lib/linux/fstat.c" - "lib/linux/getdents.c" "lib/linux/getegid.c" "lib/linux/geteuid.c" "lib/linux/getgid.c" @@ -1020,20 +1122,13 @@ "lib/linux/getrusage.c" "lib/linux/getuid.c" "lib/linux/ioctl.c" - "lib/linux/link.c" - "lib/linux/lstat.c" - "lib/linux/mkdir.c" "lib/linux/mknod.c" - "lib/linux/nanosleep.c" - "lib/linux/pipe.c" "lib/linux/readlink.c" - "lib/linux/rename.c" "lib/linux/setgid.c" "lib/linux/settimer.c" "lib/linux/setuid.c" "lib/linux/signal.c" "lib/linux/sigprogmask.c" - "lib/linux/symlink.c" ]; mes_SOURCES = [ "src/builtins.c" @@ -1054,6 +1149,7 @@ "src/string.c" "src/struct.c" "src/symbol.c" + "src/variable.c" "src/vector.c" ]; };