diff --git a/flake.nix b/flake.nix index b9a6233a5..cc7c48909 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ inherit (gitignore.lib) gitignoreSource; in { overlays.default = final: prev: let - goModHash = "sha256-2vljseczrvsl2T0P9k69ro72yU59l5fp9r/sszmXYY4="; + goModHash = "sha256-EilWxfqrcKDaSR5zA3ZuDSCq7V+/IfWpKPu8HWhpndA="; buildCmdPackage = name: final.buildGoModule { pname = name; diff --git a/patchutil/patchutil.go b/patchutil/patchutil.go index 8132e19ea..a0a94ddbc 100644 --- a/patchutil/patchutil.go +++ b/patchutil/patchutil.go @@ -182,7 +182,7 @@ func Unified(oldText, oldFile, newText, newFile string) (string, error) { } newTemp.Close() - cmd := exec.Command("diff", "-U", "9999", "--label", oldFile, "--label", newFile, oldTemp.Name(), newTemp.Name()) + cmd := exec.Command("diff", "-u", "--label", oldFile, "--label", newFile, oldTemp.Name(), newTemp.Name()) output, err := cmd.CombinedOutput() if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {