From d0594d2f4230dcd59182245e15ad7c35fae6ee41 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Tue, 25 Apr 2023 17:04:01 +1000 Subject: [PATCH] minimal-bootstrap: rename from trusting-trust --- .../linux/{trusting-trust => minimal-bootstrap}/default.nix | 0 .../linux/{trusting-trust => minimal-bootstrap}/mes/config.h | 0 .../{trusting-trust => minimal-bootstrap}/mes/default.nix | 0 .../stage0-posix/default.nix | 0 .../stage0-posix/hex0.nix | 0 .../stage0-posix/kaem-minimal.nix | 0 .../stage0-posix/mescc-tools-extra/build.kaem | 0 .../stage0-posix/mescc-tools-extra/default.nix | 0 .../stage0-posix/mescc-tools/build.kaem | 0 .../stage0-posix/mescc-tools/default.nix | 0 .../stage0-posix/sources.nix | 0 .../stage0-posix/stage0-posix-x86.nix | 0 .../stage0-posix/utils.nix | 0 .../tinycc/bootstrappable.nix | 0 .../{trusting-trust => minimal-bootstrap}/tinycc/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 16 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/default.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/mes/config.h (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/mes/default.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/default.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/hex0.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/kaem-minimal.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/mescc-tools-extra/build.kaem (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/mescc-tools-extra/default.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/mescc-tools/build.kaem (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/mescc-tools/default.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/sources.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/stage0-posix-x86.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/stage0-posix/utils.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/tinycc/bootstrappable.nix (100%) rename pkgs/os-specific/linux/{trusting-trust => minimal-bootstrap}/tinycc/default.nix (100%) diff --git a/pkgs/os-specific/linux/trusting-trust/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/default.nix rename to pkgs/os-specific/linux/minimal-bootstrap/default.nix diff --git a/pkgs/os-specific/linux/trusting-trust/mes/config.h b/pkgs/os-specific/linux/minimal-bootstrap/mes/config.h similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/mes/config.h rename to pkgs/os-specific/linux/minimal-bootstrap/mes/config.h diff --git a/pkgs/os-specific/linux/trusting-trust/mes/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/mes/default.nix rename to pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/default.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/hex0.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/hex0.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/kaem-minimal.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem-minimal.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/kaem-minimal.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem-minimal.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools-extra/build.kaem b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-extra/build.kaem similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools-extra/build.kaem rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-extra/build.kaem diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools-extra/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-extra/default.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools-extra/default.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-extra/default.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools/build.kaem b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools/build.kaem similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools/build.kaem rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools/build.kaem diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools/default.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/mescc-tools/default.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools/default.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/sources.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/sources.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/sources.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/stage0-posix-x86.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/stage0-posix-x86.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/stage0-posix-x86.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/stage0-posix-x86.nix diff --git a/pkgs/os-specific/linux/trusting-trust/stage0-posix/utils.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/utils.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/stage0-posix/utils.nix rename to pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/utils.nix diff --git a/pkgs/os-specific/linux/trusting-trust/tinycc/bootstrappable.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/bootstrappable.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/tinycc/bootstrappable.nix rename to pkgs/os-specific/linux/minimal-bootstrap/tinycc/bootstrappable.nix diff --git a/pkgs/os-specific/linux/trusting-trust/tinycc/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/default.nix similarity index 100% rename from pkgs/os-specific/linux/trusting-trust/tinycc/default.nix rename to pkgs/os-specific/linux/minimal-bootstrap/tinycc/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f21cec291fb6..dfdc90afaa85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26943,6 +26943,8 @@ with pkgs; metastore = callPackage ../os-specific/linux/metastore { }; + minimal-bootstrap = recurseIntoAttrs (callPackage ../os-specific/linux/minimal-bootstrap { }); + mingetty = callPackage ../os-specific/linux/mingetty { }; miraclecast = callPackage ../os-specific/linux/miraclecast { }; @@ -27459,8 +27461,6 @@ with pkgs; trust-dns = callPackage ../servers/dns/trust-dns { }; - trusting-trust = recurseIntoAttrs (callPackage ../os-specific/linux/trusting-trust { }); - trustymail = callPackage ../tools/security/trustymail { }; tunctl = callPackage ../os-specific/linux/tunctl { };