public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Bich 2020-11-02 23:58:09 +03:00 committed by Vincent Laporte
parent 6bc3e86662
commit fae02c06b8
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/virtualization/virt-top/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }: { stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "virt-top"; pname = "virt-top";
@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga"; sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga";
}; };
patches = [
(fetchpatch {
name = "ocaml-libvirt-0.6.1.5-fix.patch";
url = "http://git.annexia.org/?p=virt-top.git;a=patch;h=24a461715d5bce47f63cb0097606fc336230589f";
sha256 = "15w7w9iggvlw8m9w8g4h08251wzb3m3zkb58glr7ifsgi3flbn61";
})
];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ]; buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ];

20
pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
View File

@ -1,28 +1,24 @@
{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: { stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocaml-libvirt"; pname = "ocaml-libvirt";
rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; version = "0.6.1.5";
version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
src = fetchgit { src = fetchFromGitLab {
url = "git://git.annexia.org/git/ocaml-libvirt.git"; owner = "libvirt";
rev = rev; repo = "libvirt-ocaml";
sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw"; rev = "v${version}";
sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
}; };
propagatedBuildInputs = [ libvirt ]; propagatedBuildInputs = [ libvirt ];
nativeBuildInputs = [ autoconf findlib ]; nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ];
buildInputs = [ ocaml ]; buildInputs = [ ocaml ];
createFindlibDestdir = true; createFindlibDestdir = true;
preConfigure = ''
autoconf
'';
buildPhase = "make all opt CPPFLAGS=-Wno-error"; buildPhase = "make all opt CPPFLAGS=-Wno-error";
installPhase = "make install-opt"; installPhase = "make install-opt";