From 367acd05e52655ab63be185d532c661b215f76ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sat, 13 Dec 2025 22:53:13 +0100 Subject: [PATCH] git-preview: remove --- configs/git.nix | 1 - flake.nix | 1 - packages/git-preview.nix | 23 ----------------------- 3 files changed, 25 deletions(-) delete mode 100644 packages/git-preview.nix diff --git a/configs/git.nix b/configs/git.nix index 672bdff..0f05bfb 100644 --- a/configs/git.nix +++ b/configs/git.nix @@ -17,7 +17,6 @@ in { pkgs.gitstats pkgs.patch pkgs.patchutils - inputs.self.packages.${pkgs.system}.git-preview ]; environment.shellAliases = { diff --git a/flake.nix b/flake.nix index d9b90db..3029059 100644 --- a/flake.nix +++ b/flake.nix @@ -360,7 +360,6 @@ fkill = pkgs.callPackage packages/fkill.nix {}; fzfmenu = pkgs.callPackage packages/fzfmenu.nix {}; gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {}; - git-preview = pkgs.callPackage packages/git-preview.nix {}; gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";}; gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";}; hc = pkgs.callPackage packages/hc.nix {}; diff --git a/packages/git-preview.nix b/packages/git-preview.nix deleted file mode 100644 index cb2b6cd..0000000 --- a/packages/git-preview.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - coreutils, - git, - writers, -}: -writers.writeDashBin "git-preview" '' - set -efu - head_commit=$(${git}/bin/git log -1 --format=%H) - merge_commit=$1; shift - merge_message='Merge for git-preview' - preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX) - preview_name=$(${coreutils}/bin/basename "$preview_dir") - ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null - ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit" - ${git}/bin/git -C "$preview_dir" merge \ - ''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \ - -m "$merge_message" \ - -q \ - "$merge_commit" - ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" - ${coreutils}/bin/rm -fR "$preview_dir" - ${coreutils}/bin/rm -R .git/worktrees/"$preview_name" -''