From 33e6908643adeddc8fbd9ba4a0280daa0d180558 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Sat, 3 Dec 2022 21:32:43 +0300 Subject: [PATCH] d2: bump to latest master - d2/patches: remove self referencing connictions patch --- patches/d2/self_referencing_connections.patch | 25 ------------------- pkgs/d2.nix | 12 ++++----- 2 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 patches/d2/self_referencing_connections.patch diff --git a/patches/d2/self_referencing_connections.patch b/patches/d2/self_referencing_connections.patch deleted file mode 100644 index e007baa..0000000 --- a/patches/d2/self_referencing_connections.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go -index 5e3f5e5..c2d5511 100644 ---- a/d2graph/d2graph.go -+++ b/d2graph/d2graph.go -@@ -721,20 +721,16 @@ func (obj *Object) Connect(srcID, dstID []string, srcArrow, dstArrow bool, label - return nil, errors.New("cannot connect to reserved keyword") - } - } - } - - src := srcObj.EnsureChild(srcID) - dst := dstObj.EnsureChild(dstID) - -- if src == dst { -- return nil, errors.New("self-referencing connection") -- } -- - edge := &Edge{ - Attributes: Attributes{ - Label: Scalar{ - Value: label, - }, - }, - Src: src, - SrcArrow: srcArrow, diff --git a/pkgs/d2.nix b/pkgs/d2.nix index dd147eb..25f1d38 100644 --- a/pkgs/d2.nix +++ b/pkgs/d2.nix @@ -4,7 +4,7 @@ , installShellFiles }: -let version = "2022-12-01"; in +let version = "2022-12-03"; in buildGoModule { pname = "d2"; @@ -13,11 +13,11 @@ buildGoModule { src = fetchFromGitHub { owner = "terrastruct"; repo = "d2"; - rev = "0cb71095b74c71d2c22f297ff41340867e871f1a"; - sha256 = "sha256-2TOtVWtqMiPmks7olaXyuvfqIEGsqw1yRRY92sV2v1M="; + rev = "c4dc93faeec56ea6dc1dd3bcc57bd7cc9c343311"; + sha256 = "sha256-4GpBDAQE9vt9eOH/OoDV8NvO6tJYYalYQyfrLYvnpEw="; }; - vendorSha256 = "sha256-uOdUQaUuL48ltJl6YTg1a8v8GmacZpW5OtZafXqjQUo="; + vendorSha256 = "sha256-bnayR3jdQZYzeXwcPT8wEkq06oN/5AAD9TgXuwg0WQg="; ldflags = [ "-s" @@ -27,9 +27,7 @@ buildGoModule { nativeBuildInputs = [ installShellFiles ]; - patches = [ - ../patches/d2/self_referencing_connections.patch - ]; + patches = [ ]; postInstall = "installManPage ci/release/template/man/d2.1";