Merge release-23.05 into staging-next-23.05

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

@@ -42,13 +42,13 @@ rec {
 
   thunderbird-115 = (buildMozillaMach rec {
     pname = "thunderbird";
-    version = "115.1.0";
+    version = "115.1.1";
     application = "comm/mail";
     applicationName = "Mozilla Thunderbird";
     binaryName = pname;
     src = fetchurl {
       url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-      sha512 = "da03935d9f7f9a531877b91e93815481aaa49afdd6d2a68308c59235202a2743afdcbad5604d5d889580936b08382a0773123477778049a47ac6202b2b84b80d";
+      sha512 = "26f69dded43bd24ffce9acb0de204bef8c10c8df3cb82b33594d035e41179cb7450cb7c10470bfc92a933c1d801fb968049ea8a17d838d16de9973f5dddff9fc";
     };
     extraPatches = [
       # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix

@@ -1,4 +1,5 @@
 { mkXfceDerivation
+, gobject-introspection
 , dbus-glib
 , garcon
 , glib
@@ -11,11 +12,16 @@
 , libxfce4util
 , libxklavier
 , pam
+, python3
 , systemd
 , xfconf
 , lib
 }:
 
+let
+  # For xfce4-screensaver-configure
+  pythonEnv = python3.withPackages (pp: [ pp.pygobject3 ]);
+in
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-screensaver";
@@ -23,6 +29,10 @@ mkXfceDerivation {
 
   sha256 = "sha256-d72m2dW8jvM/EjgNSVaKsP5Ip7ioguB61/hy2cWw+dw=";
 
+  nativeBuildInputs = [
+    gobject-introspection
+  ];
+
   buildInputs = [
     dbus-glib
     garcon
@@ -36,6 +46,7 @@ mkXfceDerivation {
     libxfce4util
     libxklavier
     pam
+    pythonEnv
     systemd
     xfconf
   ];

pkgs/development/libraries/openimageio/default.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openimageio";
-  version = "2.4.11.1";
+  version = "2.4.13.0";
 
   src = fetchFromGitHub {
     owner = "OpenImageIO";
     repo = "oiio";
     rev = "v${version}";
-    hash = "sha256-Q8Gb/zscZre7fJPyLlZn04Xp3VFFbr6Z007mDPzownc=";
+    hash = "sha256-VVLJJB32oTujB384rmqm4MHxWplYov7CqoLqhdWjTi4=";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];

pkgs/development/ocaml-modules/hack_parallel/default.nix

@@ -3,7 +3,6 @@
 buildDunePackage rec {
   pname = "hack_parallel";
   version = "1.0.1";
-  duneVersion = "3";
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
@@ -15,6 +14,23 @@ buildDunePackage rec {
 
   patches = [ ./hack_parallel.patch ];
 
+  postPatch = ''
+    substituteInPlace src/third-party/hack_core/hack_caml.ml --replace 'include Pervasives' ""
+    substituteInPlace \
+      src/interface/hack_parallel_intf.mli \
+      src/procs/worker.ml \
+      src/third-party/hack_core/hack_core_list.ml \
+      src/third-party/hack_core/hack_result.ml* \
+      src/utils/collections/myMap.ml \
+      src/utils/daemon.ml* \
+      src/utils/exit_status.ml \
+      src/utils/hack_path.ml \
+      src/utils/measure.ml \
+      src/utils/timeout.ml \
+      --replace Pervasives. Stdlib.
+    substituteInPlace src/utils/sys_utils.ml --replace String.create Bytes.create
+  '';
+
   nativeBuildInputs = [ pkg-config ];
 
   propagatedBuildInputs = [ core core_unix sqlite ];

pkgs/development/tools/continuous-integration/gitlab-runner/default.nix

@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
 
 let
-  version = "16.2.0";
+  version = "16.3.0";
 in
 buildGoModule rec {
   inherit version;
@@ -17,13 +17,13 @@ buildGoModule rec {
   # For patchShebangs
   buildInputs = [ bash ];
 
-  vendorHash = "sha256-sP9lboy1M4+AB1Z0VsX5eNxZ9ckuJBgEPxavAbOSk8g=";
+  vendorHash = "sha256-tMhzq9ygUmNi9+mlI9Gvr2nDyG9HQbs8PVusSgadZIE=";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "sha256-gTjGf/WuMoGNvsiWWj3Y7l2MvSzBM12RY/Odolm4fNw=";
+    sha256 = "sha256-YAnHOIpUN1OuNefjCIccZOLwPNMxVBuCRQgX0Tb5bos=";
   };
 
   patches = [