d2: bump to latest master

- d2/patches: remove self referencing connictions patch
This commit is contained in:
Dmitriy Pleshevskiy 2022-12-03 21:32:43 +03:00
parent 67c16e8ed6
commit 33e6908643
Signed by: pleshevskiy
GPG key ID: 1B59187B161C0215
2 changed files with 5 additions and 32 deletions

View file

@ -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,

View file

@ -4,7 +4,7 @@
, installShellFiles , installShellFiles
}: }:
let version = "2022-12-01"; in let version = "2022-12-03"; in
buildGoModule { buildGoModule {
pname = "d2"; pname = "d2";
@ -13,11 +13,11 @@ buildGoModule {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terrastruct"; owner = "terrastruct";
repo = "d2"; repo = "d2";
rev = "0cb71095b74c71d2c22f297ff41340867e871f1a"; rev = "c4dc93faeec56ea6dc1dd3bcc57bd7cc9c343311";
sha256 = "sha256-2TOtVWtqMiPmks7olaXyuvfqIEGsqw1yRRY92sV2v1M="; sha256 = "sha256-4GpBDAQE9vt9eOH/OoDV8NvO6tJYYalYQyfrLYvnpEw=";
}; };
vendorSha256 = "sha256-uOdUQaUuL48ltJl6YTg1a8v8GmacZpW5OtZafXqjQUo="; vendorSha256 = "sha256-bnayR3jdQZYzeXwcPT8wEkq06oN/5AAD9TgXuwg0WQg=";
ldflags = [ ldflags = [
"-s" "-s"
@ -27,9 +27,7 @@ buildGoModule {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
patches = [ patches = [ ];
../patches/d2/self_referencing_connections.patch
];
postInstall = "installManPage ci/release/template/man/d2.1"; postInstall = "installManPage ci/release/template/man/d2.1";