mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
diffoscope: 147 -> 148
https://diffoscope.org/news/diffoscope-148-released/
This commit is contained in:
parent
ff51213cbc
commit
221fdca03e
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man
|
||||
{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man
|
||||
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
|
||||
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
|
||||
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
|
||||
@ -16,11 +16,11 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "147";
|
||||
version = "148";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "1pichn3l10401cqk08zrys2ya9b6cjznk7ra28awnmvlg6l1cypj";
|
||||
sha256 = "1fx3wq5bv12pjcpkd7lvis0vg50apzwvxa5jvcs2dv1r8385wchz";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@ -28,12 +28,6 @@ python3Packages.buildPythonApplication rec {
|
||||
patches = [
|
||||
./ignore_links.patch
|
||||
./skip-failing-test.patch
|
||||
|
||||
# Fix for CBFS comparator
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/39ec527371c469d61e4afc04b3ee6ae3563f7b4c.patch";
|
||||
sha256 = "1mzdcbxg3ad5ynpf79phvif5hzckmhf7vzd82l1sffhlqxh0v4h3";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
Loading…
Reference in New Issue
Block a user