Merge staging-next into staging

pkgs/applications/video/mkvtoolnix/default.nix

@@ -122,6 +122,11 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014
+  qtWrapperArgs = lib.optionals stdenv.isDarwin [
+    "--set QT_MAC_WANTS_LAYER 1"
+  ];
+
   postFixup = optionalString withGUI ''
     wrapQtApp $out/bin/mkvtoolnix-gui
   '';
@@ -131,7 +136,6 @@ stdenv.mkDerivation rec {
     homepage = "https://mkvtoolnix.download/";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ codyopel rnhmjoj ];
-    platforms = platforms.linux
+    platforms = platforms.unix;
-      ++ optionals (!withGUI) platforms.darwin;
   };
 }

pkgs/development/beam-modules/elixir_ls.nix

@@ -4,20 +4,20 @@
 
 mixRelease rec {
   pname = "elixir-ls";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "elixir-lsp";
     repo = "elixir-ls";
     rev = "v${version}";
-    sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s";
+    sha256 = "sha256-pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM=";
     fetchSubmodules = true;
   };
 
   mixFodDeps = fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1";
+    sha256 = "sha256-YRzPASpg1K2kZUga5/aQf4Q33d8aHCwhw7KJxSY56k4=";
   };
 
   # elixir_ls is an umbrella app

pkgs/development/interpreters/acl2/default.nix

@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
 
     # Clean up some stuff to save space
     find -name '*@useless-runes.lsp' -execdir rm {} +  # saves ~1GB of space
-    find -name '*.cert.out' -execdir gz {} +           # saves ~400MB of space
+    find -name '*.cert.out' -execdir gzip {} +         # saves ~400MB of space
 
     popd
   '';

pkgs/development/tools/oq/default.nix

@@ -8,13 +8,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "oq";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "Blacksmoke16";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vMW+N3N6H8S6dNm4eBJo2tSxSiouG92t4Nq3cYSWcw0=";
+    sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/games/oh-my-git/default.nix

@@ -20,6 +20,7 @@
 , libglvnd
 , libpulseaudio
 , zlib
+, udev # for libudev
 }:
 
 stdenv.mkDerivation rec {
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
     libglvnd
     libpulseaudio
     zlib
+    udev
   ];
 
   desktopItems = [

pkgs/tools/misc/entr/default.nix

@@ -2,23 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "entr";
-  version = "4.9";
+  version = "5.0";
 
   src = fetchurl {
     url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz";
-    sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI=";
+    sha256 = "1fqyshn9i213h6hiy31xlm719f6vayskfna92kvbd2aykryvp1ra";
   };
 
-  patches = lib.optionals stdenv.isDarwin [
-    # Fix v4.9 segfault on Darwin. remove with the next update
-    # https://github.com/eradman/entr/issues/74
-    (fetchpatch {
-      url = "https://github.com/eradman/entr/commit/468d77d45925abba826bb1dcda01487dbe37eb33.patch";
-      sha256 = "17kkcrsnac0pb930sf2kix71h4c7krzsrvz8pskx0vm39n1c9xfi";
-      includes = [ "entr.c" ];
-    })
-  ];
-
   postPatch = ''
     substituteInPlace Makefile.bsd --replace /bin/echo echo
     substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat

pkgs/tools/misc/exa/default.nix

@@ -18,16 +18,21 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM=";
 
-  nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
+  nativeBuildInputs = [
+    cmake pkg-config installShellFiles
+    # ghc is not supported on aarch64-darwin yet.
+  ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc;
+
   buildInputs = [ zlib ]
     ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
 
-  outputs = [ "out" "man" ];
+  outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man";
 
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") ''
     pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1
     pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5
     installManPage man/exa.1 man/exa_colors.5
+  '' + ''
     installShellCompletion \
       --name exa completions/completions.bash \
       --name exa.fish completions/completions.fish \