mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(third_party/nix-diff): use version which handles non-utf8 drvs

Browse source 
We had a problem on whitby where decoding of the drv files would fail
with an utf8-decoding error.

This version of nix-diff will leniently input files as utf-8, with
replacement characters if necessary.

Change-Id: I5cb245923c6db0875e63e420cb0783e235b6859f
This commit is contained in:
Profpatsch 2021-11-14 18:33:07 +01:00
parent 4d57898af4
commit f1a75e88cf
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/overlays/haskell/default.nix vendored
View file

@ -2,14 +2,22 @@
# avoid breakage currently present in nixpkgs or to modify package # avoid breakage currently present in nixpkgs or to modify package
# versions. # versions.
{ ... }: # This file needs nothing from readTree { lib, ... }:
self: super: # overlay parameters for the nixpkgs overlay self: super: # overlay parameters for the nixpkgs overlay
let let
overrides = hsSelf: hsSuper: with super.haskell.lib; rec { overrides = hsSelf: hsSuper: with super.haskell.lib; {
generic-arbitrary = appendPatch hsSuper.generic-arbitrary generic-arbitrary = appendPatch hsSuper.generic-arbitrary
[ ./patches/generic-arbitrary-export-garbitrary.patch ]; [ ./patches/generic-arbitrary-export-garbitrary.patch ];
nix-diff = overrideSrc hsSuper.nix-diff {
src = builtins.fetchTarball {
# https://github.com/Gabriel439/nix-diff/pull/50
url = "https://github.com/Profpatsch/nix-diff/archive/6234936b26cd144d321039a44cf1791dcfaee026.tar.gz";
sha256 = "1i3ahh8jmiayf29i1xrl2n1dkldgdmrllmccxi4yx6hbcd0r2b1l";
};
};
}; };
in { in {
haskellPackages = super.haskellPackages.override { haskellPackages = super.haskellPackages.override {