Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'

Conflicts:
	nixpkgs/nixos/modules/config/update-users-groups.pl

5 files changed, 79 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix
index 51e7dcc096b8..3547af490e6a 100644
--- a/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -1,17 +1,17 @@
-{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }:
+{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }:
 
 buildFishPlugin rec {
   pname = "fzf.fish";
-  version = "5.6";
+  version = "7.3";
 
   src = fetchFromGitHub {
     owner = "PatrickF1";
     repo = "fzf.fish";
     rev = "v${version}";
-    sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73";
+    sha256 = "16mdfyznxjhv7x561srl559misn37a35d2q9fspxa7qg1d0sc3x9";
   };
 
-  checkInputs = [ fzf ];
+  checkInputs = [ fzf fd util-linux ];
   checkPlugins = [ clownfish fishtape_3 ];
   checkFunctionDirs = [ "./functions" ];
   checkPhase = ''
@@ -20,10 +20,16 @@ buildFishPlugin rec {
     rm -r tests/*git*
 
     # Disable tests that are failing, probably because of our wrappers
+    rm -r tests/configure_bindings
     rm -r tests/search_shell_variables
 
-    fishtape tests/*/*.fish
-  '';
+    # Disable tests that are failing, because there is not 'rev' command
+    rm tests/preview_file/custom_file_preview.fish
+
+  '' + (
+    if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"''
+    else ''script -c 'fish -c "fishtape tests/*/*.fish"' ''
+  );
 
   meta = with lib; {
     description = "Augment your fish command line with fzf key bindings";
diff --git a/nixpkgs/pkgs/shells/loksh/default.nix b/nixpkgs/pkgs/shells/loksh/default.nix
new file mode 100644
index 000000000000..d8463d1773c4
--- /dev/null
+++ b/nixpkgs/pkgs/shells/loksh/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, meson
+, ninja
+, pkg-config
+, ncurses
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "loksh";
+  version = "6.9";
+
+  src = fetchFromGitHub {
+    owner = "dimkr";
+    repo = pname;
+    rev = version;
+    fetchSubmodules = true;
+    sha256 = "0x33plxqhh5202hgqidgccz5hpg8d2q71ylgnm437g60mfi9z0px";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    ncurses
+  ];
+
+  postInstall = ''
+    mv $out/bin/ksh $out/bin/loksh
+    mv $out/share/man/man1/ksh.1 $out/share/man/man1/loksh.1
+    mv $out/share/man/man1/sh.1 $out/share/man/man1/loksh-sh.1
+  '';
+
+  passthru = {
+    shellPath = "/bin/loksh";
+  };
+
+  meta = with lib; {
+    description = "Linux port of OpenBSD's ksh";
+    homepage = "https://github.com/dimkr/loksh";
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ cameronnemo ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix
index e78c208b56fe..63840a3b8ed8 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-08-27";
+  version = "2021-09-09";
   pname = "oh-my-zsh";
-  rev = "190325049ef93731ab28295dbedf36d44ab33d7a";
+  rev = "358ac6a141010b19175d0eb5a6f28ff544aa75d3";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "x+cGlYjTgs7Esb4NNSBcKhoDb1SuEQxONt/sSHeVj0M=";
+    sha256 = "n4x61WeKTba7hRU/01iaU6OYT3741VbCNzLaui69r/Q=";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch
new file mode 100644
index 000000000000..54b6ce26138a
--- /dev/null
+++ b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/darwin.patch
@@ -0,0 +1,11 @@
+diff --git a/modules/Src/aloxaf/fzftab.c b/modules/Src/aloxaf/fzftab.c
+index 60b6330..91975d8 100644
+--- a/modules/Src/aloxaf/fzftab.c
++++ b/modules/Src/aloxaf/fzftab.c
+@@ -1,6 +1,5 @@
+ #include "fzftab.mdh"
+ #include "fzftab.pro"
+-#include <malloc.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
diff --git a/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix
index ccf60e6d76af..ad1b7d3d740c 100644
--- a/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix
+++ b/nixpkgs/pkgs/shells/zsh/zsh-fzf-tab/default.nix
@@ -15,6 +15,8 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
+  patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+
   postConfigure = ''
     pushd modules
     ./configure --disable-gdbm --without-tcsetpgrp
@@ -40,6 +42,6 @@ in stdenv.mkDerivation rec {
     description = "Replace zsh's default completion selection menu with fzf!";
     license = licenses.mit;
     maintainers = with maintainers; [ vonfry ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }