diff options
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/bash/5.1.nix (renamed from pkgs/shells/bash/5.0.nix) | 35 | ||||
-rw-r--r-- | pkgs/shells/bash/bash-5.0-patches.nix | 22 | ||||
-rw-r--r-- | pkgs/shells/bash/bash-5.1-patches.nix | 8 | ||||
-rw-r--r-- | pkgs/shells/bash/pgrp-pipe-5.1.patch (renamed from pkgs/shells/bash/pgrp-pipe-5.0.patch) | 0 | ||||
-rw-r--r-- | pkgs/shells/fish/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/nushell/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/oil/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 |
9 files changed, 39 insertions, 48 deletions
diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.1.nix index 7120910d79e7..8950e5f5b1cf 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.1.nix @@ -1,9 +1,15 @@ -{ stdenv, buildPackages -, fetchurl, binutils ? null, bison, util-linux - -# patch for cygwin requires readline support -, interactive ? stdenv.isCygwin, readline80 ? null -, withDocs ? false, texinfo ? null +{ stdenv +, buildPackages +, fetchurl +, binutils ? null +, bison +, util-linux + + # patch for cygwin requires readline support +, interactive ? stdenv.isCygwin +, readline80 ? null +, withDocs ? false +, texinfo ? null }: with stdenv.lib; @@ -11,21 +17,19 @@ with stdenv.lib; assert interactive -> readline80 != null; assert withDocs -> texinfo != null; assert stdenv.hostPlatform.isDarwin -> binutils != null; - let - upstreamPatches = import ./bash-5.0-patches.nix (nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-5.0-patches/bash50-${nr}"; + upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl { + url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}"; inherit sha256; }); in - stdenv.mkDerivation rec { name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "mirror://gnu/bash/bash-${version}.tar.gz"; - sha256 = "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l"; + sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"; }; hardeningDisable = [ "format" ]; @@ -44,7 +48,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" "-T" ]; patches = upstreamPatches - ++ [ ./pgrp-pipe-5.0.patch ]; + ++ [ ./pgrp-pipe-5.1.patch ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") @@ -87,7 +91,8 @@ stdenv.mkDerivation rec { rm -f $out/lib/bash/Makefile.inc ''; - postFixup = if interactive + postFixup = + if interactive then '' substituteInPlace "$out/bin/bashbug" \ --replace '${stdenv.shell}' "$out/bin/bash" @@ -101,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); + (if interactive then " (for interactive use)" else ""); longDescription = '' Bash is the shell, or command language interpreter, that will diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix deleted file mode 100644 index 4315191d1939..000000000000 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ /dev/null @@ -1,22 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") -(patch "002" "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") -(patch "003" "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf") -(patch "004" "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") -(patch "005" "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") -(patch "006" "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") -(patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") -(patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") -(patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") -(patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") -(patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c") -(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9") -(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm") -(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") -(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") -(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") -(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") -(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw") -] diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix new file mode 100644 index 000000000000..b834deda0f80 --- /dev/null +++ b/pkgs/shells/bash/bash-5.1-patches.nix @@ -0,0 +1,8 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b") +(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm") +(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2") +(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls") +] diff --git a/pkgs/shells/bash/pgrp-pipe-5.0.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch index 2a9fa6f33c3b..2a9fa6f33c3b 100644 --- a/pkgs/shells/bash/pgrp-pipe-5.0.patch +++ b/pkgs/shells/bash/pgrp-pipe-5.1.patch diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index eabed40e8ebc..0811d43eb6ab 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -203,7 +203,7 @@ let homepage = "http://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ocharles cole-h ]; + maintainers = with maintainers; [ cole-h ]; }; passthru = { diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 44961696195f..1774a1c66772 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4"; + sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd"; }; - cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0"; + cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 3dbe95f35b6b..0896b8a50462 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "0ydqwyghnkgbpsdi49vnrx2khs3y0d0bzdzcvjjr999ycmnirz88"; + sha256 = "1z0p08q4808h78bp6nwdszpfavhr4y7n313bp0gg5qdbssnciq1v"; }; postPatch = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8fbbfd47fb95..38236c117e80 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-26"; + version = "2020-12-16"; pname = "oh-my-zsh"; - rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3"; + rev = "b28665aebb4c1b07a57890eb59551bc51d0acf37"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs="; + sha256 = "00m8d992jhbkd8mhm6zhirk9ga3dfzhh8idn2yp40yk7wdbzrd74"; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index c8e845eec99e..7e39e6779d19 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; + sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; }; patches = [ |