commit 7c7e88b45e137d2f0458bae167ede9d5fe551df2 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/bash/bash.nix

···

       16
       16
        
           # programmable completion. If we do, enable all modules installed in

     

       17
       17
        
           # the system (and user profile).

     

       18
       18
        
           if shopt -q progcomp &>/dev/null; then

     

       19
       19
       -
             . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh"

     

       19
       19
       +
             . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"

     

       20
       20
        
             nullglobStatus=$(shopt -p nullglob)

     

       21
       21
        
             shopt -s nullglob

     

       22
       22
        
             for p in $NIX_PROFILES; do

-22

pkgs/shells/bash-completion/bash-4.3.patch

···

       1
       1
       -
       commit a9c556ccad819869a6a5d932aac0a75a99372f08

     

       2
       2
       -
       Author: Barry Warsaw <barry@python.org>

     

       3
       3
       -
       Date:   Wed Sep 17 19:32:43 2014 +0300

     

       4
       4
       -
       

     

       5
       5
       -
           _init_completion: Handle cword < 0 (LP: #1289597)

     

       6
       6
       -
           

     

       7
       7
       -
           Previously only bash 4.3 seemed to provoke this, but now with the

     

       8
       8
       -
           empty command consistency tweak it occurs with earlier as well.

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/bash_completion b/bash_completion

     

       11
       11
       -
       index 7e01ae4..3bb4bc2 100644

     

       12
       12
       -
       --- a/bash_completion

     

       13
       13
       -
       +++ b/bash_completion

     

       14
       14
       -
       @@ -727,7 +727,7 @@ _init_completion()

     

       15
       15
       -
                fi

     

       16
       16
       -
            done

     

       17
       17
       -
        

     

       18
       18
       -
       -    [[ $cword -eq 0 ]] && return 1

     

       19
       19
       -
       +    [[ $cword -le 0 ]] && return 1

     

       20
       20
       -
            prev=${words[cword-1]}

     

       21
       21
       -
        

     

       22
       22
       -
            [[ ${split-} ]] && _split_longopt && split=true

+9 -16

pkgs/shells/bash-completion/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "bash-completion-2.1";

     

       4
       4
       +
         name = "bash-completion-${version}";

     

       5
       5
       +
         version = "2.4";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           url = "http://bash-completion.alioth.debian.org/files/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b";

     

       8
       8
       +
           url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";

     

       9
       9
       +
           sha256 = "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0";

     

       9
       10
        
         };

     

       10
       11
        
       

     

       11
       11
       -
         patches = [ ./bash-4.3.patch ];

     

       12
       12
       -
       

     

       13
       12
        
         doCheck = true;

     

       14
       13
        
       

     

       15
       15
       -
         # nmcli is included in the network-manager package

     

       16
       16
       -
         postInstall = ''

     

       17
       17
       -
           rm $out/share/bash-completion/completions/nmcli

     

       18
       18
       -
         '';

     

       19
       19
       -
       

     

       20
       20
       -
         meta = {

     

       21
       21
       -
           homepage = "http://bash-completion.alioth.debian.org/";

     

       14
       14
       +
         meta = with stdenv.lib; {

     

       15
       15
       +
           homepage = https://github.com/scop/bash-completion;

     

       22
       16
        
           description = "Programmable completion for the bash shell";

     

       23
       23
       -
           license = "GPL";

     

       24
       24
       -
       

     

       25
       25
       -
           platforms = stdenv.lib.platforms.unix;

     

       26
       26
       -
           maintainers = [ stdenv.lib.maintainers.peti ];

     

       17
       17
       +
           license = licenses.gpl2Plus;

     

       18
       18
       +
           platforms = platforms.unix;

     

       19
       19
       +
           maintainers = [ maintainers.peti ];

     

       27
       20
        
         };

     

       28
       21
        
       }

+2 -2

pkgs/tools/audio/beets/default.nix

