summary refs log tree commit diff
path: root/pkgs/shells/fish/plugins
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-03-10 13:09:57 -0500
committerfigsoda <figsoda@pm.me>2023-03-10 13:11:08 -0500
commitfad73040309d6968bdf02e8691c8f09ed9fecda9 (patch)
tree665114e416cee2775e4fb6efc42ad2b14cdfe2df /pkgs/shells/fish/plugins
parent678e2fe30ee2825aae481c3cfde6257715542025 (diff)
fishPlugins.autopair-fish: remove in favor of fishPlugins.autopair
Diffstat (limited to 'pkgs/shells/fish/plugins')
-rw-r--r--pkgs/shells/fish/plugins/autopair-fish.nix20
-rw-r--r--pkgs/shells/fish/plugins/autopair.nix2
-rw-r--r--pkgs/shells/fish/plugins/default.nix6
3 files changed, 4 insertions, 24 deletions
diff --git a/pkgs/shells/fish/plugins/autopair-fish.nix b/pkgs/shells/fish/plugins/autopair-fish.nix
deleted file mode 100644
index 292d492f2046e..0000000000000
--- a/pkgs/shells/fish/plugins/autopair-fish.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, stdenv, buildFishPlugin, fetchFromGitHub }:
-
-buildFishPlugin rec {
-  pname = "autopair.fish";
-  version = "1.0.4";
-
-  src = fetchFromGitHub {
-    owner = "jorgebucaran";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU=";
-  };
-
-  meta = with lib; {
-    description = "Auto-complete matching pairs in the Fish command line.";
-    homepage = "https://github.com/jorgebucaran/autopair.fish";
-    license = licenses.mit;
-    maintainers = with maintainers; [ thehedgeh0g ];
-  };
-}
diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix
index ff36da648d43e..3151d5838b20f 100644
--- a/pkgs/shells/fish/plugins/autopair.nix
+++ b/pkgs/shells/fish/plugins/autopair.nix
@@ -15,6 +15,6 @@ buildFishPlugin rec {
     description = "Auto-complete matching pairs in the Fish command line";
     homepage = "https://github.com/jorgebucaran/autopair.fish";
     license = licenses.mit;
-    maintainers = with maintainers; [ kidonng ];
+    maintainers = with maintainers; [ kidonng thehedgeh0g ];
   };
 }
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix
index 718dbfec7a642..9197c4907fdfa 100644
--- a/pkgs/shells/fish/plugins/default.nix
+++ b/pkgs/shells/fish/plugins/default.nix
@@ -1,10 +1,8 @@
-{ lib, newScope }:
+{ lib, newScope, config }:
 
 lib.makeScope newScope (self: with self; {
   autopair = callPackage ./autopair.nix { };
 
-  autopair-fish = callPackage ./autopair-fish.nix { };
-
   buildFishPlugin = callPackage ./build-fish-plugin.nix { };
 
   colored-man-pages = callPackage ./colored-man-pages.nix { };
@@ -41,4 +39,6 @@ lib.makeScope newScope (self: with self; {
   sponge = callPackage ./sponge.nix { };
 
   tide = callPackage ./tide.nix { };
+} // lib.optionalAttrs config.allowAliases {
+  autopair-fish = self.autopair; # Added 2023-03-10
 })