JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bash-completion: change attribute name

Browse Source 
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
This commit is contained in:
Robert Helgesson 2016-09-28 17:46:29 +02:00
parent dbe350f5d0
commit e8817a2d20
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/bash/bash.nix
View File

@ -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

4
pkgs/tools/audio/beets/default.nix
View File

@ -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}";

4
pkgs/tools/misc/colord/default.nix
View File

@ -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

4
pkgs/tools/package-management/createrepo_c/default.nix
View File

@ -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";

4
pkgs/tools/package-management/packagekit/default.nix
View File

@ -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 ];

1
pkgs/top-level/aliases.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -4333,7 +4333,7 @@ in
interactive = true;
});
bashCompletion = callPackage ../shells/bash-completion { };
bash-completion = callPackage ../shells/bash-completion { };
dash = callPackage ../shells/dash { };