diff --git a/nix/hsie/default.nix b/nix/hsie/default.nix index f0809c99a..1f6c2297d 100644 --- a/nix/hsie/default.nix +++ b/nix/hsie/default.nix @@ -28,8 +28,8 @@ let mkdir -p $out/bin ln -s $hsie $out/bin/$name ''; - bashCompletion = + bash-completion = runCommand "${name}-bash-completion" { inherit bin name; } "$bin/bin/$name --bash-completion-script $bin/bin/$name > $out"; in -hsie // { inherit bashCompletion bin; } +hsie // { inherit bash-completion bin; } diff --git a/nix/overlays/build-toolbox/build-toolbox.nix b/nix/overlays/build-toolbox/build-toolbox.nix index a170f9a24..e6b33e12f 100644 --- a/nix/overlays/build-toolbox/build-toolbox.nix +++ b/nix/overlays/build-toolbox/build-toolbox.nix @@ -1,11 +1,11 @@ -# Creates an environment that exposes bashCompletion arguments from all checkedShellScripts +# Creates an environment that exposes bash-completion arguments from all checkedShellScripts { buildEnv }: { name , tools , extra ? { } }: let - bashCompletion = builtins.map (tool: tool.bashCompletion) tools; + bash-completion = builtins.map (tool: tool.bash-completion) tools; env = buildEnv { inherit name; @@ -13,4 +13,4 @@ let }; in -env // { inherit bashCompletion; } // extra +env // { inherit bash-completion; } // extra diff --git a/nix/overlays/checked-shell-script/checked-shell-script.nix b/nix/overlays/checked-shell-script/checked-shell-script.nix index 7de75f524..e3c382e6d 100644 --- a/nix/overlays/checked-shell-script/checked-shell-script.nix +++ b/nix/overlays/checked-shell-script/checked-shell-script.nix @@ -58,7 +58,7 @@ let sed '/_positionals_count + 1/a\\t\t\t\tset -- "''${@:1:1}" "--" "''${@:2}"' -i $out ''; - bashCompletion = + bash-completion = runCommand "${name}-completion" { } ( '' ${argbash}/bin/argbash --type completion --strip all ${argsTemplate}/${name}.m4 > $out @@ -138,4 +138,4 @@ let script = runCommand name { inherit bin name; } "ln -s $bin/bin/$name $out"; in -script // { inherit bin bashCompletion; } +script // { inherit bin bash-completion; } diff --git a/nix/tools/withTools.nix b/nix/tools/withTools.nix index 33c38681d..e070d112c 100644 --- a/nix/tools/withTools.nix +++ b/nix/tools/withTools.nix @@ -1,4 +1,4 @@ -{ bashCompletion +{ bash-completion , buildToolbox , cabal-install , checkedShellScript diff --git a/shell.nix b/shell.nix index 1eb663765..a07398250 100644 --- a/shell.nix +++ b/shell.nix @@ -48,14 +48,14 @@ lib.overrideDerivation postgrest.env ( '' export HISTFILE=.history - source ${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh + source ${pkgs.bash-completion}/etc/profile.d/bash_completion.sh source ${pkgs.git}/share/git/contrib/completion/git-completion.bash - source ${postgrest.hsie.bashCompletion} + source ${postgrest.hsie.bash-completion} '' + builtins.concatStringsSep "\n" ( - builtins.map (bashCompletion: "source ${bashCompletion}") ( - builtins.concatLists (builtins.map (toolbox: toolbox.bashCompletion) toolboxes) + builtins.map (bash-completion: "source ${bash-completion}") ( + builtins.concatLists (builtins.map (toolbox: toolbox.bash-completion) toolboxes) ) ); }