diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-03-12 09:06:28 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-03-12 09:06:28 +0100 |
commit | 1dd94ad62fddb72cd29636a9f0a0457a2bd60c02 (patch) | |
tree | b80bc5e525784be865b3d5f19b1c97d47a05e64d /pkgs/shells | |
parent | e3b4b428606521b91c0149ef128f04c7d1be3f6b (diff) | |
parent | 32956b5f2a9f1a605bd865be9e3216dc7848d6fd (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/fish/plugins/autopair-fish.nix | 20 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/autopair.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/default.nix | 6 |
3 files changed, 6 insertions, 26 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 d1036829bfdb8..50b5a30b1d93a 100644 --- a/pkgs/shells/fish/plugins/autopair.nix +++ b/pkgs/shells/fish/plugins/autopair.nix @@ -2,19 +2,19 @@ buildFishPlugin rec { pname = "autopair"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "jorgebucaran"; repo = "autopair.fish"; rev = version; - sha256 = "sha256-l6WJ2kjDO/TnU9FSigjxk5xFp90xl68gDfggkE/wrlM="; + 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; [ kidonng ]; + maintainers = with maintainers; [ figsoda 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 }) |