From e015170e7869492ea8664477be2c3e60e15a9254 Mon Sep 17 00:00:00 2001 From: Jake Hamilton Date: Sat, 8 Jun 2024 03:36:57 -0700 Subject: [PATCH] refactor: organization and typo fixes --- foundation/flake.nix | 4 -- foundation/src/builders/bash/boot.nix | 4 +- foundation/src/builders/bash/default.nix | 4 +- foundation/src/builders/file/text/default.nix | 4 +- foundation/src/builders/kaem/default.nix | 4 +- foundation/src/builders/raw/default.nix | 4 +- foundation/src/stages/stage0/kaem/default.nix | 12 ++--- .../stage0/mescc-tools-extra/default.nix | 12 ++--- .../src/stages/stage0/mescc-tools/default.nix | 12 ++--- .../src/stages/stage0/phases/phase00.nix | 12 ++--- .../src/stages/stage0/phases/phase01.nix | 12 ++--- .../src/stages/stage0/phases/phase02.nix | 12 ++--- .../src/stages/stage0/phases/phase03.nix | 12 ++--- .../src/stages/stage0/phases/phase04.nix | 12 ++--- .../src/stages/stage0/phases/phase05.nix | 12 ++--- .../src/stages/stage0/phases/phase06.nix | 12 ++--- .../src/stages/stage0/phases/phase07.nix | 12 ++--- .../src/stages/stage0/phases/phase08.nix | 12 ++--- .../src/stages/stage0/phases/phase09.nix | 12 ++--- .../src/stages/stage0/phases/phase10.nix | 12 ++--- .../src/stages/stage0/phases/phase11.nix | 12 ++--- .../src/stages/stage0/phases/phase12.nix | 12 ++--- foundation/src/stages/stage1/bash/boot.nix | 12 ++--- foundation/src/stages/stage1/bash/default.nix | 32 +++++------ .../src/stages/stage1/binutils/default.nix | 32 +++++------ .../src/stages/stage1/bison/default.nix | 30 +++++------ .../src/stages/stage1/bzip2/default.nix | 30 +++++------ .../src/stages/stage1/coreutils/default.nix | 32 +++++------ .../src/stages/stage1/diffutils/default.nix | 32 +++++------ .../src/stages/stage1/findutils/default.nix | 32 +++++------ foundation/src/stages/stage1/gawk/default.nix | 30 +++++------ foundation/src/stages/stage1/gcc/default.nix | 54 +++++++++---------- .../src/stages/stage1/gnugrep/default.nix | 32 +++++------ .../src/stages/stage1/gnum4/default.nix | 30 +++++------ .../src/stages/stage1/gnumake/default.nix | 12 ++--- .../src/stages/stage1/gnupatch/default.nix | 12 ++--- .../src/stages/stage1/gnused/default.nix | 32 +++++------ .../src/stages/stage1/gnutar/default.nix | 32 +++++------ foundation/src/stages/stage1/gzip/default.nix | 36 ++++++------- .../src/stages/stage1/heirloom/default.nix | 30 +++++------ .../stages/stage1/linux-headers/default.nix | 30 +++++------ .../src/stages/stage1/ln-boot/default.nix | 12 ++--- foundation/src/stages/stage1/mes/compiler.nix | 10 ++-- foundation/src/stages/stage1/mes/libc.nix | 12 ++--- foundation/src/stages/stage1/mes/libs.nix | 10 ++-- foundation/src/stages/stage1/musl/default.nix | 30 +++++------ .../src/stages/stage1/nyacc/default.nix | 12 ++--- .../src/stages/stage1/python/default.nix | 30 +++++------ foundation/src/stages/stage1/tinycc/boot.nix | 28 +++++----- .../src/stages/stage1/tinycc/default.nix | 2 +- foundation/src/stages/stage1/xz/default.nix | 30 +++++------ foundation/src/stages/stage1/zlib/default.nix | 30 +++++------ foundation/src/stages/stage2/bash/default.nix | 32 +++++------ .../src/stages/stage2/binutils/default.nix | 32 +++++------ .../src/stages/stage2/busybox/default.nix | 30 +++++------ .../src/stages/stage2/bzip2/default.nix | 30 +++++------ .../src/stages/stage2/coreutils/default.nix | 32 +++++------ .../src/stages/stage2/diffutils/default.nix | 32 +++++------ .../src/stages/stage2/findutils/default.nix | 32 +++++------ foundation/src/stages/stage2/gawk/default.nix | 30 +++++------ foundation/src/stages/stage2/gcc/default.nix | 54 +++++++++---------- .../src/stages/stage2/glibc/default.nix | 30 +++++------ .../src/stages/stage2/gnugrep/default.nix | 32 +++++------ .../src/stages/stage2/gnumake/default.nix | 12 ++--- .../src/stages/stage2/gnupatch/default.nix | 12 ++--- .../src/stages/stage2/gnused/default.nix | 32 +++++------ .../src/stages/stage2/gnutar/default.nix | 32 +++++------ foundation/src/stages/stage2/gzip/default.nix | 32 +++++------ .../src/stages/stage2/patchelf/default.nix | 30 +++++------ 69 files changed, 748 insertions(+), 752 deletions(-) diff --git a/foundation/flake.nix b/foundation/flake.nix index 3ed9ec4..9fef9dc 100644 --- a/foundation/flake.nix +++ b/foundation/flake.nix @@ -13,11 +13,7 @@ modules = import ./src; forEachSystem = lib.attrs.generate [ - # "x86_64-linux" - # "aarch64-linux" "i686-linux" - # "x86_64-darwin" - # "aarch64-darwin" ]; in { extras = let diff --git a/foundation/src/builders/bash/boot.nix b/foundation/src/builders/bash/boot.nix index c108d14..9cac662 100644 --- a/foundation/src/builders/bash/boot.nix +++ b/foundation/src/builders/bash/boot.nix @@ -17,7 +17,7 @@ in { config = { aux.foundation.builders.bash.boot = { - build = lib.modules.overrides.default (settings @ { + build = settings @ { name, script, meta ? {}, @@ -71,7 +71,7 @@ in { package // { inherit meta extras; - }); + }; }; }; } diff --git a/foundation/src/builders/bash/default.nix b/foundation/src/builders/bash/default.nix index 58646fb..18149d0 100644 --- a/foundation/src/builders/bash/default.nix +++ b/foundation/src/builders/bash/default.nix @@ -20,7 +20,7 @@ in { config = { aux.foundation.builders.bash = { - build = lib.modules.overrides.default (settings @ { + build = settings @ { name, script, meta ? {}, @@ -73,7 +73,7 @@ in { package // { inherit meta extras; - }); + }; }; }; } diff --git a/foundation/src/builders/file/text/default.nix b/foundation/src/builders/file/text/default.nix index f8c35d5..3cfcdd6 100644 --- a/foundation/src/builders/file/text/default.nix +++ b/foundation/src/builders/file/text/default.nix @@ -15,7 +15,7 @@ in { config = { aux.foundation.builders.file.text = { - build = lib.modules.overrides.default (settings @ { + build = settings @ { name, contents, isExecutable ? false, @@ -63,7 +63,7 @@ in { package // { inherit meta extras; - }); + }; }; }; } diff --git a/foundation/src/builders/kaem/default.nix b/foundation/src/builders/kaem/default.nix index 3ec36f9..17396cb 100644 --- a/foundation/src/builders/kaem/default.nix +++ b/foundation/src/builders/kaem/default.nix @@ -16,7 +16,7 @@ in { config = { aux.foundation.builders.kaem = { - build = lib.modules.overrides.default (settings @ { + build = settings @ { name, script, meta ? {}, @@ -59,7 +59,7 @@ in { package // { inherit meta extras; - }); + }; }; }; } diff --git a/foundation/src/builders/raw/default.nix b/foundation/src/builders/raw/default.nix index d32c1b1..c1542bc 100644 --- a/foundation/src/builders/raw/default.nix +++ b/foundation/src/builders/raw/default.nix @@ -13,7 +13,7 @@ in { config = { aux.foundation.builders.raw = { - build = lib.modules.overrides.default (settings @ { + build = settings @ { pname, version, executable, @@ -36,7 +36,7 @@ in { package // { inherit meta extras; - }); + }; }; }; } diff --git a/foundation/src/stages/stage0/kaem/default.nix b/foundation/src/stages/stage0/kaem/default.nix index 961a4ad..c74debf 100644 --- a/foundation/src/stages/stage0/kaem/default.nix +++ b/foundation/src/stages/stage0/kaem/default.nix @@ -12,11 +12,6 @@ mescc-tools-extra = config.aux.foundation.stages.stage0.mescc-tools-extra; in { options.aux.foundation.stages.stage0.kaem = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for kaem."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -40,9 +35,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for kaem."; + }; }; config = { diff --git a/foundation/src/stages/stage0/mescc-tools-extra/default.nix b/foundation/src/stages/stage0/mescc-tools-extra/default.nix index d98eee0..5d1ed72 100644 --- a/foundation/src/stages/stage0/mescc-tools-extra/default.nix +++ b/foundation/src/stages/stage0/mescc-tools-extra/default.nix @@ -20,11 +20,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.mescc-tools-extra = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for mescc-tools-extra."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +43,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for mescc-tools-extra."; + }; }; config = { diff --git a/foundation/src/stages/stage0/mescc-tools/default.nix b/foundation/src/stages/stage0/mescc-tools/default.nix index f3d11ca..89135b2 100644 --- a/foundation/src/stages/stage0/mescc-tools/default.nix +++ b/foundation/src/stages/stage0/mescc-tools/default.nix @@ -106,11 +106,6 @@ }; in { options.aux.foundation.stages.stage0.mescc-tools = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for mescc-tools."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -134,9 +129,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for mescc-tools."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase00.nix b/foundation/src/stages/stage0/phases/phase00.nix index c18e67f..47ecb4c 100644 --- a/foundation/src/stages/stage0/phases/phase00.nix +++ b/foundation/src/stages/stage0/phases/phase00.nix @@ -18,11 +18,6 @@ else builtins.throw "Unsupported system for stage0: ${system}"; in { options.aux.foundation.stages.stage0.hex0 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for hex0."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -46,10 +41,15 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for hex0."; + }; + hash = lib.options.create { type = lib.types.nullish lib.types.string; default = { diff --git a/foundation/src/stages/stage0/phases/phase01.nix b/foundation/src/stages/stage0/phases/phase01.nix index 7053a44..1cd4ed9 100644 --- a/foundation/src/stages/stage0/phases/phase01.nix +++ b/foundation/src/stages/stage0/phases/phase01.nix @@ -11,11 +11,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.hex1 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for hex0."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -39,9 +34,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for hex1."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase02.nix b/foundation/src/stages/stage0/phases/phase02.nix index 8cb217a..5bcc381 100644 --- a/foundation/src/stages/stage0/phases/phase02.nix +++ b/foundation/src/stages/stage0/phases/phase02.nix @@ -12,11 +12,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.hex2-0 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for hex2-0."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -40,9 +35,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for hex2-0."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase03.nix b/foundation/src/stages/stage0/phases/phase03.nix index 764c5ad..4419595 100644 --- a/foundation/src/stages/stage0/phases/phase03.nix +++ b/foundation/src/stages/stage0/phases/phase03.nix @@ -13,11 +13,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.catm = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for catm."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -41,9 +36,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for catm."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase04.nix b/foundation/src/stages/stage0/phases/phase04.nix index d2a94da..0dc6bad 100644 --- a/foundation/src/stages/stage0/phases/phase04.nix +++ b/foundation/src/stages/stage0/phases/phase04.nix @@ -13,11 +13,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.M0 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for M0."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -41,9 +36,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for M0."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase05.nix b/foundation/src/stages/stage0/phases/phase05.nix index a6c2bde..fc659e0 100644 --- a/foundation/src/stages/stage0/phases/phase05.nix +++ b/foundation/src/stages/stage0/phases/phase05.nix @@ -14,11 +14,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.cc_arch = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for cc_arch."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -42,9 +37,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for cc_arch."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase06.nix b/foundation/src/stages/stage0/phases/phase06.nix index 943e540..a85cf22 100644 --- a/foundation/src/stages/stage0/phases/phase06.nix +++ b/foundation/src/stages/stage0/phases/phase06.nix @@ -15,11 +15,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.M2 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for M2."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -43,9 +38,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for M2."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase07.nix b/foundation/src/stages/stage0/phases/phase07.nix index 43a577e..e321e85 100644 --- a/foundation/src/stages/stage0/phases/phase07.nix +++ b/foundation/src/stages/stage0/phases/phase07.nix @@ -16,11 +16,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.blood-elf = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for blood-elf."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -44,9 +39,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for blood-elf."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase08.nix b/foundation/src/stages/stage0/phases/phase08.nix index f83746b..1a9d643 100644 --- a/foundation/src/stages/stage0/phases/phase08.nix +++ b/foundation/src/stages/stage0/phases/phase08.nix @@ -17,11 +17,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.M1-0 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for M1-0."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -45,9 +40,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for M1-0."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase09.nix b/foundation/src/stages/stage0/phases/phase09.nix index 6011a4e..ca9e5f3 100644 --- a/foundation/src/stages/stage0/phases/phase09.nix +++ b/foundation/src/stages/stage0/phases/phase09.nix @@ -18,11 +18,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.hex2-1 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for hex2-1."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -46,9 +41,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for hex2-1."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase10.nix b/foundation/src/stages/stage0/phases/phase10.nix index b611260..eef435d 100644 --- a/foundation/src/stages/stage0/phases/phase10.nix +++ b/foundation/src/stages/stage0/phases/phase10.nix @@ -19,11 +19,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.M1 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for M1."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -47,9 +42,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for M1."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase11.nix b/foundation/src/stages/stage0/phases/phase11.nix index 97f04f5..3684531 100644 --- a/foundation/src/stages/stage0/phases/phase11.nix +++ b/foundation/src/stages/stage0/phases/phase11.nix @@ -18,11 +18,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.hex2 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for hex2."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -46,9 +41,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for hex2."; + }; }; config = { diff --git a/foundation/src/stages/stage0/phases/phase12.nix b/foundation/src/stages/stage0/phases/phase12.nix index 0ee6b94..d05128b 100644 --- a/foundation/src/stages/stage0/phases/phase12.nix +++ b/foundation/src/stages/stage0/phases/phase12.nix @@ -18,11 +18,6 @@ architecture = config.aux.foundation.stages.stage0.architecture; in { options.aux.foundation.stages.stage0.kaem-unwrapped = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for kaem-unwrapped."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -46,9 +41,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for kaem-unwrapped."; + }; }; config = { diff --git a/foundation/src/stages/stage1/bash/boot.nix b/foundation/src/stages/stage1/bash/boot.nix index 696b51f..882b8f5 100644 --- a/foundation/src/stages/stage1/bash/boot.nix +++ b/foundation/src/stages/stage1/bash/boot.nix @@ -9,11 +9,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.bash.boot = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for bash-boot."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -37,10 +32,15 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for bash-boot."; + }; + version = lib.options.create { type = lib.types.string; description = "Version of the package."; diff --git a/foundation/src/stages/stage1/bash/default.nix b/foundation/src/stages/stage1/bash/default.nix index defe682..cb09b3e 100644 --- a/foundation/src/stages/stage1/bash/default.nix +++ b/foundation/src/stages/stage1/bash/default.nix @@ -14,21 +14,6 @@ in { ]; options.aux.foundation.stages.stage1.bash = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for bash."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,7 +37,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -61,6 +46,21 @@ in { default.value = "bash"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for bash."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/binutils/default.nix b/foundation/src/stages/stage1/binutils/default.nix index fb92b78..baf1564 100644 --- a/foundation/src/stages/stage1/binutils/default.nix +++ b/foundation/src/stages/stage1/binutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.binutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for binutils."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for binutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/bison/default.nix b/foundation/src/stages/stage1/bison/default.nix index 0614262..a822da4 100644 --- a/foundation/src/stages/stage1/bison/default.nix +++ b/foundation/src/stages/stage1/bison/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.bison = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for bison."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -51,6 +36,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for bison."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/bzip2/default.nix b/foundation/src/stages/stage1/bzip2/default.nix index 205f795..ffb9908 100644 --- a/foundation/src/stages/stage1/bzip2/default.nix +++ b/foundation/src/stages/stage1/bzip2/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.bzip2 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for bzip2."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,6 +37,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for bzip2."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/coreutils/default.nix b/foundation/src/stages/stage1/coreutils/default.nix index 38a62c1..030f270 100644 --- a/foundation/src/stages/stage1/coreutils/default.nix +++ b/foundation/src/stages/stage1/coreutils/default.nix @@ -14,21 +14,6 @@ in { ]; options.aux.foundation.stages.stage1.coreutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for coreutils-boot."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,9 +37,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for coreutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/diffutils/default.nix b/foundation/src/stages/stage1/diffutils/default.nix index 01f341d..abddc47 100644 --- a/foundation/src/stages/stage1/diffutils/default.nix +++ b/foundation/src/stages/stage1/diffutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.diffutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for diffutils."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for diffutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/findutils/default.nix b/foundation/src/stages/stage1/findutils/default.nix index bd0b372..55b79db 100644 --- a/foundation/src/stages/stage1/findutils/default.nix +++ b/foundation/src/stages/stage1/findutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.findutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for findutils."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for findutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/gawk/default.nix b/foundation/src/stages/stage1/gawk/default.nix index 932ad44..8c01309 100644 --- a/foundation/src/stages/stage1/gawk/default.nix +++ b/foundation/src/stages/stage1/gawk/default.nix @@ -14,21 +14,6 @@ in { ]; options.aux.foundation.stages.stage1.gawk = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gawk."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -61,6 +46,21 @@ in { default.value = "awk"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gawk."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/gcc/default.nix b/foundation/src/stages/stage1/gcc/default.nix index 3dd17e2..4f8c29e 100644 --- a/foundation/src/stages/stage1/gcc/default.nix +++ b/foundation/src/stages/stage1/gcc/default.nix @@ -16,6 +16,33 @@ in { ]; options.aux.foundation.stages.stage1.gcc = { + meta = { + description = lib.options.create { + type = lib.types.string; + description = "Description for the package."; + default.value = "GNU Compiler Collection."; + }; + + homepage = lib.options.create { + type = lib.types.string; + description = "Homepage for the package."; + default.value = "https://gcc.gnu.org"; + }; + + license = lib.options.create { + # TODO: Add a proper type for licenses. + type = lib.types.attrs.any; + description = "License for the package."; + default.value = lib.licenses.gpl3Plus; + }; + + platforms = lib.options.create { + type = lib.types.list.of lib.types.string; + description = "Platforms the package supports."; + default.value = ["i686-linux"]; + }; + }; + package = lib.options.create { type = lib.types.package; description = "The package to use for gcc."; @@ -84,33 +111,6 @@ in { description = "Version of isl."; }; }; - - meta = { - description = lib.options.create { - type = lib.types.string; - description = "Description for the package."; - default.value = "GNU Compiler Collection."; - }; - - homepage = lib.options.create { - type = lib.types.string; - description = "Homepage for the package."; - default.value = "https://gcc.gnu.org"; - }; - - license = lib.options.create { - # TODO: Add a proper type for licenses. - type = lib.types.attrs.any; - description = "License for the package."; - default.value = lib.licenses.gpl3Plus; - }; - - platforms = lib.options.create { - type = lib.types.list.of lib.types.string; - description = "Platforms the package supports."; - default.value = ["i686-linux"]; - }; - }; }; config = { diff --git a/foundation/src/stages/stage1/gnugrep/default.nix b/foundation/src/stages/stage1/gnugrep/default.nix index 8aa3b5d..63e61b0 100644 --- a/foundation/src/stages/stage1/gnugrep/default.nix +++ b/foundation/src/stages/stage1/gnugrep/default.nix @@ -9,21 +9,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.gnugrep = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnugrep."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -47,7 +32,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -56,6 +41,21 @@ in { default.value = "grep"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnugrep."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/gnum4/default.nix b/foundation/src/stages/stage1/gnum4/default.nix index 61e631a..5b924b6 100644 --- a/foundation/src/stages/stage1/gnum4/default.nix +++ b/foundation/src/stages/stage1/gnum4/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.gnum4 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnum4."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -51,6 +36,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnum4."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/gnumake/default.nix b/foundation/src/stages/stage1/gnumake/default.nix index 3c5fb61..9cb30b8 100644 --- a/foundation/src/stages/stage1/gnumake/default.nix +++ b/foundation/src/stages/stage1/gnumake/default.nix @@ -14,11 +14,6 @@ in { ]; options.aux.foundation.stages.stage1.gnumake = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnumake."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -42,10 +37,15 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnumake."; + }; + version = lib.options.create { type = lib.types.string; description = "Version of the package."; diff --git a/foundation/src/stages/stage1/gnupatch/default.nix b/foundation/src/stages/stage1/gnupatch/default.nix index ba25b97..0d0b07f 100644 --- a/foundation/src/stages/stage1/gnupatch/default.nix +++ b/foundation/src/stages/stage1/gnupatch/default.nix @@ -9,11 +9,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.gnupatch = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnupatch."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -37,10 +32,15 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnupatch."; + }; + version = lib.options.create { type = lib.types.string; description = "Version of the package."; diff --git a/foundation/src/stages/stage1/gnused/default.nix b/foundation/src/stages/stage1/gnused/default.nix index 7e6b6f7..524a531 100644 --- a/foundation/src/stages/stage1/gnused/default.nix +++ b/foundation/src/stages/stage1/gnused/default.nix @@ -14,21 +14,6 @@ in { ]; options.aux.foundation.stages.stage1.gnused = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnumake."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,7 +37,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -61,6 +46,21 @@ in { default.value = "sed"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnused."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/gnutar/default.nix b/foundation/src/stages/stage1/gnutar/default.nix index 2ade7fd..4579bf9 100644 --- a/foundation/src/stages/stage1/gnutar/default.nix +++ b/foundation/src/stages/stage1/gnutar/default.nix @@ -15,21 +15,6 @@ in { ]; options.aux.foundation.stages.stage1.gnutar = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnutar."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -53,7 +38,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -62,6 +47,21 @@ in { default.value = "tar"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnutar."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/gzip/default.nix b/foundation/src/stages/stage1/gzip/default.nix index 7a8b840..e460eb2 100644 --- a/foundation/src/stages/stage1/gzip/default.nix +++ b/foundation/src/stages/stage1/gzip/default.nix @@ -9,32 +9,17 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.gzip = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnugrep."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; description = "Description for the package."; - default.value = "GNU implementation of the Unix grep command"; + default.value = "GNU zip compression program."; }; homepage = lib.options.create { type = lib.types.string; description = "Homepage for the package."; - default.value = "https://www.gnu.org/software/grep"; + default.value = "https://www.gnu.org/software/gzip"; }; license = lib.options.create { @@ -47,9 +32,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gzip."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/heirloom/default.nix b/foundation/src/stages/stage1/heirloom/default.nix index 160e25a..bd76f9a 100644 --- a/foundation/src/stages/stage1/heirloom/default.nix +++ b/foundation/src/stages/stage1/heirloom/default.nix @@ -15,21 +15,6 @@ in { ]; options.aux.foundation.stages.stage1.heirloom = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for heirloom."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -66,6 +51,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for heirloom."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/linux-headers/default.nix b/foundation/src/stages/stage1/linux-headers/default.nix index e6c692f..f9643a6 100644 --- a/foundation/src/stages/stage1/linux-headers/default.nix +++ b/foundation/src/stages/stage1/linux-headers/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.linux-headers = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for linux-headers."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -45,6 +30,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for linux-headers."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/ln-boot/default.nix b/foundation/src/stages/stage1/ln-boot/default.nix index 172159a..f4365c1 100644 --- a/foundation/src/stages/stage1/ln-boot/default.nix +++ b/foundation/src/stages/stage1/ln-boot/default.nix @@ -10,11 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.ln-boot = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for ln-boot."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -38,9 +33,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for ln-boot."; + }; }; config = { diff --git a/foundation/src/stages/stage1/mes/compiler.nix b/foundation/src/stages/stage1/mes/compiler.nix index 6211efe..a45445e 100644 --- a/foundation/src/stages/stage1/mes/compiler.nix +++ b/foundation/src/stages/stage1/mes/compiler.nix @@ -11,11 +11,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.mes.compiler = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for the mes compiler."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -42,6 +37,11 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for the mes compiler."; + }; }; config = { diff --git a/foundation/src/stages/stage1/mes/libc.nix b/foundation/src/stages/stage1/mes/libc.nix index cfe9191..b86f571 100644 --- a/foundation/src/stages/stage1/mes/libc.nix +++ b/foundation/src/stages/stage1/mes/libc.nix @@ -9,11 +9,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.mes.libc = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for mes-libc."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -37,9 +32,14 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for mes-libc."; + }; }; config = { diff --git a/foundation/src/stages/stage1/mes/libs.nix b/foundation/src/stages/stage1/mes/libs.nix index a980c76..36ed899 100644 --- a/foundation/src/stages/stage1/mes/libs.nix +++ b/foundation/src/stages/stage1/mes/libs.nix @@ -11,11 +11,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.mes.libs = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for mes libs."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -43,6 +38,11 @@ in { }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for mes libs."; + }; + src = lib.options.create { type = lib.types.package; description = "Source for the package."; diff --git a/foundation/src/stages/stage1/musl/default.nix b/foundation/src/stages/stage1/musl/default.nix index 20ef930..2e6e47c 100644 --- a/foundation/src/stages/stage1/musl/default.nix +++ b/foundation/src/stages/stage1/musl/default.nix @@ -14,21 +14,6 @@ in { ]; options.aux.foundation.stages.stage1.musl = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for musl."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -56,6 +41,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for musl."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/nyacc/default.nix b/foundation/src/stages/stage1/nyacc/default.nix index 203bf1f..eaeb935 100644 --- a/foundation/src/stages/stage1/nyacc/default.nix +++ b/foundation/src/stages/stage1/nyacc/default.nix @@ -12,11 +12,6 @@ version = "1.00.2"; in { options.aux.foundation.stages.stage1.nyacc = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for nyacc."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -40,7 +35,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; @@ -48,6 +43,11 @@ in { type = lib.types.package; description = "Source for the package."; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for nyacc."; + }; }; config = { diff --git a/foundation/src/stages/stage1/python/default.nix b/foundation/src/stages/stage1/python/default.nix index 567a08e..d4feb48 100644 --- a/foundation/src/stages/stage1/python/default.nix +++ b/foundation/src/stages/stage1/python/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.python = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for python."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -51,6 +36,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for python."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/tinycc/boot.nix b/foundation/src/stages/stage1/tinycc/boot.nix index 02d4da4..a80bdf2 100644 --- a/foundation/src/stages/stage1/tinycc/boot.nix +++ b/foundation/src/stages/stage1/tinycc/boot.nix @@ -13,20 +13,6 @@ args @ { helpers = lib.fp.withDynamicArgs (import ./helpers.nix) args; in { options.aux.foundation.stages.stage1.tinycc.boot = { - compiler = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for the tinycc-boot compiler."; - }; - }; - - libs = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for the tinycc-boot libs."; - }; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -54,6 +40,20 @@ in { }; }; + compiler = { + package = lib.options.create { + type = lib.types.package; + description = "The package to use for the tinycc-boot compiler."; + }; + }; + + libs = { + package = lib.options.create { + type = lib.types.package; + description = "The package to use for the tinycc-boot libs."; + }; + }; + src = lib.options.create { type = lib.types.string; description = "Source for the package."; diff --git a/foundation/src/stages/stage1/tinycc/default.nix b/foundation/src/stages/stage1/tinycc/default.nix index b85ccd0..1e3168a 100644 --- a/foundation/src/stages/stage1/tinycc/default.nix +++ b/foundation/src/stages/stage1/tinycc/default.nix @@ -38,7 +38,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; diff --git a/foundation/src/stages/stage1/xz/default.nix b/foundation/src/stages/stage1/xz/default.nix index c25baaa..38782f0 100644 --- a/foundation/src/stages/stage1/xz/default.nix +++ b/foundation/src/stages/stage1/xz/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.xz = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for xz."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -54,6 +39,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for xz."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage1/zlib/default.nix b/foundation/src/stages/stage1/zlib/default.nix index 948e3d3..f943946 100644 --- a/foundation/src/stages/stage1/zlib/default.nix +++ b/foundation/src/stages/stage1/zlib/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage1.zlib = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for zlib."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -51,6 +36,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for zlib."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/bash/default.nix b/foundation/src/stages/stage2/bash/default.nix index fcd57bd..ee3bb5a 100644 --- a/foundation/src/stages/stage2/bash/default.nix +++ b/foundation/src/stages/stage2/bash/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.bash = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for bash."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,7 +33,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -57,6 +42,21 @@ in { default.value = "bash"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for bash."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/binutils/default.nix b/foundation/src/stages/stage2/binutils/default.nix index eeff627..d205159 100644 --- a/foundation/src/stages/stage2/binutils/default.nix +++ b/foundation/src/stages/stage2/binutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.binutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for binutils."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for binutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/busybox/default.nix b/foundation/src/stages/stage2/busybox/default.nix index bb5364e..fc9a642 100644 --- a/foundation/src/stages/stage2/busybox/default.nix +++ b/foundation/src/stages/stage2/busybox/default.nix @@ -11,21 +11,6 @@ stage2 = config.aux.foundation.stages.stage2; in { options.aux.foundation.stages.stage2.busybox = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for busybox."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,6 +37,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for busybox."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/bzip2/default.nix b/foundation/src/stages/stage2/bzip2/default.nix index 031b5f9..f287bed 100644 --- a/foundation/src/stages/stage2/bzip2/default.nix +++ b/foundation/src/stages/stage2/bzip2/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.bzip2 = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for bzip2."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,6 +37,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for bzip2."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/coreutils/default.nix b/foundation/src/stages/stage2/coreutils/default.nix index ab6c26b..c87a792 100644 --- a/foundation/src/stages/stage2/coreutils/default.nix +++ b/foundation/src/stages/stage2/coreutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.coreutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for coreutils-boot."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for coreutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/diffutils/default.nix b/foundation/src/stages/stage2/diffutils/default.nix index 0ac884d..c4fc7b7 100644 --- a/foundation/src/stages/stage2/diffutils/default.nix +++ b/foundation/src/stages/stage2/diffutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.diffutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for diffutils."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for diffutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/findutils/default.nix b/foundation/src/stages/stage2/findutils/default.nix index 7d16139..3c4564e 100644 --- a/foundation/src/stages/stage2/findutils/default.nix +++ b/foundation/src/stages/stage2/findutils/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.findutils = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for findutils."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for findutils."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/gawk/default.nix b/foundation/src/stages/stage2/gawk/default.nix index 33afc74..770f42d 100644 --- a/foundation/src/stages/stage2/gawk/default.nix +++ b/foundation/src/stages/stage2/gawk/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gawk = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gawk."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -57,6 +42,21 @@ in { default.value = "awk"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gawk."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/gcc/default.nix b/foundation/src/stages/stage2/gcc/default.nix index 3680ace..3f4702c 100644 --- a/foundation/src/stages/stage2/gcc/default.nix +++ b/foundation/src/stages/stage2/gcc/default.nix @@ -10,6 +10,33 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gcc = { + meta = { + description = lib.options.create { + type = lib.types.string; + description = "Description for the package."; + default.value = "GNU Compiler Collection."; + }; + + homepage = lib.options.create { + type = lib.types.string; + description = "Homepage for the package."; + default.value = "https://gcc.gnu.org"; + }; + + license = lib.options.create { + # TODO: Add a proper type for licenses. + type = lib.types.attrs.any; + description = "License for the package."; + default.value = lib.licenses.gpl3Plus; + }; + + platforms = lib.options.create { + type = lib.types.list.of lib.types.string; + description = "Platforms the package supports."; + default.value = ["i686-linux"]; + }; + }; + package = lib.options.create { type = lib.types.package; description = "The package to use for gcc."; @@ -78,33 +105,6 @@ in { description = "Version of isl."; }; }; - - meta = { - description = lib.options.create { - type = lib.types.string; - description = "Description for the package."; - default.value = "GNU Compiler Collection."; - }; - - homepage = lib.options.create { - type = lib.types.string; - description = "Homepage for the package."; - default.value = "https://gcc.gnu.org"; - }; - - license = lib.options.create { - # TODO: Add a proper type for licenses. - type = lib.types.attrs.any; - description = "License for the package."; - default.value = lib.licenses.gpl3Plus; - }; - - platforms = lib.options.create { - type = lib.types.list.of lib.types.string; - description = "Platforms the package supports."; - default.value = ["i686-linux"]; - }; - }; }; config = { diff --git a/foundation/src/stages/stage2/glibc/default.nix b/foundation/src/stages/stage2/glibc/default.nix index e73208c..b3834ac 100644 --- a/foundation/src/stages/stage2/glibc/default.nix +++ b/foundation/src/stages/stage2/glibc/default.nix @@ -11,21 +11,6 @@ stage2 = config.aux.foundation.stages.stage2; in { options.aux.foundation.stages.stage2.glibc = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for glibc."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,6 +37,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for glibc."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/gnugrep/default.nix b/foundation/src/stages/stage2/gnugrep/default.nix index c3b6c02..cd48175 100644 --- a/foundation/src/stages/stage2/gnugrep/default.nix +++ b/foundation/src/stages/stage2/gnugrep/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gnugrep = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnugrep."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,7 +33,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -57,6 +42,21 @@ in { default.value = "grep"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnugrep."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/gnumake/default.nix b/foundation/src/stages/stage2/gnumake/default.nix index 4ff4cfc..e0a10e9 100644 --- a/foundation/src/stages/stage2/gnumake/default.nix +++ b/foundation/src/stages/stage2/gnumake/default.nix @@ -11,11 +11,6 @@ stage2 = config.aux.foundation.stages.stage2; in { options.aux.foundation.stages.stage2.gnumake = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnumake."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -39,10 +34,15 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnumake."; + }; + version = lib.options.create { type = lib.types.string; description = "Version of the package."; diff --git a/foundation/src/stages/stage2/gnupatch/default.nix b/foundation/src/stages/stage2/gnupatch/default.nix index 2042ec4..610c21e 100644 --- a/foundation/src/stages/stage2/gnupatch/default.nix +++ b/foundation/src/stages/stage2/gnupatch/default.nix @@ -10,11 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gnupatch = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnupatch."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -38,10 +33,15 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnupatch."; + }; + version = lib.options.create { type = lib.types.string; description = "Version of the package."; diff --git a/foundation/src/stages/stage2/gnused/default.nix b/foundation/src/stages/stage2/gnused/default.nix index 0eedb08..4eceacc 100644 --- a/foundation/src/stages/stage2/gnused/default.nix +++ b/foundation/src/stages/stage2/gnused/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gnused = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnumake."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,7 +33,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -57,6 +42,21 @@ in { default.value = "sed"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnused."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/gnutar/default.nix b/foundation/src/stages/stage2/gnutar/default.nix index b5c4036..c37d56e 100644 --- a/foundation/src/stages/stage2/gnutar/default.nix +++ b/foundation/src/stages/stage2/gnutar/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gnutar = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnutar."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,7 +33,7 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; mainProgram = lib.options.create { @@ -57,6 +42,21 @@ in { default.value = "tar"; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gnutar."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/gzip/default.nix b/foundation/src/stages/stage2/gzip/default.nix index 55fc32f..dae1de8 100644 --- a/foundation/src/stages/stage2/gzip/default.nix +++ b/foundation/src/stages/stage2/gzip/default.nix @@ -10,21 +10,6 @@ stage1 = config.aux.foundation.stages.stage1; in { options.aux.foundation.stages.stage2.gzip = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for gnugrep."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -48,9 +33,24 @@ in { platforms = lib.options.create { type = lib.types.list.of lib.types.string; description = "Platforms the package supports."; - default.value = ["x86_64-linux" "aarch64-linux" "i686-linux"]; + default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for gzip."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = { diff --git a/foundation/src/stages/stage2/patchelf/default.nix b/foundation/src/stages/stage2/patchelf/default.nix index f36e843..13cfc16 100644 --- a/foundation/src/stages/stage2/patchelf/default.nix +++ b/foundation/src/stages/stage2/patchelf/default.nix @@ -11,21 +11,6 @@ stage2 = config.aux.foundation.stages.stage2; in { options.aux.foundation.stages.stage2.patchelf = { - package = lib.options.create { - type = lib.types.package; - description = "The package to use for patchelf."; - }; - - version = lib.options.create { - type = lib.types.string; - description = "Version of the package."; - }; - - src = lib.options.create { - type = lib.types.package; - description = "Source for the package."; - }; - meta = { description = lib.options.create { type = lib.types.string; @@ -52,6 +37,21 @@ in { default.value = ["i686-linux"]; }; }; + + package = lib.options.create { + type = lib.types.package; + description = "The package to use for patchelf."; + }; + + version = lib.options.create { + type = lib.types.string; + description = "Version of the package."; + }; + + src = lib.options.create { + type = lib.types.package; + description = "Source for the package."; + }; }; config = {