Unverified Commit d23b4227 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

pkgs-lib/formats: revert to remarshal for toml (#516560)

parents d899006c 331c7d8e

pkgs/build-support/writers/test.nix

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ recurseIntoAttrs { 
    toml = expectDataEqual {

      file = writeTOML "data.toml" { hello = "world"; };

      expected = ''

        hello = 'world'

        hello = "world"

      '';

    };

pkgs/pkgs-lib/formats.nix

+3 −5
Original line number Diff line number Diff line
@@ -461,18 +461,16 @@ optionalAttrs allowAliases aliases 
      generate =

        name: value:

        pkgs.callPackage (

          { runCommand, go-toml }:

          { runCommand, remarshal }:

          runCommand name

            {

              nativeBuildInputs = [ go-toml ];

              nativeBuildInputs = [ remarshal ];

              value = builtins.toJSON value;

              passAsFile = [ "value" ];

              preferLocalBuild = true;

            }

            # -use-json-number: preserve JSON ints as TOML ints

            # (Go's json.Decoder defaults to float64 for all numbers)

            ''

              jsontoml -use-json-number < "$valuePath" > "$out"

              json2toml "$valuePath" "$out"

            ''

        ) { };

pkgs/pkgs-lib/tests/formats.nix

+5 −7
Original line number Diff line number Diff line
@@ -695,16 +695,14 @@ runBuildTests { 
      float = 3.141

      int = 10

      list = [1, 2]

      str = 'foo'

      str = "foo"

      true = true



      [attrs]

      foo = 'foo'

      foo = "foo"



      [level1]

      [level1.level2]

      [level1.level2.level3]

      level4 = 'deep'

      level4 = "deep"

    '';

  };
@@ -725,7 +723,7 @@ runBuildTests { 
      ];

    };

    expected = ''

      language-server = ['bash-language-server', {except-features = ['diagnostics'], name = 'typescript-language-server'}]

      language-server = ["bash-language-server", {except-features = ["diagnostics"], name = "typescript-language-server"}]

    '';

  };
@@ -739,7 +737,7 @@ runBuildTests { 
      "stack(x,n)" = "foobar";

    };

    expected = ''

      'stack(x,n)' = 'foobar'

      "stack(x,n)" = "foobar"

    '';

  };