Unverified Commit 5457e7e8 authored by nicoo's avatar nicoo Committed by GitHub
Browse files

Merge #314653: formats: Set `preferLocalBuild` and `allowSubstitutes`

parents d3bb35ef 6475c4c4

pkgs/pkgs-lib/formats.nix

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ rec { 
      nativeBuildInputs = [ jq ];

      value = builtins.toJSON value;

      passAsFile = [ "value" ];

      preferLocalBuild = true;

    } ''

      jq . "$valuePath"> $out

    '') {};
@@ -77,6 +78,7 @@ rec { 
      nativeBuildInputs = [ remarshal ];

      value = builtins.toJSON value;

      passAsFile = [ "value" ];

      preferLocalBuild = true;

    } ''

      json2yaml "$valuePath" "$out"

    '') {};
@@ -270,6 +272,7 @@ rec { 
      nativeBuildInputs = [ remarshal ];

      value = builtins.toJSON value;

      passAsFile = [ "value" ];

      preferLocalBuild = true;

    } ''

      json2toml "$valuePath" "$out"

    '') {};
@@ -467,6 +470,7 @@ rec { 
          value = toConf value;

          passAsFile = [ "value" ];

          nativeBuildInputs = [ elixir ];

          preferLocalBuild = true;

        } ''

        cp "$valuePath" "$out"

        mix format "$out"
@@ -501,6 +505,7 @@ rec { 
                print(f"{key} = {repr(value)}")

      '';

      passAsFile = [ "value" "pythonGen" ];

      preferLocalBuild = true;

    } ''

      cat "$valuePath"

      python3 "$pythonGenPath" > $out

pkgs/pkgs-lib/formats/hocon/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ in 
          inherit name;



          dontUnpack = true;

          preferLocalBuild = true;



          json = builtins.toJSON finalValue;

          passAsFile = [ "json" ];

pkgs/pkgs-lib/formats/java-properties/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ in 
      in attrsOf elemType;



    generate = name: value:

      pkgs.runCommandLocal name

      pkgs.runCommand name

        {

          # Requirements

          # ============
@@ -80,6 +80,7 @@ in 
          #    libraries, but we can't rely on this in

          #    general.



          preferLocalBuild = true;

          passAsFile = [ "value" ];

          value = builtins.toJSON value;

          nativeBuildInputs = [

pkgs/pkgs-lib/formats/libconfig/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ in 
          inherit name;



          dontUnpack = true;

          preferLocalBuild = true;



          json = builtins.toJSON value;

          passAsFile = [ "json" ];