···

       19
       19
        
       , enableAlternatives   ? false

     

       20
       20
        
       , enableCopyArtifacts  ? false

     

       21
       21
        
       

     

       22
       22
       -
       , bashInteractive, bashCompletion

     

       22
       22
       +
       , bashInteractive, bash-completion

     

       23
       23
        
       }:

     

       24
       24
        
       

     

       25
       25
        
       assert enableAcoustid    -> pythonPackages.pyacoustid     != null;

     
···

       70
       70
        
         allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;

     

       71
       71
        
       

     

       72
       72
        
         testShell = "${bashInteractive}/bin/bash --norc";

     

       73
       73
       -
         completion = "${bashCompletion}/share/bash-completion/bash_completion";

     

       73
       73
       +
         completion = "${bash-completion}/share/bash-completion/bash_completion";

     

       74
       74
        
       

     

       75
       75
        
       in pythonPackages.buildPythonApplication rec {

     

       76
       76
        
         name = "beets-${version}";

+2 -2

pkgs/tools/misc/colord/default.nix

···

       1
       1
       -
       { stdenv, fetchzip, fetchgit, bashCompletion

     

       1
       1
       +
       { stdenv, fetchzip, fetchgit, bash-completion

     

       2
       2
        
       , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus

     

       3
       3
        
       , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms

     

       4
       4
        
       , libgudev, sane-backends }:

     
···

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
        
         buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection

     

       31
       31
       -
                         bashCompletion argyllcms automake autoconf libgudev sane-backends ];

     

       31
       31
       +
                         bash-completion argyllcms automake autoconf libgudev sane-backends ];

     

       32
       32
        
       

     

       33
       33
        
         postInstall = ''

     

       34
       34
        
           mkdir -p $out/etc/bash_completion.d

+2 -2

pkgs/tools/package-management/createrepo_c/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bashCompletion }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         rev  = "0.10.0";

     
···

       22
       22
        
                       "set (PYTHON_INSTALL_DIR "$out/${python.sitePackages}")"

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bashCompletion ];

     

       25
       25
       +
         buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bash-completion ];

     

       26
       26
        
       

     

       27
       27
        
         meta = with stdenv.lib; {

     

       28
       28
        
           description = "C implementation of createrepo";

+2 -2

pkgs/tools/package-management/packagekit/default.nix

···

       3
       3
        
       , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive

     

       4
       4
        
       , nix, boost

     

       5
       5
        
       , enableCommandNotFound ? false

     

       6
       6
       -
       , enableBashCompletion ? false, bashCompletion ? null }:

     

       6
       6
       +
       , enableBashCompletion ? false, bash-completion ? null }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         name = "packagekit-${version}";

     
···

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ]

     

       20
       20
       -
                         ++ lib.optional enableBashCompletion bashCompletion;

     

       20
       20
       +
                         ++ lib.optional enableBashCompletion bash-completion;

     

       21
       21
        
         propagatedBuildInputs = [ sqlite nix boost ];

     

       22
       22
        
         nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ];

     

       23
       23

+1

pkgs/top-level/aliases.nix

···

       24
       24
        
         asciidocFull = asciidoc-full;  # added 2014-06-22

     

       25
       25
        
         bar = lemonbar;  # added 2015-01-16

     

       26
       26
        
         bar-xft = lemonbar-xft;  # added 2015-01-16

     

       27
       27
       +
         bashCompletion = bash-completion; # Added 2016-09-28

     

       27
       28
        
         bridge_utils = bridge-utils;  # added 2015-02-20

     

       28
       29
        
         btrfsProgs = btrfs-progs; # added 2016-01-03

     

       29
       30
        
         bundler_HEAD = bundler; # added 2015-11-15

+1 -1

pkgs/top-level/all-packages.nix

···

       4337
       4337
        
           interactive = true;

     

       4338
       4338
        
         });

     

       4339
       4339
        
       

     

       4340
       4340
       -
         bashCompletion = callPackage ../shells/bash-completion { };

     

       4340
       4340
       +
         bash-completion = callPackage ../shells/bash-completion { };

     

       4341
       4341
        
       

     

       4342
       4342
        
         dash = callPackage ../shells/dash { };

     

       4343
       4343