Merge staging-next into staging

2022-07-08 00:03:17 +00:00 · 2022-07-08 00:03:17 +00:00 · 527a304ac4
parent e374cc2aad e1123916d6
commit 527a304ac4
55 changed files with 8887 additions and 462 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -6705,6 +6705,12 @@
    githubId = 845652;
    name = "Kier Davis";
  };
+  kilimnik = {
+    email = "mail@kilimnik.de";
+    github = "killercup";
+    githubId = 5883283;
+    name = "Daniel Kilimnik";
+  };
  killercup = {
    email = "killercup@gmail.com";
    github = "killercup";
@ -12652,6 +12658,7 @@
    github = "thiagokokada";
    githubId = 844343;
    name = "Thiago K. Okada";
+    matrix = "@k0kada:matrix.org";
  };
  thibaultlemaire = {
    email = "thibault.lemaire@protonmail.com";
--- a/nixos/tests/installed-tests/flatpak-builder.nix
+++ b/nixos/tests/installed-tests/flatpak-builder.nix
@ -6,6 +6,7 @@ makeInstalledTest {
  testConfig = {
    services.flatpak.enable = true;
    xdg.portal.enable = true;
+    xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
    environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
    virtualisation.diskSize = 2048;
  };
--- a/pkgs/applications/audio/open-stage-control/default.nix
+++ b/pkgs/applications/audio/open-stage-control/default.nix
@ -0,0 +1,72 @@
+{ pkgs, stdenv, lib, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, nodejs, electron, python3, ... }:
+
+let
+  nodeComposition = import ./node-composition.nix {
+    inherit pkgs nodejs;
+    inherit (stdenv.hostPlatform) system;
+  };
+in
+
+nodeComposition.package.override rec {
+  pname = "open-stage-control";
+  inherit (nodeComposition.args) version;
+
+  src = fetchFromGitHub {
+    owner = "jean-emmanuel";
+    repo = "open-stage-control";
+    rev = "v${version}";
+    hash = "sha256-q18pRtsHfme+OPmi3LhJDK1AdpfkwhoE9LA2rNenDtY=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    python3.pkgs.python-rtmidi
+  ];
+
+  dontNpmInstall = true;
+
+  postInstall = ''
+    # build assets
+    npm run build
+
+    # copy icon
+    install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png
+    install -Dm644 resources/images/logo.svg $out/share/icons/hicolor/scalable/apps/open-stage-control.svg
+
+    # wrap electron and include python-rtmidi
+    makeWrapper '${electron}/bin/electron' $out/bin/open-stage-control \
+      --inherit-argv0 \
+      --add-flags $out/lib/node_modules/open-stage-control/app \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PATH : '${lib.makeBinPath [ python3 ]}'
+  '';
+
+  installCheckPhase = ''
+    XDG_CONFIG_HOME="$(mktemp -d)" $out/bin/open-stage-control --help
+  '';
+  doInstallCheck = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "open-stage-control";
+      exec = "open-stage-control";
+      icon = "open-stage-control";
+      desktopName = "Open Stage Control";
+      comment = meta.description;
+      categories = [ "Network" "Audio" "AudioVideo" "Midi" ];
+      startupWMClass = "open-stage-control";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Libre and modular OSC / MIDI controller";
+    homepage = "https://openstagecontrol.ammd.net/";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ lilyinstarlight ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/audio/open-stage-control/generate-dependencies.sh
+++ b/pkgs/applications/audio/open-stage-control/generate-dependencies.sh
@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p jq nodePackages.node2nix
+
+# Get latest release tag
+tag="$(curl -s https://api.github.com/repos/jean-emmanuel/open-stage-control/releases/latest | jq -r .tag_name)"
+
+# Download package.json from the latest release
+curl -s https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/"$tag"/package.json | grep -v '"electron"\|"electron-installer-debian"\|"electron-packager"\|"electron-packager-plugin-non-proprietary-codecs-ffmpeg"' >package.json
+
+# Lock dependencies with node2nix
+node2nix \
+  --node-env ../../../development/node-packages/node-env.nix \
+  --nodejs-16 \
+  --input package.json \
+  --output node-packages.nix \
+  --composition node-composition.nix
+
+rm -f package.json
--- a/pkgs/applications/audio/open-stage-control/node-composition.nix
+++ b/pkgs/applications/audio/open-stage-control/node-composition.nix
@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.11.1. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
+
+let
+  nodeEnv = import ../../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit pkgs nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit nodeEnv;
+}
--- a/pkgs/applications/audio/open-stage-control/node-packages.nix
+++ b/pkgs/applications/audio/open-stage-control/node-packages.nix
--- a/pkgs/applications/misc/blender/darwin.patch
+++ b/pkgs/applications/misc/blender/darwin.patch
@ -1,7 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
+   ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)
+   if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
+     if(APPLE)
+-      if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
+      if(FALSE)
+       # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
+       # with Xcode-11 (the Clang of which doesn't support the flag).
+         message(WARNING
 diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
 --- a/build_files/cmake/platform/platform_apple.cmake
 +++ b/build_files/cmake/platform/platform_apple.cmake
-@@ -77,7 +77,6 @@ else()
+@@ -60,7 +60,6 @@ else()
   message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
 endif()
 if(NOT EXISTS "${LIBDIR}/")
@ -9,7 +21,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
 endif()
 
 # Prefer lib directory paths
-@@ -114,10 +113,6 @@ if(WITH_CODEC_SNDFILE)
+@@ -98,10 +97,6 @@ if(WITH_CODEC_SNDFILE)
   find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
   find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
   list(APPEND LIBSNDFILE_LIBRARIES
@ -20,17 +32,26 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
   )
 
   print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
-@@ -134,7 +129,7 @@ if(WITH_PYTHON)
-     # normally cached but not since we include them with blender
+@@ -118,7 +113,7 @@ if(WITH_PYTHON)
+     # Normally cached but not since we include them with blender.
     set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
     set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}")
 -    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a)
 +    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.dylib)
     set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
-     # set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
   else()
