Merge remote-tracking branch 'origin/master' into haskell-updates

2023-06-08 20:16:04 +02:00 · 2023-06-08 20:16:04 +02:00 · cb7ccdccd7
commit cb7ccdccd7
parent f1ad505272 17d63282b2
225 changed files with 3727 additions and 3941 deletions
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@ -220,7 +220,9 @@ There are a few naming guidelines:

 - The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".

- If a package is not a release but a commit from a repository, then the `version` attribute _must_ be the date of that (fetched) commit. The date _must_ be in `"unstable-YYYY-MM-DD"` format.
+- If a package is a commit from a repository without a version assigned, then the `version` attribute _should_ be the latest upstream version preceding that commit, followed by `-unstable-` and the date of the (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format.
+
+Example: Given a project had its latest releases `2.2` in November 2021, and `3.0` in January 2022, a commit authored on March 15, 2022 for an upcoming bugfix release `2.2.1` would have `version = "2.2-unstable-2022-03-15"`.

 - Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.

--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -28,6 +28,8 @@

 - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides

+- `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details.
+
 - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.

 - `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@ -652,7 +652,7 @@ in {
      deps = [ "users" ];
      text = ''
        users=()
-        while IFS=: read -r user hash tail; do
+        while IFS=: read -r user hash _; do
          if [[ "$hash" = "$"* && ! "$hash" =~ ^\''$${cryptSchemeIdPatternGroup}\$ ]]; then
            users+=("$user")
          fi
--- a/nixos/modules/services/continuous-integration/github-runner.nix
+++ b/nixos/modules/services/continuous-integration/github-runner.nix
@ -21,5 +21,5 @@ in
    services.github-runners.${cfg.name} = cfg;
  };

-  meta.maintainers = with maintainers; [ veehaitch newam ];
+  meta.maintainers = with maintainers; [ veehaitch newam thomasjm ];
 }
--- a/nixos/modules/services/databases/foundationdb.md
+++ b/nixos/modules/services/databases/foundationdb.md
@ -6,7 +6,7 @@

 *Maintainer:* Austin Seipp

-*Available version(s):* 5.1.x, 5.2.x, 6.0.x
+*Available version(s):* 7.1.x

 FoundationDB (or "FDB") is an open source, distributed, transactional
 key-value store.
@ -17,7 +17,7 @@ To enable FoundationDB, add the following to your
 {file}`configuration.nix`:
 ```
 services.foundationdb.enable = true;
-services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
+services.foundationdb.package = pkgs.foundationdb71; # FoundationDB 7.1.x
 ```

 The {option}`services.foundationdb.package` option is required, and
