From e8817a2d20037b54ac9fe548c9f31d6e7c44bedf Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 28 Sep 2016 17:46:29 +0200 Subject: [PATCH] bash-completion: change attribute name This changes the attribute name of bash-completion from `bashCompletion` to `bash-completion`. Keeps `bashCompletion` as an alias for the new name. --- nixos/modules/programs/bash/bash.nix | 2 +- pkgs/tools/audio/beets/default.nix | 4 ++-- pkgs/tools/misc/colord/default.nix | 4 ++-- pkgs/tools/package-management/createrepo_c/default.nix | 4 ++-- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index c09bcfb70e24..e23849d350b4 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -16,7 +16,7 @@ let # programmable completion. If we do, enable all modules installed in # the system (and user profile). if shopt -q progcomp &>/dev/null; then - . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh" + . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" nullglobStatus=$(shopt -p nullglob) shopt -s nullglob for p in $NIX_PROFILES; do diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 283a6d48ca26..05d8bd0990f5 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -19,7 +19,7 @@ , enableAlternatives ? false , enableCopyArtifacts ? false -, bashInteractive, bashCompletion +, bashInteractive, bash-completion }: assert enableAcoustid -> pythonPackages.pyacoustid != null; @@ -70,7 +70,7 @@ let allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins; testShell = "${bashInteractive}/bin/bash --norc"; - completion = "${bashCompletion}/share/bash-completion/bash_completion"; + completion = "${bash-completion}/share/bash-completion/bash_completion"; in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 7e6c3f30784e..6dc2c371e460 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchgit, bashCompletion +{ stdenv, fetchzip, fetchgit, bash-completion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms , libgudev, sane-backends }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bashCompletion argyllcms automake autoconf libgudev sane-backends ]; + bash-completion argyllcms automake autoconf libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index eed1ed1e5260..8d27dc8aef03 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bashCompletion }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { rev = "0.10.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "set (PYTHON_INSTALL_DIR "$out/${python.sitePackages}")" ''; - buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bashCompletion ]; + buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index af8a162357b6..68d13f7f17fa 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -3,7 +3,7 @@ , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive , nix, boost , enableCommandNotFound ? false -, enableBashCompletion ? false, bashCompletion ? null }: +, enableBashCompletion ? false, bash-completion ? null }: stdenv.mkDerivation rec { name = "packagekit-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ] - ++ lib.optional enableBashCompletion bashCompletion; + ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc09abc49b53..14c3e513d6c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,6 +24,7 @@ doNotDisplayTwice rec { asciidocFull = asciidoc-full; # added 2014-06-22 bar = lemonbar; # added 2015-01-16 bar-xft = lemonbar-xft; # added 2015-01-16 + bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 bundler_HEAD = bundler; # added 2015-11-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72636b200dc5..e05c8c427248 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4333,7 +4333,7 @@ in interactive = true; }); - bashCompletion = callPackage ../shells/bash-completion { }; + bash-completion = callPackage ../shells/bash-completion { }; dash = callPackage ../shells/dash { };