-@@ -175,9 +170,7 @@ endif()
- if(WITH_CODEC_FFMPEG)
+     # Module must be compiled against Python framework.
+@@ -147,7 +142,7 @@ endif()
+ 
+ # FreeType compiled with Brotli compression for woff2.
+ find_package(Freetype REQUIRED)
+-list(APPEND FREETYPE_LIBRARIES
+message(TRACE APPEND FREETYPE_LIBRARIES
+   ${LIBDIR}/brotli/lib/libbrotlicommon-static.a
+   ${LIBDIR}/brotli/lib/libbrotlidec-static.a)
+ 
+@@ -159,9 +154,7 @@ if(WITH_CODEC_FFMPEG)
+   set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
   set(FFMPEG_FIND_COMPONENTS
     avcodec avdevice avformat avutil
 -    mp3lame ogg opus swresample swscale
@ -40,7 +61,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
   find_package(FFmpeg)
 endif()
 
-@@ -275,7 +268,6 @@ if(WITH_BOOST)
+@@ -270,7 +263,6 @@ if(WITH_BOOST)
 endif()
 
 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
@ -48,12 +69,12 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
 endif()
 
 if(WITH_PUGIXML)
-@@ -476,7 +468,7 @@ else()
-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
- endif()
+@@ -399,7 +391,7 @@ endif()
 
-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
-+if(FALSE)
-   # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
-   string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
- endif()
+ # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
+ if(WITH_OPENMP)
+-  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  if(FALSE)
+     # Use OpenMP from our precompiled libraries.
+     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
+     set(OPENMP_CUSTOM ON)
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@ -76,9 +76,7 @@ stdenv.mkDerivation rec {
      : > build_files/cmake/platform/platform_apple_xcode.cmake
      substituteInPlace source/creator/CMakeLists.txt \
        --replace '${"$"}{LIBDIR}/python' \
-                  '${python}' \
-        --replace '${"$"}{LIBDIR}/openmp' \
-                  '${llvmPackages.openmp}'
+                  '${python}'
      substituteInPlace build_files/cmake/platform/platform_apple.cmake \
        --replace '${"$"}{LIBDIR}/python' \
                  '${python}' \
@ -159,8 +157,6 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    # darwin.patch doesn't apply anymore, needs update
-    broken = stdenv.isDarwin;
    description = "3D Creation/Animation/Publishing System";
    homepage = "https://www.blender.org";
    # They comment two licenses: GPLv2 and Blender License, but they
--- a/pkgs/applications/networking/cluster/bosh-cli/default.nix
+++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix
@ -8,13 +8,13 @@
 buildGoModule rec {
  pname = "bosh-cli";

-  version = "6.4.17";
+  version = "7.0.1";

  src = fetchFromGitHub {
    owner = "cloudfoundry";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-oVL7tBtdFJt6ktctSZiNZMd6g1LEWQ/Hra4rcGM6BnQ=";
+    sha256 = "sha256-CNicDFmWq2tgw3LEw8nOlwewY3cpzwS9ea4fxbwVJc0=";
  };
  vendorSha256 = null;

--- a/pkgs/applications/office/bookletimposer/configdir.patch
+++ b/pkgs/applications/office/bookletimposer/configdir.patch
@ -0,0 +1,20 @@
+diff --git a/lib/bookletimposer/config.py b/lib/bookletimposer/config.py
+index 8f107a4..d4d335d 100644
+--- a/lib/bookletimposer/config.py
+++ b/lib/bookletimposer/config.py
+@@ -45,14 +41,7 @@ def debug(msg):
+ 
+ 
+ def get_sharedir():
+-    if debug_enabled and os.path.exists(os.path.join("/", "usr", "local",
+-                                                     "share",
+-                                                     "bookletimposer")):
+-        return os.path.join("/", "usr", "local", "share")
+-    elif os.path.exists(os.path.join("/", "usr", "share", "bookletimposer")):
+-        return os.path.join("/", "usr", "share")
+-    else:
+-        return ""
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share"))
+ 
+ 
+ def get_datadir():
--- a/pkgs/applications/office/bookletimposer/default.nix
+++ b/pkgs/applications/office/bookletimposer/default.nix
@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitLab
+, python3
+, intltool
+, pandoc
+, gobject-introspection
+, wrapGAppsHook
+, gtk3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "bookletimposer";
+  version = "0.3.1";
+
+  src = fetchFromGitLab {
+    domain = "git.codecoop.org";
+    owner = "kjo";
+    repo = "bookletimposer";
+    rev = version;
+    sha256 = "sha256-AEpvsFBJfyqLucC0l4AN/nA2+aYBR50BEgAcNDJBSqg=";
+  };
+
+  patches = [
+    ./i18n.patch
+    ./configdir.patch
+  ];
+
+  nativeBuildInputs = [ intltool pandoc wrapGAppsHook ];
+
+  buildInputs = [ gobject-introspection ];
+
+  propagatedBuildInputs = [
+     gtk3
+     (python3.withPackages (ps: with ps; [ distutils_extra pypdf2 pygobject3 ]))
+  ];
+
+  meta = {
+    homepage = "https://kjo.herbesfolles.org/bookletimposer/";
+    description = "A utility to achieve some basic imposition on PDF documents, especially designed to work on booklets";
+    platforms = lib.platforms.linux;
+    license = "GPL-3.0-or-later";
+    maintainers = with lib.maintainers; [ afontain ];
+  };
+}
--- a/pkgs/applications/office/bookletimposer/i18n.patch
+++ b/pkgs/applications/office/bookletimposer/i18n.patch
@ -0,0 +1,19 @@
+--- a/setup.cfg	2022-06-04 17:10:10.477581502 +0200
+++ b/setup.cfg	2022-06-04 17:10:15.185594382 +0200
+@@ -1,6 +1,3 @@
+ [build]
+ icons=False
+ help=True
+-
+-[build_i18n]
+-domain=bookletimposer
+--- a/setup.py	2022-06-04 17:25:18.020872735 +0200
+++ b/setup.py	2022-06-04 17:25:23.075884898 +0200
+@@ -115,7 +115,6 @@ It allows:
+       requires = ['gtk', 'PyPDF2'],
+       cmdclass = { "build" :            build_extra.build_extra,
+                    "build_uiheaders" :  build_uiheaders,
+-                   "build_i18n" :       build_i18n.build_i18n,
+                    "build_help" :       build_help.build_help,
+                    "build_icons" :      build_icons.build_icons,
+                    "build_man" :        build_man,
--- a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
@ -1,36 +1,38 @@
+GEM
+  specs:
+
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (5.2.6)
+    activesupport (7.0.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.9)
-    gitlab-triage (1.20.0)
-      activesupport (~> 5.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.1.10)
+    gitlab-triage (1.23.1)
+      activesupport (>= 5.1)
      globalid (~> 0.4)
      graphql-client (~> 0.16)
      httparty (~> 0.17)
-    globalid (0.5.2)
+    globalid (0.6.0)
      activesupport (>= 5.0)
-    graphql (1.12.14)
-    graphql-client (0.16.0)
+    graphql (2.0.11)
+    graphql-client (0.18.0)
      activesupport (>= 3.0)
-      graphql (~> 1.8)
-    httparty (0.18.1)
+      graphql
+    httparty (0.20.0)
      mime-types (~> 3.0)
      multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.10.0)
      concurrent-ruby (~> 1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
+    minitest (5.16.2)
    multi_xml (0.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)

 PLATFORMS
  ruby
@ -40,4 +42,4 @@ DEPENDENCIES
  gitlab-triage!

 BUNDLED WITH
-   2.1.4
+   2.3.9
--- a/pkgs/applications/version-management/gitlab-triage/default.nix
+++ b/pkgs/applications/version-management/gitlab-triage/default.nix
@ -1,10 +1,12 @@
-{ lib, bundlerApp }:
+{ lib, bundlerApp, bundlerUpdateScript }:

 bundlerApp {
  pname = "gitlab-triage";
  gemdir = ./.;
  exes = [ "gitlab-triage" ];

+  passthru.updateScript = bundlerUpdateScript "gitlab-triage";
+
  meta = with lib; {
    description = "GitLab's issues and merge requests triage, automated!";
    homepage = "https://gitlab.com/gitlab-org/gitlab-triage";
--- a/pkgs/applications/version-management/gitlab-triage/gemset.nix
+++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix
@ -5,20 +5,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
+      sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj";
      type = "gem";
    };
-    version = "5.2.6";
+    version = "7.0.3";
  };
  concurrent-ruby = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
      type = "gem";
    };
-    version = "1.1.9";
+    version = "1.1.10";
  };
  gitlab-triage = {
    dependencies = ["activesupport" "globalid" "graphql-client" "httparty"];
@ -26,10 +26,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "sha256-sg/YgRnp1+EcTcBqsm8vZrV0YuHTSJEFk/whhW8An6g=";
+      sha256 = "1vs120wyqm12xy66nv0723cy3m66g5lhhdd37izbc9qwyq03m729";
      type = "gem";
    };
-    version = "1.20.0";
+    version = "1.23.1";
  };
  globalid = {
    dependencies = ["activesupport"];
@ -37,20 +37,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm";
+      sha256 = "1xk28839pi36yzlqgh7k5wqmiphz7wg2c2r2wzfvs2s7g63hy3nv";
      type = "gem";
    };
-    version = "0.5.2";
+    version = "0.6.0";
  };
  graphql = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "sha256-iweRDvp7EWY02B52iwbebEpiwL7Mj9E9RyeHYMuqc/o=";
