Merge master into haskell-updates

2024-10-08 05:27:57 +03:00 · 2022-11-05 00:15:52 +00:00 · 2022-11-05 00:15:52 +00:00 · 5c1ec1d278
commit 5c1ec1d278
parent 693e11dae3 05fb221490
207 changed files with 3009 additions and 1911 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -281,6 +281,13 @@
    githubId = 124545;
    name = "Anthony Cowley";
  };
+  adamcstephens = {
+    email = "happy.plan4249@valkor.net";
+    matrix = "@adam:valkor.net";
+    github = "adamcstephens";
+    githubId = 2071575;
+    name = "Adam C. Stephens";
+  };
  adamlwgriffiths = {
    email = "adam.lw.griffiths@gmail.com";
    github = "adamlwgriffiths";
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -1218,6 +1218,17 @@
          environment.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          PowerDNS has been updated from <literal>4.6.x</literal> to
+          <literal>4.7.x</literal>. Please be sure to review the
+          <link xlink:href="https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master">Upgrade
+          Notes</link> provided by upstream before upgrading. Worth
+          specifically noting is that the new Catalog Zones feature
+          comes with a mandatory schema change for the gsql database
+          backends, which has to be manually applied.
+        </para>
+      </listitem>
      <listitem>
        <para>
          There is a new module for the <literal>thunar</literal>
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -369,6 +369,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

 - The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment.

+- PowerDNS has been updated from `4.6.x` to `4.7.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the gsql database backends, which has to be manually applied.
+
 - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.

 - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
--- a/nixos/modules/hardware/usb-storage.nix
+++ b/nixos/modules/hardware/usb-storage.nix
@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+with lib;
+
+{
+  options.hardware.usbStorage.manageStartStop = mkOption {
+    type = types.bool;
+    default = true;
+    description = lib.mdDoc ''
+      Enable this option to gracefully spin-down external storage during shutdown.
+      If you suspect improper head parking after poweroff, install `smartmontools` and check
+      for the `Power-Off_Retract_Count` field for an increment.
+    '';
+  };
+
+  config = mkIf config.hardware.usbStorage.manageStartStop {
+    services.udev.extraRules = ''
+      ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage", ATTR{manage_start_stop}="1"
+    '';
+  };
+}
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -82,6 +82,7 @@
  ./hardware/tuxedo-keyboard.nix
  ./hardware/ubertooth.nix
  ./hardware/usb-wwan.nix
+  ./hardware/usb-storage.nix
  ./hardware/onlykey/default.nix
  ./hardware/opentabletdriver.nix
  ./hardware/sata.nix
--- a/nixos/tests/bazarr.nix
+++ b/nixos/tests/bazarr.nix
@ -16,11 +16,15 @@ in
        enable = true;
        listenPort = port;
      };
+      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"];
+      # Workaround for https://github.com/morpheus65535/bazarr/issues/1983
+      # ("Crash when running without timezone info").
+      time.timeZone = "UTC";
    };

  testScript = ''
    machine.wait_for_unit("bazarr.service")
-    machine.wait_for_open_port(port)
+    machine.wait_for_open_port(${toString port})
    machine.succeed("curl --fail http://localhost:${toString port}/")
  '';
 })
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@ -1,4 +1,8 @@
-{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
+{ lib
+, fetchFromGitHub
+, python3
+, wrapQtAppsHook
+}:

 # As of 2.1, puddletag has started pinning versions of all dependencies that it
 # was built against which is an issue as the chances of us having the exact same
@ -14,18 +18,11 @@
 # ignoring the pinned versions, it's just something we will have to accept
 # unless we want to vendor those versions.

-let
-  # NOTE: check if we can drop any of these overrides when bumping the version
-  overrideVersions = [
-    "lxml"
-    "pyparsing"
-    "pyqt5"
-  ];

-in
-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "puddletag";
  version = "2.2.0";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "puddletag";
@ -34,26 +31,29 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g=";
  };

+  pythonRelaxDeps = true;
+
+  pythonRemoveDeps = [
+    "chromaprint"
+    "pyqt5-qt5"
+  ];
+
  postPatch = ''
    substituteInPlace setup.py \
      --replace share/pixmaps share/icons
+  '';

-    cp requirements.in requirements.txt
-    sed -i requirements.txt -e 's/^chromaprint$//'
-  '' + lib.concatMapStringsSep "\n"
-    (e: ''
-      sed -i requirements.txt -e 's/^${e}.*/${e}/'
-    '')
-    overrideVersions;
+  nativeBuildInputs = [
+    python3.pkgs.pythonRelaxDepsHook
+    wrapQtAppsHook
+  ];

-  nativeBuildInputs = [ wrapQtAppsHook ];
-
-  propagatedBuildInputs = with python3Packages; [
-    pyacoustid
+  propagatedBuildInputs = with python3.pkgs; [
    configobj
    levenshtein
    lxml
    mutagen
+    pyacoustid
    pyparsing
    pyqt5
    rapidfuzz
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/pkgs/applications/audio/squeezelite/default.nix
@ -34,13 +34,13 @@ stdenv.mkDerivation {
  pname = binName;
  # versions are specified in `squeezelite.h`
  # see https://github.com/ralph-irving/squeezelite/issues/29
-  version = "1.9.9.1403";
+  version = "1.9.9.1411";

  src = fetchFromGitHub {
    owner = "ralph-irving";
    repo = "squeezelite";
-    rev = "bc72c0de3fff771540a2a45aaafafed539387b3c";
-    hash = "sha256-205i61mbeQG2MzSE9NtPHSuNeyMbjZzbZVCFFzjqKqQ=";
+    rev = "ca44fc6e258bb413d6281d927063b25940f42e5c";
+    hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY=";
  };

  buildInputs = [ flac libmad libvorbis mpg123 ]
@ -82,7 +82,7 @@ stdenv.mkDerivation {
    description = "Lightweight headless squeezebox client emulator";
    homepage = "https://github.com/ralph-irving/squeezelite";
    license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2;
-    maintainers = with maintainers; [ samdoshi ];
+    maintainers = with maintainers; [ adamcstephens ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@ -25,13 +25,13 @@

 stdenv.mkDerivation rec {
  pname = "tauon";
-  version = "7.4.2";
+  version = "7.4.3";

  src = fetchFromGitHub {
    owner = "Taiko2k";
    repo = "TauonMusicBox";
    rev = "v${version}";
-    sha256 = "sha256-fEEu7GqK1leOop3kd1Ci9BAH2bP31jvTOg3DEL8lIF4=";
+    sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0=";
  };

  postUnpack = ''
--- a/pkgs/applications/blockchains/electrs/default.nix
+++ b/pkgs/applications/blockchains/electrs/default.nix
@ -12,16 +12,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "electrs";
-  version = "0.9.9";
+  version = "0.9.10";

  src = fetchFromGitHub {
    owner = "romanz";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-jU0qN+T5bHn9l/SXDR/Wa8uCGyJhIDUCHzEQe39L2MQ=";
+    hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE=";
  };

-  cargoHash = "sha256-hdScQd0Fd6gE9/f4kk0zjZLK42oK1aaDzIOcAIsJqbU=";
+  cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ=";

  # needed for librocksdb-sys
  nativeBuildInputs = [ llvmPackages.clang ];
@ -33,6 +33,8 @@ rustPlatform.buildRustPackage rec {

  buildInputs = lib.optionals stdenv.isDarwin [ Security ];

+  passthru.updateScript = ./update.sh;
+
  meta = with lib; {
    description = "An efficient re-implementation of Electrum Server in Rust";
    homepage = "https://github.com/romanz/electrs";
--- a/pkgs/applications/blockchains/erigon.nix
+++ b/pkgs/applications/blockchains/erigon.nix
@ -2,17 +2,17 @@

 buildGoModule rec {
  pname = "erigon";
-  version = "2022.10.01";
+  version = "2.29.0";

  src = fetchFromGitHub {
    owner = "ledgerwatch";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-FuOVI59vfhm5q92hnfgarh3zpLXSDRmZQJuERHf4I7A=";
+    sha256 = "sha256-hxbeneq1ryTsULRWalgpWRa1aIIyj/QKv5hnYvUUgMg=";
    fetchSubmodules = true;
  };

-  vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw=";
+  vendorSha256 = "sha256-VJxsmJxqER+q1rGFy1CI9Wm1+JXTGQiMJwJ+yzjRtAI=";
  proxyVendor = true;

  # Build errors in mdbx when format hardening is enabled:
--- a/pkgs/applications/blockchains/go-ethereum/default.nix
+++ b/pkgs/applications/blockchains/go-ethereum/default.nix
@ -9,13 +9,13 @@ let

 in buildGoModule rec {
  pname = "go-ethereum";
-  version = "1.10.25";
+  version = "1.10.26";

  src = fetchFromGitHub {
    owner = "ethereum";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-mnf0kMfQEEQMricZJfyF7ZB/2F1dyPBx9iT2v/rGh1U=";
+    sha256 = "sha256-eefQEOeKb6gZIJdK9cq20WnhwZE1qbyd8Cl0Hqh2+u8=";
  };

  vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0=";
@ -46,7 +46,7 @@ in buildGoModule rec {
    "cmd/utils"
  ];

-  # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.25/build/ci.go#L218
+  # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.26/build/ci.go#L218
  tags = [ "urfave_cli_no_docs" ];

  # Fix for usb-related segmentation faults on darwin
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.174.0";
+  version = "1.175.0";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    hash = "sha256-3jj04ndyuJpfXu9z8j/Pdp8yNybmzLbrPr/S+uV7Rfg=";
+    hash = "sha256-Q4T4CmMK+sxOst18pW4L4uMYzc/heMetntM0L+HrSlo=";
  };

  postPatch = ''
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@ -11,13 +11,13 @@
  },
  "ATFlatControls": {
    "owner": "Alexey-T",
-    "rev": "2022.10.24",
-    "hash": "sha256-IXMOZV4NNL7VHzlbzPCcYOPYneV7bDYm5L7Ge/SlnJs="
+    "rev": "2022.11.03",
+    "hash": "sha256-U6jF+gXFOuPY512y4KWL18q8rZlfNwGqB9fTUHAHXl8="
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2022.10.25",
-    "hash": "sha256-eleuHFE+kBmqKBVKOPzUAi+LVgzRr8gIKdCIPzfxUOo="
+    "rev": "2022.11.03",
+    "hash": "sha256-BLKzmkIopcvbngQFWS+f1MQfMBOpZ9S2qch7cDGY7/0="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
@ -36,8 +36,8 @@
  },
  "Python-for-Lazarus": {
    "owner": "Alexey-T",
-    "rev": "2021.10.27",
-    "hash": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA="
+    "rev": "2022.10.26",
+    "hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY="
  },
  "Emmet-Pascal": {
    "owner": "Alexey-T",
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@ -433,25 +433,26 @@ rec {
    };
  };

-  gnuarmeclipse = buildEclipseUpdateSite rec {
-    name = "gnuarmeclipse-${version}";
-    version = "3.1.1-201606210758";
+  embed-cdt = buildEclipseUpdateSite rec {
+    name = "embed-cdt-${version}";
+    version = "6.3.1";

    src = fetchzip {
-      stripRoot = false;
-      url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip";
-      sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h";
+      stripRoot = true;
+      url = "https://github.com/eclipse-embed-cdt/eclipse-plugins/archive/v${version}.zip";
+      sha256 = "sha256-0wHRIls48NGDQzD+wuX79Thgiax+VVYVPJw2Z6NEzsg=";
    };

    meta = with lib; {
-      homepage = "http://gnuarmeclipse.livius.net/";
-      description = "GNU ARM Eclipse Plug-ins";
+      homepage = "https://github.com/eclipse-embed-cdt/eclipse-plugins";
+      description = "Embedded C/C++ Development Tools (formerly GNU MCU/ARM Eclipse)";
      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-      license = licenses.epl10;
+      license = licenses.epl20;
      platforms = platforms.all;
      maintainers = [ maintainers.bjornfor ];
    };
  };
+  gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04

  jsonedit = buildEclipsePlugin rec {
    name = "jsonedit-${version}";
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -281,12 +281,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2022-10-31";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "bfcd9a05ded8ff6cf89b302bee548c35177d9158";
-      sha256 = "1mwj6dhk7wpyk766bq504i87hyw3rgspc64ml0kc5xf8wq1mxx4m";
+      rev = "6d856dc67cb85539fae976cce268e853f14079e7";
+      sha256 = "09xqfahq1i59bw7fpxh6g16g1j9habsxi68v8ghr1za5lspki768";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -341,12 +341,12 @@ final: prev:

  SpaceVim = buildVimPluginFrom2Nix {
    pname = "SpaceVim";
-    version = "2022-11-01";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "SpaceVim";
      repo = "SpaceVim";
-      rev = "88489db9c24e6c8cbc0b39cc9b8de96d3899cb06";
-      sha256 = "16hn8zpmm9qynzakj8dp3d42pczcqdb3xj5k1di7yw810r8gdycf";
+      rev = "49e0e52d512a370b53f315fcb83e0e84ebba4d86";
+      sha256 = "19jmaabbwp8vl75ldm18vkl76xcgwfx0krihah52sdimfjy1az8i";
    };
    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
  };
@ -365,12 +365,12 @@ final: prev:

  SudoEdit-vim = buildVimPluginFrom2Nix {
    pname = "SudoEdit.vim";
-    version = "2022-08-15";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "chrisbra";
      repo = "SudoEdit.vim";
-      rev = "bcf23412e9f307036ae3dbd7968930c1fd48f02b";
-      sha256 = "1zrf32d4v5751vivwl976sjy901vjrl1m5b2vzzmp7aic76rji7y";
+      rev = "e0ffcda0c2f98bec80cb52d1af5f3af26bd38821";
+      sha256 = "125npjj74zn6ldh0656m5f7bc5035wdh7v3bwhh70jkbw36c3vvm";
    };
    meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
  };
@ -442,7 +442,7 @@ final: prev:
      owner = "ycm-core";
      repo = "YouCompleteMe";
      rev = "728b47728c31bcbc92fbc196c00230d601ca2a15";
-      sha256 = "11g2gby9qffjs4197ajzk2hsmpsjgak33rxfbfijg82m9ypsf3gc";
+      sha256 = "0mlhaxnafi6wdyxhjiy2jdpf7xqwlxh5cqjk658znb05x4kix0pp";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@ -486,12 +486,12 @@ final: prev:

  aerial-nvim = buildVimPluginFrom2Nix {
    pname = "aerial.nvim";
-    version = "2022-10-31";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "159041f5f6e0ba914221f097886f1d31ce419c04";
-      sha256 = "06b5hjsbk4k9zw64zfz8pq540wd2q3i5z4sv78n3kh0cbcjj9gmw";
+      rev = "f15e49cbc0da8840531ed0bddf67735c604994d6";
+      sha256 = "1lkyl27a3pn7lwcljpyy0q76c7f66jcik1nlbfq5nfr52h040061";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -667,12 +667,12 @@ final: prev:

  asyncrun-vim = buildVimPluginFrom2Nix {
    pname = "asyncrun.vim";
-    version = "2022-10-30";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "skywind3000";
      repo = "asyncrun.vim";
-      rev = "4794a74dae54633c586eecd67e31d771323a2f72";
-      sha256 = "1d3xm00xhwdm5yc08mzkvn5897rb58cjrlq86dlbypfrni512sv7";
+      rev = "e74f19f430f98fbb5a2f4d3a725ea980876b7314";
+      sha256 = "0fasalhsyf86sr5r2y1wh6ixbf2ys7abwvsf5lzav0za59542av4";
    };
    meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
  };
@ -907,12 +907,12 @@ final: prev:

  bufdelete-nvim = buildVimPluginFrom2Nix {
    pname = "bufdelete.nvim";
-    version = "2022-10-07";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "famiu";
      repo = "bufdelete.nvim";
-      rev = "e88dbe0ba5829119d8edb5fc69d3c8553e324a93";
-      sha256 = "0qja5jvx8047v5qbch6flcg8fq00369ffcivrv2gkqkmggg4dvb6";
+      rev = "027d356a5caec51881089886893c197f0c27fb48";
+      sha256 = "1kg671nqjic4dn275ixf3iapj40q96mmpmi4bssz0pdd4gr37klm";
    };
    meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
  };
@ -1723,12 +1723,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc.nvim";
-    version = "2022-10-31";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "46571a51028dccca9c10c860a51ea3c8adc92de8";
-      sha256 = "1agm4sban6sfg626hf78ayhr98hrvi263jv6i8hk0qhcgv26k32c";
+      rev = "5f52e41be1ff19ce1f1bd3307144e7d96703b7fd";
+      sha256 = "0nm8jgdgxbdlvcpl12fs2fgxww5nizjpqd2ywm2n7ca0lsjpqcx0";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -2011,24 +2011,24 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2022-11-01";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "47e6f18e8583f9d48c7e71e632ceb4121dc1d6cc";
-      sha256 = "1k425fr1fmq6k7j16m0ylj0z3g11lcdjflw873ivw0wc9kkh6z47";
+      rev = "4e80d710635ef4599391c5da355abe5680931469";
+      sha256 = "0zhscd3l9f5a0dn1zbc60p101s8447qjsjxhwivbpdyryl14ydqw";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };

  coq-thirdparty = buildVimPluginFrom2Nix {
    pname = "coq.thirdparty";
-    version = "2022-11-01";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.thirdparty";
-      rev = "eb27fa28ab08dfaf8911d0ac7f1196d8bc0290cc";
-      sha256 = "04ylxsg8xkc7ca4gj4j1r86wagjb8b8vhqwwjxan66igr6lhy2m0";
+      rev = "079553e07ac79f6416e7751d388e90849d9f2e91";
+      sha256 = "0aw779wcsak7ypq24kjras9bq3ynvxkl7s3mrn26ddpkcdrpkdlz";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
  };
@ -2047,12 +2047,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2022-11-01";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "0fefc00e9082b9e80345dc7805b146a25773ac2f";
-      sha256 = "1ffiyqz8yqq26v81sblgn1rf6f0nxsvlqcz3ag7bxlps24fdq48x";
+      rev = "f1668e780b4fbc199ceac58ccba38be5fd5fe7c6";
+      sha256 = "0qyam08y3j7z37iaajah2micq82a0jsl17qv4fjd7a2hamchzgcc";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2613,12 +2613,12 @@ final: prev:

  dracula-nvim = buildVimPluginFrom2Nix {
    pname = "dracula.nvim";
-    version = "2022-10-31";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "Mofiqul";
      repo = "dracula.nvim";
-      rev = "09cbd3d9434c781674fafe4da03d616e35a49d51";
-      sha256 = "06wan9q59bisd9sfdvh8rmw8vj1ahxa87r35gywlkask2jjzq83b";
+      rev = "7ff76dd8248efeabb322fec87b22d33c129536fe";
+      sha256 = "1g94pxa1frc5ym506vdvfpsk7qby2wzhdv3fby5c09a1vnkz7npz";
    };
    meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
  };
@ -2666,7 +2666,7 @@ final: prev:
      owner = "editorconfig";
      repo = "editorconfig-vim";
      rev = "6bba2596601086ddfc882488b1444bf1ea43aab9";
-      sha256 = "02a8v3z8kla7fsirl6lqk9ijj51flhn3mwb4dsc47k4fnpxr4qcp";
+      sha256 = "16a1c1k9q6db99i0s7rm3j0g6wci8x41y71ky04hb9khqkzv3xm8";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@ -2872,7 +2872,7 @@ final: prev:
      owner = "andviro";
      repo = "flake8-vim";
      rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994";
-      sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3";
+      sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/andviro/flake8-vim/";
@ -3455,12 +3455,12 @@ final: prev:

  haskell-tools-nvim = buildVimPluginFrom2Nix {
    pname = "haskell-tools.nvim";
-    version = "2022-11-01";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "haskell-tools.nvim";
-      rev = "249bf253c58b9e70d24a02c5231a75f69d170abe";
-      sha256 = "0qyfy5ll3rj1svp0ahbq1f3l3ywk02wm5b2d58ccgw6zfcwndm4y";
+      rev = "f7fa54b4efec69fb0fe5379a2d42baed4629ae76";
+      sha256 = "07h0mbaxxkpsp0549dd366249pql58yvns1ip4y5jndzq1164c1r";
    };
    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
  };
@ -3960,24 +3960,24 @@ final: prev:

  lazy-lsp-nvim = buildVimPluginFrom2Nix {
    pname = "lazy-lsp.nvim";
-    version = "2022-10-20";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "dundalek";
      repo = "lazy-lsp.nvim";
-      rev = "20f66b6a1ce6b22b3c02d0f53c15dfa7c6a9f3c8";
-      sha256 = "1yigp01qk2ljzb5sskgqic7igxwa4q8rkg4ga9czb3w4f84kpb09";
+      rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9";
+      sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga";
    };
    meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
  };

  lazygit-nvim = buildVimPluginFrom2Nix {
    pname = "lazygit.nvim";
-    version = "2022-10-25";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "kdheepak";
      repo = "lazygit.nvim";
-      rev = "c7a8bfb6062e57f3f7cc735720893f2706e6fc8e";
-      sha256 = "1hn6llvqbmghjjygy9vwx3y31sra647f3ys9626c5zn4x7a09kgh";
+      rev = "56045b4a0d8fa7bfee37411267ca5c6d3c1fe789";
+      sha256 = "1xpq3adm1d1dpfns2p3abm111dschwjqqns7c55f2biig9f3lapl";
    };
    meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
  };
@ -4584,12 +4584,12 @@ final: prev:

  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
-    version = "2022-10-30";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "3d6128b8f7c90ef8cdb0ebb7ea2f96544fa8d060";
-      sha256 = "1y514ysh0jgx9bjh5mcnmiic4m9jzz0w2jmlsf9n42hpazbi6z22";
+      rev = "993e8d200ff6d2a354e717b2beb7b31bd91b2ee4";
+      sha256 = "02gbnc28bg9sjhjmclwrkf2nh3spqibhan0xy0qdnlswms2cpp6s";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -4956,12 +4956,12 @@ final: prev:

  neodev-nvim = buildVimPluginFrom2Nix {
    pname = "neodev.nvim";
-    version = "2022-11-01";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "d9d2afc71ad32ed1edb2feecfa7c5b30ce78583a";
-      sha256 = "0bgfq9lihw77x9xyfizi0p5ixf7nx0spn4v3y1469mkmgab9zfm1";
+      rev = "d41f7e1713f3421c3c8f71c3fe4a026084227a5d";
+      sha256 = "17ffq90vhy5w42h3vqczlxpvj7vxl5sznhbbmlf90psl3s1f20sf";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };
@ -4980,12 +4980,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2022-10-27";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "TimUntersberger";
      repo = "neogit";
-      rev = "1acb13c07b34622fe1054695afcecff537d9a00a";
-      sha256 = "1wihkwfqhxvaxazn2wsd18jh8qd9cc2rc1m0rd2bw3ywm7jm24aw";
+      rev = "71651625b0cccb95bd1ae152d26bcf26d96e5182";
+      sha256 = "06xiqy490jxiayabi135c01vmpvbqm55c20lzczms1f2zcrblkny";
    };
    meta.homepage = "https://github.com/TimUntersberger/neogit/";
  };
@ -5100,24 +5100,24 @@ final: prev:

  neotest = buildVimPluginFrom2Nix {
    pname = "neotest";
-    version = "2022-10-27";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "nvim-neotest";
      repo = "neotest";
-      rev = "0be9899e859da147ad28c23a30a1df2081c16741";
-      sha256 = "08f7d8w82jk5jd2w4wrh8x4gyw0msv7m82cpzd1ahijg917818pd";
+      rev = "7721205f6b8afc0dc6fa6f1f79d228c3714d6b0e";
+      sha256 = "1xldwbmhdm05iimxjsdw03j4xbhf46ia075zqyp6x5zz9gdvcqd0";
    };
    meta.homepage = "https://github.com/nvim-neotest/neotest/";
  };

  neotest-haskell = buildVimPluginFrom2Nix {
    pname = "neotest-haskell";
-    version = "2022-10-29";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "neotest-haskell";
-      rev = "550815b39a306dddffd133c29a9f8a4907ef4f1a";
-      sha256 = "1zxlqqn490sahv3kp0hkxwqmy1a5wm4qixs4gn67vd5xl2d1jprh";
+      rev = "74b10216995909d442ce9ffb966ae3194a6da319";
+      sha256 = "184aw9vdvahcxmnhq787yh8861ai1xsai784zfkgzz1pg4s7rvbk";
    };
    meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
  };
@ -5364,12 +5364,12 @@ final: prev:

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2022-10-26";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "f1add2302e6a01531a007c51054392d2029dbed4";
-      sha256 = "050lx51x28msshjr4cq04l93brlswbx9w3kzdp35q7mxfmcr6cyg";
+      rev = "1ac465b1617b28f753cb875d8ac1d0f23c0b96d4";
+      sha256 = "1f67d5ban0k1902363k3arkfpwkgqj6w1plnxnn11w1w5y3kvj9d";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -5424,12 +5424,12 @@ final: prev:

  nvim-base16 = buildVimPluginFrom2Nix {
    pname = "nvim-base16";
-    version = "2022-11-01";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "RRethy";
      repo = "nvim-base16";
-      rev = "a1010173d1cf2fa719618644c2373611ea379402";
-      sha256 = "17pwi0haqj7f4d81i148y5p6k5fczj6898p828gjxjm5f0blk2pj";
+      rev = "bd172d833538c48bd3d589fbc8bc2f3a395ecc7b";
+      sha256 = "1h9d127s9w7qiq54596wsdgjbmhxvd7ik055n923wr4r84087vcn";
    };
    meta.homepage = "https://github.com/RRethy/nvim-base16/";
  };
@ -5616,12 +5616,12 @@ final: prev:

  nvim-dap-ui = buildVimPluginFrom2Nix {
    pname = "nvim-dap-ui";
-    version = "2022-10-27";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "rcarriga";
      repo = "nvim-dap-ui";
-      rev = "f889edb4f2b7fafa2a8f8101aea2dc499849b2ec";
-      sha256 = "18fi54hfybbywyafk0ik2bvgrl99i605qcs49i1a8gw3d6qx8zy1";
+      rev = "6a8271505e95913b82305eff63406ef22baad778";
+      sha256 = "139qh9m28zv11xy9rjplpwb4r7g4slxcwwfzvha53bzpshn0w2v6";
    };
    meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
  };
@ -5808,12 +5808,12 @@ final: prev:

  nvim-lint = buildVimPluginFrom2Nix {
    pname = "nvim-lint";
-    version = "2022-10-31";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-lint";
-      rev = "82f43b518460ff4e29f6b3b2b29018012cfd1a83";
-      sha256 = "17ibqbpslzgccpv447dj7cjyysyhqr4nxysyi383k1rl4a46ksb4";
+      rev = "56b6d3729e13c049901e0aa1bbea1b71e97b0cda";
+      sha256 = "05j1r3lnq4955xlmhhkjf21qyyv6gj8xrsh61b5r8ys0m74ahx98";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
  };
@ -5904,12 +5904,12 @@ final: prev:

  nvim-navic = buildVimPluginFrom2Nix {
    pname = "nvim-navic";
-    version = "2022-10-29";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "smiteshp";
      repo = "nvim-navic";
-      rev = "eebc4f15132c587c52fcd2ce2f0da78fc19a16c0";
-      sha256 = "1pwshw6r90ycc315f0savp2iid4rchqplphq9ms36nb4x36894mq";
+      rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0";
+      sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip";
    };
    meta.homepage = "https://github.com/smiteshp/nvim-navic/";
  };
@ -6072,12 +6072,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2022-11-01";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "e7bdcee167ae41295a3e99ad460ae80d2bb961d7";
-      sha256 = "1h2aab3zgw4q48pllx211kxqaa47ridfa8w610jb0594sqwhfynx";
+      rev = "58f61e563fadd1788052586f4d6869a99022df3c";
+      sha256 = "075645lkq6cr22kfab4kz7ay1cf5r0bg41r3nbhpdb52g1klrz5k";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -6312,12 +6312,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2022-10-28";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "62b12ba06cb617fdccfd1553f864e6492dcff2fa";
-      sha256 = "1kvnycwid2s7iabaql3iwlin4n88czm56d0qd12hhz2sa6jrriy9";
+      rev = "7610bd6b4d4a6e8b4de5c8c8d81f25de2682a7ab";
+      sha256 = "07n36hlyavan02l7jf96lhkm629gkjc7d7lr6lc1fsibqzwfdxa2";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -6372,12 +6372,12 @@ final: prev:

  orgmode = buildVimPluginFrom2Nix {
    pname = "orgmode";
-    version = "2022-10-23";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "nvim-orgmode";
      repo = "orgmode";
-      rev = "2479971860e1237e4f0dafb6cbf412dfc8a3d89c";
-      sha256 = "1bjxmlrjpgsc70yjphb8y0mkyyy3amk49j4jsbjyh2qzdfh4bghs";
+      rev = "da9a0cf060ccb27927f234a74714a74277c858f1";
+      sha256 = "0glps3xlg2pd1gwzmpwvrq3ylcw4mzjwgdq4agdjjl6bh41vdjdq";
    };
    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
  };
@ -6642,7 +6642,7 @@ final: prev:
      owner = "python-mode";
      repo = "python-mode";
      rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603";
-      sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw";
+      sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/python-mode/python-mode/";
@ -6662,12 +6662,12 @@ final: prev:

  pywal-nvim = buildVimPluginFrom2Nix {
    pname = "pywal.nvim";
-    version = "2022-09-11";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "AlphaTechnolog";
      repo = "pywal.nvim";
-      rev = "c10ea0b90bc049f882517a65fedbef18ba8f8511";
-      sha256 = "1irbzhw1yrds80sncqadz7d2k9xr66h3zs8pnx0malfpvgs41fyk";
+      rev = "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9";
+      sha256 = "00lfnbaw83iic68mvlgj75qp384g3xa5mjdhw2xmhnapghjgyv14";
    };
    meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/";
  };
@ -6806,12 +6806,12 @@ final: prev:

  registers-nvim = buildVimPluginFrom2Nix {
    pname = "registers.nvim";
-    version = "2022-11-01";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "tversteeg";
      repo = "registers.nvim";
-      rev = "395e119782845fe8fa3b7d6d17c60745a2004515";
-      sha256 = "0lxfs4rvnvgc7qmcyqspgza70m66khck57fx80v4d6whz9c5ncav";
+      rev = "cacd595e794451ce2836539cff6ce0c0c45db046";
+      sha256 = "19cwkwmbb626972k8svhm04aiqw174q953bsqxsx72d5sscaisss";
    };
    meta.homepage = "https://github.com/tversteeg/registers.nvim/";
  };
@ -6830,12 +6830,12 @@ final: prev:

  rest-nvim = buildNeovimPluginFrom2Nix {
    pname = "rest.nvim";
-    version = "2022-09-24";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "rest-nvim";
      repo = "rest.nvim";
-      rev = "4a23d38726c0b3c5a2de9f927de5b0b518bdf4f7";
-      sha256 = "10s74zwpr9wnnwjvh079g1k9ffnjpbzpxazwbpr55z9ln02sc2vs";
+      rev = "3d4bec4754b41fa1d1a2fe145cdcf3b269b3323a";
+      sha256 = "0znrslxik741p8cncf60iii3v9x7ln629wixvm0cm4c6g1mk0x4x";
    };
    meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
  };
@ -7312,12 +7312,12 @@ final: prev:

  srcery-vim = buildVimPluginFrom2Nix {
    pname = "srcery-vim";
-    version = "2022-06-08";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "srcery-colors";
      repo = "srcery-vim";
-      rev = "0ff514ff249d0e6b6cc4702d6606f196e3827fc8";
-      sha256 = "0l5j9y414nxxiw0vxcygxfd09hn1wbwh3d6a735n6n3kn3z42ww5";
+      rev = "cdb0bc36fda80eb58d38ecddfb1c7b2fab3a4d53";
+      sha256 = "0x055kynvxym614vzxi1vv2zcndfadzjhwk92f4h6z5zvld7fpxj";
    };
    meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
  };
@ -7505,12 +7505,12 @@ final: prev:

  tabby-nvim = buildVimPluginFrom2Nix {
    pname = "tabby.nvim";
-    version = "2022-10-17";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "nanozuki";
      repo = "tabby.nvim";
-      rev = "18c8effd11f801793e1a8b9adb4d6ef7fbedf57b";
-      sha256 = "0r68260gc5ln2z338mm7xb4v4y3p8xzkx1wlwagqp35dhgrl2kpn";
+      rev = "1718f42d4044ce612091fd7a7bff0dc7313ff5b8";
+      sha256 = "01p7fkhflv23slsr54j7b4cvz0bl2nwn6x0zq1c373cjq3zq2x5a";
    };
    meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
  };
@ -7546,7 +7546,7 @@ final: prev:
      owner = "codota";
      repo = "tabnine-vim";
      rev = "e27face391a4d9a3e43ff251010f77deddf0c88d";
-      sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq";
+      sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/codota/tabnine-vim/";
@ -7795,12 +7795,12 @@ final: prev:

  telescope-manix = buildVimPluginFrom2Nix {
    pname = "telescope-manix";
-    version = "2022-10-19";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "telescope-manix";
-      rev = "9f91408328be8719ca1f6c49a3ccc1df6392d5e9";
-      sha256 = "03wkgmwq3fl92bd4d33ahfp328pdwcmpw0pcjqf9cfaplpi0fzk2";
+      rev = "700279d1d8bc0267404672d2927b522e7ca87ee3";
+      sha256 = "0d10lci5wf84wlixxqnrhn3frl735s5jmzg2yz2l79h37k84xydl";
    };
    meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
  };
@ -8120,12 +8120,12 @@ final: prev:

  toggleterm-nvim = buildVimPluginFrom2Nix {
    pname = "toggleterm.nvim";
-    version = "2022-10-26";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "toggleterm.nvim";
-      rev = "8f302c9a05ff53fc3f891cbf09c5f959b10392a3";
-      sha256 = "1nvq4zridnz0pr9j9ivcl4b5w8srli8szhjy6ry22vw9c5xllzx3";
+      rev = "3ba683827c623affb4d9aa518e97b34db2623093";
+      sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41";
    };
    meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
  };
@ -8744,12 +8744,12 @@ final: prev:

  vim-airline-themes = buildVimPluginFrom2Nix {
    pname = "vim-airline-themes";
-    version = "2022-09-26";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "vim-airline";
      repo = "vim-airline-themes";
-      rev = "cc5d3490c8f4c87d29d97df414941a9df8ceb390";
-      sha256 = "13lslv7rr3ixcjgkklds2zsk9b0p9sx9lpl3fwzdnkcgh1x91vn8";
+      rev = "5552f5e9aa1db1b8d588b9a645a88394452d2b05";
+      sha256 = "0bzspa5mrhs52x9q6kxkwbxvqg79myim15jg35rf517sraga5v8s";
    };
    meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
  };
@ -9824,12 +9824,12 @@ final: prev:

  vim-floaterm = buildVimPluginFrom2Nix {
    pname = "vim-floaterm";
-    version = "2022-10-30";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "voldikss";
      repo = "vim-floaterm";
-      rev = "20cbfc777b783fd93259c83c96eef4a35c6ddbcd";
-      sha256 = "02zwq4hq7zpqhmkir16bms8agvydc6fy51sgw6ycqib0hvsb34cd";
+      rev = "280b34a0760801168a67f952542b6c49292aa5f3";
+      sha256 = "19hb8bqkk6iqy8lm4gs6kiiw6igjjyvazw9fx6gnmf86pkajk3cw";
    };
    meta.homepage = "https://github.com/voldikss/vim-floaterm/";
  };
@ -10341,12 +10341,12 @@ final: prev:

  vim-illuminate = buildVimPluginFrom2Nix {
    pname = "vim-illuminate";
-    version = "2022-11-01";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "RRethy";
      repo = "vim-illuminate";
-      rev = "7a4eccd0fffe8b5dd14ad0d0400d3eab6d80c4b3";
-      sha256 = "0a0d16vjr23a3q6mmz653xn1hmnd7h8dbkldvmsr4dx0spqfydp8";
+      rev = "fb83d835eac50baeef49aac20c524a80727db0ac";
+      sha256 = "0xk5hhsb3gv3yrfcr3gnxj9g9bcdab8nlfi06q5c7nqgy4fryp6n";
    };
    meta.homepage = "https://github.com/RRethy/vim-illuminate/";
  };
@ -10810,12 +10810,12 @@ final: prev:

  vim-maktaba = buildVimPluginFrom2Nix {
    pname = "vim-maktaba";
-    version = "2022-10-31";
+    version = "2022-11-02";
    src = fetchFromGitHub {
      owner = "google";
      repo = "vim-maktaba";
-      rev = "88ad116a4b2b4777ce4d0ecf214963a0c9b4fd06";
-      sha256 = "07mhpr326rjfh47izx4c9hdkb5zhpbl01k0h4bbi1lxbzvsxgs9k";
+      rev = "5d416e84d024538f5e5cf25c394d081802f0a35e";
+      sha256 = "13filvmaxr0dvc44f3ah80g8jhkrn3rqkwqj1a7wxjv6a6xa083z";
    };
    meta.homepage = "https://github.com/google/vim-maktaba/";
  };
@ -12854,12 +12854,12 @@ final: prev:
    pname = "vim-yapf";
    version = "2018-10-04";
    src = fetchFromGitHub {
-      owner = "mindriot101";
+      owner = "simonrw";
      repo = "vim-yapf";
      rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad";
      sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80";
    };
-    meta.homepage = "https://github.com/mindriot101/vim-yapf/";
+    meta.homepage = "https://github.com/simonrw/vim-yapf/";
  };

  vim2hs = buildVimPluginFrom2Nix {
@ -13021,12 +13021,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2022-10-31";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "e148cf1fdc817b6668263817634538d09bafd115";
-      sha256 = "15iikf6w8x75g7wjdp469rsxraz883387cxlahc0zsl0bdbylv5q";
+      rev = "06c47edcc2c44c1ca87a2c04a411cf0c0bd39a14";
+      sha256 = "0gkq4j2cwc6a4mhhyd3ivkc5qj6m9p4jg469za4v5g1v59w22pch";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -13382,11 +13382,11 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2022-10-31";
+    version = "2022-11-03";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "c4f0f1a88304378cb76ac0a0c00a99f6d58f972f";
+      rev = "72540852ca00d7842ea1123635aecb9353192f0b";
      sha256 = "0mb3qhg5aaxvkc8h95sbwg5nm89w719l9apymc5rpmis4r0mr5zg";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
@ -13406,12 +13406,12 @@ final: prev:

  chad = buildVimPluginFrom2Nix {
    pname = "chad";
-    version = "2022-11-01";
+    version = "2022-11-04";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "d7b2c15268ffbb4dedebbda34b702c89b2cd782a";
-      sha256 = "1r53lz0vmfii82mchh0hlzs0zg7d7sjxiihv2bwlapwzwmdp2n4k";
+      rev = "5ec88a8374cd7e2564ffeaa27f82dd75229312d2";
+      sha256 = "1swic358xzzmw0pxp7x2r35yf70ivbg83fljk8p3qi7s9pr0ngr8";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -25,12 +25,12 @@
  };
  bash = buildGrammar {
    language = "bash";
-    version = "f1a86d3";
+    version = "77cf8a7";
    source = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-bash";
-      rev = "f1a86d3cc5aeeb67e0e52442e893af7f813025b4";
-      hash = "sha256-zzHA+kGw67WFyPVFRWRyKmhAjxp5jkv0K2yhGxNfFM4=";
+      rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b";
+      hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY=";
    };
  };
  beancount = buildGrammar {
@ -503,12 +503,12 @@
  };
  help = buildGrammar {
    language = "help";
-    version = "8df3266";
+    version = "49cdef5";
    source = fetchFromGitHub {
      owner = "neovim";
      repo = "tree-sitter-vimdoc";
-      rev = "8df3266b423d24c9ac3f3b4b9928e65eb1e5e741";
-      hash = "sha256-t9SHuymK5pYlryWGpORGPYLgPZ3xBx0XH69s5RtRnEI=";
+      rev = "49cdef52ded4a886bf34bc474876b09f9270d48f";
+      hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc=";
    };
  };
  hjson = buildGrammar {
@ -633,22 +633,22 @@
  };
  julia = buildGrammar {
    language = "julia";
-    version = "0572ceb";
+    version = "8fb38ab";
    source = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-julia";
-      rev = "0572cebf7b8e8ef5990b4d1e7f44f0b36f62922c";
-      hash = "sha256-hN3wZJa7oXEUgdJfN0o2EoTYBsE1UZjGYfFYlGjjvO8=";
+      rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25";
+      hash = "sha256-G619Zlb2uL2PskYKNqoG6XXBxRipeGFU4eOLw7u3BRo=";
    };
  };
  kotlin = buildGrammar {
    language = "kotlin";
-    version = "a4f71eb";
+    version = "b953dbd";
    source = fetchFromGitHub {
      owner = "fwcd";
      repo = "tree-sitter-kotlin";
-      rev = "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569";
-      hash = "sha256-aRMqhmZKbKoggtBOgtFIq0xTP+PgeD3Qz6DPJsAFPRQ=";
+      rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28";
+      hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY=";
    };
  };
  lalrpop = buildGrammar {
@ -693,12 +693,12 @@
  };
  lua = buildGrammar {
    language = "lua";
-    version = "887dfd4";
+    version = "fb30e8c";
    source = fetchFromGitHub {
      owner = "MunifTanjim";
      repo = "tree-sitter-lua";
-      rev = "887dfd4e83c469300c279314ff1619b1d0b85b91";
-      hash = "sha256-5i+UN6Es+K7KDD1qz3ZrVn8IfGdTswcISUyV2sGtY9M=";
+      rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320";
+      hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI=";
    };
  };
  m68k = buildGrammar {
@ -731,7 +731,6 @@
      hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
    };
    location = "tree-sitter-markdown";
-
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
@ -743,7 +742,6 @@
      hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
    };
    location = "tree-sitter-markdown-inline";
-
  };
  menhir = buildGrammar {
    language = "menhir";
@ -815,7 +813,6 @@
      hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM=";
    };
    location = "ocaml";
-
  };
  ocaml_interface = buildGrammar {
    language = "ocaml_interface";
@ -827,7 +824,6 @@
      hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM=";
    };
    location = "interface";
-
  };
  ocamllex = buildGrammar {
    language = "ocamllex";
@ -983,12 +979,12 @@
  };
  racket = buildGrammar {
    language = "racket";
-    version = "b9b2e74";
+    version = "69ca563";
    source = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-racket";
-      rev = "b9b2e7454d7098e44595dd8c1b471b9d1518b910";
-      hash = "sha256-DxwbIhyCx+E0kDztPQFBa9x65ssKzsMh7vY+TpP3dTM=";
+      rev = "69ca563af3bcf9d67220532e0814786f2dc34db1";
+      hash = "sha256-GLBi/NM7dFsPtmZWbFm/vM0gOwqbihOqXnxMR5k8hWE=";
    };
  };
  rasi = buildGrammar {
@ -1043,12 +1039,12 @@
  };
  ruby = buildGrammar {
    language = "ruby";
-    version = "252ca18";
+    version = "c919603";
    source = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-ruby";
-      rev = "252ca18be76b0918fb6b34c302292b6931876c25";
-      hash = "sha256-8UWHLVrSxQM6iT+tN+2PwTs43n+Z69c0DVnDE3yfqKo=";
+      rev = "c91960320d0f337bdd48308a8ad5500bd2616979";
+      hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE=";
    };
  };
  rust = buildGrammar {
@ -1123,12 +1119,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "2743c7b";
+    version = "70c5026";
    source = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f";
-      hash = "sha256-lhQxFXphS97tITDosG/pGe85osV4CweW44ulmCd+CxQ=";
+      rev = "70c50264ae022193adb364ffa7a767d765ed9857";
+      hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs=";
    };
  };
  supercollider = buildGrammar {
@ -1163,14 +1159,14 @@
  };
  swift = buildGrammar {
    language = "swift";
-    version = "c88b5d7";
+    version = "d7808f0";
    source = fetchFromGitHub {
      owner = "alex-pinkus";
      repo = "tree-sitter-swift";
      nativeBuildInputs = [ nodejs tree-sitter ];
      postFetch = "pushd $out && tree-sitter generate && popd";
-      rev = "c88b5d73f193f5b0762b1a5f0299a275e6a728fb";
-      hash = "sha256-OfFMGxL72SPZW4AtHoThhYtjmKWabStLKAB9TxmjMDw=";
+      rev = "d7808f030a44dc8768948042baa7566949785e2f";
+      hash = "sha256-7Gjpf2isOpeOV3ZMTMibK+F4C4v8ywOPin2Wv86s+AM=";
    };
  };
  sxhkdrc = buildGrammar {
@ -1245,7 +1241,6 @@
      hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8=";
    };
    location = "tsx";
-
  };
  turtle = buildGrammar {
    language = "turtle";
@ -1259,12 +1254,12 @@
  };
  twig = buildGrammar {
    language = "twig";
-    version = "6a01f20";
+    version = "035f549";
    source = fetchFromGitHub {
      owner = "gbprod";
      repo = "tree-sitter-twig";
-      rev = "6a01f20e73038300d205d370212c361949be3035";
-      hash = "sha256-M+57mGl4Sgn0yUGAyxHxE6ShR+E/ki4m8/x/f/KHetA=";
+      rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91";
+      hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20=";
    };
  };
  typescript = buildGrammar {
@ -1277,7 +1272,6 @@
      hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8=";
    };
    location = "typescript";
-
  };
  v = buildGrammar {
    language = "v";
@ -1289,7 +1283,6 @@
      hash = "sha256-d1NeZixsN9992Q1UC5ZKGN4LNxlsvdL91QW2K8d1J9Y=";
    };
    location = "tree_sitter_v";
-
  };
  vala = buildGrammar {
    language = "vala";
@ -1313,12 +1306,12 @@
  };
  vim = buildGrammar {
    language = "vim";
-    version = "9736af8";
+    version = "4ae7bd6";
    source = fetchFromGitHub {
      owner = "vigoux";
      repo = "tree-sitter-viml";
-      rev = "9736af8ef0a7f20b4c45f6474342c8f5b473e2cc";
-      hash = "sha256-cptSrA+EOfntdW9V8qt3pg3PUK7uSwex7OS4XVnwItI=";
+      rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f";
+      hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA=";
    };
  };
  vue = buildGrammar {
@ -1363,12 +1356,12 @@
  };
  zig = buildGrammar {
    language = "zig";
-    version = "b1803f2";
+    version = "d90d38d";
    source = fetchFromGitHub {
      owner = "maxxnino";
      repo = "tree-sitter-zig";
-      rev = "b1803f2a665d228f968a831eac4fcc07a377c7bc";
-      hash = "sha256-WLfecfqwCNh/IPPfmZ55XgsY6cLv62ad0Xhh9pUW3nw=";
+      rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca";
+      hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A=";
    };
  };
 }
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@ -3,11 +3,31 @@
 self: super:

 let
-  builtGrammars = callPackage ./generated.nix {
+  generatedGrammars = callPackage ./generated.nix {
    buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { };
  };

-  allGrammars = lib.filter lib.isDerivation (lib.attrValues builtGrammars);
+  generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
+
+  # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins`
+  # for example, for ocaml_interface, the following aliases will be added
+  #   ocaml-interface
+  #   tree-sitter-ocaml-interface
+  #   tree-sitter-ocaml_interface
+  builtGrammars = generatedGrammars // lib.listToAttrs
+    (lib.concatLists (lib.mapAttrsToList
+      (k: v:
+        let
+          replaced = lib.replaceStrings [ "_" ] [ "-" ] k;
+        in
+        map (lib.flip lib.nameValuePair v)
+          ([ ("tree-sitter-${k}") ] ++ lib.optionals (k != replaced) [
+            replaced
+            "tree-sitter-${replaced}"
+          ]))
+      generatedDerivations));
+
+  allGrammars = lib.attrValues generatedDerivations;

  # Usage:
  # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
@ -34,5 +54,7 @@ in

    withAllGrammars = withPlugins (_: allGrammars);
  };
