Merge branch 'staging' of https://github.com/NixOS/nixpkgs

11 files changed, 19 insertions, 267 deletions

diff --git a/nixpkgs/pkgs/shells/bash/5.nix b/nixpkgs/pkgs/shells/bash/5.nix
index 6b126390c9f6..3beb54b908e2 100644
--- a/nixpkgs/pkgs/shells/bash/5.nix
+++ b/nixpkgs/pkgs/shells/bash/5.nix
@@ -68,6 +68,12 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
+    # At least on Linux bash memory allocator has pathological performance
+    # in scenarios involving use of larger memory:
+    #   https://lists.gnu.org/archive/html/bug-bash/2023-08/msg00052.html
+    # Various distributions default to system allocator. Let's nixpkgs
+    # do the same.
+    "--without-bash-malloc"
     (if interactive then "--with-installed-readline" else "--disable-readline")
   ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "bash_cv_job_control_missing=nomissing"
@@ -81,7 +87,6 @@ stdenv.mkDerivation rec {
     "bash_cv_dev_fd=standard"
     "bash_cv_termcap_lib=libncurses"
   ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [
-    "--without-bash-malloc"
     "--disable-nls"
   ];
 
diff --git a/nixpkgs/pkgs/shells/elvish/default.nix b/nixpkgs/pkgs/shells/elvish/default.nix
deleted file mode 100644
index 1bd0c138c9c0..000000000000
--- a/nixpkgs/pkgs/shells/elvish/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, runCommand
-}:
-
-let
-  pname = "elvish";
-  version = "0.19.2";
-  shellPath = "/bin/elvish";
-in
-buildGoModule {
-  inherit pname version;
-
-  src = fetchFromGitHub {
-    owner = "elves";
-    repo = "elvish";
-    rev = "v${version}";
-    hash = "sha256-eCPJXCgmMvrJ2yVqYgXHXJWb6Ec0sutc91LNs4yRBYk=";
-  };
-
-  vendorHash = "sha256-VMI20IP1jVkUK3rJm35szaFDfZGEEingUEL/xfVJ1cc=";
-
-  subPackages = [ "cmd/elvish" ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X src.elv.sh/pkg/buildinfo.Version==${version}"
-  ];
-
-  strictDeps = true;
-
-  doCheck = false;
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out${shellPath} -c "
-      fn expect {|key expected|
-        var actual = \$buildinfo[\$key]
-        if (not-eq \$actual \$expected) {
-          fail '\$buildinfo['\$key']: expected '(to-string \$expected)', got '(to-string \$actual)
-        }
-      }
-
-      expect version ${version}
-    "
-
-    runHook postInstallCheck
-  '';
-
-  passthru = {
-    inherit shellPath;
-  };
-
-  meta = {
-    homepage = "https://elv.sh/";
-    description = "A friendly and expressive command shell";
-    longDescription = ''
-      Elvish is a friendly interactive shell and an expressive programming
-      language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0
-      status, it is already suitable for most daily interactive use.
-    '';
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ vrthra AndersonTorres ];
-  };
-}
diff --git a/nixpkgs/pkgs/shells/mksh/default.nix b/nixpkgs/pkgs/shells/mksh/default.nix
deleted file mode 100644
index 3e4791e2b8a3..000000000000
--- a/nixpkgs/pkgs/shells/mksh/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, installShellFiles
-}:
-
-stdenv.mkDerivation rec {
-  pname = "mksh";
-  version = "59c";
-
-  src = fetchurl {
-    urls = [
-      "http://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz"
-      "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz"
-    ];
-    hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY=";
-  };
-
-  strictDeps = true;
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  dontConfigure = true;
-
-  buildPhase = ''
-    runHook preBuild
-    sh ./Build.sh -r
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -D mksh $out/bin/mksh
-    install -D dot.mkshrc $out/share/mksh/mkshrc
-    installManPage mksh.1
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "http://www.mirbsd.org/mksh.htm";
-    description = "MirBSD Korn Shell";
-    longDescription = ''
-      The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI
-      approved) successor to pdksh, developed as part of the MirOS
-      Project as native Bourne/POSIX/Korn shell for MirOS BSD, but
-      also to be readily available under other UNIX(R)-like operating
-      systems.
-    '';
-    license = with licenses; [ miros isc unicode-dfs-2016 ];
-    maintainers = with maintainers; [ AndersonTorres joachifm ];
-    platforms = platforms.unix;
-  };
-
-  passthru = {
-    shellPath = "/bin/mksh";
-  };
-}
-# TODO [ AndersonTorres ]: lksh
-# TODO [ AndersonTorres ]: a more accurate licensing info
diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix
index d87d842be08c..34b8f9504f8b 100644
--- a/nixpkgs/pkgs/shells/nushell/default.nix
+++ b/nixpkgs/pkgs/shells/nushell/default.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  version = "0.84.0";
+  version = "0.85.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     rev = version;
-    hash = "sha256-vXtQUWKRPS53IBUgO9Dw8dVzfD5W2kHSPOZHs293O5Q=";
+    hash = "sha256-/c3JTgIT+T41D0S7irQ0jq2MDzmx3os4pYpVr10cL3E=";
   };
 
