Merge master into haskell-updates

NixOS · Jun 19, 2024 · 7c6a6d1 · 7c6a6d1
2 parents e07bc34 + 78fde8e
commit 7c6a6d1
Show file tree

Hide file tree

Showing 353 changed files with 5,570 additions and 4,556 deletions.
diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml
@@ -39,6 +39,9 @@ jobs:
  pkgs/development/cuda-modules
  pkgs/test/cuda
  pkgs/top-level/cuda-packages.nix
+ NIX_FMT_PATHS_MAINTAINERS: |
+ maintainers/maintainer-list.nix
+ maintainers/team-list.nix
  NIX_FMT_PATHS_K3S: |
  nixos/modules/services/cluster/k3s
  nixos/tests/k3s

diff --git a/flake.nix b/flake.nix
@@ -46,7 +46,8 @@
 
  checks = forAllSystems (system: {
  tarball = jobs.${system}.tarball;
- } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux) {
+ # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64
+ } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) {
  # Test that ensures that the nixosSystem function can accept a lib argument
  # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules
  # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>`

diff --git 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/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
@@ -535,11 +535,9 @@ rec {
  name = "riscv-multiplatform";
  target = "Image";
  autoModules = true;
+ preferBuiltin = true;
  baseConfig = "defconfig";
  DTB = true;
- extraConfig = ''
- SERIAL_OF_PLATFORM y
- '';
  };
  };