Merge staging-next into staging

2022-11-01 00:03:36 +00:00 · 2022-11-01 00:03:36 +00:00 · a8e550e843
commit a8e550e843
parent 85d6819fff facfd56509
51 changed files with 488 additions and 145 deletions
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@ -319,6 +319,18 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b
 However, please check if it's possible to disable a problematic subset of the
 test suite and leave a comment explaining your reasoning.

+This can be achived with `--skip` in `checkFlags`:
+
+```nix
+rustPlatform.buildRustPackage {
+  /* ... */
+  checkFlags = [
+    # reason for disabling test
+    "--skip=example::tests:example_test"
+  ];
+}
+```
+
 #### Setting `test-threads` {#setting-test-threads}

 `buildRustPackage` will use parallel test threads by default,
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1481,6 +1481,12 @@
    githubId = 35324;
    name = "Badi' Abdul-Wahid";
  };
+  baduhai = {
+    email = "baduhai@pm.me";
+    github = "baduhai";
+    githubId = 31864305;
+    name = "William";
+  };
  baitinq = {
    email = "manuelpalenzuelamerino@gmail.com";
    name = "Baitinq";
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -721,6 +721,16 @@
          instead.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The
+          <link xlink:href="https://ce-programming.github.io/CEmu">CEmu
+          TI-84 Plus CE emulator</link> package has been renamed to
+          <literal>cemu-ti</literal>. The
+          <link xlink:href="https://cemu.info">Cemu Wii U
+          emulator</link> is now packaged as <literal>cemu</literal>.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <literal>systemd-networkd</literal> v250 deprecated, renamed,
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -235,6 +235,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

 - The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.

+- The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`.
+
 - `systemd-networkd` v250 deprecated, renamed, and moved some sections and settings which leads to the following breaking module changes:

   * `systemd.network.networks.<name>.dhcpV6PrefixDelegationConfig` is renamed to `systemd.network.networks.<name>.dhcpPrefixDelegationConfig`.
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@ -1,18 +1,30 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkg-config
-, ronn, substituteAll
-, mbrolaSupport ? true, mbrola
-, pcaudiolibSupport ? true, pcaudiolib
-, sonicSupport ? true, sonic }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoconf
+, automake
+, which
+, libtool
+, pkg-config
+, ronn
+, substituteAll
+, mbrolaSupport ? true
+, mbrola
+, pcaudiolibSupport ? true
+, pcaudiolib
+, sonicSupport ? true
+, sonic
+}:

 stdenv.mkDerivation rec {
  pname = "espeak-ng";
-  version = "1.50";
+  version = "1.51";

  src = fetchFromGitHub {
    owner = "espeak-ng";
    repo = "espeak-ng";
    rev = version;
-    sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b";
+    hash = "sha256-KwzMlQ3/JgpNOpuV4zNc0zG9oWEGFbVSJ4bEd3dtD3Y=";
  };

  patches = lib.optionals mbrolaSupport [
@ -26,8 +38,8 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ];

  buildInputs = lib.optional mbrolaSupport mbrola
-             ++ lib.optional pcaudiolibSupport pcaudiolib
-             ++ lib.optional sonicSupport sonic;
+    ++ lib.optional pcaudiolibSupport pcaudiolib
+    ++ lib.optional sonicSupport sonic;

  preConfigure = "./autogen.sh";

@ -35,12 +47,6 @@ stdenv.mkDerivation rec {
    "--with-mbrola=${if mbrolaSupport then "yes" else "no"}"
  ];

-  # Current release lacks dependencies on local espeak-ng:
-  #  cd dictsource && ESPEAK_DATA_PATH=/build/espeak-ng LD_LIBRARY_PATH=../src: ../src/espeak-ng --compile=yue && cd ..
-  #  bash: line 1: ../src/espeak-ng: No such file or directory
-  # Should be fixed in next release: https://github.com/espeak-ng/espeak-ng/pull/1029
-  enableParallelBuilding = false;
-
  postInstall = lib.optionalString stdenv.isLinux ''
    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng
  '';
--- a/pkgs/applications/emulators/cemu/cmakelists.patch
+++ b/pkgs/applications/emulators/cemu/cmakelists.patch
@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4b2b789..48d9be0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -92,6 +92,7 @@ find_package(pugixml REQUIRED)
+ find_package(RapidJSON REQUIRED)
+ find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED)
+ find_package(libzip REQUIRED)
+find_package(SPIRV-Tools-opt REQUIRED)
+ find_package(glslang REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(zstd MODULE REQUIRED) # MODULE so that zstd::zstd is available
--- a/pkgs/applications/emulators/cemu/default.nix
+++ b/pkgs/applications/emulators/cemu/default.nix
@ -0,0 +1,119 @@
+{ lib, stdenv, fetchFromGitHub
+, addOpenGLRunpath
+, wrapGAppsHook
+, cmake
+, glslang
+, nasm
+, pkg-config
+
+, SDL2
+, boost
+, cubeb
+, curl
+, fmt_9
+, glm
+, gtk3
+, imgui
+, libpng
+, libzip
+, libXrender
+, pugixml
+, rapidjson
+, vulkan-headers
+, wxGTK32
+, zarchive
+
+, vulkan-loader
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cemu";
+  version = "2.0-10";
+
+  src = fetchFromGitHub {
+    owner = "cemu-project";
+    repo = "Cemu";
+    rev = "v${version}";
+    hash = "sha256-GJA/lJJqShuHeYirBW1kyVsU44kMpmAn916PSGOnKkY=";
+  };
+
+  patches = [
+    # glslangTargets want SPIRV-Tools-opt to be defined:
+    # > The following imported targets are referenced, but are missing:
+    # > SPIRV-Tools-opt
+    ./cmakelists.patch
+  ];
+
+  nativeBuildInputs = [
+    addOpenGLRunpath
+    wrapGAppsHook
+    cmake
+    glslang
+    nasm
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    boost
+    cubeb
+    curl
+    fmt_9
+    glm
+    gtk3
+    imgui
+    libpng
+    libzip
+    libXrender
+    pugixml
+    rapidjson
+    vulkan-headers
+    wxGTK32
+    zarchive
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG"
+    "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
+    "-DENABLE_VCPKG=OFF"
+
+    # PORTABLE:
+    # "All data created and maintained by Cemu will be in the directory where the executable file is located"
+    "-DPORTABLE=OFF"
+  ];
+
+  preConfigure = ''
+    rm -rf dependencies/imgui
+    ln -s ${imgui}/include/imgui dependencies/imgui
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 ../bin/Cemu_release $out/bin/Cemu
+    ln -s $out/bin/Cemu $out/bin/cemu
+
+    mkdir -p $out/share/applications
+    substitute ../dist/linux/info.cemu.Cemu.desktop $out/share/applications/info.cemu.Cemu.desktop \
+      --replace "Exec=Cemu" "Exec=$out/bin/Cemu"
+
+    install -Dm644 ../dist/linux/info.cemu.Cemu.metainfo.xml -t $out/share/metainfo
+    install -Dm644 ../src/resource/logo_icon.png $out/share/icons/hicolor/128x128/apps/info.cemu.Cemu.png
+
+    runHook postInstall
+  '';
+
+  preFixup = let
+    libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs;
+  in ''
+    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}")
+  '';
+
+  meta = with lib; {
+    description = "Cemu is a Wii U emulator";
+    homepage = "https://cemu.info";
+    license = licenses.mpl20;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ zhaofengli baduhai ];
+  };
+}
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@ -3,13 +3,13 @@

 mkDerivation rec {
  pname = "AusweisApp2";
-  version = "1.24.2";
+  version = "1.24.3";

  src = fetchFromGitHub {
    owner = "Governikus";
    repo = "AusweisApp2";
    rev = version;
-    sha256 = "sha256-p38zcTFbCyImiGVCr5o/QQ6BT8U2SMiHeYE3aTNYpJs=";
+    sha256 = "sha256-zwAmMj9Px27e/xJPAsOUh4saCZNQYBdse0bcZu8M3xA=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/applications/misc/darkman/default.nix
+++ b/pkgs/applications/misc/darkman/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "darkman";
-  version = "1.3.1";
+  version = "1.4.0";

  src = fetchFromGitLab {
    owner = "WhyNotHugo";
    repo = "darkman";
    rev = "v${version}";
-    sha256 = "09iwc9cwwc88c6yrf6a552nbsnf1w8cnlra9axsar2p0k21v5yl1";
+    sha256 = "sha256-Q/pjQmlyREl32C0LiwypEz1qBw2AeBOZbUIwNP392Sc=";
  };

  vendorSha256 = "09rjqw6v1jaf0mhmycw9mcay9q0y1fya2azj8216gdgkl48ics08";
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@ -11,17 +11,18 @@
 , enableXfcePanelApplet ? false
 , xfce
 , gtk3
+, gitUpdater
 }:

 stdenv.mkDerivation rec {
  pname = "jgmenu";
-  version = "4.4.0";
+  version = "4.4.1";

  src = fetchFromGitHub {
    owner = "johanmalm";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-REzrN4tz+cFmKyJeOPOkzjvthsJdY3GButF7RdnzviE=";
+    sha256 = "sha256-UC92zyuMVjyMLNEOBMElO8wCWYgwWRZAGLEOdTPNMak=";
  };

  nativeBuildInputs = [
@ -57,6 +58,8 @@ stdenv.mkDerivation rec {
    done
  '';

+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
  meta = with lib; {
    homepage = "https://github.com/johanmalm/jgmenu";
    description = "Small X11 menu intended to be used with openbox and tint2";
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "arkade";
-  version = "0.8.48";
+  version = "0.8.50";

  src = fetchFromGitHub {
    owner = "alexellis";
    repo = "arkade";
    rev = version;
-    sha256 = "sha256-3yYbuVx2dZsMefFFNVGivAR4wwXJwsr9XqGiyUKNAMo=";
+    sha256 = "sha256-DPBQ+MisNgVh2DpaIF//fjIzGvfpNYRS4zpYeUVqLwg=";
  };

  CGO_ENABLED = 0;
--- a/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kubecfg";
-  version = "0.27.0";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "kubecfg";
    repo = "kubecfg";
    rev = "v${version}";
-    sha256 = "sha256-IJ/QKqGhhJfqRBVKfmV4jTC2C53DmzmK5AECJg2xdmw=";
+    sha256 = "sha256-Ask1Mbt/7xhfTNPmLIFtndT6qqbyotFrhoaUggzgGas=";
  };

-  vendorSha256 = "sha256-kmUhcHZ6LcxtuuucOwcO6TNk2TsWL6lcppD6M6unY2M=";
+  vendorSha256 = "sha256-vqlANAwZTC4goeN/KsrYL9GWzkhi4WUx9Llyi863KVY=";

  ldflags = [ "-s" "-w" "-X main.version=v${version}" ];

--- a/pkgs/applications/video/motion/default.nix
+++ b/pkgs/applications/video/motion/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  pname = "motion";
-  version = "4.4.0";
+  version = "4.5.0";

  src = fetchFromGitHub {
    owner  = "Motion-Project";
    repo   = "motion";
    rev    = "release-${version}";
-    sha256 = "sha256-srL9F99HHq5cw82rnQpywkTuY4s6hqIO64Pw5CnaG5Q=";
+    sha256 = "sha256-uKEgTQhpslOCfNj8z95/DK4M1Gx4SMRjl1/KPh5KHuc=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
--- a/pkgs/applications/virtualization/pods/default.nix
+++ b/pkgs/applications/virtualization/pods/default.nix
@ -15,19 +15,19 @@

 stdenv.mkDerivation rec {
  pname = "pods";
-  version = "1.0.0-beta.6";
+  version = "1.0.0-beta.7";

  src = fetchFromGitHub {
    owner = "marhkb";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-ndsxa4d4lB1kZtRoLmAs/3e93qoKlS1YjB1GK9xby/A=";
+    sha256 = "sha256-b44x+VyoiDafsPqfCTPm70zZJfNYQ31/UXsrXP6K29E=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    sha256 = "sha256-qgR7wVXGJyAYCh9B9uJ63njXjiZa4BswfFMBhBpvKoM=";
+    sha256 = "sha256-kgXt5enZ0VJr6hmEVcCREna4Y53q1jEFzUMsGtV2zvY=";
  };

  nativeBuildInputs = [
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "numix-icon-theme-circle";
-  version = "22.10.17";
+  version = "22.10.31";

  src = fetchFromGitHub {
    owner = "numixproject";
    repo = pname;
    rev = version;
-    sha256 = "sha256-eM6oRchH7kuK9CZiQ8iIrHYrSG4p+y1bdXEdezFjNDw=";
+    sha256 = "sha256-FuXCQkSSSmIx6ZsVUqvOTGZrrvobITF9n9N0phoS49U=";
  };

  nativeBuildInputs = [ gtk3 ];
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "numix-icon-theme-square";
-  version = "22.10.17";
+  version = "22.10.31";

  src = fetchFromGitHub {
    owner = "numixproject";
    repo = pname;
    rev = version;
-    sha256 = "sha256-uS2Oqb5yRNHZDheflo5U4wyMm8fLvU4w3qLjPQ+zE68=";
+    sha256 = "sha256-TtRIVut4VBkQnM0+DM44305+FG3l2tDSU+FfaR7OFZI=";
  };

  nativeBuildInputs = [ gtk3 ];
--- a/pkgs/development/libraries/audio/cubeb/default.nix
+++ b/pkgs/development/libraries/audio/cubeb/default.nix
@ -0,0 +1,56 @@
+{ lib, stdenv, fetchFromGitHub
+, cmake
+, pkg-config
+, jack2
+, pulseaudio
+, sndio
+, speexdsp
+, lazyLoad ? true
+}:
+
+stdenv.mkDerivation {
+  pname = "cubeb";
+  version = "unstable-2022-10-18";
+
+  src = fetchFromGitHub {
+    owner = "mozilla";
+    repo = "cubeb";
+    rev = "27d2a102b0b75d9e49d43bc1ea516233fb87d778";
+    hash = "sha256-q+uz1dGU4LdlPogL1nwCR/KuOX4Oy3HhMdA6aJylBRk=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    jack2
+    pulseaudio
+    sndio
+    speexdsp
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_TESTS=OFF" # tests require an audio server
+    "-DBUNDLE_SPEEX=OFF"
+    "-DUSE_SANITIZERS=OFF"
+
+    # Whether to lazily load libraries with dlopen()
+    "-DLAZY_LOAD_LIBS=${if lazyLoad then "ON" else "OFF"}"
+  ];
+
+  passthru = {
+    # For downstream users when lazyLoad is true
+    backendLibs = [ jack2 pulseaudio sndio speexdsp ];
+  };
+
+  meta = with lib; {
+    description = "Cross platform audio library";
+    homepage = "https://github.com/mozilla/cubeb";
+    license = licenses.isc;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ zhaofengli ];
+  };
+}
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@ -53,7 +53,7 @@ in
  };

  fmt_9 = generic {
-    version = "9.0.0";
-    sha256 = "sha256-nwlAzMkY1JdhLtes48VaNH9LS7GzqtPCwk2dZA/bGmQ=";
+    version = "9.1.0";
+    sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=";
  };
 }
--- a/pkgs/development/libraries/libphonenumber/default.nix
+++ b/pkgs/development/libraries/libphonenumber/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation }:
+{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation, buildPackages }:

 stdenv.mkDerivation rec {
  pname = "phonenumber";
@ -13,7 +13,6 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    cmake
-    gtest
    pkg-config
  ];

@ -21,9 +20,15 @@ stdenv.mkDerivation rec {
    boost
    protobuf
    icu
+    gtest
  ] ++ lib.optional stdenv.isDarwin Foundation;

  cmakeDir = "../cpp";
+  cmakeFlags =
+    lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "-DBUILD_GEOCODER=OFF"
+      "-DPROTOC_BIN=${buildPackages.protobuf}/bin/protoc"
+    ];

  checkPhase = "./libphonenumber_test";

--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "11.2.0";
+  version = "11.4.1";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "esphome";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-Y7BQzms2BUtc0fw1PxrsSYDMZLt5NX42M1sUNuiVoCs=";
+    hash = "sha256-2vECQFeHvCjU0Fxd/H5M+C5c5lxYE5Tg5u+01EchNO0=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/confection/default.nix
+++ b/pkgs/development/python-modules/confection/default.nix
@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pydantic
+, pytestCheckHook
+, pythonOlder
+, srsly
+}:
+
+buildPythonPackage rec {
+  pname = "confection";
+  version = "0.0.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "explosion";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-3qxB94CYCMZN+sKqbmDfkRyAs6HJkFLE/5yJx1DKqYM=";
+  };
+
+  propagatedBuildInputs = [
+    pydantic
+    srsly
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "confection"
+  ];
+
+  meta = with lib; {
+    description = "Library that offers a configuration system";
+    homepage = "https://github.com/explosion/confection";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "griffe";
-  version = "0.22.2";
+  version = "0.23.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -20,9 +20,16 @@ buildPythonPackage rec {
    owner = "mkdocstrings";
    repo = pname;
    rev = version;
-    hash = "sha256-mkYtfO+wZ4vIdpCzum9uwoKMv1Xn0few8ywbvrEwxj8=";
+    hash = "sha256-eoWOkAwAd3ab9+uUfAdrYhkheibfGYkuoNQX/3nS57w=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'dynamic = ["version"]' 'version = "${version}"' \
+      --replace 'license = "ISC"' 'license = {file = "LICENSE"}' \
+      --replace 'version = {source = "scm"}' 'license-expression = "ISC"'
+  '';
+
  nativeBuildInputs = [
    pdm-pep517
  ];
@ -42,11 +49,6 @@ buildPythonPackage rec {
    ];
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
-  '';
-
  pythonImportsCheck = [
    "griffe"
  ];
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@ -1,20 +1,25 @@
 { lib
 , buildPythonPackage
-, fetchPypi
 , cython
+, fetchPypi
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "murmurhash";
-  version = "1.0.8";
+  version = "1.0.9";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-i7A6rYQoN6ZLDB0u0itQ66hfn6UUdsi8CnfDZql58fM=";
+    hash = "sha256-/no4yw09h8FOyd3cSTL/4tvHfXVGmrgP1QFGibDge1g=";
  };

  postPatch = ''
-    substituteInPlace setup.py --replace "'wheel>=0.32.0,<0.33.0'" ""
+    substituteInPlace setup.py \
+      --replace "'wheel>=0.32.0,<0.33.0'" ""
  '';

  buildInputs = [
@ -24,9 +29,9 @@ buildPythonPackage rec {
  # No test
  doCheck = false;

-  checkPhase = ''
-    pytest murmurhash
-  '';
+  pythonImportsCheck = [
+    "murmurhash"
+  ];

  meta = with lib; {
    description = "Cython bindings for MurmurHash2";
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "neo4j";
-  version = "5.1.0";
+  version = "5.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "neo4j";
    repo = "neo4j-python-driver";
    rev = "refs/tags/${version}";
-    hash = "sha256-v/IJdgn3C1JgT0KJ9O7wn+5nexDbakzM/u8bAeEPjz0=";
+    hash = "sha256-g5jeqE1eu+4iqXp57EF9xt8To2oyI3ey5URGRoPLs1Q=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@ -1,34 +1,45 @@
 { lib
 , buildPythonPackage
+, cymem
+, cython
+, python
 , fetchPypi
 , murmurhash
-, pytest
-, cython
-, cymem
-, python
+, pytestCheckHook
+, pythonOlder
 }:
+
 buildPythonPackage rec {
  pname = "preshed";
-  version = "3.0.7";
+  version = "3.0.8";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-Oc0qCrGtsRRSxheDHqDM6n0XEvKBLRdEc4c1mHUTETo=";
+    hash = "sha256-bHTHAHiAm/3doXvpZIPEHQbXF5NLB8q3khAR2BdYs1c=";
  };

-  propagatedBuildInputs = [
+  nativeBuildInputs = [
    cython
+  ];
+
+  propagatedBuildInputs = [
    cymem
    murmurhash
  ];

  checkInputs = [
-    pytest
+    pytestCheckHook
  ];

-  checkPhase = ''
-    ${python.interpreter} setup.py test
-  '';
+  # Tests have import issues with 3.0.8
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "preshed"
+  ];

  meta = with lib; {
    description = "Cython hash tables that assume keys are pre-hashed";
--- a/pkgs/development/python-modules/pyipp/default.nix
+++ b/pkgs/development/python-modules/pyipp/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "pyipp";
-  version = "0.12.0";
+  version = "0.12.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
   owner = "ctalkington";
   repo = "python-ipp";
   rev = version;
-   hash = "sha256-umlFGI0Y9cWF3N46yFztv0OlhLIzqhQF8e4quCmqn78=";
+   hash = "sha256-xTSi5Eh6vVuQ+Kr/oVMlh5YcckVRsfTUgdmGHndmX+Q=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pyiqvia/default.nix
+++ b/pkgs/development/python-modules/pyiqvia/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "pyiqvia";
-  version = "2022.04.0";
+  version = "2022.10.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -21,8 +21,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "bachya";
    repo = pname;
-    rev = version;
-    hash = "sha256-qW1rjKc1+w2rTUGackPjb0qgTZpFXh0ZRBqMmf4nDnk=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4xoK/SwpcsjIpGUertWoSlRsKIpgpV1XmuIzDJcZMZg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pyopenuv";
-  version = "2022.04.0";
+  version = "2022.10.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "bachya";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-qPk3XA6ciID6h12102AGLxfaTmE63BzKPLvwFn6F1tM=";
+    hash = "sha256-g89UV3rQc6WP6xU4x07Vdgp6plTH1BVdwxmjE2ocnp4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@ -1,5 +1,4 @@
 { lib
-, asyncio-dgram
 , buildPythonPackage
 , click
 , fetchFromGitHub
@ -19,11 +18,10 @@ buildPythonPackage rec {
    owner = "sbidy";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-IkuAYEg5nuUT6zxmuJe6afp4MVWf0+HAnEoAdOrdTvQ=";
+    hash = "sha256-IkuAYEg5nuUT6zxmuJe6afp4MVWf0+HAnEoAdOrdTvQ=";
  };

  propagatedBuildInputs = [
-    asyncio-dgram
    click
  ];

--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "seaborn";
-  version = "0.12.0";
+  version = "0.12.1";
  format = "pyproject";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-iT8XKS2LrKYWwVeN21jrJcctYi9U/F7jKcggfcm1eyM=";
+    hash = "sha256-ux6x1R0wlzaMGHw+8InAKI7B/oqhxp+zJMaKodAt9ME=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/srp/default.nix
+++ b/pkgs/development/python-modules/srp/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "srp";
-  version = "1.0.19";
+  version = "1.0.20";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-SOZT6MP1kJCbpAcwbrLoRgosfR+GxWvOWc9Cr1T/XSo=";
+    hash = "sha256-LbRTvc4mue6tNnp7V4MHTvgOhIK/MMAUCnuJg2oFRwc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@ -5,13 +5,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "sqlfluff";
-  version = "1.3.2";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-mwGDSppOcpvwPtMNzElZtwYigIHhw3GUnza4ZXCCEvc=";
+    hash = "sha256-fToZik96lRsajpDDkTiyob9ZDv25uCEaonrV87rVmgU=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, buildPackages }:

 buildGoModule rec {
  pname = "doctl";
@ -22,7 +22,7 @@ buildGoModule rec {
  postInstall = ''
    export HOME=$(mktemp -d) # attempts to write to /homeless-shelter
    for shell in bash fish zsh; do
-      $out/bin/doctl completion $shell > doctl.$shell
+      ${stdenv.hostPlatform.emulator buildPackages} $out/bin/doctl completion $shell > doctl.$shell
      installShellCompletion doctl.$shell
    done
  '';
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ruff";
-  version = "0.0.92";
+  version = "0.0.93";

  src = fetchFromGitHub {
    owner = "charliermarsh";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-PTlLxFtp1IdHobhwN4zoxVQgDDc8CAG4q5YD2DqQ7oM=";
+    sha256 = "sha256-rueFBZLYce1SVqJUyunv8Ph/r0bHKsyUX1EToF5PDVg=";
  };

-  cargoSha256 = "sha256-bhOT0kecoJL/DqOkYVgKZojV2U+nX0/ckWCPb8Zchu4=";
+  cargoSha256 = "sha256-DeMK0t8brIK4vLqWmzHNVeTKYpdsr3h3xE1m/vGGqU4=";

  buildInputs = lib.optionals stdenv.isDarwin [
    CoreServices
--- a/pkgs/development/tools/stylua/default.nix
+++ b/pkgs/development/tools/stylua/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "stylua";
-  version = "0.15.1";
+  version = "0.15.2";

  src = fetchFromGitHub {
    owner = "johnnymorganz";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-uxJsgTEvrwFfGrGv1VFoYGX9RnlqHBgUU75OlqSOEnc=";
+    sha256 = "sha256-cMT6+U9tfucPE5IkHjsWlzcD+nLQC24fqTyOhsTwFqk=";
  };

-  cargoSha256 = "sha256-FQgb9EcKEp29hl4n+A4hTdzmoEy8MfwUyt32jy1BxiY=";
+  cargoSha256 = "sha256-H8oD769xdsXIJWqfFCL76MIKrKkHUSTzzciuHJBdjyI=";

  # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
  postPatch = ''
--- a/pkgs/development/tools/sumneko-lua-language-server/default.nix
+++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix
@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
    makeWrapper "$out"/share/lua-language-server/bin/lua-language-server \
      $out/bin/lua-language-server \
      --add-flags "-E $out/share/lua-language-server/main.lua \
-      --logpath='~/.cache/sumneko_lua/log' \
-      --metapath='~/.cache/sumneko_lua/meta'"
+      --logpath='\$XDG_CACHE_HOME/sumneko_lua/log' \
+      --metapath='\$XDG_CACHE_HOME/sumneko_lua/meta'"

    runHook postInstall
  '';
--- a/pkgs/development/tools/taplo/default.nix
+++ b/pkgs/development/tools/taplo/default.nix
@ -8,15 +8,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "taplo";
-  version = "0.7.2";
+  version = "0.8.0";

  src = fetchCrate {
    inherit version;
    pname = "taplo-cli";
-    sha256 = "sha256-AiX6ruiyyWt33G49dD9ozFXq+3efEMzJoeWVfP5UGGo=";
+    sha256 = "sha256-od8uL2xvIGFtftob3P0VQ+SPkwQgU68OxS6hk34c4+U=";
  };

-  cargoSha256 = "sha256-Uvc/1CE8eaYfelJ3U8zxF2HVx9P7G1ZVQB5tCvQDTac=";
+  cargoSha256 = "sha256-1ba0FqegYNbRis7Nwl2RONHOxq0iuLah8a1QlWs4HfE=";

  buildInputs = lib.optional stdenv.isDarwin Security;

--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "dgraph";
-  version = "21.12.0";
+  version = "22.0.0";

  src = fetchFromGitHub {
    owner = "dgraph-io";
    repo = "dgraph";
    rev = "v${version}";
-    sha256 = "sha256-OYDWr+wJEIP7raIHsXSjvuFr2ENJOllufO5ff6lxoR4=";
+    sha256 = "sha256-2ZLZ1emsXmt1RjVq5Pdsbi+ItzxN/fEImOq7VBg5pxA=";
  };

-  vendorSha256 = "sha256-YtU3Yeq/lNeq7cOB+KvHbvlH9g40WuJk1ovHxCQMG60=";
+  vendorSha256 = "sha256-K2Q2QBP6fJ3E2LEmZO2U/0DiQifrJVG0lcs4pO5yqrY=";

  doCheck = false;

--- a/pkgs/servers/matrix-appservice-discord/default.nix
+++ b/pkgs/servers/matrix-appservice-discord/default.nix
@ -1,4 +1,4 @@
-{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python3, nodejs }:
+{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python3, nodejs, removeReferencesTo }:

 assert lib.versionAtLeast nodejs.version "12.0.0";

@ -30,6 +30,7 @@ in mkYarnPackage rec {
      postInstall = ''
        # build native sqlite bindings
        npm run build-release --offline --nodedir="${nodeSources}"
+        find build -type f -exec ${removeReferencesTo}/bin/remove-references-to -t "${nodeSources}" {} \;
     '';
    };
  };
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "prom2json";
-  version = "1.3.0";
+  version = "1.3.2";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "prometheus";
    repo = "prom2json";
-    sha256 = "09glf7br1a9k6j2hs94l2k4mlmlckdz5c9v6qg618c2nd4rk1mz6";
+    sha256 = "sha256-5RPpgUEFLecu0qRg7KSNLwdUEiXeebrGdP/udCtq4z0=";
  };

-  vendorSha256 = null;
+  vendorSha256 = "sha256-fPGkqrnl21as1xiT279qPzkz01tDNOSMcsm/DSNHDU0=";

  meta = with lib; {
    description = "Tool to scrape a Prometheus client and dump the result as JSON";
--- a/pkgs/servers/web-apps/hedgedoc/default.nix
+++ b/pkgs/servers/web-apps/hedgedoc/default.nix
@ -12,14 +12,14 @@

 mkYarnPackage rec {
  pname = "hedgedoc";
-  version = "1.9.4";
+  version = "1.9.5";

  # we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies
  # in development and production and the web assets muts be compiled with js-yaml 3 while development
  # uses js-yaml 4 which breaks the text editor
  src = fetchzip {
    url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz";
-    hash = "sha256-YBPxL1/2bj+8cemSBZSNqSlD/DYJRxSG5UuyUipf3R8=";
+    hash = "sha256-dcqCc4UUI1knRlDfQlXq3cpTRTh+kbgFynbypDzw9y8=";
  };

  nativeBuildInputs = [ which makeWrapper ];
@ -30,7 +30,7 @@ mkYarnPackage rec {

  offlineCache = fetchYarnDeps {
    yarnLock = src + "/yarn.lock";
-    sha256 = "sha256-tnxubtu2lv5DKYY4rwQzNwvsFu3pD3NF4VUN/xieqpc=";
+    sha256 = "18k2q2llngdk0gsyjrwpirhvwmkwgzhx8nw1rx7g7v2nfzyz189b";
  };

  configurePhase = ''
--- a/pkgs/servers/web-apps/hedgedoc/package.json
+++ b/pkgs/servers/web-apps/hedgedoc/package.json
@ -1,6 +1,6 @@
 {
  "name": "HedgeDoc",
-  "version": "1.9.4",
+  "version": "1.9.5",
  "description": "The best platform to write and share markdown.",
  "main": "app.js",
  "license": "AGPL-3.0",
@ -21,7 +21,7 @@
    "Idle.Js": "git+https://github.com/shawnmclean/Idle.js",
    "archiver": "^5.0.2",
    "async": "^3.0.0",
-    "aws-sdk": "^2.987.0",
+    "aws-sdk": "^2.1243.0",
    "azure-storage": "^2.7.0",
    "base64url": "^3.0.0",
    "body-parser": "^1.15.2",
@ -37,7 +37,7 @@
    "ejs": "^3.0.0",
    "express": ">=4.14",
    "express-session": "^1.14.2",
-    "file-type": "^17.0.0",
+    "file-type": "^18.0.0",
    "formidable": "^2.0.0",
    "graceful-fs": "^4.1.11",
    "helmet": "^4.5.0",
@ -47,7 +47,7 @@
    "lodash": "^4.17.20",
    "lutim": "^1.0.2",
    "lz-string": "git+https://github.com/hackmdio/lz-string.git",
-    "mariadb": "^3.0.0",
+    "mariadb": "^3.0.2",
    "markdown-it": "^13.0.0",
    "markdown-it-abbr": "^1.0.4",
    "markdown-it-container": "^3.0.0",
@ -65,7 +65,7 @@
    "meta-marked": "git+https://github.com/hedgedoc/meta-marked",
    "method-override": "^3.0.0",
    "minimist": "^1.2.0",
-    "minio": "7.0.29",
+    "minio": "7.0.32",
    "moment": "^2.17.1",
    "morgan": "^1.7.0",
    "mysql2": "^2.0.0",
@ -99,7 +99,7 @@
    "string": "^3.3.3",
    "toobusy-js": "^0.5.1",
    "umzug": "^2.3.0",
-    "uuid": "^8.0.0",
+    "uuid": "^9.0.0",
    "validator": "^13.0.0",
    "winston": "^3.1.0",
    "xss": "^1.0.3"
@ -134,7 +134,7 @@
    "url": "https://github.com/hedgedoc/hedgedoc.git"
  },
  "devDependencies": {
-    "abcjs": "6.0.3",
+    "abcjs": "6.1.6",
    "babel-cli": "6.26.0",
    "babel-core": "6.26.3",
    "babel-loader": "7.1.5",
@ -148,14 +148,14 @@
    "copy-webpack-plugin": "6.4.1",
    "css-loader": "5.2.7",
    "emojify.js": "1.1.0",
-    "esbuild-loader": "2.19.0",
+    "esbuild-loader": "2.20.0",
    "escape-html": "1.0.3",
-    "eslint": "8.19.0",
+    "eslint": "8.26.0",
    "eslint-config-standard": "17.0.0",
    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-n": "15.2.4",
+    "eslint-plugin-n": "15.3.0",
    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "6.0.0",
+    "eslint-plugin-promise": "6.1.1",
    "eslint-plugin-standard": "4.1.0",
    "exports-loader": "1.1.1",
    "expose-loader": "1.0.3",
@ -168,9 +168,9 @@
    "html-webpack-plugin": "4.5.2",
    "imports-loader": "1.2.0",
    "ionicons": "2.0.1",
-    "jquery": "3.6.0",
+    "jquery": "3.6.1",
    "jquery-mousewheel": "3.1.13",
-    "jquery-ui": "1.13.1",
+    "jquery-ui": "1.13.2",
    "js-cookie": "3.0.1",
    "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
    "js-yaml": "3.14.1",
@ -180,12 +180,12 @@
    "less-loader": "7.3.0",
    "list.js": "2.3.1",
    "mathjax": "2.7.9",
-    "mermaid": "9.1.3",
+    "mermaid": "9.1.7",
    "mini-css-extract-plugin": "1.6.2",
-    "mocha": "10.0.0",
+    "mocha": "10.1.0",
    "mock-require": "3.0.3",
    "optimize-css-assets-webpack-plugin": "6.0.1",
-    "prismjs": "1.28.0",
+    "prismjs": "1.29.0",
    "raphael": "2.3.0",
    "remark-cli": "11.0.0",
    "remark-preset-lint-markdown-style-guide": "5.1.2",
--- a/pkgs/servers/web-apps/hedgedoc/update.sh
+++ b/pkgs/servers/web-apps/hedgedoc/update.sh
@ -16,11 +16,16 @@ if [ -z "$version" ]; then
 fi

 src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version"
-wget "$src/package.json" -O package.json

-src_hash=$(nix-prefetch-github hedgedoc hedgedoc --rev "${version}" | jq -r .sha256)
+wget "$src/package.json" -O package.json
+wget "$src/yarn.lock" -O yarn.lock
+
+src_old_hash=$(nix-prefetch-url --unpack "https://github.com/hedgedoc/hedgedoc/releases/download/$version/hedgedoc-$version.tar.gz")
+src_hash=$(nix hash to-sri --type sha256 $src_old_hash)
 yarn_hash=$(prefetch-yarn-deps yarn.lock)

-sed -i "s/version = \".*\"/version = \"$version\"/" default.nix
-sed -i "s/hash = \".*\"/hash = \"$src_hash\"/" default.nix
-sed -i "s/sha256 = \".*\"/sha256 = \"$yarn_hash\"/" default.nix
+sed -i "s|version = \".*\"|version = \"$version\"|" default.nix
+sed -i "s|hash = \".*\"|hash = \"$src_hash\"|" default.nix
+sed -i "s|sha256 = \".*\"|sha256 = \"$yarn_hash\"|" default.nix
+
+rm yarn.lock
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@ -738,6 +738,7 @@ self: super:
            buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
            postPatch = lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
            meta.platforms = lib.platforms.unix;
+            meta.broken = stdenv.isDarwin;
        } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}";

    in attrs //
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:

 stdenv.mkDerivation rec {
-  version = "2022-10-25";
+  version = "2022-10-30";
  pname = "oh-my-zsh";
-  rev = "49691b58b3c1fbe64b927ec88d5e9697f76e2a80";
+  rev = "50a526f209a182add8a47e362e1c9a3bfd7c5af4";

  src = fetchFromGitHub {
    inherit rev;
    owner = "ohmyzsh";
    repo = "ohmyzsh";
-    sha256 = "z6cwBsOxMEdm+3QeqeDPIya0jzvrcxrkl7ssd+dHkKo=";
+    sha256 = "1PPLUxFGUTHCxEgJXw8TLAqXOLfzz1oQNwmjLRfhQH4=";
  };

  strictDeps = true;
--- a/pkgs/tools/archivers/zarchive/default.nix
+++ b/pkgs/tools/archivers/zarchive/default.nix
@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, cmake, zstd }:
+
+stdenv.mkDerivation rec {
+  pname = "zarchive";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "Exzap";
+    repo = "ZArchive";
+    rev = "v${version}";
+    hash = "sha256-hX637O/mVLTzmG0a9swJu9w+3o26VHo+K/9RhMuf1lI=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zstd ];
+
+  meta = with lib; {
+    description = "File archive format supporting random-access reads";
+    homepage = "https://github.com/Exzap/ZArchive";
+    license = licenses.mit0;
+    maintainers = with maintainers; [ zhaofengli ];
+  };
+}
--- a/pkgs/tools/misc/hyfetch/default.nix
+++ b/pkgs/tools/misc/hyfetch/default.nix
@ -1,21 +1,32 @@
-{ lib, buildPythonPackage, fetchFromGitHub, typing-extensions, setuptools }:
+{ lib
+, fetchFromGitHub
+, python3
+}:

-buildPythonPackage rec {
-  pname = "HyFetch";
+python3.pkgs.buildPythonApplication rec {
+  pname = "hyfetch";
  version = "1.4.3";
+  format = "setuptools";

  src = fetchFromGitHub {
-    repo = "hyfetch";
    owner = "hykilpikonna";
+    repo = "hyfetch";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-ScdcV1ojtVz/OdR7k+y7Wj4VAne++8LY9Vz+wO3CJGI=";
+    hash = "sha256-ScdcV1ojtVz/OdR7k+y7Wj4VAne++8LY9Vz+wO3CJGI=";
  };

-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
    typing-extensions
    setuptools
  ];

+  # No test available
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "hyfetch"
+  ];
+
  meta = with lib; {
    description = "neofetch with pride flags <3";
    longDescription = ''
--- a/pkgs/tools/misc/star-history/default.nix
+++ b/pkgs/tools/misc/star-history/default.nix
@ -9,14 +9,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "star-history";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-sVcYQneWEZXcsbzMJ2ZfHS0C529J6s1sDxrcIojEC4U=";
+    sha256 = "sha256-fmuCmyqw7wubMafkhqL1MltW6jZefgXdnudxdeBRSV4=";
  };

-  cargoSha256 = "sha256-d0PesmJTZFVoVwBLMZzOsF76hcUbRaEoymmfw3Qh9mc=";
+  cargoSha256 = "sha256-+wHOBjBQyMuooDey4Py8xmgW3NNI8t8rCwA8A7D6L84=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@ -62,20 +62,24 @@

 stdenv.mkDerivation rec {
  pname = "rsyslog";
-  version = "8.2208.0";
+  version = "8.2210.0";

  src = fetchurl {
    url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
-    sha256 = "sha256-FN5o57jlqwxdc0+C4tyf/yLNf0cQrWkHJ+sQp7mz314=";
+    hash = "sha256-ZD7ieROdaUoHyf8/8Q3FITvfh0mD0n03NSXpXgX6CU0=";
  };

-  nativeBuildInputs = [ pkg-config autoreconfHook ];
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+    docutils
+  ];
+
  buildInputs = [
    fastJson
    libestr
    json_c
    zlib
-    docutils
  ] ++ lib.optional withKrb5 libkrb5
  ++ lib.optional withJemalloc jemalloc
  ++ lib.optional withPostgres postgresql
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1503,6 +1503,8 @@ with pkgs;

  cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };

+  cemu = callPackage ../applications/emulators/cemu { };
+
  cen64 = callPackage ../applications/emulators/cen64 { };

  citra-canary = callPackage ../applications/emulators/citra {
@ -13070,6 +13072,8 @@ with pkgs;

  yj = callPackage ../development/tools/yj { };

+  zarchive = callPackage ../tools/archivers/zarchive { };
+
  zprint = callPackage ../development/tools/zprint { };

  yle-dl = callPackage ../tools/misc/yle-dl {};
@ -18204,6 +18208,8 @@ with pkgs;
  # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
  cachix = haskell.lib.compose.justStaticExecutables haskellPackages.cachix;

+  cubeb = callPackage ../development/libraries/audio/cubeb { };
+
  hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };

  hci = callPackage ../development/tools/continuous-integration/hci { };
@ -36440,7 +36446,7 @@ with pkgs;

  hplipWithPlugin = hplip.override { withPlugin = true; };

-  hyfetch = python3Packages.callPackage ../tools/misc/hyfetch { };
+  hyfetch = callPackage ../tools/misc/hyfetch { };

  hyperfine = callPackage ../tools/misc/hyperfine {
    inherit (darwin.apple_sdk.frameworks) Security;
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1898,6 +1898,8 @@ self: super: with self; {

  conda = callPackage ../development/python-modules/conda { };

+  confection = callPackage ../development/python-modules/confection { };
+
  configargparse = callPackage ../development/python-modules/configargparse { };

  configclass = callPackage ../development/python-modules/configclass { };