-  cargoHash = "sha256-NtTCuTWbGTrGKF7ulm3Bfal/WuBtPEX7QvHoOyKY1V8=";
+  cargoHash = "sha256-lBipwX72j0Af3PCat18s9NIjJiKZFZTcU9Utwt+eQzI=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
diff --git a/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix
index 9170e8452460..0abe1d4abfe9 100644
--- a/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix
+++ b/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix
@@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nushell";
     repo = pname;
-    rev = "45c051dad0e243a63608c8274b7fddd5f0b74941";
-    hash = "sha256-kpE+vgobYsQuh8sS3gK/yg68nQykquwteeuecjLtIrE=";
+    rev = "36a45f28a39ee1526a748b53f438a41ae939fc7c";
+    hash = "sha256-QhERyWomyOOk9aYRjm69ykzOR3G/uGM/A4Pr9PlB71w=";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
index bc63789633a2..8c511782e3de 100644
--- a/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
+++ b/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
@@ -12,9 +12,9 @@ let
 in
 rustPlatform.buildRustPackage {
   inherit pname;
-  version = "0.84.0";
+  version = "0.85.0";
   src = nushell.src;
-  cargoHash = "sha256-pwOdSJHd9njR0lr4n2EzCcqRonh0cbBHGZgAJ1l8FEk=";
+  cargoHash = "sha256-OKtktjBOujvljAX260TbC2sQWZOiGgU+sXsbYRhGPRM=";
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ IOKit Foundation ];
   cargoBuildFlags = [ "--package nu_plugin_formats" ];
