Backport nixpkgs merged changes for integration of cargo-make complet…

…ions (#859)

Apply NixOS/nixpkgs#349104

Update GH-771

home-manager/bash.nix

@@ -3,6 +3,7 @@
   lib,
   pkgs,
   homemade-pkgs,
+  edge-pkgs,
   ...
 }:
 
@@ -122,7 +123,9 @@
         source "${pkgs.fzf-git-sh}/share/fzf-git-sh/fzf-git.sh"
         source "${pkgs.podman}/share/bash-completion/completions/podman"
         source "${pkgs.zellij}/share/bash-completion/completions/zellij.bash"
-        source "${homemade-pkgs.cargo-make-completions}/share/bash-completion/completions/makers-completion.bash"
+
+        # Adding only in devshell is not enough
+        source "${edge-pkgs.cargo-make}/share/bash-completion/completions/makers-completion.bash"
 
         source "${../dependencies/dprint/completions.bash}"
 

home-manager/zsh.nix

@@ -3,6 +3,7 @@
   lib,
   pkgs,
   homemade-pkgs,
+  edge-pkgs,
   ...
 }:
 
@@ -231,7 +232,7 @@ in
       source "${pkgs.fzf-git-sh}/share/fzf-git-sh/fzf-git.sh"
       source "${pkgs.podman}/share/zsh/site-functions/_podman"
       # cargo-make recommends to use bash completions for zsh
-      source "${homemade-pkgs.cargo-make-completions}/share/bash-completion/completions/makers-completion.bash"
+      source "${edge-pkgs.cargo-make}/share/bash-completion/completions/makers-completion.bash"
 
       # fzf completions are also possible to be used in bash, but it overrides default completions with the registering
       # So currently injecting only in zsh

pkgs/default.nix

@@ -61,8 +61,6 @@
   micro-kdl = pkgs.callPackage ./micro-kdl { };
   micro-nordcolors = pkgs.callPackage ./micro-nordcolors { };
 
-  cargo-make-completions = pkgs.callPackage ./cargo-make-completions { };
-
   kdl-vim = pkgs.callPackage ./kdl.vim { };
 
   nix-hash-url = pkgs.callPackage ./nix-hash-url { };