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.

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

ocaml-libvirt: 0.6.1.4.2017-11-08-unstable -> 0.6.1.5 #102533

Merged
merged 1 commit into from Nov 10, 2020
Merged

ocaml-libvirt: 0.6.1.4.2017-11-08-unstable -> 0.6.1.5 #102533

merged 1 commit into from Nov 10, 2020

Conversation

quyse
Copy link
Contributor

@quyse quyse commented Nov 2, 2020

Motivation for this change

Fix a few problems and bumps it to the latest version:

Things done
  • 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.

SuperSandro2000
SuperSandro2000 reviewed Nov 3, 2020
View reviewed changes
pkgs/development/ocaml-modules/ocaml-libvirt/default.nix Outdated
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-ocaml";
rev = "refs/tags/v${version}";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
rev = "refs/tags/v${version}";
rev = "v${version}";

Shouldn't this just be the long of my change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I didn't realize it works for tags with fetchFromGitlab.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 3, 2020 •
edited

Result of nixpkgs-review pr 102533 run on x86_64-linux 1

1 package failed to build:
  • virt-top
5 packages built:
  • libguestfs
  • python27Packages.guestfs
  • python37Packages.guestfs
  • python38Packages.guestfs
  • vagrant
unpacking sources
unpacking source archive /nix/store/l665bfrrl0w0wc5vv5kzzlhpd8j8fij2-virt-top
source root is virt-top
patching sources
autoreconfPhase
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force 
autoreconf: configure.ac: tracing
autoreconf: configure.ac: not using Libtool
autoreconf: running: /nix/store/r8b9z1s0di4c8qnhwrpcir7p7rm7s4x7-autoconf-2.69/bin/autoconf --force
autoreconf: running: /nix/store/r8b9z1s0di4c8qnhwrpcir7p7rm7s4x7-autoconf-2.69/bin/autoheader --force
autoreconf: configure.ac: not using Automake
autoreconf: Leaving directory `.'
configuring
configure flags: --prefix=/nix/store/jzp3z29b00nnl2xzf8mgw5nc80x1dam4-virt-top-1.0.9
checking for a BSD-compatible install... /nix/store/7fdm1ij6f7xwjmhpici1bh3xh08n0sp7-coreutils-8.31/bin/install -c
checking for ocamlc... ocamlc
OCaml version is 4.10.0
OCaml library path is /nix/store/73wmqn80qnyywp3lyhzhianby333p7dz-ocaml-4.10.0/lib/ocaml
checking for ocamlopt... ocamlopt
checking for ocamlc.opt... ocamlc.opt
checking for ocamlopt.opt... ocamlopt.opt
checking for ocaml... ocaml
checking for ocamldep... ocamldep
checking for ocamlmktop... ocamlmktop
checking for ocamlmklib... ocamlmklib
checking for ocamldoc... ocamldoc
checking for ocamlbuild... no
checking for ocamlfind... ocamlfind
checking for OCaml findlib package unix... found
checking for OCaml findlib package extlib... found
checking for OCaml findlib package libvirt... found
checking for OCaml findlib package curses... found
checking for OCaml findlib package gettext... found
checking for OCaml findlib package xml-light... found
checking for OCaml findlib package csv... found
checking for OCaml findlib package calendar... not found
checking for perldoc... no
checking for ocaml-gettext... ocaml-gettext
checking for msgfmt... msgfmt
configure: creating src/opt_gettext.ml
------------------------------------------------------------
Thanks for downloading virt-top 1.0.9
------------------------------------------------------------
configure: creating ./config.status
config.status: creating Makefile
config.status: creating Make.rules
config.status: creating po/Makefile
config.status: creating src/Makefile
config.status: creating src/version.ml
config.status: creating config.h
building
make -C src opt
make[1]: Entering directory '/build/virt-top/src'
rm -f .depend .depend-t
ocamlfind ocamldep -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv  collect.mli csv_output.mli redraw.mli screen.mli stream_output.mli top.mli types.mli utils.mli collect.ml csv_output.ml main.ml opt_calendar.ml opt_csv.ml opt_gettext.ml opt_xml.ml redraw.ml screen.ml stream_output.ml top.ml types.ml utils.ml version.ml | \
  sed 's/ :/:/' | \
  sed 's/ *$//' | \
  sed -e :a -e '/ *\\$/N; s/ *\\\n */ /; ta' | \
          sort > .depend-t
mv .depend-t .depend
ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c version.ml
ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c opt_gettext.ml
ocamlfind ocamlc -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c utils.mli
ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c utils.ml
ocamlfind ocamlc -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c types.mli
ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c types.ml
ocamlfind ocamlc -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c collect.mli
ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c collect.ml
ocamlfind ocamlc -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c screen.mli
ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX-3 -ccopt '' -package unix,extlib,curses,str,libvirt -package gettext-stub -package xml-light -package csv -c screen.ml
File "screen.ml", lines 45-52, characters 17-24:
45 | .................function
46 |   | D.InfoNoState -> '?'
47 |   | D.InfoRunning -> 'R'
48 |   | D.InfoBlocked -> 'S'
49 |   | D.InfoPaused -> 'P'
50 |   | D.InfoShutdown -> 'D'
51 |   | D.InfoShutoff -> 'O'
52 |   | D.InfoCrashed -> 'X'
Error (warning 8): this pattern-matching is not exhaustive.
Here is an example of a case that is not matched:
InfoPMSuspended
File "_none_", line 1:
Warning 58: no cmx file was found in path for module Curses, and its interface was not compiled with -opaque
make[1]: *** [../Make.rules:33: screen.cmx] Error 2
make[1]: Leaving directory '/build/virt-top/src'
make: *** [Makefile:28: opt] Error 2

@vbgl
Copy link
Contributor

vbgl commented Nov 3, 2020

What about using the sources from there: https://libvirt.org/sources/ocaml/ocaml-libvirt-0.6.1.5.tar.gz?

@quyse
Copy link
Contributor Author

quyse commented Nov 4, 2020

It seems fix for virt-top with ocaml-libvirt-0.6.1.5 was committed immediately after release of the virt-top latest version: http://git.annexia.org/?p=virt-top.git;a=summary
I included it as a patch for virt-top - hope it's OK to do this in this PR as it is related.

Another small change for ocaml-libvirt: made use of autoreconfHook which I guess is preferred.

What about using the sources from there: https://libvirt.org/sources/ocaml/ocaml-libvirt-0.6.1.5.tar.gz?

I'm fairly new to contributing to nixpkgs, so I don't know - whatever is usually preferred (is there some policy on using git vs tarballs, or Github/Gitlab vs project websites?) Normally I prefer Github/Gitlab for any sources because they are less likely to go down or change domain or other part of URL.

@ofborg ofborg bot requested a review from volth November 4, 2020 02:07
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 102533 run on x86_64-darwin 1

3 packages marked as broken and skipped:
  • python27Packages.guestfs
  • python37Packages.guestfs
  • python38Packages.guestfs

@vbgl
Copy link
Contributor

vbgl commented Nov 9, 2020

@GrahamcOfBorg build libguestfs vagrant virt-top

@vbgl vbgl merged commit fae02c0 into NixOS:master Nov 10, 2020
@quyse quyse deleted the ocaml-libvirt branch November 13, 2020 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@quyse @SuperSandro2000 @vbgl