+
+  meta.maintainers = with lib.maintainers; [ figsoda ];
 }

--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
@ -4,10 +4,10 @@
 import json
 import re
 import subprocess
-from os import getenv
+from os import environ
 from os.path import dirname, join

-lockfile = json.load(open(join(getenv("NVIM_TREESITTER"), "lockfile.json")))
+lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json")))

 configs = json.loads(
    subprocess.check_output(
@ -98,8 +98,7 @@ def generate_grammar(item):
    location = info.get("location")
    if location:
        generated += f"""
-    location = "{location}";
-"""
+    location = "{location}";"""

    generated += """
  };
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1244,10 +1244,16 @@ let
          mktplcRef = {
            publisher = "github";
            name = "copilot";
-            version = "1.46.6822";
-            sha256 = "sha256-L71mC0190ZubqNVliu7es4SDsBTGVokePpcNupABI8Q=";
+            version = "1.56.7152";
+            sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM=";
+          };
+          meta = with lib; {
+            description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor.";
+            downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot";
+            homepage = "https://github.com/features/copilot";
+            license = licenses.unfree;
+            maintainers = with maintainers; [ Zimmi48 ];
          };
-          meta = { license = lib.licenses.unfree; };
        };

        github-vscode-theme = buildVscodeMarketplaceExtension {
@ -1679,6 +1685,22 @@ let
        };
      };