+      sha256 = "18k3wh73mb7rs469wfn4m10d1rlg2v9chd89nf7vy8z3yjbf9nl4";
      type = "gem";
    };
-    version = "1.12.14";
+    version = "2.0.11";
  };
  graphql-client = {
    dependencies = ["activesupport" "graphql"];
@ -58,10 +58,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4";
+      sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq";
      type = "gem";
    };
-    version = "0.16.0";
+    version = "0.18.0";
  };
  httparty = {
    dependencies = ["mime-types" "multi_xml"];
@ -69,10 +69,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7";
+      sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9";
      type = "gem";
    };
-    version = "0.18.1";
+    version = "0.20.0";
  };
  i18n = {
    dependencies = ["concurrent-ruby"];
@ -80,10 +80,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
+      sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
      type = "gem";
    };
-    version = "1.8.10";
+    version = "1.10.0";
  };
  mime-types = {
    dependencies = ["mime-types-data"];
@ -91,30 +91,30 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
      type = "gem";
    };
-    version = "3.3.1";
+    version = "3.4.1";
  };
  mime-types-data = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy";
+      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
      type = "gem";
    };
-    version = "3.2021.0704";
+    version = "3.2022.0105";
  };
  minitest = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
+      sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
      type = "gem";
    };
-    version = "5.14.4";
+    version = "5.16.2";
  };
  multi_xml = {
    groups = ["default"];
@ -126,25 +126,15 @@
    };
    version = "0.6.0";
  };
-  thread_safe = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
  tzinfo = {
-    dependencies = ["thread_safe"];
+    dependencies = ["concurrent-ruby"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
+      sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
      type = "gem";
    };
-    version = "1.2.9";
+    version = "2.0.4";
  };
 }
--- a/pkgs/applications/video/anime-downloader/default.nix
+++ b/pkgs/applications/video/anime-downloader/default.nix
@ -11,12 +11,6 @@ python3.pkgs.buildPythonApplication rec {
    sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
  };