diff --git a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
index 39af12a6a935..f7e912a6fdc6 100644
--- a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
+++ b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
@@ -12,9 +12,9 @@ let
 in
 rustPlatform.buildRustPackage {
   inherit pname;
-  version = "0.84.0";
+  version = "0.85.0";
   src = nushell.src;
-  cargoHash = "sha256-RcwCYfIEV0+NbZ99uWaCOLqLap3wZ4qXIsc02fqkBSQ=";
+  cargoHash = "sha256-Fj70uKYzEKxeZeNrqlwM7ZFJ+K1tz10RqLndrdY40CE=";
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
   cargoBuildFlags = [ "--package nu_plugin_gstat" ];
diff --git a/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/nixpkgs/pkgs/shells/nushell/plugins/query.nix
index 0988d4f80bb7..51db91bec266 100644
--- a/nixpkgs/pkgs/shells/nushell/plugins/query.nix
+++ b/nixpkgs/pkgs/shells/nushell/plugins/query.nix
@@ -9,11 +9,11 @@
 
 rustPlatform.buildRustPackage {
   pname = "nushell_plugin_query";
-  version = "0.84.0";
+  version = "0.85.0";
 
   src = nushell.src;
 
-  cargoHash = "sha256-8uAoiurQpI++duheNqwEDw/0CIPE1dHcgL48hKWqNUg=";
+  cargoHash = "sha256-8iUqOdGWm2kDW72ptlCBIqqe4zjckN09MOQD77kCf5Y=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
 
diff --git a/nixpkgs/pkgs/shells/pash/default.nix b/nixpkgs/pkgs/shells/pash/default.nix
deleted file mode 100644
index c9150fda18ae..000000000000
--- a/nixpkgs/pkgs/shells/pash/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, fetchFromGitHub, buildDotnetPackage }:
-
-buildDotnetPackage {
-  pname = "pash";
-  version = "git-2016-07-06";
-
-  src = fetchFromGitHub {
-    owner = "Pash-Project";
-    repo = "Pash";
-    rev = "8d6a48f5ed70d64f9b49e6849b3ee35b887dc254";
-    sha256 = "0c4wa8qi1zs01p9ck171jkw0n1rsymsrhpsb42gl7warwhpmv59f";
-  };
-
-  strictDeps = true;
-  preConfigure = "rm -rvf $src/Source/PashConsole/bin/*";
-
-  outputFiles = [ "Source/PashConsole/bin/Release/*" ];
-
-  meta = with lib; {
-    description = "An open source implementation of Windows PowerShell";
-    homepage = "https://github.com/Pash-Project/Pash";
-    maintainers = [ maintainers.fornever maintainers.vrthra ];
-    platforms = platforms.all;
-    license = with licenses; [ bsd3 gpl3 ];
-  };
-
-  passthru = {
-    shellPath = "/bin/pash";
-  };
-}
diff --git a/nixpkgs/pkgs/shells/rc/default.nix b/nixpkgs/pkgs/shells/rc/default.nix
deleted file mode 100644
index 1e1e968e7333..000000000000
--- a/nixpkgs/pkgs/shells/rc/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkgsStatic
-, byacc
-, ed
-, ncurses
-, readline
-, installShellFiles
-, historySupport ? true
-, readlineSupport ? true
-, lineEditingLibrary ? if (stdenv.hostPlatform.isDarwin
-                           || stdenv.hostPlatform.isStatic)
-                       then "null"
-                       else "readline"
-}:
-
-assert lib.elem lineEditingLibrary [ "null" "edit" "editline" "readline" "vrl" ];
-assert !(lib.elem lineEditingLibrary [ "edit" "editline" "vrl" ]); # broken
-assert (lineEditingLibrary == "readline") -> readlineSupport;
-stdenv.mkDerivation (finalAttrs: {
-  pname = "rc";
-  version = "unstable-2023-06-14";
-
-  src = fetchFromGitHub {
-    owner = "rakitzis";
-    repo = "rc";
-    rev = "4aaba1a9cb9fdbb8660696a87850836ffdb09599";
-    hash = "sha256-Yql3mt7hTO2W7wTfPje+X2zBGTHiNXGGXYORJewJIM8=";
-  };
-
-  outputs = [ "out" "man" ];
-
-  # TODO: think on a less ugly fixup
-  postPatch = ''
-    ed -v -s Makefile << EOS
-    # - remove reference to now-inexistent git index file
-    /version.h:/ s| .git/index||
-    # - manually insert the git revision string
-    /v=/ c
-    ${"\t"}v=${builtins.substring 0 7 finalAttrs.src.rev}
-    .
-    /\.git\/index:/ d
-    w
-    q
-    EOS
-  '';
-
-  nativeBuildInputs = [
-    byacc
-    ed
-    installShellFiles
-  ];
-
-  buildInputs = [
-    ncurses
-  ]
-  ++ lib.optionals readlineSupport [
-    readline
-  ];
-
-  strictDeps = true;
-
-  makeFlags  = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "PREFIX=${placeholder "out"}"
-    "MANPREFIX=${placeholder "man"}/share/man"
-    "CPPFLAGS=\"-DSIGCLD=SIGCHLD\""
-    "EDIT=${lineEditingLibrary}"
-  ];
-
-  buildFlags = [
-    "all"
-  ] ++ lib.optionals historySupport [
-    "history"
-  ];
-
-  postInstall = lib.optionalString historySupport ''
-    installManPage history.1
-  '';
-
-  passthru = {
-    shellPath = "/bin/rc";
-    tests.static = pkgsStatic.rc;
-  };
-
-  meta = {
-    homepage = "https://github.com/rakitzis/rc";
-    description = "The Plan 9 shell";
-    license = [ lib.licenses.zlib ];
-    mainProgram = "rc";
-    maintainers = with lib.maintainers; [ ramkromberg AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/nixpkgs/pkgs/shells/zsh/antibody/default.nix
index 0ecbb9bfdb6f..8df75ac15b95 100644
--- a/nixpkgs/pkgs/shells/zsh/antibody/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/antibody/default.nix
@@ -8,10 +8,10 @@ buildGoModule rec {
     owner = "getantibody";
     repo = "antibody";
     rev = "v${version}";
-    sha256 = "0icag53svzdm7yvzp855fp0f7q0g0jkfmjaa1sj6mmb01c1xgzi1";
+    hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU=";
   };
 
-  vendorSha256 = "0z8fma3v2dph8nv3q4lmv43s6p5sc338xb7kcmnpwcc0iw7b4vyj";
+  vendorHash = "sha256-0m+yDo+AMX5tZfOsjsZgulyjB9mVEjy2RfA2sYeqDn0=";
 
   doCheck = false;