@ -66,7 +66,7 @@ necessary Python modules).
 ```ShellSession
 a@link> cat fdb-status.py
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python pythonPackages.foundationdb52
+#! nix-shell -i python -p python pythonPackages.foundationdb71

 import fdb
 import json
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@ -42,10 +42,10 @@ in

    services.unifi.mongodbPackage = mkOption {
      type = types.package;
-      default = pkgs.mongodb-4_2;
+      default = pkgs.mongodb-4_4;
      defaultText = literalExpression "pkgs.mongodb";
      description = lib.mdDoc ''
-        The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.2.
+        The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.4.
      '';
    };

--- a/nixos/modules/services/video/unifi-video.nix
+++ b/nixos/modules/services/video/unifi-video.nix
@ -123,7 +123,7 @@ in

    mongodbPackage = mkOption {
      type = types.package;
-      default = pkgs.mongodb-4_2;
+      default = pkgs.mongodb-4_4;
      defaultText = literalExpression "pkgs.mongodb";
      description = lib.mdDoc ''
        The mongodb package to use.
--- a/nixos/modules/services/web-apps/mediawiki.nix
+++ b/nixos/modules/services/web-apps/mediawiki.nix
@ -8,7 +8,7 @@ let
  cfg = config.services.mediawiki;
  fpm = config.services.phpfpm.pools.mediawiki;
  user = "mediawiki";
-  group = if cfg.webserver == "apache" then "apache" else "mediawiki";
+  group = if cfg.webserver == "apache" then config.services.httpd.group else "mediawiki";

  cacheDir = "/var/cache/mediawiki";
  stateDir = "/var/lib/mediawiki";
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@ -217,7 +217,8 @@ in
      ''
        # Various log/runtime directories.

-        mkdir -m 1777 -p /var/tmp
+        mkdir -p /var/tmp
+        chmod 1777 /var/tmp

        # Empty, immutable home directory of many system accounts.
        mkdir -p /var/empty
@ -231,7 +232,8 @@ in

    system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
      then ''
-        mkdir -m 0755 -p /usr/bin
+        mkdir -p /usr/bin
+        chmod 0755 /usr/bin
        ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp
        mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
      ''
@ -251,7 +253,8 @@ in
          if mountpoint -q "$mountPoint"; then
            local options="remount,$options"
          else
-            mkdir -m 0755 -p "$mountPoint"
+            mkdir -p "$mountPoint"
+            chmod 0755 "$mountPoint"
          fi
          mount -t "$fsType" -o "$options" "$device" "$mountPoint"
        }
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@ -317,7 +317,8 @@ in {
    environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
      (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
    system.activationScripts.binfmt = stringAfter [ "specialfs" ] ''
-      mkdir -p -m 0755 /run/binfmt
+      mkdir -p /run/binfmt
+      chmod 0755 /run/binfmt
      ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
    '';
    systemd = lib.mkIf (config.boot.binfmt.registrations != {}) {
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@ -62,7 +62,6 @@ in {
        frontend = {};

        # include some popular integrations, that absolutely shouldn't break
-        esphome = {};
        knx = {};
        shelly = {};
        zha = {};
@ -198,7 +197,7 @@ in {

    with subtest("Check that new components get setup after restart"):
        journal = get_journal_since(cursor)
-        for domain in ["esphome"]:
+        for domain in ["backup"]:
            assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing"

    with subtest("Check that no errors were logged"):
--- a/nixos/tests/initrd-luks-empty-passphrase.nix
+++ b/nixos/tests/initrd-luks-empty-passphrase.nix
@ -18,6 +18,11 @@ in {
      emptyDiskImages = [ 512 ];
      useBootLoader = true;
      useEFIBoot = true;
+      # This requires to have access
+      # to a host Nix store as
+      # the new root device is /dev/vdb
+      # an empty 512MiB drive, containing no Nix store.
+      mountHostNixStore = true;
    };

    boot.loader.systemd-boot.enable = true;
--- a/nixos/tests/luks.nix
+++ b/nixos/tests/luks.nix
@ -7,6 +7,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
      emptyDiskImages = [ 512 512 ];
      useBootLoader = true;
      useEFIBoot = true;
+      # To boot off the encrypted disk, we need to have a init script which comes from the Nix store
+      mountHostNixStore = true;
    };
    boot.loader.systemd-boot.enable = true;

--- a/nixos/tests/lvm2/systemd-stage-1.nix
+++ b/nixos/tests/lvm2/systemd-stage-1.nix
@ -65,6 +65,8 @@ in import ../make-test-python.nix ({ pkgs, ... }: {
      emptyDiskImages = [ 8192 8192 ];
      useBootLoader = true;
      useEFIBoot = true;
+      # To boot off the LVM disk, we need to have a init script which comes from the Nix store.
+      mountHostNixStore = true;
    };
    boot.loader.systemd-boot.enable = true;
    boot.loader.efi.canTouchEfiVariables = true;
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@ -33,7 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
    nodes = {
      node = {...}: {
        environment.systemPackages = with pkgs; [
-          mongodb-4_2
          mongodb-4_4
          mongodb-5_0
        ];
@ -43,7 +42,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
    testScript = ''
      node.start()
    ''
-      + runMongoDBTest pkgs.mongodb-4_2
      + runMongoDBTest pkgs.mongodb-4_4
      + runMongoDBTest pkgs.mongodb-5_0
      + ''
--- a/nixos/tests/systemd-initrd-btrfs-raid.nix
+++ b/nixos/tests/systemd-initrd-btrfs-raid.nix
@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
    virtualisation = {
      emptyDiskImages = [ 512 512 ];
      useBootLoader = true;
+      # Booting off the BTRFS RAID requires an available init script from the Nix store
+      mountHostNixStore = true;
      useEFIBoot = true;
    };
    boot.loader.systemd-boot.enable = true;
--- a/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/nixos/tests/systemd-initrd-luks-fido2.nix
@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
    virtualisation = {
      emptyDiskImages = [ 512 ];
      useBootLoader = true;
+      # Booting off the encrypted disk requires having a Nix store available for the init script
+      mountHostNixStore = true;
      useEFIBoot = true;
      qemu.package = lib.mkForce (pkgs.qemu_test.override { canokeySupport = true; });
      qemu.options = [ "-device canokey,file=/tmp/canokey-file" ];
--- a/nixos/tests/systemd-initrd-luks-keyfile.nix
+++ b/nixos/tests/systemd-initrd-luks-keyfile.nix
@ -14,6 +14,8 @@ in {
    virtualisation = {
      emptyDiskImages = [ 512 ];
      useBootLoader = true;
+      # Necessary to boot off the encrypted disk because it requires a init script coming from the Nix store
+      mountHostNixStore = true;
      useEFIBoot = true;
    };
    boot.loader.systemd-boot.enable = true;
--- a/nixos/tests/systemd-initrd-luks-password.nix
+++ b/nixos/tests/systemd-initrd-luks-password.nix
@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
    virtualisation = {
      emptyDiskImages = [ 512 512 ];
      useBootLoader = true;
+      # Booting off the encrypted disk requires an available init script
+      mountHostNixStore = true;
      useEFIBoot = true;
    };
    boot.loader.systemd-boot.enable = true;
--- a/nixos/tests/systemd-initrd-luks-tpm2.nix
+++ b/nixos/tests/systemd-initrd-luks-tpm2.nix
@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
    virtualisation = {
      emptyDiskImages = [ 512 ];
      useBootLoader = true;
+      # Booting off the TPM2-encrypted device requires an available init script
+      mountHostNixStore = true;
      useEFIBoot = true;
      qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"];
    };
--- a/nixos/tests/systemd-initrd-networkd-ssh.nix
+++ b/nixos/tests/systemd-initrd-networkd-ssh.nix
@ -10,13 +10,15 @@ import ./make-test-python.nix ({ lib, ... }: {
      virtualisation = {
        emptyDiskImages = [ 4096 ];
        useBootLoader = true;
+        # Booting off the encrypted disk requires an available init script from the Nix store
+        mountHostNixStore = true;
        useEFIBoot = true;
      };

      specialisation.encrypted-root.configuration = {
-        virtualisation.bootDevice = "/dev/mapper/root";
+        virtualisation.rootDevice = "/dev/mapper/root";
        boot.initrd.luks.devices = lib.mkVMOverride {
-          root.device = "/dev/vdc";
+          root.device = "/dev/vdb";
        };
        boot.initrd.systemd.enable = true;
        boot.initrd.network = {
@ -61,7 +63,7 @@ import ./make-test-python.nix ({ lib, ... }: {

    server.wait_for_unit("multi-user.target")
    server.succeed(
-        "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdc",
+        "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb",
        "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf",
        "sync",
    )
--- a/nixos/tests/systemd-initrd-swraid.nix
+++ b/nixos/tests/systemd-initrd-swraid.nix
@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
    virtualisation = {
      emptyDiskImages = [ 512 512 ];
      useBootLoader = true;
+      # Booting off the RAID requires an available init script
+      mountHostNixStore = true;
      useEFIBoot = true;
    };
    boot.loader.systemd-boot.enable = true;
--- a/pkgs/applications/backup/ludusavi/default.nix
+++ b/pkgs/applications/backup/ludusavi/default.nix
@ -18,16 +18,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ludusavi";
-  version = "0.17.1";
+  version = "0.19.0";

  src = fetchFromGitHub {
    owner = "mtkennerly";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-LTqorrZ7hp9hFGcQ0rdc/U6st9YraXEftDpH7VEShs8=";
+    hash = "sha256-1Na+xGcb15/ZRbuy96qJwPg6Zo7FsGwCUXD3XgzWXo0=";
  };

-  cargoSha256 = "sha256-3SijgvIPb+QBAWZaTivw8P5aYjctGfgnVrFYcGl8PyE=";
+  cargoSha256 = "sha256-JjeOODm5xsRM5cJgCDb89cN60SuEeDzTVe6siKVDdcU=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/applications/editors/thiefmd/default.nix
+++ b/pkgs/applications/editors/thiefmd/default.nix
@ -1,46 +1,69 @@
-{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, cmake, desktop-file-utils, glib
-, meson, ninja, pkg-config, vala, clutter, discount, gtk3, gtksourceview4, gtkspell3
-, libarchive, libgee, libhandy, libsecret, link-grammar, webkitgtk }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, vala
+, pkg-config
+, wrapGAppsHook
+, desktop-file-utils
+, discount
+, glib
+, gtk3
+, gtksourceview4
+, gtkspell3
+, json-glib
+, libarchive
+, libgee
+, libhandy
+, libsecret
+, libxml2
+, link-grammar
+, webkitgtk_4_1
+}:

 stdenv.mkDerivation rec {
  pname = "thiefmd";
-  version = "0.2.5-stability";
+  version = "0.2.7";

  src = fetchFromGitHub {
    owner = "kmwallio";
    repo = "ThiefMD";
    rev = "v${version}";
-    sha256 = "sha256-cUZ7NVGe4e9ZISo9gjWFuDNCyF3rsQtrDX+ureyqtwM=";
+    hash = "sha256-noNfGFMeIyKhAgiovJDn91TLELAOQ4nD/5QlQfsKTII=";
    fetchSubmodules = true;
  };

  nativeBuildInputs = [
-    cmake desktop-file-utils glib meson wrapGAppsHook
-    ninja pkg-config vala
+    meson
+    ninja
+    vala
+    pkg-config
+    wrapGAppsHook
+    desktop-file-utils
  ];

  buildInputs = [
-    clutter discount gtk3 gtksourceview4 gtkspell3
-    libarchive libgee libhandy libsecret link-grammar
-    webkitgtk
+    discount # libmarkdown
+    glib
+    gtk3
+    gtksourceview4
+    gtkspell3
+    json-glib
+    libarchive
+    libgee
+    libhandy
+    libsecret
+    libxml2
+    link-grammar
+    webkitgtk_4_1
  ];

-  dontUseCmakeConfigure = true;
-
-  postInstall = ''
-    mv $out/share/applications/com.github.kmwallio.thiefmd.desktop \
-      $out/share/applications/thiefmd.desktop
-    substituteInPlace $out/share/applications/thiefmd.desktop \
-      --replace 'Exec=com.github.kmwallio.' Exec=$out/bin/
-
-    makeWrapper $out/bin/com.github.kmwallio.thiefmd \
-      $out/bin/thiefmd \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/"
-  '';
-
  meta = with lib; {
    description = "Markdown & Fountain editor that helps with organization and management";
    homepage = "https://thiefmd.com";
+    downloadPage = "https://github.com/kmwallio/ThiefMD";
+    mainProgram = "com.github.kmwallio.thiefmd";
    license = licenses.gpl3Only;
    platforms = platforms.linux;
    maintainers = with maintainers; [ wolfangaukang ];
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -173,12 +173,12 @@ final: prev:

  LazyVim = buildVimPluginFrom2Nix {
    pname = "LazyVim";
-    version = "2023-06-05";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "LazyVim";
      repo = "LazyVim";
-      rev = "56f092f1a8f37036253a5c1f1253d0eebac6dd61";
-      sha256 = "1bf2dsy1xgxzi9fb49jgqk6pqx68079lakaa4x0slaij0k0hlvi5";
+      rev = "0731f08ee43138b61eaf02ac00110babf61be99d";
+      sha256 = "1rkb321a8za0dp12vln131kc420al620v2c36n00kj2xk19qlk75";
    };
    meta.homepage = "https://github.com/LazyVim/LazyVim/";
  };
@ -2431,12 +2431,12 @@ final: prev:

  dart-vim-plugin = buildVimPluginFrom2Nix {
    pname = "dart-vim-plugin";
-    version = "2022-05-23";
+    version = "2023-06-05";
    src = fetchFromGitHub {
      owner = "dart-lang";
      repo = "dart-vim-plugin";
-      rev = "81e50e80329e5eac2c115f45585b1838a614d07a";
-      sha256 = "0xi8iv3ycam3ypcxl0zn418qi2m1g0zcbfj6zvdbnfbi0nbqwj9n";
+      rev = "0ba32c911178e6701d3f76d754c8138a7c7c2e6f";
+      sha256 = "0qz1d0immg9wc9ccqkn2i558jpv0v96g8zn7kd26dc3j1j64lpd4";
    };
    meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
  };
@ -2959,6 +2959,18 @@ final: prev:
    meta.homepage = "https://github.com/edgedb/edgedb-vim/";
  };

+  edgy-nvim = buildVimPluginFrom2Nix {
+    pname = "edgy.nvim";
+    version = "2023-06-06";
+    src = fetchFromGitHub {
+      owner = "folke";
+      repo = "edgy.nvim";
+      rev = "cb82974725e7730c847a5764f51da4b84361b502";
+      sha256 = "1ha7sqcbjf9jmiscqgd513fwp6x3pigrcb2l75jnx1nhh6nc1zxm";
+    };
+    meta.homepage = "https://github.com/folke/edgy.nvim/";
+  };
+
  editorconfig-vim = buildVimPluginFrom2Nix {
    pname = "editorconfig-vim";
    version = "2023-03-22";
@ -3839,12 +3851,12 @@ final: prev:

  haskell-tools-nvim = buildNeovimPluginFrom2Nix {
    pname = "haskell-tools.nvim";
-    version = "2023-06-04";
+    version = "2023-06-05";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "haskell-tools.nvim";
-      rev = "33bac7b297df2b16df82f1465decfa13069b1ce1";
-      sha256 = "1r82ykba0nzyja8kgrk770895ihbggn6c839c3sbgn0vc8drc0np";
+      rev = "c8084560f5d449053b8d13d0a21ef0c7619fd886";
+      sha256 = "05w403gc8p3c4c7n1485dn9zqzz12jx3c00g07pc0j5623a3idip";
    };
    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
  };
@ -4439,12 +4451,12 @@ final: prev:

  lazy-nvim = buildVimPluginFrom2Nix {
    pname = "lazy.nvim";
-    version = "2023-06-03";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "lazy.nvim";
-      rev = "f145e6f42a56306c5536e9efbfe41f7efbec285d";
-      sha256 = "0dllxvrnyfxij710lkwq99m4vfwsabnh47dx4nrl5x0gbplaw6m9";
+      rev = "ae25448d39fb2bdc38a139339233270edec44484";
+      sha256 = "03vdi199hxngfmkaizqgdwh7vxg86pw0ngmmv87vx8hnl9il8gps";
    };
    meta.homepage = "https://github.com/folke/lazy.nvim/";
  };
@ -5555,12 +5567,12 @@ final: prev:

  neodev-nvim = buildVimPluginFrom2Nix {
    pname = "neodev.nvim";
-    version = "2023-06-04";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "91bebf70e2c50c1d298752b74a34ca9da3c04f85";
-      sha256 = "1mz33za6a1vrvbx7bxw497bzpmhnwgiandmgg3xhr6zjym22kzvk";
+      rev = "1dffaffd6eadd39daba4a102d1ead42dd198e2c2";
+      sha256 = "1146pjml56rgis3waxha40dlg0r3a3d5n65mim9jac9l91pbl76y";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };
@ -5651,12 +5663,12 @@ final: prev:

  neorg = buildVimPluginFrom2Nix {
    pname = "neorg";
-    version = "2023-06-05";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "nvim-neorg";
      repo = "neorg";
-      rev = "45efa0e606cd403fead47dd7b199f6b5c9a0a68b";
-      sha256 = "09754m3r6yz563sl1g100cxpzf8pz6cpikhqznn5xalv1d7c10si";
+      rev = "474af829b0f3e25e09e68d2842ffcb6ca24d359b";
+      sha256 = "054901bdaw6a0aqwdxbm66cii0h03inyrww7k0dw6ahbni7rswgp";
    };
    meta.homepage = "https://github.com/nvim-neorg/neorg/";
  };
@ -6083,12 +6095,12 @@ final: prev:

  nlsp-settings-nvim = buildVimPluginFrom2Nix {
    pname = "nlsp-settings.nvim";
-    version = "2023-06-04";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "f6e8784d53908060b507a777c57449b472fbae97";
-      sha256 = "0p8l1gwphc8d6z5yyb95i3p800sbdh9p3ha2kinfxmk978jf0a2y";
+      rev = "8f136a9e341b8ef9d306d8ed378f023f179c9501";
+      sha256 = "0ca15pxv66k7hvfwd8cg9wf44075n3m353mqm7q86dr041f5zhc8";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -6131,12 +6143,12 @@ final: prev:

  noice-nvim = buildVimPluginFrom2Nix {
    pname = "noice.nvim";
-    version = "2023-06-04";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "noice.nvim";
-      rev = "7b14678f83ad1a875b1bcea34de4377ebfb50973";
-      sha256 = "05y8lz4r4rmjbnma7zv3fz0lknlgby6385sai92zkh5a959bj51x";
+      rev = "acf47e2b863eb20f177aa1bd5398041513e731e1";
+      sha256 = "1w4vzkashi7yqkzgb9cdq7nv27ibkw94ih041jf36k9axmlffqbr";
    };
    meta.homepage = "https://github.com/folke/noice.nvim/";
  };
@ -6191,12 +6203,12 @@ final: prev:

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2023-05-30";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "c89333e034a8daba654ebfcf9a4ec9f87765f01e";
-      sha256 = "1kpyh1y5p0cazbvcm9cazkc93giqbbngm9zk1pf5qxrl18217cqh";
+      rev = "a138b14099e9623832027ea12b4631ddd2a49256";
+      sha256 = "1jgsh1jkyxfj6cjz9sh4b80k83nlqi83kbd1c7jnqz5x98lybi1p";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -6359,12 +6371,12 @@ final: prev:

  nvim-cokeline = buildVimPluginFrom2Nix {
    pname = "nvim-cokeline";
-    version = "2023-06-03";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "willothy";
      repo = "nvim-cokeline";
-      rev = "dce9f06d939b85abb5222939874343e3100a4c0d";
-      sha256 = "1vbv63klkzcl2szz146f8251xc60px0yfsh3i79cbaknrskmmj8d";
+      rev = "7fb6753c8fb90eebb6b56f86fc6e65468a23c81c";
+      sha256 = "18japvpc1rrvsb6ycjzixqgrcabwyd8aq94a35k271liyk3i5i7g";
    };
    meta.homepage = "https://github.com/willothy/nvim-cokeline/";
  };
@ -6695,12 +6707,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-06-05";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "664de12a7816dfa348bb475607edfa4fe0122025";
-      sha256 = "0f2068l6kcrxxvk9wk8gxswqj0f3f6w6dm1nzmbcvqv4j5mvwnps";
+      rev = "00d7063cdca8d39eb4e3308277cc21eae7bb44f7";
+      sha256 = "0s4lwpafikfjl4kbp7dpll0akz1ir11bw5zgcy2zll2z2zdsb447";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -6899,12 +6911,12 @@ final: prev:

  nvim-scrollview = buildVimPluginFrom2Nix {
    pname = "nvim-scrollview";
-    version = "2023-06-05";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "b0aee8d8a8ec4bb4b1d8152b8748ae6da37cd39c";
-      sha256 = "1fphw6g9h2b3dk8xxjvmyxhcmw7b27y0jq0g3ybx9wnqac3w06m0";
+      rev = "b4a7bb3f54e180e6203071ffa80f375bef9239fd";
+      sha256 = "014bis349y6j2ll17xbanikcaw0v54yiz69pi8k1pmkif7n08c6d";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -8982,12 +8994,12 @@ final: prev:

  telescope-manix = buildNeovimPluginFrom2Nix {
    pname = "telescope-manix";
-    version = "2023-05-29";
+    version = "2023-06-05";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "telescope-manix";
-      rev = "86f40f1d562e344851e2d9df853c8f058db33c38";
-      sha256 = "0br5naafzrzrmr4qzdhl6j8557c4m4d6agqzphn9fcd8q6faphk8";
+      rev = "3930d658899dff2c796d8a5b488f7cc77a08d966";
+      sha256 = "030v85lihjhvma9m22j1xc37wm06g4jkmhlmxpv1hsafff8cmxhq";
    };
    meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
  };
@ -9524,12 +9536,12 @@ final: prev:

  typescript-nvim = buildVimPluginFrom2Nix {
    pname = "typescript.nvim";
-    version = "2023-01-03";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "typescript.nvim";
-      rev = "f66d4472606cb24615dfb7dbc6557e779d177624";
-      sha256 = "1hm87jpscv250x8hv3vacw0sdhkwa81x21cxyvc6nf2vsbj5hx9w";
+      rev = "5b3680e5c386e8778c081173ea0c978c14a40ccb";
+      sha256 = "0ixxgbcz8y42xlbin2dv3ycrlrgjd53shi9i8iyy0kxpr57cjldz";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
  };
@ -11432,12 +11444,12 @@ final: prev:

  vim-gruvbox8 = buildVimPluginFrom2Nix {
    pname = "vim-gruvbox8";
-    version = "2023-06-05";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "lifepillar";
      repo = "vim-gruvbox8";
-      rev = "6bf129b4d65fad40ce4317f0ac34f9708afc7f0e";
-      sha256 = "00i8xfbzjs8d0fpmsvrysc1p6hnk6z95d61q7nc1hkx14hlc5w0l";
+      rev = "75614aff9669abd7f8b0aae58fdfbaddfebee1e0";
+      sha256 = "0bszxd8f0qyydx0w9dff46spc36s35jdpgshr616wlfwpgi4l1z4";
    };
    meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
  };
@ -13607,12 +13619,12 @@ final: prev:

  vim-solarized8 = buildVimPluginFrom2Nix {
    pname = "vim-solarized8";
-    version = "2023-06-02";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "lifepillar";
      repo = "vim-solarized8";
-      rev = "2b5bad7944c6990a8dd31ff519268b174b587a70";
-      sha256 = "1z45y9cvkavffb8hjj9gq2r2hlha9v0g7cijcirpa7rlpz486qm3";
+      rev = "77a6bd78a6f1f8b6f841fc7e1ea427b2348ac1b7";
+      sha256 = "072y01039s2gimnsvibwfb499r0wqbwqk7n8ykqilf6y298r1m2g";
    };
    meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
  };
@ -15110,12 +15122,12 @@ final: prev:

  lspsaga-nvim-original = buildVimPluginFrom2Nix {
    pname = "lspsaga-nvim-original";
-    version = "2023-06-01";
+    version = "2023-06-06";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "c475ace5b8882631b351ef7c3e8078ca9ebbb751";
-      sha256 = "1dg96sg0262nm2rzq6h80f51grc4www7ljcx6c7j3l8p0c003gha";
+      rev = "4f075452c466df263e69ae142f6659dcf9324bf6";
+      sha256 = "0p7lqf8562z7wnjiijniqs9pn36n16gywpm940lbz724g5lykm4q";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -247,6 +247,7 @@ https://github.com/stevearc/dressing.nvim/,,
 https://github.com/Shougo/echodoc.vim/,,
 https://github.com/sainnhe/edge/,,
 https://github.com/edgedb/edgedb-vim/,,
+https://github.com/folke/edgy.nvim/,HEAD,
 https://github.com/editorconfig/editorconfig-vim/,,
 https://github.com/gpanders/editorconfig.nvim/,,
 https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
--- a/pkgs/applications/emulators/pcsx2/default.nix
+++ b/pkgs/applications/emulators/pcsx2/default.nix
@ -1,90 +1,110 @@
-{ alsa-lib
-, cmake
+{ cmake
 , fetchFromGitHub
+, lib
+, stdenv
+, curl
+, ffmpeg
 , fmt
 , gettext
-, glib
-, gtk3
 , harfbuzz
-, lib
 , libaio
+, libbacktrace
 , libpcap
-, libpng
 , libpulseaudio
 , libsamplerate
-, libXdmcp
-, openssl
-, pcre
-, perl
+, libXrandr
+, libzip
 , pkg-config
-, portaudio
+, qtbase
+, qtsvg
+, qttools
+, qttranslations
+, qtwayland
+, rapidyaml
 , SDL2
 , soundtouch
-, stdenv
-, udev
 , vulkan-headers
 , vulkan-loader
-, wrapGAppsHook
-, wxGTK
-, zlib
 , wayland
+, wrapQtAppsHook
+, xz
+, zip
 }:

+let
+  # The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves
+  pcsx2_patches = fetchFromGitHub {
+    owner = "PCSX2";
+    repo = "pcsx2_patches";
+    rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1";
+    sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4=";
+  };
+in
 stdenv.mkDerivation rec {
  pname = "pcsx2";
-  version = "1.7.3331";
-  # nixpkgs-update: no auto update
+  version = "1.7.4554";

  src = fetchFromGitHub {
    owner = "PCSX2";
    repo = "pcsx2";
    fetchSubmodules = true;
    rev = "v${version}";
-    hash = "sha256-0RcmBMxKj/gnkNEjn2AUSSO1DzyNSf1lOZWPSUq6764=";
+    sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8=";
  };

  cmakeFlags = [
    "-DDISABLE_ADVANCE_SIMD=TRUE"
-    "-DDISABLE_PCSX2_WRAPPER=TRUE"
-    "-DPACKAGE_MODE=TRUE"
-    "-DWAYLAND_API=TRUE"
-    "-DXDG_STD=TRUE"
-    "-DUSE_VULKAN=TRUE"
+    "-DUSE_SYSTEM_LIBS=ON"
+    "-DDISABLE_BUILD_DATE=TRUE"
  ];

-  nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook zip ];

  buildInputs = [
-    alsa-lib
+    curl
+    ffmpeg
    fmt
    gettext
-    glib
-    gtk3
    harfbuzz
    libaio
+    libbacktrace
    libpcap
-    libpng
    libpulseaudio
    libsamplerate
-    libXdmcp
-    openssl
-    pcre
-    portaudio
+    libXrandr
+    libzip
+    qtbase
+    qtsvg
+    qttools
+    qttranslations
+    qtwayland
+    rapidyaml
    SDL2
    soundtouch
-    udev
+    vulkan-headers
    vulkan-loader
    wayland
-    wxGTK
-    zlib
+    xz
  ];

-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
-    )
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a bin/pcsx2-qt bin/resources $out/bin/
+
+    install -Dm644 $src/pcsx2/Resources/AppIcon64.png $out/share/pixmaps/PCSX2.png
+    install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
+
+    zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
  '';

+  qtWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
+      ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
+      libpulseaudio
+      vulkan-loader
+    ]}"
+  ];
+
  meta = with lib; {
    description = "Playstation 2 emulator";
    longDescription = ''
@ -95,13 +115,9 @@ stdenv.mkDerivation rec {
      PC, with many additional features and benefits.
    '';
    homepage = "https://pcsx2.net";
+    license = with licenses; [ gpl3 lgpl3 ];
    maintainers = with maintainers; [ hrdinka govanify ];
-
-    # PCSX2's source code is released under LGPLv3+. It However ships
-    # additional data files and code that are licensed differently.
-    # This might be solved in future, for now we should stick with
-    # license.free
-    license = licenses.free;
+    mainProgram = "pcsx2-qt";
    platforms = platforms.x86_64;
  };
 }
--- a/pkgs/applications/kde/angelfish.nix
+++ b/pkgs/applications/kde/angelfish.nix
@ -22,7 +22,7 @@
 , srcs

 # provided as callPackage input to enable easier overrides through overlays
-, cargoSha256 ? "sha256-whMfpElpFB7D+dHHJrbwINFL4bVpHTlcZX+mdBfiqEE="
+, cargoSha256 ? "sha256-Cgcat/ZJH8I/RzUVWaO24R2lh+tB5foqDnH8Yjs4K1k="
 }:

 mkDerivation rec {
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.1/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.2/src -A '*.tar.xz' )
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildDotnetModule
 , fetchFromGitHub
 , dotnetCorePackages
@ -7,19 +6,18 @@
 , zlib
 , openssl
 , callPackage
-, stdenvNoCC
 }:

 buildDotnetModule rec {
  pname = "archisteamfarm";
  # nixpkgs-update: no auto update
-  version = "5.4.5.2";
+  version = "5.4.6.3";

  src = fetchFromGitHub {
    owner = "justarchinet";
    repo = pname;
    rev = version;
-    sha256 = "sha256-l3qcdgTTpbI4Jdy1jpzyCiAFglJfzBHkb6hLIZ4hDKQ=";
+    hash = "sha256-TAGb3LPS0Jpm3dGGkQbrtTBFCE/xos2ZbNq5UwnrGZY=";
  };

  dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
--- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix
@ -61,7 +61,7 @@
  (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
-  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; })
+  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.0"; sha256 = "02s98d8nwz5mg4mymcr86qdamy71a29g2091xg452czmd3s3x2di"; })
  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
  (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
@ -71,14 +71,14 @@
  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
-  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
+  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.0"; sha256 = "1bnwpwg7k72z06027ip4yi222863r8sv14ck9nj8h64ckiw2r256"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
  (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.0"; sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i"; })
  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; })
-  (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; })
+  (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.3"; sha256 = "12f5h28115vv7j17whq7f9fwnww3p7iwfbkq3m24m0si303cgqbw"; })
+  (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.3"; sha256 = "0d9nmgj97qpd4w8x609amcawmcywm2q0r2w1p2hvyah0p5s9m0f3"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
  (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@ -9,11 +9,11 @@ buildNpmPackage {
    repo = "ASF-ui";
    # updated by the update script
    # this is always the commit that should be used with asf-ui from the latest asf version
-    rev = "114c390c92a889b86cf560def28fb8f39bc4fe54";
-    sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826";
+    rev = "3078d92e8b8d79571b771f452a53d1789330c541";
+    hash = "sha256-K3YTgsde9aqtmKuFKjXpoWe6USGpKBlC6eeazuOYTqk=";
  };

-  npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU=";
+  npmDepsHash = "sha256-L+aWsGMUmIsPJRQ4XPg8WOWOqHKcfDQTqUK+vGBHi0Y=";

  installPhase = ''
    runHook preInstall
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
@ -10,20 +10,14 @@ pushd "$(dirname "$0")"
 ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)

 curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
-curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json

 # update-source-version doesn't work for some reason
 sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix
-sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
+sed -i "s/hash\\s*=\\s*.*/hash = \"$(nix-prefetch fetchurl --url "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix

-node2nix \
-  --nodejs-14 \
-  --development \
-  --lock package-lock.json \
-  --node-env ../../../../development/node-packages/node-env.nix \
-  --output node-packages.nix \
-  --composition node-composition.nix \
+npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
+sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix

-rm package.json package-lock.json
+rm package-lock.json

 popd
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.matthiasbeyer ];
    platforms = with lib.platforms; linux;
+    mainProgram = "vis";
  };
 }
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@ -8,13 +8,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "khal";
-  version = "0.11.1";
+  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "pimutils";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-5wBKo24EKdEUoYhhv1EqMPOjdwUS31d3R24kLdbyvPA=";
+    hash = "sha256-yI33pB/t+UISvSbLUzmsZqBxLF6r8R3j9iPNeosKcYw=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/applications/misc/oxker/default.nix
+++ b/pkgs/applications/misc/oxker/default.nix
@ -2,14 +2,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "oxker";
-  version = "0.3.0";
+  version = "0.3.1";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-VIsop0XjadZQecKRbt+2U2qrMVmPaLZGUuMEY8v+aJ8=";
+    sha256 = "sha256-35MHq2G2L7yfz+W9uUaRb8fpEp/h0bt2HtK615XwZG8=";
  };

-  cargoHash = "sha256-wBTbHHCNZvp1xc6iiK6LzBFYsF9RPHA74YM6SDv6x94=";
+  cargoHash = "sha256-goIb8BoHSF0g/OWmeZtha+qKlcvLTqwMmYcD2uYUI7E=";

  meta = with lib; {
    description = "A simple tui to view & control docker containers";
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@ -6,9 +6,9 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "spicetify";
-    repo = pname;
+    repo = "spicetify-cli";
    rev = "v${version}";
-    sha256 = "sha256-6pOFDQqzxA1eHI66BHL9Yst1PtGyJzhmFveCErBA2pU=";
+    hash = "sha256-6pOFDQqzxA1eHI66BHL9Yst1PtGyJzhmFveCErBA2pU=";
  };

  vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";
--- a/pkgs/applications/misc/sticky/default.nix
+++ b/pkgs/applications/misc/sticky/default.nix
@ -12,14 +12,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "sticky";
-  version = "1.14";
+  version = "1.16";
  format = "other";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E=";
+    hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM=";
  };

  postPatch = ''
--- a/pkgs/applications/misc/waycorner/default.nix
+++ b/pkgs/applications/misc/waycorner/default.nix
@ -0,0 +1,40 @@
+{ lib
+, makeWrapper
+, rustPlatform
+, pkg-config
+, fetchFromGitHub
+, wayland
+,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "waycorner";
+  version = "0.2.1";
+  src = fetchFromGitHub {
+    owner = "AndreasBackx";
+    repo = "waycorner";
+    rev = version;
+    hash = "sha256-xvmvtn6dMqt8kUwvn5d5Nl1V84kz1eWa9BSIN/ONkSQ=";
+  };
+  cargoHash = "sha256-Dl+GhJywWhaC4QMS70klazPsFipGVRW+6jrXH2XsEAI=";
+  buildInputs = [
+    wayland
+  ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+  postFixup = ''
+    # the program looks for libwayland-client.so at runtime
+    wrapProgram $out/bin/waycorner \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}
+  '';
+
+  meta = with lib; {
+    description = "Hot corners for Wayland";
+    changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md";
+    homepage = "https://github.com/AndreasBackx/waycorner";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ NotAShelf ];
+  };
+}
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@ -167,7 +167,8 @@ stdenv.mkDerivation {

      for executable in \
        firefox firefox-bin plugin-container \
-        updater crashreporter webapprt-stub
+        updater crashreporter webapprt-stub \
+        glxtest vaapitest
      do
        if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then
          patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--- a/pkgs/applications/networking/cluster/clusterctl/default.nix
+++ b/pkgs/applications/networking/cluster/clusterctl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "clusterctl";
-  version = "1.4.2";
+  version = "1.4.3";

  src = fetchFromGitHub {
    owner = "kubernetes-sigs";
    repo = "cluster-api";
    rev = "v${version}";
-    hash = "sha256-NvCQs6YzQ2zNLQiYgFK/q2c74g/+YkzQIQJWEINOYIE=";
+    hash = "sha256-OtA7mhypPNDD7IH5XKOoE2ytcjR0uhed8B3MoMrPd0Y=";
  };

-  vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE=";
+  vendorHash = "sha256-QzD0Stbr8QuQ8n9l9qv16KFqSFBsRbxETmQ8LHdk3nI=";

  subPackages = [ "cmd/clusterctl" ];

@ -43,6 +43,6 @@ buildGoModule rec {
    description = "Kubernetes cluster API tool";
    homepage = "https://cluster-api.sigs.k8s.io/";
    license = licenses.asl20;
-    maintainers = with maintainers; [ zowoq ];
+    maintainers = with maintainers; [ zowoq qjoly ];
  };
 }
--- a/pkgs/applications/networking/cluster/pinniped/default.nix
+++ b/pkgs/applications/networking/cluster/pinniped/default.nix
@ -2,18 +2,18 @@

 buildGoModule rec{
  pname = "pinniped";
-  version = "0.23.0";
+  version = "0.24.0";

  src = fetchFromGitHub {
    owner = "vmware-tanzu";
    repo = "pinniped";
    rev = "v${version}";
-    sha256 = "sha256-noWNklLRYW0l7fGBnsTQk8v5t+mwKheh0egHxL+YxAE=";
+    sha256 = "sha256-v1VuCM6sMNVj6nAVuqphDUVGBc3k0oYJWt9TJb/3fP4=";
  };

  subPackages = "cmd/pinniped";

-  vendorHash = "sha256-P28L+IHZ+To08Y4gdv/VldAoVcMnCPlZDxy7xe5OP8o=";
+  vendorHash = "sha256-k3fFr83LPY10ASLERzUO/8ojZgx3LLGFEIjMxaGehTs=";

  ldflags = [ "-s" "-w" ];

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -64,13 +64,13 @@
    "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
  },
  "archive": {
-    "hash": "sha256-GHHhIfBFlc5LlwsDLvpVhlJd5Fp4X2tU26h9PYjgz4Y=",
+    "hash": "sha256-fhKN7aqQlurzKB568LC7wt0yikUrsEjS8vngMedqQY8=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/archive",
    "owner": "hashicorp",
    "repo": "terraform-provider-archive",
-    "rev": "v2.3.0",
+    "rev": "v2.4.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M="
+    "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4="
  },
  "argocd": {
    "hash": "sha256-orABx+1OgvlKaLhUNYALJl9pbKHag/oFDALx5S0XdLs=",
@ -566,13 +566,13 @@
    "vendorHash": null
  },
  "ibm": {
-    "hash": "sha256-0ZIm6OTVTfbWcPMWsLNxmD3QDDbB72lvwsISkiWzcFQ=",
+    "hash": "sha256-uJf3SB86kTOSKGhS1Psg5to439xfzPqJkrCmoy1gozs=",
    "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
    "owner": "IBM-Cloud",
    "repo": "terraform-provider-ibm",
-    "rev": "v1.53.0",
+    "rev": "v1.54.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bcCiNWwVSLI3F3ikTx8z/TtkbgjLAB8puSFTC9LTEMU="
+    "vendorHash": "sha256-pdjCemr2kg+5E677rgeGtphp+YMmIdvuyv9AjmPBygE="
  },
  "icinga2": {
    "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -963,13 +963,13 @@
    "vendorHash": null
  },
  "scaleway": {
-    "hash": "sha256-+WNvmkQvqupSYQDlY/57nyaV6kH2wvQLsb+uAJuGaaw=",
+    "hash": "sha256-YP3cf247RKp0LJMtNhZ03JBTOEF/RKU77CuQu0Bty3M=",
    "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
    "owner": "scaleway",
    "repo": "terraform-provider-scaleway",
-    "rev": "v2.20.0",
+    "rev": "v2.21.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-dSnq0iU1ANuOyTNZQfy7FRjEIL2HG2ZJFNTe6iaBe5U="
+    "vendorHash": "sha256-rz/toAnr8Bn8OImPnb337NhQbDc1TdAS9aRtyOnHZKw="
  },
  "secret": {
    "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1044,11 +1044,11 @@
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
  },
  "spotinst": {
-    "hash": "sha256-0Y9fJFiPLIuurA6OKKnbTvuUe0xFoSyZLQFPkh/LIvY=",
+    "hash": "sha256-NFmyz5CdZoSucKib5SUVNc+m5yXUUNxO7LSMXJtFRJk=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.122.0",
+    "rev": "v1.122.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-hfg3XyBf5V+NJTzCoHbnTU4HkEdQsllqcH2NjeTmlf0="
  },
@ -1180,12 +1180,12 @@
    "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="
  },
  "vault": {
-    "hash": "sha256-eTHdmow16TJ/uJ4M5yFiYrwuYo4kYSnkPXymxAYVjuw=",
+    "hash": "sha256-J7jYFqcXWOZaBwfuR9ZyoYPIq8QKYbZ6I+ZpAKDuZhQ=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
    "owner": "hashicorp",
    "proxyVendor": true,
    "repo": "terraform-provider-vault",
-    "rev": "v3.15.2",
+    "rev": "v3.16.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="
  },
--- a/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix
@ -5,15 +5,7 @@
 , installShellFiles
 , installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
 , installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
-, pkg-config
-, Security
-, libiconv
-, openssl
 , notmuch
-, withRusttlsTls ? true
-, withRusttlsNativeCerts ? withRusttlsTls
-, withNativeTls ? false
-, withNativeTlsVendored ? withNativeTls
 , withImapBackend ? true
 , withNotmuchBackend ? false
 , withSmtpSender ? true
@ -21,31 +13,23 @@

 rustPlatform.buildRustPackage rec {
  pname = "himalaya";
-  version = "0.7.3";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "soywod";
    repo = pname;
    rev = "v${version}";
-    sha256 = "HmH4qL70ii8rS8OeUnUxsy9/wMx+f2SBd1AyRqlfKfc=";
+    hash = "sha256-kK/F3Geiuz0CgGSE0sCOfSZjg9gEPLyUEilzb+SdIM8=";
  };

-  cargoSha256 = "NJFOtWlfKZRLr9vvDvPQjpT4LGMeytk0JFJb0r77bwE=";
+  cargoSha256 = "4L09lWD8tRJvBPzQlSdk4aa1QY7sVw26OwgMzscN1j8=";

-  nativeBuildInputs = [ ]
-    ++ lib.optional (installManPages || installShellCompletions) installShellFiles
-    ++ lib.optional (withNativeTls && !stdenv.hostPlatform.isDarwin) pkg-config;
+  nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles;

-  buildInputs = [ ]
-    ++ lib.optional withNativeTls (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
-    ++ lib.optional withNotmuchBackend notmuch;
+  buildInputs = lib.optional withNotmuchBackend notmuch;

  buildNoDefaultFeatures = true;
  buildFeatures = [ ]
-    ++ lib.optional withRusttlsTls "rustls-tls"
-    ++ lib.optional withRusttlsNativeCerts "rustls-native-certs"
-    ++ lib.optional withNativeTls "native-tls"
-    ++ lib.optional withNativeTlsVendored "native-tls-vendored"
    ++ lib.optional withImapBackend "imap-backend"
    ++ lib.optional withNotmuchBackend "notmuch-backend"
    ++ lib.optional withSmtpSender "smtp-sender";
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@ -173,7 +173,8 @@ stdenv.mkDerivation {

      for executable in \
        thunderbird thunderbird-bin plugin-container \
-        updater crashreporter webapprt-stub
+        updater crashreporter webapprt-stub \
+        glxtest vaapitest
      do
        if [ -e "$out/usr/lib/thunderbird-bin-${version}/$executable" ]; then
          patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
+++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
@ -3,12 +3,12 @@ electron, libsecret }:

 stdenv.mkDerivation rec {
  pname = "tutanota-desktop";
-  version = "3.112.6";
+  version = "3.113.3";

  src = fetchurl {
    url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
    name = "tutanota-desktop-${version}.tar.gz";
-    sha256 = "sha256-Kqj6XQkwPU7pmR8JY8f7iMqpOYjvWxS5Yir/YTBPXjM=";
+    sha256 = "sha256-d4yvz0BE0YeZjcH9X/2eGAk5CmJI4CQWblVoU5CO77k=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@ -1,20 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }:
+{ lib, stdenv, fetchFromGitHub, jdk11, maven, javaPackages }:

 let
-  version = "0.9.6";
+  version = "0.10.1";

  src = fetchFromGitHub {
    owner = "gephi";
    repo = "gephi";
    rev = "v${version}";
-    sha256 = "sha256-3+tOwcE7TUeexJCugFsx9SgsKeb7ApNqbMEIi9QaKPE=";
+    hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
  };

  # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
  deps = stdenv.mkDerivation {
    name = "gephi-${version}-deps";
    inherit src;
-    buildInputs = [ jdk maven ];
+    buildInputs = [ jdk11 maven ];
    buildPhase = ''
      while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
        echo "timeout, restart maven to continue downloading"
@ -24,7 +24,7 @@ let
    installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
-    outputHash = "sha256-kIPsZN0alRAgiMbckQnMWKOKtCZ37D/6MgT17VYcr+s=";
+    outputHash = "sha256-OdW4M5nGEkYkmHpRLM4cBQtk4SJII2uqM8TXb6y4eXk=";
  };
 in
 stdenv.mkDerivation {
@ -33,7 +33,7 @@ stdenv.mkDerivation {

  inherit src;

-  buildInputs = [ jdk maven ];
+  buildInputs = [ jdk11 maven ];

  buildPhase = ''
    # 'maven.repo.local' must be writable so copy it out of nix store
@ -49,10 +49,10 @@ stdenv.mkDerivation {

    # use self-compiled JOGL to avoid patchelf'ing .so inside jars
    rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
-    cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
-    cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
+    cp ${javaPackages.jogl_2_4_0}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
+    cp ${javaPackages.jogl_2_4_0}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/

-    echo "jdkhome=${jdk}" >> $out/etc/gephi.conf
+    printf "\n\njdkhome=${jdk11}\n" >> $out/etc/gephi.conf
  '';

  meta = with lib; {
--- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@ -1,53 +1,80 @@
-{ lib, stdenv, fetchFromGitHub
-, libpng, gzip, fftw, blas, lapack
+{ lib
+, stdenv
+, fetchFromGitHub
+, libpng
+, gzip
+, fftw
+, blas
+, lapack
 , withMPI ? false
 , mpi
+, cmake
+# Available list of packages can be found near here:
+# https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222
+, packages ? {
+  ASPHERE = true;
+  BODY = true;
+  CLASS2 = true;
+  COLLOID = true;
+  COMPRESS = true;
+  CORESHELL = true;
+  DIPOLE = true;
+  GRANULAR = true;
+  KSPACE = true;
+  MANYBODY = true;
+  MC = true;
+  MISC = true;
+  MOLECULE = true;
+  OPT = true;
+  PERI = true;
+  QEQ = true;
+  REPLICA = true;
+  RIGID = true;
+  SHOCK = true;
+  ML-SNAP = true;
+  SRD = true;
+  REAXFF = true;
+}
 }:
-let packages = [
-     "asphere" "body" "class2" "colloid" "compress" "coreshell"
-     "dipole" "granular" "kspace" "manybody" "mc" "misc" "molecule"
-     "opt" "peri" "qeq" "replica" "rigid" "shock" "snap" "srd" "user-reaxc"
-    ];
-    lammps_includes = "-DLAMMPS_EXCEPTIONS -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64";
-in
+
 stdenv.mkDerivation rec {
  # LAMMPS has weird versioning converted to ISO 8601 format
-  version = "stable_29Oct2020";
+  version = "23Jun2022_update4";
  pname = "lammps";

  src = fetchFromGitHub {
    owner = "lammps";
    repo = "lammps";
-    rev = version;
-    sha256 = "1rmi9r5wj2z49wg43xyhqn9sm37n95cyli3g7vrqk3ww35mmh21q";
+    rev = "stable_${version}";
+    hash = "sha256-zGztc+iUFNIa0KKtfpAhwitInvMmXeTHp1XsOLibfzM=";
  };
+  preConfigure = ''
+    cd cmake
+  '';
+  nativeBuildInputs = [
+    cmake
+  ];

  passthru = {
    inherit mpi;
    inherit packages;
  };
+  cmakeFlags = [
+  ] ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages)));

-  buildInputs = [ fftw libpng blas lapack gzip ]
-    ++ (lib.optionals withMPI [ mpi ]);
+  buildInputs = [
+    fftw
+    libpng
+    blas
+    lapack
+    gzip
+  ] ++ lib.optionals withMPI [
+    mpi
+  ];

-  configurePhase = ''
-    cd src
-    for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done
-  '';
-
-  # Must do manual build due to LAMMPS requiring a separate build for
-  # the libraries and executable. Also non-typical make script
-  buildPhase = ''
-    make mode=exe ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
-    make mode=shlib ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/include $out/lib
-
-    cp -v lmp_* $out/bin/
-    cp -v *.h $out/include/
-    cp -v liblammps* $out/lib/
+  # For backwards compatibility
+  postInstall = ''
+    ln -s $out/bin/lmp $out/bin/lmp_serial
  '';

  meta = with lib; {
@ -62,6 +89,10 @@ stdenv.mkDerivation rec {
    homepage = "https://lammps.sandia.gov";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
-    maintainers = [ maintainers.costrouc ];
+    # compiling lammps with 64 bit support blas and lapack might cause runtime
+    # segfaults. In anycase both blas and lapack should have the same #bits
+    # support.
+    broken = (blas.isILP64 && lapack.isILP64);
+    maintainers = [ maintainers.costrouc maintainers.doronbehar ];
  };
 }
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@ -36,6 +36,34 @@
 , withPython ? with stdenv; buildPlatform.canExecute hostPlatform
 }:

+let filters = {
+      # "binary-name = package" where:
+      #  - "${package}/bin/${binary-name}" is the full path to the binary
+      #  - occurrences of `"${binary-name}"` in recoll's filters should be fixed up
+      awk = gawk;
+      antiword = antiword;
+      catppt = catdoc;
+      djvused = djvulibre;
+      djvutxt = djvulibre;
+      egrep = gnugrep;
+      groff = groff;
+      gunzip = gzip;
+      iconv = libiconv;
+      pdftotext = poppler_utils;
+      ps2ascii = ghostscript;
+      sed = gnused;
+      tar = gnutar;
+      unzip = unzip;
+      xls2csv = catdoc;
+      xsltproc = libxslt;
+      unrtf = unrtf;
+      untex = untex;
+      wpd2html = libwpd;
+      perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]);
+    };
+    filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters));
+in
+
 mkDerivation rec {
  pname = "recoll";
  version = "1.33.4";
@ -109,28 +137,15 @@ mkDerivation rec {
    substituteInPlace $out/share/recoll/filters/rclconfig.py       --replace /usr/share/recoll $out/share/recoll
    for f in $out/share/recoll/filters/* ; do
      if [[ ! "$f" =~ \.zip$ ]]; then
-        substituteInPlace $f --replace '"antiword"'  '"${lib.getBin antiword}/bin/antiword"'
-        substituteInPlace $f --replace '"awk"'       '"${lib.getBin gawk}/bin/awk"'
-        substituteInPlace $f --replace '"catppt"'    '"${lib.getBin catdoc}/bin/catppt"'
-        substituteInPlace $f --replace '"djvused"'   '"${lib.getBin djvulibre}/bin/djvused"'
-        substituteInPlace $f --replace '"djvutxt"'   '"${lib.getBin djvulibre}/bin/djvutxt"'
-        substituteInPlace $f --replace '"egrep"'     '"${lib.getBin gnugrep}/bin/egrep"'
-        substituteInPlace $f --replace '"groff"'     '"${lib.getBin groff}/bin/groff"'
-        substituteInPlace $f --replace '"gunzip"'    '"${lib.getBin gzip}/bin/gunzip"'
-        substituteInPlace $f --replace '"iconv"'     '"${lib.getBin libiconv}/bin/iconv"'
-        substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"'
+  '' + lib.concatStrings (lib.mapAttrsToList (k: v: (''
+        substituteInPlace $f --replace '"${k}"'  '"${lib.getBin v}/bin/${k}"'
+  '')) filters) + ''
        substituteInPlace $f --replace '"pstotext"'  '"${lib.getBin ghostscript}/bin/ps2ascii"'
-        substituteInPlace $f --replace '"sed"'       '"${lib.getBin gnused}/bin/sed"'
-        substituteInPlace $f --replace '"tar"'       '"${lib.getBin gnutar}/bin/tar"'
-        substituteInPlace $f --replace '"unzip"'     '"${lib.getBin unzip}/bin/unzip"'
-        substituteInPlace $f --replace '"xls2csv"'   '"${lib.getBin catdoc}/bin/xls2csv"'
-        substituteInPlace $f --replace '"xsltproc"'  '"${lib.getBin libxslt}/bin/xsltproc"'
-        substituteInPlace $f --replace '"unrtf"'     '"${lib.getBin unrtf}/bin/unrtf"'
-        substituteInPlace $f --replace '"untex"'     '"${lib.getBin untex}/bin/untex"'
-        substituteInPlace $f --replace '"wpd2html"'  '"${lib.getBin libwpd}/bin/wpd2html"'
-        substituteInPlace $f --replace /usr/bin/perl   ${lib.getBin perl}/bin/perl
+        substituteInPlace $f --replace /usr/bin/perl   ${lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))}/bin/perl
      fi
    done
+    wrapProgram $out/bin/recoll      --prefix PATH : "${filterPath}"
+    wrapProgram $out/bin/recollindex --prefix PATH : "${filterPath}"
    wrapProgram $out/share/recoll/filters/rclaudio.py \
      --prefix PYTHONPATH : $PYTHONPATH
    wrapProgram $out/share/recoll/filters/rclimg \
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "git-repo";
-  version = "2.32";
+  version = "2.34.1";

  src = fetchFromGitHub {
    owner = "android";
    repo = "tools_repo";
    rev = "v${version}";
-    sha256 = "sha256-WY77F4culQ1y8UDIhI117AHBL5mEk40s8HpP3+5muZI=";
+    hash = "sha256-jSHUtgghYI9Wgdf7RGYjVlq7iSJT612Lv5M2mq7L4EA=";
  };

  # Fix 'NameError: name 'ssl' is not defined'
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "gitoxide";
-  version = "0.25.0";
+  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "Byron";
    repo = "gitoxide";
    rev = "v${version}";
-    sha256 = "sha256-3U/gQz/tJ/IrDd7ZIusJWDEB4nlpTM4miYfTEeEonv4=";
+    sha256 = "sha256-RAcKnS7vLuzXBxasHBxjmrdxyVvexou0SmiVu6ysZOQ=";
  };

-  cargoHash = "sha256-VPOivxdqEWQdFYYhSZVe5ji8CS0dKQeElKPeHxfwg4A=";
+  cargoHash = "sha256-w2WfBQoccpE71jOrjeuNF6HPTfY6lxpzg/AUEIngSJo=";

  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ curl ] ++ (if stdenv.isDarwin
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@ -9,20 +9,31 @@

 buildGoModule rec {
  pname = "gvisor";
-  version = "20221102.1";
+  version = "20230529.0";

  # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
  # that can be used to build gvisor without bazel.
+  #
  # For updates, you should stick to the commits labeled "Merge release-** (automated)"
+  # Make sure to check that the tagged commit for a release aligns with the version in
+  # the message for good measure; e.g. the commit
+  #
+  #     142d38d770a07291877dc0d50b88b719dbef76dc is "Merge release-20230522.0-11-g919cfd12b (automated)"
+  #
+  # on the 'go' branch. But the mentioned commit, 919cfd12b..., is actually tagged as release-20230529.0
+  #
+  #    https://github.com/google/gvisor/releases/tag/release-202329.0
+  #
+  # Presumably this is a result of the release process. Handle with care.

  src = fetchFromGitHub {
    owner = "google";
    repo = "gvisor";
-    rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff";
-    sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o=";
+    rev = "142d38d770a07291877dc0d50b88b719dbef76dc";
+    hash = "sha256-Ukcjlz/6iUmDAUpQpIVfZHKbwK90Mt6fukcFaw64hQI=";
  };

-  vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU=";
+  vendorHash = "sha256-COr47mZ4tsbzMjkv63l+fexo0RL5lrBXeewak9CuZVk=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/data/icons/fluent-icon-theme/default.nix
+++ b/pkgs/data/icons/fluent-icon-theme/default.nix
@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g

 stdenvNoCC.mkDerivation rec {
  inherit pname;
-  version = "2023-02-01";
+  version = "2023-06-07";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    hash = "sha256-Plm05+5r6p9MabLmmh8kWitALGFalruBbhAgBhPCjRo=";
+    hash = "sha256-drEAjIY/lacqncSeVeNmeRX6v4PnLvGo66Na1fuFXRg=";
  };

  nativeBuildInputs = [ gtk3 jdupes ];
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a

 stdenvNoCC.mkDerivation rec {
  inherit pname;
-  version = "2023-02-23";
+  version = "2023-06-05";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    sha256 = "sha256-yXpHm/iXtBdEo6m8W7Itp3N9vrWRTb7S3aKi0X2RObo=";
+    sha256 = "sha256-qiHmA/K4hdXVSFzergGhgssKR+kXp3X0cqtX1X5ayM4=";
  };

  nativeBuildInputs = [ gtk3 jdupes ];
--- a/pkgs/desktops/cinnamon/bulky/default.nix
+++ b/pkgs/desktops/cinnamon/bulky/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "bulky";
-  version = "2.8";
+  version = "2.9";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "bulky";
    rev = version;
-    hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0=";
+    hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@ -155,20 +155,20 @@ stdenv.mkDerivation rec {
      -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
      {} +

-    sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
+    # All optional and may introduce circular dependency.
+    find ./files/usr/share/cinnamon/applets -type f -exec sed -i \
+      -e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \
+      {} +

-    sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
+    pushd ./files/usr/share/cinnamon/cinnamon-settings
+      substituteInPlace ./bin/capi.py                     --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"'
+      substituteInPlace ./bin/CinnamonGtkSettings.py      --replace "'python3'" "'${pythonEnv.interpreter}'"
+      substituteInPlace ./bin/SettingsWidgets.py          --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
+      substituteInPlace ./bin/Spices.py                   --replace "msgfmt" "${gettext}/bin/msgfmt"
+      substituteInPlace ./modules/cs_info.py              --replace "lspci" "${pciutils}/bin/lspci"
+    popd

-    sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-      -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
-
-    sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
-
-    sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
-
-    sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon  -i ./files/usr/bin/cinnamon-session-cinnamon2d
-
-    sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
+    sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}

    patchShebangs src/data-to-c.pl
  '';
@ -179,9 +179,16 @@ stdenv.mkDerivation rec {
      --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
    )

+    buildPythonPath "$out ${python3.pkgs.xapp}"
+
+    # https://github.com/NixOS/nixpkgs/issues/200397
+    patchPythonScript $out/bin/cinnamon-spice-updater
+
    # https://github.com/NixOS/nixpkgs/issues/129946
-    buildPythonPath "${python3.pkgs.xapp}"
    patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+
+    # Called as `pkexec cinnamon-settings-users.py`.
+    wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
  '';

  passthru = {
--- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
+++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
@ -5,14 +5,14 @@

 stdenvNoCC.mkDerivation rec {
  pname = "mint-cursor-themes";
-  version = "1.0.1";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    # They don't really do tags, this is just a named commit.
-    rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5";
-    hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk=";
+    rev = "d2c1428b499a347c291dafb13c89699fdbdd4be7";
+    hash = "sha256-i2Wf+OKwal9G5hkcAdmGSgX6txu1AHajqqPJdhpJoA0=";
  };

  installPhase = ''
--- a/pkgs/desktops/cinnamon/warpinator/default.nix
+++ b/pkgs/desktops/cinnamon/warpinator/default.nix
@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "warpinator";
-  version = "1.6.2";
+  version = "1.6.3";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
+    hash = "sha256-iCq2cwZgsq5/bJqjYuZ6dZLqz2nIpgHCrIQeMVxJNXY=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/cinnamon/xapp/default.nix
+++ b/pkgs/desktops/cinnamon/xapp/default.nix
@ -79,12 +79,11 @@ stdenv.mkDerivation rec {
    # Patch pastebin & inxi location
    sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
    sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
-
-    # Patch gtk3 module target dir
-    substituteInPlace libxapp/meson.build \
-         --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'"
  '';

+  # Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
+  PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
+
  meta = with lib; {
    homepage = "https://github.com/linuxmint/xapp";
    description = "Cross-desktop libraries and common resources";
--- a/pkgs/development/compilers/assemblyscript/default.nix
+++ b/pkgs/development/compilers/assemblyscript/default.nix
@ -0,0 +1,25 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "assemblyscript";
+  version = "0.27.5";
+
+  src = fetchFromGitHub {
+    owner = "AssemblyScript";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-3dWIYkiAA61xbUXJGmb/amjHmyXYoy16lLIAZR4sD5k=";
+  };
+
+  npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8=";
+
+  meta = with lib; {
+    homepage = "https://github.com/AssemblyScript/${pname}";
+    description = "A TypeScript-like language for WebAssembly";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lucperkins ];
+  };
+}
--- a/pkgs/development/compilers/erg/default.nix
+++ b/pkgs/development/compilers/erg/default.nix
@ -0,0 +1,63 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, makeWrapper
+, python3
+, which
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "erg";
+  version = "0.6.13";
+
+  src = fetchFromGitHub {
+    owner = "erg-lang";
+    repo = "erg";
+    rev = "v${version}";
+    hash = "sha256-XwQKtorE1HGRRCCtxQBVbl6O6aTs5Z2/W9n2Am40e8Q=";
+  };
+
+  cargoHash = "sha256-I4hQ78RTkCDKpq7HBNJsKqCiFL9004XvWdwtRdTQQkE=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    python3
+    which
+  ];
+
+  buildFeatures = [ "full" ];
+
+  env = {
+    BUILD_DATE = "1970/01/01 00:00:00";
+    GIT_HASH_SHORT = src.rev;
+  };
+
+  # TODO(figsoda): fix tests
+  doCheck = false;
+
+  # the build script is impure and also assumes we are in a git repository
+  postPatch = ''
+    rm crates/erg_common/build.rs
+  '';
+
+  preBuild = ''
+    export HOME=$(mktemp -d)
+    export CARGO_ERG_PATH=$HOME/.erg
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share
+    mv "$CARGO_ERG_PATH" $out/share/erg
+
+    wrapProgram $out/bin/erg \
+      --set-default ERG_PATH $out/share/erg
+  '';
+
+  meta = with lib; {
+    description = "A statically typed language that can deeply improve the Python ecosystem";
+    homepage = "https://github.com/erg-lang/erg";
+    changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@ -143,6 +143,20 @@
        return $ verbosity >= Verbose
  ''

+, ghcSrc ? (if rev != null then fetchgit else fetchurl) ({
+    inherit url sha256;
+  } // lib.optionalAttrs (rev != null) {
+    inherit rev;
+  })
+
+  # GHC's build system hadrian built from the GHC-to-build's source tree
+  # using our bootstrap GHC.
+, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian {
+    ghcSrc = ghcSrc;
+    ghcVersion = version;
+    userSettings = hadrianUserSettings;
+  }
+
 , #  Whether to build sphinx documentation.
  enableDocs ? (
    # Docs disabled for musl and cross because it's a large task to keep
@ -161,12 +175,6 @@
 assert !enableNativeBignum -> gmp != null;

 let
-  src = (if rev != null then fetchgit else fetchurl) ({
-    inherit url sha256;
-  } // lib.optionalAttrs (rev != null) {
-    inherit rev;
-  });
-
  inherit (stdenv) buildPlatform hostPlatform targetPlatform;

  inherit (bootPkgs) ghc;
@ -188,14 +196,6 @@ let
      "*.*.ghc.c.opts += -optc-std=gnu99"
    ];

-  # GHC's build system hadrian built from the GHC-to-build's source tree
-  # using our bootstrap GHC.
-  hadrian = bootPkgs.callPackage ../../tools/haskell/hadrian {
-    ghcSrc = src;
-    ghcVersion = version;
-    userSettings = hadrianUserSettings;
-  };
-
  # Splicer will pull out correct variations
  libDeps = platform: lib.optional enableTerminfo ncurses
    ++ lib.optionals (!targetPlatform.isGhcjs) [libffi]
@ -258,7 +258,7 @@ stdenv.mkDerivation ({
  pname = "${targetPrefix}ghc${variantSuffix}";
  inherit version;

-  inherit src;
+  src = ghcSrc;

  enableParallelBuilding = true;

--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, jekyll, fetchFromGitHub }:
+{ stdenv, lib, jekyll, cmake, fetchFromGitHub, gtest }:

 stdenv.mkDerivation rec {
  pname = "jsonnet";
@ -12,28 +12,21 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";
  };

-  nativeBuildInputs = [ jekyll ];
+  nativeBuildInputs = [ jekyll cmake ];
+  buildInputs = [ gtest ];
+
+  cmakeFlags = ["-DBUILD_STATIC_LIBS=ON" "-DUSE_SYSTEM_GTEST=ON" ];

  enableParallelBuilding = true;

-  makeFlags = [
-    "jsonnet"
-    "jsonnetfmt"
-    "libjsonnet.so"
-  ];
-
  # Upstream writes documentation in html, not in markdown/rst, so no
  # other output formats, sorry.
-  preBuild = ''
-    jekyll build --source ./doc --destination ./html
+  postBuild = ''
+    jekyll build --source ../doc --destination ./html
  '';

-  installPhase = ''
-    mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet
-    cp jsonnet $out/bin/
-    cp jsonnetfmt $out/bin/
-    cp libjsonnet*.so $out/lib/
-    cp -a include/*.h $out/include/
+  postInstall = ''
+    mkdir -p $out/share/doc/jsonnet
    cp -r ./html $out/share/doc/jsonnet
  '';

--- 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 = "M4h";
+  milestone_id = "M4i";
  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";
-      hash = "sha256-7yphap7qZBkbTKiwhyCTLgbBO/aA0eUWtva+XjpaZDI=";
+      hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw=";
    }
  else
    fetchurl {
      url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
-      hash = "sha256-vrZpYFoQw1hxgZ7lAoejIqnjIOFFMahAI9SjFN/Cnms=";
+      hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk=";
    };

  # The tarball is just the prebuilt binary, in the archive root.
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
  owner = "QuickChick";
  inherit version;
  defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
-      { cases = [ (range "8.13" "8.16") pred.true  ]; out = "1.6.4"; }
+      { cases = [ (range "8.13" "8.17") pred.true  ]; out = "1.6.5"; }
      { cases = [ "8.13" pred.true  ]; out = "1.5.0"; }
      { cases = [ "8.12" pred.true  ]; out = "1.4.0"; }
      { cases = [ "8.11" pred.true  ]; out = "1.3.2"; }
@ -17,6 +17,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
      { cases = [ "8.6"  pred.true  ];  out = "20171102"; }
      { cases = [ "8.5"  pred.true  ];  out = "20170512"; }
    ] null;
+  release."1.6.5".sha256    = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U=";
  release."1.6.4".sha256    = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM=";
  release."1.6.2".sha256    = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
  release."1.5.0".sha256    = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
--- a/pkgs/development/coq-modules/gappalib/default.nix
+++ b/pkgs/development/coq-modules/gappalib/default.nix
@ -6,7 +6,8 @@ mkCoqDerivation {
  owner = "gappa";
  domain = "gitlab.inria.fr";
  inherit version;
-  defaultVersion = if lib.versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null;
+  defaultVersion = if lib.versions.range "8.8" "8.17" coq.coq-version then "1.5.3" else null;
+  release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s=";
  release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM=";
  release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg";
  release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n";
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@ -1,14 +1,15 @@
 { lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }:

-mkCoqDerivation {
+(mkCoqDerivation {
  pname = "simple-io";
  owner = "Lysxia";
  repo = "coq-simple-io";
  inherit version;
  defaultVersion = with lib.versions; lib.switch coq.coq-version [
-    { case = range "8.11" "8.16"; out = "1.7.0"; }
+    { case = range "8.11" "8.17"; out = "1.8.0"; }
    { case = range "8.7"  "8.13"; out = "1.3.0"; }
  ] null;
+  release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY=";
  release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
  release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
  mlPlugin = true;
@ -26,4 +27,7 @@ mkCoqDerivation {
    license = licenses.mit;
    maintainers = [ maintainers.vbgl ];
  };
-}
+}).overrideAttrs (o: lib.optionalAttrs (lib.versionAtLeast o.version "1.8.0" || o.version == "dev") {
+  doCheck = false;
+  useDune = true;
+})
--- a/pkgs/development/coq-modules/simple-io/test.nix
+++ b/pkgs/development/coq-modules/simple-io/test.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation {

  checkPhase = ''
    cd test
-    for p in Argv.v Example.v HelloWorld.v TestExtraction.v TestPervasives.v
+    for p in Argv.v Example.v HelloWorld.v TestExtraction.v TestOcamlbuild.v TestPervasives.v
    do
      [ -f $p ] && echo $p && coqc $p
    done
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@ -1,6 +1,81 @@
-{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
+{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet }:

 {
+  jogl_2_4_0 =
+    let
+      version = "2.4.0";
+
+      gluegen-src = fetchgit {
+        url = "git://jogamp.org/srv/scm/gluegen.git";
+        rev = "v${version}";
+        hash = "sha256-qQzq7v2vMFeia6gXaNHS3AbOp9HhDRgISp7P++CKErA=";
+        fetchSubmodules = true;
+      };
+      jogl-src = fetchgit {
+        url = "git://jogamp.org/srv/scm/jogl.git";
+        rev = "v${version}";
+        hash = "sha256-PHDq7uFEQfJ2P0eXPUi0DGFR1ob/n5a68otgzpFnfzQ=";
+        fetchSubmodules = true;
+      };
+    in
+    stdenv.mkDerivation {
+      pname = "jogl";
+      inherit version;
+
+      srcs = [ gluegen-src jogl-src ];
+      sourceRoot = ".";
+
+      unpackCmd = "cp -r $curSrc \${curSrc##*-}";
+
+      nativeBuildInputs = [ ant jdk11 git xmlstarlet ];
+      buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ];
+
+      # Workaround build failure on -fno-common toolchains:
+      #   ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
+      #     `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
+      NIX_CFLAGS_COMPILE = "-fcommon"; # copied from 2.3.2, is this still needed?
+
+      buildPhase = ''
+        ( cd gluegen/make
+          substituteInPlace ../src/java/com/jogamp/common/util/IOUtil.java --replace '#!/bin/true' '#!${coreutils}/bin/true'
+
+          # set timestamp of files in jar to a fixed point in time
+          xmlstarlet ed --inplace \
+             --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
+             build.xml gluegen-cpptasks-base.xml
+
+          ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
+
+        ( cd jogl/make
+
+          # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
+          # if arm/aarch64 support will be added, this block might be commented out on those platforms
+          # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
+          xmlstarlet ed --inplace --delete '//*[@if="setup.addNativeBroadcom"]' build-newt.xml
+
+          # set timestamp of files in jar to a fixed point in time
+          xmlstarlet ed --inplace \
+             --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
+             build.xml build-nativewindow.xml build-jogl.xml
+
+          ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
+      '';
+
+      installPhase = ''
+        mkdir -p $out/share/java
+        cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
+        cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar  $out/share/java/
+        cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-amd64,-os-drm,-os-x11}.jar  $out/share/java/
+      '';
+
+      meta = with lib; {
+        description = "Java libraries for 3D Graphics, Multimedia and Processing";
+        homepage = "https://jogamp.org/";
+        license = licenses.bsd3;
+        platforms = [ "x86_64-linux" ];
+      };
+    };
+
  jogl_2_3_2 =
    let
      version = "2.3.2";
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "cpp-utilities";
-  version = "5.22.0";
+  version = "5.23.0";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-c36FzKDAaalKVIrqVSCoslrKVopW77cGdGwfiMbaXe4=";
+    sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , ninja
 , openssl
