alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #55371 from grahamc/diffoscope

Browse source 
Diffoscope: update, add guestfs when bloated
This commit is contained in:
Domen Kožar 2019-02-07 10:43:52 +07:00 committed by GitHub
parent 47aad6e9b5 ddd96283fc
commit 0fb87b5099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/python-modules/guestfs/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }:
buildPythonPackage rec {
pname = "guestfs";
version = "1.40.1";
src = fetchurl {
url = "http://download.libguestfs.org/python/guestfs-${version}.tar.gz";
sha256 = "06a4b5xf1rkhnzfvck91n0z9mlkrgy90s9na5a8da2g4p776lhkf";
};
propagatedBuildInputs = [ libguestfs qemu ];
meta = with stdenv.lib; {
homepage = "http://libguestfs.org/guestfs-python.3.html";
description = "Use libguestfs from Python";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ grahamc ];
};
}

5
pkgs/tools/misc/diffoscope/default.nix
View file

@ -9,12 +9,12 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
name = "diffoscope-${version}";
version = "99";
version = "110";
src = fetchgit {
url = "https://anonscm.debian.org/git/reproducible/diffoscope.git";
rev = "refs/tags/${version}";
sha256 = "04a2sqv43g002b7s0crk9gnpdvf90j8j8p01b6shinxh6an8prs2";
sha256 = "0rhjxigwxbqbqk7xv7n4m4rh693rg3cbp4x565jv68iy423mf2fb";
};
patches = [
@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec {
] ++ lib.optionals enableBloat [
apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick
llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
python3Packages.guestfs
];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root

2
pkgs/top-level/python-packages.nix
View file

@ -406,6 +406,8 @@ in {
gssapi = callPackage ../development/python-modules/gssapi { };
guestfs = callPackage ../development/python-modules/guestfs { };
h5py = callPackage ../development/python-modules/h5py {
hdf5 = pkgs.hdf5;
};