aboutsummaryrefslogtreecommitdiff
path: root/pkgs/servers/sql
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-11-03 12:06:41 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-11-03 12:06:41 +0100
commit470f05cb5d9c88ae1de04b31fa63c8739b92b854 (patch)
treeb314b36e56a7d546399303f5217eb232867192f0 /pkgs/servers/sql
parentb810a5d23c4575439b89d55e18fa07605fe99ddf (diff)
parent237966224d5147ffcb7c51710fff10cf31da8f6f (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r--pkgs/servers/sql/cockroachdb/default.nix4
-rw-r--r--pkgs/servers/sql/dolt/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index a5071efb486f..3418335d418f 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -14,13 +14,13 @@ let
in
buildGoPackage rec {
pname = "cockroach";
- version = "20.1.4";
+ version = "20.1.7";
goPackagePath = "github.com/cockroachdb/cockroach";
src = fetchurl {
url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
- sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n";
+ sha256 = "1m1jziby0mzfbpwsak1marh1k9sx8vhc17ix6lgikxip4dpf52qg";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ];
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 0ee6bd26c240..8d4e92551354 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
- version = "0.21.0";
+ version = "0.21.1";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
- sha256 = "0w9k48jxklhaql8qbbm9ay0md5nia6x3wr0zz3w44pw3gl5kvxyw";
+ sha256 = "03fg91r6lxfq58c5843vysaw8hbagiq4r2qxc4nh9w1b3mc71h7v";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
- vendorSha256 = "16xh4s7zmar0r3kwps5bbl168imyx252lvz9s3snvxzz5kd8wlnm";
+ vendorSha256 = "19755xbjxxva574mj0sc7kqqmr4k22bbvf4aj3d0hhcfjpyhn434";
doCheck = false;