Merge master into staging-next

2 files changed, 8 insertions, 5 deletions

diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix
index bbd56e510b7da..cc7e3e27be6dd 100644
--- a/pkgs/shells/mrsh/default.nix
+++ b/pkgs/shells/mrsh/default.nix
@@ -2,23 +2,26 @@
 
 stdenv.mkDerivation rec {
   pname   = "mrsh";
-  version = "2020-01-08";
+  version = "2020-07-27";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "mrsh";
-    rev = "ef21854fc9ce172fb1f7f580b19a89d030d67c65";
-    sha256 = "1iyxmwl61p2x9v9b22416n4lnrlwjqyxybq35x8bcbjxkwypp943";
+    rev = "0da902c0ee6f443fe703498e60f266af7f12537e";
+    sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = [ readline ];
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "A minimal POSIX shell";
     homepage = "https://mrsh.sh";
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer ];
     platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 8ff2b4d270ee6..711d7060fa55d 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
-  version = "0.9.23";
+  version = "0.9.24";
 
   # fetch from github because the pypi package ships incomplete tests
   src = fetchFromGitHub {
     owner  = "xonsh";
     repo   = "xonsh";
     rev    = version;
-    sha256 = "1by13ryq9ldc9wln3fk5mm6zvjp4aim57ikw49v0dfmz8irnpglp";
+    sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y";
   };
 
   LC_ALL = "en_US.UTF-8";