ineffassign: fix build (#350398)

authored by

Aleksana and committed by
GitHub
ea20054f a63ca5dc

+111 -34
+72
pkgs/by-name/in/ineffassign/0001-fix-build.patch
··· 1 + From 731d5be8e39bdf28266057ef06705a1a5fd45750 Mon Sep 17 00:00:00 2001 2 + From: wxt <3264117476@qq.com> 3 + Date: Tue, 22 Oct 2024 11:46:12 +0800 4 + Subject: [PATCH] fix build 5 + 6 + --- 7 + go.mod | 11 +++++++++-- 8 + go.sum | 35 ++++++++--------------------------- 9 + 2 files changed, 17 insertions(+), 29 deletions(-) 10 + 11 + diff --git a/go.mod b/go.mod 12 + index b65ec67..84cc7ca 100644 13 + --- a/go.mod 14 + +++ b/go.mod 15 + @@ -1,5 +1,12 @@ 16 + module github.com/gordonklaus/ineffassign 17 + 18 + -go 1.14 19 + +go 1.22.0 20 + 21 + -require golang.org/x/tools v0.1.5 22 + +toolchain go1.23.2 23 + + 24 + +require golang.org/x/tools v0.26.0 25 + + 26 + +require ( 27 + + golang.org/x/mod v0.21.0 // indirect 28 + + golang.org/x/sync v0.8.0 // indirect 29 + +) 30 + diff --git a/go.sum b/go.sum 31 + index 6483b19..486c8d4 100644 32 + --- a/go.sum 33 + +++ b/go.sum 34 + @@ -1,27 +1,8 @@ 35 + -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= 36 + -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 37 + -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= 38 + -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= 39 + -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 40 + -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 41 + -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 42 + -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= 43 + -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 44 + -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 45 + -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 46 + -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 47 + -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 48 + -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 49 + -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= 50 + -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 51 + -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 52 + -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 53 + -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= 54 + -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 55 + -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= 56 + -golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= 57 + -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 58 + -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 59 + -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 60 + -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= 61 + -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 62 + +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= 63 + +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 64 + +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= 65 + +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= 66 + +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= 67 + +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 68 + +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= 69 + +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= 70 + -- 71 + 2.46.1 72 +
+39
pkgs/by-name/in/ineffassign/package.nix
··· 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + nix-update-script, 6 + }: 7 + 8 + buildGoModule rec { 9 + pname = "ineffassign"; 10 + version = "0.1.0"; 11 + 12 + src = fetchFromGitHub { 13 + owner = "gordonklaus"; 14 + repo = "ineffassign"; 15 + rev = "refs/tags/v${version}"; 16 + hash = "sha256-JVrAIspRL6XvDd/AnPFt9IJPQ0hY1KPwXvldAfwYkzU="; 17 + }; 18 + 19 + patches = [ 20 + ./0001-fix-build.patch # run go get -u. Old dependency can't run correctly on go 1.23 21 + ]; 22 + 23 + vendorHash = "sha256-WpX5I9PK7xuln6BkIEW2qIF1K/BgaEu/gkJsz+ThVk0="; 24 + 25 + passthru.updateScript = nix-update-script { }; 26 + 27 + allowGoReference = true; 28 + 29 + meta = { 30 + description = "Detect ineffectual assignments in Go code"; 31 + mainProgram = "ineffassign"; 32 + homepage = "https://github.com/gordonklaus/ineffassign"; 33 + license = lib.licenses.mit; 34 + maintainers = with lib.maintainers; [ 35 + kalbasit 36 + bot-wxt1221 37 + ]; 38 + }; 39 + }
-32
pkgs/development/tools/ineffassign/default.nix
··· 1 - { lib 2 - , buildGoModule 3 - , fetchFromGitHub 4 - , go 5 - }: 6 - 7 - buildGoModule rec { 8 - pname = "ineffassign"; 9 - version = "unstable-2021-09-04"; 10 - rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c"; 11 - 12 - src = fetchFromGitHub { 13 - owner = "gordonklaus"; 14 - repo = "ineffassign"; 15 - inherit rev; 16 - sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ="; 17 - }; 18 - 19 - vendorHash = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM="; 20 - 21 - allowGoReference = true; 22 - 23 - nativeCheckInputs = [ go ]; 24 - 25 - meta = with lib; { 26 - description = "Detect ineffectual assignments in Go code"; 27 - mainProgram = "ineffassign"; 28 - homepage = "https://github.com/gordonklaus/ineffassign"; 29 - license = licenses.mit; 30 - maintainers = with maintainers; [ kalbasit ]; 31 - }; 32 - }
-2
pkgs/top-level/all-packages.nix
··· 20244 20244 20245 20245 impy = callPackage ../development/libraries/impy { }; 20246 20246 20247 - ineffassign = callPackage ../development/tools/ineffassign { }; 20248 - 20249 20247 ijs = callPackage ../development/libraries/ijs { }; 20250 20248 20251 20249 indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };