Merge branch 'staging-next' into staging

2020-11-24 05:44:44 +01:00
parent 1083d88df6 3d6687dc95
commit 6d99109b12
95 changed files with 878 additions and 316 deletions
@@ -2,18 +2,18 @@

 buildGoModule rec {
    pname = "dolt";
-    version = "0.21.4";
+    version = "0.22.0";

    src = fetchFromGitHub {
        owner = "liquidata-inc";
        repo = "dolt";
        rev = "v${version}";
-        sha256 = "13dr3iq3v14i9zlcpv8yvq6yp90b70512bk2jkr5arlk2bilba8c";
+        sha256 = "14km34wjhijfwxvqcplf2jmh69zj7llsrimafmz94jy8cy85cpa1";
    };

    modRoot = "./go";
    subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "1x3a4q629jrgh7x8b81n2iapbxjfd389pj1wc2zd6c5l9r70xr97";
+  vendorSha256 = "01lf5f2iigv8pihblwxyqx0pgj6gqir3b7rcna0xkirrfpvzd38c";

  doCheck = false;