@ -16,23 +15,19 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "duckdb";
-  version = "0.7.1";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-dCPWrB/Jqm4/kS6J/3jcQG291tFKAZSEptEYLGOZsLo=";
+    hash = "sha256-w01QB3mufeKdo4d0BBm6xiidnnyo9CLpmntT6690leM=";
  };

  patches = [ ./version.patch ];

  postPatch = ''
    substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"
-    substituteInPlace tools/shell/CMakeLists.txt \
-      --replace \
-      'install(TARGETS shell RUNTIME DESTINATION "''${PROJECT_BINARY_DIR}")' \
-      'install(TARGETS shell RUNTIME DESTINATION "''${INSTALL_BIN_DIR}")'
  '';

  nativeBuildInputs = [ cmake ninja ];
@ -90,6 +85,16 @@ stdenv.mkDerivation rec {
        "test/sql/copy/parquet/delta_byte_array_length_mismatch.test"
        "test/sql/function/timestamp/test_icu_strptime.test"
        "test/sql/timezone/test_icu_timezone.test"
+        "test/sql/copy/parquet/snowflake_lineitem.test"
+        "test/sql/copy/parquet/test_parquet_force_download.test"
+        "test/sql/copy/parquet/delta_byte_array_multiple_pages.test"
+        "test/sql/copy/csv/test_csv_httpfs_prepared.test"
+        "test/sql/copy/csv/test_csv_httpfs.test"
+        "test/sql/copy/csv/parallel/test_parallel_csv.test"
+        "test/sql/copy/csv/parallel/csv_parallel_httpfs.test"
+        "test/common/test_cast_struct.test"
+        # test is order sensitive
+        "test/sql/copy/parquet/parquet_glob.test"
        # these are only hidden if no filters are passed in
        "[!hide]"
        # this test apparently never terminates
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@ -16,11 +16,11 @@

 stdenv.mkDerivation rec {
  pname = "eccodes";
-  version = "2.30.0";
+  version = "2.30.2";

  src = fetchurl {
    url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "sha256-s9yTidBYQaLpyVeqUgmIpUwmBRY95kt+c8CEqu0fw8Q=";
+    sha256 = "sha256-ObleQiGxFtyBhlbQTIKIQFXUiuuqKZDCWeqM3/2kJYI=";
  };

  postPatch = ''
--- a/pkgs/development/libraries/hyperscan/default.nix
+++ b/pkgs/development/libraries/hyperscan/default.nix
@ -9,25 +9,22 @@
 #         which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
 #         I not see any reason (for now) to backport 8.41.

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "hyperscan";
-  version = "5.4.0";
+  version = "5.4.2";

  src = fetchFromGitHub {
    owner = "intel";
-    repo = pname;
-    sha256 = "sha256-AJAjaXVnGqIlMk+gb6lpTLUdZr8nxn2XSW4fj6j/cmk=";
-    rev = "v${version}";
+    repo = "hyperscan";
+    hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk=";
+    rev = "v${finalAttrs.version}";
  };

  outputs = [ "out" "dev" ];

  buildInputs = [ boost ];
  nativeBuildInputs = [
-    cmake ragel python3
-    # Consider simply using busybox for these
-    # Need at least: rev, sed, cut, nm
-    util-linux
+    cmake ragel python3 util-linux
  ];

  cmakeFlags = [
@ -37,14 +34,6 @@ stdenv.mkDerivation rec {
  ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";

-  patches = [
-    (fetchpatch {
-      # part of https://github.com/intel/hyperscan/pull/336
-      url = "https://github.com/intel/hyperscan/commit/e2c4010b1fc1272cab816ba543940b3586e68a0c.patch";
-      sha256 = "sha256-doVNwROL6MTcgOW8jBwGTnxe0zvxjawiob/g6AvXLak=";
-    })
-  ];
-
  postPatch = ''
    sed -i '/examples/d' CMakeLists.txt
    substituteInPlace libhs.pc.in \
@ -69,7 +58,7 @@ stdenv.mkDerivation rec {

    homepage = "https://www.hyperscan.io/";
    maintainers = with maintainers; [ avnik ];
-    platforms = [ "x86_64-linux" ]; # can't find nm on darwin ; might build on aarch64 but untested
+    platforms = [ "x86_64-linux" ];
    license = licenses.bsd3;
  };
-}
+})
--- a/pkgs/development/libraries/libdeltachat/Cargo.lock
+++ b/pkgs/development/libraries/libdeltachat/Cargo.lock
@ -88,6 +88,12 @@ dependencies = [
 "alloc-no-stdlib",
 ]

+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@ -112,6 +118,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
 [[package]]
 name = "anyhow"
 version = "1.0.71"
@ -209,7 +221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
 dependencies = [
 "async-channel",
- "base64 0.21.0",
+ "base64 0.21.2",
 "byte-pool",
 "chrono",
 "futures",
@ -270,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]

 [[package]]
@ -287,17 +299,6 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@ -312,7 +313,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
 dependencies = [
 "async-trait",
 "axum-core",
- "base64 0.21.0",
+ "base64 0.21.2",
 "bitflags 1.3.2",
 "bytes",
 "futures-util",
@ -403,9 +404,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"

 [[package]]
 name = "base64ct"
@ -655,13 +656,13 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
 "iana-time-zone",
 "js-sys",
- "num-integer",
 "num-traits",
 "time 0.1.45",
 "wasm-bindgen",
@ -707,24 +708,29 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "3.2.23"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
 dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
+dependencies = [
+ "anstyle",
 "bitflags 1.3.2",
 "clap_lex",
- "indexmap",
- "textwrap",
 ]

 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"

 [[package]]
 name = "clipboard-win"
@ -854,20 +860,20 @@ dependencies = [

 [[package]]
 name = "criterion"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
 dependencies = [
 "anes",
- "atty",
 "cast",
 "ciborium",
 "clap",
 "criterion-plot",
 "futures",
+ "is-terminal",
 "itertools",
- "lazy_static",
 "num-traits",
+ "once_cell",
 "oorandom",
 "plotters",
 "rayon",
@ -977,6 +983,16 @@ dependencies = [
 "typenum",
 ]

+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@ -1144,7 +1160,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@ -1154,7 +1170,7 @@ dependencies = [
 "async-smtp",
 "async_zip",
 "backtrace",
- "base64 0.21.0",
+ "base64 0.21.2",
 "brotli",
 "chrono",
 "criterion",
@ -1183,6 +1199,7 @@ dependencies = [
 "parking_lot",
 "percent-encoding",
 "pgp",
+ "pretty_assertions",
 "pretty_env_logger",
 "proptest",
 "qrcodegen",
@ -1219,18 +1236,19 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
 "anyhow",
 "async-channel",
 "axum",
- "base64 0.21.0",
+ "base64 0.21.2",
 "deltachat",
- "env_logger 0.10.0",
+ "env_logger",
 "futures",
 "log",
 "num-traits",
 "sanitize-filename",
+ "schemars",
 "serde",
 "serde_json",
 "tempfile",
@ -1242,7 +1260,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
 "ansi_term",
 "anyhow",
@ -1257,12 +1275,12 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
 "anyhow",
 "deltachat",
 "deltachat-jsonrpc",
- "env_logger 0.10.0",
+ "env_logger",
 "futures-lite",
 "log",
 "serde",
@ -1277,12 +1295,12 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]

 [[package]]
 name = "deltachat_ffi"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
 "anyhow",
 "deltachat",
@ -1295,6 +1313,7 @@ dependencies = [
 "serde_json",
 "thiserror",
 "tokio",
+ "yerpc",
 ]

 [[package]]
@ -1399,6 +1418,12 @@ dependencies = [
 "cipher",
 ]

+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@ -1496,6 +1521,12 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "dyn-clone"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+
 [[package]]
 name = "ecdsa"
 version = "0.14.8"
@ -1766,26 +1797,13 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
- "humantime 2.1.0",
+ "humantime",
 "is-terminal",
 "log",
 "regex",
@ -2058,7 +2076,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]

 [[package]]
@ -2166,9 +2184,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
 dependencies = [
 "bytes",
 "fnv",
@ -2213,15 +2231,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"

-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.2.6"
@ -2329,15 +2338,6 @@ dependencies = [
 "libm 0.2.6",
 ]

-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error 1.2.3",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@ -2530,7 +2530,7 @@ checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546"
 dependencies = [
 "abao",
 "anyhow",
- "base64 0.21.0",
+ "base64 0.21.2",
 "blake3",
 "bytes",
 "default-net",
@ -2661,9 +2661,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"

 [[package]]
 name = "libm"
@ -2722,12 +2722,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"

 [[package]]
 name = "lru-cache"
@ -3083,9 +3080,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

 [[package]]
 name = "oorandom"
@ -3171,12 +3168,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
 [[package]]
 name = "ouroboros"
 version = "0.15.6"
@ -3200,6 +3191,15 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "output_vt100"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@ -3326,9 +3326,9 @@ dependencies = [

 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"

 [[package]]
 name = "pgp"
@ -3337,7 +3337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0"
 dependencies = [
 "aes",
- "base64 0.21.0",
+ "base64 0.21.2",
 "bitfield",
 "block-padding",
 "blowfish",
@ -3545,12 +3545,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

 [[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
+name = "pretty_assertions"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
 dependencies = [
- "env_logger 0.7.1",
+ "ctor",
+ "diff",
+ "output_vt100",
+ "yansi",
+]
+
+[[package]]
+name = "pretty_env_logger"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
+dependencies = [
+ "env_logger",
 "log",
 ]

@ -3589,24 +3601,23 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.55"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "proptest"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70"
+checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
 dependencies = [
 "bitflags 1.3.2",
 "byteorder",
 "lazy_static",
 "num-traits",
- "quick-error 2.0.1",
 "rand 0.8.5",
 "rand_chacha 0.3.1",
 "rand_xorshift",
@ -3644,12 +3655,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
 [[package]]
 name = "quick-xml"
 version = "0.28.2"
@ -3709,9 +3714,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
 "proc-macro2",
 ]
@ -3881,13 +3886,13 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.7.1",
+ "regex-syntax 0.7.2",
 ]

 [[package]]
@ -3907,17 +3912,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

 [[package]]
 name = "reqwest"
-version = "0.11.17"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
 "bytes",
 "encoding_rs",
 "futures-core",
@ -3955,7 +3960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
 "hostname",
- "quick-error 1.2.3",
+ "quick-error",
 ]

 [[package]]
@ -4137,7 +4142,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
 ]

 [[package]]
@ -4209,6 +4214,30 @@ dependencies = [
 "windows-sys 0.42.0",
 ]

+[[package]]
+name = "schemars"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@ -4293,9 +4322,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
 "serde_derive",
 ]
@ -4320,13 +4349,24 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]

 [[package]]
@ -4351,9 +4391,9 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
 dependencies = [
 "serde",
 ]
@ -4633,9 +4673,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
 "proc-macro2",
 "quote",
@ -4765,7 +4805,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]

 [[package]]
@ -4843,9 +4883,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.28.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
 "autocfg",
 "bytes",
@ -4878,7 +4918,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]

 [[package]]
@ -4960,9 +5000,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
 dependencies = [
 "serde",
 "serde_spanned",
@ -4972,18 +5012,18 @@ dependencies = [

 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
 dependencies = [
 "indexmap",
 "serde",
@ -5288,9 +5328,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"

 [[package]]
 name = "uuid"
-version = "1.3.2"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
 dependencies = [
 "getrandom 0.2.8",
 "serde",
@ -5689,9 +5729,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

 [[package]]
 name = "winnow"
-version = "0.4.1"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
 dependencies = [
 "memchr",
 ]
@ -5743,6 +5783,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
 [[package]]
 name = "yasna"
 version = "0.5.1"
@ -5754,9 +5800,9 @@ dependencies = [

 [[package]]
 name = "yerpc"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a0257f42e6bdc187f37074723b6094da3502cee21ae517b3c54d2c37d506e7"
+checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96"
 dependencies = [
 "anyhow",
 "async-channel",
@ -5766,6 +5812,7 @@ dependencies = [
 "futures",
 "futures-util",
 "log",
+ "schemars",
 "serde",
 "serde_json",
 "tokio",
@ -5776,9 +5823,9 @@ dependencies = [

 [[package]]
 name = "yerpc_derive"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd53ff9053698697b92c2535bf7ecb983fd5d546d690b7c725e5070d6d9a620"
+checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94"
 dependencies = [
 "convert_case 0.5.0",
 "darling 0.14.3",
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "libdeltachat";
-  version = "1.115.0";
+  version = "1.116.0";

  src = fetchFromGitHub {
    owner = "deltachat";
    repo = "deltachat-core-rust";
    rev = "v${version}";
-    hash = "sha256-GAU/v2/MwvgqtZnvp2wwrKpPXhzr5g7QxVngR+pt35c=";
+    hash = "sha256-fSTte2rqy0w4zk9Vh4y3/UWplR0hvwdBqSoSYjoUhPg=";
  };

  patches = [
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@ -13,7 +13,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "liblouis";
-  version = "3.25.0";
+  version = "3.26.0";

  outputs = [ "out" "dev" "info" "doc" ]
    # configure: WARNING: cannot generate manual pages while cross compiling
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "liblouis";
    repo = "liblouis";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-On5PbBgvDAeD41oGb5EKBtKvi/VXnLsVrTMX7tcwnq4=";
+    hash = "sha256-Kko9qBWdNiZ61Wbb7lUYoSNU1hhRUexPcU3pADv0UHo=";
  };

  strictDeps = true;
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@ -22,13 +22,13 @@ let

  # determine the version number, there might be different ones per architecture
  version = {
-    x86_64-linux = "21.9.0.0.0";
+    x86_64-linux = "21.10.0.0.0";
    aarch64-linux = "19.10.0.0.0";
    x86_64-darwin = "19.8.0.0.0";
  }.${stdenv.hostPlatform.system} or throwSystem;

  directory = {
-    x86_64-linux = "219000";
+    x86_64-linux = "2110000";
    aarch64-linux = "191000";
    x86_64-darwin = "198000";
  }.${stdenv.hostPlatform.system} or throwSystem;
@ -36,11 +36,11 @@ let
  # hashes per component and architecture
  hashes = {
    x86_64-linux = {
-      basic = "sha256-wiygUvZFYvjp5pndv3b9yTPxe8sC5HZkJ7jZqO1Mss8=";
-      sdk = "sha256-ehqHV52yLRe8ehrKqpLaN0HnN3zjHU7WrfjtqvQadgY=";
-      sqlplus = "sha256-tYvoG+7l5jXyTpxFUYZXaHCT0xGDeah78AinJ2qIsE8=";
-      tools = "sha256-6K2Ni0ZqqpqCrGFrBD06s0QNjNEDtNPrvDQ1U97lTKY=";
-      odbc = "sha256-yTANMLhaEqm9/ZEVqhEn1Gl8eJukgvqpqdaMRjxWxgs=";
+      basic = "sha256-uo0QBOmx7TQyroD+As60IhjEkz//+0Cm1tWvLI3edaE=";
+      sdk = "sha256-TIBFi1jHLJh+SUNFvuL7aJpxh61hG6gXhFIhvdPgpts=";
+      sqlplus = "sha256-mF9kLjhZXe/fasYDfmZrYPL2CzAp3xDbi624RJDA4lM=";
+      tools = "sha256-ay8ynzo1fPHbCg9GoIT5ja//iZPIZA2yXI/auVExiRY=";
+      odbc = "sha256-3M6/cEtUrIFzQay8eHNiLGE+L0UF+VTmzp4cSBcrzlk=";
    };
    aarch64-linux = {
      basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY=";
--- a/pkgs/development/libraries/rapidyaml/default.nix
+++ b/pkgs/development/libraries/rapidyaml/default.nix
@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+, git
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rapidyaml";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "biojppm";
+    repo = pname;
+    fetchSubmodules = true;
+    rev = "v${version}";
+    sha256 = "sha256-1/P6Szgng94UU8cPFAtOKMS+EmiwfW/IJl2UTolDU5s=";
+  };
+
+  nativeBuildInputs = [ cmake git ];
+
+  meta = with lib; {
+    description = "A library to parse and emit YAML, and do it fast.";
+    homepage = "https://github.com/biojppm/rapidyaml";
+    license = licenses.mit;
+    maintainers = with maintainers; [ martfont ];
+  };
+}
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@ -30,13 +30,13 @@

 stdenv.mkDerivation rec {
  pname = "vte";
-  version = "0.72.1";
+  version = "0.72.2";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-BVT5+I1Wzi14OY/Mf2m8AOU7u8X2lOCuHcr1KG+J1+Q=";
+    sha256 = "sha256-95Zv0YWmmB9TlkFitxz+9+YGSVFV1vWCe3KqDdZ0HJ4=";
  };

  patches = [
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@ -1,7 +1,9 @@
-{ lib, fetchFromGitHub, buildDunePackage
-, calendar, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib
+{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
+, calendar, camlp-streams, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib
 }:

+let with-camlp-streams = lib.optional (lib.versionAtLeast ocaml.version "5.0"); in
+
 buildDunePackage rec {
  pname = "pgocaml";
  version = "4.3.0";
@ -12,10 +14,16 @@ buildDunePackage rec {
    hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY=";
  };

-  minimalOCamlVersion = "4.08";
-  duneVersion = "3";
+  # Compatibility with OCaml ≥ 5.0
+  patches = with-camlp-streams (fetchpatch {
+    url = "https://github.com/darioteixeira/pgocaml/commit/906a289dc57da4971e312c31eedd26d81e902ed5.patch";
+    hash = "sha256-/v9Jheg98GhrcD2gcsQpPvq7YiIrvJj22SKvrBRlR9Y=";
+  });

-  propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ];
+  minimalOCamlVersion = "4.08";
+
+  propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]
+  ++ with-camlp-streams camlp-streams;

  meta = with lib; {
    description = "An interface to PostgreSQL databases for OCaml applications";
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@ -1,5 +1,8 @@
 { lib, stdenv, fetchFromGitHub, ocaml, findlib }:

+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "twt is not available for OCaml ${ocaml.version}"
+
 stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-twt";
  version = "0.94.0";
--- a/pkgs/development/ocaml-modules/vlq/default.nix
+++ b/pkgs/development/ocaml-modules/vlq/default.nix
@ -1,7 +1,10 @@
-{ lib, buildDunePackage, fetchurl
+{ lib, buildDunePackage, fetchurl, ocaml
 , dune-configurator
 }:

+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "vlq is not available for OCaml ${ocaml.version}"
+
 buildDunePackage rec {
  pname = "vlq";
  version = "0.2.1";
@ -11,8 +14,6 @@ buildDunePackage rec {
    sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi";
  };

-  useDune2 = true;
-
  buildInputs = [ dune-configurator ];

  meta = {
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@ -1,6 +1,7 @@
 { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:

 if lib.versionOlder ocaml.version "4.08"
+|| lib.versionAtLeast ocaml.version "5.0"
 then throw "wasm is not available for OCaml ${ocaml.version}"
 else

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

 buildPythonPackage rec {
  pname = "accuweather";
-  version = "0.5.2";
+  version = "1.0.0";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "bieniu";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-rXA5A80PWn08VPeimJeMNWMGvzaE/gWrRuJseHiDkRg=";
+    hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA=";
  };

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

 buildPythonPackage rec {
  pname = "aioairzone";
-  version = "0.5.5";
+  version = "0.6.3";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "Noltari";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-6PBNwCfh5ryR3Jub3GDykY6lRQt9wdkV8yWkvivuQpM=";
+    hash = "sha256-grUfhUc8U7d7GgUa8TfvSPYOYr4IW1mZM0tl6I5gUdg=";
  };

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

 buildPythonPackage rec {
  pname = "anthropic";
-  version = "0.2.9";
+  version = "0.2.10";
  format = "pyproject";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-LURWTTYsztbo5mI2bk3n+U3NxsthNGpeUoNZsK/B8vM=";
+    hash = "sha256-5NoGGobY/7hgcsCw/q8hmjpPff3dQiTfm6dp5GlJjBk=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/bambi/default.nix
+++ b/pkgs/development/python-modules/bambi/default.nix
@ -12,11 +12,14 @@
 , pandas
 , pymc
 , scipy
+, setuptools
 }:

 buildPythonPackage rec {
  pname = "bambi";
  version = "0.10.0";
+  format = "pyproject";
+
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
@ -26,6 +29,10 @@ buildPythonPackage rec {
    hash = "sha256-D04eTAlckEqgKA+59BRljlyneHYoqqZvLYmt/gBLHcU=";
  };

+  nativeBuildInputs = [
+    setuptools
+  ];
+
  propagatedBuildInputs = [
    arviz
    formulae
@ -35,7 +42,9 @@ buildPythonPackage rec {
    scipy
  ];

-  preCheck = ''export HOME=$(mktemp -d)'';
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';

  nativeCheckInputs = [
    blackjax
@ -43,13 +52,24 @@ buildPythonPackage rec {
    numpyro
    pytestCheckHook
  ];
+
  disabledTests = [
-    # attempt to fetch data:
+    # Tests require network access
+    "test_custom_prior"
    "test_data_is_copied"
+    "test_distributional_model"
+    "test_gamma_with_splines"
+    "test_non_distributional_model_with_categories"
+    "test_non_distributional_model"
+    "test_normal_with_splines"
    "test_predict_offset"
+    # Assertion issue
+    "test_custom_likelihood_function"
  ];

-  pythonImportsCheck = [ "bambi" ];
+  pythonImportsCheck = [
+    "bambi"
+  ];

  meta = with lib; {
    homepage = "https://bambinos.github.io/bambi";
--- a/pkgs/development/python-modules/cacheyou/default.nix
+++ b/pkgs/development/python-modules/cacheyou/default.nix
@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, cherrypy
+, fetchPypi
+, filelock
+, msgpack
+, pdm-backend
+, pytestCheckHook
+, pythonOlder
+, redis
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "cacheyou";
+  version = "23.3";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  __darwinAllowLocalNetworking = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-fkCPFfSXj+oiR3NLMIYh919/4Wm0YWeVGccuioXWHV0=";
+  };
+
+  nativeBuildInputs = [
+    pdm-backend
+  ];
+
+  propagatedBuildInputs = [
+    msgpack
+    requests
+  ];
+
+  passthru.optional-dependencies = {
+    filecache = [
+      filelock
+    ];
+    redis = [
+      redis
+    ];
+  };
+
+  nativeCheckInputs = [
+    cherrypy
+    pytestCheckHook
+  ] ++ passthru.optional-dependencies.filecache;
+
+  pythonImportsCheck = [
+    "cacheyou"
+  ];
+
+  meta = {
+    description = "The httplib2 caching algorithms packaged up for use with requests";
+    homepage = "https://github.com/frostming/cacheyou";
+    changelog = "https://github.com/frostming/cacheyou/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
 , fetchFromGitHub
 , rustPlatform
 , pytestCheckHook
@ -17,22 +16,22 @@ let
    name = "arrow-testing";
    owner = "apache";
    repo = "arrow-testing";
-    rev = "47f7b56b25683202c1fd957668e13f2abafc0f12";
-    hash = "sha256-ZDznR+yi0hm5O1s9as8zq5nh1QxJ8kXCRwbNQlzXpnI=";
+    rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88";
+    hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8=";
  };

  parquet-testing = fetchFromGitHub {
    name = "parquet-testing";
    owner = "apache";
    repo = "parquet-testing";
-    rev = "b2e7cc755159196e3a068c8594f7acbaecfdaaac";
-    hash = "sha256-IFvGTOkaRSNgZOj8DziRj88yH5JRF+wgSDZ5N0GNvjk=";
+    rev = "e13af117de7c4f0a4d9908ae3827b3ab119868f3";
+    hash = "sha256-rVI9zyk9IRDlKv4u8BeMb0HRdWLfCpqOlYCeUdA7BB8=";
  };
 in

 buildPythonPackage rec {
  pname = "datafusion";
-  version = "23.0.0";
+  version = "25.0.0";
  format = "pyproject";

  src = fetchFromGitHub {
@ -40,13 +39,13 @@ buildPythonPackage rec {
    owner = "apache";
    repo = "arrow-datafusion-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-ndee7aNmoTtZyfl9UUXdNVHkp0GAuJWkyfZJyRrGwn8=";
+    hash = "sha256-oC+fp41a9rsdobpvShZ7sDdtYPJQQ7JLg6MFL+4Pksg=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    name = "datafusion-cargo-deps";
    inherit src pname version;
-    hash = "sha256-eDweEc+7dDbF0WBi6M5XAPIiHRjlYAdf2eNJdwj4D7c=";
+    hash = "sha256-0e0ZRgwcS/46mi4c2loAnBA2bsaD+/RiMh7oNg3EvHY=";
  };

  nativeBuildInputs = with rustPlatform; [
--- a/pkgs/development/python-modules/devolo-plc-api/default.nix
+++ b/pkgs/development/python-modules/devolo-plc-api/default.nix
@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , httpx
 , protobuf
 , pytest-asyncio
@ -10,12 +9,13 @@
 , pytestCheckHook
 , pythonOlder
 , setuptools-scm
+, syrupy
 , zeroconf
 }:

 buildPythonPackage rec {
  pname = "devolo-plc-api";
-  version = "1.3.0";
+  version = "1.3.1";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -24,9 +24,14 @@ buildPythonPackage rec {
    owner = "2Fake";
    repo = "devolo_plc_api";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ika0mypHo7a8GCa2eNhOLIhMZ2ASwJOxV4mmAzvJm0E=";
+    hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "protobuf>=4.22.0" "protobuf"
+  '';
+
  SETUPTOOLS_SCM_PRETEND_VERSION = version;

  nativeBuildInputs = [
@ -44,6 +49,7 @@ buildPythonPackage rec {
    pytest-httpx
    pytest-mock
    pytestCheckHook
+    syrupy
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@ -19,14 +19,14 @@

 buildPythonPackage rec {
  pname = "django-oauth-toolkit";
-  version = "2.2.0";
+  version = "2.3.0";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "jazzband";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ=";
+    hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/duckdb-engine/default.nix
+++ b/pkgs/development/python-modules/duckdb-engine/default.nix
@ -7,13 +7,14 @@
 , hypothesis
 , ipython-sql
 , poetry-core
+, snapshottest
 , sqlalchemy
 , typing-extensions
 }:

 buildPythonPackage rec {
  pname = "duckdb-engine";
-  version = "0.7.0";
+  version = "0.7.3";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -22,7 +23,7 @@ buildPythonPackage rec {
    repo = "duckdb_engine";
    owner = "Mause";
    rev = "refs/tags/v${version}";
-    hash = "sha256-qLQjFkud9DivLQ9PignLrXlUVOAxsd28s7+2GdC5jKE=";
+    hash = "sha256-Z9m1+Bc/csWKdPDuwf82xX0qOiD1Y5LBgJjUlLntAO8=";
  };

  nativeBuildInputs = [
@ -38,15 +39,19 @@ buildPythonPackage rec {
    export HOME="$(mktemp -d)"
  '';

-  # this test tries to download the httpfs extension
  disabledTests = [
+    # this test tries to download the httpfs extension
    "test_preload_extension"
+    # test should be skipped based on sqlalchemy version but isn't and fails
+    "test_commit"
  ];

  nativeCheckInputs = [
    pytestCheckHook
    hypothesis
    ipython-sql
+    # TODO(cpcloud): include pandas here when it supports sqlalchemy 2.0
+    snapshottest
    typing-extensions
  ];

--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, fetchpatch
 , duckdb
 , google-cloud-storage
 , mypy
@ -47,6 +46,15 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  disabledTests = [
+    # tries to make http request
+    "test_install_non_existent_extension"
+  ];
+
+  preCheck = ''
+    export HOME="$(mktemp -d)"
+  '';
+
  pythonImportsCheck = [
    "duckdb"
  ];
--- a/pkgs/development/python-modules/fastdownload/default.nix
+++ b/pkgs/development/python-modules/fastdownload/default.nix
@ -8,13 +8,13 @@

 buildPythonPackage rec {
  pname = "fastdownload";
-  version = "0.0.6";
+  version = "0.0.7";
  format = "setuptools";
  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-1ayb0zx8rFKDgqlq/tVVLqDkh47T5jofHt53r8bWr30=";
+    sha256 = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo=";
  };

  propagatedBuildInputs = [ fastprogress fastcore ];
--- a/pkgs/development/python-modules/fastpair/default.nix
+++ b/pkgs/development/python-modules/fastpair/default.nix
@ -1,27 +1,41 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, scipy
+, pythonOlder
+}:

 buildPythonPackage {
  pname = "fastpair";
-  version = "2021-05-19";
+  version = "unstable-2021-05-19";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "carsonfarmer";
    repo = "fastpair";
    rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379";
-    sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx";
+    hash = "sha256-vSb6o0XvHlzev2+uQKUI66wM39ZNqDsppEc8rlB+H9E=";
  };

-  nativeBuildInputs = [ pytest-runner ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"pytest-runner",' ""
+  '';

-  nativeCheckInputs = [ pytest pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];

  propagatedBuildInputs = [
    scipy
  ];

  meta = with lib; {
-    homepage = "https://github.com/carsonfarmer/fastpair";
    description = "Data-structure for the dynamic closest-pair problem";
+    homepage = "https://github.com/carsonfarmer/fastpair";
    license = licenses.mit;
    maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
  };
--- a/pkgs/development/python-modules/favicon/default.nix
+++ b/pkgs/development/python-modules/favicon/default.nix
@ -1,26 +1,47 @@
-{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock,
-  pytest-runner }:
+{ lib
+, beautifulsoup4
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+}:

 buildPythonPackage rec {
  pname = "favicon";
  version = "0.7.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8";
+    hash = "sha256-bWtaeN4qDQCEWJ9ofzhLLs1qZScJP+xWRAOxowYF16g=";
  };

-  buildInputs = [ pytest-runner ];
-  nativeCheckInputs = [ pytest requests-mock ];
-  propagatedBuildInputs = [ requests beautifulsoup4 ];
-
-  checkPhase = ''
-    pytest
+  postPatch = ''
+    sed -i "/pytest-runner/d" setup.py
  '';

+  propagatedBuildInputs = [
+    beautifulsoup4
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [
+    "favicon"
+  ];
+
  meta = with lib; {
    description = "Find a website's favicon";
    homepage = "https://github.com/scottwernervt/favicon";
+    changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst";
    license = licenses.mit;
    maintainers = with maintainers; [ elohmeier ];
  };
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "flask-restful";
-  version = "0.3.9";
+  version = "0.3.10";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "Flask-RESTful";
    inherit version;
-    hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4=";
+    hash = "sha256-/kry7wAn34+bT3l6uiDFVmgBtq3plaxjtYir8aWc7Dc=";
  };

  # conditional so that overrides are easier for web applications
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-container";
-  version = "2.22.0";
+  version = "2.23.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-zrttx7vfsUjFnCLyfYxG4uKH/RJr9BYCGZ3fxFg7Vsg=";
+    hash = "sha256-yVyd5kowbHbs64EY5oMIa1sYIs/qShqzVdjfZ1VifA4=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "google-cloud-spanner";
-  version = "3.35.1";
+  version = "3.36.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-w/Aua6IS7WHRsmjiNFJZp9D6Huo8PspYDa1JGDRp3mc=";
+    hash = "sha256-zBKYxYvmUIAnC1StrhfzOSdkB4zhHlkds/6H5l1ZjG0=";
  };

  propagatedBuildInputs = [
--- a/Show More
+++ b/Show More