Unverified Commit c078ee64 authored by Matt Sturgeon's avatar Matt Sturgeon Committed by GitHub
Browse files

nixos: remove optional builtins prefixes from prelude functions (#447403)

parents 73314380 a2ed7e8d

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";

nixos/lib/testing/driver.nix

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ let 
        ${lib.optionalString (!config.skipTypeCheck) ''

          # prepend type hints so the test script can be type checked with mypy

          cat "${../test-script-prepend.py}" >> testScriptWithTypes

          echo "${builtins.toString machineNames}" >> testScriptWithTypes

          echo "${builtins.toString vlanNames}" >> testScriptWithTypes

          echo "${toString machineNames}" >> testScriptWithTypes

          echo "${toString vlanNames}" >> testScriptWithTypes

          echo -n "$testScript" >> testScriptWithTypes



          echo "Running type check (enable/disable: config.skipTypeCheck)"