Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

24 files changed, 240 insertions, 77 deletions

diff --git a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
index 66f53949c245..d2dd8d53929e 100644
--- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }:
+{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL2_ttf";
@@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM=";
   };
 
-  configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags = [ "--disable-harfbuzz-builtin" ]
+    ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" ];
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ SDL2 freetype ]
+  buildInputs = [ SDL2 freetype harfbuzz ]
     ++ lib.optional (!stdenv.isDarwin) libGL
     ++ lib.optional stdenv.isDarwin darwin.libobjc;
 
diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch b/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch
index 5655c151e2f6..32c0a4cab584 100644
--- a/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch
+++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch
@@ -1,18 +1,105 @@
-diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindProtobufAlt.cmake
-index d29f757ae..61c6e16e1 100644
+diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindprotobufAlt.cmake
+similarity index 60%
+rename from cmake_modules/FindProtobufAlt.cmake
+rename to cmake_modules/FindprotobufAlt.cmake
+index 15fe1b4f2..19bdd6291 100644
 --- a/cmake_modules/FindProtobufAlt.cmake
-+++ b/cmake_modules/FindProtobufAlt.cmake
-@@ -22,11 +22,8 @@ else()
++++ b/cmake_modules/FindprotobufAlt.cmake
+@@ -16,24 +16,24 @@
+ # under the License.
+ 
+ if(ARROW_PROTOBUF_USE_SHARED)
+-  set(Protobuf_USE_STATIC_LIBS OFF)
++  set(protobuf_USE_STATIC_LIBS OFF)
+ else()
+-  set(Protobuf_USE_STATIC_LIBS ON)
++  set(protobuf_USE_STATIC_LIBS ON)
  endif()
  
  set(find_package_args)
 -if(ProtobufAlt_FIND_VERSION)
 -  list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION})
--endif()
- if(ProtobufAlt_FIND_QUIETLY)
++if(protobufAlt_FIND_VERSION)
++  list(APPEND find_package_args ${protobufAlt_FIND_VERSION})
+ endif()
+-if(ProtobufAlt_FIND_QUIETLY)
++if(protobufAlt_FIND_QUIETLY)
    list(APPEND find_package_args QUIET)
  endif()
 -find_package(Protobuf ${find_package_args})
 -set(ProtobufAlt_FOUND ${Protobuf_FOUND})
