Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'

Conflicts:
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
	nixpkgs/pkgs/development/node-packages/default.nix
	nixpkgs/pkgs/development/python-modules/priority/deadline.patch

7 files changed, 33 insertions, 62 deletions

diff --git a/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch b/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch
deleted file mode 100644
index f2e0802f7981..000000000000
--- a/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001
-From: Adrian Gierakowski <agierakowski@gmail.com>
-Date: Sun, 19 Jul 2020 08:38:05 +0100
-Subject: [PATCH] fix dirent64 et al on darwin
-
----
- configure.ac | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index b8faca9..cee1e4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then
- 				 [klibc has bsd_signal instead of signal])])
- fi
- 
-+dnl TODO: stat64 is deprecated since macOS 10.6
- dnl Check for stat64 (dietlibc/klibc).
- AC_CHECK_FUNC(stat64,, [
- 	AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
-@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [
- 	AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
- ])
- 
-+dnl OS X apparently has stat64 but not readdir64.
-+AC_CHECK_FUNC(readdir64,, [
-+	AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit])
-+])
-+
-+dnl OS X apparently has stat64 but not dirent64.
-+AC_CHECK_TYPE(struct dirent64,, [
-+	AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit])
-+],[#include <dirent.h>])
-+
- dnl Check if struct stat has st_mtim.
- AC_MSG_CHECKING(for stat::st_mtim)
- AC_COMPILE_IFELSE(
--- 
-2.15.1
-
diff --git a/nixpkgs/pkgs/shells/dash/default.nix b/nixpkgs/pkgs/shells/dash/default.nix
index f044c41b73d6..2a0d73145607 100644
--- a/nixpkgs/pkgs/shells/dash/default.nix
+++ b/nixpkgs/pkgs/shells/dash/default.nix
@@ -1,30 +1,42 @@
-{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }:
+{ lib
+, stdenv
+, buildPackages
+, autoreconfHook
+, fetchurl
+, fetchpatch
+, libedit
+}:
 
 stdenv.mkDerivation rec {
   pname = "dash";
-  version = "0.5.11.2";
+  version = "0.5.11.4";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
-    sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0";
+    sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af";
   };
 
   hardeningDisable = [ "format" ];
 
   patches = [
-    (fetchurl {
+    (fetchpatch {
       # Dash executes code when noexec ("-n") is specified
       # https://www.openwall.com/lists/oss-security/2020/11/11/3
       url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
-      sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5";
+      sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1";
+    })
+
+    # aarch64-darwin fix from upstream; remove on next release
+    (fetchpatch {
+      url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614";
+      sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw";
     })
-  ] ++ lib.optionals stdenv.isDarwin [
-      # Temporary fix until a proper one is accepted upstream
-    ./0001-fix-dirent64-et-al-on-darwin.patch
   ];
 
+  # configure.ac patched; remove on next release
+  nativeBuildInputs = [ autoreconfHook ];
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
   buildInputs = [ libedit ];
 
   configureFlags = [ "--with-libedit" ];
diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix
index eaddb0f56dcd..3ebdc4c8e5a6 100644
--- a/nixpkgs/pkgs/shells/nushell/default.nix
+++ b/nixpkgs/pkgs/shells/nushell/default.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU=";
+    sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E=";
   };
 
-  cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY=";
+  cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];
diff --git a/nixpkgs/pkgs/shells/oil/default.nix b/nixpkgs/pkgs/shells/oil/default.nix
index 38ff6a76818a..48bd2fcd8382 100644
--- a/nixpkgs/pkgs/shells/oil/default.nix
+++ b/nixpkgs/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.9.0";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "sha256-xk4io2ZXVupU6mCqmD94k1AaE8Kk0cf3PIx28X6gNjY=";
+    sha256 = "sha256-msPRus7J/qMfFFaayQfrjFFqhSvPuwpr6EaobOCBaUE=";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index 63840a3b8ed8..bff4ee38df82 100644
--- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
 
 stdenv.mkDerivation rec {
-  version = "2021-09-09";
+  version = "2021-09-22";
   pname = "oh-my-zsh";
-  rev = "358ac6a141010b19175d0eb5a6f28ff544aa75d3";
+  rev = "5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "n4x61WeKTba7hRU/01iaU6OYT3741VbCNzLaui69r/Q=";
+    sha256 = "SSvPU/YWFcGN8oyOyQXZhNOuOS7Z8a6Vel94z9EoyAU=";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix
index d5ed2641d536..0e176d0505f5 100644
--- a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "pure-prompt";
-  version = "1.17.1";
+  version = "1.17.3";
 
   src = fetchFromGitHub {
     owner = "sindresorhus";
     repo = "pure";
     rev = "v${version}";
-    sha256 = "sha256-bWp04xT+/Xhgxj1Rm0FgTkRtLH9nuSFtqBsO3B7Exvo=";
+    sha256 = "sha256-WNixw2vVn1mBEDSeIFrWZHHUcX4TNgr+motBemBQfr0=";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix
index 618a35c2f6ad..f1dcb9ead9c9 100644
--- a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "3.14.0";
+  version = "3.14.1";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-K9dNQAMW/Ms6rlAmfgQCqMiA7S4gLh9ZhvUoQiLoHOY=";
+    sha256 = "sha256-/Q2vsCIDsHUSBavJoHX3L0NQ7REoQmaiRgHVGiLtNPE=";
   };
 
   dontBuild = true;