diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/default.nix | 2 | ||||
-rw-r--r-- | lib/systems/examples.nix | 6 | ||||
-rw-r--r-- | lib/systems/flake-systems.nix | 4 | ||||
-rw-r--r-- | lib/systems/platforms.nix | 4 | ||||
-rw-r--r-- | lib/tests/release.nix | 4 | ||||
-rw-r--r-- | lib/trivial.nix | 62 |
6 files changed, 71 insertions, 11 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index d37ff720edce6..0981122388bb1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -81,7 +81,7 @@ let && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; # Derived meta-data - useLLVM = final.isFreeBSD; + useLLVM = final.isFreeBSD || final.isOpenBSD; libc = /**/ if final.isDarwin then "libSystem" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 79ec4461e4193..6a9427b2d9de7 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -59,7 +59,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; - rustc.config = "armv7-linux-androideabi"; + rust.rustcTarget = "armv7-linux-androideabi"; sdkVer = "28"; ndkVer = "24"; useAndroidPrebuilt = true; @@ -67,7 +67,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; - rustc.config = "aarch64-linux-android"; + rust.rustcTarget = "aarch64-linux-android"; sdkVer = "28"; ndkVer = "24"; useAndroidPrebuilt = true; @@ -207,7 +207,7 @@ rec { aarch64-embedded = { config = "aarch64-none-elf"; libc = "newlib"; - rustc.config = "aarch64-unknown-none"; + rust.rustcTarget = "aarch64-unknown-none"; }; aarch64be-embedded = { diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix index b1988c6a4fbb0..a68580ff1407b 100644 --- a/lib/systems/flake-systems.nix +++ b/lib/systems/flake-systems.nix @@ -16,12 +16,12 @@ "armv6l-linux" "armv7l-linux" "i686-linux" - "mipsel-linux" + # "mipsel-linux" is excluded because it is not bootstrapped # Other platforms with sufficient support in stdenv which is not formally # mandated by their platform tier. "aarch64-darwin" - "armv5tel-linux" + # "armv5tel-linux" is excluded because it is not bootstrapped "powerpc64le-linux" "riscv64-linux" diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d2e8f77bec03e..403ffc028f0be 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -535,11 +535,9 @@ rec { name = "riscv-multiplatform"; target = "Image"; autoModules = true; + preferBuiltin = true; baseConfig = "defconfig"; DTB = true; - extraConfig = '' - SERIAL_OF_PLATFORM y - ''; }; }; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 1447e88170913..084fbd94d34c2 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -24,7 +24,9 @@ in # # https://github.com/NixOS/nixpkgs/issues/272591 # - [(import ../../pkgs/test/release {})] + [(import ../../pkgs/test/release { + inherit pkgs lib nix; + })] ; } diff --git a/lib/trivial.nix b/lib/trivial.nix index dee7eca9699a0..20a3ffebbc2bb 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -403,7 +403,7 @@ in { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Vicuña"; + codeName = "Vicuna"; /** Returns the current nixpkgs version suffix as string. @@ -623,6 +623,37 @@ in { /** Reads a JSON file. + # Examples + :::{.example} + ## `lib.trivial.importJSON` usage example + + example.json + ```json + { + "title": "Example JSON", + "hello": { + "world": "foo", + "bar": { + "foobar": true + } + } + } + ``` + + ```nix + importJSON ./example.json + => { + title = "Example JSON"; + hello = { + world = "foo"; + bar = { + foobar = true; + }; + }; + } + ``` + + ::: # Inputs @@ -642,6 +673,35 @@ in { /** Reads a TOML file. + # Examples + :::{.example} + ## `lib.trivial.importTOML` usage example + + example.toml + ```toml + title = "TOML Example" + + [hello] + world = "foo" + + [hello.bar] + foobar = true + ``` + + ```nix + importTOML ./example.toml + => { + title = "TOML Example"; + hello = { + world = "foo"; + bar = { + foobar = true; + }; + }; + } + ``` + + ::: # Inputs |