-+find_package(protobuf ${find_package_args})
-+set(ProtobufAlt_FOUND ${protobuf_FOUND})
+-if(ProtobufAlt_FOUND)
+-  set(ProtobufAlt_VERSION ${Protobuf_VERSION})
+-  set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR})
+-  set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR})
+-  set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH})
+-  set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK})
++find_package(protobuf ${find_package_args} CONFIG)
++set(protobufAlt_FOUND ${protobuf_FOUND})
++if(protobufAlt_FOUND)
++  set(protobufAlt_VERSION ${protobuf_VERSION})
++  set(protobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR})
++  set(protobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR})
++  set(protobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH})
++  set(protobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK})
+ endif()
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index 94f926039..8efc98323 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -63,7 +63,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
+     opentelemetry-cpp
+     ORC
+     re2
+-    Protobuf
++    protobuf
+     RapidJSON
+     Snappy
+     Substrait
+@@ -189,7 +189,7 @@ macro(build_dependency DEPENDENCY_NAME)
+     build_opentelemetry()
+   elseif("${DEPENDENCY_NAME}" STREQUAL "ORC")
+     build_orc()
+-  elseif("${DEPENDENCY_NAME}" STREQUAL "Protobuf")
++  elseif("${DEPENDENCY_NAME}" STREQUAL "protobuf")
+     build_protobuf()
+   elseif("${DEPENDENCY_NAME}" STREQUAL "RapidJSON")
+     build_rapidjson()
+@@ -1722,7 +1722,7 @@ if(ARROW_WITH_PROTOBUF)
+   # "3" for 3.12.0 are different. So 23.4 is rejected with 3.12.0. If
+   # we use FORCE_ANY_NEWER_VERSION here, we can bypass the check and
+   # use 23.4.
+-  resolve_dependency(Protobuf
++  resolve_dependency(protobuf
+                      FORCE_ANY_NEWER_VERSION
+                      TRUE
+                      HAVE_ALT
+@@ -1732,7 +1732,7 @@ if(ARROW_WITH_PROTOBUF)
+                      PC_PACKAGE_NAMES
+                      protobuf)
+ 
+-  if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN)
++  if(NOT protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN)
+     add_definitions(-DPROTOBUF_USE_DLLS)
+   endif()
+ 
+@@ -1768,8 +1768,8 @@ if(ARROW_WITH_PROTOBUF)
+   message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}")
+   get_target_property(PROTOBUF_TYPE ${ARROW_PROTOBUF_LIBPROTOBUF} TYPE)
+   if(NOT STREQUAL "INTERFACE_LIBRARY")
+-    # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake
+-    message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}")
++    # protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake
++    message(STATUS "Found libprotoc: ${protobuf_PROTOC_LIBRARY}")
+     get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION)
+     message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}")
+     message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}")
+@@ -3986,7 +3986,7 @@ endmacro()
+ 
+ if(ARROW_WITH_GRPC)
+   set(ARROW_GRPC_REQUIRED_VERSION "1.30.0")
+-  if(NOT Protobuf_SOURCE STREQUAL gRPC_SOURCE)
++  if(NOT protobuf_SOURCE STREQUAL gRPC_SOURCE)
+     # ARROW-15495: Protobuf/gRPC must come from the same source
+     message(STATUS "Forcing gRPC_SOURCE to Protobuf_SOURCE (${Protobuf_SOURCE})")
+     set(gRPC_SOURCE "${Protobuf_SOURCE}")
diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch b/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch
deleted file mode 100644
index de9b1986ffed..000000000000
--- a/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/cmake_modules/FindPythonLibsNew.cmake b/cmake_modules/FindPythonLibsNew.cmake
---- a/cmake_modules/FindPythonLibsNew.cmake
-+++ b/cmake_modules/FindPythonLibsNew.cmake
-@@ -117,6 +117,7 @@ list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
- list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
- list(GET _PYTHON_VALUES 8 PYTHON_LIBRARY_PATH)
- list(GET _PYTHON_VALUES 9 PYTHON_OTHER_LIBS)
-+string(REPLACE "-lncurses" "" PYTHON_OTHER_LIBS "${PYTHON_OTHER_LIBS}")
- 
- # Make sure the Python has the same pointer-size as the chosen compiler
- # Skip the check on OS X, it doesn't consistently have CMAKE_SIZEOF_VOID_P defined
diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
index c1bbc3e303d1..ddf8db98b39b 100644
--- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix
@@ -78,11 +78,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "arrow-cpp";
-  version = "12.0.1";
+  version = "13.0.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    hash = "sha256-NIHEETk6oVx16I2Tz4MV+vf0PhgP4HkBKNOEDUF96Fg=";
+    hash = "sha256-Nd/aGRJip1a+k07viv7o0JdiytJQIdqmJuskniUayeY=";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
@@ -120,8 +120,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # patch to fix python-test
-    ./darwin.patch
+    # Protobuf switched to lower case project name.
     ./cmake-find-protobuf.patch
   ];
 
diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix
index e46c03ed8087..080c944c90f5 100644
--- a/nixpkgs/pkgs/development/libraries/boost/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix
@@ -9,7 +9,7 @@
 , enableDebug ? false
 , enableSingleThreaded ? false
 , enableMultiThreaded ? true
