From 040494bb21e1c1d2dddf3bc0a61da9b0b56d75cf Mon Sep 17 00:00:00 2001 From: Jeff Hykin Date: Tue, 21 May 2024 23:53:33 -0400 Subject: [PATCH] new bootTools is working --- lib/.github/workflows/update.yml | 55 - lib/.gitrepo | 12 - lib/flake.nix | 5 - {lib/lib => nodes/1_lib}/.version | 0 {lib/lib => nodes/1_lib}/README.md | 0 {lib/lib => nodes/1_lib}/ascii-table.nix | 0 {lib/lib => nodes/1_lib}/asserts.nix | 0 {lib/lib => nodes/1_lib}/attrsets.nix | 12 - {lib/lib => nodes/1_lib}/cli.nix | 0 {lib/lib => nodes/1_lib}/customisation.nix | 0 {lib/lib => nodes/1_lib}/debug.nix | 0 {lib/lib => nodes/1_lib}/default.nix | 59 +- {lib/lib => nodes/1_lib}/deprecated.nix | 0 {lib/lib => nodes/1_lib}/deprecated/README.md | 0 {lib/lib => nodes/1_lib}/deprecated/misc.nix | 0 {lib/lib => nodes/1_lib}/derivations.nix | 0 {lib/lib => nodes/1_lib}/fetchers.nix | 0 {lib/lib => nodes/1_lib}/fileset/README.md | 0 {lib/lib => nodes/1_lib}/fileset/benchmark.sh | 0 {lib/lib => nodes/1_lib}/fileset/default.nix | 0 {lib/lib => nodes/1_lib}/fileset/internal.nix | 0 .../1_lib}/fileset/mock-splitRoot.nix | 0 {lib/lib => nodes/1_lib}/fileset/tests.sh | 0 {lib/lib => nodes/1_lib}/filesystem.nix | 0 {lib/lib => nodes/1_lib}/fixed-points.nix | 0 .../1_lib}/flake-version-info.nix | 0 {lib/lib => nodes/1_lib}/flake.nix | 0 {lib/lib => nodes/1_lib}/flakes.nix | 0 {lib/lib => nodes/1_lib}/generators.nix | 0 {lib/lib => nodes/1_lib}/gvariant.nix | 0 {lib/lib => nodes/1_lib}/kernel.nix | 0 {lib/lib => nodes/1_lib}/licenses.nix | 0 {lib/lib => nodes/1_lib}/lists.nix | 0 {lib/lib => nodes/1_lib}/meta.nix | 0 {lib/lib => nodes/1_lib}/minver.nix | 0 {lib/lib => nodes/1_lib}/modules.nix | 0 {lib/lib => nodes/1_lib}/options.nix | 2 - {lib/lib => nodes/1_lib}/path/README.md | 0 {lib/lib => nodes/1_lib}/path/default.nix | 0 .../1_lib}/path/tests/default.nix | 0 .../1_lib}/path/tests/generate.awk | 0 {lib/lib => nodes/1_lib}/path/tests/prop.nix | 0 {lib/lib => nodes/1_lib}/path/tests/prop.sh | 0 {lib/lib => nodes/1_lib}/path/tests/unit.nix | 0 {lib/lib => nodes/1_lib}/source-types.nix | 0 {lib/lib => nodes/1_lib}/sources.nix | 0 .../lib => nodes/1_lib}/strings-with-deps.nix | 0 {lib/lib => nodes/1_lib}/strings.nix | 0 .../1_lib}/systems/architectures.nix | 0 {lib/lib => nodes/1_lib}/systems/default.nix | 0 {lib/lib => nodes/1_lib}/systems/doubles.nix | 0 {lib/lib => nodes/1_lib}/systems/examples.nix | 0 .../1_lib}/systems/flake-systems.nix | 0 {lib/lib => nodes/1_lib}/systems/inspect.nix | 0 {lib/lib => nodes/1_lib}/systems/parse.nix | 0 .../lib => nodes/1_lib}/systems/platforms.nix | 0 .../lib => nodes/1_lib}/systems/supported.nix | 0 {lib/lib => nodes/1_lib}/tests/check-eval.nix | 0 {lib/lib => nodes/1_lib}/tests/filesystem.sh | 0 .../tests/flakes/subflakeTest/flake.nix | 0 .../flakes/subflakeTest/subflake/flake.nix | 0 .../1_lib}/tests/maintainer-module.nix | 0 .../lib => nodes/1_lib}/tests/maintainers.nix | 0 {lib/lib => nodes/1_lib}/tests/misc.nix | 0 {lib/lib => nodes/1_lib}/tests/modules.sh | 0 ...adhoc-freeformType-survives-type-merge.nix | 0 .../alias-with-priority-can-override.nix | 0 .../tests/modules/alias-with-priority.nix | 0 .../modules/attrsOf-conditional-check.nix | 0 .../tests/modules/attrsOf-lazy-check.nix | 0 .../1_lib}/tests/modules/boolByOr.nix | 0 .../1_lib}/tests/modules/class-check.nix | 0 .../tests/modules/declaration-positions.nix | 0 .../1_lib}/tests/modules/declare-attrsOf.nix | 0 .../modules/declare-attrsOfSub-any-enable.nix | 0 ...e-bare-submodule-deep-option-duplicate.nix | 0 .../declare-bare-submodule-deep-option.nix | 0 .../declare-bare-submodule-nested-option.nix | 0 .../tests/modules/declare-bare-submodule.nix | 0 .../modules/declare-coerced-value-unsound.nix | 0 .../tests/modules/declare-coerced-value.nix | 0 .../1_lib}/tests/modules/declare-either.nix | 0 .../tests/modules/declare-enable-nested.nix | 0 .../1_lib}/tests/modules/declare-enable.nix | 0 .../modules/declare-int-between-value.nix | 0 .../declare-int-positive-value-nested.nix | 0 .../modules/declare-int-positive-value.nix | 0 .../modules/declare-int-unsigned-value.nix | 0 .../tests/modules/declare-lazyAttrsOf.nix | 0 .../tests/modules/declare-mkPackageOption.nix | 0 .../1_lib}/tests/modules/declare-oneOf.nix | 0 .../1_lib}/tests/modules/declare-set.nix | 0 .../declare-submodule-via-evalModules.nix | 0 .../modules/declare-submoduleWith-modules.nix | 0 .../declare-submoduleWith-noshorthand.nix | 0 .../modules/declare-submoduleWith-path.nix | 0 .../declare-submoduleWith-shorthand.nix | 0 .../modules/declare-submoduleWith-special.nix | 0 .../1_lib}/tests/modules/declare-variants.nix | 0 .../1_lib}/tests/modules/default.nix | 0 .../tests/modules/deferred-module-error.nix | 0 .../1_lib}/tests/modules/deferred-module.nix | 0 .../modules/define-_module-args-custom.nix | 0 .../modules/define-attrsOfSub-bar-enable.nix | 0 .../tests/modules/define-attrsOfSub-bar.nix | 0 .../define-attrsOfSub-foo-enable-force.nix | 0 .../define-attrsOfSub-foo-enable-if.nix | 0 .../modules/define-attrsOfSub-foo-enable.nix | 0 .../define-attrsOfSub-foo-force-enable.nix | 0 .../define-attrsOfSub-foo-if-enable.nix | 0 .../tests/modules/define-attrsOfSub-foo.nix | 0 .../define-attrsOfSub-force-foo-enable.nix | 0 .../define-attrsOfSub-if-foo-enable.nix | 0 .../modules/define-bare-submodule-values.nix | 0 .../tests/modules/define-enable-abort.nix | 0 .../tests/modules/define-enable-force.nix | 0 .../tests/modules/define-enable-throw.nix | 0 .../modules/define-enable-with-custom-arg.nix | 0 .../define-enable-with-top-level-mkIf.nix | 0 .../1_lib}/tests/modules/define-enable.nix | 0 .../define-force-attrsOfSub-foo-enable.nix | 0 .../tests/modules/define-force-enable.nix | 0 .../define-freeform-keywords-shorthand.nix | 0 .../define-if-attrsOfSub-foo-enable.nix | 0 .../tests/modules/define-module-check.nix | 0 .../define-option-dependently-nested.nix | 0 .../modules/define-option-dependently.nix | 0 .../modules/define-settingsDict-a-is-b.nix | 0 ...define-shorthandOnlyDefinesConfig-true.nix | 0 .../define-submoduleWith-noshorthand.nix | 0 .../define-submoduleWith-shorthand.nix | 0 .../modules/define-value-int-negative.nix | 0 .../modules/define-value-int-positive.nix | 0 .../tests/modules/define-value-int-zero.nix | 0 .../tests/modules/define-value-list.nix | 0 .../modules/define-value-string-arbitrary.nix | 0 .../modules/define-value-string-bigint.nix | 0 .../define-value-string-properties.nix | 0 .../tests/modules/define-value-string.nix | 0 .../1_lib}/tests/modules/define-variant.nix | 0 .../tests/modules/disable-declare-enable.nix | 0 .../disable-define-enable-string-path.nix | 0 .../tests/modules/disable-define-enable.nix | 0 .../tests/modules/disable-enable-modules.nix | 0 .../tests/modules/disable-module-bad-key.nix | 0 .../tests/modules/disable-module-with-key.nix | 0 .../disable-module-with-toString-key.nix | 0 .../tests/modules/disable-recursive/bar.nix | 0 .../modules/disable-recursive/disable-bar.nix | 0 .../modules/disable-recursive/disable-foo.nix | 0 .../tests/modules/disable-recursive/foo.nix | 0 .../tests/modules/disable-recursive/main.nix | 0 .../1_lib}/tests/modules/doRename-basic.nix | 0 .../modules/doRename-condition-enable.nix | 0 .../modules/doRename-condition-migrated.nix | 0 .../modules/doRename-condition-no-enable.nix | 0 .../tests/modules/doRename-condition.nix | 0 .../tests/modules/doRename-warnings.nix | 0 .../1_lib}/tests/modules/docs.nix | 0 .../1_lib}/tests/modules/emptyValues.nix | 0 .../modules/error-mkOption-in-config.nix | 0 .../error-mkOption-in-submodule-config.nix | 0 .../error-nonEmptyListOf-submodule.nix | 0 .../modules/extendModules-168767-imports.nix | 0 .../1_lib}/tests/modules/freeform-attrsOf.nix | 0 .../tests/modules/freeform-lazyAttrsOf.nix | 0 .../1_lib}/tests/modules/freeform-nested.nix | 0 .../tests/modules/freeform-str-dep-unstr.nix | 0 .../tests/modules/freeform-submodules.nix | 0 .../tests/modules/freeform-unstr-dep-str.nix | 0 .../tests/modules/functionTo/list-order.nix | 0 .../modules/functionTo/merging-attrs.nix | 0 .../tests/modules/functionTo/merging-list.nix | 0 .../modules/functionTo/submodule-options.nix | 0 .../tests/modules/functionTo/trivial.nix | 0 .../tests/modules/functionTo/wrong-type.nix | 0 .../1_lib}/tests/modules/gvariant.nix | 0 .../tests/modules/import-configuration.nix | 0 .../tests/modules/import-custom-arg.nix | 0 .../tests/modules/import-from-store.nix | 0 .../tests/modules/merge-module-with-key.nix | 0 .../tests/modules/merge-typeless-option.nix | 0 .../tests/modules/module-argument-default.nix | 0 .../tests/modules/module-class-is-darwin.nix | 0 .../tests/modules/module-class-is-nixos.nix | 0 .../modules/module-imports-_type-check.nix | 0 .../1_lib}/tests/modules/optionTypeFile.nix | 0 .../tests/modules/optionTypeMerging.nix | 0 .../options-type-error-configuration.nix | 0 .../options-type-error-typical-nested.nix | 0 .../modules/options-type-error-typical.nix | 0 .../lib => nodes/1_lib}/tests/modules/raw.nix | 0 .../1_lib}/tests/modules/shorthand-meta.nix | 0 .../1_lib}/tests/modules/submoduleFiles.nix | 0 .../test-mergeAttrDefinitionsWithPrio.nix | 0 .../types-anything/attrs-coercible.nix | 0 .../modules/types-anything/equal-atoms.nix | 0 .../modules/types-anything/functions.nix | 0 .../tests/modules/types-anything/lists.nix | 0 .../tests/modules/types-anything/mk-mods.nix | 0 .../modules/types-anything/nested-attrs.nix | 0 .../modules/types-attrTag-wrong-decl.nix | 0 .../1_lib}/tests/modules/types-attrTag.nix | 0 .../1_lib}/tests/modules/types-unique.nix | 0 .../1_lib}/tests/modules/types.nix | 0 .../1_lib}/tests/nix-for-tests.nix | 0 .../tests/packages-from-directory/a.nix | 0 .../tests/packages-from-directory/b.nix | 0 .../c/my-extra-feature.patch | 0 .../c/not-a-namespace/not-a-package.nix | 0 .../packages-from-directory/c/package.nix | 0 .../c/support-definitions.nix | 0 .../my-namespace/d.nix | 0 .../my-namespace/e.nix | 0 .../my-namespace/f/package.nix | 0 .../my-namespace/my-sub-namespace/g.nix | 0 .../my-namespace/my-sub-namespace/h.nix | 0 {lib/lib => nodes/1_lib}/tests/release.nix | 0 {lib/lib => nodes/1_lib}/tests/sources.sh | 0 {lib/lib => nodes/1_lib}/tests/systems.nix | 0 {lib/lib => nodes/1_lib}/tests/teams.nix | 0 .../1_lib}/tests/test-to-plist-expected.plist | 0 .../1_lib}/tests/test-with-nix.nix | 0 {lib/lib => nodes/1_lib}/trivial.nix | 0 {lib/lib => nodes/1_lib}/types.nix | 0 {lib/lib => nodes/1_lib}/versions.nix | 0 {lib/lib => nodes/1_lib}/zip-int-bits.nix | 0 nodes/2_func_macBootTools/default.nix | 42 + .../2_func_macBootTools/static/meta.json | 0 .../2_func_macBootTools}/static/setup.json | 13 +- .../default.nix | 9 + .../static/meta.json | 3 + .../static/setup.json | 2 + .../4_drv_bootTools_darwin-x86-64/default.nix | 9 + .../static/meta.json | 3 + .../static/setup.json | 2 + pkgs/bootTools/default.nix | 1425 ----------------- 237 files changed, 123 insertions(+), 1530 deletions(-) delete mode 100644 lib/.github/workflows/update.yml delete mode 100644 lib/.gitrepo delete mode 100644 lib/flake.nix rename {lib/lib => nodes/1_lib}/.version (100%) rename {lib/lib => nodes/1_lib}/README.md (100%) rename {lib/lib => nodes/1_lib}/ascii-table.nix (100%) rename {lib/lib => nodes/1_lib}/asserts.nix (100%) rename {lib/lib => nodes/1_lib}/attrsets.nix (99%) rename {lib/lib => nodes/1_lib}/cli.nix (100%) rename {lib/lib => nodes/1_lib}/customisation.nix (100%) rename {lib/lib => nodes/1_lib}/debug.nix (100%) rename {lib/lib => nodes/1_lib}/default.nix (79%) rename {lib/lib => nodes/1_lib}/deprecated.nix (100%) rename {lib/lib => nodes/1_lib}/deprecated/README.md (100%) rename {lib/lib => nodes/1_lib}/deprecated/misc.nix (100%) rename {lib/lib => nodes/1_lib}/derivations.nix (100%) rename {lib/lib => nodes/1_lib}/fetchers.nix (100%) rename {lib/lib => nodes/1_lib}/fileset/README.md (100%) rename {lib/lib => nodes/1_lib}/fileset/benchmark.sh (100%) rename {lib/lib => nodes/1_lib}/fileset/default.nix (100%) rename {lib/lib => nodes/1_lib}/fileset/internal.nix (100%) rename {lib/lib => nodes/1_lib}/fileset/mock-splitRoot.nix (100%) rename {lib/lib => nodes/1_lib}/fileset/tests.sh (100%) rename {lib/lib => nodes/1_lib}/filesystem.nix (100%) rename {lib/lib => nodes/1_lib}/fixed-points.nix (100%) rename {lib/lib => nodes/1_lib}/flake-version-info.nix (100%) rename {lib/lib => nodes/1_lib}/flake.nix (100%) rename {lib/lib => nodes/1_lib}/flakes.nix (100%) rename {lib/lib => nodes/1_lib}/generators.nix (100%) rename {lib/lib => nodes/1_lib}/gvariant.nix (100%) rename {lib/lib => nodes/1_lib}/kernel.nix (100%) rename {lib/lib => nodes/1_lib}/licenses.nix (100%) rename {lib/lib => nodes/1_lib}/lists.nix (100%) rename {lib/lib => nodes/1_lib}/meta.nix (100%) rename {lib/lib => nodes/1_lib}/minver.nix (100%) rename {lib/lib => nodes/1_lib}/modules.nix (100%) rename {lib/lib => nodes/1_lib}/options.nix (99%) rename {lib/lib => nodes/1_lib}/path/README.md (100%) rename {lib/lib => nodes/1_lib}/path/default.nix (100%) rename {lib/lib => nodes/1_lib}/path/tests/default.nix (100%) rename {lib/lib => nodes/1_lib}/path/tests/generate.awk (100%) rename {lib/lib => nodes/1_lib}/path/tests/prop.nix (100%) rename {lib/lib => nodes/1_lib}/path/tests/prop.sh (100%) rename {lib/lib => nodes/1_lib}/path/tests/unit.nix (100%) rename {lib/lib => nodes/1_lib}/source-types.nix (100%) rename {lib/lib => nodes/1_lib}/sources.nix (100%) rename {lib/lib => nodes/1_lib}/strings-with-deps.nix (100%) rename {lib/lib => nodes/1_lib}/strings.nix (100%) rename {lib/lib => nodes/1_lib}/systems/architectures.nix (100%) rename {lib/lib => nodes/1_lib}/systems/default.nix (100%) rename {lib/lib => nodes/1_lib}/systems/doubles.nix (100%) rename {lib/lib => nodes/1_lib}/systems/examples.nix (100%) rename {lib/lib => nodes/1_lib}/systems/flake-systems.nix (100%) rename {lib/lib => nodes/1_lib}/systems/inspect.nix (100%) rename {lib/lib => nodes/1_lib}/systems/parse.nix (100%) rename {lib/lib => nodes/1_lib}/systems/platforms.nix (100%) rename {lib/lib => nodes/1_lib}/systems/supported.nix (100%) rename {lib/lib => nodes/1_lib}/tests/check-eval.nix (100%) rename {lib/lib => nodes/1_lib}/tests/filesystem.sh (100%) rename {lib/lib => nodes/1_lib}/tests/flakes/subflakeTest/flake.nix (100%) rename {lib/lib => nodes/1_lib}/tests/flakes/subflakeTest/subflake/flake.nix (100%) rename {lib/lib => nodes/1_lib}/tests/maintainer-module.nix (100%) rename {lib/lib => nodes/1_lib}/tests/maintainers.nix (100%) rename {lib/lib => nodes/1_lib}/tests/misc.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules.sh (100%) rename {lib/lib => nodes/1_lib}/tests/modules/adhoc-freeformType-survives-type-merge.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/alias-with-priority-can-override.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/alias-with-priority.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/attrsOf-conditional-check.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/attrsOf-lazy-check.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/boolByOr.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/class-check.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declaration-positions.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-attrsOf.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-attrsOfSub-any-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-bare-submodule-deep-option-duplicate.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-bare-submodule-deep-option.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-bare-submodule-nested-option.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-bare-submodule.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-coerced-value-unsound.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-coerced-value.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-either.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-enable-nested.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-int-between-value.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-int-positive-value-nested.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-int-positive-value.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-int-unsigned-value.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-lazyAttrsOf.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-mkPackageOption.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-oneOf.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-set.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-submodule-via-evalModules.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-submoduleWith-modules.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-submoduleWith-noshorthand.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-submoduleWith-path.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-submoduleWith-shorthand.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-submoduleWith-special.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/declare-variants.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/default.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/deferred-module-error.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/deferred-module.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-_module-args-custom.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-bar-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-bar.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-foo-enable-force.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-foo-enable-if.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-foo-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-foo-force-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-foo-if-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-foo.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-force-foo-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-attrsOfSub-if-foo-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-bare-submodule-values.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-enable-abort.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-enable-force.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-enable-throw.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-enable-with-custom-arg.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-enable-with-top-level-mkIf.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-force-attrsOfSub-foo-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-force-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-freeform-keywords-shorthand.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-if-attrsOfSub-foo-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-module-check.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-option-dependently-nested.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-option-dependently.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-settingsDict-a-is-b.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-shorthandOnlyDefinesConfig-true.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-submoduleWith-noshorthand.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-submoduleWith-shorthand.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-int-negative.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-int-positive.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-int-zero.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-list.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-string-arbitrary.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-string-bigint.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-string-properties.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-value-string.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/define-variant.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-declare-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-define-enable-string-path.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-define-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-enable-modules.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-module-bad-key.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-module-with-key.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-module-with-toString-key.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-recursive/bar.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-recursive/disable-bar.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-recursive/disable-foo.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-recursive/foo.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/disable-recursive/main.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/doRename-basic.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/doRename-condition-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/doRename-condition-migrated.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/doRename-condition-no-enable.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/doRename-condition.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/doRename-warnings.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/docs.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/emptyValues.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/error-mkOption-in-config.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/error-mkOption-in-submodule-config.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/error-nonEmptyListOf-submodule.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/extendModules-168767-imports.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/freeform-attrsOf.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/freeform-lazyAttrsOf.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/freeform-nested.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/freeform-str-dep-unstr.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/freeform-submodules.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/freeform-unstr-dep-str.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/functionTo/list-order.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/functionTo/merging-attrs.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/functionTo/merging-list.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/functionTo/submodule-options.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/functionTo/trivial.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/functionTo/wrong-type.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/gvariant.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/import-configuration.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/import-custom-arg.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/import-from-store.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/merge-module-with-key.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/merge-typeless-option.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/module-argument-default.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/module-class-is-darwin.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/module-class-is-nixos.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/module-imports-_type-check.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/optionTypeFile.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/optionTypeMerging.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/options-type-error-configuration.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/options-type-error-typical-nested.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/options-type-error-typical.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/raw.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/shorthand-meta.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/submoduleFiles.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/test-mergeAttrDefinitionsWithPrio.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-anything/attrs-coercible.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-anything/equal-atoms.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-anything/functions.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-anything/lists.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-anything/mk-mods.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-anything/nested-attrs.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-attrTag-wrong-decl.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-attrTag.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types-unique.nix (100%) rename {lib/lib => nodes/1_lib}/tests/modules/types.nix (100%) rename {lib/lib => nodes/1_lib}/tests/nix-for-tests.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/a.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/b.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/c/my-extra-feature.patch (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/c/package.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/c/support-definitions.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/my-namespace/d.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/my-namespace/e.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/my-namespace/f/package.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix (100%) rename {lib/lib => nodes/1_lib}/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix (100%) rename {lib/lib => nodes/1_lib}/tests/release.nix (100%) rename {lib/lib => nodes/1_lib}/tests/sources.sh (100%) rename {lib/lib => nodes/1_lib}/tests/systems.nix (100%) rename {lib/lib => nodes/1_lib}/tests/teams.nix (100%) rename {lib/lib => nodes/1_lib}/tests/test-to-plist-expected.plist (100%) rename {lib/lib => nodes/1_lib}/tests/test-with-nix.nix (100%) rename {lib/lib => nodes/1_lib}/trivial.nix (100%) rename {lib/lib => nodes/1_lib}/types.nix (100%) rename {lib/lib => nodes/1_lib}/versions.nix (100%) rename {lib/lib => nodes/1_lib}/zip-int-bits.nix (100%) create mode 100644 nodes/2_func_macBootTools/default.nix rename pkgs/bootTools/static/generator_info.json => nodes/2_func_macBootTools/static/meta.json (100%) rename {pkgs/bootTools => nodes/2_func_macBootTools}/static/setup.json (93%) create mode 100644 nodes/3_drv_bootTools_darwin-aarch-64/default.nix create mode 100644 nodes/3_drv_bootTools_darwin-aarch-64/static/meta.json create mode 100644 nodes/3_drv_bootTools_darwin-aarch-64/static/setup.json create mode 100644 nodes/4_drv_bootTools_darwin-x86-64/default.nix create mode 100644 nodes/4_drv_bootTools_darwin-x86-64/static/meta.json create mode 100644 nodes/4_drv_bootTools_darwin-x86-64/static/setup.json delete mode 100644 pkgs/bootTools/default.nix diff --git a/lib/.github/workflows/update.yml b/lib/.github/workflows/update.yml deleted file mode 100644 index c68f7aa..0000000 --- a/lib/.github/workflows/update.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Update - -on: - workflow_dispatch: - schedule: - - cron: '0 0 * * SUN' # every sunday - -jobs: - update: - name: Pull in latest lib from Nixpkgs - runs-on: ubuntu-latest - steps: - - - name: Procure Nix - uses: cachix/install-nix-action@v21 - - - name: Checkout - uses: actions/checkout@v2 - with: - ref: master - path: nixpkgs-lib - - - name: Checkout nixpkgs repo - uses: actions/checkout@v2 - with: - ref: master - repository: NixOS/nixpkgs - path: nixpkgs - fetch-depth: 0 # complete history - - - name: Procure git-filter-repo from nixpkgs - run: "nix profile install nixpkgs#git-filter-repo" - - - - name: Filter nixpkgs on ./lib - run: | - cd ./nixpkgs - git filter-repo --path lib --force - - - name: Update nixpkgs.lib - run: | - cd ./nixpkgs-lib - git remote add other ../nixpkgs/ - git fetch other master - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git merge -X theirs --allow-unrelated-histories other/master - - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - directory: nixpkgs-lib - branch: master - diff --git a/lib/.gitrepo b/lib/.gitrepo deleted file mode 100644 index 206fc37..0000000 --- a/lib/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme -; -[subrepo] - remote = git@github.com:nix-community/nixpkgs.lib.git - branch = master - commit = 0df131b5ee4d928a4b664b6d0cd99cf134d6ab6b - parent = 91911cb4385d8950614656373e3d82b9da997f06 - method = merge - cmdver = 0.4.5 diff --git a/lib/flake.nix b/lib/flake.nix deleted file mode 100644 index 76dae9f..0000000 --- a/lib/flake.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - description = "A cheap & continously rebased fork of nixpkgs.lib"; - - outputs = { self }: { lib = import ./lib; }; -} diff --git a/lib/lib/.version b/nodes/1_lib/.version similarity index 100% rename from lib/lib/.version rename to nodes/1_lib/.version diff --git a/lib/lib/README.md b/nodes/1_lib/README.md similarity index 100% rename from lib/lib/README.md rename to nodes/1_lib/README.md diff --git a/lib/lib/ascii-table.nix b/nodes/1_lib/ascii-table.nix similarity index 100% rename from lib/lib/ascii-table.nix rename to nodes/1_lib/ascii-table.nix diff --git a/lib/lib/asserts.nix b/nodes/1_lib/asserts.nix similarity index 100% rename from lib/lib/asserts.nix rename to nodes/1_lib/asserts.nix diff --git a/lib/lib/attrsets.nix b/nodes/1_lib/attrsets.nix similarity index 99% rename from lib/lib/attrsets.nix rename to nodes/1_lib/attrsets.nix index 83f8d0f..219a58e 100644 --- a/lib/lib/attrsets.nix +++ b/nodes/1_lib/attrsets.nix @@ -2025,16 +2025,4 @@ rec { intersection; in (x // y) // mask; - - # DEPRECATED - zipWithNames = warn - "lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames; - - # DEPRECATED - zip = warn - "lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith; - - # DEPRECATED - cartesianProductOfSets = warnIf (isInOldestRelease 2405) - "lib.cartesianProductOfSets is a deprecated alias of lib.cartesianProduct." cartesianProduct; } diff --git a/lib/lib/cli.nix b/nodes/1_lib/cli.nix similarity index 100% rename from lib/lib/cli.nix rename to nodes/1_lib/cli.nix diff --git a/lib/lib/customisation.nix b/nodes/1_lib/customisation.nix similarity index 100% rename from lib/lib/customisation.nix rename to nodes/1_lib/customisation.nix diff --git a/lib/lib/debug.nix b/nodes/1_lib/debug.nix similarity index 100% rename from lib/lib/debug.nix rename to nodes/1_lib/debug.nix diff --git a/lib/lib/default.nix b/nodes/1_lib/default.nix similarity index 79% rename from lib/lib/default.nix rename to nodes/1_lib/default.nix index d5d47de..b597fe9 100644 --- a/lib/lib/default.nix +++ b/nodes/1_lib/default.nix @@ -9,8 +9,44 @@ let lib = makeExtensible (self: let callLibs = file: import file { lib = self; }; + loadNode = (root: folder: + let + static = { + setup = builtins.fromJSON builtins.readFile ( "${root}/${folder}/static/setup.json" ); + dependencies = builtins.fromJSON builtins.readFile ( "${root}/${folder}/static/dependencies.json" ); + meta = builtins.fromJSON builtins.readFile ( "${root}/${folder}/static/meta.json" ); + }; + _nodeNames = (builtins.attrNames static.dependencies.nodes); + in + # basecase + if (builtins.length _nodeNames) == 0 + then + { + static = static; + value = import "${root}/${folder}/default.nix"; + dependencies = {}; + } + # recursive case + else + { + static = static; + value = import "${root}/${folder}/default.nix"; + dependencies.nodes = (builtins.listToAttrs + (builtins.map + (nodeName: + { + name = nodeName; + value = (loadNode root nodeName).value; + } + ) + _nodeNames + ) + ); + } + ); in { - + builtins = builtins; + # often used, or depending on very little trivial = callLibs ./trivial.nix; fixedPoints = callLibs ./fixed-points.nix; @@ -47,7 +83,6 @@ let # misc asserts = callLibs ./asserts.nix; debug = callLibs ./debug.nix; - misc = callLibs ./deprecated/misc.nix; # domain-specific fetchers = callLibs ./fetchers.nix; @@ -138,7 +173,6 @@ let mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule mkDerivedConfig doRename mkAliasOptionModuleMD; - evalOptionValue = lib.warn "External use of `lib.evalOptionValue` is deprecated. If your use case isn't covered by non-deprecated functions, we'd like to know more and perhaps support your use case well, instead of providing access to these low level functions. In this case please open an issue in https://github.com/nixos/nixpkgs/issues/." self.modules.evalOptionValue; inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption getValues getFiles @@ -155,17 +189,16 @@ let traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN runTests testAllTrue; - inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs - maybeAttrNullable maybeAttr ifEnable checkFlag getValue - checkReqs uniqList uniqListExt condConcat lazyGenericClosure - innerModifySumArgs modifySumArgs innerClosePropagation - closePropagation mapAttrsFlatten nvs setAttr setAttrMerge - mergeAttrsWithFunc mergeAttrsConcatenateValues - mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults - mergeAttrsByFuncDefaultsClean mergeAttrBy - fakeHash fakeSha256 fakeSha512 - nixType imap; inherit (self.versions) splitVersion; + + loadStatic = (folder: + { + setup = builtins.fromJSON ( builtins.readFile "${folder}/static/setup.json" ); + dependencies = builtins.fromJSON ( builtins.readFile "${folder}/static/dependencies.json" ); + meta = builtins.fromJSON ( builtins.readFile "${folder}/static/meta.json" ); + } + ); + loadNode = loadNode; }); in lib diff --git a/lib/lib/deprecated.nix b/nodes/1_lib/deprecated.nix similarity index 100% rename from lib/lib/deprecated.nix rename to nodes/1_lib/deprecated.nix diff --git a/lib/lib/deprecated/README.md b/nodes/1_lib/deprecated/README.md similarity index 100% rename from lib/lib/deprecated/README.md rename to nodes/1_lib/deprecated/README.md diff --git a/lib/lib/deprecated/misc.nix b/nodes/1_lib/deprecated/misc.nix similarity index 100% rename from lib/lib/deprecated/misc.nix rename to nodes/1_lib/deprecated/misc.nix diff --git a/lib/lib/derivations.nix b/nodes/1_lib/derivations.nix similarity index 100% rename from lib/lib/derivations.nix rename to nodes/1_lib/derivations.nix diff --git a/lib/lib/fetchers.nix b/nodes/1_lib/fetchers.nix similarity index 100% rename from lib/lib/fetchers.nix rename to nodes/1_lib/fetchers.nix diff --git a/lib/lib/fileset/README.md b/nodes/1_lib/fileset/README.md similarity index 100% rename from lib/lib/fileset/README.md rename to nodes/1_lib/fileset/README.md diff --git a/lib/lib/fileset/benchmark.sh b/nodes/1_lib/fileset/benchmark.sh similarity index 100% rename from lib/lib/fileset/benchmark.sh rename to nodes/1_lib/fileset/benchmark.sh diff --git a/lib/lib/fileset/default.nix b/nodes/1_lib/fileset/default.nix similarity index 100% rename from lib/lib/fileset/default.nix rename to nodes/1_lib/fileset/default.nix diff --git a/lib/lib/fileset/internal.nix b/nodes/1_lib/fileset/internal.nix similarity index 100% rename from lib/lib/fileset/internal.nix rename to nodes/1_lib/fileset/internal.nix diff --git a/lib/lib/fileset/mock-splitRoot.nix b/nodes/1_lib/fileset/mock-splitRoot.nix similarity index 100% rename from lib/lib/fileset/mock-splitRoot.nix rename to nodes/1_lib/fileset/mock-splitRoot.nix diff --git a/lib/lib/fileset/tests.sh b/nodes/1_lib/fileset/tests.sh similarity index 100% rename from lib/lib/fileset/tests.sh rename to nodes/1_lib/fileset/tests.sh diff --git a/lib/lib/filesystem.nix b/nodes/1_lib/filesystem.nix similarity index 100% rename from lib/lib/filesystem.nix rename to nodes/1_lib/filesystem.nix diff --git a/lib/lib/fixed-points.nix b/nodes/1_lib/fixed-points.nix similarity index 100% rename from lib/lib/fixed-points.nix rename to nodes/1_lib/fixed-points.nix diff --git a/lib/lib/flake-version-info.nix b/nodes/1_lib/flake-version-info.nix similarity index 100% rename from lib/lib/flake-version-info.nix rename to nodes/1_lib/flake-version-info.nix diff --git a/lib/lib/flake.nix b/nodes/1_lib/flake.nix similarity index 100% rename from lib/lib/flake.nix rename to nodes/1_lib/flake.nix diff --git a/lib/lib/flakes.nix b/nodes/1_lib/flakes.nix similarity index 100% rename from lib/lib/flakes.nix rename to nodes/1_lib/flakes.nix diff --git a/lib/lib/generators.nix b/nodes/1_lib/generators.nix similarity index 100% rename from lib/lib/generators.nix rename to nodes/1_lib/generators.nix diff --git a/lib/lib/gvariant.nix b/nodes/1_lib/gvariant.nix similarity index 100% rename from lib/lib/gvariant.nix rename to nodes/1_lib/gvariant.nix diff --git a/lib/lib/kernel.nix b/nodes/1_lib/kernel.nix similarity index 100% rename from lib/lib/kernel.nix rename to nodes/1_lib/kernel.nix diff --git a/lib/lib/licenses.nix b/nodes/1_lib/licenses.nix similarity index 100% rename from lib/lib/licenses.nix rename to nodes/1_lib/licenses.nix diff --git a/lib/lib/lists.nix b/nodes/1_lib/lists.nix similarity index 100% rename from lib/lib/lists.nix rename to nodes/1_lib/lists.nix diff --git a/lib/lib/meta.nix b/nodes/1_lib/meta.nix similarity index 100% rename from lib/lib/meta.nix rename to nodes/1_lib/meta.nix diff --git a/lib/lib/minver.nix b/nodes/1_lib/minver.nix similarity index 100% rename from lib/lib/minver.nix rename to nodes/1_lib/minver.nix diff --git a/lib/lib/modules.nix b/nodes/1_lib/modules.nix similarity index 100% rename from lib/lib/modules.nix rename to nodes/1_lib/modules.nix diff --git a/lib/lib/options.nix b/nodes/1_lib/options.nix similarity index 99% rename from lib/lib/options.nix rename to nodes/1_lib/options.nix index 7e64e6e..f6b7c78 100644 --- a/lib/lib/options.nix +++ b/nodes/1_lib/options.nix @@ -397,8 +397,6 @@ rec { if ! isString text then throw "literalExpression expects a string." else { _type = "literalExpression"; inherit text; }; - literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression; - /* Transition marker for documentation that's already migrated to markdown syntax. Has been a no-op for some while and been removed from nixpkgs. Kept here to alert downstream users who may not be aware of the migration's diff --git a/lib/lib/path/README.md b/nodes/1_lib/path/README.md similarity index 100% rename from lib/lib/path/README.md rename to nodes/1_lib/path/README.md diff --git a/lib/lib/path/default.nix b/nodes/1_lib/path/default.nix similarity index 100% rename from lib/lib/path/default.nix rename to nodes/1_lib/path/default.nix diff --git a/lib/lib/path/tests/default.nix b/nodes/1_lib/path/tests/default.nix similarity index 100% rename from lib/lib/path/tests/default.nix rename to nodes/1_lib/path/tests/default.nix diff --git a/lib/lib/path/tests/generate.awk b/nodes/1_lib/path/tests/generate.awk similarity index 100% rename from lib/lib/path/tests/generate.awk rename to nodes/1_lib/path/tests/generate.awk diff --git a/lib/lib/path/tests/prop.nix b/nodes/1_lib/path/tests/prop.nix similarity index 100% rename from lib/lib/path/tests/prop.nix rename to nodes/1_lib/path/tests/prop.nix diff --git a/lib/lib/path/tests/prop.sh b/nodes/1_lib/path/tests/prop.sh similarity index 100% rename from lib/lib/path/tests/prop.sh rename to nodes/1_lib/path/tests/prop.sh diff --git a/lib/lib/path/tests/unit.nix b/nodes/1_lib/path/tests/unit.nix similarity index 100% rename from lib/lib/path/tests/unit.nix rename to nodes/1_lib/path/tests/unit.nix diff --git a/lib/lib/source-types.nix b/nodes/1_lib/source-types.nix similarity index 100% rename from lib/lib/source-types.nix rename to nodes/1_lib/source-types.nix diff --git a/lib/lib/sources.nix b/nodes/1_lib/sources.nix similarity index 100% rename from lib/lib/sources.nix rename to nodes/1_lib/sources.nix diff --git a/lib/lib/strings-with-deps.nix b/nodes/1_lib/strings-with-deps.nix similarity index 100% rename from lib/lib/strings-with-deps.nix rename to nodes/1_lib/strings-with-deps.nix diff --git a/lib/lib/strings.nix b/nodes/1_lib/strings.nix similarity index 100% rename from lib/lib/strings.nix rename to nodes/1_lib/strings.nix diff --git a/lib/lib/systems/architectures.nix b/nodes/1_lib/systems/architectures.nix similarity index 100% rename from lib/lib/systems/architectures.nix rename to nodes/1_lib/systems/architectures.nix diff --git a/lib/lib/systems/default.nix b/nodes/1_lib/systems/default.nix similarity index 100% rename from lib/lib/systems/default.nix rename to nodes/1_lib/systems/default.nix diff --git a/lib/lib/systems/doubles.nix b/nodes/1_lib/systems/doubles.nix similarity index 100% rename from lib/lib/systems/doubles.nix rename to nodes/1_lib/systems/doubles.nix diff --git a/lib/lib/systems/examples.nix b/nodes/1_lib/systems/examples.nix similarity index 100% rename from lib/lib/systems/examples.nix rename to nodes/1_lib/systems/examples.nix diff --git a/lib/lib/systems/flake-systems.nix b/nodes/1_lib/systems/flake-systems.nix similarity index 100% rename from lib/lib/systems/flake-systems.nix rename to nodes/1_lib/systems/flake-systems.nix diff --git a/lib/lib/systems/inspect.nix b/nodes/1_lib/systems/inspect.nix similarity index 100% rename from lib/lib/systems/inspect.nix rename to nodes/1_lib/systems/inspect.nix diff --git a/lib/lib/systems/parse.nix b/nodes/1_lib/systems/parse.nix similarity index 100% rename from lib/lib/systems/parse.nix rename to nodes/1_lib/systems/parse.nix diff --git a/lib/lib/systems/platforms.nix b/nodes/1_lib/systems/platforms.nix similarity index 100% rename from lib/lib/systems/platforms.nix rename to nodes/1_lib/systems/platforms.nix diff --git a/lib/lib/systems/supported.nix b/nodes/1_lib/systems/supported.nix similarity index 100% rename from lib/lib/systems/supported.nix rename to nodes/1_lib/systems/supported.nix diff --git a/lib/lib/tests/check-eval.nix b/nodes/1_lib/tests/check-eval.nix similarity index 100% rename from lib/lib/tests/check-eval.nix rename to nodes/1_lib/tests/check-eval.nix diff --git a/lib/lib/tests/filesystem.sh b/nodes/1_lib/tests/filesystem.sh similarity index 100% rename from lib/lib/tests/filesystem.sh rename to nodes/1_lib/tests/filesystem.sh diff --git a/lib/lib/tests/flakes/subflakeTest/flake.nix b/nodes/1_lib/tests/flakes/subflakeTest/flake.nix similarity index 100% rename from lib/lib/tests/flakes/subflakeTest/flake.nix rename to nodes/1_lib/tests/flakes/subflakeTest/flake.nix diff --git a/lib/lib/tests/flakes/subflakeTest/subflake/flake.nix b/nodes/1_lib/tests/flakes/subflakeTest/subflake/flake.nix similarity index 100% rename from lib/lib/tests/flakes/subflakeTest/subflake/flake.nix rename to nodes/1_lib/tests/flakes/subflakeTest/subflake/flake.nix diff --git a/lib/lib/tests/maintainer-module.nix b/nodes/1_lib/tests/maintainer-module.nix similarity index 100% rename from lib/lib/tests/maintainer-module.nix rename to nodes/1_lib/tests/maintainer-module.nix diff --git a/lib/lib/tests/maintainers.nix b/nodes/1_lib/tests/maintainers.nix similarity index 100% rename from lib/lib/tests/maintainers.nix rename to nodes/1_lib/tests/maintainers.nix diff --git a/lib/lib/tests/misc.nix b/nodes/1_lib/tests/misc.nix similarity index 100% rename from lib/lib/tests/misc.nix rename to nodes/1_lib/tests/misc.nix diff --git a/lib/lib/tests/modules.sh b/nodes/1_lib/tests/modules.sh similarity index 100% rename from lib/lib/tests/modules.sh rename to nodes/1_lib/tests/modules.sh diff --git a/lib/lib/tests/modules/adhoc-freeformType-survives-type-merge.nix b/nodes/1_lib/tests/modules/adhoc-freeformType-survives-type-merge.nix similarity index 100% rename from lib/lib/tests/modules/adhoc-freeformType-survives-type-merge.nix rename to nodes/1_lib/tests/modules/adhoc-freeformType-survives-type-merge.nix diff --git a/lib/lib/tests/modules/alias-with-priority-can-override.nix b/nodes/1_lib/tests/modules/alias-with-priority-can-override.nix similarity index 100% rename from lib/lib/tests/modules/alias-with-priority-can-override.nix rename to nodes/1_lib/tests/modules/alias-with-priority-can-override.nix diff --git a/lib/lib/tests/modules/alias-with-priority.nix b/nodes/1_lib/tests/modules/alias-with-priority.nix similarity index 100% rename from lib/lib/tests/modules/alias-with-priority.nix rename to nodes/1_lib/tests/modules/alias-with-priority.nix diff --git a/lib/lib/tests/modules/attrsOf-conditional-check.nix b/nodes/1_lib/tests/modules/attrsOf-conditional-check.nix similarity index 100% rename from lib/lib/tests/modules/attrsOf-conditional-check.nix rename to nodes/1_lib/tests/modules/attrsOf-conditional-check.nix diff --git a/lib/lib/tests/modules/attrsOf-lazy-check.nix b/nodes/1_lib/tests/modules/attrsOf-lazy-check.nix similarity index 100% rename from lib/lib/tests/modules/attrsOf-lazy-check.nix rename to nodes/1_lib/tests/modules/attrsOf-lazy-check.nix diff --git a/lib/lib/tests/modules/boolByOr.nix b/nodes/1_lib/tests/modules/boolByOr.nix similarity index 100% rename from lib/lib/tests/modules/boolByOr.nix rename to nodes/1_lib/tests/modules/boolByOr.nix diff --git a/lib/lib/tests/modules/class-check.nix b/nodes/1_lib/tests/modules/class-check.nix similarity index 100% rename from lib/lib/tests/modules/class-check.nix rename to nodes/1_lib/tests/modules/class-check.nix diff --git a/lib/lib/tests/modules/declaration-positions.nix b/nodes/1_lib/tests/modules/declaration-positions.nix similarity index 100% rename from lib/lib/tests/modules/declaration-positions.nix rename to nodes/1_lib/tests/modules/declaration-positions.nix diff --git a/lib/lib/tests/modules/declare-attrsOf.nix b/nodes/1_lib/tests/modules/declare-attrsOf.nix similarity index 100% rename from lib/lib/tests/modules/declare-attrsOf.nix rename to nodes/1_lib/tests/modules/declare-attrsOf.nix diff --git a/lib/lib/tests/modules/declare-attrsOfSub-any-enable.nix b/nodes/1_lib/tests/modules/declare-attrsOfSub-any-enable.nix similarity index 100% rename from lib/lib/tests/modules/declare-attrsOfSub-any-enable.nix rename to nodes/1_lib/tests/modules/declare-attrsOfSub-any-enable.nix diff --git a/lib/lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix b/nodes/1_lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix similarity index 100% rename from lib/lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix rename to nodes/1_lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix diff --git a/lib/lib/tests/modules/declare-bare-submodule-deep-option.nix b/nodes/1_lib/tests/modules/declare-bare-submodule-deep-option.nix similarity index 100% rename from lib/lib/tests/modules/declare-bare-submodule-deep-option.nix rename to nodes/1_lib/tests/modules/declare-bare-submodule-deep-option.nix diff --git a/lib/lib/tests/modules/declare-bare-submodule-nested-option.nix b/nodes/1_lib/tests/modules/declare-bare-submodule-nested-option.nix similarity index 100% rename from lib/lib/tests/modules/declare-bare-submodule-nested-option.nix rename to nodes/1_lib/tests/modules/declare-bare-submodule-nested-option.nix diff --git a/lib/lib/tests/modules/declare-bare-submodule.nix b/nodes/1_lib/tests/modules/declare-bare-submodule.nix similarity index 100% rename from lib/lib/tests/modules/declare-bare-submodule.nix rename to nodes/1_lib/tests/modules/declare-bare-submodule.nix diff --git a/lib/lib/tests/modules/declare-coerced-value-unsound.nix b/nodes/1_lib/tests/modules/declare-coerced-value-unsound.nix similarity index 100% rename from lib/lib/tests/modules/declare-coerced-value-unsound.nix rename to nodes/1_lib/tests/modules/declare-coerced-value-unsound.nix diff --git a/lib/lib/tests/modules/declare-coerced-value.nix b/nodes/1_lib/tests/modules/declare-coerced-value.nix similarity index 100% rename from lib/lib/tests/modules/declare-coerced-value.nix rename to nodes/1_lib/tests/modules/declare-coerced-value.nix diff --git a/lib/lib/tests/modules/declare-either.nix b/nodes/1_lib/tests/modules/declare-either.nix similarity index 100% rename from lib/lib/tests/modules/declare-either.nix rename to nodes/1_lib/tests/modules/declare-either.nix diff --git a/lib/lib/tests/modules/declare-enable-nested.nix b/nodes/1_lib/tests/modules/declare-enable-nested.nix similarity index 100% rename from lib/lib/tests/modules/declare-enable-nested.nix rename to nodes/1_lib/tests/modules/declare-enable-nested.nix diff --git a/lib/lib/tests/modules/declare-enable.nix b/nodes/1_lib/tests/modules/declare-enable.nix similarity index 100% rename from lib/lib/tests/modules/declare-enable.nix rename to nodes/1_lib/tests/modules/declare-enable.nix diff --git a/lib/lib/tests/modules/declare-int-between-value.nix b/nodes/1_lib/tests/modules/declare-int-between-value.nix similarity index 100% rename from lib/lib/tests/modules/declare-int-between-value.nix rename to nodes/1_lib/tests/modules/declare-int-between-value.nix diff --git a/lib/lib/tests/modules/declare-int-positive-value-nested.nix b/nodes/1_lib/tests/modules/declare-int-positive-value-nested.nix similarity index 100% rename from lib/lib/tests/modules/declare-int-positive-value-nested.nix rename to nodes/1_lib/tests/modules/declare-int-positive-value-nested.nix diff --git a/lib/lib/tests/modules/declare-int-positive-value.nix b/nodes/1_lib/tests/modules/declare-int-positive-value.nix similarity index 100% rename from lib/lib/tests/modules/declare-int-positive-value.nix rename to nodes/1_lib/tests/modules/declare-int-positive-value.nix diff --git a/lib/lib/tests/modules/declare-int-unsigned-value.nix b/nodes/1_lib/tests/modules/declare-int-unsigned-value.nix similarity index 100% rename from lib/lib/tests/modules/declare-int-unsigned-value.nix rename to nodes/1_lib/tests/modules/declare-int-unsigned-value.nix diff --git a/lib/lib/tests/modules/declare-lazyAttrsOf.nix b/nodes/1_lib/tests/modules/declare-lazyAttrsOf.nix similarity index 100% rename from lib/lib/tests/modules/declare-lazyAttrsOf.nix rename to nodes/1_lib/tests/modules/declare-lazyAttrsOf.nix diff --git a/lib/lib/tests/modules/declare-mkPackageOption.nix b/nodes/1_lib/tests/modules/declare-mkPackageOption.nix similarity index 100% rename from lib/lib/tests/modules/declare-mkPackageOption.nix rename to nodes/1_lib/tests/modules/declare-mkPackageOption.nix diff --git a/lib/lib/tests/modules/declare-oneOf.nix b/nodes/1_lib/tests/modules/declare-oneOf.nix similarity index 100% rename from lib/lib/tests/modules/declare-oneOf.nix rename to nodes/1_lib/tests/modules/declare-oneOf.nix diff --git a/lib/lib/tests/modules/declare-set.nix b/nodes/1_lib/tests/modules/declare-set.nix similarity index 100% rename from lib/lib/tests/modules/declare-set.nix rename to nodes/1_lib/tests/modules/declare-set.nix diff --git a/lib/lib/tests/modules/declare-submodule-via-evalModules.nix b/nodes/1_lib/tests/modules/declare-submodule-via-evalModules.nix similarity index 100% rename from lib/lib/tests/modules/declare-submodule-via-evalModules.nix rename to nodes/1_lib/tests/modules/declare-submodule-via-evalModules.nix diff --git a/lib/lib/tests/modules/declare-submoduleWith-modules.nix b/nodes/1_lib/tests/modules/declare-submoduleWith-modules.nix similarity index 100% rename from lib/lib/tests/modules/declare-submoduleWith-modules.nix rename to nodes/1_lib/tests/modules/declare-submoduleWith-modules.nix diff --git a/lib/lib/tests/modules/declare-submoduleWith-noshorthand.nix b/nodes/1_lib/tests/modules/declare-submoduleWith-noshorthand.nix similarity index 100% rename from lib/lib/tests/modules/declare-submoduleWith-noshorthand.nix rename to nodes/1_lib/tests/modules/declare-submoduleWith-noshorthand.nix diff --git a/lib/lib/tests/modules/declare-submoduleWith-path.nix b/nodes/1_lib/tests/modules/declare-submoduleWith-path.nix similarity index 100% rename from lib/lib/tests/modules/declare-submoduleWith-path.nix rename to nodes/1_lib/tests/modules/declare-submoduleWith-path.nix diff --git a/lib/lib/tests/modules/declare-submoduleWith-shorthand.nix b/nodes/1_lib/tests/modules/declare-submoduleWith-shorthand.nix similarity index 100% rename from lib/lib/tests/modules/declare-submoduleWith-shorthand.nix rename to nodes/1_lib/tests/modules/declare-submoduleWith-shorthand.nix diff --git a/lib/lib/tests/modules/declare-submoduleWith-special.nix b/nodes/1_lib/tests/modules/declare-submoduleWith-special.nix similarity index 100% rename from lib/lib/tests/modules/declare-submoduleWith-special.nix rename to nodes/1_lib/tests/modules/declare-submoduleWith-special.nix diff --git a/lib/lib/tests/modules/declare-variants.nix b/nodes/1_lib/tests/modules/declare-variants.nix similarity index 100% rename from lib/lib/tests/modules/declare-variants.nix rename to nodes/1_lib/tests/modules/declare-variants.nix diff --git a/lib/lib/tests/modules/default.nix b/nodes/1_lib/tests/modules/default.nix similarity index 100% rename from lib/lib/tests/modules/default.nix rename to nodes/1_lib/tests/modules/default.nix diff --git a/lib/lib/tests/modules/deferred-module-error.nix b/nodes/1_lib/tests/modules/deferred-module-error.nix similarity index 100% rename from lib/lib/tests/modules/deferred-module-error.nix rename to nodes/1_lib/tests/modules/deferred-module-error.nix diff --git a/lib/lib/tests/modules/deferred-module.nix b/nodes/1_lib/tests/modules/deferred-module.nix similarity index 100% rename from lib/lib/tests/modules/deferred-module.nix rename to nodes/1_lib/tests/modules/deferred-module.nix diff --git a/lib/lib/tests/modules/define-_module-args-custom.nix b/nodes/1_lib/tests/modules/define-_module-args-custom.nix similarity index 100% rename from lib/lib/tests/modules/define-_module-args-custom.nix rename to nodes/1_lib/tests/modules/define-_module-args-custom.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-bar-enable.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-bar-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-bar-enable.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-bar-enable.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-bar.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-bar.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-bar.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-bar.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-foo-enable-force.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-foo-enable-force.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-foo-enable-force.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-foo-enable-force.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-foo-enable-if.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-foo-enable-if.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-foo-enable-if.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-foo-enable-if.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-foo-enable.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-foo-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-foo-enable.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-foo-enable.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-foo-force-enable.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-foo-force-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-foo-force-enable.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-foo-force-enable.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-foo-if-enable.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-foo-if-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-foo-if-enable.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-foo-if-enable.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-foo.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-foo.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-foo.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-foo.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-force-foo-enable.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-force-foo-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-force-foo-enable.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-force-foo-enable.nix diff --git a/lib/lib/tests/modules/define-attrsOfSub-if-foo-enable.nix b/nodes/1_lib/tests/modules/define-attrsOfSub-if-foo-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-attrsOfSub-if-foo-enable.nix rename to nodes/1_lib/tests/modules/define-attrsOfSub-if-foo-enable.nix diff --git a/lib/lib/tests/modules/define-bare-submodule-values.nix b/nodes/1_lib/tests/modules/define-bare-submodule-values.nix similarity index 100% rename from lib/lib/tests/modules/define-bare-submodule-values.nix rename to nodes/1_lib/tests/modules/define-bare-submodule-values.nix diff --git a/lib/lib/tests/modules/define-enable-abort.nix b/nodes/1_lib/tests/modules/define-enable-abort.nix similarity index 100% rename from lib/lib/tests/modules/define-enable-abort.nix rename to nodes/1_lib/tests/modules/define-enable-abort.nix diff --git a/lib/lib/tests/modules/define-enable-force.nix b/nodes/1_lib/tests/modules/define-enable-force.nix similarity index 100% rename from lib/lib/tests/modules/define-enable-force.nix rename to nodes/1_lib/tests/modules/define-enable-force.nix diff --git a/lib/lib/tests/modules/define-enable-throw.nix b/nodes/1_lib/tests/modules/define-enable-throw.nix similarity index 100% rename from lib/lib/tests/modules/define-enable-throw.nix rename to nodes/1_lib/tests/modules/define-enable-throw.nix diff --git a/lib/lib/tests/modules/define-enable-with-custom-arg.nix b/nodes/1_lib/tests/modules/define-enable-with-custom-arg.nix similarity index 100% rename from lib/lib/tests/modules/define-enable-with-custom-arg.nix rename to nodes/1_lib/tests/modules/define-enable-with-custom-arg.nix diff --git a/lib/lib/tests/modules/define-enable-with-top-level-mkIf.nix b/nodes/1_lib/tests/modules/define-enable-with-top-level-mkIf.nix similarity index 100% rename from lib/lib/tests/modules/define-enable-with-top-level-mkIf.nix rename to nodes/1_lib/tests/modules/define-enable-with-top-level-mkIf.nix diff --git a/lib/lib/tests/modules/define-enable.nix b/nodes/1_lib/tests/modules/define-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-enable.nix rename to nodes/1_lib/tests/modules/define-enable.nix diff --git a/lib/lib/tests/modules/define-force-attrsOfSub-foo-enable.nix b/nodes/1_lib/tests/modules/define-force-attrsOfSub-foo-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-force-attrsOfSub-foo-enable.nix rename to nodes/1_lib/tests/modules/define-force-attrsOfSub-foo-enable.nix diff --git a/lib/lib/tests/modules/define-force-enable.nix b/nodes/1_lib/tests/modules/define-force-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-force-enable.nix rename to nodes/1_lib/tests/modules/define-force-enable.nix diff --git a/lib/lib/tests/modules/define-freeform-keywords-shorthand.nix b/nodes/1_lib/tests/modules/define-freeform-keywords-shorthand.nix similarity index 100% rename from lib/lib/tests/modules/define-freeform-keywords-shorthand.nix rename to nodes/1_lib/tests/modules/define-freeform-keywords-shorthand.nix diff --git a/lib/lib/tests/modules/define-if-attrsOfSub-foo-enable.nix b/nodes/1_lib/tests/modules/define-if-attrsOfSub-foo-enable.nix similarity index 100% rename from lib/lib/tests/modules/define-if-attrsOfSub-foo-enable.nix rename to nodes/1_lib/tests/modules/define-if-attrsOfSub-foo-enable.nix diff --git a/lib/lib/tests/modules/define-module-check.nix b/nodes/1_lib/tests/modules/define-module-check.nix similarity index 100% rename from lib/lib/tests/modules/define-module-check.nix rename to nodes/1_lib/tests/modules/define-module-check.nix diff --git a/lib/lib/tests/modules/define-option-dependently-nested.nix b/nodes/1_lib/tests/modules/define-option-dependently-nested.nix similarity index 100% rename from lib/lib/tests/modules/define-option-dependently-nested.nix rename to nodes/1_lib/tests/modules/define-option-dependently-nested.nix diff --git a/lib/lib/tests/modules/define-option-dependently.nix b/nodes/1_lib/tests/modules/define-option-dependently.nix similarity index 100% rename from lib/lib/tests/modules/define-option-dependently.nix rename to nodes/1_lib/tests/modules/define-option-dependently.nix diff --git a/lib/lib/tests/modules/define-settingsDict-a-is-b.nix b/nodes/1_lib/tests/modules/define-settingsDict-a-is-b.nix similarity index 100% rename from lib/lib/tests/modules/define-settingsDict-a-is-b.nix rename to nodes/1_lib/tests/modules/define-settingsDict-a-is-b.nix diff --git a/lib/lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix b/nodes/1_lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix similarity index 100% rename from lib/lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix rename to nodes/1_lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix diff --git a/lib/lib/tests/modules/define-submoduleWith-noshorthand.nix b/nodes/1_lib/tests/modules/define-submoduleWith-noshorthand.nix similarity index 100% rename from lib/lib/tests/modules/define-submoduleWith-noshorthand.nix rename to nodes/1_lib/tests/modules/define-submoduleWith-noshorthand.nix diff --git a/lib/lib/tests/modules/define-submoduleWith-shorthand.nix b/nodes/1_lib/tests/modules/define-submoduleWith-shorthand.nix similarity index 100% rename from lib/lib/tests/modules/define-submoduleWith-shorthand.nix rename to nodes/1_lib/tests/modules/define-submoduleWith-shorthand.nix diff --git a/lib/lib/tests/modules/define-value-int-negative.nix b/nodes/1_lib/tests/modules/define-value-int-negative.nix similarity index 100% rename from lib/lib/tests/modules/define-value-int-negative.nix rename to nodes/1_lib/tests/modules/define-value-int-negative.nix diff --git a/lib/lib/tests/modules/define-value-int-positive.nix b/nodes/1_lib/tests/modules/define-value-int-positive.nix similarity index 100% rename from lib/lib/tests/modules/define-value-int-positive.nix rename to nodes/1_lib/tests/modules/define-value-int-positive.nix diff --git a/lib/lib/tests/modules/define-value-int-zero.nix b/nodes/1_lib/tests/modules/define-value-int-zero.nix similarity index 100% rename from lib/lib/tests/modules/define-value-int-zero.nix rename to nodes/1_lib/tests/modules/define-value-int-zero.nix diff --git a/lib/lib/tests/modules/define-value-list.nix b/nodes/1_lib/tests/modules/define-value-list.nix similarity index 100% rename from lib/lib/tests/modules/define-value-list.nix rename to nodes/1_lib/tests/modules/define-value-list.nix diff --git a/lib/lib/tests/modules/define-value-string-arbitrary.nix b/nodes/1_lib/tests/modules/define-value-string-arbitrary.nix similarity index 100% rename from lib/lib/tests/modules/define-value-string-arbitrary.nix rename to nodes/1_lib/tests/modules/define-value-string-arbitrary.nix diff --git a/lib/lib/tests/modules/define-value-string-bigint.nix b/nodes/1_lib/tests/modules/define-value-string-bigint.nix similarity index 100% rename from lib/lib/tests/modules/define-value-string-bigint.nix rename to nodes/1_lib/tests/modules/define-value-string-bigint.nix diff --git a/lib/lib/tests/modules/define-value-string-properties.nix b/nodes/1_lib/tests/modules/define-value-string-properties.nix similarity index 100% rename from lib/lib/tests/modules/define-value-string-properties.nix rename to nodes/1_lib/tests/modules/define-value-string-properties.nix diff --git a/lib/lib/tests/modules/define-value-string.nix b/nodes/1_lib/tests/modules/define-value-string.nix similarity index 100% rename from lib/lib/tests/modules/define-value-string.nix rename to nodes/1_lib/tests/modules/define-value-string.nix diff --git a/lib/lib/tests/modules/define-variant.nix b/nodes/1_lib/tests/modules/define-variant.nix similarity index 100% rename from lib/lib/tests/modules/define-variant.nix rename to nodes/1_lib/tests/modules/define-variant.nix diff --git a/lib/lib/tests/modules/disable-declare-enable.nix b/nodes/1_lib/tests/modules/disable-declare-enable.nix similarity index 100% rename from lib/lib/tests/modules/disable-declare-enable.nix rename to nodes/1_lib/tests/modules/disable-declare-enable.nix diff --git a/lib/lib/tests/modules/disable-define-enable-string-path.nix b/nodes/1_lib/tests/modules/disable-define-enable-string-path.nix similarity index 100% rename from lib/lib/tests/modules/disable-define-enable-string-path.nix rename to nodes/1_lib/tests/modules/disable-define-enable-string-path.nix diff --git a/lib/lib/tests/modules/disable-define-enable.nix b/nodes/1_lib/tests/modules/disable-define-enable.nix similarity index 100% rename from lib/lib/tests/modules/disable-define-enable.nix rename to nodes/1_lib/tests/modules/disable-define-enable.nix diff --git a/lib/lib/tests/modules/disable-enable-modules.nix b/nodes/1_lib/tests/modules/disable-enable-modules.nix similarity index 100% rename from lib/lib/tests/modules/disable-enable-modules.nix rename to nodes/1_lib/tests/modules/disable-enable-modules.nix diff --git a/lib/lib/tests/modules/disable-module-bad-key.nix b/nodes/1_lib/tests/modules/disable-module-bad-key.nix similarity index 100% rename from lib/lib/tests/modules/disable-module-bad-key.nix rename to nodes/1_lib/tests/modules/disable-module-bad-key.nix diff --git a/lib/lib/tests/modules/disable-module-with-key.nix b/nodes/1_lib/tests/modules/disable-module-with-key.nix similarity index 100% rename from lib/lib/tests/modules/disable-module-with-key.nix rename to nodes/1_lib/tests/modules/disable-module-with-key.nix diff --git a/lib/lib/tests/modules/disable-module-with-toString-key.nix b/nodes/1_lib/tests/modules/disable-module-with-toString-key.nix similarity index 100% rename from lib/lib/tests/modules/disable-module-with-toString-key.nix rename to nodes/1_lib/tests/modules/disable-module-with-toString-key.nix diff --git a/lib/lib/tests/modules/disable-recursive/bar.nix b/nodes/1_lib/tests/modules/disable-recursive/bar.nix similarity index 100% rename from lib/lib/tests/modules/disable-recursive/bar.nix rename to nodes/1_lib/tests/modules/disable-recursive/bar.nix diff --git a/lib/lib/tests/modules/disable-recursive/disable-bar.nix b/nodes/1_lib/tests/modules/disable-recursive/disable-bar.nix similarity index 100% rename from lib/lib/tests/modules/disable-recursive/disable-bar.nix rename to nodes/1_lib/tests/modules/disable-recursive/disable-bar.nix diff --git a/lib/lib/tests/modules/disable-recursive/disable-foo.nix b/nodes/1_lib/tests/modules/disable-recursive/disable-foo.nix similarity index 100% rename from lib/lib/tests/modules/disable-recursive/disable-foo.nix rename to nodes/1_lib/tests/modules/disable-recursive/disable-foo.nix diff --git a/lib/lib/tests/modules/disable-recursive/foo.nix b/nodes/1_lib/tests/modules/disable-recursive/foo.nix similarity index 100% rename from lib/lib/tests/modules/disable-recursive/foo.nix rename to nodes/1_lib/tests/modules/disable-recursive/foo.nix diff --git a/lib/lib/tests/modules/disable-recursive/main.nix b/nodes/1_lib/tests/modules/disable-recursive/main.nix similarity index 100% rename from lib/lib/tests/modules/disable-recursive/main.nix rename to nodes/1_lib/tests/modules/disable-recursive/main.nix diff --git a/lib/lib/tests/modules/doRename-basic.nix b/nodes/1_lib/tests/modules/doRename-basic.nix similarity index 100% rename from lib/lib/tests/modules/doRename-basic.nix rename to nodes/1_lib/tests/modules/doRename-basic.nix diff --git a/lib/lib/tests/modules/doRename-condition-enable.nix b/nodes/1_lib/tests/modules/doRename-condition-enable.nix similarity index 100% rename from lib/lib/tests/modules/doRename-condition-enable.nix rename to nodes/1_lib/tests/modules/doRename-condition-enable.nix diff --git a/lib/lib/tests/modules/doRename-condition-migrated.nix b/nodes/1_lib/tests/modules/doRename-condition-migrated.nix similarity index 100% rename from lib/lib/tests/modules/doRename-condition-migrated.nix rename to nodes/1_lib/tests/modules/doRename-condition-migrated.nix diff --git a/lib/lib/tests/modules/doRename-condition-no-enable.nix b/nodes/1_lib/tests/modules/doRename-condition-no-enable.nix similarity index 100% rename from lib/lib/tests/modules/doRename-condition-no-enable.nix rename to nodes/1_lib/tests/modules/doRename-condition-no-enable.nix diff --git a/lib/lib/tests/modules/doRename-condition.nix b/nodes/1_lib/tests/modules/doRename-condition.nix similarity index 100% rename from lib/lib/tests/modules/doRename-condition.nix rename to nodes/1_lib/tests/modules/doRename-condition.nix diff --git a/lib/lib/tests/modules/doRename-warnings.nix b/nodes/1_lib/tests/modules/doRename-warnings.nix similarity index 100% rename from lib/lib/tests/modules/doRename-warnings.nix rename to nodes/1_lib/tests/modules/doRename-warnings.nix diff --git a/lib/lib/tests/modules/docs.nix b/nodes/1_lib/tests/modules/docs.nix similarity index 100% rename from lib/lib/tests/modules/docs.nix rename to nodes/1_lib/tests/modules/docs.nix diff --git a/lib/lib/tests/modules/emptyValues.nix b/nodes/1_lib/tests/modules/emptyValues.nix similarity index 100% rename from lib/lib/tests/modules/emptyValues.nix rename to nodes/1_lib/tests/modules/emptyValues.nix diff --git a/lib/lib/tests/modules/error-mkOption-in-config.nix b/nodes/1_lib/tests/modules/error-mkOption-in-config.nix similarity index 100% rename from lib/lib/tests/modules/error-mkOption-in-config.nix rename to nodes/1_lib/tests/modules/error-mkOption-in-config.nix diff --git a/lib/lib/tests/modules/error-mkOption-in-submodule-config.nix b/nodes/1_lib/tests/modules/error-mkOption-in-submodule-config.nix similarity index 100% rename from lib/lib/tests/modules/error-mkOption-in-submodule-config.nix rename to nodes/1_lib/tests/modules/error-mkOption-in-submodule-config.nix diff --git a/lib/lib/tests/modules/error-nonEmptyListOf-submodule.nix b/nodes/1_lib/tests/modules/error-nonEmptyListOf-submodule.nix similarity index 100% rename from lib/lib/tests/modules/error-nonEmptyListOf-submodule.nix rename to nodes/1_lib/tests/modules/error-nonEmptyListOf-submodule.nix diff --git a/lib/lib/tests/modules/extendModules-168767-imports.nix b/nodes/1_lib/tests/modules/extendModules-168767-imports.nix similarity index 100% rename from lib/lib/tests/modules/extendModules-168767-imports.nix rename to nodes/1_lib/tests/modules/extendModules-168767-imports.nix diff --git a/lib/lib/tests/modules/freeform-attrsOf.nix b/nodes/1_lib/tests/modules/freeform-attrsOf.nix similarity index 100% rename from lib/lib/tests/modules/freeform-attrsOf.nix rename to nodes/1_lib/tests/modules/freeform-attrsOf.nix diff --git a/lib/lib/tests/modules/freeform-lazyAttrsOf.nix b/nodes/1_lib/tests/modules/freeform-lazyAttrsOf.nix similarity index 100% rename from lib/lib/tests/modules/freeform-lazyAttrsOf.nix rename to nodes/1_lib/tests/modules/freeform-lazyAttrsOf.nix diff --git a/lib/lib/tests/modules/freeform-nested.nix b/nodes/1_lib/tests/modules/freeform-nested.nix similarity index 100% rename from lib/lib/tests/modules/freeform-nested.nix rename to nodes/1_lib/tests/modules/freeform-nested.nix diff --git a/lib/lib/tests/modules/freeform-str-dep-unstr.nix b/nodes/1_lib/tests/modules/freeform-str-dep-unstr.nix similarity index 100% rename from lib/lib/tests/modules/freeform-str-dep-unstr.nix rename to nodes/1_lib/tests/modules/freeform-str-dep-unstr.nix diff --git a/lib/lib/tests/modules/freeform-submodules.nix b/nodes/1_lib/tests/modules/freeform-submodules.nix similarity index 100% rename from lib/lib/tests/modules/freeform-submodules.nix rename to nodes/1_lib/tests/modules/freeform-submodules.nix diff --git a/lib/lib/tests/modules/freeform-unstr-dep-str.nix b/nodes/1_lib/tests/modules/freeform-unstr-dep-str.nix similarity index 100% rename from lib/lib/tests/modules/freeform-unstr-dep-str.nix rename to nodes/1_lib/tests/modules/freeform-unstr-dep-str.nix diff --git a/lib/lib/tests/modules/functionTo/list-order.nix b/nodes/1_lib/tests/modules/functionTo/list-order.nix similarity index 100% rename from lib/lib/tests/modules/functionTo/list-order.nix rename to nodes/1_lib/tests/modules/functionTo/list-order.nix diff --git a/lib/lib/tests/modules/functionTo/merging-attrs.nix b/nodes/1_lib/tests/modules/functionTo/merging-attrs.nix similarity index 100% rename from lib/lib/tests/modules/functionTo/merging-attrs.nix rename to nodes/1_lib/tests/modules/functionTo/merging-attrs.nix diff --git a/lib/lib/tests/modules/functionTo/merging-list.nix b/nodes/1_lib/tests/modules/functionTo/merging-list.nix similarity index 100% rename from lib/lib/tests/modules/functionTo/merging-list.nix rename to nodes/1_lib/tests/modules/functionTo/merging-list.nix diff --git a/lib/lib/tests/modules/functionTo/submodule-options.nix b/nodes/1_lib/tests/modules/functionTo/submodule-options.nix similarity index 100% rename from lib/lib/tests/modules/functionTo/submodule-options.nix rename to nodes/1_lib/tests/modules/functionTo/submodule-options.nix diff --git a/lib/lib/tests/modules/functionTo/trivial.nix b/nodes/1_lib/tests/modules/functionTo/trivial.nix similarity index 100% rename from lib/lib/tests/modules/functionTo/trivial.nix rename to nodes/1_lib/tests/modules/functionTo/trivial.nix diff --git a/lib/lib/tests/modules/functionTo/wrong-type.nix b/nodes/1_lib/tests/modules/functionTo/wrong-type.nix similarity index 100% rename from lib/lib/tests/modules/functionTo/wrong-type.nix rename to nodes/1_lib/tests/modules/functionTo/wrong-type.nix diff --git a/lib/lib/tests/modules/gvariant.nix b/nodes/1_lib/tests/modules/gvariant.nix similarity index 100% rename from lib/lib/tests/modules/gvariant.nix rename to nodes/1_lib/tests/modules/gvariant.nix diff --git a/lib/lib/tests/modules/import-configuration.nix b/nodes/1_lib/tests/modules/import-configuration.nix similarity index 100% rename from lib/lib/tests/modules/import-configuration.nix rename to nodes/1_lib/tests/modules/import-configuration.nix diff --git a/lib/lib/tests/modules/import-custom-arg.nix b/nodes/1_lib/tests/modules/import-custom-arg.nix similarity index 100% rename from lib/lib/tests/modules/import-custom-arg.nix rename to nodes/1_lib/tests/modules/import-custom-arg.nix diff --git a/lib/lib/tests/modules/import-from-store.nix b/nodes/1_lib/tests/modules/import-from-store.nix similarity index 100% rename from lib/lib/tests/modules/import-from-store.nix rename to nodes/1_lib/tests/modules/import-from-store.nix diff --git a/lib/lib/tests/modules/merge-module-with-key.nix b/nodes/1_lib/tests/modules/merge-module-with-key.nix similarity index 100% rename from lib/lib/tests/modules/merge-module-with-key.nix rename to nodes/1_lib/tests/modules/merge-module-with-key.nix diff --git a/lib/lib/tests/modules/merge-typeless-option.nix b/nodes/1_lib/tests/modules/merge-typeless-option.nix similarity index 100% rename from lib/lib/tests/modules/merge-typeless-option.nix rename to nodes/1_lib/tests/modules/merge-typeless-option.nix diff --git a/lib/lib/tests/modules/module-argument-default.nix b/nodes/1_lib/tests/modules/module-argument-default.nix similarity index 100% rename from lib/lib/tests/modules/module-argument-default.nix rename to nodes/1_lib/tests/modules/module-argument-default.nix diff --git a/lib/lib/tests/modules/module-class-is-darwin.nix b/nodes/1_lib/tests/modules/module-class-is-darwin.nix similarity index 100% rename from lib/lib/tests/modules/module-class-is-darwin.nix rename to nodes/1_lib/tests/modules/module-class-is-darwin.nix diff --git a/lib/lib/tests/modules/module-class-is-nixos.nix b/nodes/1_lib/tests/modules/module-class-is-nixos.nix similarity index 100% rename from lib/lib/tests/modules/module-class-is-nixos.nix rename to nodes/1_lib/tests/modules/module-class-is-nixos.nix diff --git a/lib/lib/tests/modules/module-imports-_type-check.nix b/nodes/1_lib/tests/modules/module-imports-_type-check.nix similarity index 100% rename from lib/lib/tests/modules/module-imports-_type-check.nix rename to nodes/1_lib/tests/modules/module-imports-_type-check.nix diff --git a/lib/lib/tests/modules/optionTypeFile.nix b/nodes/1_lib/tests/modules/optionTypeFile.nix similarity index 100% rename from lib/lib/tests/modules/optionTypeFile.nix rename to nodes/1_lib/tests/modules/optionTypeFile.nix diff --git a/lib/lib/tests/modules/optionTypeMerging.nix b/nodes/1_lib/tests/modules/optionTypeMerging.nix similarity index 100% rename from lib/lib/tests/modules/optionTypeMerging.nix rename to nodes/1_lib/tests/modules/optionTypeMerging.nix diff --git a/lib/lib/tests/modules/options-type-error-configuration.nix b/nodes/1_lib/tests/modules/options-type-error-configuration.nix similarity index 100% rename from lib/lib/tests/modules/options-type-error-configuration.nix rename to nodes/1_lib/tests/modules/options-type-error-configuration.nix diff --git a/lib/lib/tests/modules/options-type-error-typical-nested.nix b/nodes/1_lib/tests/modules/options-type-error-typical-nested.nix similarity index 100% rename from lib/lib/tests/modules/options-type-error-typical-nested.nix rename to nodes/1_lib/tests/modules/options-type-error-typical-nested.nix diff --git a/lib/lib/tests/modules/options-type-error-typical.nix b/nodes/1_lib/tests/modules/options-type-error-typical.nix similarity index 100% rename from lib/lib/tests/modules/options-type-error-typical.nix rename to nodes/1_lib/tests/modules/options-type-error-typical.nix diff --git a/lib/lib/tests/modules/raw.nix b/nodes/1_lib/tests/modules/raw.nix similarity index 100% rename from lib/lib/tests/modules/raw.nix rename to nodes/1_lib/tests/modules/raw.nix diff --git a/lib/lib/tests/modules/shorthand-meta.nix b/nodes/1_lib/tests/modules/shorthand-meta.nix similarity index 100% rename from lib/lib/tests/modules/shorthand-meta.nix rename to nodes/1_lib/tests/modules/shorthand-meta.nix diff --git a/lib/lib/tests/modules/submoduleFiles.nix b/nodes/1_lib/tests/modules/submoduleFiles.nix similarity index 100% rename from lib/lib/tests/modules/submoduleFiles.nix rename to nodes/1_lib/tests/modules/submoduleFiles.nix diff --git a/lib/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix b/nodes/1_lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix similarity index 100% rename from lib/lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix rename to nodes/1_lib/tests/modules/test-mergeAttrDefinitionsWithPrio.nix diff --git a/lib/lib/tests/modules/types-anything/attrs-coercible.nix b/nodes/1_lib/tests/modules/types-anything/attrs-coercible.nix similarity index 100% rename from lib/lib/tests/modules/types-anything/attrs-coercible.nix rename to nodes/1_lib/tests/modules/types-anything/attrs-coercible.nix diff --git a/lib/lib/tests/modules/types-anything/equal-atoms.nix b/nodes/1_lib/tests/modules/types-anything/equal-atoms.nix similarity index 100% rename from lib/lib/tests/modules/types-anything/equal-atoms.nix rename to nodes/1_lib/tests/modules/types-anything/equal-atoms.nix diff --git a/lib/lib/tests/modules/types-anything/functions.nix b/nodes/1_lib/tests/modules/types-anything/functions.nix similarity index 100% rename from lib/lib/tests/modules/types-anything/functions.nix rename to nodes/1_lib/tests/modules/types-anything/functions.nix diff --git a/lib/lib/tests/modules/types-anything/lists.nix b/nodes/1_lib/tests/modules/types-anything/lists.nix similarity index 100% rename from lib/lib/tests/modules/types-anything/lists.nix rename to nodes/1_lib/tests/modules/types-anything/lists.nix diff --git a/lib/lib/tests/modules/types-anything/mk-mods.nix b/nodes/1_lib/tests/modules/types-anything/mk-mods.nix similarity index 100% rename from lib/lib/tests/modules/types-anything/mk-mods.nix rename to nodes/1_lib/tests/modules/types-anything/mk-mods.nix diff --git a/lib/lib/tests/modules/types-anything/nested-attrs.nix b/nodes/1_lib/tests/modules/types-anything/nested-attrs.nix similarity index 100% rename from lib/lib/tests/modules/types-anything/nested-attrs.nix rename to nodes/1_lib/tests/modules/types-anything/nested-attrs.nix diff --git a/lib/lib/tests/modules/types-attrTag-wrong-decl.nix b/nodes/1_lib/tests/modules/types-attrTag-wrong-decl.nix similarity index 100% rename from lib/lib/tests/modules/types-attrTag-wrong-decl.nix rename to nodes/1_lib/tests/modules/types-attrTag-wrong-decl.nix diff --git a/lib/lib/tests/modules/types-attrTag.nix b/nodes/1_lib/tests/modules/types-attrTag.nix similarity index 100% rename from lib/lib/tests/modules/types-attrTag.nix rename to nodes/1_lib/tests/modules/types-attrTag.nix diff --git a/lib/lib/tests/modules/types-unique.nix b/nodes/1_lib/tests/modules/types-unique.nix similarity index 100% rename from lib/lib/tests/modules/types-unique.nix rename to nodes/1_lib/tests/modules/types-unique.nix diff --git a/lib/lib/tests/modules/types.nix b/nodes/1_lib/tests/modules/types.nix similarity index 100% rename from lib/lib/tests/modules/types.nix rename to nodes/1_lib/tests/modules/types.nix diff --git a/lib/lib/tests/nix-for-tests.nix b/nodes/1_lib/tests/nix-for-tests.nix similarity index 100% rename from lib/lib/tests/nix-for-tests.nix rename to nodes/1_lib/tests/nix-for-tests.nix diff --git a/lib/lib/tests/packages-from-directory/a.nix b/nodes/1_lib/tests/packages-from-directory/a.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/a.nix rename to nodes/1_lib/tests/packages-from-directory/a.nix diff --git a/lib/lib/tests/packages-from-directory/b.nix b/nodes/1_lib/tests/packages-from-directory/b.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/b.nix rename to nodes/1_lib/tests/packages-from-directory/b.nix diff --git a/lib/lib/tests/packages-from-directory/c/my-extra-feature.patch b/nodes/1_lib/tests/packages-from-directory/c/my-extra-feature.patch similarity index 100% rename from lib/lib/tests/packages-from-directory/c/my-extra-feature.patch rename to nodes/1_lib/tests/packages-from-directory/c/my-extra-feature.patch diff --git a/lib/lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix b/nodes/1_lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix rename to nodes/1_lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix diff --git a/lib/lib/tests/packages-from-directory/c/package.nix b/nodes/1_lib/tests/packages-from-directory/c/package.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/c/package.nix rename to nodes/1_lib/tests/packages-from-directory/c/package.nix diff --git a/lib/lib/tests/packages-from-directory/c/support-definitions.nix b/nodes/1_lib/tests/packages-from-directory/c/support-definitions.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/c/support-definitions.nix rename to nodes/1_lib/tests/packages-from-directory/c/support-definitions.nix diff --git a/lib/lib/tests/packages-from-directory/my-namespace/d.nix b/nodes/1_lib/tests/packages-from-directory/my-namespace/d.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/my-namespace/d.nix rename to nodes/1_lib/tests/packages-from-directory/my-namespace/d.nix diff --git a/lib/lib/tests/packages-from-directory/my-namespace/e.nix b/nodes/1_lib/tests/packages-from-directory/my-namespace/e.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/my-namespace/e.nix rename to nodes/1_lib/tests/packages-from-directory/my-namespace/e.nix diff --git a/lib/lib/tests/packages-from-directory/my-namespace/f/package.nix b/nodes/1_lib/tests/packages-from-directory/my-namespace/f/package.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/my-namespace/f/package.nix rename to nodes/1_lib/tests/packages-from-directory/my-namespace/f/package.nix diff --git a/lib/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix b/nodes/1_lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix rename to nodes/1_lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix diff --git a/lib/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix b/nodes/1_lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix similarity index 100% rename from lib/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix rename to nodes/1_lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix diff --git a/lib/lib/tests/release.nix b/nodes/1_lib/tests/release.nix similarity index 100% rename from lib/lib/tests/release.nix rename to nodes/1_lib/tests/release.nix diff --git a/lib/lib/tests/sources.sh b/nodes/1_lib/tests/sources.sh similarity index 100% rename from lib/lib/tests/sources.sh rename to nodes/1_lib/tests/sources.sh diff --git a/lib/lib/tests/systems.nix b/nodes/1_lib/tests/systems.nix similarity index 100% rename from lib/lib/tests/systems.nix rename to nodes/1_lib/tests/systems.nix diff --git a/lib/lib/tests/teams.nix b/nodes/1_lib/tests/teams.nix similarity index 100% rename from lib/lib/tests/teams.nix rename to nodes/1_lib/tests/teams.nix diff --git a/lib/lib/tests/test-to-plist-expected.plist b/nodes/1_lib/tests/test-to-plist-expected.plist similarity index 100% rename from lib/lib/tests/test-to-plist-expected.plist rename to nodes/1_lib/tests/test-to-plist-expected.plist diff --git a/lib/lib/tests/test-with-nix.nix b/nodes/1_lib/tests/test-with-nix.nix similarity index 100% rename from lib/lib/tests/test-with-nix.nix rename to nodes/1_lib/tests/test-with-nix.nix diff --git a/lib/lib/trivial.nix b/nodes/1_lib/trivial.nix similarity index 100% rename from lib/lib/trivial.nix rename to nodes/1_lib/trivial.nix diff --git a/lib/lib/types.nix b/nodes/1_lib/types.nix similarity index 100% rename from lib/lib/types.nix rename to nodes/1_lib/types.nix diff --git a/lib/lib/versions.nix b/nodes/1_lib/versions.nix similarity index 100% rename from lib/lib/versions.nix rename to nodes/1_lib/versions.nix diff --git a/lib/lib/zip-int-bits.nix b/nodes/1_lib/zip-int-bits.nix similarity index 100% rename from lib/lib/zip-int-bits.nix rename to nodes/1_lib/zip-int-bits.nix diff --git a/nodes/2_func_macBootTools/default.nix b/nodes/2_func_macBootTools/default.nix new file mode 100644 index 0000000..d66c835 --- /dev/null +++ b/nodes/2_func_macBootTools/default.nix @@ -0,0 +1,42 @@ +let # imports + lib = import ../1_lib; +in + let # package info + builtins = lib.builtins; + static = lib.loadStatic ./.; + in + (system: + let + thisSetup = static.setup.osSpecific.${system}; + bootstrapFiles = { + bootstrapTools = builtins.fetchurl { url = thisSetup.stdFetchurls.bootstrapTools.url; }; + unpack = builtins.fetchurl { url = thisSetup.stdFetchurls.unpack.url; }; + }; + pathValue = lib.makeBinPath [ + "/nix/store${(builtins.placeholder "out")}" + bootstrapFiles.unpack + ]; + in + builtins.derivation { + system = system; + name = static.packageInfo.name; + builder = "${bootstrapFiles.unpack}/bin/bash"; + + args = [ + "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" + bootstrapFiles.bootstrapTools + ]; + + PATH = pathValue; + + __impureHostDeps = [ + "/bin/sh" + "/usr/lib/libSystem.B.dylib" + "/usr/lib/system/libunc.dylib" # This dependency is "hidden", so our scanning code doesn't pick it up + ]; + # TODO: test if these work + # __contentAddressed = true; + # outputHashAlgo = "sha256"; + # outputHashMode = "recursive"; + } + ) \ No newline at end of file diff --git a/pkgs/bootTools/static/generator_info.json b/nodes/2_func_macBootTools/static/meta.json similarity index 100% rename from pkgs/bootTools/static/generator_info.json rename to nodes/2_func_macBootTools/static/meta.json diff --git a/pkgs/bootTools/static/setup.json b/nodes/2_func_macBootTools/static/setup.json similarity index 93% rename from pkgs/bootTools/static/setup.json rename to nodes/2_func_macBootTools/static/setup.json index 7bf767c..1ab6f20 100644 --- a/pkgs/bootTools/static/setup.json +++ b/nodes/2_func_macBootTools/static/setup.json @@ -1,4 +1,7 @@ { + "packageInfo": { + "name": "bootstrap-tools" + }, "osSpecific": { "darwin-x86-64": { "stdFetchurls": { @@ -9,9 +12,8 @@ "unpack": { "url": "http://tarballs.nixos.org/stdenv/x86_64-apple-darwin/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f/unpack.nar.xz", "hash": "sha256-93GK8LjjgUBknxsylfGVr0DG4AbWVIQEIWrwxhDW07k=", - "name": "unpack", - "unpack": true - }, + "name": "unpack" + } }, "stdMetadata": { "nixpkgs revision": "d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f", @@ -31,9 +33,8 @@ "unpack": { "url": "http://tarballs.nixos.org/stdenv/aarch64-apple-darwin/d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f/unpack.nar.xz", "hash": "sha256-XCVy6TMDJ1DKFnhIT1NHzdQUjY/TPKLV67Zi/ANIpms=", - "name": "unpack", - "unpack": true - }, + "name": "unpack" + } }, "stdMetadata": { "nixpkgs revision": "d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f", diff --git a/nodes/3_drv_bootTools_darwin-aarch-64/default.nix b/nodes/3_drv_bootTools_darwin-aarch-64/default.nix new file mode 100644 index 0000000..085aaf7 --- /dev/null +++ b/nodes/3_drv_bootTools_darwin-aarch-64/default.nix @@ -0,0 +1,9 @@ +let # imports + lib = import ../1_lib; + macBootTools = import ../2_func_macBootTools; +in + let # package info + builtins = lib.builtins; + static = lib.loadStatic ./.; + in + macBootTools "darwin-x86-64" \ No newline at end of file diff --git a/nodes/3_drv_bootTools_darwin-aarch-64/static/meta.json b/nodes/3_drv_bootTools_darwin-aarch-64/static/meta.json new file mode 100644 index 0000000..a0cca99 --- /dev/null +++ b/nodes/3_drv_bootTools_darwin-aarch-64/static/meta.json @@ -0,0 +1,3 @@ +{ + "generated by": null +} \ No newline at end of file diff --git a/nodes/3_drv_bootTools_darwin-aarch-64/static/setup.json b/nodes/3_drv_bootTools_darwin-aarch-64/static/setup.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/nodes/3_drv_bootTools_darwin-aarch-64/static/setup.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/nodes/4_drv_bootTools_darwin-x86-64/default.nix b/nodes/4_drv_bootTools_darwin-x86-64/default.nix new file mode 100644 index 0000000..a21fa83 --- /dev/null +++ b/nodes/4_drv_bootTools_darwin-x86-64/default.nix @@ -0,0 +1,9 @@ +let # imports + lib = import ../1_lib; + macBootTools = import ../2_func_macBootTools; +in + let # package info + builtins = lib.builtins; + static = lib.loadStatic ./.; + in + macBootTools "darwin-aarch-64" \ No newline at end of file diff --git a/nodes/4_drv_bootTools_darwin-x86-64/static/meta.json b/nodes/4_drv_bootTools_darwin-x86-64/static/meta.json new file mode 100644 index 0000000..a0cca99 --- /dev/null +++ b/nodes/4_drv_bootTools_darwin-x86-64/static/meta.json @@ -0,0 +1,3 @@ +{ + "generated by": null +} \ No newline at end of file diff --git a/nodes/4_drv_bootTools_darwin-x86-64/static/setup.json b/nodes/4_drv_bootTools_darwin-x86-64/static/setup.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/nodes/4_drv_bootTools_darwin-x86-64/static/setup.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/pkgs/bootTools/default.nix b/pkgs/bootTools/default.nix deleted file mode 100644 index 0c06791..0000000 --- a/pkgs/bootTools/default.nix +++ /dev/null @@ -1,1425 +0,0 @@ -# This file contains the standard build environment for Darwin. It is based on LLVM and is patterned -# after the Linux stdenv. It shares similar goals to the Linux standard environment in that the -# resulting environment should be built purely and not contain any references to it. -# -# For more on the design of the stdenv and updating it, see `README.md`. -# -# See also the top comments of the Linux stdenv `../linux/default.nix` for a good overview of -# the bootstrap process and working with it. -let - lib = import ../../lib; - builtins = lib.builtins; - setup = builtins.fromJSON (builtins.readFile ./static/setup.json); -in - { - "darwin-aarch-64" = ( - let - system = "aarch64-darwin"; - thisSetup = setup.osSpecific.${system}; - bootstrapFiles = { - bootstrapTools = builtins.fetchurl thisSetup.stdFetchurls.bootstrapTools; - unpack = builtins.fetchurl thisSetup.stdFetchurls.unpack; - }; - in - builtins.derivation { - system = system; - name = "bootstrap-tools"; - builder = "${bootstrapFiles.unpack}/bin/bash"; - - args = [ - "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" - bootstrapFiles.bootstrapTools - ]; - - PATH = lib.makeBinPath [ - (builtins.placeholder "out") - bootstrapFiles.unpack - ]; - - __impureHostDeps = [ - "/bin/sh" - "/usr/lib/libSystem.B.dylib" - "/usr/lib/system/libunc.dylib" # This dependency is "hidden", so our scanning code doesn't pick it up - ]; - # TODO: test if these work - # __contentAddressed = true; - # outputHashAlgo = "sha256"; - # outputHashMode = "recursive"; - } - ); - # "darwin-x86-64" = ( - # - # ); - } - -# { -# localSystem -# , crossSystem -# , config -# , overlays -# , crossOverlays ? [ ] -# # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools -# , bootstrapFiles ? if localSystem.isAarch64 then -# import ./bootstrap-files/aarch64-apple-darwin.nix -# else -# import ./bootstrap-files/x86_64-apple-darwin.nix -# }: - -# assert crossSystem == localSystem; - -# let -# inherit (localSystem) system; - -# useAppleSDKLibs = localSystem.isAarch64; - -# commonImpureHostDeps = [ -# "/bin/sh" -# "/usr/lib/libSystem.B.dylib" -# "/usr/lib/system/libunc.dylib" # This dependency is "hidden", so our scanning code doesn't pick it up -# ]; - -# isFromNixpkgs = pkg: !(isFromBootstrapFiles pkg); -# isFromBootstrapFiles = -# pkg: pkg.passthru.isFromBootstrapFiles or false; -# isBuiltByNixpkgsCompiler = -# pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc; -# isBuiltByBootstrapFilesCompiler = -# pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc; - -# commonPreHook = '' -# export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} -# export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1} -# export NIX_IGNORE_LD_THROUGH_GCC=1 -# unset SDKROOT -# ''; - -# bootstrapTools = derivation ({ -# inherit system; - -# name = "bootstrap-tools"; -# builder = "${bootstrapFiles.unpack}/bin/bash"; - -# args = [ -# "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" -# bootstrapFiles.bootstrapTools -# ]; - -# PATH = lib.makeBinPath [ -# (placeholder "out") -# bootstrapFiles.unpack -# ]; - -# __impureHostDeps = commonImpureHostDeps; -# } // lib.optionalAttrs config.contentAddressedByDefault { -# __contentAddressed = true; -# outputHashAlgo = "sha256"; -# outputHashMode = "recursive"; -# }) // { passthru.isFromBootstrapFiles = true; }; - -# stageFun = prevStage: -# { name, overrides ? (self: super: { }), extraNativeBuildInputs ? [ ], extraPreHook ? "" }: - -# let -# cc = if prevStage.llvmPackages.clang-unwrapped == null -# then null else -# lib.makeOverridable (import ../../build-support/cc-wrapper) { -# name = "${name}-clang-wrapper"; - -# nativeTools = false; -# nativeLibc = false; - -# expand-response-params = lib.optionalString -# (prevStage.stdenv.hasCC or false && prevStage.stdenv.cc != "/dev/null") -# prevStage.expand-response-params; - -# extraPackages = [ -# prevStage.llvmPackages.compiler-rt -# ]; - -# extraBuildCommands = -# let -# inherit (prevStage.llvmPackages) clang-unwrapped compiler-rt release_version; -# in -# '' -# function clangResourceRootIncludePath() { -# clangLib="$1/lib/clang" -# if (( $(ls "$clangLib" | wc -l) > 1 )); then -# echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2 -# exit 1 -# fi -# echo "$clangLib/$(ls -1 "$clangLib")/include" -# } - -# rsrc="$out/resource-root" -# mkdir "$rsrc" -# ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc" -# ln -s "${compiler-rt.out}/lib" "$rsrc/lib" -# ln -s "${compiler-rt.out}/share" "$rsrc/share" -# echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags -# ''; - -# cc = prevStage.llvmPackages.clang-unwrapped; -# bintools = prevStage.darwin.binutils; - -# isClang = true; -# libc = prevStage.darwin.Libsystem; -# inherit (prevStage.llvmPackages) libcxx; - -# inherit lib; -# inherit (prevStage) coreutils gnugrep; - -# stdenvNoCC = prevStage.ccWrapperStdenv; -# runtimeShell = prevStage.ccWrapperStdenv.shell; -# }; - -# bash = prevStage.bash or bootstrapTools; - -# thisStdenv = import ../generic { -# name = "${name}-stdenv-darwin"; - -# buildPlatform = localSystem; -# hostPlatform = localSystem; -# targetPlatform = localSystem; - -# inherit config; - -# extraBuildInputs = [ prevStage.darwin.CF ]; -# extraNativeBuildInputs = extraNativeBuildInputs -# ++ [ prevStage.darwin.apple_sdk.sdkRoot ]; - -# preHook = lib.optionalString (!isBuiltByNixpkgsCompiler bash) '' -# # Don't patch #!/interpreter because it leads to retained -# # dependencies on the bootstrapTools in the final stdenv. -# dontPatchShebangs=1 -# '' + '' -# ${commonPreHook} -# ${extraPreHook} -# '' + lib.optionalString (prevStage.darwin ? locale) '' -# export PATH_LOCALE=${prevStage.darwin.locale}/share/locale -# ''; - -# shell = bash + "/bin/bash"; -# initialPath = [ bash bootstrapTools ]; - -# fetchurlBoot = import ../../build-support/fetchurl { -# inherit lib; -# stdenvNoCC = prevStage.ccWrapperStdenv or thisStdenv; -# curl = bootstrapTools; -# }; - -# inherit cc; - -# # The stdenvs themselves don't use mkDerivation, so I need to specify this here -# __stdenvImpureHostDeps = commonImpureHostDeps; -# __extraImpureHostDeps = commonImpureHostDeps; - -# # Using the bootstrap tools curl for fetchers allows the stdenv bootstrap to avoid -# # having a dependency on curl, allowing curl to be updated without triggering a -# # new stdenv bootstrap on Darwin. -# overrides = self: super: (overrides self super) // { -# fetchurl = thisStdenv.fetchurlBoot; -# fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; }; -# fetchgit = super.fetchgit.override { -# git = super.git.override { curl = bootstrapTools; }; -# }; -# fetchzip = super.fetchzip.override { inherit (self) fetchurl; }; -# }; -# }; - -# in -# { -# inherit config overlays; -# stdenv = thisStdenv; -# }; -# in -# assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check -# [ -# ({}: { -# __raw = true; - -# coreutils = null; -# gnugrep = null; - -# pbzx = null; -# cpio = null; - -# darwin = { -# apple_sdk.sdkRoot = null; -# binutils = null; -# binutils-unwrapped = null; -# cctools = null; -# print-reexports = null; -# rewrite-tbd = null; -# sigtool = null; -# CF = null; -# Libsystem = null; -# }; - -# llvmPackages = { -# clang-unwrapped = null; -# libllvm = null; -# libcxx = null; -# compiler-rt = null; -# }; -# }) - -# # Create a stage with the bootstrap tools. This will be used to build the subsequent stages and -# # build up the standard environment. -# # -# # Note: Each stage depends only on the the packages in `prevStage`. If a package is not to be -# # rebuilt, it should be passed through by inheriting it. -# (prevStage: stageFun prevStage { -# name = "bootstrap-stage0"; - -# overrides = self: super: { -# # We thread stage0's stdenv through under this name so downstream stages -# # can use it for wrapping gcc too. This way, downstream stages don't need -# # to refer to this stage directly, which violates the principle that each -# # stage should only access the stage that came before it. -# ccWrapperStdenv = self.stdenv; - -# bash = bootstrapTools; -# coreutils = bootstrapTools; -# cpio = bootstrapTools; -# gnugrep = bootstrapTools; -# pbzx = bootstrapTools; - -# darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { -# # Prevent CF from being propagated to the initial stdenv. Packages that require it -# # will have to manually add it to their build inputs. -# CF = null; - -# binutils-unwrapped = bootstrapTools // { -# version = "boot"; -# }; - -# binutils = super.wrapBintoolsWith { -# name = "bootstrap-stage0-binutils-wrapper"; - -# nativeTools = false; -# nativeLibc = false; - -# expand-response-params = ""; -# libc = selfDarwin.Libsystem; - -# inherit lib; -# inherit (self) stdenvNoCC coreutils gnugrep; -# runtimeShell = self.stdenvNoCC.shell; - -# bintools = selfDarwin.binutils-unwrapped; - -# inherit (selfDarwin) postLinkSignHook signingUtils; -# }; - -# cctools = bootstrapTools // { -# targetPrefix = ""; -# version = "boot"; -# man = bootstrapTools; -# }; - -# locale = self.stdenv.mkDerivation { -# name = "bootstrap-stage0-locale"; -# buildCommand = '' -# mkdir -p $out/share/locale -# ''; -# }; - -# print-reexports = bootstrapTools; - -# rewrite-tbd = bootstrapTools; - -# sigtool = bootstrapTools; -# } // lib.optionalAttrs (! useAppleSDKLibs) { -# Libsystem = self.stdenv.mkDerivation { -# name = "bootstrap-stage0-Libsystem"; -# buildCommand = '' -# mkdir -p $out - -# cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib -# chmod -R +w $out/lib -# substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system - -# ln -s libSystem.B.tbd $out/lib/libSystem.tbd - -# for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do -# ln -s libSystem.tbd $out/lib/lib$name.tbd -# done - -# ln -s ${bootstrapTools}/lib/*.o $out/lib - -# ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib -# ln -s libresolv.9.dylib $out/lib/libresolv.dylib - -# ln -s ${bootstrapTools}/include-Libsystem $out/include -# ''; -# passthru.isFromBootstrapFiles = true; -# }; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (selfTools: _: { -# libclang = self.stdenv.mkDerivation { -# name = "bootstrap-stage0-clang"; -# version = "boot"; -# outputs = [ "out" "lib" ]; -# buildCommand = '' -# mkdir -p $out/lib -# ln -s $out $lib -# ln -s ${bootstrapTools}/bin $out/bin -# ln -s ${bootstrapTools}/lib/clang $out/lib -# ln -s ${bootstrapTools}/include $out -# ''; -# passthru = { -# isFromBootstrapFiles = true; -# hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" ]; -# }; -# }; -# clang-unwrapped = selfTools.libclang; -# libllvm = self.stdenv.mkDerivation { -# name = "bootstrap-stage0-llvm"; -# outputs = [ "out" "lib" ]; -# buildCommand = '' -# mkdir -p $out/bin $out/lib -# ln -s $out $lib -# ln -s ${bootstrapTools}/bin/strip $out/bin/llvm-strip -# ln -s ${bootstrapTools}/lib/libLLVM* $out/lib -# ''; -# passthru.isFromBootstrapFiles = true; -# }; -# llvm = selfTools.libllvm; -# }); -# libraries = super.llvmPackages.libraries.extend (_: _: { -# libcxx = self.stdenv.mkDerivation { -# name = "bootstrap-stage0-libcxx"; -# buildCommand = '' -# mkdir -p $out/lib $out/include -# ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib -# ln -s ${bootstrapTools}/include/c++ $out/include -# ''; -# passthru = { -# isLLVM = true; -# isFromBootstrapFiles = true; -# }; -# }; -# compiler-rt = self.stdenv.mkDerivation { -# name = "bootstrap-stage0-compiler-rt"; -# buildCommand = '' -# mkdir -p $out/lib $out/share -# ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib -# ln -s ${bootstrapTools}/lib/darwin $out/lib -# ''; -# passthru.isFromBootstrapFiles = true; -# }; -# }); -# in -# { inherit tools libraries; } // tools // libraries -# ); -# }; - -# # The bootstrap tools may use `strip` from cctools, so use a compatible set of flags until LLVM -# # is rebuilt, and darwin.binutils can use its implementation instead. -# extraPreHook = '' -# stripAllFlags=" " # the cctools "strip" command doesn't know "-s" -# stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p" -# ''; -# }) - -# # This stage is primarily responsible for building the linker and setting up versions of -# # certain dependencies needed by the rest of the build process. It is necessary to rebuild the -# # linker because the `compiler-rt` build process checks the version and attempts to manually -# # run `codesign` if it detects a version of `ld64` it considers too old. If that happens, the -# # build process will fail for a few different reasons: -# # - sigtool is too old and does not accept the `--sign` argument; -# # - sigtool is new enough to accept the `--sign` argument, but it aborts when it is invoked on a -# # binary that is already signed; or -# # - compiler-rt attempts to invoke `codesign` on x86_64-darwin, but `sigtool` is not currently -# # part of the x86_64-darwin bootstrap tools. -# # -# # This stage also builds CF and Libsystem to simplify assertions and assumptions for later by -# # making sure both packages are present on x86_64-darwin and aarch64-darwin. -# (prevStage: -# # previous stage0 stdenv: -# assert lib.all isFromBootstrapFiles ( -# with prevStage; [ bash coreutils cpio gnugrep ] ++ lib.optionals useAppleSDKLibs [ pbzx ] -# ); - -# assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ -# binutils-unwrapped cctools print-reexports rewrite-tbd sigtool -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); -# assert (with prevStage.darwin; (! useAppleSDKLibs) -> CF == null); - -# assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm compiler-rt libcxx -# ]); - -# stageFun prevStage { -# name = "bootstrap-stage1"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# coreutils gnugrep; - -# # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. -# cmake = self.cmakeMinimal; -# cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { -# buildInputs = old.buildInputs ++ [ self.darwin.CF ]; -# }); - -# # Disable tests because they use dejagnu, which fails to run. -# libffi = super.libffi.override { doCheck = false; }; - -# # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. -# libxml2 = super.libxml2.override { pythonSupport = false; }; - -# ninja = super.ninja.override { }; - -# # Use this stage’s CF to build Python. It’s required but can’t be included in the stdenv. -# python3 = self.python3Minimal; -# python3Minimal = super.python3Minimal.overrideAttrs (old: { -# buildInputs = old.buildInputs ++ [ self.darwin.CF ]; -# }); - -# darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; - -# # Use this stage’s CF to build configd. It’s required but can’t be included in the stdenv. -# configd = superDarwin.configd.overrideAttrs (old: { -# buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; -# }); - -# signingUtils = prevStage.darwin.signingUtils.override { -# inherit (selfDarwin) sigtool; -# }; - -# postLinkSignHook = prevStage.darwin.postLinkSignHook.override { -# inherit (selfDarwin) sigtool; -# }; - -# binutils = superDarwin.binutils.override { -# inherit (self) coreutils; -# inherit (selfDarwin) postLinkSignHook signingUtils; - -# bintools = selfDarwin.binutils-unwrapped; -# libc = selfDarwin.Libsystem; -# # TODO(@sternenseemann): can this be removed? -# runtimeShell = "${bootstrapTools}/bin/bash"; -# }; - -# binutils-unwrapped = superDarwin.binutils-unwrapped.override { -# inherit (selfDarwin) cctools; -# }; - -# cctools = selfDarwin.cctools-port; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (_: _: { -# inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm; -# }); -# libraries = super.llvmPackages.libraries.extend (_: _: { -# inherit (prevStage.llvmPackages) compiler-rt libcxx; -# }); -# in -# { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries -# ); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# # The bootstrap tools may use `strip` from cctools, so use a compatible set of flags until LLVM -# # is rebuilt, and darwin.binutils can use its implementation instead. -# extraPreHook = '' -# stripAllFlags=" " # the cctools "strip" command doesn't know "-s" -# stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p" - -# # Don’t assume the ld64 in bootstrap tools supports response files. Only recent versions do. -# export NIX_LD_USE_RESPONSE_FILE=0 -# ''; -# }) - -# # Build cctools, Python, and sysctl for use by LLVM’s check phase. They must be built in -# # their stage to prevent infinite recursions and to make sure the stdenv used to build -# # LLVM has the newly built cctools instead of the one from the bootstrap tools. -# (prevStage: -# # previous stage1 stdenv: -# assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake bash binutils-unwrapped bison brotli cmake cpio cyrus_sasl db -# ed expat flex gettext gmp groff icu libedit libffi libiconv libidn2 libkrb5 libssh2 -# libtool libunistring libxml2 m4 ncurses nghttp2 ninja openldap openssh openssl -# patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite -# subversion texinfo unzip which xz zlib zstd -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool -# ]); -# assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); - -# assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm compiler-rt libcxx -# ]); - -# assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == "boot"; - -# stageFun prevStage { -# name = "bootstrap-stage1-sysctl"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal -# coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu -# libedit libffi libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 -# ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config -# python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz -# zlib zstd; - -# # Support for the SystemConfiguration framework is required to run the LLVM tests, but trying -# # to override python3Minimal does not appear to work. -# python3 = (super.python3.override { -# inherit (self) libffi; -# inherit (self.darwin) configd; -# openssl = null; -# readline = null; -# ncurses = null; -# gdbm = null; -# sqlite = null; -# tzdata = null; -# stripConfig = true; -# stripIdlelib = true; -# stripTests = true; -# stripTkinter = true; -# rebuildBytecode = false; -# stripBytecode = true; -# includeSiteCustomize = false; -# enableOptimizations = false; -# enableLTO = false; -# mimetypesSupport = false; -# }).overrideAttrs (_: { pname = "python3-minimal-scproxy"; }); - -# darwin = super.darwin.overrideScope (_: superDarwin: { -# inherit (prevStage.darwin) -# CF sdkRoot Libsystem binutils-unwrapped cctools cctools-port configd darwin-stubs dyld -# launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook -# print-reexports rewrite-tbd signingUtils sigtool; - -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (_: _: { -# inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm; -# clang = prevStage.stdenv.cc; -# }); -# libraries = super.llvmPackages.libraries.extend (_: _: { -# inherit (prevStage.llvmPackages) compiler-rt libcxx; -# }); -# in -# { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries -# ); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# # Until LLVM is rebuilt, assume `strip` is the one from cctools. -# extraPreHook = '' -# stripAllFlags=" " # the cctools "strip" command doesn't know "-s" -# stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p" -# ''; -# }) - -# # First rebuild of LLVM. While this LLVM is linked to a bunch of junk from the bootstrap tools, -# # the libc++ and libc++abi it produces are not. The compiler will be rebuilt in a later stage, -# # but those libraries will be used in the final stdenv. -# # -# # Rebuild coreutils and gnugrep to avoid unwanted references to the bootstrap tools on `PATH`. -# (prevStage: -# # previous stage-sysctl stdenv: -# assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake bash binutils-unwrapped bison brotli cmake cpio cyrus_sasl db -# ed expat flex gettext gmp groff icu libedit libffi libiconv libidn2 libkrb5 libssh2 -# libtool libunistring libxml2 m4 ncurses nghttp2 ninja openldap openssh openssl -# patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite -# subversion sysctl.provider texinfo unzip which xz zlib zstd -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); - -# assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm compiler-rt libcxx -# ]); - -# assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-port; - -# stageFun prevStage { -# name = "bootstrap-stage-xclang"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal -# cpio cyrus_sasl db ed expat flex gettext gmp groff icu libedit libffi libiconv -# libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 ncurses nghttp2 ninja -# openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal -# scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd; - -# # Switch from cctools-port to cctools-llvm now that LLVM has been built. -# darwin = super.darwin.overrideScope (_: superDarwin: { -# inherit (prevStage.darwin) -# CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc -# locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool; - -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; - -# # Avoid building unnecessary Python dependencies due to building LLVM manpages. -# cctools-llvm = superDarwin.cctools-llvm.override { enableManpages = false; }; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# llvmMajor = lib.versions.major super.llvmPackages.release_version; - -# # libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior -# # stages to the final stdenv via rpath by dropping it from `extraBuildInputs`. -# stdenvNoCF = self.stdenv.override { -# extraBuildInputs = [ ]; -# }; - -# libcxxBootstrapStdenv = self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override { -# nixSupport.cc-cflags = [ "-nostdlib" ]; -# nixSupport.cc-ldflags = [ "-lSystem" ]; -# }); - -# libraries = super.llvmPackages.libraries.extend (selfLib: superLib: { -# compiler-rt = null; -# libcxx = superLib.libcxx.override ({ -# stdenv = libcxxBootstrapStdenv; -# }); -# }); -# in -# { inherit libraries; } // libraries -# ); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# extraPreHook = '' -# stripAllFlags=" " # the cctools "strip" command doesn't know "-s" -# stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p" -# ''; -# }) - -# # This stage rebuilds Libsystem. It also rebuilds bash, which will be needed in later stages -# # to use in patched shebangs (e.g., to make sure `icu-config` uses bash from nixpkgs). -# (prevStage: -# # previous stage-xclang stdenv: -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal coreutils cpio -# cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu libedit libtool m4 ninja -# openbsm openldap openpam openssh patchutils pbzx perl pkg-config.pkg-config python3 -# python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# brotli libffi libiconv libidn2 libkrb5 libssh2 libunistring libxml2 ncurses -# nghttp2 openssl zlib zstd -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm -# ]); -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); -# assert prevStage.llvmPackages.compiler-rt == null; - -# assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-port; - -# stageFun prevStage { - -# name = "bootstrap-stage2-Libsystem"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils -# cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu libedit libffi -# libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 ncurses nghttp2 -# ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config -# python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz -# zlib zstd; - -# # Bash must be linked against the system CoreFoundation instead of the open-source one. -# # Otherwise, there will be a dependency cycle: bash -> CF -> icu -> bash (for icu^dev). -# bash = super.bash.overrideAttrs (super: { -# buildInputs = super.buildInputs ++ [ self.darwin.apple_sdk.frameworks.CoreFoundation ]; -# }); - -# darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { -# inherit (prevStage.darwin) -# CF binutils-unwrapped cctools configd darwin-stubs launchd libobjc libtapi locale -# objc4 print-reexports rewrite-tbd signingUtils sigtool; - -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (_: _: { -# inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang libllvm llvm; -# }); - -# libraries = super.llvmPackages.libraries.extend (selfLib: superLib: { -# inherit (prevStage.llvmPackages) compiler-rt libcxx; -# }); -# in -# { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries -# ); - -# # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to -# # the final stdenv, which happens because of the rpath hook. -# stdenv = -# let -# stdenvNoCF = super.stdenv.override { -# extraBuildInputs = [ ]; -# }; -# in -# self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override { -# inherit (self.llvmPackages) libcxx; -# }); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# extraPreHook = '' -# stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O -# ''; -# }) - -# # This stage rebuilds CF, compiler-rt, and the sdkRoot derivation. -# # -# # CF requires: -# # - aarch64-darwin: libobjc (due to being apple_sdk.frameworks.CoreFoundation instead of swift-corefoundation) -# # - x86_64-darwin: libiconv libxml2 icu zlib -# (prevStage: -# # previous stage2-Libsystem stdenv: -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils -# cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu libedit libidn2 -# libkrb5 libssh2 libtool libunistring m4 nghttp2 ninja openbsm openldap openpam openssh -# openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf -# sqlite subversion sysctl.provider texinfo unzip which xz zstd -# ]); - -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# libffi libiconv libxml2 ncurses zlib zstd -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); -# assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm -# ]); -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); -# assert prevStage.llvmPackages.compiler-rt == null; - -# assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-llvm; - -# stageFun prevStage { - -# name = "bootstrap-stage2-CF"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# autoconf automake bash bison brotli cmake cmakeMinimal coreutils cpio -# cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 -# libssh2 libtool libunistring m4 ncurses nghttp2 ninja openbsm openldap openpam -# openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons serf -# sqlite subversion sysctl texinfo unzip which xz zstd; - -# # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. -# libxml2 = super.libxml2.override { pythonSupport = false; }; - -# darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { -# inherit (prevStage.darwin) -# Libsystem configd darwin-stubs launchd locale print-reexports rewrite-tbd -# signingUtils sigtool; - -# # Rewrap binutils so it uses the rebuilt Libsystem. -# binutils = superDarwin.binutils.override { -# inherit (prevStage) expand-response-params; -# libc = selfDarwin.Libsystem; -# } // { -# passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; }; -# }; - -# # Avoid building unnecessary Python dependencies due to building LLVM manpages. -# cctools-llvm = superDarwin.cctools-llvm.override { enableManpages = false; }; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (_: _: { -# inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang libllvm llvm; -# clang = prevStage.stdenv.cc; -# }); - -# libraries = super.llvmPackages.libraries.extend (selfLib: superLib: { -# inherit (prevStage.llvmPackages) libcxx; - -# # Make sure compiler-rt is linked against the CF from this stage, which can be -# # propagated to the final stdenv. CF is required by ASAN. -# compiler-rt = superLib.compiler-rt.override ({ -# inherit (self.llvmPackages) libllvm; -# stdenv = self.stdenv.override { -# extraBuildInputs = [ self.darwin.CF ]; -# }; -# }); -# }); -# in -# { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries -# ); - -# # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to -# # the final stdenv, which happens because of the rpath hook. Also don’t use a stdenv with -# # compiler-rt because it needs to be built in this stage. -# stdenv = -# let -# stdenvNoCF = super.stdenv.override { -# extraBuildInputs = [ ]; -# }; -# in -# self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override { -# inherit (self.llvmPackages) libcxx; - -# # Make sure the stdenv is using the Libsystem that will be propagated to the final stdenv. -# libc = self.darwin.Libsystem; -# bintools = self.llvmPackages.clangNoCompilerRtWithLibc.bintools.override { -# libc = self.darwin.Libsystem; -# }; -# }); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# extraPreHook = '' -# stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O -# ''; -# }) - -# # Rebuild LLVM with LLVM. This stage also rebuilds certain dependencies needed by LLVM. -# # -# # LLVM requires: libcxx libffi libiconv libxml2 ncurses zlib -# (prevStage: -# # previous stage2-CF stdenv: -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl -# db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool -# libunistring m4 ncurses nghttp2 ninja openbsm openldap openpam openssh openssl -# patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite -# subversion sysctl.provider texinfo unzip which xz zstd -# ]); -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ -# bash binutils-unwrapped icu libffi libiconv libxml2 zlib -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ -# locale print-reexports rewrite-tbd sigtool -# ]); -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools libtapi -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); -# assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm -# ]); -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); - -# assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-llvm; - -# stageFun prevStage { - -# name = "bootstrap-stage3"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal -# coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit -# libidn2 libkrb5 libssh2 libtool libunistring m4 nghttp2 ninja openbsm openldap -# openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons -# sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd - -# # CF dependencies - don’t rebuild them. -# icu libiconv libxml2 zlib; - -# # Disable tests because they use dejagnu, which fails to run. -# libffi = super.libffi.override { doCheck = false; }; - -# darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { -# inherit (prevStage.darwin) -# CF Libsystem binutils binutils-unwrapped cctools cctools-llvm cctools-port configd -# darwin-stubs dyld launchd libclosure libdispatch libobjc libtapi locale objc4 -# postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool; - -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# libraries = super.llvmPackages.libraries.extend (_: _: { -# inherit (prevStage.llvmPackages) compiler-rt libcxx; -# }); -# in -# { inherit libraries; } // libraries -# ); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# extraPreHook = '' -# stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O -# ''; -# }) - -# # Construct a standard environment with the new clang. Also use the new compiler to rebuild -# # everything that will be part of the final stdenv and isn’t required by it, CF, or Libsystem. -# (prevStage: -# # previous stage3 stdenv: -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl -# db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool -# libunistring m4 nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx -# perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion -# sysctl.provider texinfo unzip which xz zstd -# ]); - -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ -# bash binutils-unwrapped icu libffi libiconv libxml2 zlib -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ -# locale print-reexports rewrite-tbd sigtool -# ]); -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools libtapi -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); -# assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); - -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm compiler-rt libcxx -# ]); - -# assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == lib.getVersion prevStage.darwin.cctools-llvm; - -# stageFun prevStage { - -# name = "bootstrap-stage4"; - -# overrides = self: super: { -# inherit (prevStage) ccWrapperStdenv -# autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff -# libedit libtool m4 ninja openldap openssh patchutils perl pkg-config python3 scons -# serf sqlite subversion sysctl texinfo unzip which - -# # CF dependencies - don’t rebuild them. -# icu - -# # LLVM dependencies - don’t rebuild them. -# libffi libiconv libxml2 ncurses zlib; - -# darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { -# inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs -# # CF dependencies - don’t rebuild them. -# libobjc objc4; - -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; - -# signingUtils = superDarwin.signingUtils.override { -# inherit (selfDarwin) sigtool; -# }; - -# binutils = superDarwin.binutils.override { -# inherit (prevStage) expand-response-params; - -# bintools = selfDarwin.binutils-unwrapped; -# libc = selfDarwin.Libsystem; -# }; - -# # cctools needs to build the LLVM man pages, which requires sphinx. Sphinx -# # has hatch-vcs as a transitive dependency, which pulls in git (and curl). -# # Disabling the tests for hatch-vcs allows the stdenv bootstrap to avoid having -# # any dependency on curl other than the one provided in the bootstrap tools. -# cctools-llvm = superDarwin.cctools-llvm.override (old: { -# llvmPackages = -# let -# tools = old.llvmPackages.tools.extend (_: superTools: { -# llvm-manpages = superTools.llvm-manpages.override { -# python3Packages = prevStage.python3Packages.overrideScope (_: superPython: { -# hatch-vcs = (superPython.hatch-vcs.override { -# git = null; -# pytestCheckHook = null; -# }); -# }); -# }; -# }); -# inherit (old.llvmPackages) libraries release_version; -# in -# { inherit tools libraries release_version; } // tools // libraries; -# }); -# }); - -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (_: _: { -# inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm; -# libcxxClang = lib.makeOverridable (import ../../build-support/cc-wrapper) { -# nativeTools = false; -# nativeLibc = false; - -# inherit (prevStage) expand-response-params; - -# extraPackages = [ -# self.llvmPackages.compiler-rt -# ]; - -# extraBuildCommands = -# let -# inherit (self.llvmPackages) clang-unwrapped compiler-rt release_version; - -# # Clang 16+ uses only the major version in resource-root, but older versions use the complete one. -# clangResourceRootIncludePath = clangLib: clangRelease: -# let -# clangVersion = -# if lib.versionAtLeast clangRelease "16" -# then lib.versions.major clangRelease -# else clangRelease; -# in -# "${clangLib}/lib/clang/${clangVersion}/include"; -# in -# '' -# rsrc="$out/resource-root" -# mkdir "$rsrc" -# ln -s "${clangResourceRootIncludePath clang-unwrapped.lib release_version}" "$rsrc" -# ln -s "${compiler-rt.out}/lib" "$rsrc/lib" -# ln -s "${compiler-rt.out}/share" "$rsrc/share" -# echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags -# ''; - -# cc = self.llvmPackages.clang-unwrapped; -# bintools = self.darwin.binutils; - -# isClang = true; -# libc = self.darwin.Libsystem; -# inherit (self.llvmPackages) libcxx; - -# inherit lib; -# inherit (self) stdenvNoCC coreutils gnugrep runtimeShell; -# }; -# }); -# libraries = super.llvmPackages.libraries.extend (_: _:{ -# inherit (prevStage.llvmPackages) compiler-rt libcxx; -# }); -# in -# { inherit tools libraries; } // tools // libraries -# ); -# }; - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ]; - -# extraPreHook = '' -# stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O -# ''; -# }) - -# # Construct the final stdenv. The version of LLVM provided should match the one defined in -# # `all-packages.nix` for Darwin. Nothing should depend on the bootstrap tools or originate from -# # the bootstrap tools. -# # -# # When updating the Darwin stdenv, make sure that the result has no dependency (`nix-store -qR`) -# # on `bootstrapTools` or the binutils built in stage 1. -# (prevStage: -# # previous stage4 stdenv: -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ -# bash binutils-unwrapped brotli bzip2 cpio diffutils ed file findutils gawk -# gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 -# libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch -# pbzx pcre python3Minimal xar xz zlib zstd -# ]); - -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ -# binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool -# ]); - -# assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]); -# assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); -# assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); -# assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); - -# assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ -# clang-unwrapped libclang libllvm llvm compiler-rt libcxx -# ]); - -# assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ -# autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit -# libtool m4 ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons -# serf sqlite subversion sysctl.provider texinfo unzip which -# ]); - -# assert prevStage.darwin.cctools == prevStage.darwin.cctools-llvm; - -# let -# doSign = localSystem.isAarch64; - -# cc = prevStage.llvmPackages.clang; -# in -# { -# inherit config overlays; -# stdenv = import ../generic { -# name = "stdenv-darwin"; - -# buildPlatform = localSystem; -# hostPlatform = localSystem; -# targetPlatform = localSystem; - -# inherit config; - -# preHook = '' -# ${commonPreHook} -# stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O -# export PATH_LOCALE=${prevStage.darwin.locale}/share/locale -# ''; - -# initialPath = ((import ../generic/common-path.nix) { pkgs = prevStage; }); - -# extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# ] ++ [ prevStage.darwin.apple_sdk.sdkRoot ]; - -# extraBuildInputs = [ prevStage.darwin.CF ]; - -# inherit cc; - -# shell = cc.shell; - -# inherit (prevStage.stdenv) fetchurlBoot; - -# extraAttrs = { -# inherit bootstrapTools; -# libc = prevStage.darwin.Libsystem; -# shellPackage = prevStage.bash; -# } // lib.optionalAttrs useAppleSDKLibs { -# # This objc4 will be propagated to all builds using the final stdenv, -# # and we shouldn't mix different builds, because they would be -# # conflicting LLVM modules. Export it here so we can grab it later. -# inherit (prevStage.darwin) objc4; -# }; - -# disallowedRequisites = [ bootstrapTools.out ]; - -# allowedRequisites = (with prevStage; [ -# bash -# binutils.bintools -# binutils.bintools.lib -# bzip2.bin -# bzip2.out -# cc.expand-response-params -# coreutils -# darwin.binutils -# darwin.binutils.bintools -# diffutils -# ed -# file -# findutils -# gawk -# gettext -# gmp.out -# gnugrep -# gnugrep.pcre2.out -# gnumake -# gnused -# gnutar -# gzip -# icu.out -# libffi.out -# libiconv -# libunistring.out -# libxml2.out -# ncurses.dev -# ncurses.man -# ncurses.out -# openbsm -# openpam -# patch -# xz.bin -# xz.out -# zlib.dev -# zlib.out -# ] -# ++ lib.optionals doSign [ openssl.out ]) -# ++ lib.optionals localSystem.isAarch64 [ -# prevStage.updateAutotoolsGnuConfigScriptsHook -# prevStage.gnu-config -# ] -# ++ (with prevStage.llvmPackages; [ -# bintools-unwrapped -# clang-unwrapped -# clang-unwrapped.lib -# compiler-rt -# compiler-rt.dev -# libcxx -# libcxx.dev -# lld -# llvm -# llvm.lib -# ]) -# ++ (with prevStage.darwin; [ -# CF -# Libsystem -# cctools-llvm -# cctools-port -# dyld -# libtapi -# locale -# apple_sdk.sdkRoot -# ] -# ++ lib.optional useAppleSDKLibs [ objc4 ] -# ++ lib.optionals doSign [ postLinkSignHook sigtool signingUtils ]); - -# __stdenvImpureHostDeps = commonImpureHostDeps; -# __extraImpureHostDeps = commonImpureHostDeps; - -# overrides = self: super: { -# inherit (prevStage) -# bash binutils brotli bzip2 coreutils cpio diffutils ed file findutils gawk -# gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 -# libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch pbzx -# pcre python3Minimal xar xz zlib zstd; - -# darwin = super.darwin.overrideScope (_: superDarwin: { -# inherit (prevStage.darwin) -# CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi rewrite-tbd xnu; - -# apple_sdk = superDarwin.apple_sdk // { -# inherit (prevStage.darwin.apple_sdk) sdkRoot; -# }; -# } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { -# inherit (prevStage.darwin) binutils binutils-unwrapped cctools-llvm cctools-port; -# }); -# } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { -# inherit (prevStage.llvmPackages) clang llvm; - -# # Need to get rid of these when cross-compiling. -# llvmPackages = super.llvmPackages // ( -# let -# tools = super.llvmPackages.tools.extend (_: _: { -# inherit (prevStage.llvmPackages) clang clang-unwrapped libclang libllvm llvm; -# }); -# libraries = super.llvmPackages.libraries.extend (_: _: { -# inherit (prevStage.llvmPackages) compiler-rt libcxx; -# }); -# in -# { inherit tools libraries; } // tools // libraries -# ); - -# inherit (prevStage) binutils binutils-unwrapped; -# }; -# }; -# }) - -# # This "no-op" stage is just a place to put the assertions about stage6. -# (prevStage: -# # previous final stage stdenv: -# assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool; -# assert isBuiltByNixpkgsCompiler prevStage.darwin.binutils-unwrapped; -# assert isBuiltByNixpkgsCompiler prevStage.darwin.print-reexports; -# assert isBuiltByNixpkgsCompiler prevStage.darwin.rewrite-tbd; -# assert isBuiltByNixpkgsCompiler prevStage.darwin.cctools; - -# assert isFromNixpkgs prevStage.darwin.CF; -# assert isFromNixpkgs prevStage.darwin.Libsystem; - -# assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped; -# assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libllvm; -# assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libcxx; -# assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.compiler-rt; -# { inherit (prevStage) config overlays stdenv; }) -# ]