-  buildInputs = with python3.pkgs; [
-    jsbeautifier
-    pycryptodome
-    requests
-  ];
-
  propagatedBuildInputs = [
    aria2
    mpv
@ -27,8 +21,11 @@ python3.pkgs.buildPythonApplication rec {
    click
    coloredlogs
    fuzzywuzzy
+    jsbeautifier
+    pycryptodome
    pySmartDL
    pyqt5
+    requests
    requests-cache
    selenium
    tabulate
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -3,6 +3,7 @@
 , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
+, fetchpatch
 # If open-watcom-bin is not passed, VirtualBox will fall back to use
 # the shipped alternative sources (assembly).
 , open-watcom-bin
@ -98,8 +99,12 @@ in stdenv.mkDerivation {
    # https://github.com/NixOS/nixpkgs/issues/123851
    ./fix-audio-driver-loading.patch
    # NOTE: both patches below should be removed when updating to 6.1.35
-    # https://www.virtualbox.org/ticket/20914#comment:6
-    ./linux518.patch
+    # https://www.virtualbox.org/ticket/20914#comment:15
+    (fetchpatch {
+      url = "https://www.virtualbox.org/raw-attachment/ticket/20914/vbox-linux-5.19.patch";
+      hash = "sha512-NNiMf8kUuM/PimrQCOacYLkrf7UFPh6ZdPsXKyLlsqWfWQXkG92Fv3qZXvg8weE1Z/SBsFTuHICEI4b4l1wZFw==";
+      extraPrefix = "/";
+    })
    # https://www.virtualbox.org/ticket/20904#comment:22
    ./ffreestanding.patch
  ];
--- a/pkgs/applications/virtualization/virtualbox/linux518.patch
+++ b/pkgs/applications/virtualization/virtualbox/linux518.patch
@ -1,285 +0,0 @@
-Index: include/VBox/sup.h
-===================================================================
--- trunk/include/VBox/sup.h	(revision 151556)
-+++ trunk/include/VBox/sup.h	(working copy)
-@@ -2142,6 +2142,26 @@
-  */
- SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void);
- 
-+/**
-+ * Notification from R0 VMM prior to loading the guest-FPU register state.
-+ *
-+ * @returns Whether the host-FPU register state has been saved by the host kernel.
-+ * @param   fCtxHook    Whether thread-context hooks are enabled.
-+ *
-+ * @remarks Called with preemption disabled.
-+ */
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook);
-+
-+/**
-+ * Notification from R0 VMM prior to saving the guest-FPU register state (and
-+ * potentially restoring the host-FPU register state) in ring-0.
-+ *
-+ * @param   fCtxHook    Whether thread-context hooks are enabled.
-+ *
-+ * @remarks Called with preemption disabled.
-+ */
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook);
-+
- /** @copydoc RTLogGetDefaultInstanceEx
-  * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */
- SUPR0DECL(struct RTLOGGER *) SUPR0GetDefaultLogInstanceEx(uint32_t fFlagsAndGroup);
-Index: src/VBox/Additions/linux/sharedfolders/regops.c
-===================================================================
--- trunk/src/VBox/Additions/linux/sharedfolders/regops.c	(revision 151556)
-+++ trunk/src/VBox/Additions/linux/sharedfolders/regops.c	(working copy)
-@@ -3823,7 +3823,9 @@
-     .readpage       = vbsf_readpage,
-     .writepage      = vbsf_writepage,
-     /** @todo Need .writepages if we want msync performance...  */
-#if RTLNX_VER_MIN(2,5,12)
-+#if RTLNX_VER_MIN(5,18,0)
-+    .dirty_folio = filemap_dirty_folio,
-+#elif RTLNX_VER_MIN(2,5,12)
-     .set_page_dirty = __set_page_dirty_buffers,
- #endif
- #if RTLNX_VER_MIN(5,14,0)
-Index: src/VBox/Additions
-===================================================================
--- trunk/src/VBox/Additions	(revision 151556)
-+++ trunk/src/VBox/Additions	(working copy)
-
-Property changes on: src/VBox/Additions
-___________________________________________________________________
-Modified: svn:mergeinfo
-## -0,0 +0,1 ##
-   Merged /trunk/src/VBox/Additions:r150844
-Index: src/VBox/HostDrivers/Support/SUPDrv.cpp
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(working copy)
-@@ -98,6 +98,18 @@
- # endif
- #endif
- 
-+#if defined(RT_OS_LINUX) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
-+/* In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks
-+ * before triggering __underlying_memcpy() call. We do not pass these checks here,
-+ * so bypass them for now.  */
-+# if RTLNX_VER_MIN(5,18,0)
-+#  define SUPDRV_MEMCPY __underlying_memcpy
-+# else
-+# define SUPDRV_MEMCPY  memcpy
-+# endif
-+#else
-+# define SUPDRV_MEMCPY  memcpy
-+#endif
- 
- /*
-  * Logging assignments:
-@@ -266,6 +278,8 @@
-     SUPEXP_STK_BACK(    2,  SUPR0ContFree),
-     SUPEXP_STK_BACK(    2,  SUPR0ChangeCR4),
-     SUPEXP_STK_BACK(    1,  SUPR0EnableVTx),
-+    SUPEXP_STK_OKAY(    1,  SUPR0FpuBegin),
-+    SUPEXP_STK_OKAY(    1,  SUPR0FpuEnd),
-     SUPEXP_STK_BACK(    0,  SUPR0SuspendVTxOnCpu),
-     SUPEXP_STK_BACK(    1,  SUPR0ResumeVTxOnCpu),
-     SUPEXP_STK_OKAY(    1,  SUPR0GetCurrentGdtRw),
-@@ -1742,7 +1756,7 @@
- 
-             /* execute */
-             pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
-            memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
-+            SUPDRV_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
-             pReq->Hdr.rc = VINF_SUCCESS;
-             return 0;
-         }
-Index: src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp	(working copy)
-@@ -2002,6 +2002,18 @@
- }
- 
- 
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
- /*
-  *
-  * org_virtualbox_SupDrv
-Index: src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	(working copy)
-@@ -640,3 +640,16 @@
-     return 0;
- }
- 
-+
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-Index: src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(working copy)
-@@ -1454,6 +1454,31 @@
- }
- 
- 
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+#if RTLNX_VER_MIN(5,18,0)
-+    kernel_fpu_begin();
-+    /* if (fCtxHook) */
-+        preempt_enable();  /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */
-+    return true;
-+#else
-+    return false;
-+#endif
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+#if RTLNX_VER_MIN(5,18,0)
-+    /* if (fCtxHook) */
-+        preempt_disable();  /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */
-+    kernel_fpu_end();
-+#endif
-+}
-+
-+
- int VBOXCALL    supdrvOSGetCurrentGdtRw(RTHCUINTPTR *pGdtRw)
- {
- #if RTLNX_VER_MIN(4,12,0)
-Index: src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp	(working copy)
-@@ -541,3 +541,16 @@
-     return 0;
- }
- 
-+
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-Index: src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(working copy)
-@@ -1309,3 +1309,16 @@
-     return 0;
- }
- 
-+
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-Index: src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
-===================================================================
--- trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp	(working copy)
-@@ -2704,6 +2704,19 @@
- }
- 
- 
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-+
- SUPR0DECL(int) SUPR0IoCtlSetupForHandle(PSUPDRVSESSION pSession, intptr_t hHandle, uint32_t fFlags, PSUPR0IOCTLCTX *ppCtx)
- {
-     /*
-Index: src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-===================================================================
--- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	(working copy)
-@@ -2311,7 +2311,13 @@
-                 vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
-                 Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
-                 Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
-+#if RTLNX_VER_MIN(5,18,0)
-+                local_bh_disable();
-+                err = netif_rx(pBuf);
-+                local_bh_enable();
-+#else
-                 err = netif_rx_ni(pBuf);
-+#endif
-                 if (err)
-                     rc = RTErrConvertFromErrno(err);
-             }
-Index: src/VBox/VMM/VMMR0/CPUMR0.cpp
-===================================================================
--- trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp	(revision 151556)
-+++ trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp	(working copy)
-@@ -440,6 +440,9 @@
-     Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST));
-     Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE));
- 
-+    /* Notify the support driver prior to loading the guest-FPU register state. */
-+    SUPR0FpuBegin(false /* unused */);
-+
-     if (!pVM->cpum.s.HostFeatures.fLeakyFxSR)
-     {
-         Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE));
-@@ -484,6 +487,9 @@
-     Assert(ASMGetCR4() & X86_CR4_OSFXSR);
-     if (pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST))
-     {
-+        /* Notify the support driver prior to loading the host-FPU register state. */
-+        SUPR0FpuEnd(false /* unused */);
-+
-         fSavedGuest = RT_BOOL(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST);
-         if (!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE))
-             cpumR0SaveGuestRestoreHostFPUState(&pVCpu->cpum.s);
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "cpp-utilities";
-  version = "5.16.0";
+  version = "5.17.0";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-B/pWdfK3KddAIppJXQRohiIK8mouAQjXRHic75IzY/Q=";
+    sha256 = "sha256-1NjdVflLapuNeYKgRgO7zJxJN1rXjGjQO1m+xUfTeEI=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/pipewire/wireplumber.nix
+++ b/pkgs/development/libraries/pipewire/wireplumber.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch
 , nix-update-script
 , # base build deps
  meson
