diff --git a/modules/home/all/git.nix b/modules/home/all/git.nix index bad5f4f..4a213fe 100644 --- a/modules/home/all/git.nix +++ b/modules/home/all/git.nix @@ -2,7 +2,6 @@ { home.packages = with pkgs; [ git-filter-repo - git-squash # https://github.com/sheerun/git-squash ]; programs.git = { diff --git a/overlays/default.nix b/overlays/default.nix index 77f7473..a1e3f44 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -15,5 +15,4 @@ self: super: { actualism-app = inputs.actualism-app.packages.${self.system}.default; omnix = inputs.omnix.packages.${self.system}.default; git-merge-and-delete = self.callPackage "${packages}/git-merge-and-delete.nix" { }; - git-squash = self.callPackage "${packages}/git-squash.nix" { }; } diff --git a/packages/git-squash.nix b/packages/git-squash.nix deleted file mode 100644 index f4c675e..0000000 --- a/packages/git-squash.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, git -}: - -stdenv.mkDerivation { - pname = "git-squash"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "sheerun"; - repo = "git-squash"; - rev = "master"; - sha256 = "sha256-yvufKIwjP7VcIzLi8mE228hN4jmaqk90c8oxJtkXEP8="; - }; - - nativeBuildInputs = [ bash git ]; - - installPhase = '' - mkdir -p $out/bin - cp git-squash $out/bin/git-squash - chmod +x $out/bin/git-squash - ''; - - meta = with lib; { - description = "A Git command for squashing commits"; - homepage = "https://github.com/sheerun/git-squash"; - license = licenses.mit; # Adjust if the actual license is different - platforms = platforms.all; - maintainers = [ ]; # You can add maintainers if needed - }; -}