From 4682f63a73d0e4666a65c0ec03dc62a58328cfac Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 23 Nov 2022 07:48:52 +0000 Subject: [PATCH 1/2] maintainers: add deejayem --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bfd89bd6fa5..455d59ee7ad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3288,6 +3288,15 @@ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; }]; }; + deejayem = { + email = "nixpkgs.bu5hq@simplelogin.com"; + github = "deejayem"; + githubId = 2564003; + name = "David Morgan"; + keys = [{ + fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; + }]; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; From b40da0c8f5cfdda145e3957199a43ea7f8cd36ac Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 24 Nov 2022 21:33:57 +0000 Subject: [PATCH 2/2] zsh-forgit: init at 22.11.0 --- pkgs/shells/zsh/zsh-forgit/default.nix | 35 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-forgit/default.nix diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix new file mode 100644 index 00000000000..01dc6874cc4 --- /dev/null +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, git, fzf }: + +stdenv.mkDerivation rec { + pname = "zsh-forgit"; + version = "22.11.0"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = "forgit"; + rev = version; + sha256 = "ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A="; + }; + + strictDeps = true; + + postPatch = '' + substituteInPlace forgit.plugin.zsh \ + --replace "fzf " "${fzf}/bin/fzf " \ + --replace "git " "${git}/bin/git " + ''; + + dontBuild = true; + + installPhase = '' + install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/wfxr/forgit"; + description = "A utility tool powered by fzf for using git interactively"; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb049f54fc..43b64c73031 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13249,6 +13249,8 @@ with pkgs; zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; + zsh-forgit = callPackage ../shells/zsh/zsh-forgit { }; + zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { };