Skip to content

Revert "gocode: remove"#279324

Merged
infinisil merged 1 commit intoNixOS:masterfrom
katexochen:revert-276887-gocode/remove
Jan 7, 2024
Merged

Revert "gocode: remove"#279324
infinisil merged 1 commit intoNixOS:masterfrom
katexochen:revert-276887-gocode/remove

Conversation

@katexochen
Copy link
Contributor

@katexochen katexochen commented Jan 7, 2024

Reverts #276887

I've missed two references when removing this, and fixing causes a mass rebuild, so reverting on master and reopening on staging so that the packages don't stay broken during the staging cycle.

@katexochen katexochen requested a review from ajs124 January 7, 2024 09:27
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jan 7, 2024
@ofborg ofborg bot requested a review from kalbasit January 7, 2024 09:49
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 7, 2024
@raphaelr
Copy link
Contributor

raphaelr commented Jan 7, 2024

I don't understand why this is causing so many rebuilds. Picking one of them (vimPlugins.vim-ps1) at random - the .drv path is exactly the same:

$ git checkout master
$ git rev-parse HEAD
c931d73fba96e8efc7378c6a24ccb25f4440c9e3
$ nix-instantiate -A vimPlugins.vim-ps1
/nix/store/1znp2a3ghgx3jam3ypnqn7bmag77bxjp-vimplugin-vim-ps1-2023-12-09.drv
$ git fetch upstream pull/279324/head
$ git merge FETCH_HEAD
Auto-merging pkgs/top-level/aliases.nix
Auto-merging pkgs/top-level/all-packages.nix
Merge made by the 'ort' strategy.
 pkgs/development/tools/gocode/default.nix | 43 ++++++++++++++++++++++++++++++++++++++++
 pkgs/development/tools/gocode/deps.nix    | 12 ++++++++++++
 pkgs/top-level/aliases.nix                | 62 ++++++++++++++++++++++++----------------------------------
 pkgs/top-level/all-packages.nix           |  2 ++
 4 files changed, 83 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/development/tools/gocode/default.nix
 create mode 100644 pkgs/development/tools/gocode/deps.nix
$ nix-instantiate -A vimPlugins.vim-ps1
/nix/store/1znp2a3ghgx3jam3ypnqn7bmag77bxjp-vimplugin-vim-ps1-2023-12-09.drv

@fabianhjr
Copy link
Member

fabianhjr commented Jan 7, 2024

probably detected as adding those expressions and on removal those weren't counted.

@fabianhjr fabianhjr requested a review from vcunat January 7, 2024 20:08
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inclined to merge as is

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 7, 2024
@infinisil infinisil merged commit 788cf70 into NixOS:master Jan 7, 2024
@katexochen katexochen deleted the revert-276887-gocode/remove branch January 8, 2024 05:10
@katexochen katexochen mentioned this pull request Jan 8, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants