Unverified Commit 5d2a9113 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 308bd926 db8a4e9f

lib/systems/examples.nix

+24 −7
Original line number Diff line number Diff line
@@ -341,32 +341,49 @@ rec { 
  # Windows

  #



  # 32 bit mingw-w64

  mingw32 = {

  # mingw-w64 with MSVCRT for i686

  mingw-msvcrt-i686 = {

    config = "i686-w64-mingw32";

    libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain

  };



  # 64 bit mingw-w64

  mingwW64 = {

  # mingw-w64 with MSVCRT for x86_64

  mingw-msvcrt-x86_64 = {

    # That's the triplet they use in the mingw-w64 docs.

    config = "x86_64-w64-mingw32";

    libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain

  };



  ucrt64 = {

  # mingw-w64 with UCRT for x86_64, default compiler

  mingw-ucrt-x86_64 = {

    config = "x86_64-w64-mingw32";

    libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain

  };



  # LLVM-based mingw-w64 for ARM

  ucrtAarch64 = {

  # mingw-w64 with UCRT for x86_64, LLVM

  mingw-ucrt-x86_64-llvm = {

    config = "x86_64-w64-mingw32";

    libc = "ucrt";

    rust.rustcTarget = "x86_64-pc-windows-gnullvm";

    useLLVM = true;

  };



  # mingw-w64 with ucrt for Aarch64, default compiler (which is LLVM

  # because GCC does not support this platform yet).

  mingw-ucrt-aarch64 = {

    config = "aarch64-w64-mingw32";

    libc = "ucrt";

    rust.rustcTarget = "aarch64-pc-windows-gnullvm";

    useLLVM = true;

  };



  # mingw-64 back compat

  # TODO: Warn after 26.05, and remove after 26.11.

  mingw32 = mingw-msvcrt-i686;

  mingwW64 = mingw-msvcrt-x86_64;

  ucrt64 = mingw-ucrt-x86_64;

  ucrtAarch64 = mingw-ucrt-aarch64;



  # Target the MSVC ABI

  x86_64-windows = {

    config = "x86_64-pc-windows-msvc";

nixos/lib/eval-config-minimal.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ let 
      inherit prefix modules;

      class = "nixos";

      specialArgs = {

        modulesPath = builtins.toString ../modules;

        modulesPath = toString ../modules;

      }

      // specialArgs;

    };

nixos/lib/make-btrfs-fs.nix

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ pkgs.stdenv.mkDerivation { 
      return 1

    fi



    if [ ${builtins.toString compressImage} ]; then

    if [ ${toString compressImage} ]; then

      echo "Compressing image"

      zstd -v --no-progress ./$img -o $out

    fi

nixos/lib/make-ext4-fs.nix

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ pkgs.stdenv.mkDerivation { 


    resize2fs $img $new_size



    if [ ${builtins.toString compressImage} ]; then

    if [ ${toString compressImage} ]; then

      echo "Compressing image"

      zstd -T$NIX_BUILD_CORES -v --no-progress ./$img -o $out

    fi

nixos/lib/systemd-lib.nix

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ rec { 
  toIntBaseDetected =

    value:

    assert (match "[0-9]+|0x[0-9a-fA-F]+" value) != null;

    (builtins.fromTOML "v=${value}").v;

    (fromTOML "v=${value}").v;



  hexChars = stringToCharacters "0123456789abcdefABCDEF";