-, enableShared ? !(with stdenv.hostPlatform; isStatic || libc == "msvcrt") # problems for now
+, enableShared ? !(with stdenv.hostPlatform; isStatic || isMinGW) # problems for now
 , enableStatic ? !enableShared
 , enablePython ? false
 , enableNumpy ? false
@@ -91,7 +91,7 @@ let
     ++ lib.optional (!enablePython) "--without-python"
     ++ lib.optional needUserConfig "--user-config=user-config.jam"
     ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"
-    ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+    ++ lib.optionals stdenv.hostPlatform.isMinGW [
     "threadapi=win32"
   ] ++ extraB2Args
   );
@@ -259,7 +259,7 @@ stdenv.mkDerivation {
     # Make boost header paths relative so that they are not runtime dependencies
     cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
       -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
-  '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
+  '' + lib.optionalString stdenv.hostPlatform.isMinGW ''
     $RANLIB "$out/lib/"*.a
   '';
 
diff --git a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
index 1d91cafc81c4..de01c6a7a1ae 100644
--- a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
     description = "AOSP libldac dispatcher";
     homepage    = "https://github.com/EHfive/ldacBT";
     license     = licenses.asl20;
-    platforms   = platforms.all;
+    # libldac code detects & #error's out on non-LE byte order
+    platforms   = platforms.littleEndian;
     maintainers = with maintainers; [ adisbladis ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/nixpkgs/pkgs/development/libraries/level-zero/default.nix
index c213e75d5f2d..0c953b8d8710 100644
--- a/nixpkgs/pkgs/development/libraries/level-zero/default.nix
+++ b/nixpkgs/pkgs/development/libraries/level-zero/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.13.5";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XpLbbcB8M63q+0Vj7NrERSXVIjy5KQrVZMvYijUbJhw=";
+    hash = "sha256-7hFGY255dLgDo93+Nx2we/cfEtwaiaajdVg1VTst1/U=";
   };
 
   nativeBuildInputs = [ cmake addOpenGLRunpath ];
diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix
index b9d31c6fd874..3863710f3c8c 100644
--- a/nixpkgs/pkgs/development/libraries/libcef/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix
@@ -66,16 +66,16 @@ let
       projectArch = "x86_64";
     };
   };
-  platforms."aarch64-linux".sha256 = "0ij7y0whlq8g1sskbhirbw3ngbp95k1in2pi9kjhb9flydjwxq8g";
-  platforms."x86_64-linux".sha256 = "0dyv1ddsakxi51a7iwmy006mx27gvjq49i45difkmjv6mw9s2fw9";
+  platforms."aarch64-linux".sha256 = "0xzgcnh45x3sqg0jndp9g08zy9bvzvmvfz8imj12j55vkm6f7kl6";
+  platforms."x86_64-linux".sha256 = "1942mwlyrz5pxlx9kcnz85rqbz8q8slkivx0001z30l7a6pizgg5";
 
   platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
 in
 stdenv.mkDerivation rec {
   pname = "cef-binary";
-  version = "116.0.15";
-  gitRevision = "0b8c265";
-  chromiumVersion = "116.0.5845.111";
+  version = "116.0.20";
+  gitRevision = "d6abd3c";
+  chromiumVersion = "116.0.5845.180";
 
   src = fetchurl {
     url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
diff --git a/nixpkgs/pkgs/development/libraries/libiconv/default.nix b/nixpkgs/pkgs/development/libraries/libiconv/default.nix
index 91b0df75f87b..0f0e7405d766 100644
--- a/nixpkgs/pkgs/development/libraries/libiconv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiconv/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch =
-    lib.optionalString ((stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc)
+    lib.optionalString ((stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isMinGW) || stdenv.cc.nativeLibc)
       ''
         sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
       ''
diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
index b6902050b5d5..27d4fda2ddc6 100644
--- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   # This is needed by freeimage
   patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ]
-    ++ lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
+    ++ lib.optional stdenv.hostPlatform.isMinGW
     ./mingw-boolean.patch;
 
   outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
index d670f8e96984..3f2f81183ca2 100644
--- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix
@@ -17,7 +17,7 @@
     (stdenv.hostPlatform == stdenv.buildPlatform || stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isWasi)
 , icuSupport ? false
 , icu
-, enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic
+, enableShared ? !stdenv.hostPlatform.isMinGW && !stdenv.hostPlatform.isStatic
 , enableStatic ? !enableShared
 , gnome
 }:
diff --git a/nixpkgs/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix
index 3b71167cdec1..14e2f4480824 100644
--- a/nixpkgs/pkgs/development/libraries/libzip/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libzip";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-UqYLRhglh+CDtx4rgvyqumTdXrAcWx8bxxBpo4WOQP4=";
+    sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M=";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     pkgConfigModules = [ "libzip" ];
     platforms = platforms.unix;
-    changelog = "https://github.com/nih-at/libzip/blob/v${version}/NEWS.md";
+    changelog = "https://github.com/nih-at/libzip/blob/v${finalAttrs.version}/NEWS.md";
   };
 })
