Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libvirt: 6.3.0 -> 6.6.0 #98937

Closed
wants to merge 1 commit into from
Closed

libvirt: 6.3.0 -> 6.6.0 #98937

wants to merge 1 commit into from

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Sep 27, 2020 •
edited

Motivation for this change

https://github.com/libvirt/libvirt/blob/master/NEWS.rst#v660-2020-08-02

Things done

Also upgrades python3Packages.libvirt
and patches the rpcgen tool from Apple's developer_cmds package.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@basvandijk
Copy link
Member Author

@GrahamcOfBorg build libvirt python3Packages.libvirt

@basvandijk
Copy link
Member Author

@GrahamcOfBorg eval

@ofborg ofborg bot requested review from fpletz and globin September 27, 2020 13:02
@basvandijk basvandijk marked this pull request as draft September 27, 2020 15:14
@basvandijk
Copy link
Member Author

The build fails on darwin when build in a sandbox:

nix-build -A libvirt --option sandbox true
...
rpcgen: rpcgen: $RPCGEN_CPP: /usr/bin/clang-cpp$RPCGEN_CPP: /usr/bin/clang-cpp: rpcgen: : No such file or directory
No such file or directory
rpcgen: $RPCGEN_CPP: /usr/bin/clang-cpprpcgen: : No such file or directory
$RPCGEN_CPP: /usr/bin/clang-cpp: $RPCGEN_CPP: /usr/bin/clang-cppNo such file or directory
: No such file or directory
...
  CC       logging/virtlogd-log_daemon.o
In file included from ../../src/logging/log_daemon.c:32:
In file included from ../../src/admin/admin_server_dispatch.h:23:
In file included from ../../src/rpc/virnetserverprogram.h:24:
../../src/rpc/virnetmessage.h:41:5: error: must use 'struct' tag to refer to type 'virNetMessageHeader'
    virNetMessageHeader header;
    ^
    struct
../../src/rpc/virnetmessage.h:41:25: error: field has incomplete type 'struct virNetMessageHeader'
    virNetMessageHeader header;
                        ^
../../src/rpc/virnetmessage.h:25:16: note: forward declaration of 'struct virNetMessageHeader'
typedef struct virNetMessageHeader *virNetMessageHeaderPtr;
               ^
../../src/logging/log_daemon.c:916:47: error: use of undeclared identifier 'VIR_LOG_MANAGER_PROTOCOL_PROGRAM'
    if (!(logProgram = virNetServerProgramNew(VIR_LOG_MANAGER_PROTOCOL_PROGRAM,
                                              ^
../../src/logging/log_daemon.c:917:47: error: use of undeclared identifier 'VIR_LOG_MANAGER_PROTOCOL_PROGRAM_VERSION'
                                              VIR_LOG_MANAGER_PROTOCOL_PROGRAM_VERSION,
                                              ^
../../src/logging/log_daemon.c:929:53: error: use of undeclared identifier 'ADMIN_PROGRAM'
        if (!(adminProgram = virNetServerProgramNew(ADMIN_PROGRAM,
                                                    ^
../../src/logging/log_daemon.c:930:53: error: use of undeclared identifier 'ADMIN_PROTOCOL_VERSION'
                                                    ADMIN_PROTOCOL_VERSION,
                                                    ^
6 errors generated.

I suspect it succeeds outside the sandbox since I have Xcode installed. I'll figure out which dependency to add to make it succeed inside the sandbox.

@basvandijk basvandijk force-pushed the libvirt-6.6.0 branch 2 times, most recently from 3132484 to da264a5 Compare September 28, 2020 12:06
@basvandijk
libvirt: 6.3.0 -> 6.6.0
de0e703 
Also upgrades `python3Packages.libvirt`
and patches the `rpcgen` tool from Apple's `developer_cmds` package.
@basvandijk basvandijk marked this pull request as ready for review September 28, 2020 12:08
@basvandijk
Copy link
Member Author

Problem solved. It should be ready for review now.

@GrahamcOfBorg build libvirt python3Packages.libvirt

@basvandijk
Copy link
Member Author

@GrahamcOfBorg eval

@ofborg ofborg bot requested a review from matthewbauer September 28, 2020 13:02
jonringer
jonringer approved these changes Sep 28, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM from linux PoV

https://github.com/NixOS/nixpkgs/pull/98937
1 package failed to build:
virt-manager-qt

24 packages built:
collectd collectd-data docker-machine-kvm docker-machine-kvm2 gnome3.gnome-boxes haskellPackages.libvirt-hs libvirt libvirt-glib libvmi minikube minishift python37Packages.libvirt python38Packages.libvirt rubyPackages.ruby-libvirt rubyPackages_2_5.ruby-libvirt rubyPackages_2_7.ruby-libvirt terraform-full terraform-providers.libvirt terraform_0_11-full terragrunt virt-manager virt-top virt-viewer virtlyst

would like darwin to review as well @NixOS/darwin-maintainers

@basvandijk
Copy link
Member Author

@jonringer thanks for checking! I see that virt-manager-qt was already failing on master.

I do see ofborg reporting between 500 and 1000 packages on darwin need to be rebuild (likely due to the darwin.developer_cmds change). So I think it's better to retarget this to staging.

@basvandijk basvandijk mentioned this pull request Sep 28, 2020
Merged
10 tasks
@basvandijk
Copy link
Member Author

Closing this in favor of #99043 which is targeted against staging.

@basvandijk basvandijk closed this Sep 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@fpletz fpletz Awaiting requested review from fpletz

@globin globin Awaiting requested review from globin

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@basvandijk @jonringer