commit 7e012249499ba8c991a1b56b5af3454d3a496548 · pyrox.dev/nixpkgs

-79

pkgs/by-name/wi/wire/go-modules.patch

···

       1
       1
       -
       diff --git a/go.mod b/go.mod

     

       2
       2
       -
       index 944aef0..ee579ff 100644

     

       3
       3
       -
       --- a/go.mod

     

       4
       4
       -
       +++ b/go.mod

     

       5
       5
       -
       @@ -1,6 +1,6 @@

     

       6
       6
       -
        module github.com/google/wire

     

       7
       7
       -
        

     

       8
       8
       -
       -go 1.12

     

       9
       9
       -
       +go 1.18

     

       10
       10
       -
        

     

       11
       11
       -
        require (

     

       12
       12
       -
        	github.com/google/go-cmp v0.2.0

     

       13
       13
       -
       @@ -8,3 +8,5 @@ require (

     

       14
       14
       -
        	github.com/pmezard/go-difflib v1.0.0

     

       15
       15
       -
        	golang.org/x/tools v0.17.0

     

       16
       16
       -
        )

     

       17
       17
       -
       +

     

       18
       18
       -
       +require golang.org/x/mod v0.14.0 // indirect

     

       19
       19
       -
       diff --git a/go.sum b/go.sum

     

       20
       20
       -
       index 8da3aae..fbca3c1 100644

     

       21
       21
       -
       --- a/go.sum

     

       22
       22
       -
       +++ b/go.sum

     

       23
       23
       -
       @@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN

     

       24
       24
       -
        github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=

     

       25
       25
       -
        github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

     

       26
       26
       -
        github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

     

       27
       27
       -
       -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

     

       28
       28
       -
       -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

     

       29
       29
       -
       -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

     

       30
       30
       -
       -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=

     

       31
       31
       -
       -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=

     

       32
       32
       -
       -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=

     

       33
       33
       -
       -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=

     

       34
       34
       -
       -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=

     

       35
       35
       -
        golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=

     

       36
       36
       -
        golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=

     

       37
       37
       -
       -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

     

       38
       38
       -
       -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=

     

       39
       39
       -
       -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=

     

       40
       40
       -
       -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=

     

       41
       41
       -
       -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=

     

       42
       42
       -
       -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=

     

       43
       43
       -
       -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=

     

       44
       44
       -
       -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

     

       45
       45
       -
       -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

     

       46
       46
       -
       -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

     

       47
       47
       -
       -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=

     

       48
       48
       -
        golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=

     

       49
       49
       -
       -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=

     

       50
       50
       -
       -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

     

       51
       51
       -
       -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

     

       52
       52
       -
       -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       53
       53
       -
       -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       54
       54
       -
       -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       55
       55
       -
       -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       56
       56
       -
       -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       57
       57
       -
       -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

     

       58
       58
       -
       -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

     

       59
       59
       -
       -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

     

       60
       60
       -
       -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

     

       61
       61
       -
       -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

     

       62
       62
       -
       -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=

     

       63
       63
       -
       -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=

     

       64
       64
       -
       -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=

     

       65
       65
       -
       -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

     

       66
       66
       -
       -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

     

       67
       67
       -
       -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=

     

       68
       68
       -
       -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=

     

       69
       69
       -
       -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=

     

       70
       70
       -
       -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=

     

       71
       71
       -
       -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

     

       72
       72
       -
       -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

     

       73
       73
       -
       -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

     

       74
       74
       -
       -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

     

       75
       75
       -
       -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=

     

       76
       76
       -
       -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=

     

       77
       77
       -
        golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=

     

       78
       78
       -
        golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=

     

       79
       79
       -
       -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

+9 -15

pkgs/by-name/wi/wire/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       buildGoModule rec {

     

       7
       7
       +
       buildGoModule (finalAttrs: {

     

       8
       8
        
         pname = "wire";

     

       9
       9
       -
         version = "0.6.0";

     

       9
       9
       +
         version = "0.7.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "google";

     

       13
       13
        
           repo = "wire";

     

       14
       14
       -
           rev = "v${version}";

     

       15
       15
       -
           hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko=";

     

       14
       14
       +
           tag = "v${finalAttrs.version}";

     

       15
       15
       +
           hash = "sha256-pKWi5qRCSgWdGwEzoV0nx2t1HUODBaC6ELyf//+fPog=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         patches = [

     

       19
       19
       -
           # Bump the minimum version of Go required to compile packages in this module,

     

       20
       20
       -
           # as `golang.org/x/tools` requires go1.18 or later.

     

       21
       21
       -
           ./go-modules.patch

     

       22
       22
       -
         ];

     

       23
       23
       -
       

     

       24
       24
       -
         vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY=";

     

       18
       18
       +
         vendorHash = "sha256-pUzYfFrKV0M1j1P6DVIGCe6FaY+OPbn5VNLHP0Xu2R0=";

     

       25
       19
        
       

     

       26
       20
        
         subPackages = [ "cmd/wire" ];

     

       27
       21
        
       

     
···

       30
       24
        
           "-w"

     

       31
       25
        
         ];

     

       32
       26
        
       

     

       33
       33
       -
         meta = with lib; {

     

       27
       27
       +
         meta = {

     

       34
       28
        
           homepage = "https://github.com/google/wire";

     

       35
       29
        
           description = "Code generation tool that automates connecting components using dependency injection";

     

       36
       30
        
           mainProgram = "wire";

     

       37
       37
       -
           license = licenses.asl20;

     

       38
       38
       -
           maintainers = with maintainers; [ svrana ];

     

       31
       31
       +
           license = lib.licenses.asl20;

     

       32
       32
       +
           maintainers = with lib.maintainers; [ svrana ];

     

       39
       33
        
         };

     

       40
       40
       -
       }

     

       34
       34
       +
       })