kdiff3: 1.8, finally a release!
kdiff3: 1.8, finally a release!

Drop git-diff patch, really hope it's not still outstanding
(and it doesn't apply).
cc @vcunat (who filed linked upstream issue)

NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs