minimal-bootstrap: lots of updates (#448701) (1a01d7df) · Commits · nix / nixpkgs

pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ let
		};

		# Thanks to the live-bootstrap project!
		# See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/bash-2.05b/bash-2.05b.kaem
		liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/bash-2.05b";
		# See https://github.com/fosslinux/live-bootstrap/blob/c0494d9af84b9e8c3e76e34c6e898978013a3b39/steps/bash-2.05b/pass1.kaem
		liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/c0494d9af84b9e8c3e76e34c6e898978013a3b39/steps/bash-2.05b";

		main_mk = fetchurl {
		url = "${liveBootstrap}/mk/main.mk";
		@@ -30,7 +30,7 @@ let

		common_mk = fetchurl {
		url = "${liveBootstrap}/mk/common.mk";
		sha256 = "09rigxxf85p2ybnq248sai1gdx95yykc8jmwi4yjx389zh09mcr8";
		sha256 = "sha256-9BzUJPz6Vx+r69i2SQlqRTH9ihgLaUp1JSYGlTbWWu8=";
		};

		builtins_mk = fetchurl {

pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,10 @@ let
		# musl 1.1.x doesn't use 64bit time_t
		"--disable-year2038"
		# libstdbuf.so fails in static builds
		"--enable-no-install-program=stdbuf"
		"--enable-no-install-program=stdbuf,arch,coreutils,hostname"
		# Disable PATH_MAX for better reproducibility
		"gl_cv_func_getcwd_path_max=\"no, but it is partly working\""
		"gl_cv_have_unlimited_file_name_length=no"
		];
		in
		bash.runCommand "${pname}-${version}"
		@@ -68,6 +71,7 @@ bash.runCommand "${pname}-${version}"
		# Configure
		export CC="tcc -B ${tinycc.libs}/lib"
		export LD=tcc
		export LDFLAGS="-L ./lib"
		bash ./configure ${lib.concatStringsSep " " configureFlags}

		# Build

pkgs/os-specific/linux/minimal-bootstrap/default.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ lib.makeScope

		gawk-mes = callPackage ./gawk/mes.nix {
		bash = bash_2_05;
		tinycc = tinycc-mes;
		tinycc = tinycc-bootstrappable;
		gnused = gnused-mes;
		};

		@@ -123,7 +123,7 @@ lib.makeScope
		tinycc = tinycc-mes;
		};

		gnumake = callPackage ./gnumake { tinycc = tinycc-mes; };
		gnumake = callPackage ./gnumake { tinycc = tinycc-bootstrappable; };

		gnumake-musl = callPackage ./gnumake/musl.nix {
		bash = bash_2_05;
		@@ -141,7 +141,7 @@ lib.makeScope
		};
		gnused-mes = callPackage ./gnused/mes.nix {
		bash = bash_2_05;
		tinycc = tinycc-mes;
		tinycc = tinycc-bootstrappable;
		};

		gnutar = callPackage ./gnutar/mes.nix {
		@@ -165,13 +165,13 @@ lib.makeScope

		gzip = callPackage ./gzip {
		bash = bash_2_05;
		tinycc = tinycc-mes;
		tinycc = tinycc-bootstrappable;
		gnused = gnused-mes;
		};

		heirloom = callPackage ./heirloom {
		bash = bash_2_05;
		tinycc = tinycc-mes;
		tinycc = tinycc-bootstrappable;
		};

		heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; };

pkgs/os-specific/linux/minimal-bootstrap/heirloom/stubs.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -28,15 +28,6 @@ int mkstemp(char *t)
		return fd;
		}

		int putenv(char *string)
		{
		return 0;
		}

		char* realpath (char* path, char* resolved) {
		return NULL;
		}

		#define strncasecmp(a,b,n) strncmp(strupr(a),strupr(b),n)

pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix

+10 −7

Original line number	Diff line number	Diff line
		@@ -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"

Admin message