Merge staging-next into staging

2 files changed, 51 insertions, 37 deletions

diff --git a/pkgs/development/compilers/factor-lang/factor98.nix b/pkgs/development/compilers/factor-lang/factor98.nix
index c4a9a075fdf..f9b59339825 100644
--- a/pkgs/development/compilers/factor-lang/factor98.nix
+++ b/pkgs/development/compilers/factor-lang/factor98.nix
@@ -1,53 +1,53 @@
-{ stdenv
-, lib
-, git
+{ lib
+, stdenv
+, cairo
 , curl
-, makeWrapper
-, runtimeShell
 , fetchurl
-, unzip
-, runCommand
-, writeScriptBin
-, interpreter
-, glib
-, pango
-, cairo
-, gtk2-x11
+, freealut
 , gdk-pixbuf
+, git
+, glib
 , gnome2
-, pcre
+, graphviz
+, gtk2-x11
+, interpreter
 , libGL
 , libGLU
-, freealut
-, openssl
-, udis86
-, openal
 , libogg
-, libvorbis
-, graphviz
 , librsvg
-, zlib
-, tzdata
+, libvorbis
+, makeWrapper
 , ncurses
+, openal
+, openssl
+, pango
+, pcre
+, runCommand
+, runtimeShell
+, tzdata
+, udis86
+, unzip
+, writeScriptBin
+, zlib
 }:
 let
   runtimeLibs = [
-    glib
-    pango
     cairo
-    gtk2-x11
+    freealut
     gdk-pixbuf
+    glib
     gnome2.gtkglext
-    pcre
+    graphviz
+    gtk2-x11
     libGL
     libGLU
-    freealut
-    openssl
-    udis86
-    openal
     libogg
     libvorbis
-    graphviz
+    openal
+    openssl
+    pango
+    pcre
+    udis86
     zlib
   ];
 
@@ -154,9 +154,9 @@ stdenv.mkDerivation {
     runHook postBuild
   '';
 
-  # For now, the check phase runs, but should always return 0.  This way the
-  # logs contain the test failures until all unit tests are fixed.  Then, it
-  # should return 1 if any test failures have occured.
+  # For now, the check phase runs, but should always return 0. This way the logs
+  # contain the test failures until all unit tests are fixed. Then, it should
+  # return 1 if any test failures have occured.
   doCheck = false;
   checkPhase = ''
     runHook preCheck
@@ -196,9 +196,22 @@ stdenv.mkDerivation {
   };
 
   meta = with lib; {
-    homepage = http://factorcode.org;
-    license = licenses.bsd2;
+    homepage = "https://factorcode.org/";
     description = "A concatenative, stack-based programming language";
+    longDescription = ''
+      The Factor programming language is a concatenative, stack-based
+      programming language with high-level features including dynamic types,
+      extensible syntax, macros, and garbage collection. On a practical side,
+      Factor has a full-featured library, supports many different platforms, and
+      has been extensively documented.
+
+      The implementation is fully compiled for performance, while still
+      supporting interactive development. Factor applications are portable
+      between all common platforms. Factor can deploy stand-alone applications
+      on all platforms. Full source code for the Factor project is available
+      under a BSD license.
+    '';
+    license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra spacefrogg ];
     platforms = lib.intersectLists platforms.x86_64 platforms.linux;
   };
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 3aa90733a92..ec52e56c1fa 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -71,7 +71,8 @@ stdenv.mkDerivation (args // {
   # See #144785 for details.
   configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ];
   # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
-  hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie";
+  hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
+    ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
 
   buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
   buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses