diff --git a/derivations/git-spice/default.nix b/derivations/git-spice/default.nix deleted file mode 100644 index 7b3d2196..00000000 --- a/derivations/git-spice/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - git, - nix-update-script, -}: - -buildGoModule rec { - pname = "git-spice"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "abhinav"; - repo = "git-spice"; - rev = "refs/tags/v${version}"; - hash = "sha256-jBEoNfj3rGNqZaNJfJUZzXFmvmLUp2biHbk6E2C/Dww="; - }; - - vendorHash = "sha256-2SEFXjO6o6Hh1gmds/pIRwulyiSy6wxE/5wJnKcdX6A="; - - subPackages = [ "." ]; - - nativeCheckInputs = [ git ]; - - buildInputs = [ git ]; - - ldflags = [ - "-s" - "-w" - "-X=main._version=${version}" - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Manage stacked Git branches"; - homepage = "https://abhinav.github.io/git-spice/"; - changelog = "https://github.com/abhinav/git-spice/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.vinnymeller ]; - mainProgram = "gs"; - }; -} diff --git a/flake.nix b/flake.nix index 3e93dedf..daede856 100644 --- a/flake.nix +++ b/flake.nix @@ -83,8 +83,6 @@ gh-repo-url = final.callPackage ./derivations/gh-repo-url {}; gh-rebase-pr = final.callPackage ./derivations/gh-rebase-pr {}; wlman = final.callPackage ./derivations/wlman {}; - # temporary until this exists in nixpkgs - git-spice = final.callPackage ./derivations/git-spice {}; # https://kokada.capivaras.dev/blog/quick-bits-realise-nix-symlinks/ realise-symlink = final.writeShellApplication { name = "realise-symlink"; diff --git a/home/packages/simon.nix b/home/packages/simon.nix index a0959776..346f96f0 100644 --- a/home/packages/simon.nix +++ b/home/packages/simon.nix @@ -40,7 +40,6 @@ in { entr fd file - git-spice hexyl htop jless