Merge branch 'staging-next' into staging

2021-05-12 14:31:36 +02:00
parent 917218e8e2 1d2db66464
commit 71fa678899
37 changed files with 321 additions and 214 deletions
--- a/pkgs/development/tools/gojsontoyaml/default.nix
+++ b/pkgs/development/tools/gojsontoyaml/default.nix
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "gojsontoyaml";
-  version = "unstable-2020-06-02";
+  version = "unstable-2020-12-16";

  src = fetchFromGitHub {
    owner = "brancz";
    repo = "gojsontoyaml";
-    rev = "3697ded27e8cfea8e547eb082ebfbde36f1b5ee6";
-    sha256 = "07sisadpfnzbylzirs5ski8wl9fl18dm7xhbv8imw6ksxq4v467a";
+    rev = "202f76bf8c1f8fb74941a845b349941064603185";
+    sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss=";
  };

  vendorSha256 = null;