Merge staging-next into staging

pkgs/applications/science/logic/elan/default.nix

@@ -7,16 +7,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "elan";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "sha256-Ve9nd/IEHo7Gg4WyxqKLUV495U1k9LfDyClkuVkooyA=";
+    sha256 = "sha256-nK4wvxK5Ne1+4kaMts6pIr5FvXBgXJsGdn68gGEZUdk=";
   };
 
-  cargoSha256 = "sha256-InGMZdP0c/QKU6ao8qhAUIDcAhOTumLOz6wo/u2+ibA=";
+  cargoSha256 = "sha256-ptSbpq1ePNWmdBGfKtqFGfkdimDjU0YEo4F8VPtQMt4=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 

pkgs/applications/science/math/gmsh/default.nix

@@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "gmsh";
-  version = "4.8.1";
+  version = "4.8.3";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "sha256-1QOPXyWuhZc1NvsFzIhv6xvX1n4mBanYeJvMJSj6izU=";
+    sha256 = "sha256-JvJIsSmgDR6gZY8CRBDCSQvNneckVFoRRKCSxgQnZ3U=";
   };
 
   buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL