Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6bc3e866628b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fae02c06b8b3
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 10, 2020

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

    @quyse @vbgl
    quyse authored and vbgl committed Nov 10, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fae02c0 View commit details
Showing with 17 additions and 13 deletions.
  1. +9 −1 pkgs/applications/virtualization/virt-top/default.nix
  2. +8 −12 pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
10 changes: 9 additions & 1 deletion pkgs/applications/virtualization/virt-top/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:
{ stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:

stdenv.mkDerivation rec {
pname = "virt-top";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
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 ];
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ];

20 changes: 8 additions & 12 deletions pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:
{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:

stdenv.mkDerivation rec {
pname = "ocaml-libvirt";
rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";
version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4
version = "0.6.1.5";

src = fetchgit {
url = "git://git.annexia.org/git/ocaml-libvirt.git";
rev = rev;
sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-ocaml";
rev = "v${version}";
sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
};

propagatedBuildInputs = [ libvirt ];

nativeBuildInputs = [ autoconf findlib ];
nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ];

buildInputs = [ ocaml ];

createFindlibDestdir = true;

preConfigure = ''
autoconf
'';

buildPhase = "make all opt CPPFLAGS=-Wno-error";

installPhase = "make install-opt";