From bd26885bbdfb180fe0dac112386e410f709784e1 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:24:12 -0700 Subject: [PATCH 1/5] m2libc: init at unstable-2023-05-22 --- pkgs/by-name/m2/m2libc/package.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/m2/m2libc/package.nix diff --git a/pkgs/by-name/m2/m2libc/package.nix b/pkgs/by-name/m2/m2libc/package.nix new file mode 100644 index 000000000000..6c7b695ef715 --- /dev/null +++ b/pkgs/by-name/m2/m2libc/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2libc"; + version = "unstable-2023-05-22"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2libc"; + rev = "de7c75f144176c3b9be77695d9bf94440445aeae"; + hash = "sha256-248plvODhBRfmx7zOmf05ICbk8vzSbaceZJ0j+wPaAY="; + }; + + patches = [ + # # aarch64: syscall: mkdir -> mkdirat + # https://github.com/oriansj/M2libc/pull/17 + (fetchpatch { + url = "https://github.com/oriansj/M2libc/commit/ff7c3023b3ab6cfcffc5364620b25f8d0279e96b.patch"; + hash = "sha256-QAKddv4TixIQHpFa9SVu9fAkeKbzhQaxjaWzW2yJy7A="; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -r . $out/include/M2libc + + runHook postInstall + ''; + + meta = with lib; { + description = "More standards compliant C library written in M2-Planet's C subset"; + homepage = "https://github.com/oriansj/m2libc"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "riscv32-linux" "riscv64-linux" ]; + }; +}) From f1a2feaa969f830ebfaf66ec598451aff6ad1bd9 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:24:39 -0700 Subject: [PATCH 2/5] mescc-tools: init at 1.5.1 --- pkgs/by-name/me/mescc-tools/package.nix | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/me/mescc-tools/package.nix diff --git a/pkgs/by-name/me/mescc-tools/package.nix b/pkgs/by-name/me/mescc-tools/package.nix new file mode 100644 index 000000000000..635e375aa80b --- /dev/null +++ b/pkgs/by-name/me/mescc-tools/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromSavannah +, m2libc +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mescc-tools"; + version = "1.5.1"; + + src = fetchFromSavannah { + repo = "mescc-tools"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-jFDrmzsjKEQKOKlsch1ceWtzUhoJAJVyHjXGVhjE9/U="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ which ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Collection of tools written for use in bootstrapping"; + homepage = "https://savannah.nongnu.org/projects/mescc-tools"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + }; +}) From dfa6dfc5fbfa912e427905a0936aff3336dd9061 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:25:14 -0700 Subject: [PATCH 3/5] mescc-tools-extra: init at 1.3.0 --- pkgs/by-name/me/mescc-tools-extra/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/me/mescc-tools-extra/package.nix diff --git a/pkgs/by-name/me/mescc-tools-extra/package.nix b/pkgs/by-name/me/mescc-tools-extra/package.nix new file mode 100644 index 000000000000..892c185060e1 --- /dev/null +++ b/pkgs/by-name/me/mescc-tools-extra/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +, perl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mescc-tools-extra"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "mescc-tools-extra"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-LS9Eq1z+OsDF7Jq0TfF4u8jEJ5bjcLZNfKtnpIbtG20="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ perl ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Collection of tools written for use in bootstrapping"; + homepage = "https://github.com/oriansj/mescc-tools-extra"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + }; +}) From 93db87d3af9c420910a0e5b452ed9ab4f7632ecb Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:25:48 -0700 Subject: [PATCH 4/5] m2-planet: init at 1.11.0 --- pkgs/by-name/m2/m2-planet/package.nix | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/m2/m2-planet/package.nix diff --git a/pkgs/by-name/m2/m2-planet/package.nix b/pkgs/by-name/m2/m2-planet/package.nix new file mode 100644 index 000000000000..926d829ba691 --- /dev/null +++ b/pkgs/by-name/m2/m2-planet/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2-planet"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2-Planet"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-xVwUO67PlRiBj/YBnnTXFGh3jH470fcbaNjABoyYes4="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it. + hardeningDisable = [ "fortify" ]; + + installPhase = '' + runHook preInstall + + install -D bin/M2-Planet $out/bin/M2-Planet + + runHook postInstall + ''; + + meta = with lib; { + description = "PLAtform NEutral Transpiler"; + homepage = "https://github.com/oriansj/M2-Planet"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + mainProgram = "M2-Planet"; + }; +}) From cde691ddc26a5380e33c0f67bf92fc79c366f5d2 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sun, 22 Oct 2023 06:26:20 -0700 Subject: [PATCH 5/5] m2-mesoplanet: init at 1.11.0 --- pkgs/by-name/m2/m2-mesoplanet/package.nix | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/m2/m2-mesoplanet/package.nix diff --git a/pkgs/by-name/m2/m2-mesoplanet/package.nix b/pkgs/by-name/m2/m2-mesoplanet/package.nix new file mode 100644 index 000000000000..d4f7419f91f4 --- /dev/null +++ b/pkgs/by-name/m2/m2-mesoplanet/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +, mescc-tools +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2-mesoplanet"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2-Mesoplanet"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-hE7xvX84q3tk0XakveYDJhrhfBnpoItQs456NCzFfws="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it. + hardeningDisable = [ "fortify" ]; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ mescc-tools ]; + + installPhase = '' + runHook preInstall + + install -D bin/M2-Mesoplanet $out/bin/M2-Mesoplanet + + runHook postInstall + ''; + + meta = with lib; { + description = "Macro Expander Saving Our m2-PLANET"; + homepage = "https://github.com/oriansj/M2-Mesoplanet"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + mainProgram = "M2-Mesoplanet"; + }; +})