diff --git a/nixpkgs/pkgs/development/libraries/mpir/default.nix b/nixpkgs/pkgs/development/libraries/mpir/default.nix
index 8ccad867ea89..6dd105bdb302 100644
--- a/nixpkgs/pkgs/development/libraries/mpir/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpir/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, m4, which, yasm, buildPackages }:
+{ lib, stdenv, fetchurl, m4, which, yasm, autoreconfHook, fetchpatch, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "mpir";
@@ -6,13 +6,22 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs = [ m4 which yasm ];
+  nativeBuildInputs = [ m4 which yasm autoreconfHook ];
 
   src = fetchurl {
     url = "https://mpir.org/mpir-${version}.tar.bz2";
     sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
   };
 
+  patches = [
+    # Fixes configure check failures with clang 16 due to implicit definitions of `exit`, which
+    # is an error with newer versions of clang.
+    (fetchpatch {
+      url = "https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb.patch";
+      hash = "sha256-vW+cDK5Hq2hKEyprOJaNbj0bT2FJmMcyZHPE8GUNUWc=";
+    })
+  ];
+
   configureFlags = [ "--enable-cxx" ]
     ++ lib.optionals stdenv.isLinux [ "--enable-fat" ];
 
diff --git a/nixpkgs/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix
index 7d8877c79ad1..59a3b4975793 100644
--- a/nixpkgs/pkgs/development/libraries/nspr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.tests = {
-    inherit (nixosTests) firefox firefox-esr-102 firefox-esr-115;
+    inherit (nixosTests) firefox firefox-esr-115;
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix
index 8badbf9e8760..592dbffbdffc 100644
--- a/nixpkgs/pkgs/development/libraries/nss/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix
@@ -182,9 +182,9 @@ stdenv.mkDerivation rec {
   passthru.updateScript = ./update.sh;
 
   passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) {
-    inherit (nixosTests) firefox-esr-102;
+    inherit (nixosTests) firefox-esr-115;
   } // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) {
-    inherit (nixosTests) firefox firefox-esr-115;
+    inherit (nixosTests) firefox;
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/libraries/open62541/default.nix b/nixpkgs/pkgs/development/libraries/open62541/default.nix
index fb67d66018f7..e25ac7bfca51 100644
--- a/nixpkgs/pkgs/development/libraries/open62541/default.nix
+++ b/nixpkgs/pkgs/development/libraries/open62541/default.nix
@@ -31,13 +31,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open62541";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "open62541";
     repo = "open62541";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cmD01D49pHEHN0QQtE5RXv0YZ/MPIWnubeUY6BH4DrU=";
+    hash = "sha256-XmoLmBGTMA6cejLiNU8hAVnHd35eh6lTIu9csmiR+4U=";
     fetchSubmodules = true;
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/openimageio/default.nix b/nixpkgs/pkgs/development/libraries/openimageio/default.nix
index b73deed22086..610a458c071d 100644
--- a/nixpkgs/pkgs/development/libraries/openimageio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openimageio/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openimageio";
-  version = "2.4.14.0";
+  version = "2.4.15.0";
 
   src = fetchFromGitHub {
     owner = "OpenImageIO";
     repo = "oiio";
     rev = "v${version}";
-    hash = "sha256-iHXU3Zr32XNn2Q2Pn/sgF6E1q/FXbdmVrOKC4lhGx3k=";
+    hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M=";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];
diff --git a/nixpkgs/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch b/nixpkgs/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch
new file mode 100644
index 000000000000..7312b41fc740
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch
@@ -0,0 +1,44 @@
+From 4bfac4471f53c4f74c8d81020beb938f92d84ca5 Mon Sep 17 00:00:00 2001
+From: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Date: Tue, 22 Aug 2023 16:07:30 +0200
+Subject: [PATCH] Avoid clobbering non-volatile XMM registers
+
+This affects some Poly1305 assembler functions
+which are only used for certain CPU types.
+
+Remove those functions for Windows targets,
+as a simple interim solution.
+
+Fixes #21522
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/21808)
+
+(cherry picked from commit 7b8e27bc2e02238986d89ef0ece067ec1b48e165)
+---
+ crypto/poly1305/asm/poly1305-x86_64.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
+index fa9bfb7a7b81..24bab9d0bcf9 100755
+--- a/crypto/poly1305/asm/poly1305-x86_64.pl
++++ b/crypto/poly1305/asm/poly1305-x86_64.pl
+@@ -195,7 +195,7 @@ sub poly1305_iteration {
+ 	bt	\$`5+32`,%r9		# AVX2?
+ 	cmovc	%rax,%r10
+ ___
+-$code.=<<___	if ($avx>3);
++$code.=<<___	if ($avx>3 && !$win64);
+ 	mov	\$`(1<<31|1<<21|1<<16)`,%rax
+ 	shr	\$32,%r9
+ 	and	%rax,%r9
+@@ -2724,7 +2724,7 @@ sub poly1305_iteration {
+ .cfi_endproc
+ .size	poly1305_blocks_avx512,.-poly1305_blocks_avx512
+ ___
+-if ($avx>3) {
++if ($avx>3 && !$win64) {
+ ########################################################################
+ # VPMADD52 version using 2^44 radix.
+ #
diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix
index aaee6685cfc5..93786881a520 100644
--- a/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -241,6 +241,9 @@ in {
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
+      # https://www.openssl.org/news/secadv/20230908.txt
+      ./1.1/CVE-2023-4807.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./use-etc-ssl-certs-darwin.patch
        else ./use-etc-ssl-certs.patch)
diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
index db85bfdd9c0b..b1e03e35df12 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -31,12 +31,6 @@ assert useCudatoolkitRunfile || (libcublas != null); let
   # versionTriple :: String
   # Version with three components: major.minor.patch
   versionTriple = majorMinorPatch version;
-
-  # cudatoolkit_root :: Derivation
-  cudatoolkit_root =
-    if useCudatoolkitRunfile
-    then cudatoolkit
-    else libcublas;
 in
   backendStdenv.mkDerivation {
     pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
@@ -65,7 +59,10 @@ in
       stdenv.cc.cc.lib
 
       zlib
-      cudatoolkit_root
+    ] ++ lists.optionals useCudatoolkitRunfile [
+      cudatoolkit
+    ] ++ lists.optionals (!useCudatoolkitRunfile) [
+      libcublas.lib
     ];
 
     # We used to patch Runpath here, but now we use autoPatchelfHook
diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
index fe648a2ce7bf..d68e22f1c891 100644
--- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix
@@ -3,10 +3,8 @@
 , fetchFromGitHub
 , fetchpatch
 , cmake
-# Although we include upstream patches that fix compilation with fmt_10, we
-# still use fmt_9 because this dependency is propagated, and many of spdlog's
-# reverse dependencies don't support fmt_10 yet.
-, fmt_9
+, fmt
+, catch2_3
 , staticBuild ? stdenv.hostPlatform.isStatic
 
 # tests
@@ -15,29 +13,26 @@
 
 stdenv.mkDerivation rec {
   pname = "spdlog";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "gabime";
     repo  = "spdlog";
     rev   = "v${version}";
-    hash  = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ=";
+    hash  = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns=";
   };
 
   patches = [
-    # Fix compatiblity with fmt 10.0. Remove with the next release
+    # Fix a broken test, remove with the next release.
     (fetchpatch {
-      url = "https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05.patch";
-      hash = "sha256-cRsQilkyUQW47PFpDwKgU/pm+tOeLvwPx32gNOPAO1U=";
-    })
-    (fetchpatch {
-      url = "https://github.com/gabime/spdlog/commit/af1785b897c9d1098d4aa7213fad232be63c19b4.patch";
-      hash = "sha256-zpfLiBeDAOsvk4vrIyXC0kvFe2WkhAhersd+fhA8DFY=";
+      url = "https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a.patch";
+      hash = "sha256-L79yOkm3VY01jmxNctfneTLmOA5DEQeNNGC8LbpJiOc=";
     })
   ];
 
   nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ fmt_9 ];
+  propagatedBuildInputs = [ fmt ];
+  checkInputs = [ catch2_3 ];
 
   cmakeFlags = [
     "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"
diff --git a/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix b/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix
new file mode 100644
index 000000000000..9555b9faea60
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, llvmPackages
+, enableOpenMP ? true
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wfa2-lib";
+  version = "2.3.3";
+
+  src = fetchFromGitHub {
+    owner = "smarco";
+    repo = "WFA2-lib";
+    rev = "v${version}";
+    hash = "sha256-PLZhxKMBhKm6E/ENFZ/yWMWIwJG5voaJls2in44OGoQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals enableOpenMP [ llvmPackages.openmp ];
+
+  cmakeFlags = [ "-DOPENMP=${if enableOpenMP then "ON" else "OFF"}" ];
+
+  meta = with lib; {
+    description = "Wavefront alignment algorithm library v2";
+    homepage = "https://github.com/smarco/WFA2-lib";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rs0vere ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/zint/default.nix b/nixpkgs/pkgs/development/libraries/zint/default.nix
index 15aecee196d0..69ec64ada9d2 100644
--- a/nixpkgs/pkgs/development/libraries/zint/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zint/default.nix
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/zint/zint/blob/${version}/ChangeLog";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ azahi ];
+    platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix
index 051a55df8e49..baef243cbdc6 100644
--- a/nixpkgs/pkgs/development/libraries/zlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
-  dontConfigure = stdenv.hostPlatform.libc == "msvcrt";
+  dontConfigure = stdenv.hostPlatform.isMinGW;
 
   preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     export CHOST=${stdenv.hostPlatform.config}
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
     # Non-typical naming confuses libtool which then refuses to use zlib's DLL
     # in some cases, e.g. when compiling libpng.
-  + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt" && shared) ''
+  + lib.optionalString (stdenv.hostPlatform.isMinGW && shared) ''
     ln -s zlib1.dll $out/bin/libz.dll
   '';
 
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static;
   configurePlatforms = [];
 
-  installFlags = lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+  installFlags = lib.optionals stdenv.hostPlatform.isMinGW [
     "BINARY_PATH=$(out)/bin"
     "INCLUDE_PATH=$(dev)/include"
     "LIBRARY_PATH=$(out)/lib"
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=${stdenv.cc.targetPrefix}"
-  ] ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
+  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
     "-f" "win32/Makefile.gcc"
   ] ++ lib.optionals shared [
     # Note that as of writing (zlib 1.2.11), this flag only has an effect