@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-3NrzOsL0MekxMMXCFubEkazzSWFNsjUsX8n2ECcr7yY=";
  };

+  patches = [
+    # fix sound not working in VMs
+    # FIXME: drop in next release
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253.patch";
+      sha256 = "sha256-xhhAlhOovwIjwAxXxvHRTG4GzpIPYvKQE2F4ZP1Udq8=";
+    })
+  ];
+
  nativeBuildInputs = [
    meson
    pkg-config
--- a/pkgs/development/libraries/science/math/wcpg/default.nix
+++ b/pkgs/development/libraries/science/math/wcpg/default.nix
@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, blas
+, gmp
+, lapack
+, libf2c
+, mpfi
+, mpfr
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wcpg";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner = "fixif";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    blas
+    gmp
+    lapack
+    libf2c
+    mpfi
+    mpfr
+  ];
+
+  meta = with lib; {
+    description = "Worst-Case Peak-Gain library";
+    homepage = "https://github.com/fixif/WCPG";
+    license = licenses.cecill-b;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wegank ];
+  };
+}
--- a/pkgs/development/ocaml-modules/cohttp/async.nix
+++ b/pkgs/development/ocaml-modules/cohttp/async.nix
@ -7,6 +7,7 @@
 , async_unix
 , cohttp
 , conduit-async
+, core_unix
 , uri
 , uri-sexp
 , logs
