From 087c2167c50fc87c5f4d8d890b7c652339a5fefb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Sep 2025 14:41:37 +0000 Subject: [PATCH 1/2] dolt: 1.58.5 -> 1.59.2 --- pkgs/by-name/do/dolt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 42a26dc86bce..3f1e7d28298d 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.58.5"; + version = "1.59.2"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-ieMAld3wssub+vdNNassjpc3X1KPSNhR6GK/EmIwQ28="; + sha256 = "sha256-qIV4pbyrN40joXCgmE0e1EDkfRaHC/G1lwdkpzrO5fU="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-Mr51zbGBnO0sb9KDBiidFpRZk7wHJqbY1fYnXwgqJA8="; + vendorHash = "sha256-DPo1xzV11Q9emVIlrBFQcWXGNXKfYOKzR/hi5nJJp34="; proxyVendor = true; doCheck = false; From 3176993d8a95efb2b11e9120c53f5faeed7ae7f9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 7 Sep 2025 00:37:58 +0400 Subject: [PATCH 2/2] dolt: modernize --- pkgs/by-name/do/dolt/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 3f1e7d28298d..fc6f8aefa234 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -4,15 +4,15 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "dolt"; version = "1.59.2"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; - rev = "v${version}"; - sha256 = "sha256-qIV4pbyrN40joXCgmE0e1EDkfRaHC/G1lwdkpzrO5fU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-qIV4pbyrN40joXCgmE0e1EDkfRaHC/G1lwdkpzrO5fU="; }; modRoot = "./go"; @@ -21,11 +21,11 @@ buildGoModule rec { proxyVendor = true; doCheck = false; - meta = with lib; { + meta = { description = "Relational database with version control and CLI a-la Git"; mainProgram = "dolt"; homepage = "https://github.com/dolthub/dolt"; - license = licenses.asl20; - maintainers = with maintainers; [ danbst ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ danbst ]; }; -} +})