+      maximedenes.vscoq = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          publisher = "maximedenes";
+          name = "vscoq";
+          version = "0.3.6";
+          sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek=";
+        };
+        meta = with lib; {
+          description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant.";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=maximedenes.vscoq";
+          homepage = "https://github.com/coq-community/vscoq";
+          license = licenses.mit;
+          maintainers = with maintainers; [ Zimmi48 ];
+        };
+      };
+
      mhutchie.git-graph = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "git-graph";
@ -2465,8 +2487,8 @@ let
        mktplcRef = {
          name = "code-spell-checker";
          publisher = "streetsidesoftware";
-          version = "2.10.1";
-          sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0=";
+          version = "2.11.0";
+          sha256 = "sha256-ZYbkCe/FdSxmipV9TTq0AF/Ft01+LTUeo3sVyKMP3iQ=";
        };
        meta = with lib; {
          changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
--- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix
@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "jupyter";
    publisher = "ms-toolsai";
-    version = "2022.5.1001411044";
-    sha256 = "0z6i7a5sba42yc2inp3yvw6lm6m0kings2iv18h4d6zyhm2lb61p";
+    version = "2022.9.1202862440";
+    sha256 = "sha256-0F6eTEXt0PJY0+1o/qZEuUcD9sjHSnUrI1OS4IO2WLc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/editors/vscode/extensions/python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/python/default.nix
@ -19,8 +19,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
  mktplcRef = {
    name = "python";
    publisher = "ms-python";
-    version = "2022.15.12711056";
-    sha256 = "sha256-bksUMN+ZdkmElVD8BC4ihklQyWlKkcpep2VOwUzISnQ=";
+    version = "2022.17.13011006";
+    sha256 = "sha256-f5vbXcqKwCnL+vsTcOX7rWUfoXNih5ZaWr3XUpCYB/M=";
  };

  buildInputs = [ icu ];
--- a/pkgs/applications/emulators/cemu/default.nix
+++ b/pkgs/applications/emulators/cemu/default.nix
@ -28,13 +28,13 @@

 stdenv.mkDerivation rec {
  pname = "cemu";
-  version = "2.0-10";
+  version = "2.0-13";

  src = fetchFromGitHub {
    owner = "cemu-project";
    repo = "Cemu";
    rev = "v${version}";
-    hash = "sha256-GJA/lJJqShuHeYirBW1kyVsU44kMpmAn916PSGOnKkY=";
+    hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM=";
  };

  patches = [
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@ -3,11 +3,11 @@
 , lib
 , fetchurl
 # native
-, autoreconfHook
+, cmake
 , pkg-config
 # not native
 , gdal
-, wxGTK31
+, wxGTK32
 , proj
 , dxflib
 , curl
@ -31,24 +31,20 @@

 mkDerivation rec {
  pname = "saga";
-  version = "7.9.1";
+  version = "8.4.0";

  src = fetchurl {
    url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
-    sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w=";
+    sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0=";
  };

+  sourceRoot = "saga-${version}/saga-gis";
+
  nativeBuildInputs = [
-    # Upstream's gnerated ./configure is not reliable
-    autoreconfHook
+    cmake
    pkg-config
  ];
-  configureFlags = [
-    "--with-system-svm"
-    # hdf is no detected otherwise
-    "HDF5_LIBS=-l${hdf5}/lib"
-    "HDF5_CFLAGS=-I${hdf5.dev}/include"
-  ];
+
  buildInputs = [
    curl
    dxflib
@ -56,7 +52,7 @@ mkDerivation rec {
    libsvm
    hdf5
    gdal
-    wxGTK31
+    wxGTK32
    proj
    libharu
    opencv
@ -77,9 +73,9 @@ mkDerivation rec {
    sqlite
  ];

-  enableParallelBuilding = true;
-
-  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
+  cmakeFlags = [
+    "-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}"
+  ];

  meta = with lib; {
    description = "System for Automated Geoscientific Analyses";
--- a/pkgs/applications/misc/free42/default.nix
+++ b/pkgs/applications/misc/free42/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "free42";
-  version = "3.0.15";
+  version = "3.0.16";

  src = fetchFromGitHub {
    owner = "thomasokken";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4=";
+    hash = "sha256-hL4Ytu9zf8x+H/TuvJ3m0E3d8gMZFIDogWEYlaOap+g=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/mangal/default.nix
+++ b/pkgs/applications/misc/mangal/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "mangal";
-  version = "3.14.2";
+  version = "4.0.1";

  src = fetchFromGitHub {
    owner = "metafates";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-W3oToI7frUfd3zwtr3UpbwAWzCVxDaZY9zhn8dO/4wA=";
+    hash = "sha256-pMiZgO/+koyIDm7ONZn0qEq+d6HeFfQFaU1Qjovqmc4=";
  };

  proxyVendor = true;
--- a/pkgs/applications/misc/moonlight-qt/default.nix
+++ b/pkgs/applications/misc/moonlight-qt/default.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "moonlight-qt";
-  version = "4.2.1";
+  version = "4.3.1";

  src = fetchFromGitHub {
    owner = "moonlight-stream";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-cDX6XiAPFIS/csVpRl7yyAexiZwjmxp1Ng9gAo1uUw8=";
+    sha256 = "sha256-Utpv9VdX5vuUWDSGc3YcF8tHbvUZpPeXEDP4NKts+vI=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@ -9,7 +9,7 @@
 , gtkmm3
 , pcre
 , swig
-, antlr4_8
+, antlr4_9
 , sudo
 , mysql
 , libxml2
@ -23,7 +23,7 @@
 , libzip
 , libsecret
 , libssh
-, python2
+, python3
 , jre
 , boost
 , libsigcxx
@ -43,14 +43,14 @@
 }:

 let
-  inherit (python2.pkgs) paramiko pycairo pyodbc;
+  inherit (python3.pkgs) paramiko pycairo pyodbc;
 in stdenv.mkDerivation rec {
  pname = "mysql-workbench";
-  version = "8.0.21";
+  version = "8.0.30";

  src = fetchurl {
    url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
-    sha256 = "0rqgr1dcbf6yp60hninbw5dnwykx5ngbyhhx0sbhgv0m0cq5a44h";
+    sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185";
  };

  patches = [
@ -67,6 +67,7 @@ in stdenv.mkDerivation rec {
      nohup = "${coreutils}/bin/nohup";
      rm = "${coreutils}/bin/rm";
      rmdir = "${coreutils}/bin/rmdir";
+      stat = "${coreutils}/bin/stat";
      sudo = "${sudo}/bin/sudo";
    })

@ -78,10 +79,12 @@ in stdenv.mkDerivation rec {
    })
  ];

-  # have it look for 4.7.2 instead of 4.7.1
+  # 1. have it look for 4.9.3 instead of 4.9.1
+  # 2. for some reason CMakeCache.txt is part of source code
  preConfigure = ''
    substituteInPlace CMakeLists.txt \
-      --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar"
+      --replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar"
+    rm -f build/CMakeCache.txt
  '';

  nativeBuildInputs = [
@ -97,8 +100,8 @@ in stdenv.mkDerivation rec {
    gtk3
    gtkmm3
    libX11
-    antlr4_8.runtime.cpp
-    python2
+    antlr4_9.runtime.cpp
+    python3
    mysql
    libxml2
    libmysqlconnectorcpp
@ -143,10 +146,10 @@ in stdenv.mkDerivation rec {
  cmakeFlags = [
    "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
    "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
-    "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}"
    # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
    # Newer versions of connector still provide the legacy library when enabled
    # but the headers are in a different location.
+    "-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}"
    "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
  ];

@ -156,7 +159,7 @@ in stdenv.mkDerivation rec {

  preFixup = ''
    gappsWrapperArgs+=(
-      --prefix PATH : "${python2}/bin"
+      --prefix PATH : "${python3}/bin"
      --prefix PROJSO : "${proj}/lib/libproj.so"
      --set PYTHONPATH $PYTHONPATH
    )
--- a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch
+++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch
@ -1,6 +1,7 @@
--- a/frontend/linux/workbench/mysql-workbench.in
-+++ b/frontend/linux/workbench/mysql-workbench.in
-@@ -99,8 +99,8 @@
+diff -u -r a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
+--- a/frontend/linux/workbench/mysql-workbench.in	2022-03-25 09:06:06.000000000 +0200
+++ b/frontend/linux/workbench/mysql-workbench.in	2022-06-17 00:22:51.290117109 +0300
+@@ -100,8 +100,8 @@
 if test "$WB_DEBUG" != ""; then
   $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
 else
@ -11,8 +12,9 @@
   else
   $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
   fi
--- a/plugins/migration/frontend/migration_bulk_copy_data.py
-+++ b/plugins/migration/frontend/migration_bulk_copy_data.py
+diff -u -r a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/migration/frontend/migration_bulk_copy_data.py
+--- a/plugins/migration/frontend/migration_bulk_copy_data.py	2022-03-25 09:06:06.000000000 +0200
+++ b/plugins/migration/frontend/migration_bulk_copy_data.py	2022-06-17 00:13:29.430055453 +0300
@@ -110,7 +110,7 @@
         return 'sh'
 
@ -34,7 +36,7 @@
@@ -417,7 +417,7 @@
     
         with open(script_path, 'w+') as f:
-             os.chmod(script_path, 0700)
+             os.chmod(script_path, 0o700)
 -            f.write('#!/bin/bash\n\n')
 +            f.write('#!/usr/bin/env bash\n\n')
             f.write('MYPATH=`pwd`\n')
@ -43,14 +45,15 @@
@@ -521,7 +521,7 @@
     
         with open(script_path, 'w+') as f:
-             os.chmod(script_path, 0700)
+             os.chmod(script_path, 0o700)
 -            f.write('#!/bin/bash\n\n')
 +            f.write('#!/usr/bin/env bash\n\n')
             f.write('MYPATH=`pwd`\n')
             
             f.write("arg_source_password=\"<put source password here>\"\n")
--- a/plugins/wb.admin/backend/wb_server_control.py
-+++ b/plugins/wb.admin/backend/wb_server_control.py
+diff -u -r a/plugins/wb.admin/backend/wb_server_control.py b/plugins/wb.admin/backend/wb_server_control.py
+--- a/plugins/wb.admin/backend/wb_server_control.py	2022-03-25 09:06:06.000000000 +0200
+++ b/plugins/wb.admin/backend/wb_server_control.py	2022-06-17 00:14:26.937905324 +0300
@@ -39,7 +39,7 @@
 
 UnixVariant = {
@ -60,8 +63,9 @@
     }
 }
 
--- a/plugins/wb.admin/backend/wb_server_management.py
-+++ b/plugins/wb.admin/backend/wb_server_management.py
+diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin/backend/wb_server_management.py
+--- a/plugins/wb.admin/backend/wb_server_management.py	2022-03-25 09:06:06.000000000 +0200
+++ b/plugins/wb.admin/backend/wb_server_management.py	2022-06-17 00:18:58.034028354 +0300
@@ -40,7 +40,7 @@
 
 def reset_sudo_prefix():
@ -89,7 +93,19 @@
 
     return command
 
-@@ -896,9 +896,9 @@
+@@ -878,9 +878,9 @@
+     @useAbsPath("path")
+     def get_file_owner(self, path, as_user = Users.CURRENT, user_password = None):
+         if self.target_os == wbaOS.linux:
+-          command = 'LC_ALL=C stat -c %U '
+          command = 'LC_ALL=C @stat@ -c %U '
+         else:
+-          command = 'LC_ALL=C /usr/bin/stat -f "%Su" '
+          command = 'LC_ALL=C @stat@ -f "%Su" '
+       
+         output = io.StringIO()
+         command = command + quote_path(path)
+@@ -904,9 +904,9 @@
             if as_user == Users.CURRENT:
                 raise PermissionDeniedError("Cannot set owner of directory %s" % path)        
             else:
@ -101,43 +117,43 @@
             
         res = self.process_ops.exec_cmd(command,
                                         as_user   = as_user,
-@@ -927,7 +927,7 @@
+@@ -935,7 +935,7 @@
     @useAbsPath("path")
     def remove_directory(self, path, as_user = Users.CURRENT, user_password = None):
-         output = StringIO.StringIO()
+         output = io.StringIO()
 -        res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path),
 +        res = self.process_ops.exec_cmd('@rmdir@ ' + quote_path(path),
                                         as_user   = as_user,
                                         user_password = user_password,
                                         output_handler = output.write,
-@@ -940,7 +940,7 @@
+@@ -948,7 +948,7 @@
     @useAbsPath("path")
     def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None):
-         output = StringIO.StringIO()
+         output = io.StringIO()
 -        res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path),
 +        res = self.process_ops.exec_cmd('@rm@ -R ' + quote_path(path),
                                         as_user   = as_user,
                                         user_password = user_password,
                                         output_handler = output.write,
-@@ -953,7 +953,7 @@
+@@ -961,7 +961,7 @@
     @useAbsPath("path")
     def delete_file(self, path, as_user = Users.CURRENT, user_password = None):
-         output = StringIO.StringIO()
+         output = io.StringIO()
 -        res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path),
 +        res = self.process_ops.exec_cmd("@rm@ " + quote_path(path),
                                         as_user   = as_user,
                                         user_password = user_password,
                                         output_handler = output.write,
-@@ -1001,7 +1001,7 @@
+@@ -1009,7 +1009,7 @@
     def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None):
-         output = StringIO.StringIO()
+         output = io.StringIO()
         
 -        res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest),
 +        res = self.process_ops.exec_cmd("LC_ALL=C @cp@ " + quote_path(source) + " " + quote_path(dest),
                       as_user   = as_user,
                       user_password = user_password,
                       output_handler = output.write,
-@@ -1077,9 +1077,9 @@
+@@ -1085,9 +1085,9 @@
             # for ls -l, the output format changes depending on stdout being a terminal or not
             # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not)
             # the good news is that if the line is there, then it will always start with total, regardless of the locale
@ -147,11 +163,11 @@
 -            command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path)
 +            command = 'LC_ALL=C @ls@ -1 -p %s' % quote_path(path)
             
-         output = StringIO.StringIO()
+         output = io.StringIO()
         res = self.process_ops.exec_cmd(command,
-@@ -2160,9 +2160,9 @@
+@@ -2163,9 +2163,9 @@
     def get_range(self, start, end):
-         f = StringIO.StringIO()
+         f = io.StringIO()
         if not self._need_sudo:
 -            ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write)
 +            ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write)
@ -161,7 +177,7 @@
 
         if ret != 0:
             raise RuntimeError("Could not get data from file %s" % self.path)
-@@ -2170,9 +2170,9 @@
+@@ -2173,9 +2173,9 @@
 
     def read_task(self, offset, file):
         if not self._need_sudo:
@ -173,9 +189,9 @@
         # this will signal the reader end that there's no more data
         file.close()
 
-@@ -2198,9 +2198,9 @@
+@@ -2202,9 +2202,9 @@
         self._pos = offset
-         f = StringIO.StringIO()
+         f = io.StringIO()
         if not self._need_sudo:
 -            self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write)
 +            self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write)
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -3,10 +3,10 @@
 rec {
  firefox = buildMozillaMach rec {
    pname = "firefox";
-    version = "106.0.3";
+    version = "106.0.5";
    src = fetchurl {
      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d";
+      sha512 = "879b054340d632c5d972888ceb67da0d02f28f6755e9683c8e4e7fb71b55bde0e588b98e24bae448ffea8ddd3e30c44dc0563554ecd69506862796a64ca040d7";
    };

    # This patch could be applied anywhere (just rebuild, no effect)
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@ -166,38 +166,64 @@ let
    in stdenv.mkDerivation {
      inherit pname version;

-      desktopItem = makeDesktopItem {
+      desktopItem = makeDesktopItem ({
        name = applicationName;
        exec = "${launcherName} %U";
        inherit icon;
        desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}";
-        genericName = "Web Browser";
-        categories = [ "Network" "WebBrowser" ];
-        mimeTypes = [
-          "text/html"
-          "text/xml"
-          "application/xhtml+xml"
-          "application/vnd.mozilla.xul+xml"
-          "x-scheme-handler/http"
-          "x-scheme-handler/https"
-          "x-scheme-handler/ftp"
-        ];
+        startupNotify = true;
        startupWMClass = wmClass;
-        actions = {
-          new-window = {
-            name = "New Window";
-            exec = "${launcherName} --new-window %U";
-          };
-          new-private-window = {
-            name = "New Private Window";
-            exec = "${launcherName} --private-window %U";
-          };
-          profile-manager-window = {
-            name = "Profile Manager";
-            exec = "${launcherName} --ProfileManger";
-          };
-        };
-      };
+        terminal = false;
+      } // (if libName == "thunderbird"
+            then {
+              genericName = "Email Client";
+              comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars.";
+              categories = [
+                "Network" "Chat" "Email" "Feed" "GTK" "News"
+              ];
+              keywords = [
+                "mail" "email" "e-mail" "messages" "rss" "calendar"
+                "address book" "addressbook" "chat"
+              ];
+              mimeTypes = [
+                "message/rfc822"
+                "x-scheme-handler/mailto"
+                "text/calendar"
+                "text/x-vcard"
+              ];
+              actions = {
+                profile-manager-window = {
+                  name = "Profile Manager";
+                  exec = "${launcherName} --ProfileManger";
+                };
+              };
+            }
+            else {
+              genericName = "Web Browser";
+              categories = [ "Network" "WebBrowser" ];
+              mimeTypes = [
+                "text/html"
+                "text/xml"
+                "application/xhtml+xml"
+                "application/vnd.mozilla.xul+xml"
+                "x-scheme-handler/http"
+                "x-scheme-handler/https"
+              ];
+              actions = {
+                new-window = {
+                  name = "New Window";
+                  exec = "${launcherName} --new-window %U";
+                };
+                new-private-window = {
+                  name = "New Private Window";
+                  exec = "${launcherName} --private-window %U";
+                };
+                profile-manager-window = {
+                  name = "Profile Manager";
+                  exec = "${launcherName} --ProfileManger";
+                };
+              };
+            }));

      nativeBuildInputs = [ makeWrapper lndir jq ];
      buildInputs = [ browser.gtk3 ];
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "lagrange";
-  version = "1.13.7";
+  version = "1.13.8";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
    rev = "v${version}";
-    sha256 = "sha256-WUNDkLKT/AgS5WkBKbVSM5/1zSjQuE8Aq68JLSOHFEs=";
+    sha256 = "sha256-SdncFkMCAY28njw361R70h6gcK0YHSU7AUwf9wzxCRo=";
  };

  nativeBuildInputs = [ cmake pkg-config zip ];
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "cilium-cli";
-  version = "0.12.5";
+  version = "0.12.6";

  src = fetchFromGitHub {
    owner = "cilium";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-VChonOHnif9Rz0pLg+nGt5jFT4wLIQq/C64zBlP/w0w=";
+    sha256 = "sha256-w9U8+TYU9BQ2w/jSbDo6lEAlIuMOoCjO9fWhywyVbEk=";
  };

  vendorSha256 = null;
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@ -1,7 +1,7 @@
 { lib
 , fetchFromGitHub
 , buildGoModule
-, makeWrapper
+, fetchpatch
 }:

 buildGoModule rec {
@ -15,7 +15,16 @@ buildGoModule rec {
    sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
  };

-  vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24=";
+  patches = [
+    # https://github.com/instrumenta/kubeval/pull/346
+    (fetchpatch {
+      name = "bump-golang.org/x/sys.patch";
+      url = "https://github.com/instrumenta/kubeval/commit/d64502b04d9e1b85fd3d5509049adb50f3e39954.patch";
+      sha256 = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM=";
+    })
+  ];
+
+  vendorSha256 = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM=";

  doCheck = false;

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -111,13 +111,13 @@
    "version": "2.24.1"
  },
  "aws": {
-    "hash": "sha256-qm6iXQFnCFGSL9TsJlIwl/qTPagSaWbJOmLlzFBFAzo=",
+    "hash": "sha256-TQzVuqUhAfEqzCcxA5l993ww9X1dcBeKvddJKzYsBH8=",
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/aws",
    "repo": "terraform-provider-aws",
-    "rev": "v4.37.0",
-    "vendorHash": "sha256-EnCFfs+REgT3q2OprotXNvnLka4JRfj5c0VTi7Js7zc=",
-    "version": "4.37.0"
+    "rev": "v4.38.0",
+    "vendorHash": "sha256-6IyBJJV+PRFc8f12fBhtOUjbJdyQYanhsvAxugFf/EE=",
+    "version": "4.38.0"
  },
  "azuread": {
    "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=",
@ -129,13 +129,13 @@
    "version": "2.30.0"
  },
  "azurerm": {
-    "hash": "sha256-TOm7e3yLTsmWCIDHklUncCjI5vbd0u/HWH/koOL95u4=",
+    "hash": "sha256-SV5td8GMEpLGLQgbl+1v9F2/hIrXpKsMBfOK+2+jDvk=",
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/azurerm",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.29.1",
+    "rev": "v3.30.0",
    "vendorHash": null,
-    "version": "3.29.1"
+    "version": "3.30.0"
  },
  "azurestack": {
    "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
@ -714,14 +714,14 @@
    "version": "2.0.3"
  },
  "lxd": {
-    "hash": "sha256-x0f8kP7OsgSD8d9vu99vp7Xq3szwLKxoAZdUCJc8B7A=",
+    "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=",
    "owner": "terraform-lxd",
    "provider-source-address": "registry.terraform.io/terraform-lxd/lxd",
    "proxyVendor": true,
    "repo": "terraform-provider-lxd",
-    "rev": "v1.7.3",
+    "rev": "v1.8.0",
    "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=",
-    "version": "1.7.3"
+    "version": "1.8.0"
  },
  "mailgun": {
    "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=",
@ -914,13 +914,13 @@
    "version": "0.22.0"
  },
  "pagerduty": {
-    "hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=",
+    "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=",
    "owner": "PagerDuty",
    "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty",
    "repo": "terraform-provider-pagerduty",
-    "rev": "v2.6.3",
+    "rev": "v2.6.4",
    "vendorHash": null,
-    "version": "2.6.3"
+    "version": "2.6.4"
  },
  "panos": {
    "hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=",
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@ -9,7 +9,7 @@

 stdenv.mkDerivation rec {
  pname = "signal-desktop";
-  version = "5.62.0"; # Please backport all updates to the stable channel.
+  version = "5.63.0"; # Please backport all updates to the stable channel.
  # All releases have a limited lifetime and "expire" 90 days after the release.
  # When releases "expire" the application becomes unusable until an update is
  # applied. The expiration date for the current release can be extracted with:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "sha256-ehRwGZM4lj+pgxUnBlBfcYt2JypuZ5PX3S5ymZriRWA=";
+    sha256 = "sha256-f8gQUnmI/VU0FteoMVY0k0RK1R7Ho7JRx+WoMhKki4s=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@ -12,6 +12,8 @@
 , gpgSupport   ? false
 , gpgmeSupport ? true
 , imapSupport  ? true
+, pop3Support  ? true
+, smtpSupport  ? true
 , withSidebar  ? true
 , gssSupport   ? true
 , writeScript
@ -44,9 +46,9 @@ stdenv.mkDerivation rec {
    (lib.enableFeature headerCache  "hcache")
    (lib.enableFeature gpgmeSupport "gpgme")
    (lib.enableFeature imapSupport  "imap")
+    (lib.enableFeature smtpSupport  "smtp")
+    (lib.enableFeature pop3Support  "pop")
    (lib.enableFeature withSidebar  "sidebar")
-    "--enable-smtp"
-    "--enable-pop"
    "--with-mailpath="

    # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
--- a/pkgs/applications/networking/warp/default.nix
+++ b/pkgs/applications/networking/warp/default.nix
@ -9,7 +9,7 @@
 , pkg-config
 , python3
 , rustPlatform
-, wrapGAppsHook
+, wrapGAppsHook4
 , glib
 , gtk4
 , libadwaita
@ -17,14 +17,14 @@

 stdenv.mkDerivation rec {
  pname = "warp";
-  version = "0.2.1";
+  version = "0.3.1";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
-    repo = "warp";
+    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ajz450ix68TDkhyAZd1IgZA/jUnXULrYZOSdcoOL+S0=";
+    hash = "sha256-0zjtaF0RwI7Sj2D5vRaiBJI+Bp/F17VO9ywMRqZyqxI=";
  };

  postPatch = ''
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-08xbd2YmJw2NTrxBrnJZMV2VvX6V0eX+fxbEEWFoC9c=";
+    hash = "sha256-HotArxXfmT6Gw6ZZZQ4X6bTx0EFb6vZLbXxhddmGID8=";
  };

  nativeBuildInputs = [
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    ninja
    pkg-config
    python3
-    wrapGAppsHook
+    wrapGAppsHook4
  ] ++ (with rustPlatform; [
    cargoSetupHook
    rust.cargo
--- a/pkgs/applications/office/libreoffice/src-still/download.nix
+++ b/pkgs/applications/office/libreoffice/src-still/download.nix
@ -112,11 +112,11 @@
    md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
  }
  {
-    name = "curl-7.83.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/curl-7.83.1.tar.xz";
-    sha256 = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4";
+    name = "curl-7.86.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-7.86.0.tar.xz";
+    sha256 = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b";
    md5 = "";
-    md5name = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4-curl-7.83.1.tar.xz";
+    md5name = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b-curl-7.86.0.tar.xz";
  }
  {
    name = "libe-book-0.1.3.tar.xz";
@ -126,11 +126,11 @@
    md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
  }
  {
-    name = "libepoxy-1.5.9.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz";
-    sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4";
+    name = "libepoxy-1.5.10.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.10.tar.gz";
+    sha256 = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15";
    md5 = "";
-    md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz";
+    md5name = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15-libepoxy-1.5.10.tar.gz";
  }
  {
    name = "epm-3.7.tar.gz";
@ -154,11 +154,11 @@
    md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
  }
  {
-    name = "expat-2.4.6.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz";
-    sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b";
+    name = "expat-2.4.9.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz";
+    sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354";
    md5 = "";
-    md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz";
+    md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz";
  }
  {
    name = "Firebird-3.0.7.33374-0.tar.bz2";
@ -560,11 +560,11 @@
    md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz";
  }
  {
-    name = "libxml2-2.9.14.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.9.14.tar.xz";
-    sha256 = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee";
+    name = "libxml2-2.10.3.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz";
+    sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c";
    md5 = "";
-    md5name = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee-libxml2-2.9.14.tar.xz";
+    md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz";
  }
  {
    name = "libxslt-1.1.35.tar.xz";
@ -637,11 +637,11 @@
    md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";
  }
  {
-    name = "nss-3.79-with-nspr-4.34.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/nss-3.79-with-nspr-4.34.tar.gz";
-    sha256 = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835";
+    name = "nss-3.83-with-nspr-4.34.1.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz";
+    sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30";
    md5 = "";
-    md5name = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835-nss-3.79-with-nspr-4.34.tar.gz";
+    md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz";
  }
  {
    name = "libodfgen-0.1.8.tar.xz";
@ -672,11 +672,11 @@
    md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
  }
  {
-    name = "openssl-1.1.1l.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz";
-    sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1";
+    name = "openssl-1.1.1q.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz";
+    sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
    md5 = "";
-    md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz";
+    md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz";
  }
  {
    name = "liborcus-0.17.2.tar.bz2";
@ -707,39 +707,39 @@
    md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz";
  }
  {
-    name = "libpng-1.6.37.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz";
-    sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca";
+    name = "libpng-1.6.38.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpng-1.6.38.tar.xz";
+    sha256 = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be";
    md5 = "";
-    md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
+    md5name = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be-libpng-1.6.38.tar.xz";
  }
  {
-    name = "poppler-21.11.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz";
-    sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584";
+    name = "poppler-22.09.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz";
+    sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e";
    md5 = "";
-    md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz";
+    md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz";
  }
  {
-    name = "poppler-data-0.4.10.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz";
-    sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30";
+    name = "poppler-data-0.4.11.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz";
+    sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c";
    md5 = "";
-    md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
+    md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz";
  }
  {
-    name = "postgresql-13.5.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2";
-    sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3";
+    name = "postgresql-13.8.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/postgresql-13.8.tar.bz2";
+    sha256 = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded";
    md5 = "";
-    md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2";
+    md5name = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded-postgresql-13.8.tar.bz2";
  }
  {
-    name = "Python-3.8.10.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz";
-    sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9";
+    name = "Python-3.8.15.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/Python-3.8.15.tar.xz";
+    sha256 = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550";
    md5 = "";
-    md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz";
+    md5name = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550-Python-3.8.15.tar.xz";
  }
  {
    name = "libqxp-0.0.2.tar.xz";
@ -861,11 +861,11 @@
    md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
  }
  {
-    name = "zlib-1.2.12.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz";
-    sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18";
+    name = "zlib-1.2.13.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz";
+    sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98";
    md5 = "";
-    md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz";
+    md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz";
  }
  {
    name = "libzmf-0.0.2.tar.xz";
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@ -8,7 +8,7 @@ rec {

  major = "7";
  minor = "3";
-  patch = "6";
+  patch = "7";
  tweak = "2";

  subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {

  src = fetchurl {
    url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    hash = "sha256-MwPWr2/7vFg0UFGgCQwTNvi5PEnHhhxlNLzuogWu1aM=";
+    hash = "sha256-UphmAklfbZdWGlTgmBGsXv53vYPY+oyRpFKfBhBX9Ls=";
  };

  # FIXME rename
  translations = fetchSrc {
    name = "translations";
-    sha256 = "sha256-vjthXfBP6vRY3lMBlithJM7b5SX3uvBwEpi30IeW/Dg=";
+    sha256 = "sha256-WRgPzLGywfQI6uFRBNhPZ2G1nhhiWa8WbaCYp2XRALk=";
  };

  # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {

  help = fetchSrc {
    name = "help";
-    sha256 = "sha256-b3VvaNEfnytWqJekAWOKokNoCnefXdQgYB7Hpptra0s=";
+    sha256 = "sha256-yBnnR0mTexkyWnJnSf2zC6w+DsdBTHU8frOTmPfEedA=";
  };
 }
--- a/pkgs/applications/science/astronomy/calcmysky/default.nix
+++ b/pkgs/applications/science/astronomy/calcmysky/default.nix
@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, wrapQtAppsHook
+, glm
+, eigen
+, qtbase
+}:
+
+stdenv.mkDerivation rec {
+  pname = "calcmysky";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "10110111";
+    repo = "CalcMySky";
+    rev = "v${version}";
+    hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48=";
+  };
+
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
+  buildInputs = [ glm eigen qtbase ];
+
+  doCheck = true;
+
+  meta = with lib;{
+    description = "Simulator of light scattering by planetary atmospheres";
+    homepage = "https://github.com/10110111/CalcMySky";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@ -1,25 +1,51 @@
-{ stdenv, lib, fetchFromGitHub
-, cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv
-, qtscript, qtserialport, qttools, qtcharts
-, qtmultimedia, qtlocation, qtbase, wrapQtAppsHook
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, perl
+, wrapQtAppsHook
+, qtbase
+, qtcharts
+, qtlocation
+, qtmultimedia
+, qtscript
+, qtserialport
+, qtwebengine
+, calcmysky
+, qxlsx
+, indilib
+, libnova
 }:

 stdenv.mkDerivation rec {
  pname = "stellarium";
-  version = "0.22.2";
+  version = "1.0";

  src = fetchFromGitHub {
    owner = "Stellarium";
    repo = "stellarium";
    rev = "v${version}";
-    sha256 = "sha256-FBH5IB1keMzRP06DQK2e7HX8rwm5/sdTX+cB80uG0vw=";
+    sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE=";
  };

-  nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    perl
+    wrapQtAppsHook
+  ];

  buildInputs = [
-    freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools
-    qtmultimedia qtlocation qtbase qtcharts
+    qtbase
+    qtcharts
+    qtlocation
+    qtmultimedia
+    qtscript
+    qtserialport
+    qtwebengine
+    calcmysky
+    qxlsx
+    indilib
+    libnova
  ];

  preConfigure = lib.optionalString stdenv.isDarwin ''
--- a/pkgs/applications/science/biology/seqkit/default.nix
+++ b/pkgs/applications/science/biology/seqkit/default.nix
@ -0,0 +1,25 @@
+{ lib
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+  pname = "seqkit";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "shenwei356";
+    repo = "seqkit";
+    rev = "v${version}";
+    sha256 = "sha256-2DWb6PIYT9VfJeqbZ9+E1jk/xJ2+h0GARKF6XWdMhkI=";
+  };
+
+  vendorSha256 = "sha256-RQNthtPYuOSCenA0hs5EhybimrftjEJlQNkfnKGXTiM=";
+
+  meta = with lib; {
+    description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation";
+    homepage = "https://github.com/shenwei356/seqkit";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bzizou ];
+  };
+}
--- a/pkgs/applications/science/logic/surelog/default.nix
+++ b/pkgs/applications/science/logic/surelog/default.nix
@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+, pkg-config
+, libuuid
+, openjdk11
+, gperftools
+}:
+
+stdenv.mkDerivation rec {
+  pname = "surelog";
+  version = "1.40";
+
+  src = fetchFromGitHub {
+    owner = "chipsalliance";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    openjdk11
+    (python3.withPackages (p: with p; [
+      psutil
+      orderedmultidict
+    ]))
+  ];
+
+  buildInputs = [
+    libuuid
+    gperftools
+  ];
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    make -j $NIX_BUILD_CORES UnitTests
+    ctest --output-on-failure
+    runHook postCheck
+  '';
+
+  postInstall = ''
+    mv $out/lib/surelog/* $out/lib/
+    mv $out/lib/pkg $out/lib/surelog/
+  '';
+
+  meta = {
+    description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler";
+    homepage = "https://github.com/chipsalliance/Surelog";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/applications/science/logic/uhdm/default.nix
+++ b/pkgs/applications/science/logic/uhdm/default.nix
@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, python3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "UHDM";
+  version = "0.9.1.40";
+
+  src = fetchFromGitHub {
+    owner = "chipsalliance";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-CliKU2WM8B9012aDcS/mTyIf+JcsVsc4uRRi9+FRWbM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    (python3.withPackages (p: with p; [ orderedmultidict ]))
+  ];
+
+  doCheck = true;
+  checkPhase = "make test";
+
+  postInstall = ''
+    mv $out/lib/uhdm/* $out/lib/
+    rm -rf $out/lib/uhdm
+  '';
+
+  prePatch = ''
+    substituteInPlace CMakeLists.txt --replace \
+    'capnp compile' \
+    'capnp compile --src-prefix=''${GENDIR}/..'
+  '';
+
+  meta = {
+    description = "Universal Hardware Data Model";
+    homepage = "https://github.com/chipsalliance/UHDM";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.all;
+  };
+}
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@ -4,6 +4,7 @@
 , makeWrapper
 , readline
 , gmp
+, pari
 , zlib
 # one of
 # - "minimal" (~400M):
@ -23,27 +24,31 @@ let
  # packages absolutely required for gap to start
  # `*` represents the version where applicable
  requiredPackages = [
-    "GAPDoc-*"
-    "primgrp-*"
-    "SmallGrp-*"
+    "gapdoc"
+    "primgrp"
+    "smallgrp"
    "transgrp"
  ];
-  # packages autoloaded by default if available
+  # packages autoloaded by default if available, and their dependencies
  autoloadedPackages = [
    "atlasrep"
-    "autpgrp-*"
-    "alnuth-*"
-    "crisp-*"
-    "ctbllib-*"
-    "FactInt-*"
+    "autpgrp"
+    "alnuth"
+    "crisp"
+    "ctbllib"
+    "factint"
    "fga"
-    "irredsol-*"
-    "laguna-*"
-    "polenta-*"
-    "polycyclic-*"
-    "resclasses-*"
-    "sophus-*"
-    "tomlib-*"
+    "irredsol"
+    "laguna"
+    "polenta"
+    "polycyclic"
+    "resclasses"
+    "sophus"
+    "tomlib"
+    "autodoc"  # dependency of atlasrep
+    "io"       # used by atlasrep to fetch data from online sources
+    "radiroot" # dependency of polenta
+    "utils"    # dependency of atlasrep
  ];
  keepAll = keepAllPackages || (packageSet == "full");
  packagesToKeep = requiredPackages ++ lib.optionals (packageSet == "standard") autoloadedPackages;
@ -61,11 +66,11 @@ in
 stdenv.mkDerivation rec {
  pname = "gap";
  # https://www.gap-system.org/Releases/
-  version = "4.11.1";
+  version = "4.12.1";

  src = fetchurl {
    url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
-    sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ=";
+    sha256 = "sha256-+evvEe4xshDONuPHCWB0K04lMoK71ScK3JMkJzySsBY=";
  };

  # remove all non-essential packages (which take up a lot of space)
@ -83,9 +88,14 @@ stdenv.mkDerivation rec {
    makeWrapper
  ];

-  # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min.
-  # tests are run twice, once with all packages loaded and once without
-  # checkTarget = "teststandard";
+  propagatedBuildInputs = [
+    pari # used at runtime by the alnuth package
+  ];
+
+  # "teststandard" is a superset of the tests run by "check". it takes ~20min
+  # instead of ~1min. tests are run twice, once with all packages loaded and
+  # once without.
+  # installCheckTarget = "teststandard";

  doInstallCheck = true;
  installCheckTarget = "check";
@ -104,34 +114,28 @@ stdenv.mkDerivation rec {
    # like the defaults the Makefile, but use gap from PATH instead of the
    # one from builddir
    installCheckFlagsArray+=(
-      "TESTGAP=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r -A"
-      "TESTGAPauto=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r"
+      "TESTGAPcore=gap --quitonbreak -b -q -r"
+      "TESTGAPauto=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80"
+      "TESTGAP=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80 -A"
    )
  '';

  postBuild = ''
    pushd pkg
-    bash ../bin/BuildPackages.sh
+    # failures are ignored unless --strict is set
+    bash ../bin/BuildPackages.sh ${lib.optionalString (!keepAll) "--strict"}
    popd
  '';

-  installTargets = [
-    "install-libgap"
-    "install-headers"
-  ];
-
-  # full `make install` is not yet implemented, just for libgap and headers
  postInstall = ''
-    # Install config.h, which is not currently handled by `make install-headers`
-    cp gen/config.h "$out/include/gap"
+    # make install creates an empty pkg dir. since we run "make check" on
+    # installCheckPhase to make sure the installed GAP finds its libraries, we
+    # also install the tst dir. this is probably excessively cautious, see
+    # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942
+    rm -r "$out/share/gap/pkg"
+    cp -ar pkg tst "$out/share/gap"

-    mkdir -p "$out/bin" "$out/share/gap/"
-
-    echo "Copying files to target directory"
-    cp -ar . "$out/share/gap/build-dir"
-
-    makeWrapper "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" \
-      --set GAP_DIR $out/share/gap/build-dir
+    makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap"
  '';

  preFixup = ''
@ -141,14 +145,11 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Computational discrete algebra system";
-    maintainers = with maintainers;
-    [
-      raskin
-      chrisjefferson
-      timokau
-    ];
+    # We are also grateful to ChrisJefferson for previous work on the package,
+    # and to ChrisJefferson and fingolfin for help with GAP-related questions
+    # from the upstream point of view.
+    maintainers = teams.sage.members;
    platforms = platforms.all;
-    broken = stdenv.isDarwin;
    # keeping all packages increases the package size considerably, which is
    # why a local build is preferable in that situation. The timeframe is
    # reasonable and that way the binary cache doesn't get overloaded.
--- a/pkgs/applications/science/math/sage/env-locations.nix
+++ b/pkgs/applications/science/math/sage/env-locations.nix
@ -35,7 +35,7 @@ writeTextFile rec {
    export GRAPHS_DATA_DIR='${graphs}/share/graphs'
    export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
    export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
-    export GAP_ROOT_DIR='${gap}/share/gap/build-dir'
+    export GAP_ROOT_DIR='${gap}/share/gap'
    export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/'
    export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
    export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@ -130,6 +130,14 @@ stdenv.mkDerivation rec {
      rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa";
      sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI=";
    })
+
+    # https://trac.sagemath.org/ticket/34391
+    (fetchSageDiff {
+      name = "gap-4.12-upgrade.patch";
+      base = "9.8.beta2";
+      rev = "eb8cd42feb58963adba67599bf6e311e03424328";
+      sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw=";
+    })
  ];

  patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
--- a/pkgs/applications/version-management/srvc/default.nix
+++ b/pkgs/applications/version-management/srvc/default.nix
@ -1,17 +1,21 @@
-{ lib, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }:

 rustPlatform.buildRustPackage rec {
  pname = "srvc";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "insilica";
    repo = "rs-srvc";
    rev = "v${version}";
-    sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I=";
+    sha256 = "sha256-XGZ6Jr/RVDOLDa0sANZIsKtNjY3pEBlOtei+xNGPBBY=";
  };

-  cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg=";
+  cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    Security
+  ];

  meta = with lib; {
    description = "Sysrev version control";
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@ -12,7 +12,7 @@

  obs-gstreamer = callPackage ./obs-gstreamer.nix { };

-  obs-hyperion = callPackage ./obs-hyperion/default.nix { };
+  obs-hyperion = libsForQt5.callPackage ./obs-hyperion/default.nix { };

  obs-move-transition = callPackage ./obs-move-transition.nix { };

--- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@ -1,22 +1,37 @@
-{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL
-, qtbase }:
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, obs-studio, libGL
+, qtbase, flatbuffers }:

 stdenv.mkDerivation rec {
  pname = "obs-hyperion";
  version = "1.0.1";

-  src = fetchFromGitLab {
+  src = fetchFromGitHub {
    owner = "hyperion-project";
    repo = "hyperion-obs-plugin";
-    rev = "v${version}";
-    sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV2EGgcyQ=";
+    rev = version;
+    sha256 = "sha256-pfWfJWuIoa+74u5J76/GE+OuHkksbwOAPfsR9OGX3L4=";
  };

-  nativeBuildInputs = [ meson pkg-config ninja ];
+  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ obs-studio libGL qtbase ];

+  dontWrapQtApps = true;
+
+  cmakeFlags = [
+    "-DOBS_SOURCE=${obs-studio.src}"
+    "-DGLOBAL_INSTALLATION=ON"
+  ];
+
+  preConfigure = ''
+    # https://github.com/hyperion-project/hyperion-obs-plugin/issues/7
+    rm -rf external/flatbuffers
+    cp -r ${flatbuffers.src} external/flatbuffers
+    chmod -R a+w external
+  '';
+
  meta = with lib; {
    description = "OBS Studio plugin to connect to a Hyperion.ng server";
+    homepage = "https://github.com/hyperion-project/hyperion-obs-plugin";
    license = licenses.mit;
    maintainers = with maintainers; [ algram ];
    platforms = [ "x86_64-linux" ];
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@ -41,13 +41,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "icewm";
-  version = "3.1.0";
+  version = "3.2.0";

  src = fetchFromGitHub {
    owner = "ice-wm";
    repo = "icewm";
    rev = finalAttrs.version;
-    hash = "sha256-0mnhH/7Y4VXpNUU++ln2//9/vuTxq9sa2D933Cf7Ifw=";
+    hash = "sha256-fTaWfItY//fkvaYADeCBYg+dag59Y9Fw+Al0UgHnkXc=";
  };

  nativeBuildInputs = [
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@ -10,7 +10,7 @@ let
  slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]);
  escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
  escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
-  passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" ];
+  passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "leaveDotGit" "deepClone" ];

  useFetchGit = deepClone || fetchSubmodules || leaveDotGit;
  fetcher = if useFetchGit then fetchgit else fetchzip;
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@ -13,14 +13,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "mozo";
-  version = "1.26.1";
+  version = "1.26.2";

  format = "other";
  doCheck = false;

  src = fetchurl {
    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk=";
+    sha256 = "RyxILg7y+xYp5h4X2qoaSH9kOSsCmEncmkCCr7OLye4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix
@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
  release = "10.3-2021.10";

  suffix = {
-    aarch64-darwin = "mac";  # use intel binaries via rosetta
    aarch64-linux = "aarch64-linux";
    x86_64-darwin = "mac";
    x86_64-linux  = "x86_64-linux";
@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
    sha256 = {
-      aarch64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv";
      aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn";
      x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv";
      x86_64-linux  = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp";
@ -51,6 +49,6 @@ stdenv.mkDerivation rec {
    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
    maintainers = with maintainers; [ prusnak ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
  };
 }
--- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
  version = "11.3.rel1";

  platform = {
-    aarch64-darwin = "darwin-x86_64";  # use intel binaries via rosetta
    aarch64-linux = "aarch64";
    x86_64-darwin = "darwin-x86_64";
    x86_64-linux  = "x86_64";
@ -19,7 +18,6 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz";
    sha256 = {
-      aarch64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2";
      aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc";
      x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2";
      x86_64-linux  = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l";
@ -49,6 +47,6 @@ stdenv.mkDerivation rec {
    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
    maintainers = with maintainers; [ prusnak ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
  };
 }
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
  subdir = "6-2017q2";

  suffix = {
-    aarch64-darwin = "mac";  # use intel binaries via rosetta
    x86_64-darwin = "mac";
    x86_64-linux  = "linux";
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
    sha256 = {
-      aarch64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";
      x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";
      x86_64-linux  = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -50,6 +48,6 @@ stdenv.mkDerivation rec {
    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
    maintainers = with maintainers; [ prusnak ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
  };
 }
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
  subdir = "7-2018q2";

  suffix = {
-    aarch64-darwin = "mac";  # use intel binaries via rosetta
    x86_64-darwin = "mac";
    x86_64-linux  = "linux";
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
    sha256 = {
-      aarch64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";
      x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";
      x86_64-linux  = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -50,6 +48,6 @@ stdenv.mkDerivation rec {
    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
    maintainers = with maintainers; [ prusnak ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
  };
 }
--- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix
@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
  subdir = "8-2019q3/RC1.1";

  suffix = {
-    aarch64-darwin = "mac";  # use intel binaries via rosetta
    x86_64-darwin = "mac";
    x86_64-linux  = "linux";
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
    sha256 = {
-      aarch64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";
      x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";
      x86_64-linux  = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -50,6 +48,6 @@ stdenv.mkDerivation rec {
    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
    maintainers = with maintainers; [ prusnak ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
  };
 }
--- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix
@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
  subdir = "9-2020q2";

  suffix = {
-    aarch64-darwin = "mac";  # use intel binaries via rosetta
    aarch64-linux = "aarch64-linux";
    x86_64-darwin = "mac";
    x86_64-linux  = "x86_64-linux";
@ -21,7 +20,6 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";
    sha256 = {
-      aarch64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv";
      aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z";
      x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv";
      x86_64-linux  = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s";
@ -52,6 +50,6 @@ stdenv.mkDerivation rec {
    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
    maintainers = with maintainers; [ prusnak ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
  };
 }
--- a/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix
@ -3,36 +3,53 @@
 , cmake
 , pkg-config
 , lit
-, llvm_11
+, llvm
 , spirv-headers
 , spirv-tools
 }:

+let
+  llvmMajor = lib.versions.major llvm.version;
+
+  branch =
+    if llvmMajor == "15" then rec {
+      version = "15.0.0";
+      rev = "v${version}";
+      hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
+    } else if llvmMajor == "14" then rec{
+      version = "14.0.0";
+      rev = "v${version}";
+      hash = "sha256-BhNAApgZ/w/92XjpoDY6ZEIhSTwgJ4D3/EfNvPmNM2o=";
+    } else if llvmMajor == "11" then {
+      version = "unstable-2022-05-04";
+      rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0
+      hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
+    } else throw "Incompatible LLVM version.";
+in
 stdenv.mkDerivation rec {
  pname = "SPIRV-LLVM-Translator";
-  version = "unstable-2022-05-04";
+  inherit (branch) version;

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "SPIRV-LLVM-Translator";
-    rev = "99420daab98998a7e36858befac9c5ed109d4920";
-    sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
+    inherit (branch) rev hash;
  };

-  nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ];
+  nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ];

-  buildInputs = [ spirv-headers llvm_11 ];
+  buildInputs = [ spirv-headers llvm ];

  checkInputs = [ lit ];

  cmakeFlags = [
    "-DLLVM_INCLUDE_TESTS=ON"
-    "-DLLVM_DIR=${llvm_11.dev}"
+    "-DLLVM_DIR=${llvm.dev}"
    "-DBUILD_SHARED_LIBS=YES"
    "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
    # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/
    "-DCMAKE_SKIP_BUILD_RPATH=ON"
-  ];
+  ] ++ lib.optionals (llvmMajor != "11") [ "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ];

  # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
  doCheck = false;
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@ -6,18 +6,18 @@

 stdenv.mkDerivation rec {
  pname = "unison-code-manager";
-  milestone_id = "M4";
+  milestone_id = "M4c";
  version = "1.0.${milestone_id}-alpha";

  src = if (stdenv.isDarwin) then
    fetchurl {
      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
-      sha256 = "A8i1jH9+W89M+XbmYx0knJsP5c/EdVE2T9L/EIL0USU=";
+      sha256 = "sha256-mkzIC/cPkpH0obEBqkvvKVh74LaV6jkfyEMLHmJn/nE=";
    }
  else
    fetchurl {
      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
-      sha256 = "OqtJiKAsefw2fVjhtsYUe+qLPqXBPFkHUaMh26EJBJ4=";
+      sha256 = "sha256-LfT/pMOvfBAwew6NW0VNvuB5c1AC7b+qKraP25+kytg=";
    };

  # The tarball is just the prebuilt binary, in the archive root.
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@ -4,29 +4,27 @@
 , python3
 , readline
 , stdenv
-, which
 , yosys
 , zlib
 , yosys-symbiflow
+, uhdm
+, surelog
 }: let

  src = fetchFromGitHub {
-    owner  = "SymbiFlow";
-    repo   = "yosys-symbiflow-plugins";
-    rev    = "35c6c33811a8de7c80dff6a7bcf7aa6ec9b21233";
-    hash   = "sha256-g5dX9+R+gWt8e7Bhbbg60O9qa+Vi6Ar0M1sHhYlAre8=";
+    owner  = "chipsalliance";
+    repo   = "yosys-f4pga-plugins";
+    rev    = "27208ce08200a5e89e3bd4f466bc68824df38c32";
+    hash   = "sha256-S7txjzlIp+idWIfp/DDOznluA3aMFfosMUt5dvi+g44=";
  };

-  version = "2022.01.06";
+  version = "2022.09.27";

  # Supported symbiflow plugins.
  #
  # The following are disabled:
  #
  # "ql-qlf" builds but fails to load the plugin, so is not currently supported.
-  #
-  # "UHDM" doesn't currently build, as the work to package UHDM and surelog has
-  # not (yet) been undertaken.
  plugins = [
    "design_introspection"
    "fasm"
@ -36,7 +34,7 @@
    # "ql-qlf"
    "sdc"
    "xdc"
-    # "UHDM"
+    "systemverilog"
  ];

  static_gtest = gtest.dev.overrideAttrs (old: {
@ -50,8 +48,8 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
  inherit src version plugin;
  enableParallelBuilding = true;

-  nativeBuildInputs = [ which python3 ];
-  buildInputs = [ yosys readline zlib ] ;
+  nativeBuildInputs = [ python3 ];
+  buildInputs = [ yosys readline zlib uhdm surelog ];

  # xdc has an incorrect path to a test which has yet to be patched
  doCheck = plugin != "xdc";
@ -102,5 +100,3 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec {
    maintainers = with maintainers; [ ollieB thoughtpolice ];
  };
 }))
-
-
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "clojure";
-  version = "1.11.1.1182";
+  version = "1.11.1.1189";

  src = fetchurl {
    # https://clojure.org/releases/tools
    url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "sha256-u6qTQwtoN47UedSsxsyV0ej3C6Ta5ncbP3lZzTmvPr8=";
+    sha256 = "sha256-wg5iN5/UT6jb68vF98mgSl21fLG9BdEcXH0EEmvnEOs=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/draco/default.nix
+++ b/pkgs/development/libraries/draco/default.nix
@ -16,14 +16,14 @@ let
  cmakeBool = b: if b then "ON" else "OFF";
 in
 stdenv.mkDerivation rec {
-  version = "1.5.3";
+  version = "1.5.5";
  pname = "draco";

  src = fetchFromGitHub {
    owner = "google";
    repo = "draco";
    rev = version;
-    sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ=";
+    sha256 = "sha256-WYWEUfBPz/Pt7sE8snG3/LnOA3DEUm/SUVLtsH7zG5g=";
    fetchSubmodules = true;
  };

@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Library for compressing and decompressing 3D geometric meshes and point clouds";
    homepage = "https://google.github.io/draco/";
+    changelog = "https://github.com/google/draco/releases/tag/${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ jansol ];
    platforms = platforms.all;
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , qmake
 }:
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
  '';
  installPhase = ''
    install -d -m 0755 $out/lib
-    cp -pr *.so* $out/lib
+    cp -pr *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib
    install -d -m 0755 $out/include/dxflib
    cp -pr src/*.h $out/include/dxflib
    # Generate pkg-config file
@ -39,8 +40,8 @@ stdenv.mkDerivation rec {

  meta = {
    homepage = "https://qcad.org/en/90-dxflib";
-    maintainers = with lib.maintainers; [raskin];
-    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.unix;
    description = "DXF file format library";
  };
 }
--- a/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/pkgs/development/libraries/howard-hinnant-date/default.nix
@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
      url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728";
      sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154";
    })
+    # Fix CMake include directory path.
+    # https://github.com/HowardHinnant/date/pull/753
+    (fetchpatch {
+      name = "fix-cmake-include-dir.patch";
+      url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch";
+      hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4=";
+    })
    # Without this patch, this library will drop a `tzdata` directory into
    # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
    # searches for `zoneinfo` be the one from the `tzdata` package.
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "hsqldb";
-  version = "2.7.0";
+  version = "2.7.1";
  underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);

  src = fetchurl {
    url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
-    sha256 = "sha256-nLBCigQMPF6QbjrUuSDjP2ir38TmzC5Pa8Rjpk1BkcQ=";
+    sha256 = "sha256-d0FruJXNnwme1gPHWcIXpD2LO0fL8CzZOn8H14Quo50=";
  };

  nativeBuildInputs = [ unzip makeWrapper ];
--- a/pkgs/development/libraries/lief/default.nix
+++ b/pkgs/development/libraries/lief/default.nix
@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "lief";
-  version = "0.12.1";
+  version = "0.12.3";

  src = fetchFromGitHub {
    owner = "lief-project";
    repo = "LIEF";
    rev = version;
-    sha256 = "sha256-IQqPwTNFHLOr8iwg8IhXpuiyg2rIdFuVDzwT39eA6/c=";
+    sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY=";
  };

  outputs = [ "out" "py" ];
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@ -7,13 +7,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname   = "mimalloc";
-  version = "2.0.6";
+  version = "2.0.7";

  src = fetchFromGitHub {
    owner  = "microsoft";
    repo   = pname;
    rev    = "v${version}";
-    sha256 = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc=";
+    sha256 = "sha256-h3+awCdlZaGCkavBeQfJsKgOZX4MHB3quPIfTlj6pDw=";
  };

  doCheck = true;
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@ -23,7 +23,7 @@
  sdlSupport ? false, SDL2,
  restSupport ? false, asio,
  withApps ? false,
-  withExamples ? false, fltk, wxGTK,
+  withExamples ? false, fltk, wxGTK30-gtk3,
 }:

 stdenv.mkDerivation rec {
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
    ++ lib.optional luaSupport lua
    ++ lib.optional sdlSupport SDL2
    ++ lib.optional restSupport asio
-    ++ lib.optionals withExamples [ fltk wxGTK ]
+    ++ lib.optionals withExamples [ fltk wxGTK30-gtk3 ]
    ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
    ++ lib.optional (restSupport || colladaSupport) boost
  ;
--- a/pkgs/development/libraries/qca-qt5/2.3.2.nix
+++ b/pkgs/development/libraries/qca-qt5/2.3.2.nix
@ -1,30 +0,0 @@
-{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
-
-stdenv.mkDerivation rec {
-  pname = "qca-qt5";
-  version = "2.3.2";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
-    sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0=";
-  };
-
-  buildInputs = [ openssl qtbase ];
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  dontWrapQtApps = true;
-
-  # tells CMake to use this CA bundle file if it is accessible
-  preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
-
-  # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
-  cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
-
-  meta = with lib; {
-    description = "Qt 5 Cryptographic Architecture";
-    homepage = "http://delta.affinix.com/qca";
-    maintainers = with maintainers; [ ttuegel ];
-    license = licenses.lgpl21Plus;
-    platforms = with platforms; unix;
-  };
-}
--- a/pkgs/development/libraries/qxlsx/default.nix
+++ b/pkgs/development/libraries/qxlsx/default.nix
@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qtbase
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qxlsx";
+  version = "1.4.4";
+
+  src = fetchFromGitHub {
+    owner = "QtExcel";
+    repo = "QXlsx";
+    rev = "v${version}";
+    hash = "sha256-01G7eJRrnee/acEeobYAYMY+93y+I0ASOTVRGuO+IcA=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qtbase ];
+
+  # Don't force Qt definitions onto users: https://github.com/QtExcel/QXlsx/commit/8e83402d
+  postPatch = ''
+    substituteInPlace QXlsx/CMakeLists.txt \
+     --replace 'target_compile_definitions(QXlsx PUBLIC' 'target_compile_definitions(QXlsx PRIVATE'
+  '';
+
+  preConfigure = ''
+    cd QXlsx
+  '';
+
+  dontWrapQtApps = true;
+
+  meta = with lib;{
+    description = "Excel file(*.xlsx) reader/writer library using Qt 5 or 6";
+    homepage = "https://qtexcel.github.io/QXlsx";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/development/libraries/rocmlir/default.nix
+++ b/pkgs/development/libraries/rocmlir/default.nix
@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, hip
+, python3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rocmlir";
+  rocmVersion = "5.3.1";
+  # For some reason they didn't add a tag for 5.3.1, should be compatible, change to rocmVersion later
+  version = "5.3.0";
+
+  src = fetchFromGitHub {
+    owner = "ROCmSoftwarePlatform";
+    repo = "rocMLIR";
+    rev = "rocm-${version}"; # change to rocmVersion later
+    hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    hip
+  ];
+
+  buildInputs = [
+    python3
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_FAT_LIBMLIRMIOPEN=ON"
+  ];
+
+  meta = with lib; {
+    description = "MLIR-based convolution and GEMM kernel generator";
+    homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ Madouura ];
+    broken = rocmVersion != hip.version;
+  };
+}
--- a/pkgs/development/libraries/volk/default.nix
+++ b/pkgs/development/libraries/volk/default.nix
@ -30,7 +30,14 @@ stdenv.mkDerivation rec {
    })
  ];

-  cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ];
+  cmakeFlags = lib.optionals (!enableModTool) [
+    "-DENABLE_MODTOOL=OFF"
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+    # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
+    # volk_32f_log2_32f: fail on arch neon
+    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
+  ];
+
  postInstall = lib.optionalString (!stdenv.isDarwin) ''
    ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
  '';
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@ -1,19 +1,20 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, Security
 , autoreconfHook
 , openssl
 }:

 stdenv.mkDerivation rec {
  pname = "wolfssl";
-  version = "5.5.1";
+  version = "5.5.2";

  src = fetchFromGitHub {
    owner = "wolfSSL";
    repo = "wolfssl";
    rev = "v${version}-stable";
-    sha256 = "sha256-gDY5uEvV5nNPObrar5Fq2UTW30UZ71CooUwQVJkq4l8=";
+    sha256 = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0=";
  };

  postPatch = ''
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
    "out"
  ];

+  propagatedBuildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ];
  nativeBuildInputs = [
    autoreconfHook
  ];
--- a/pkgs/development/misc/brev-cli/default.nix
+++ b/pkgs/development/misc/brev-cli/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "brev-cli";
-  version = "0.6.148";
+  version = "0.6.153";

  src = fetchFromGitHub {
    owner = "brevdev";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-WMy65tnNYN1RzAEAyn2a+H3c+2ygFjqv1eGbBWIj3v0=";
+    sha256 = "sha256-v9jkQoamLiH8LsBmqNwUrnAvXamMHxhJ94SXFgdt9Cc=";
  };

  vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "crownstone-uart";
-  version = "2.6.0";
+  version = "2.7.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "crownstone";
    repo = "crownstone-lib-python-uart";
    rev = version;
-    sha256 = "sha256-cmMxbYGaE+HpgrZ78eCampE/1Ku/X9mJP6VcBbxQm6Q=";
+    sha256 = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY=";
  };

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

 buildPythonPackage rec {
  pname = "deepdiff";
-  version = "6.1.0";
+  version = "6.2.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "seperman";
    repo = "deepdiff";
    rev = "refs/tags/${version}";
-    hash = "sha256-ngtQNyVQaywMyYitj37m0RJGBiMpjB4b8Rn+feMOjVU=";
+    hash = "sha256-AKah3A9srKm/cFWM7IiZ7JxQ8s0KTuh8VLKOymsDgnA=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@ -18,7 +18,7 @@
 }:

 buildPythonPackage rec {
-  version = "0.20.46";
+  version = "0.20.50";
  pname = "dulwich";
  format = "setuptools";

@ -26,7 +26,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Tw6I//9dsVI9k9kvFSX+X6FhMY/7qtUCwbmzvnoGcXI=";
+    hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4=";
  };

  LC_ALL = "en_US.UTF-8";
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@ -12,13 +12,13 @@

 buildPythonPackage rec {
  pname = "eve";
-  version = "2.0.2";
+  version = "2.0.3";
  format = "setuptools";

  src = fetchPypi {
    inherit version;
    pname = "Eve";
-    sha256 = "80cad5702d07189c5f43f432d307c473331144477a6a360d22a27dc018366c13";
+    sha256 = "sha256-UiOhnJyEy5bPIIRHAhuWo8AqHOCp0OE5d0btujfeq4o=";
  };

  disabled = pythonOlder "3.7";
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "fastavro";
-  version = "1.6.1";
+  version = "1.7.0";

  disabled = pythonOlder "3.6";
  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-2BtJQiDPMMIxbO0FdOQT/jzsaiPMTdmf8S21ezmQRLQ=";
+    sha256 = "sha256-vzaaX3wj1UkFGCohxYlPw6NA0b+oV/2JtpYXC4zncjk=";
  };

  preBuild = ''
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "holoviews";
-  version = "1.15.1";
+  version = "1.15.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-bQpOXKK/piX1+243BS8BCEX/0FEl5YnOvegvAR53az4=";
+    hash = "sha256-3sJBf2VACLHXtkWzHs9iHIvvkBaU5MTnJy7/0Yr6Nts=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@ -46,7 +46,6 @@
 }:
 let
  testBackends = [
-    "dask"
    "datafusion"
    "duckdb"
    "pandas"
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@ -0,0 +1,56 @@
+{ lib
+, python-dateutil
+, buildPythonPackage
+, fetchFromGitHub
+, freezegun
+, tzdata
+, pyparsing
+, pydantic
+, pytest-asyncio
+, pytest-benchmark
+, pytest-golden
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "ical";
+  version = "4.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "allenporter";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-pZtjGWmEVcHSCgiVTKoEaRvec02cz3x93W+UXx3J8gE=";
+  };
+
+  propagatedBuildInputs = [
+    python-dateutil
+    tzdata
+    pydantic
+    pyparsing
+  ];
+
+  checkInputs = [
+    freezegun
+    pytest-asyncio
+    pytest-benchmark
+    pytest-golden
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "ical"
+  ];
+
+  meta = with lib; {
+    description = "Library for handling iCalendar";
+    homepage = "https://github.com/allenporter/ical";
+    changelog = "https://github.com/allenporter/ical/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/icontract/default.nix
+++ b/pkgs/development/python-modules/icontract/default.nix
@ -2,20 +2,14 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, asttokens
-, typing-extensions
-, pytestCheckHook
-, yapf
-, docutils
-, pygments
-, dpcontracts
-, tabulate
-, py-cpuinfo
-, typeguard
 , astor
-, numpy
+, asttokens
 , asyncstdlib
 , deal
+, dpcontracts
+, numpy
+, pytestCheckHook
+, typing-extensions
 }:

 buildPythonPackage rec {
@ -38,40 +32,39 @@ buildPythonPackage rec {
    export ICONTRACT_SLOW=1
  '';

-
  propagatedBuildInputs = [
    asttokens
    typing-extensions
  ];

  checkInputs = [
-    pytestCheckHook
-    yapf
-    docutils
-    pygments
-    dpcontracts
-    tabulate
-    py-cpuinfo
-    typeguard
    astor
-    numpy
    asyncstdlib
    deal
+    dpcontracts
+    numpy
+    pytestCheckHook
  ];

  disabledTestPaths = [
-    # mypy decorator checks don't pass. For some reaseon mypy
+    # mypy decorator checks don't pass. For some reason mypy
    # doesn't check the python file provided in the test.
    "tests/test_mypy_decorators.py"
  ];

+  # Upstream adds some plain text files direct to the package's root directory
+  # https://github.com/Parquery/icontract/blob/master/setup.py#L63
+  postInstall = ''
+    rm -f $out/{LICENSE.txt,README.rst,requirements.txt}
+  '';
+
  pythonImportsCheck = [ "icontract" ];

  meta = with lib; {
    description = "Provide design-by-contract with informative violation messages";
    homepage = "https://github.com/Parquery/icontract";
-    changelog = "https://github.com/Parquery/icontract/blob/master/CHANGELOG.rst";
+    changelog = "https://github.com/Parquery/icontract/blob/v${version}/CHANGELOG.rst";
    license = licenses.mit;
-    maintainers = with maintainers; [ gador ];
+    maintainers = with maintainers; [ gador thiagokokada ];
  };
 }
--- a/pkgs/development/python-modules/lcov_cobertura/default.nix
+++ b/pkgs/development/python-modules/lcov_cobertura/default.nix
@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "lcov_cobertura";
+  version = "2.0.2";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q=";
+  };
+
+  doCheck = true;
+  pythonImportsCheck = [
+    "lcov_cobertura"
+  ];
+
+  meta = {
+    description = "Converts code coverage from lcov format to Cobertura's XML format";
+    homepage = "https://eriwen.github.io/lcov-to-cobertura-xml/";
+    license = lib.licenses.asl20;
+  };
+}
--- a/pkgs/development/python-modules/life360/default.nix
+++ b/pkgs/development/python-modules/life360/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "life360";
-  version = "5.2.1";
+  version = "5.3.0";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "pnbruckner";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-yhOqiLozeqPjl5ZBgPaMuZ2fJeOwhI460p9x7i1hVuM=";
+    hash = "sha256-GacesPWPTuIIZel4OARWW13OYflYFNf4Jxh9I8ms7s0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "lxmf";
-  version = "0.2.3";
+  version = "0.2.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "markqvist";
    repo = "lxmf";
    rev = "refs/tags/${version}";
-    hash = "sha256-A8FKwKyRFFYkT4eEv7JHI/pjKCfJhk8NkUfUrmsxO90=";
+    hash = "sha256-yr+CU8MgBIUHuw40oNmm+//DG+iB0m7geBh4doaqV/0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/mediafile/default.nix
+++ b/pkgs/development/python-modules/mediafile/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "mediafile";
-  version = "0.10.0";
+  version = "0.10.1";
  format = "flit";

  disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "beetbox";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-Sdb5Hvm4Y344msZGie4PJ88ZmFtWfc0chABtmwnEN/Y=";
+    hash = "sha256-2h17FA0GTY4R+WhZiQtPFYf6gH7XLbI3aOB/nUXFtJI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "mitmproxy-wireguard";
-  version = "0.1.15";
+  version = "0.1.17";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "decathorpe";
    repo = "mitmproxy_wireguard";
    rev = "refs/tags/${version}";
-    hash = "sha256-31S955juthagoFsthVTf3Vjx2YCKn43HKJ6mjrA8lfw=";
+    hash = "sha256-G//3h9QHModKNcGqG2FcV65bver809J4Xnig/Fr5zdg=";
  };

  nativeBuildInputs = [
@ -31,7 +31,7 @@ buildPythonPackage rec {
  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-e2P3vfiaTOUf28Lexv2SDFaiGE55G8EkDKSYb8b7vLM=";
+    hash = "sha256-KPk6lLofsWDG+rswG5+q4bs9CZJFn4RuepX/OQvZ1Pw=";
  };

  # Module has no tests, only a test client
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "mutagen";
-  version = "1.45.1";
+  version = "1.46.0";
  format = "pyproject";

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1";
+    hash = "sha256-bl+LqEg2uZ/mC+X7J/hL5K2Rm7trScqmroHnBYS1Xlg=";
  };

  outputs = [ "out" "doc" ];
@ -44,11 +44,13 @@ buildPythonPackage rec {
  disabledTests = [
    # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one
    "test_test_fileobj_save"
+    "test_test_fileobj_load"
+    "test_test_fileobj_delete"
+    "test_mock_fileobj"
  ];

-  disabledTestPaths = [
-    # we are not interested in code quality measurements
-    "tests/quality/test_flake8.py"
+  pythonImportsCheck = [
+    "mutagen"
  ];

  meta = with lib; {
@ -66,5 +68,6 @@ buildPythonPackage rec {
    homepage = "https://mutagen.readthedocs.io";
    changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}";
    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "nomadnet";
-  version = "0.2.6";
+  version = "0.2.7";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "markqvist";
    repo = "NomadNet";
    rev = version;
-    hash = "sha256-IcWHqPVfqHYw2k/EtIYruhBC8nz4UgjTz0psaa5Ki4c=";
+    hash = "sha256-ycQWvJnYvuNtXxNWjuLXD+TghscCIuOZMmch02M9C00=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/p1monitor/default.nix
+++ b/pkgs/development/python-modules/p1monitor/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "p1monitor";
-  version = "2.1.0";
+  version = "2.1.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "klaasnicolaas";
    repo = "python-p1monitor";
    rev = "refs/tags/v${version}";
-    hash = "sha256-3xvh/Ic2Mtczi5WREDXy+qQLpXhJQZf6fosT0h+fA0o=";
+    hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU=";
  };

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

 buildPythonPackage rec {
  pname = "peaqevcore";
-  version = "7.2.1";
+  version = "7.3.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-xkoa9nn/b1cDcbOxT4YT2mx8XqaA/kui/cG8xWf26yc=";
+    hash = "sha256-G2ujLjN8LEHY9gd0SWBpOSkV6fQAZ8pojR0+bMi6TUw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pylddwrap/default.nix
+++ b/pkgs/development/python-modules/pylddwrap/default.nix
@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, coreutils
+, fetchFromGitHub
+, icontract
+, pytestCheckHook
+, pythonOlder
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "pylddwrap";
+  version = "1.2.2";
+  format = "setuptools";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "Parquery";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg=";
+  };
+
+  postPatch = ''
+    substituteInPlace lddwrap/__init__.py \
+      --replace '/usr/bin/env' '${coreutils}/bin/env'
+  '';
+
+  # Upstream adds some plain text files direct to the package's root directory
+  # https://github.com/Parquery/pylddwrap/blob/master/setup.py#L71
+  postInstall = ''
+    rm -f $out/{LICENSE,README.rst,requirements.txt}
+  '';
+
+  propagatedBuildInputs = [
+    icontract
+    typing-extensions
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "lddwrap" ];
+
+  meta = with lib; {
+    description = "Python wrapper around ldd *nix utility to determine shared libraries of a program";
+    homepage = "https://github.com/Parquery/pylddwrap";
+    changelog = "https://github.com/Parquery/pylddwrap/blob/v${version}/CHANGELOG.rst";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thiagokokada ];
+  };
+}
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pylitterbot";
-  version = "2022.10.1";
+  version = "2022.11.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "natekspencer";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-E7rBRPtXa/E6jf75zULuGaiu2DHvq4hZjcwPwj/w9ww=";
+    hash = "sha256-GEKLkFzQV8xI3c8061fO1p66WKj3eDXmx7VaRYDu7kw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/pkgs/development/python-modules/pypcap/default.nix
@ -2,32 +2,22 @@
 , buildPythonPackage
 , dpkt
 , fetchFromGitHub
-, fetchpatch
 , libpcap
 , pytestCheckHook
 }:

 buildPythonPackage rec {
  pname = "pypcap";
-  version = "1.2.3";
-
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "pynetwork";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "1zscfk10jpqwxgc8d84y8bffiwr92qrg2b24afhjwiyr352l67cf";
+    # No release was tagged and PyPI doesn't contain tests.
+    rev = "968859f0ffb5b7c990506dffe82457b7de23a026";
+    sha256 = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE=";
  };

-  patches = [
-    # Support for Python 3.9, https://github.com/pynetwork/pypcap/pull/102
-    (fetchpatch {
-      name = "support-python-3.9.patch";
-      url = "https://github.com/pynetwork/pypcap/pull/102/commits/e22f5d25f0d581d19ef337493434e72cd3a6ae71.patch";
-      sha256 = "0n1syh1vcplgsf6njincpqphd2w030s3b2jyg86d7kbqv1w5wk0l";
-    })
-  ];
-
  postPatch = ''
    # Add the path to libpcap in the nix-store
    substituteInPlace setup.py --replace "('/usr', sys.prefix)" "'${libpcap}'"
--- a/Show More
+++ b/Show More