@ -25,8 +26,6 @@ buildDunePackage {
  inherit (cohttp)
    version
    src
-    minimumOCamlVersion
-    useDune2
    ;

  buildInputs = [ ppx_sexp_conv ];
@ -38,6 +37,7 @@ buildDunePackage {
    async_unix
    async
    base
+    core_unix
    magic-mime
    logs
    fmt
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@ -1,27 +1,26 @@
 { lib, fetchurl, buildDunePackage
 , ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp
 , ocaml, fmt, alcotest
+, crowbar
 }:

 buildDunePackage rec {
  pname = "cohttp";
-  version = "4.0.0";
+  version = "5.0.0";

-  useDune2 = true;
-
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";

  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
-    sha256 = "bd7aa4cd2c82744990ed7c49e3ee7a40324c64cb3d8509804809155e2bacd1d2";
+    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
+    sha256 = "sha256-/W/0uGyBg1XWGzoIYoWW2/UX1qfabo7exIG7BlPKWgU=";
  };

  buildInputs = [ jsonm ppx_sexp_conv ];

  propagatedBuildInputs = [ base64 re stringext uri-sexp ];

-  doCheck = lib.versionAtLeast ocaml.version "4.05";
-  checkInputs = [ fmt alcotest ];
+  doCheck = true;
+  checkInputs = [ fmt alcotest crowbar ];

  meta = {
    description = "HTTP(S) library for Lwt, Async and Mirage";
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@ -9,8 +9,6 @@ buildDunePackage {
  pname = "cohttp-lwt-unix";
  inherit (cohttp-lwt) version src;

-  useDune2 = true;
-
  buildInputs = [ cmdliner ppx_sexp_conv ];

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@ -1,18 +1,16 @@
-{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
+{ lib, buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }:

 buildDunePackage {
  pname = "cohttp-lwt";
  inherit (cohttp)
    version
    src
-    useDune2
-    minimumOCamlVersion
    ;

  buildInputs = [ ppx_sexp_conv ];

  propagatedBuildInputs = [
-    cohttp ocaml_lwt logs sexplib0 uri
+    cohttp lwt logs sexplib0 uri
  ];

  meta = cohttp.meta // {
--- a/pkgs/development/ocaml-modules/cohttp/mirage.nix
+++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix
@ -8,7 +8,7 @@
 buildDunePackage {
  pname = "cohttp-mirage";

-  inherit (cohttp) version src minimumOCamlVersion useDune2;
+  inherit (cohttp) version src;

  nativeBuildInputs = [ ppx_sexp_conv ];

--- a/pkgs/development/ocaml-modules/conduit/async.nix
+++ b/pkgs/development/ocaml-modules/conduit/async.nix
@ -7,8 +7,6 @@ buildDunePackage {
  inherit (conduit)
    version
    src
-    minimumOCamlVersion
-    useDune2
    ;

  buildInputs = [ ppx_sexp_conv ppx_here ];
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@ -1,21 +1,20 @@
 { lib, fetchurl, buildDunePackage
-, ppx_sexp_conv, sexplib, astring, uri, logs
+, ppx_sexp_conv, sexplib, astring, uri
 , ipaddr, ipaddr-sexp
 }:

 buildDunePackage rec {
  pname = "conduit";
-  version = "4.0.2";
-  useDune2 = true;
+  version = "5.1.0";

-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.03";

  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz";
-    sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537";
+    url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
+    sha256 = "sha256-5RyMPoecu+ngmYmwBZUJODLchmQgiAcuA+Wlmiojkc0=";
  };

-  propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ];
+  propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];

  meta = {
    description = "A network connection establishment library";
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@ -1,17 +1,17 @@
 { buildDunePackage
-, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
+, conduit-lwt, ppx_sexp_conv, lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
 , lwt_ssl, tls, lwt_log, ssl
 }:

 buildDunePackage {
  pname = "conduit-lwt-unix";
-  inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
+  inherit (conduit-lwt) version src;

  buildInputs = [ ppx_sexp_conv ];

  propagatedBuildInputs = [
    conduit-lwt
-    ocaml_lwt
+    lwt
    uri
    ipaddr
    ipaddr-sexp
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@ -1,12 +1,12 @@
-{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
+{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib }:

 buildDunePackage {
  pname = "conduit-lwt";
-  inherit (conduit) version src useDune2 minimumOCamlVersion;
+  inherit (conduit) version src;

  buildInputs = [ ppx_sexp_conv ];

-  propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
+  propagatedBuildInputs = [ conduit lwt sexplib ];

  meta = conduit.meta // {
    description = "A network connection establishment library for Lwt";
--- a/pkgs/development/ocaml-modules/conduit/mirage.nix
+++ b/pkgs/development/ocaml-modules/conduit/mirage.nix
@ -1,5 +1,5 @@
 { buildDunePackage, conduit-lwt
-, ppx_sexp_conv, sexplib, uri, cstruct, mirage-stack, mirage-flow
+, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
 , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
 , dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
 , tcpip, ca-certs-nss
@ -8,12 +8,12 @@
 buildDunePackage {
  pname = "conduit-mirage";

-  inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
+  inherit (conduit-lwt) version src;

  nativeBuildInputs = [ ppx_sexp_conv ];

  propagatedBuildInputs = [
-    sexplib uri cstruct mirage-stack mirage-clock mirage-flow
+    sexplib uri cstruct mirage-clock mirage-flow
    mirage-flow-combinators mirage-random mirage-time
    dns-client conduit-lwt vchan xenstore tls tls-mirage
    ipaddr ipaddr-sexp tcpip ca-certs-nss
--- a/pkgs/development/ocaml-modules/dns/certify.nix
+++ b/pkgs/development/ocaml-modules/dns/certify.nix
@ -1,12 +1,13 @@
 { buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509
-, mirage-random, mirage-time, mirage-clock, mirage-stack
+, mirage-random, mirage-time, mirage-clock
 , logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt
+, tcpip
 }:

 buildDunePackage {
  pname = "dns-certify";

-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;

  propagatedBuildInputs = [
    dns
@ -17,12 +18,12 @@ buildDunePackage {
    mirage-random
    mirage-time
    mirage-clock
-    mirage-stack
    logs
    mirage-crypto-pk
    mirage-crypto-rng
    mirage-crypto-ec
    lwt
+    tcpip
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@ -1,5 +1,5 @@
 { buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
-, rresult, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
+, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
 , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
 , randomconv, alcotest
 }:
@ -7,9 +7,9 @@
 buildDunePackage {
  pname = "dns-cli";

-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";

-  inherit (dns) version src useDune2;
+  inherit (dns) version src;

  # no need to propagate as this is primarily
  # an executable package
@ -19,7 +19,6 @@ buildDunePackage {
    dns-client
    dns-server
    dns-certify
-    rresult
    bos
    cmdliner
    fpath
--- a/pkgs/development/ocaml-modules/dns/client.nix
+++ b/pkgs/development/ocaml-modules/dns/client.nix
@ -1,15 +1,19 @@
-{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
-, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv
-, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }:
+{ lib, buildDunePackage, dns, lwt, mirage-clock, mirage-time
+, mirage-random, mirage-crypto-rng, mtime, randomconv
+, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
+, ca-certs, ca-certs-nss
+, happy-eyeballs
+, tcpip
+, tls, tls-mirage
+}:

 buildDunePackage {
  pname = "dns-client";
  inherit (dns) src version;

-  useDune2 = true;
-
-  propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr
-                            ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock
+  propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
+                            lwt mirage-random mirage-time mirage-clock
+                            ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage
                            mtime mirage-crypto-rng ];
  checkInputs = [ alcotest ];
  doCheck = true;
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@ -1,23 +1,22 @@
 { lib, buildDunePackage, fetchurl, alcotest
-, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt
+, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
 }:

 buildDunePackage rec {
  pname = "dns";
-  version = "5.0.1";
+  version = "6.1.4";

-  useDune2 = true;
-  minimumOCamlVersion = "4.07";
+  minimalOCamlVersion = "4.08";

  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
-    sha256 = "72c0a1a91c8e409bd448c8e0ea28d16d13177c326aea403ee1c30ddcb5969adc";
+    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
+    sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY=";
  };

-  propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
+  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];

  doCheck = true;
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];

  meta = {
    description = "An Domain Name System (DNS) library";
--- a/pkgs/development/ocaml-modules/dns/mirage.nix
+++ b/pkgs/development/ocaml-modules/dns/mirage.nix
@ -1,15 +1,15 @@
-{ buildDunePackage, dns, mirage-stack, ipaddr, lwt }:
+{ buildDunePackage, dns, ipaddr, lwt, tcpip }:

 buildDunePackage {
  pname = "dns-mirage";

-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;

  propagatedBuildInputs = [
    dns
-    mirage-stack
    ipaddr
    lwt
+    tcpip
  ];

  meta = dns.meta // {
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@ -1,12 +1,13 @@
 { buildDunePackage, dns, dns-server, dns-mirage, lru, duration
 , randomconv, lwt, mirage-time, mirage-clock, mirage-random
+, tcpip, tls, tls-mirage
 , alcotest
 }:

 buildDunePackage {
  pname = "dns-resolver";

-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;

  propagatedBuildInputs = [
    dns
@ -19,6 +20,9 @@ buildDunePackage {
    mirage-time
    mirage-clock
    mirage-random
+    tcpip
+    tls
+    tls-mirage
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/dns/server.nix
+++ b/pkgs/development/ocaml-modules/dns/server.nix
@ -1,12 +1,12 @@
 { buildDunePackage, dns, dns-mirage, randomconv, duration, lwt
-, mirage-time, mirage-clock, mirage-stack, metrics
+, mirage-time, mirage-clock, metrics
 , alcotest, mirage-crypto-rng, dns-tsig, base64
 }:

 buildDunePackage {
  pname = "dns-server";

-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;

  propagatedBuildInputs = [
    dns
@ -16,7 +16,6 @@ buildDunePackage {
    lwt
    mirage-time
    mirage-clock
-    mirage-stack
    metrics
  ];

--- a/pkgs/development/ocaml-modules/dns/stub.nix
+++ b/pkgs/development/ocaml-modules/dns/stub.nix
@ -1,12 +1,12 @@
 { buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig
 , dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
-, mirage-random, mirage-stack, metrics
+, mirage-random, tcpip, metrics
 }:

 buildDunePackage {
  pname = "dns-stub";

-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;

  propagatedBuildInputs = [
    dns
@ -21,7 +21,7 @@ buildDunePackage {
    mirage-time
    mirage-clock
    mirage-random
-    mirage-stack
+    tcpip
    metrics
  ];

--- a/pkgs/development/ocaml-modules/dns/tsig.nix
+++ b/pkgs/development/ocaml-modules/dns/tsig.nix
@ -3,7 +3,7 @@
 buildDunePackage {
  pname = "dns-tsig";

-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;

  propagatedBuildInputs = [
    mirage-crypto
--- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl
+, domain-name, duration, fmt, ipaddr, logs
+}:
+
+buildDunePackage rec {
+  pname = "happy-eyeballs";
+  version = "0.1.3";
+
+  minimalOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
+    sha256 = "sha256:0ns1bxcmx0rkq4am6vl2aargdzkfhria8sfmgnh8dgzvvj93cc1c";
+  };
+
+  propagatedBuildInputs = [
+    domain-name
+    duration
+    fmt
+    ipaddr
+    logs
+  ];
+
+  meta = {
+    description = "Connecting to a remote host via IP version 4 or 6";
+    homepage = "https://github.com/roburio/happy-eyeballs";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
--- a/pkgs/development/ocaml-modules/mirage-random/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-random/default.nix
@ -2,13 +2,11 @@

 buildDunePackage rec {
  pname = "mirage-random";
-  version = "2.0.0";
-
-  useDune2 = true;
+  version = "3.0.0";

  src = fetchurl {
    url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz";
-    sha256 = "0qj41d5smkkkbjwsnz71bhhj94d2cwv53rf3j4rhky0pqbkidnv1";
+    sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8=";
  };

  propagatedBuildInputs = [ cstruct ];
--- a/pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch
+++ b/pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch
@ -0,0 +1,31 @@
+diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml
+index 4363cff7..b0cc0c53 100644
+--- a/src/server/ocsigen_cohttp.ml
+++ b/src/server/ocsigen_cohttp.ml
+@@ -14,25 +14,13 @@ exception Ext_http_error of
+ 
+ let _print_request fmt request =
+ 
+-  let print_list print_data out_ch lst =
+-    let rec aux = function
+-      | [] -> ()
+-      | [ x ] -> print_data out_ch x
+-      | x :: r -> print_data out_ch x; aux r
+-    in aux lst
+-  in
+-
+   Format.fprintf fmt "%s [%s/%s]:\n"
+     (Uri.to_string (Cohttp.Request.uri request))
+     Cohttp.(Code.string_of_version (Request.version request))
+     Cohttp.(Code.string_of_method (Request.meth request));
+ 
+   Cohttp.Header.iter
+-    (fun key values ->
+-       (print_list
+-          (fun fmt value -> Format.fprintf fmt "\t%s = %s\n" key value)
+-          fmt
+-          values))
+    (Format.fprintf fmt "\t%s = %s\n")
+     (Cohttp.Request.headers request)
+ 
+ let connections = Hashtbl.create 256
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@ -37,6 +37,8 @@ buildDunePackage rec {
    ocaml_pcre xml-light
  ];

+  patches = [ ./cohttp-5.patch ];
+
  configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ];

  dontAddPrefix = true;
--- a/pkgs/development/python-modules/pyenvisalink/default.nix
+++ b/pkgs/development/python-modules/pyenvisalink/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "pyenvisalink";
-  version = "4.5";
+  version = "4.6";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-WS1DCnuVmFAKsFVOb6HeKoNn2ZWHoLupg2VOZkzVsBU=";
+    sha256 = "sha256-CQvomHYNMrf0oQjNCcLyisxIV2+3TOgEPzA9seZYsOs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@ -119,7 +119,8 @@ buildPythonPackage rec {
    pyhamcrest
  ]
  ++ passthru.optional-dependencies.conch
-  ++ passthru.optional-dependencies.tls;
+  # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873
+  ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls;

  checkPhase = ''
    export SOURCE_DATE_EPOCH=315532800
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@ -32,7 +32,6 @@
 , gnutar
 , json-glib
 , libcap
-, libdwarf
 , libsoup
 , libyaml
 , ostree
@ -106,7 +105,6 @@ in stdenv.mkDerivation rec {
    glib
    json-glib
    libcap
-    libdwarf
    libsoup
    libxml2
    libyaml
--- a/pkgs/development/tools/protoc-gen-connect-go/default.nix
+++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix
@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "protoc-gen-connect-go";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "bufbuild";
+    repo = "connect-go";
+    rev = "v${version}";
+    sha256 = "sha256-sChXmz88AV2uw7QqIj2kwrUStcOU91Bm+QOj0GQ075Y=";
+  };
+
+  vendorSha256 = "sha256-qf9Ni2eL7gyE3/B6Lkrzsfu6ajjKUdDr7DzMJif3wbg=";
+
+  subPackages = [ "cmd/protoc-gen-connect-go" ];
+
+  meta = with lib; {
+    description = "Simple, reliable, interoperable. A better gRPC.";
+    homepage = "https://github.com/bufbuild/connect-go";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ kilimnik ];
+  };
+}
--- a/pkgs/servers/http/apache-modules/mod_mbtiles/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_mbtiles/default.nix
@ -0,0 +1,33 @@
+{ lib, stdenv, fetchFromGitHub, apacheHttpd, sqlite }:
+
+stdenv.mkDerivation rec {
+  pname = "mod_mbtiles";
+  version = "unstable-2022-05-25";
+
+  src = fetchFromGitHub {
+    owner = "systemed";
+    repo = pname;
+    rev = "f9d12a9581820630dd923c3c90aa8dcdcf65cb87";
+    sha256 = "sha256-wOoLSNLgh0YXHUFn7WfUkQXpyWsgCrVZlMg55rvi9q4=";
+  };
+
+  buildInputs = [ apacheHttpd sqlite ];
+
+  buildPhase = ''
+    apxs -lsqlite3 -ca mod_mbtiles.c
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D .libs/mod_mbtiles.so -t $out/modules
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/systemed/mod_mbtiles";
+    description = "Serve tiles with Apache directly from an .mbtiles file";
+    license = licenses.free;
+    maintainers = with maintainers; [ sikmir ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/tools/admin/syft/default.nix
+++ b/pkgs/tools/admin/syft/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "syft";
-  version = "0.49.0";
+  version = "0.50.0";

  src = fetchFromGitHub {
    owner = "anchore";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-VsiQa3W/5eG5/U4sGRvYPa0MDYrayXIJtbutPnH/vUI=";
+    sha256 = "sha256-FQHmlASGBJOCAde0k3yuQBj8ZGsmi2jPWbq26NgXOxU=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -20,7 +20,7 @@ buildGoModule rec {
      find "$out" -name .git -print0 | xargs -0 rm -rf
    '';
  };
-  vendorSha256 = "sha256-NENKogPlp6upMkRULnkkqMep9U7cI+CR+6TDF38T2vk=";
+  vendorSha256 = "sha256-lnI2Y6GcxR+LiR8Us4j+8GbSYyXwvpiWqacWneGrMAE=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@ -15,14 +15,14 @@ let
 in
 with python.pkgs; buildPythonApplication rec {
  pname = "esphome";
-  version = "2022.6.0";
+  version = "2022.6.2";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-Fe58aBEVogYcN+ZFZZ8XSnijVuQoKuMcaor59e5pREw=";
+    sha256 = "sha256-VD2ZTsNIgWtIuWPv1ZQS7G1PlDr2cgYWqXrSuriZWtw=";
  };

  postPatch = ''
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/pkgs/tools/networking/yggdrasil/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "yggdrasil";
-  version = "0.4.3";
+  version = "0.4.4";

  src = fetchFromGitHub {
    owner = "yggdrasil-network";
    repo = "yggdrasil-go";
    rev = "v${version}";
-    sha256 = "sha256-dI+KJblSvsBC3CrUzjaDsIZ6N2QEXRTXRbEXolBK5ko=";
+    sha256 = "sha256-uJFBboV0DhZHEir4+2VdTGMqxZsahnFRgr9btdMlW2M=";
  };

-  vendorSha256 = "sha256-yhPArisADhP5Uop4zZVbqED76uWeBZJlV6IkKbL4EFI=";
+  vendorSha256 = "sha256-qeyXUTcII0hMrOWIvsjaOXv/tKWBoUrTkCimRC/RnUw=";

  # Change the default location of the management socket on Linux
  # systems so that the yggdrasil system service unit does not have to
--- a/pkgs/tools/security/grype/default.nix
+++ b/pkgs/tools/security/grype/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "grype";
-  version = "0.40.1";
+  version = "0.41.0";

  src = fetchFromGitHub {
    owner = "anchore";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-op0oNtHljAjEmWCjvWHk/jGf8De6IdX7Y0dfPl7dkN0=";
+    hash = "sha256-hEWs1o4Y3fm6dbkpClKxvR4qt5egE6Yt70V9sd3GK3I=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -26,7 +26,7 @@ buildGoModule rec {
    '';
  };

-  vendorSha256 = "sha256-5huViLIs6SZoO0cAIf2sI20qlQUsFi+Rv68PvfbVgBw=";
+  vendorSha256 = "sha256-BB7E6wb6A97AATxFHENLo+Q+oVYOnYRzC/15bfomgR4=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -472,6 +472,10 @@ with pkgs;

  protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { };

+  protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go {
+    buildGoModule = buildGo118Module;
+  };
+
  protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };

  protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { };
@ -21917,6 +21921,8 @@ with pkgs;

    mod_itk = callPackage ../servers/http/apache-modules/mod_itk { };

+    mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { };
+
    php = pkgs.php.override { inherit apacheHttpd; };

    subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
@ -25833,6 +25839,8 @@ with pkgs;
  bleachbit = callPackage ../applications/misc/bleachbit { };

  blender = callPackage  ../applications/misc/blender {
+    # LLVM 11 crashes when compiling GHOST_SystemCocoa.mm
+    stdenv = if stdenv.isDarwin then llvmPackages_10.stdenv else stdenv;
    inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;
  };

@ -25978,6 +25986,8 @@ with pkgs;

  bookworm = callPackage ../applications/office/bookworm { };

+  bookletimposer = callPackage ../applications/office/bookletimposer { };
+
  boops = callPackage ../applications/audio/boops { };

  ChowCentaur  = callPackage ../applications/audio/ChowCentaur { };
@ -29196,6 +29206,11 @@ with pkgs;

  openscad = libsForQt5.callPackage ../applications/graphics/openscad {};

+  open-stage-control = callPackage ../applications/audio/open-stage-control {
+    electron = electron_15;
+    nodejs = nodejs-16_x;
+  };
+
  opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};

  opentoonz = let
@ -33587,6 +33602,8 @@ with pkgs;

  gmsh = callPackage ../applications/science/math/gmsh { };

+  wcpg = callPackage ../development/libraries/science/math/wcpg { };
+
  zn_poly = callPackage ../development/libraries/science/math/zn_poly { };

  ### SCIENCE/MOLECULAR-DYNAMICS
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@ -505,6 +505,8 @@ let
    hacl-star = callPackage ../development/ocaml-modules/hacl-star { };
    hacl-star-raw = callPackage ../development/ocaml-modules/hacl-star/raw.nix { };

+    happy-eyeballs = callPackage ../development/ocaml-modules/happy-eyeballs { };
+
    hashcons = callPackage ../development/ocaml-modules/hashcons { };

    herelib = callPackage ../development/ocaml-modules/herelib { };