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: b45c5dc0aa6f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ded2b8a66969
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 31, 2019

  1. libguestfs: 1.38.6 -> 1.40.2 (#67572) 

    * libguestfs: bump stable 1.38.6 -> 1.40.2
    @Amar1729 @c0bw3b
    Amar1729 authored and c0bw3b committed Oct 31, 2019
    Copy the full SHA
    ded2b8a View commit details
Showing with 12 additions and 8 deletions.
  1. +12 −8 pkgs/development/libraries/libguestfs/default.nix
20 changes: 12 additions & 8 deletions pkgs/development/libraries/libguestfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, numactl, xen, libapparmor
, gmp, readline, file, numactl, xen, libapparmor, jansson
, getopt, perlPackages, ocamlPackages
, appliance ? null
, javaSupport ? false, jdk ? null }:
@@ -11,16 +11,16 @@ assert javaSupport -> jdk != null;

stdenv.mkDerivation rec {
pname = "libguestfs";
version = "1.38.6";
version = "1.40.2";

src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p";
url = "http://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz";
sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [
makeWrapper autoreconfHook ncurses cpio gperf
ncurses cpio gperf jansson
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex
numactl xen libapparmor getopt perlPackages.ModuleBuild
@@ -65,6 +65,8 @@ stdenv.mkDerivation rec {

doInstallCheck = appliance != null;
installCheckPhase = ''
runHook preInstallCheck
export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G
@@ -77,12 +79,14 @@ stdenv.mkDerivation rec {
mkfs ext2 /dev/sda1
list-filesystems
EOF
runHook postInstallCheck
'';

meta = with stdenv.lib; {
description = "Tools for accessing and modifying virtual machine disk images";
license = licenses.gpl2;
homepage = http://libguestfs.org/;
license = with licenses; [ gpl2 lgpl21 ];
homepage = "http://libguestfs.org/";
maintainers = with maintainers; [offline];
platforms = platforms.linux;
};