From 1f39a95faf285680bfcf9b8f08c641d16639b303 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 22 Oct 2024 11:22:52 +0800 Subject: [PATCH 1/4] ineffassign: move to by-name --- .../default.nix => by-name/in/ineffassign/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/ineffassign/default.nix => by-name/in/ineffassign/package.nix} (100%) diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/by-name/in/ineffassign/package.nix similarity index 100% rename from pkgs/development/tools/ineffassign/default.nix rename to pkgs/by-name/in/ineffassign/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0557a51ad6cfd..ee4ac7f854cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20270,8 +20270,6 @@ with pkgs; impy = callPackage ../development/libraries/impy { }; - ineffassign = callPackage ../development/tools/ineffassign { }; - ijs = callPackage ../development/libraries/ijs { }; itktcl = callPackage ../development/libraries/itktcl { }; From 68b21a7c3b8de118ad4ca8d9e2fef15ca214dba8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 22 Oct 2024 11:24:15 +0800 Subject: [PATCH 2/4] ineffassign: nixfmt --- pkgs/by-name/in/ineffassign/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/in/ineffassign/package.nix b/pkgs/by-name/in/ineffassign/package.nix index 0febc4db51e7b..5d61f34664c57 100644 --- a/pkgs/by-name/in/ineffassign/package.nix +++ b/pkgs/by-name/in/ineffassign/package.nix @@ -1,7 +1,8 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, go +{ + lib, + buildGoModule, + fetchFromGitHub, + go, }: buildGoModule rec { From e8aa0985c165e6856cebd924c1347bfcc53be289 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 22 Oct 2024 11:57:33 +0800 Subject: [PATCH 3/4] ineffassign: add bot-wxt1221 as maintainers --- pkgs/by-name/in/ineffassign/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/ineffassign/package.nix b/pkgs/by-name/in/ineffassign/package.nix index 5d61f34664c57..0c452b8880b3f 100644 --- a/pkgs/by-name/in/ineffassign/package.nix +++ b/pkgs/by-name/in/ineffassign/package.nix @@ -28,6 +28,6 @@ buildGoModule rec { mainProgram = "ineffassign"; homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit bot-wxt1221 ]; }; } From 65ed427ce95084b9e60d8ba2ce0555c2824f30fa Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 22 Oct 2024 11:27:22 +0800 Subject: [PATCH 4/4] ineffassign: add passthru.updateScript; unstable-2021-09-04 -> 0.1.0 --- .../in/ineffassign/0001-fix-build.patch | 72 +++++++++++++++++++ pkgs/by-name/in/ineffassign/package.nix | 28 +++++--- 2 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/in/ineffassign/0001-fix-build.patch diff --git a/pkgs/by-name/in/ineffassign/0001-fix-build.patch b/pkgs/by-name/in/ineffassign/0001-fix-build.patch new file mode 100644 index 0000000000000..3b953539d8523 --- /dev/null +++ b/pkgs/by-name/in/ineffassign/0001-fix-build.patch @@ -0,0 +1,72 @@ +From 731d5be8e39bdf28266057ef06705a1a5fd45750 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 22 Oct 2024 11:46:12 +0800 +Subject: [PATCH] fix build + +--- + go.mod | 11 +++++++++-- + go.sum | 35 ++++++++--------------------------- + 2 files changed, 17 insertions(+), 29 deletions(-) + +diff --git a/go.mod b/go.mod +index b65ec67..84cc7ca 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,5 +1,12 @@ + module github.com/gordonklaus/ineffassign + +-go 1.14 ++go 1.22.0 + +-require golang.org/x/tools v0.1.5 ++toolchain go1.23.2 ++ ++require golang.org/x/tools v0.26.0 ++ ++require ( ++ golang.org/x/mod v0.21.0 // indirect ++ golang.org/x/sync v0.8.0 // indirect ++) +diff --git a/go.sum b/go.sum +index 6483b19..486c8d4 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,27 +1,8 @@ +-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= +-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= ++github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= ++golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= ++golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= ++golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= ++golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= ++golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= ++golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +-- +2.46.1 + diff --git a/pkgs/by-name/in/ineffassign/package.nix b/pkgs/by-name/in/ineffassign/package.nix index 0c452b8880b3f..f88b72527c275 100644 --- a/pkgs/by-name/in/ineffassign/package.nix +++ b/pkgs/by-name/in/ineffassign/package.nix @@ -2,32 +2,38 @@ lib, buildGoModule, fetchFromGitHub, - go, + nix-update-script, }: buildGoModule rec { pname = "ineffassign"; - version = "unstable-2021-09-04"; - rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c"; + version = "0.1.0"; src = fetchFromGitHub { owner = "gordonklaus"; repo = "ineffassign"; - inherit rev; - sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-JVrAIspRL6XvDd/AnPFt9IJPQ0hY1KPwXvldAfwYkzU="; }; - vendorHash = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM="; + patches = [ + ./0001-fix-build.patch # run go get -u. Old dependency can't run correctly on go 1.23 + ]; - allowGoReference = true; + vendorHash = "sha256-WpX5I9PK7xuln6BkIEW2qIF1K/BgaEu/gkJsz+ThVk0="; + + passthru.updateScript = nix-update-script { }; - nativeCheckInputs = [ go ]; + allowGoReference = true; - meta = with lib; { + meta = { description = "Detect ineffectual assignments in Go code"; mainProgram = "ineffassign"; homepage = "https://github.com/gordonklaus/ineffassign"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit bot-wxt1221 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kalbasit + bot-wxt1221 + ]; }; }