Skip to content

Commit 7a88928

Browse files
authored
Merge pull request #406 from mattfarina/update-mergo
Updating location of mergo
2 parents f82c865 + 1cd209d commit 7a88928

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

dict.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sprig
22

33
import (
4-
"github.com/imdario/mergo"
4+
"dario.cat/mergo"
55
"github.com/mitchellh/copystructure"
66
)
77

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/Masterminds/sprig/v3
33
go 1.21
44

55
require (
6+
dario.cat/mergo v1.0.1
67
github.com/Masterminds/goutils v1.1.1
78
github.com/Masterminds/semver/v3 v3.3.0
89
github.com/google/uuid v1.6.0
910
github.com/huandu/xstrings v1.5.0
10-
github.com/imdario/mergo v0.3.16
1111
github.com/mitchellh/copystructure v1.2.0
1212
github.com/shopspring/decimal v1.4.0
1313
github.com/spf13/cast v1.7.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
2+
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
13
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
24
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
35
github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
@@ -13,8 +15,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
1315
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1416
github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
1517
github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
16-
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
17-
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
1818
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1919
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
2020
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

0 commit comments

Comments
 (0)