From de4643eb80ffa13b65c6e5e662235080c093b3e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 19:45:17 +0100
Subject: diffoscope: 63 -> 77

---
 pkgs/tools/misc/diffoscope/default.nix | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'pkgs/tools/misc/diffoscope')

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 22c9ea4872b5..6a9763666d3b 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,30 +1,24 @@
-{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
+{ lib, stdenv, fetchgit, fetchpatch, python3, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
 , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
 , colordiff
 , enableBloat ? false
 }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "diffoscope-${version}";
-  version = "63";
-
-  namePrefix = "";
+python3.pkgs.buildPythonApplication rec {
+  pname = "diffoscope";
+  name = "${pname}-${version}";
+  version = "77";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "018c0xcgf6pgq493dib29pfyqpj7vb93a6qfmdh790fpxa2j1zyd";
+    sha256 = "0l5q24sqb88qkz62cz85bq65myfqig3z3m1lj2s92hdlqip9946b";
   };
 
   patches =
     [ # Ignore different link counts.
       ./ignore_links.patch
-
-      # Our Glibc doesn't have the C.UTF-8 locale yet
-      # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8), so use
-      # en_US.UTF-8 instead.
-      ./locale.patch
     ];
 
   postPatch = ''
@@ -35,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
   # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++
+  propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++
     map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
     ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
-- 
cgit 1.4.1