diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-05-31 07:30:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-05-31 07:30:41 +0200 |
| commit | 5804775d03fe99dcbc31aa61de20626df0ed7571 (patch) | |
| tree | ad1b4f0b5dd0bd8fd9ecc0632815d129a7cc60ec /pkgs/shells | |
| parent | d3d81af60c22e9e93a3930a9630b210362341ab9 (diff) | |
| parent | b64e2b1db37091eb93959fe8f27a7d7da84feb27 (diff) | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/5.nix | 7 | ||||
| -rw-r--r-- | pkgs/shells/bash/bash-completion/default.nix | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index de0426fbcdcd3..25798533113c8 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPackages , fetchurl +, updateAutotoolsGnuConfigScriptsHook , bison , util-linux @@ -88,12 +89,16 @@ stdenv.mkDerivation rec { "bash_cv_termcap_lib=libncurses" ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ "--disable-nls" + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + # /dev/fd is optional on FreeBSD. we need it to work when built on a system + # with it and transferred to a system without it! This includes linux cross. + "bash_cv_dev_fd=absent" ]; strictDeps = true; # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ] + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook bison ] ++ lib.optional withDocs texinfo ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 80f5ffeff9519..3bdef89e722e0 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl -, fetchpatch , autoreconfHook , perl , ps @@ -9,15 +8,15 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.13.0"; + version = "2.14.0"; # Using fetchurl because fetchGithub or fetchzip will have trouble on # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the # test fixtures that are part of the repository. # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 src = fetchurl { - url = "https://github.com/scop/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xfmaOeQPDRVMA/8VQ46H7OH1rGZjNqRFmJni/0vt89E="; + url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"; + sha256 = "sha256-XHSU+WgoCDLWrbWqGfdFpW8aed8xHlkzjF76b3KF4Wg="; }; strictDeps = true; |