Merge master into staging-next

2024-04-04 12:01:12 +00:00 · 2024-04-04 12:01:12 +00:00 · 9320095b97
parent 1ea9e4ecab ed607387c4
commit 9320095b97
61 changed files with 1029 additions and 657 deletions
--- a/.github/workflows/manual-nixos.yml
+++ b/.github/workflows/manual-nixos.yml
@ -26,6 +26,6 @@ jobs:
        with:
          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
          name: nixpkgs-ci
-          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
      - name: Building NixOS manual
        run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux
--- a/.github/workflows/manual-nixpkgs.yml
+++ b/.github/workflows/manual-nixpkgs.yml
@ -27,6 +27,6 @@ jobs:
        with:
          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
          name: nixpkgs-ci
-          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
      - name: Building Nixpkgs manual
        run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true pkgs/top-level/release.nix -A manual -A manual.tests
--- a/doc/languages-frameworks/dlang.section.md
+++ b/doc/languages-frameworks/dlang.section.md
@ -0,0 +1,69 @@
+# D (Dlang) {#dlang}
+
+Nixpkgs provides multiple D compilers such as `ldc`, `dmd` and `gdc`.
+These can be used like any other package during build time.
+
+However, Nixpkgs provides a build helper for compiling packages using the `dub` package manager.
+
+Here's an example:
+```nix
+{
+  lib,
+  buildDubPackage,
+  fetchFromGitHub,
+  ncurses,
+  zlib,
+}:
+
+buildDubPackage rec {
+  pname = "btdu";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "CyberShadow";
+    repo = "btdu";
+    rev = "v${version}";
+    hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE=";
+  };
+
+  # generated by dub-to-nix, see below
+  dubLock = ./dub-lock.json;
+
+  buildInputs = [
+    ncurses
+    zlib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 btdu -t $out/bin
+    runHook postInstall
+  '';
+}
+```
+
+Note that you need to define `installPhase` because `dub` doesn't know where files should go in `$out`.
+
+Also note that running `dub test` is disabled by default. You can enable it by setting `doCheck = true`.
+
+## Lockfiles {#dub-lockfiles}
+Nixpkgs has its own lockfile format for `dub` dependencies, because `dub`'s official "lockfile" format (`dub.selections.json`) is not hash based.
+
+A lockfile can be generated using the `dub-to-nix` helper package.
+* Firstly, install `dub-to-nix` into your shell session by running `nix-shell -p dub-to-nix`
+* Then navigate to the root of the source of the program you want to package
+* Finally, run `dub-to-nix` and it will print the lockfile to stdout. You could pipe stdout into a text file or just copy the output manually into a file.
+
+## `buildDubPackage` parameters {#builddubpackage-parameters}
+
+The `buildDubPackage` function takes an attrset of parameters that are passed on to `stdenv.mkDerivation`.
+
+The following parameters are specific to `buildDubPackage`:
+
+* `dubLock`: A lockfile generated by `dub-to-nix` from the source of the package. Can be either a path to the file, or an attrset already parsed with `lib.importJSON`.
+  The latter useful if the package uses `dub` dependencies not already in the lockfile. (e.g. if the package calls `dub run some-dub-package` manually)
+* `dubBuildType ? "release"`: The build type to pass to `dub build` as a value for the `--build=` flag.
+* `dubFlags ? []`: The flags to pass to `dub build` and `dub test`.
+* `dubBuildFlags ? []`: The flags to pass to `dub build`.
+* `dubTestFlags ? []`: The flags to pass to `dub test`.
+* `compiler ? ldc`: The D compiler to be used by `dub`.
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@ -14,6 +14,7 @@ cuda.section.md
 cuelang.section.md
 dart.section.md
 dhall.section.md
+dlang.section.md
 dotnet.section.md
 emscripten.section.md
 gnome.section.md
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@ -40,6 +40,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
 - A new option `systemd.sysusers.enable` was added. If enabled, users and
  groups are created with systemd-sysusers instead of with a custom perl script.

+- The default dbus implementation has transitioned to dbus-broker from the classic dbus daemon for better performance and reliability. Users can revert to the classic dbus daemon by setting `services.dbus.implementation = "dbus";`. For detailed deviations, refer to [dbus-broker's deviations page](https://github.com/bus1/dbus-broker/wiki/Deviations).
+
 - A new option `virtualisation.containers.cdi` was added. It contains `static` and `dynamic` attributes (corresponding to `/etc/cdi` and `/run/cdi` respectively) to configure the Container Device Interface (CDI).

 - `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `virtualisation.containers.cdi.dynamic.nvidia.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature.
@ -400,6 +402,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
  The `nimPackages` and `nim2Packages` sets have been removed.
  See https://nixos.org/manual/nixpkgs/unstable#nim for more information.

+- Programs written in [D](https://dlang.org/) using the `dub` build system and package manager can now be built using `buildDubPackage` utilizing lockfiles provided by the new `dub-to-nix` helper program.
+  See the [D section](https://nixos.org/manual/nixpkgs/unstable#dlang) in the manual for more information.
+
 - [Portunus](https://github.com/majewsky/portunus) has been updated to major version 2.
  This version of Portunus supports strong password hashes, but the legacy hash SHA-256 is also still supported to ensure a smooth migration of existing user accounts.
  After upgrading, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all user accounts to strong password hashes.
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@ -39,7 +39,7 @@ in

      implementation = mkOption {
        type = types.enum [ "dbus" "broker" ];
-        default = "dbus";
+        default = "broker";
        description = lib.mdDoc ''
          The implementation to use for the message bus defined by the D-Bus specification.
          Can be either the classic dbus daemon or dbus-broker, which aims to provide high
@ -101,6 +101,11 @@ in

      users.groups.messagebus.gid = config.ids.gids.messagebus;

+      # Install dbus for dbus tools even when using dbus-broker
+      environment.systemPackages = [
+        pkgs.dbus
+      ];
+
      # You still need the dbus reference implementation installed to use dbus-broker
      systemd.packages = [
        pkgs.dbus
@ -132,10 +137,6 @@ in
    })

    (mkIf (cfg.implementation == "dbus") {
-      environment.systemPackages = [
-        pkgs.dbus
-      ];
-
      security.wrappers.dbus-daemon-launch-helper = {
        source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper";
        owner = "root";
--- a/nixos/tests/mycelium/default.nix
+++ b/nixos/tests/mycelium/default.nix
@ -1,6 +1,6 @@
 import ../make-test-python.nix ({ lib, ... }: let
-  peer1-ip = "531:c350:28c1:dfde:ea6d:77d1:a60b:7209";
-  peer2-ip = "49f:3942:3a55:d100:4c78:c558:c4f:695b";
+  peer1-ip = "538:f40f:1c51:9bd9:9569:d3f6:d0a1:b2df";
+  peer2-ip = "5b6:6776:fee0:c1f3:db00:b6a8:d013:d38f";
 in
  {
    name = "mycelium";
--- a/pkgs/applications/audio/furnace/default.nix
+++ b/pkgs/applications/audio/furnace/default.nix
@ -27,14 +27,14 @@

 stdenv.mkDerivation rec {
  pname = "furnace";
-  version = "0.6.1";
+  version = "0.6.2";

  src = fetchFromGitHub {
    owner = "tildearrow";
    repo = "furnace";
    rev = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-QUOZGUyZp20ls7rtDK+cmg3Smbd+hl1m9aMhHQmMMbY=";
+    hash = "sha256-Pv9Sx+bdoy8uV5o9i1rUSuokwQVA8EPYFkZXM8Fynmk=";
  };

  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
--- a/pkgs/applications/audio/mympd/default.nix
+++ b/pkgs/applications/audio/mympd/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "mympd";
-  version = "14.1.0";
+  version = "14.1.1";

  src = fetchFromGitHub {
    owner = "jcorporation";
    repo = "myMPD";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-yNB5WQi3M4cYogtxx/vLi2xJog2keyFrJIMlx663DLo=";
+    sha256 = "sha256-qGKTQAEwkv5Bz09GzmUHWnQ/DzmiexOY/dTkFyCtH/M=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "sidplayfp";
-  version = "2.6.2";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "libsidplayfp";
    repo = "sidplayfp";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-bAd4fq5tlBYfYuIG/02MCbEwjjVBZFJbZJNT13voInw=";
+    hash = "sha256-bIX9BByUdScbS0NCrUjF5PTHG9T6hrPGjD5XM0eQgfA=";
  };

  strictDeps = true;
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@ -48,7 +48,7 @@
        "new": "sqlite-lua"
    },
    "vim-fsharp": {
-        "date": "2024-04-02",
+        "date": "2024-04-03",
        "new": "zarchive-vim-fsharp"
    },
    "vim-jade": {
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -305,12 +305,12 @@ final: prev:

  SchemaStore-nvim = buildVimPlugin {
    pname = "SchemaStore.nvim";
-    version = "2024-04-01";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "f0ca13e2634f08f127e086909d18a9387a47e760";
-      sha256 = "1hihsm0lspdf84sq3v0n9ildgdgs5syci42iilpmcrall80p4b28";
+      rev = "32e3a9654693f513a2cbb76ba99cbc9947b1352d";
+      sha256 = "1sazs3a8zzbjy6g83fm1kqah8cc3x3pihbzqplmllrw2nbc29qxk";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -1363,12 +1363,12 @@ final: prev:

  chadtree = buildVimPlugin {
    pname = "chadtree";
-    version = "2024-03-11";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "d2afbb28ed1b6de119fe7c1d4fe248da0819b4d8";
-      sha256 = "0gmjs4ms7nxmfd4wyw082mqqgj82309x75yi8rxvnaqyksn70bas";
+      rev = "f085e2363ed170b3d90a95e614954395a0a541c0";
+      sha256 = "01cfzcm2f6vr67w2l4f80iqmp74l827mmzcfjgcxjc68a70y2y8f";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -1423,12 +1423,12 @@ final: prev:

  citruszest-nvim = buildVimPlugin {
    pname = "citruszest.nvim";
-    version = "2024-02-13";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "zootedb0t";
      repo = "citruszest.nvim";
-      rev = "60e6cec400cd857ffd69d582794c3ce5571c0049";
-      sha256 = "0mbs4v35v6xwi44dh8isgp66n6x10q6jkvj3ygvpqanwff6bp89s";
+      rev = "b30d441088d579d22e773f4cb28550fb9a65a604";
+      sha256 = "03j3n1rjmvylllhhpp6qz5v6n3h1hb12bsp186jvamb3wqky48la";
    };
    meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/";
  };
@ -2102,7 +2102,7 @@ final: prev:
      rev = "c3d089186ccead26eba01023502f3eeadd7a92d2";
      sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ=";
    };
-    meta.homepage = "https://github.com/chrisgrieser/cmp_yanky";
+    meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/";
  };

  cobalt2-nvim = buildVimPlugin {
@ -2612,12 +2612,12 @@ final: prev:

  coq_nvim = buildVimPlugin {
    pname = "coq_nvim";
-    version = "2024-03-22";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "c6f4505074674c5d7fdd3afbbd6164323fe20fd7";
-      sha256 = "1d31a6w0rd0dv003yim7chlz1limdg8w91kimv97q8gh6l43sxh0";
+      rev = "c7fc9a764f91d7152c6a435de730eb436aeeed49";
+      sha256 = "0ljpylgxir8sbcxh9qmvwm1vpabs2l4s3im81yfcyj1164hwsk84";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2744,12 +2744,12 @@ final: prev:

  cyberdream-nvim = buildVimPlugin {
    pname = "cyberdream.nvim";
-    version = "2024-03-26";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "scottmckendry";
      repo = "cyberdream.nvim";
-      rev = "184554643fa02460b2429d4adfb8a7e6ddc89476";
-      sha256 = "0hhiy9rmxba46qjymrqap5sra1rc3haj28ff9y6k2qp2v6xi9lf7";
+      rev = "10bae2c37bc76e812af769687acb88b11283d38b";
+      sha256 = "1w7k5x8da0a3ifw0hgs5wcph5kixx52jd0zqqdf7v76ci3158g95";
    };
    meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
  };
@ -2780,24 +2780,24 @@ final: prev:

  dashboard-nvim = buildVimPlugin {
    pname = "dashboard-nvim";
-    version = "2024-03-26";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "dashboard-nvim";
-      rev = "39f308a0b845b8da46f83c8a2d69f0191d4b7a8f";
-      sha256 = "0wllb3d9lla4f7ygipzv27dxsfbz08q2318wjycmm1ylzxkmg0ha";
+      rev = "7c0c09d55118a2afeb8874e885f87ae80d8ff452";
+      sha256 = "0ipn3cbivi04hn1qixxp8cd4kxfsjnkd3a8hz5j3bpn4x74c6qxk";
    };
    meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
  };

  debugprint-nvim = buildVimPlugin {
    pname = "debugprint.nvim";
-    version = "2024-04-01";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "andrewferrier";
      repo = "debugprint.nvim";
-      rev = "58c472289ed710c477370d432851d2af84d9002a";
-      sha256 = "1agsclhl15d14g241irask7sr2k8vpdljziz1zl8j5kkz0zqjg9n";
+      rev = "ff44034c8f52feb252bd88311f91b8c9b9abe0f0";
+      sha256 = "1gxfimxg422bgz631nrdxwmmvx1l40vy3qjwawnp0jgi0b32nlfv";
    };
    meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
  };
@ -3383,12 +3383,12 @@ final: prev:

  efmls-configs-nvim = buildVimPlugin {
    pname = "efmls-configs-nvim";
-    version = "2024-02-11";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "creativenull";
      repo = "efmls-configs-nvim";
-      rev = "a61c52d325835e24dc14ffb7748a32b8f087ae32";
-      sha256 = "0y145z35y5x1frnaw1s9nlap1sjm3gk0fzcgwp0xskmfhcm8b55r";
+      rev = "479505abe49a554c0d31104a2fee730188240944";
+      sha256 = "1qgwxxwdqk6nqdaka11p5cpyms1d2h5yqcgq3wfcy8f2j94hpbxg";
    };
    meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
  };
@ -3685,12 +3685,12 @@ final: prev:

  flatten-nvim = buildVimPlugin {
    pname = "flatten.nvim";
-    version = "2024-01-26";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "willothy";
      repo = "flatten.nvim";
-      rev = "92c59ae6200e6b04aff167577ebb8a9035a6d2b3";
-      sha256 = "18sq9bh5l60nfxhc1glgn6nc35089hvp9vgkqp5s5ridnibf77z4";
+      rev = "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d";
+      sha256 = "0cakkw66sw6g5s0cj5smdbfbd022rs2xgkfc56krkbyqh0midawr";
    };
    meta.homepage = "https://github.com/willothy/flatten.nvim/";
  };
@ -4093,12 +4093,12 @@ final: prev:

  gitsigns-nvim = buildNeovimPlugin {
    pname = "gitsigns.nvim";
-    version = "2024-04-01";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "070875f9e4eb81eb20cb60996cd1d9086d94b05e";
-      sha256 = "03hr98kcy9vh6qbibhbc54laf5ph0p3rrdyx5j434z2hxsjh4sad";
+      rev = "b45ff86f5618d1421a88c12d4feb286b80a1e2d3";
+      sha256 = "0wdz87n5k1wh0c9kzvrqf163nr33iwyvys2j355ql082qwlywhdq";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -4751,12 +4751,12 @@ final: prev:

  inc-rename-nvim = buildVimPlugin {
    pname = "inc-rename.nvim";
-    version = "2024-03-30";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "smjonas";
      repo = "inc-rename.nvim";
-      rev = "0f853910da9bb2a09d0ef2454db55935f554f16f";
-      sha256 = "1ynvh1wjvjnzbhssmlwvkw8zwpcrkv71c8wmwdh67fjpfimak84g";
+      rev = "5e03e986625961d1fac296d1bf332a6510c3add6";
+      sha256 = "0zcii0ypqv66xmy4w964kry4zij87fx9mckxifck0xy1y79ncp7r";
    };
    meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
  };
@ -4919,12 +4919,12 @@ final: prev:

  iron-nvim = buildVimPlugin {
    pname = "iron.nvim";
-    version = "2024-03-31";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "Vigemus";
      repo = "iron.nvim";
-      rev = "0bedb945f4d9f10f36096deda62824bc48e1ec43";
-      sha256 = "0hgvnbrw3di2snh93qja5cgq5i4igm7asbn5b87dwrwmbn233z5c";
+      rev = "f6f199e3d353fc5761e2feda63b569a98897c66b";
+      sha256 = "1bwqval3lr12cqivfmmvxdi6da07000xbsn2ygiz4ym1a0a9jg5v";
    };
    meta.homepage = "https://github.com/Vigemus/iron.nvim/";
  };
@ -5448,12 +5448,12 @@ final: prev:

  litee-calltree-nvim = buildVimPlugin {
    pname = "litee-calltree.nvim";
-    version = "2023-11-11";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "ldelossa";
      repo = "litee-calltree.nvim";
-      rev = "14b66cc6ff76deb67259db99196c0da5a6c75ca2";
-      sha256 = "0ynnn2rknyzyjn796lig32n1jycapg6q4zrpzllxlvqyhyhxsjf5";
+      rev = "3908f52f2e69438cdeca32771d449f8ef3ee3bcc";
+      sha256 = "1x1100r11k0g0nkc6a2l1hsjciav5df6k9qv8bxj051wkwawzg0g";
    };
    meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/";
  };
@ -5520,12 +5520,12 @@ final: prev:

  lsp-format-nvim = buildVimPlugin {
    pname = "lsp-format.nvim";
-    version = "2024-01-24";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "lukas-reineke";
      repo = "lsp-format.nvim";
-      rev = "5e18095a637ec969b86c72266872219ad2f4586e";
-      sha256 = "0lls2pa86lyfzwmipm6rxpbv7qgyx1mlgzg7rjr44y2rkv4m62fl";
+      rev = "3612642b0e2eb85015838df5dcfbacb61f15db98";
+      sha256 = "1pizkn16ma7yfsy19g06f6l6zkqwsjkmzybqhhhp18xbbyj7m8cc";
    };
    meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/";
  };
@ -5580,12 +5580,12 @@ final: prev:

  lsp-zero-nvim = buildVimPlugin {
    pname = "lsp-zero.nvim";
-    version = "2024-03-30";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "VonHeikemen";
      repo = "lsp-zero.nvim";
-      rev = "8d96bcd4450a83a528a013ec5bf7dafa5f3d36c4";
-      sha256 = "05dsypsgas3ab155iza21ghf0i27sbxfk494xjg3qgiyy887a0g9";
+      rev = "74441a6309cf12232da52520e210387dc95412f8";
+      sha256 = "0q96939hfqn29svgqrj1cskmxiax5h05yz8lxqmhn9cvpkzm5s4k";
    };
    meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
  };
@ -5699,12 +5699,12 @@ final: prev:

  luasnip = buildNeovimPlugin {
    pname = "luasnip";
-    version = "2024-04-01";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "79cc25c39878401d4e8b6ec42fcf14639426bafc";
-      sha256 = "02bwj0z6fqim8v0giksjamr7415x8j95ihvyqd0zdfan2a3wqjv7";
+      rev = "825a61bad1d60d917a7962d73cf3c683f4e0407e";
+      sha256 = "002ksxnplfmvwclm1713x2m25zd8dkjm6bhfxv56r24i174h3dfb";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5952,12 +5952,12 @@ final: prev:

  mini-nvim = buildVimPlugin {
    pname = "mini.nvim";
-    version = "2024-03-31";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "efa0eb3dc97398e0510372f61bcf625127ab7a24";
-      sha256 = "01dg543rf7mkb93gzgk6s2n69l26vafsf9dw2zp9y3k2880is6sk";
+      rev = "5d841fcca666bc27ca777807a63381ce2cf6e2f9";
+      sha256 = "0sg82lbzf1s7qkmvc4sdpw25nms61xgdym2pqk8szmm400jk74n1";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -6528,12 +6528,12 @@ final: prev:

  neorg = buildVimPlugin {
    pname = "neorg";
-    version = "2024-04-01";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "nvim-neorg";
      repo = "neorg";
-      rev = "27f338f9f6bfad03de7c623173c9cfd24d7e7803";
-      sha256 = "05bd7p25dzjah4w4szfh1r2iivl4vc1byq5is3mbmkph13gy4vc7";
+      rev = "89f9a79179e179e9e0d96d6adce14473bed896bc";
+      sha256 = "1mfq1d6s8npnm35hflz80zxiln7wx1d4m90zpbb4vhv7nap975za";
    };
    meta.homepage = "https://github.com/nvim-neorg/neorg/";
  };
@ -6598,7 +6598,7 @@ final: prev:
    meta.homepage = "https://github.com/kassio/neoterm/";
  };

-  neotest = buildVimPlugin {
+  neotest = buildNeovimPlugin {
    pname = "neotest";
    version = "2024-03-20";
    src = fetchFromGitHub {
@ -6735,12 +6735,12 @@ final: prev:

  neotest-java = buildVimPlugin {
    pname = "neotest-java";
-    version = "2024-04-02";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "rcasia";
      repo = "neotest-java";
-      rev = "3a1853d55789b03ef71e1748a69470a0d016afad";
-      sha256 = "0jhwxw8jrq558fsy7d13jvj7c2gq03972lqx9hgyw1zjgmrjzfg4";
+      rev = "9af20dbc445f568b5f6b6f3241f07259ee95cfe8";
+      sha256 = "1v87jb7fm3xgnhzfxbp6wn5dk4m8r0asff4d0ap3zcc4sr771cl5";
    };
    meta.homepage = "https://github.com/rcasia/neotest-java/";
  };
@ -7047,12 +7047,12 @@ final: prev:

  night-owl-nvim = buildVimPlugin {
    pname = "night-owl.nvim";
-    version = "2024-03-12";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "oxfist";
      repo = "night-owl.nvim";
-      rev = "7f139517b6d2f05ee6542850b04de004a6b25dce";
-      sha256 = "1c20y1f0sakbajsmzk0fhv3wqwsni3wxlvsgcgzxbf922rm9ln3x";
+      rev = "1afa7f158feb79987ca0d017f65558492e6c8a8e";
+      sha256 = "1gypvdfbg7s3l3j9hlf6n2d22pjq4q54xv48gsg2zvczzg3c77ww";
    };
    meta.homepage = "https://github.com/oxfist/night-owl.nvim/";
  };
@ -7107,12 +7107,12 @@ final: prev:

  nlsp-settings-nvim = buildVimPlugin {
    pname = "nlsp-settings.nvim";
-    version = "2024-04-01";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "74596ac22f75d3e20a848eb9aee975504ff7a318";
-      sha256 = "1gbwj37nkvxvcpvwap68fp4pp2c6nag8ldh9d0fcvs0v2igww2p6";
+      rev = "5c4e0796937a3d732f8d489188d55312d802050a";
+      sha256 = "12pvrvcd339y8f0pzx398fn7c4shjmdy68xq7rfq6bg245mnd04j";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -7179,12 +7179,12 @@ final: prev:

  none-ls-nvim = buildVimPlugin {
    pname = "none-ls.nvim";
-    version = "2024-04-01";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "nvimtools";
      repo = "none-ls.nvim";
-      rev = "e632688737b6b878e900ac69179a9aae734bb331";
-      sha256 = "0qry0dn8mmxifq74hy6wp468fwxvpdn07689z9sv5acq6l18b5ci";
+      rev = "fff481b65d88415933b9574dc0e1947724bcf64a";
+      sha256 = "0qpnsj7pd7lg9qli3pgwxk8m50k65866mxk1id42n85v558hd9nx";
    };
    meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
  };
@ -7814,12 +7814,12 @@ final: prev:

  nvim-lspconfig = buildVimPlugin {
    pname = "nvim-lspconfig";
-    version = "2024-03-30";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "f4619ab31fc4676001ea05ae8200846e6e7700c7";
-      sha256 = "0q61jhria23nalapvb9m1qlifc01ir7lq9sjb6iifdqvjwi0ygi8";
+      rev = "96e5711040df23583591391ce49e556b8cd248d8";
+      sha256 = "0jlqjhi6x3g8w80mqbnmybh5lmf8cw0lnyywhhdkc5plpzh43j0c";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -7932,6 +7932,18 @@ final: prev:
    meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
  };

+  nvim-nio = buildNeovimPlugin {
+    pname = "nvim-nio";
+    version = "2024-04-02";
+    src = fetchFromGitHub {
+      owner = "nvim-neotest";
+      repo = "nvim-nio";
+      rev = "173f285eebb410199273fa178aa517fd2d7edd80";
+      sha256 = "0favgnfpsak44lzyzyhfavazr2i64l7ysk370xm4wbrb51kjsdkf";
+    };
+    meta.homepage = "https://github.com/nvim-neotest/nvim-nio/";
+  };
+
  nvim-nonicons = buildVimPlugin {
    pname = "nvim-nonicons";
    version = "2023-02-04";
@ -8174,12 +8186,12 @@ final: prev:

  nvim-treesitter = buildVimPlugin {
    pname = "nvim-treesitter";
-    version = "2024-04-02";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "54cf9180a36299265e217858e6e531245074c3f4";
-      sha256 = "0bs0qxpnbadz45hj25vr849hxkvjxz9hli8aaad0mkdjx3ncm8sv";
+      rev = "cc0e29727a9651e27869b7444e835c44fb1e7b4c";
+      sha256 = "1lnpmbj0nz33dv5b2kf6p39bxknjfcwqc7qsj5rzsxf4ycf73jig";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -8234,12 +8246,12 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPlugin {
    pname = "nvim-treesitter-textobjects";
-    version = "2024-03-12";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4";
-      sha256 = "159fcx7kfbgrk8lywfrx7vpdd6pdzphrqv4jwlvmjmzmmnbayhm7";
+      rev = "acffd3476eb340faef0ec07e48060b817386b973";
+      sha256 = "1mw5dn52dx1lmh98254hj44c4nlwxaf4j5i9fla9fg1g71rc521k";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };
@ -8282,12 +8294,12 @@ final: prev:

  nvim-ufo = buildVimPlugin {
    pname = "nvim-ufo";
-    version = "2024-03-23";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-ufo";
-      rev = "458aa4451b98614cfab6b3d7beddc8caff5e3052";
-      sha256 = "0wf12b87pqlk1d8smcv60ac8f9jgqp5dyggadjx2zqc1n7gp90h5";
+      rev = "a5390706f510d39951dd581f6d2a972741b3fa26";
+      sha256 = "0fyc504ay04402gk1vly0lz8fa5yyfmix16zsvl29grw6rpjacvp";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
  };
@ -8426,12 +8438,12 @@ final: prev:

  octo-nvim = buildVimPlugin {
    pname = "octo.nvim";
-    version = "2024-03-21";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "pwntester";
      repo = "octo.nvim";
-      rev = "27d6fd6ad2f2f59330724d6ea5c751f0c3ec96e6";
-      sha256 = "0xzkjs1592b98banjpk8xz62bbygaqsmhmylsxancf1p5mkznc9g";
+      rev = "a511b52fbf040f928a24deb72e17ec465613b442";
+      sha256 = "0jrcqxjbv24qa9k701l1bxyz20s0wj9jkr8vxx68j3z51idjygqn";
    };
    meta.homepage = "https://github.com/pwntester/octo.nvim/";
  };
@ -8619,12 +8631,12 @@ final: prev:

  orgmode = buildVimPlugin {
    pname = "orgmode";
-    version = "2024-04-01";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "nvim-orgmode";
      repo = "orgmode";
-      rev = "dafe43304589086378ecfd5409d138e991ddd034";
-      sha256 = "00ylaaqhvmr14kxqdqvj0ilwiqc8639p8hmakgvysxb3pn8y2lgp";
+      rev = "207d12c8683090195d290c46b00f684ec941f20e";
+      sha256 = "1ff4sxq671iwk3c4qbsj9disdb5iaa0ynhq88slmq045ndbjz2bh";
    };
    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
  };
@ -10631,12 +10643,12 @@ final: prev:

  telescope-vim-bookmarks-nvim = buildVimPlugin {
    pname = "telescope-vim-bookmarks.nvim";
-    version = "2022-07-17";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "tom-anders";
      repo = "telescope-vim-bookmarks.nvim";
-      rev = "92498cbf7c127dea37c3d27117b60dd7ab9baef4";
-      sha256 = "1nflwz7jji4lr621cifg4mq7a6ld4dvaq3dxg7rr4bahh02w5hb5";
+      rev = "09a61043496bd9c4240955f7532ff2ae8fe3a905";
+      sha256 = "0mkn7kbg1319mvfmx4agx2l1vng1lbqayf6b6xs2rvb98fybai74";
    };
    meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/";
  };
@ -10680,12 +10692,12 @@ final: prev:

  telescope-nvim = buildNeovimPlugin {
    pname = "telescope.nvim";
-    version = "2024-03-30";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0";
-      sha256 = "0k5x7cjihq79g4kc8q1qc1mwawbkmq6m661fd67rkv9r9az38yx9";
+      rev = "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff";
+      sha256 = "0rzdasr1lavdrxk7kszi0ari3di48zfki70himrc1m2qs89pa6ph";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -12445,12 +12457,12 @@ final: prev:

  vim-dirvish = buildVimPlugin {
    pname = "vim-dirvish";
-    version = "2024-02-20";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "justinmk";
      repo = "vim-dirvish";
-      rev = "b660af1fa07fe1d44d4eb3ea5242334f6c2766ca";
-      sha256 = "1h0ypp7fp47dk8sj1xgrm9113cgsvdczmfilbrix5rmm9b0jph2i";
+      rev = "3851bedb7f191b9a4a5531000b6fc0a8795cc9bb";
+      sha256 = "1b5fg5d1rvnh9ipl4q1sh4xwgkn55hip303mm13h3ckmcy1cyilk";
    };
    meta.homepage = "https://github.com/justinmk/vim-dirvish/";
  };
@ -12829,12 +12841,12 @@ final: prev:

  vim-floaterm = buildVimPlugin {
    pname = "vim-floaterm";
-    version = "2024-02-29";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "voldikss";
      repo = "vim-floaterm";
-      rev = "c0535d758004bcce016839e318cbbe802b92c469";
-      sha256 = "16ds8cc1qj8q0nkzdy35difq49jhbwhji3hlgksyg4phm8m54zja";
+      rev = "fe61226f8990bb4d36fa274fdc5f6079535cedeb";
+      sha256 = "0yy16na6ffjj4kk14ar1gy9zvd9nlz15hnn18s3g92494gipq4q2";
    };
    meta.homepage = "https://github.com/voldikss/vim-floaterm/";
  };
@ -13659,12 +13671,12 @@ final: prev:

  vim-just = buildVimPlugin {
    pname = "vim-just";
-    version = "2024-03-23";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "NoahTheDuke";
      repo = "vim-just";
-      rev = "9506b055bcdbb9263cbf9648005a6869ae0df523";
-      sha256 = "0dj1cj3mjxwr9b9i03h4mx79k6c1byxa6x82405wabr7ks0gyi1j";
+      rev = "4f6eea3d5ad64236549411bb2e2fd8f1c7926abc";
+      sha256 = "07g61mvln8sdqfacypap5fdx235bmrlbx713s4n8jpxdp6fwnydr";
    };
    meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
  };
@ -13719,12 +13731,12 @@ final: prev:

  vim-lawrencium = buildVimPlugin {
    pname = "vim-lawrencium";
-    version = "2022-01-19";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "ludovicchabant";
      repo = "vim-lawrencium";
-      rev = "cfda83655a3885f410fcf96ea1104ea0431570c3";
-      sha256 = "0jxk4xc10n6llr4hx67laxkx9rygrk0w6zyfvb2cpzcjranfmxnp";
+      rev = "756d7544c380a92b6f12e501a0d979cb6f53a90a";
+      sha256 = "16wzibxqz6jqh4bp43h1hh9kwlnns6zcqd6hdi25zzlfpx5m14q3";
    };
    meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/";
  };
@ -15629,12 +15641,12 @@ final: prev:

  vim-test = buildVimPlugin {
    pname = "vim-test";
-    version = "2024-03-14";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "vim-test";
      repo = "vim-test";
-      rev = "a49c9cade75e97cace5e3ba545ce82d02f689feb";
-      sha256 = "0mw7jzi5qf4wn4zbm63ddn2xa97fhd38rp68ddnbvj8lqqjjkxam";
+      rev = "8746ef06631293d7d47a6daccd95b0ed3e135494";
+      sha256 = "04wp13zpfzvcx7lisjq489m8vh6maynv6lhz7didqr3lawicnvr2";
    };
    meta.homepage = "https://github.com/vim-test/vim-test/";
  };
@ -15953,12 +15965,12 @@ final: prev:

  vim-visual-multi = buildVimPlugin {
    pname = "vim-visual-multi";
-    version = "2024-02-22";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "mg979";
      repo = "vim-visual-multi";
-      rev = "fe1ec7e430013b83c8c2dee85ae496251b71e253";
-      sha256 = "0mvirqq1gmp2270bm92fk3c4d96r2jlkl2s36pm1d00b7vd3vpll";
+      rev = "e2ff111f123da6cf97f95b96b10eb95854f953c9";
+      sha256 = "0kg3wwgxv1gclyvdws52chyz1jfgmi4hc2pdg9fmkqpkk0g17r68";
    };
    meta.homepage = "https://github.com/mg979/vim-visual-multi/";
  };
@ -16554,12 +16566,12 @@ final: prev:

  wiki-vim = buildVimPlugin {
    pname = "wiki.vim";
-    version = "2024-03-31";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "wiki.vim";
-      rev = "34750beb0f734c9c8eef5db406904419f4546e87";
-      sha256 = "00vdp002yw7z5krg679h2gqldngv8yd1irhx1hjjfqc9xpyx37yd";
+      rev = "34c82a61963988bdf9db3ff426ff313d419f2061";
+      sha256 = "0qazdn1y0j3pb9qm3f9ydasgkcvishz2km0aw19n1fqyylal0fps";
    };
    meta.homepage = "https://github.com/lervag/wiki.vim/";
  };
@ -16939,12 +16951,12 @@ final: prev:

  gbprod-nord = buildVimPlugin {
    pname = "gbprod-nord";
-    version = "2024-03-20";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "nord.nvim";
-      rev = "9896e4634b1ba99e7a532a568b3b66e3344ad0df";
-      sha256 = "1zmvc65rgh6m3jmjflglinzfqj6sz2mrfrg8qkb50zdpzghs39jb";
+      rev = "a6f4979566e44a69ddc80c9df73e960af1ab1840";
+      sha256 = "1fykygiq7izp19ylppvsw5v1i1rmy6x6abc5sjlls6wmcgz5dsvn";
    };
    meta.homepage = "https://github.com/gbprod/nord.nvim/";
  };
@ -16963,12 +16975,12 @@ final: prev:

  harpoon2 = buildVimPlugin {
    pname = "harpoon2";
-    version = "2024-01-26";
+    version = "2024-04-02";
    src = fetchFromGitHub {
      owner = "ThePrimeagen";
      repo = "harpoon";
-      rev = "a38be6e0dd4c6db66997deab71fc4453ace97f9c";
-      sha256 = "1cmiw4sy5r4h8f2k1m91f2xykasnp66zdibx0l8vk94hw990sg26";
+      rev = "4ad05be8fe98092f0dec3bc3b47abebb59c3814a";
+      sha256 = "0ssnlid3bd6qnar1xlg2kkmlgfdabrnkwqhvvw02nr9ms901d9sh";
    };
    meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
  };
@ -17011,12 +17023,12 @@ final: prev:

  nvchad-ui = buildVimPlugin {
    pname = "nvchad-ui";
-    version = "2024-03-31";
+    version = "2024-04-03";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "ui";
-      rev = "af9ab0cd9e193c68c443939fa7e4b8213db5693b";
-      sha256 = "0q9aip8r5z5cmjsz56z4mddk7vlymrk0lsbi2jam6gx9zzjxh6h9";
+      rev = "e1af69426b3c4b55c88bd1c81790c1c73b30bfa8";
+      sha256 = "1rmfjmwm5zckvdyk2pdpi2zgzql9rvy0b2rpsm8z56g98skh3nma";
    };
    meta.homepage = "https://github.com/nvchad/ui/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -348,12 +348,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "0.0.0+rev=a185502";
+    version = "0.0.0+rev=4ec5afd";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "a18550206a205a0b056437652cf4802f377c4a92";
-      hash = "sha256-7ir4fpRs/7qeWGFxzjYM3Y++LA7fIdcGCZM9vKMJ5tE=";
+      rev = "4ec5afdf98041d137c25b555958a1f825c7c1272";
+      hash = "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@ -480,12 +480,12 @@
  };
  dtd = buildGrammar {
    language = "dtd";
-    version = "0.0.0+rev=24b662e";
+    version = "0.0.0+rev=2282ad5";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-xml";
-      rev = "24b662eb61e369757d13c4b5f0624284dc3fe7e8";
-      hash = "sha256-1S//ZwSCr6HylScgKpgwcnvK0BR4Bz9o4hVxvLmdcgA=";
+      rev = "2282ad5cb8e815523e70d5c82404620bd9a1494c";
+      hash = "sha256-CZAVJdT01wXyaDnPxXz6ZhiiDxuvwKCWPGjaWe6FpWk=";
    };
    location = "dtd";
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
@ -647,12 +647,12 @@
  };
  fish = buildGrammar {
    language = "fish";
-    version = "0.0.0+rev=f917690";
+    version = "0.0.0+rev=a78aef9";
    src = fetchFromGitHub {
      owner = "ram02z";
      repo = "tree-sitter-fish";
-      rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9";
-      hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s=";
+      rev = "a78aef9abc395c600c38a037ac779afc7e3cc9e0";
+      hash = "sha256-D7s3ZsHQeGf+pYdbXvi5GMFqbkgajBuqTQwvjnjnrVo=";
    };
    meta.homepage = "https://github.com/ram02z/tree-sitter-fish";
  };
@ -823,12 +823,12 @@
  };
  glsl = buildGrammar {
    language = "glsl";
-    version = "0.0.0+rev=339fe65";
+    version = "0.0.0+rev=f704096";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-glsl";
-      rev = "339fe659aed7618b822d27120c1ec5b5cd83c61c";
-      hash = "sha256-n+dakT/9Z6o+ZP0MIAG6Yi98kqrtVvew+nbbpBh7ln4=";
+      rev = "f7040966a97c6c5a644a230df7fe74623f963d2f";
+      hash = "sha256-HwaN4T3dpcMpR2Nch3gMh9QGhBThd4RxdW7o5KTzRtI=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
  };
@ -1055,12 +1055,12 @@
  };
  hlsl = buildGrammar {
    language = "hlsl";
-    version = "0.0.0+rev=2c2732d";
+    version = "0.0.0+rev=ef428a3";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-hlsl";
-      rev = "2c2732db3ac55028af9456f89ab12683e02822bf";
-      hash = "sha256-7UD61tLBwVHiUlo5dqZ55k+TiRzrJRuvieggJgKO98I=";
+      rev = "ef428a36b2faa20450ee979a618f802228b38318";
+      hash = "sha256-/G5c7Fr7Z23FR7n5oh90QHObicDjx8Ppslp8T6sr1wg=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
  };
@ -1496,24 +1496,24 @@
  };
  markdown = buildGrammar {
    language = "markdown";
-    version = "0.0.0+rev=4401749";
+    version = "0.0.0+rev=7fe453b";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "44017499c51cb6431635ed51d5080e1fd05c2c21";
-      hash = "sha256-Z68efDuV5QAGZFvDKPf/i6FHaBge2tIc0ElmvKdwM9k=";
+      rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b";
+      hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4=";
    };
    location = "tree-sitter-markdown";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
-    version = "0.0.0+rev=4401749";
+    version = "0.0.0+rev=7fe453b";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "44017499c51cb6431635ed51d5080e1fd05c2c21";
-      hash = "sha256-Z68efDuV5QAGZFvDKPf/i6FHaBge2tIc0ElmvKdwM9k=";
+      rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b";
+      hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4=";
    };
    location = "tree-sitter-markdown-inline";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@ -2287,12 +2287,12 @@
  };
  slang = buildGrammar {
    language = "slang";
-    version = "0.0.0+rev=6015bdc";
+    version = "0.0.0+rev=13fdd89";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-slang";
-      rev = "6015bdc81e5e447a2bb8b342da27048a031b2713";
-      hash = "sha256-fQXx/ue7LNCdreAhgpKi159dbhyMjxvQKM1P6J+Xa8k=";
+      rev = "13fdd899bfa62527cc39887abd74ec24cd626dec";
+      hash = "sha256-YImk9t0zrOSBornem2rTzqhl/FUWqh955bjjOWkcfHY=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-slang";
  };
@ -2342,12 +2342,12 @@
  };
  solidity = buildGrammar {
    language = "solidity";
-    version = "0.0.0+rev=b239a95";
+    version = "0.0.0+rev=a8ed2f5";
    src = fetchFromGitHub {
      owner = "JoranHonig";
      repo = "tree-sitter-solidity";
-      rev = "b239a95f94cfcc6e7b3e961bc73a28d55e214f02";
-      hash = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0=";
+      rev = "a8ed2f5d600fed77f8ed3084d1479998c649bca1";
+      hash = "sha256-aSQnJR/r4H086Um4TV4mjnCSg+2Y7KFn2Rwo/lP2nfg=";
    };
    meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
  };
@ -2577,12 +2577,12 @@
  };
  templ = buildGrammar {
    language = "templ";
-    version = "0.0.0+rev=592faa3";
+    version = "0.0.0+rev=db66241";
    src = fetchFromGitHub {
      owner = "vrischmann";
      repo = "tree-sitter-templ";
-      rev = "592faa3186ef857c92e4bd1c31d73c07a4a334db";
-      hash = "sha256-XX1+P8ibo8REYYZQaC47lneg/roralo+YiRwFNnARsQ=";
+      rev = "db662414ccd6f7c78b1e834e7abe11c224b04759";
+      hash = "sha256-DPVVdzAU3xGa1TpndlwPZr11zi1ToYkvqWDJeddfDYs=";
    };
    meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
  };
@ -2633,12 +2633,12 @@
  };
  tlaplus = buildGrammar {
    language = "tlaplus";
-    version = "0.0.0+rev=496322c";
+    version = "0.0.0+rev=439dad0";
    src = fetchFromGitHub {
      owner = "tlaplus-community";
      repo = "tree-sitter-tlaplus";
-      rev = "496322c1f78647ae0cc1ec96e7b2523656d34846";
-      hash = "sha256-QG8FPwdTJ+AQE4uoujJxRlaeagqX+jQyBdytDflFX20=";
+      rev = "439dad01355e4db335fe9cd12eb177b4f2563dd6";
+      hash = "sha256-d2CPUjqMOu9xc+wjw2uGk2UmkR9OzoYFchbK+IMH7YA=";
    };
    meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
  };
@ -2924,12 +2924,12 @@
  };
  wing = buildGrammar {
    language = "wing";
-    version = "0.0.0+rev=5151f4a";
+    version = "0.0.0+rev=0cdff2b";
    src = fetchFromGitHub {
      owner = "winglang";
      repo = "wing";
-      rev = "5151f4a33d81ff68f94ff451a3404c581705eb96";
-      hash = "sha256-OFOp2ldpYizhUfW6ArThvWAp8nepG+rCrIbrjU9p2hQ=";
+      rev = "0cdff2bc50e3664049905e952746cadf4ac62f15";
+      hash = "sha256-ocHNpn7EKDdoBsanBf8XPhqZYM0wna9a+tDxy4gIO3o=";
    };
    location = "libs/tree-sitter-wing";
    generate = true;
@ -2948,24 +2948,24 @@
  };
  xml = buildGrammar {
    language = "xml";
-    version = "0.0.0+rev=24b662e";
+    version = "0.0.0+rev=2282ad5";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-xml";
-      rev = "24b662eb61e369757d13c4b5f0624284dc3fe7e8";
-      hash = "sha256-1S//ZwSCr6HylScgKpgwcnvK0BR4Bz9o4hVxvLmdcgA=";
+      rev = "2282ad5cb8e815523e70d5c82404620bd9a1494c";
+      hash = "sha256-CZAVJdT01wXyaDnPxXz6ZhiiDxuvwKCWPGjaWe6FpWk=";
    };
    location = "xml";
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml";
  };
  yaml = buildGrammar {
    language = "yaml";
-    version = "0.0.0+rev=10c6c7a";
+    version = "0.0.0+rev=c9ee63b";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-yaml";
-      rev = "10c6c7a69dde767ad229e1510e0c1c7aacd8c83a";
-      hash = "sha256-vAH7uB5Mcm3AsH9Y6jEb/IAzpNtLP5DL5Rd5ED0qpOc=";
+      rev = "c9ee63b15c92656a89f7007f38a98f21c3eca81d";
+      hash = "sha256-2MWTBUoaf+F/TJU+CWJ22JAoyq63XKxy1wJPxcZFePc=";
    };
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml";
  };
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -962,7 +962,7 @@
  };

  neotest = super.neotest.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = with self; [ nvim-nio plenary-nvim ];
  };

  neotest-gradle = super.neotest-gradle.overrideAttrs {
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -667,6 +667,7 @@ https://github.com/gpanders/nvim-moonwalk/,,
 https://github.com/SmiteshP/nvim-navbuddy/,,
 https://github.com/smiteshp/nvim-navic/,HEAD,
 https://github.com/AckslD/nvim-neoclip.lua/,,
+https://github.com/nvim-neotest/nvim-nio/,HEAD,
 https://github.com/yamatsum/nvim-nonicons/,,
 https://github.com/rcarriga/nvim-notify/,,
 https://github.com/LhKipp/nvim-nu/,HEAD,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -3129,6 +3129,21 @@ let
        };
      };

+      ms-vscode.test-adapter-converter = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "test-adapter-converter";
+          publisher = "ms-vscode";
+          version = "0.1.9";
+          sha256 = "sha256-M53jhAVawk2yCeSrLkWrUit3xbDc0zgCK2snbK+BaSs=";
+        };
+        meta = {
+          description = "A Visual Studio Code extension that converts from the Test Explorer UI API into native VS Code testing";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.test-adapter-converter";
+          homepage = "https://github.com/microsoft/vscode-test-adapter-converter";
+          license = lib.licenses.mit;
+        };
+      };
+
      ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "Theme-TomorrowKit";
--- a/pkgs/applications/science/logic/lean4/default.nix
+++ b/pkgs/applications/science/logic/lean4/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lean4";
-  version = "4.6.1";
+  version = "4.7.0";

  src = fetchFromGitHub {
    owner = "leanprover";
    repo = "lean4";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-wUqGADwSocg2ciycCxg9qp+vJLJ2otA/5JpTrkFrDoQ=";
+    hash = "sha256-jHY8BhDotfGcMS0Xzl5iawqCaug3dDEKuD5Y1WcM06I=";
  };

  postPatch = ''
--- a/pkgs/applications/version-management/gh/default.nix
+++ b/pkgs/applications/version-management/gh/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "gh";
-  version = "2.46.0";
+  version = "2.47.0";

  src = fetchFromGitHub {
    owner = "cli";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-UvHLOG7/IJOzqFSu9Bbho+ldgvvGCiVjJK0epnYxZF8=";
+    hash = "sha256-vLnz0VDp8mTYBWPPidqw9SUvkn7S1jMTLN1RQyU9YnE=";
  };

-  vendorHash = "sha256-hZ8YGGrkeqI8079KSQM3E8SISb8lzFo4kQx2G+8HpNM=";
+  vendorHash = "sha256-5GjU6A2QLDxrTMxaBCOniSX56Undfcu+dhfC5tc16V0=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/build-support/dlang/README.md
+++ b/pkgs/build-support/dlang/README.md
@ -0,0 +1,7 @@
+# Build support for D
+
+Build utilities for the D language can be found in this directory.
+
+### Current maintainers
+- @TomaSajt
+- @jtbx
--- a/pkgs/build-support/dlang/builddubpackage/default.nix
+++ b/pkgs/build-support/dlang/builddubpackage/default.nix
@ -0,0 +1,124 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  linkFarm,
+  dub,
+  ldc,
+  removeReferencesTo,
+}:
+
+# See https://nixos.org/manual/nixpkgs/unstable#dlang for more detailed usage information
+
+{
+  # A lockfile generated by `dub-to-nix` from the source of the package.
+  # Can be either a path to the file, or an attrset already parsed with `lib.importJSON`.
+  dubLock,
+  # The build type to pass to `dub build` as a value for the `--build=` flag.
+  dubBuildType ? "release",
+  # The flags to pass to `dub build` and `dub test`.
+  dubFlags ? [ ],
+  # The flags to pass to `dub build`.
+  dubBuildFlags ? [ ],
+  # The flags to pass to `dub test`.
+  dubTestFlags ? [ ],
+  # The D compiler to be used by `dub`.
+  compiler ? ldc,
+  ...
+}@args:
+
+let
+  makeDubDep =
+    {
+      pname,
+      version,
+      sha256,
+    }:
+    {
+      inherit pname version;
+      src = fetchurl {
+        name = "dub-${pname}-${version}.zip";
+        url = "mirror://dub/${pname}/${version}.zip";
+        inherit sha256;
+      };
+    };
+
+  lockJson = if lib.isPath dubLock then lib.importJSON dubLock else dubLock;
+
+  lockedDeps = lib.mapAttrsToList (
+    pname: { version, sha256 }: makeDubDep { inherit pname version sha256; }
+  ) lockJson.dependencies;
+
+  # a directory with multiple single element registries
+  # one big directory with all .zip files leads to version parsing errors
+  # when the name of a package is a prefix of the name of another package
+  dubRegistryBase = linkFarm "dub-registry-base" (
+    map (dep: {
+      name = "${dep.pname}/${dep.pname}-${dep.version}.zip";
+      path = dep.src;
+    }) lockedDeps
+  );
+
+  combinedFlags = "--skip-registry=all --compiler=${lib.getExe compiler} ${toString dubFlags}";
+  combinedBuildFlags = "${combinedFlags} --build=${dubBuildType} ${toString dubBuildFlags}";
+  combinedTestFlags = "${combinedFlags} ${toString dubTestFlags}";
+in
+stdenv.mkDerivation (
+  builtins.removeAttrs args [ "dubLock" ]
+  // {
+    strictDeps = args.strictDeps or true;
+
+    nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
+      dub
+      compiler
+      removeReferencesTo
+    ];
+
+    configurePhase =
+      args.configurePhase or ''
+        runHook preConfigure
+
+        export DUB_HOME="$NIX_BUILD_TOP/.dub"
+        mkdir -p $DUB_HOME
+
+        # register dependencies
+        ${lib.concatMapStringsSep "\n" (dep: ''
+          dub fetch ${dep.pname}@${dep.version} --cache=user --skip-registry=standard --registry=file://${dubRegistryBase}/${dep.pname}
+        '') lockedDeps}
+
+        runHook postConfigure
+      '';
+
+    buildPhase =
+      args.buildPhase or ''
+        runHook preBuild
+
+        dub build ${combinedBuildFlags}
+
+        runHook postBuild
+      '';
+
+    doCheck = args.doCheck or false;
+
+    checkPhase =
+      args.checkPhase or ''
+        runHook preCheck
+
+        dub test ${combinedTestFlags}
+
+        runHook postCheck
+      '';
+
+    preFixup = ''
+      ${args.preFixup or ""}
+
+      find "$out" -type f -exec remove-references-to -t ${compiler} '{}' +
+    '';
+
+    disallowedReferences = [ compiler ];
+
+    meta = {
+      platforms = dub.meta.platforms;
+    } // args.meta or { };
+  }
+)
--- a/pkgs/build-support/dlang/dub-support.nix
+++ b/pkgs/build-support/dlang/dub-support.nix
@ -0,0 +1,5 @@
+{ callPackage }:
+{
+  buildDubPackage = callPackage ./builddubpackage { };
+  dub-to-nix = callPackage ./dub-to-nix { };
+}
--- a/pkgs/build-support/dlang/dub-to-nix/default.nix
+++ b/pkgs/build-support/dlang/dub-to-nix/default.nix
@ -0,0 +1,19 @@
+{
+  lib,
+  runCommand,
+  makeWrapper,
+  python3,
+  nix,
+}:
+
+runCommand "dub-to-nix"
+  {
+    nativeBuildInputs = [ makeWrapper ];
+    buildInputs = [ python3 ];
+  }
+  ''
+    install -Dm755 ${./dub-to-nix.py} "$out/bin/dub-to-nix"
+    patchShebangs "$out/bin/dub-to-nix"
+    wrapProgram "$out/bin/dub-to-nix" \
+        --prefix PATH : ${lib.makeBinPath [ nix ]}
+  ''
--- a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py
+++ b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py
@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+import sys
+import json
+import os
+import subprocess
+
+def eprint(text: str):
+    print(text, file=sys.stderr)
+
+if not os.path.exists("dub.selections.json"):
+    eprint("The file `dub.selections.json` does not exist in the current working directory")
+    eprint("run `dub upgrade --annotate` to generate it")
+    sys.exit(1)
+
+with open("dub.selections.json") as f:
+    selectionsJson = json.load(f)
+
+versionDict: dict[str, str] = selectionsJson["versions"]
+
+for pname in versionDict:
+    version = versionDict[pname]
+    if version.startswith("~"):
+        eprint(f'Package "{pname}" has a branch-type version "{version}", which doesn\'t point to a fixed version')
+        eprint("You can resolve it by manually changing the required version to a fixed one inside `dub.selections.json`")
+        eprint("When packaging, you might need to create a patch for `dub.sdl` or `dub.json` to accept the changed version")
+        sys.exit(1)
+
+lockedDependenciesDict: dict[str, dict[str, str]] = {}
+
+for pname in versionDict:
+    version = versionDict[pname]
+    eprint(f"Fetching {pname}@{version}")
+    url = f"https://code.dlang.org/packages/{pname}/{version}.zip"
+    command = ["nix-prefetch-url", "--type", "sha256", url]
+    sha256 = subprocess.run(command, check=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL).stdout.rstrip()
+    lockedDependenciesDict[pname] = {"version": version, "sha256": sha256}
+
+print(json.dumps({"dependencies": lockedDependenciesDict}, indent=2))
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -312,6 +312,11 @@
    "https://backpan.perl.org/"  # for old releases
  ];

+  # D DUB
+  dub = [
+    "https://code.dlang.org/packages/"
+  ];
+
  # Haskell Hackage
  hackage = [
    "https://hackage.haskell.org/package/"
--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@ -2,7 +2,7 @@

 args:

-# see the substituteAll in the nixpkgs documentation for usage and constaints
+# see the substituteAll in the nixpkgs documentation for usage and constraints
 stdenvNoCC.mkDerivation ({
  name = if args ? name then args.name else baseNameOf (toString args.src);
  builder = ./substitute-all.sh;
--- a/pkgs/by-name/ca/cano/package.nix
+++ b/pkgs/by-name/ca/cano/package.nix
@ -0,0 +1,34 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, gnumake
+, ncurses
+}:
+stdenv.mkDerivation (finalAttrs: {
+  name = "cano";
+  version = "0-unstable-2024-31-3";
+
+  src = fetchFromGitHub {
+    owner = "CobbCoding1";
+    repo = "Cano";
+    rev = "6b3488545b4180f20a7fa892fb0ee719e9298ddc";
+    hash = "sha256-qFo0szZVGLUf7c7KdEIofcieWZqtM6kQE6D8afrZ+RU=";
+  };
+
+  buildInputs = [ gnumake ncurses ];
+  hardeningDisable = [ "format" "fortify" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/cano $out/bin
+  '';
+
+  meta = {
+     description = "Text Editor Written In C Using ncurses";
+     homepage = "https://github.com/CobbCoding1/Cano";
+     license = lib.licenses.asl20;
+     mainProgram = "Cano";
+     maintainers = with lib.maintainers; [ sigmanificient ];
+     platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/fr/freefilesync/package.nix
+++ b/pkgs/by-name/fr/freefilesync/package.nix
@ -18,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "freefilesync";
-  version = "13.4";
+  version = "13.5";

  src = fetchurl {
    url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
      rm -f $out
      tryDownload "$url"
    '';
-    hash = "sha256-0c4HYlah9aHsMMyCz/TjgA59pTce4hogz5n6Xf9Myho=";
+    hash = "sha256-8At8QobAQR2mQnFjFSPTkEuxmP9M8gINP0qH28J3ynY=";
  };

  sourceRoot = ".";
--- a/pkgs/development/tools/misc/fzf-make/default.nix
+++ b/pkgs/development/tools/misc/fzf-make/default.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "fzf-make";
-  version = "0.26.0";
+  version = "0.27.0";

  src = fetchFromGitHub {
    owner = "kyu08";
    repo = "fzf-make";
    rev = "v${version}";
-    hash = "sha256-rmQR1XnNJQnTz9vS+UWPpfFakgkVwNZasjRlNwk4p68=";
+    hash = "sha256-OgvPUk5q7DB9hakZzCUM2dlXMQzE/CGpg4pMDQCk7k0=";
  };

-  cargoHash = "sha256-QXyibZHqhK6Jhh6Qu73o2o6hABpNWPIxS4tR5IXLNkc=";
+  cargoHash = "sha256-MTOafmrlaW8WNUqsG2c/WnbG9ZKbq9zdou6buB4Qo/k=";

  nativeBuildInputs = [ makeBinaryWrapper ];

--- a/pkgs/by-name/gl/glas/package.nix
+++ b/pkgs/by-name/gl/glas/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "glas";
-  version = "0.2.2";
+  version = "0.2.3";

  src = fetchFromGitHub {
    owner = "maurobalbi";
    repo = "glas";
    rev = "v${version}";
-    sha256 = "sha256-y1sPDCHIfECEhKP6EQs3kDrX/yM+ni0irfPe1c50jJU=";
+    sha256 = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU=";
  };

-  cargoHash = "sha256-h27NqsVOW+LM83xtSAV7cvlRbznGE87aJb2/WeSmfOY=";
+  cargoHash = "sha256-zESRtefoObpUsu4RfTsqJAyBNylouXffpNK3W/X+w9M=";

  doInstallCheck = true;
  postInstallCheck = ''
--- a/pkgs/by-name/ko/koodousfinder/package.nix
+++ b/pkgs/by-name/ko/koodousfinder/package.nix
@ -1,6 +1,7 @@
-{ lib
-, python3
-, fetchFromGitHub
+{
+  lib,
+  python3,
+  fetchFromGitHub,
 }:

 python3.pkgs.buildPythonApplication rec {
@ -17,11 +18,13 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk=";
  };

-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  pythonRelaxDeps = [ "keyring" ];

-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ poetry-core ];
+
+  nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
+
+  dependencies = with python3.pkgs; [
    keyring
    requests
  ];
@ -29,9 +32,7 @@ python3.pkgs.buildPythonApplication rec {
  # Project has no tests, re-check with next release
  doCheck = false;

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

  meta = with lib; {
    description = "Tool to allows users to search for and analyze Android apps";
--- a/pkgs/by-name/la/labwc-tweaks/package.nix
+++ b/pkgs/by-name/la/labwc-tweaks/package.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "labwc-tweaks";
-  version = "unstable-2024-01-04";
+  version = "unstable-2024-04-02";

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc-tweaks";
-    rev = "1604f64cc62e4800ee04a6e1c323a48ee8140d83";
-    hash = "sha256-xFvc+Y03HjSvj846o84Wpk5tEXI49z8xkILSX2oas8A=";
+    rev = "a1a3cfaefd1908de8752d0d6d6b7170b04ee075c";
+    hash = "sha256-uvUsoqiQBuNMBQWAxl/tCIvWsEYmZ4dQ31TrznI/XcA=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/my/mycelium/Cargo.lock
+++ b/pkgs/by-name/my/mycelium/Cargo.lock
@ -146,9 +146,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "axum"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
 "async-trait",
 "axum-core",
@ -170,7 +170,7 @@ dependencies = [
 "serde_json",
 "serde_path_to_error",
 "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.0",
 "tokio",
 "tower",
 "tower-layer",
@ -192,7 +192,7 @@ dependencies = [
 "mime",
 "pin-project-lite",
 "rustversion",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
 "tower-layer",
 "tower-service",
 ]
@ -236,15 +236,6 @@ version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"

-[[package]]
-name = "blake2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "blake3"
 version = "1.5.1"
@ -258,15 +249,6 @@ dependencies = [
 "constant_time_eq",
 ]

-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.14.0"
@ -469,17 +451,6 @@ dependencies = [
 "powerfmt",
 ]

-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.33"
@ -520,9 +491,9 @@ dependencies = [

 [[package]]
 name = "etherparse"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24890603eb4b43aa788f02261ce21714449033e3e2ab93692f0ab18480c3c9b1"
+checksum = "095ab548cf452be5813424558a18af88f0a620d0f4a3d8793aa09311a3b6fa5f"
 dependencies = [
 "arrayvec",
 ]
@ -1074,16 +1045,14 @@ dependencies = [

 [[package]]
 name = "mycelium"
-version = "0.4.5"
+version = "0.5.0"
 dependencies = [
 "aes-gcm",
 "axum",
 "base64 0.22.0",
- "blake2",
 "blake3",
 "bytes",
 "clap",
- "digest",
 "etherparse",
 "faster-hex",
 "futures",
@ -1699,9 +1668,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
 "itoa",
 "ryu",
@ -1834,6 +1803,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"

+[[package]]
+name = "sync_wrapper"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@ -1929,9 +1904,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
 "backtrace",
 "bytes",
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@ -7,13 +7,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "mycelium";
-  version = "0.4.5";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "threefoldtech";
    repo = "mycelium";
    rev = "v${version}";
-    hash = "sha256-AJA1yd7P9zHOIdSOR2bAHgL5NyoyqzgNIEs8ObgD4Mo=";
+    hash = "sha256-K82LHVXbSMIJQlQ/qUpdCBVlAEZWyMMG2eUt2FzNwRE=";
  };

  cargoLock = {
--- a/pkgs/by-name/se/serve-d/dub-lock.json
+++ b/pkgs/by-name/se/serve-d/dub-lock.json
@ -0,0 +1,112 @@
+{
+  "dependencies": {
+    "automem": {
+      "version": "0.6.9",
+      "sha256": "05zk8h81ih5jc4n8d7kgr6hv5f923ybf2pdyf2ld3imkx0zb0plr"
+    },
+    "cachetools": {
+      "version": "0.4.1",
+      "sha256": "1407cb3mm8pqlcljdi60lpz2vhsj6rwzax0j24xggmyhr7ij6gx7"
+    },
+    "dcd": {
+      "version": "0.13.6",
+      "sha256": "19fnp5hdk2n7z5s57a445a92xd4iadh7lbw14sq1pr4zyks32114"
+    },
+    "dfmt": {
+      "version": "0.14.1",
+      "sha256": "1czk48dylq05iwi9137hy694c43whiqnmvgc5k7c32bjzzpi5pyq"
+    },
+    "diet-complete": {
+      "version": "0.0.3",
+      "sha256": "1klzivhzb185m38jvmm957s38mllpa2rkkv8az8ipmwdjj8z6mpv"
+    },
+    "dscanner": {
+      "version": "0.12.2",
+      "sha256": "12zhby1vj28fsryv7j6xhdiiw8d7dk1d00sarpimfpl77ajmpia8"
+    },
+    "dsymbol": {
+      "version": "0.11.3",
+      "sha256": "0flnh8b1hc97hlm86ilb0kc194vib5cpqf8abxfbv24czxp6gfv7"
+    },
+    "dub": {
+      "version": "1.26.1",
+      "sha256": "0sbixp7dpixlp1hwjlmnlh4dwci9f2fadxg42j8ha86rx7ggprqi"
+    },
+    "dunit": {
+      "version": "1.0.16",
+      "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"
+    },
+    "emsi_containers": {
+      "version": "0.8.0",
+      "sha256": "032j0rrlnhx0z2xrg9pfhb1darzj4h8qvxhixiw8gwz5izaxq1ny"
+    },
+    "eventsystem": {
+      "version": "1.2.0",
+      "sha256": "0spg6p8rxihdn473pmwxghbkkzzccamkqxdcqaqf6k06zvjl7qfs"
+    },
+    "inifiled": {
+      "version": "1.3.3",
+      "sha256": "01hw0lb9n6vwmx6vj5nq2awg54l5pvngqhzxfj2kmg99az84dg6d"
+    },
+    "isfreedesktop": {
+      "version": "0.1.1",
+      "sha256": "0bnjr9avvhl7s09dnbcdr5437yb18jj26fzvm7j292kvd2i8kzqz"
+    },
+    "libddoc": {
+      "version": "0.7.4",
+      "sha256": "1cs4nycn0pl30354dccb2akmbcdmz22yq28sn3imvfndmh059szi"
+    },
+    "libdparse": {
+      "version": "0.19.4",
+      "sha256": "1nyhga4qxkkf1qs3sd07mnyifw81dbz3nwm1vj106kair0d25q0b"
+    },
+    "msgpack-d": {
+      "version": "1.0.1",
+      "sha256": "1b6v667ymns90n0ssg7bd8fny1ashv5axpa8xf461ghzqnkkh05d"
+    },
+    "painlessjson": {
+      "version": "1.4.0",
+      "sha256": "0gy71wbssgn7z50gy8fg3mmwk82qp3y17ypl3x10jbc9nczipryi"
+    },
+    "painlesstraits": {
+      "version": "0.3.0",
+      "sha256": "0li4n0v70x5sgnqv60v5481jqlv22mk338cww4d3z5l0nhng3bvh"
+    },
+    "requests": {
+      "version": "2.1.2",
+      "sha256": "10332kdsjv30zkayx3vg6lxa701wmdncf0xjxwxkcjpsw7smzs2z"
+    },
+    "rm-rf": {
+      "version": "0.1.0",
+      "sha256": "0yr2jan7m49y0c6vm8nblvmgqqzw1c19g5m3cb412wwa37k12v5d"
+    },
+    "silly": {
+      "version": "1.1.1",
+      "sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb"
+    },
+    "standardpaths": {
+      "version": "0.8.1",
+      "sha256": "026sy2ywi708s3kx6ca55nkbq1hn3bcj9804bf01dvxnlschmlvc"
+    },
+    "stdx-allocator": {
+      "version": "2.77.5",
+      "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"
+    },
+    "test_allocator": {
+      "version": "0.3.4",
+      "sha256": "1xpjz6smxwgm4walrv3xbzi46cddc80q5n4gs7j9gm2yx11sf7gj"
+    },
+    "unit-threaded": {
+      "version": "0.10.8",
+      "sha256": "1jvmxka6s2zzrxns62jb50p01bgybhbkrkgi9qzq93xldc6jn2i9"
+    },
+    "workspace-d": {
+      "version": "3.7.0",
+      "sha256": "0alhmb64v7sbm1g9pdsng3fqy941s67lsqxjcf8awg1z7kn3l1hv"
+    },
+    "xdgpaths": {
+      "version": "0.2.5",
+      "sha256": "09l3bkcldv7ckh3d2cmivvj3cbql96a24g3khlz7zp9f1aabfykl"
+    }
+  }
+}
--- a/pkgs/by-name/se/serve-d/package.nix
+++ b/pkgs/by-name/se/serve-d/package.nix
@ -0,0 +1,39 @@
+{
+  lib,
+  buildDubPackage,
+  fetchFromGitHub,
+  dtools,
+}:
+
+buildDubPackage rec {
+  pname = "serve-d";
+  version = "0.7.6";
+
+  src = fetchFromGitHub {
+    owner = "Pure-D";
+    repo = "serve-d";
+    rev = "v${version}";
+    hash = "sha256-h4zsW8phGcI4z0uMCIovM9cJ6hKdk8rLb/Jp4X4dkpk=";
+  };
+
+  nativeBuildInputs = [ dtools ];
+
+  dubLock = ./dub-lock.json;
+
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 serve-d -t $out/bin
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/Pure-D/serve-d/releases/tag/${src.rev}";
+    description = "D LSP server (dlang language server protocol server)";
+    homepage = "https://github.com/Pure-D/serve-d";
+    license = lib.licenses.mit;
+    mainProgram = "serve-d";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
--- a/pkgs/by-name/sw/swaymux/package.nix
+++ b/pkgs/by-name/sw/swaymux/package.nix
@ -6,7 +6,7 @@
 , stdenv
 }:
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.0";
+  version = "1.1";
  pname = "swaymux";

  src = fetchFromGitea {
@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
    domain = "git.grimmauld.de";
    owner = "Grimmauld";
    repo = "swaymux";
-    hash = "sha256-M85pqfYnYeVPTZXKtjg/ks5LUl3u2onG9Nfn8Xs+BSA=";
+    hash = "sha256-OMJ9wKNuvD1Z9KV7Bp7aIA5gWbBl9PmTdGcGegE0vqM=";
  };

  buildInputs = [ qt6.qtwayland nlohmann_json qt6.qtbase];
--- a/pkgs/development/compilers/ldc/generic.nix
+++ b/pkgs/development/compilers/ldc/generic.nix
@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/ldc-developers/ldc";
    # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
    license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
+    mainProgram = "ldc2";
    maintainers = with maintainers; [ lionello jtbx ];
    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
  };
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/pkgs/development/compilers/tinygo/default.nix
@ -21,7 +21,7 @@ let

  # only doing this because only on darwin placing clang.cc in nativeBuildInputs
  # doesn't build
-  bootstrapTools = runCommand "tinygo-bootstap-tools" { } ''
+  bootstrapTools = runCommand "tinygo-bootstrap-tools" { } ''
    mkdir -p $out
    ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor}
  '';
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "guile-lib";
-  version = "0.2.7";
+  version = "0.2.8";

  src = fetchurl {
    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-5O87hF8SGILHwM8E+BocuP02DG9ktWuGjeVUYhT5BN4=";
+    hash = "sha256-ZOkC7gy7LO4e+4Fow7+e1J4LMqiiPbhj6DvxSBfXZ9k=";
  };

  strictDeps = true;
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@ -18,14 +18,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libsidplayfp";
-  version = "2.6.0";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "libsidplayfp";
    repo = "libsidplayfp";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8=";
+    hash = "sha256-f0c9rZ5QA4A7zKdXz6ImyPU0TnYi41cmjoqDqF9zYdA=";
  };

  outputs = [
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@ -19,14 +19,14 @@
 buildPythonPackage rec {
  pname = "amaranth";
  format = "pyproject";
-  version = "0.4.4";
+  version = "0.4.5";
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "amaranth-lang";
    repo = "amaranth";
    rev = "refs/tags/v${version}";
-    hash = "sha256-XL5S7/Utfg83DLIBGBDWYoQnRZaFE11Wy+XXbimu3Q8=";
+    hash = "sha256-g9dn6gUTdFHz9GMWHERsRLWHoI3E7vjuQDK0usbZO7g=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/breezy/Cargo.lock
+++ b/pkgs/development/python-modules/breezy/Cargo.lock
@ -25,7 +25,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "breezy"
-version = "3.3.6"
+version = "3.3.7"
 dependencies = [
 "pyo3",
 ]
@ -241,7 +241,7 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"

 [[package]]
 name = "rio-py"
-version = "3.3.6"
+version = "3.3.7"
 dependencies = [
 "lazy_static",
 "pyo3",
@ -262,9 +262,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"

 [[package]]
 name = "syn"
-version = "2.0.57"
+version = "2.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@ -29,7 +29,7 @@

 buildPythonPackage rec {
  pname = "breezy";
-  version = "3.3.6";
+  version = "3.3.7";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -38,7 +38,7 @@ buildPythonPackage rec {
    owner = "breezy-team";
    repo = "breezy";
    rev = "brz-${version}";
-    hash = "sha256-d2TZPFqKRI4sf6R2X/pczqN+LcfpTmP1W+wkDlKX6HE=";
+    hash = "sha256-NSfMUyx6a/vb1vTNn/fFfNktrFdB2N940m0TR6EhB9k=";
  };

  cargoDeps = rustPlatform.importCargoLock {
--- a/pkgs/development/python-modules/bsuite/default.nix
+++ b/pkgs/development/python-modules/bsuite/default.nix
@ -1,113 +1,128 @@
-{ lib
-, fetchPypi
-, buildPythonPackage
-, fetchpatch
-, frozendict
-, termcolor
-, matplotlib
-, gym
-, pandas
-, scipy
-, absl-py
-, dm-env
-, plotnine
-, scikit-image
-, dm-tree
-, patsy
-, tensorflow-probability
-, dm-haiku
-, statsmodels
-, mizani
-, trfl
-, optax
-, pytestCheckHook
-, dm-sonnet
-, rlax
-, distrax
+{
+  lib,
+  absl-py,
+  buildPythonPackage,
+  distrax,
+  dm-env,
+  dm-haiku,
+  dm-sonnet,
+  dm-tree,
+  fetchpatch,
+  fetchPypi,
+  frozendict,
+  gym,
+  matplotlib,
+  mizani,
+  optax,
+  pandas,
+  patsy,
+  plotnine,
+  pytestCheckHook,
+  pythonOlder,
+  rlax,
+  scikit-image,
+  scipy,
+  setuptools,
+  statsmodels,
+  tensorflow-probability,
+  termcolor,
+  trfl,
 }:

-let bsuite = buildPythonPackage rec {
-  pname = "bsuite";
-  version = "0.3.5";
-  format = "setuptools";
+let
+  bsuite = buildPythonPackage rec {
+    pname = "bsuite";
+    version = "0.3.5";
+    pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0=";
+    disabled = pythonOlder "3.7";
+
+    src = fetchPypi {
+      inherit pname version;
+      hash = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0=";
+    };
+
+    patches = [
+      # Convert np.int -> np.int32 since np.int is deprecated, https://github.com/google-deepmind/bsuite/pull/48
+      (fetchpatch {
+        url = "https://github.com/google-deepmind/bsuite/pull/48/commits/f8d81b2f1c27ef2c8c71ae286001ed879ea306ab.patch";
+        hash = "sha256-FXtvVS+U8brulq8Z27+yWIimB+kigGiUOIv1SHb1TA8=";
+      })
+      # Replace imp with importlib, https://github.com/google-deepmind/bsuite/pull/50
+      (fetchpatch {
+        name = "replace-imp.patch";
+        url = "https://github.com/google-deepmind/bsuite/commit/d08b63655c7efa5b5bb0f35e825e17549d23e812.patch";
+        hash = "sha256-V5p/6edNXTpEckuSuxJ/mvfJng5yE/pfeMoYbvlNpEo=";
+      })
+    ];
+
+    build-system = [ setuptools ];
+
+    dependencies = [
+      absl-py
+      dm-env
+      dm-tree
+      frozendict
+      gym
+      matplotlib
+      mizani
+      pandas
+      patsy
+      plotnine
+      scikit-image
+      scipy
+      statsmodels
+      termcolor
+    ];
+
+    nativeCheckInputs = [
+      distrax
+      dm-haiku
+      dm-sonnet
+      optax
+      pytestCheckHook
+      rlax
+      tensorflow-probability
+      trfl
+    ];
+
+    pythonImportsCheck = [ "bsuite" ];
+
+    disabledTests = [
+      # Tests require network connection
+      "test_run9"
+      "test_longer_action_sequence"
+      "test_reset"
+      "test_step_after_reset"
+      "test_step_on_fresh_environment"
+      "test_longer_action_sequence"
+      "test_reset"
+      "test_step_after_reset"
+      "test_step_on_fresh_environment"
+      "test_longer_action_sequence"
+      "test_reset"
+      "test_step_after_reset"
+      "test_step_on_fresh_environment"
+      "test_logger"
+      "test_episode_truncation"
+    ];
+
+    # Escape infinite recursion with rlax
+    doCheck = false;
+
+    passthru.tests = {
+      check = bsuite.overridePythonAttrs (_: {
+        doCheck = true;
+      });
+    };
+
+    meta = with lib; {
+      description = "Collection of experiments that investigate core capabilities of a reinforcement learning (RL) agent";
+      homepage = "https://github.com/deepmind/bsuite";
+      changelog = "https://github.com/google-deepmind/bsuite/releases/tag/${version}";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ onny ];
+    };
  };
-
-  patches = [
-    (fetchpatch {  # Convert np.int -> np.int32 since np.int is deprecated (https://github.com/google-deepmind/bsuite/pull/48)
-      url = "https://github.com/google-deepmind/bsuite/pull/48/commits/f8d81b2f1c27ef2c8c71ae286001ed879ea306ab.patch";
-      hash = "sha256-FXtvVS+U8brulq8Z27+yWIimB+kigGiUOIv1SHb1TA8=";
-    })
-  ];
-
-  propagatedBuildInputs = [
-    absl-py
-    dm-env
-    dm-tree
-    frozendict
-    gym
-    matplotlib
-    mizani
-    pandas
-    patsy
-    plotnine
-    scikit-image
-    scipy
-    statsmodels
-    termcolor
-  ];
-
-  nativeCheckInputs = [
-    distrax
-    dm-haiku
-    dm-sonnet
-    optax
-    pytestCheckHook
-    rlax
-    tensorflow-probability
-    trfl
-  ];
-
-  pythonImportsCheck = [
-    "bsuite"
-  ];
-
-  disabledTests = [
-    # Tests require network connection
-    "test_run9"
-    "test_longer_action_sequence"
-    "test_reset"
-    "test_step_after_reset"
-    "test_step_on_fresh_environment"
-    "test_longer_action_sequence"
-    "test_reset"
-    "test_step_after_reset"
-    "test_step_on_fresh_environment"
-    "test_longer_action_sequence"
-    "test_reset"
-    "test_step_after_reset"
-    "test_step_on_fresh_environment"
-    "test_logger"
-    "test_episode_truncation"
-  ];
-
-  # escape infinite recursion with rlax
-  doCheck = false;
-
-  passthru.tests = {
-    check = bsuite.overridePythonAttrs (_: { doCheck = true; });
-  };
-
-  meta = with lib; {
-    description = ''
-      Core RL Behaviour Suite. A collection of reinforcement learning
-      experiments
-    '';
-    homepage = "https://github.com/deepmind/bsuite";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ onny ];
-  };
-}; in bsuite
+in
+bsuite
--- a/pkgs/development/python-modules/fastapi-sso/default.nix
+++ b/pkgs/development/python-modules/fastapi-sso/default.nix
@ -1,22 +1,23 @@
-{ lib
-, buildPythonPackage
-, email-validator
-, fastapi
-, fetchFromGitHub
-, httpx
-, oauthlib
-, poetry-core
-, pydantic
-, pylint
-, pytest-asyncio
-, pytest-xdist
-, pytestCheckHook
-, pythonOlder
+{
+  lib,
+  buildPythonPackage,
+  email-validator,
+  fastapi,
+  fetchFromGitHub,
+  httpx,
+  oauthlib,
+  poetry-core,
+  pydantic,
+  pylint,
+  pytest-asyncio,
+  pytest-xdist,
+  pytestCheckHook,
+  pythonOlder,
 }:

 buildPythonPackage rec {
  pname = "fastapi-sso";
-  version = "0.13.1";
+  version = "0.14.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -25,16 +26,14 @@ buildPythonPackage rec {
    owner = "tomasvotava";
    repo = "fastapi-sso";
    rev = "refs/tags/${version}";
-    hash = "sha256-gblxjunXNerbC+7IYkGrO/PJak0MCoxdmWfo7iVeV7g=";
+    hash = "sha256-JFIVmpKsTaL7SYwamW/8zMWaBampmCTweiNz7zcgbco=";
  };

  postPatch = ''
    sed -i "/--cov/d" pyproject.toml
  '';

-  build-system = [
-    poetry-core
-  ];
+  build-system = [ poetry-core ];

  dependencies = [
    fastapi
@ -51,9 +50,7 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

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

  meta = with lib; {
    description = "FastAPI plugin to enable SSO to most common providers (such as Facebook login, Google login and login via Microsoft Office 365 Account";
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@ -72,14 +72,14 @@ in

 buildPythonPackage rec {
  pname = "jupyterhub";
-  version = "4.1.0";
+  version = "4.1.3";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-sKpNnbmpg5gWgLyoZ+15FSV4/oPJqDJ3TuE5Bbe3V0w=";
+    hash = "sha256-61RxYcVwl0SkUHPYePPgyWVAhZouZBmTHDbu986Ii4I=";
  };

  # Most of this only applies when building from source (e.g. js/css assets are
--- a/pkgs/development/python-modules/myuplink/default.nix
+++ b/pkgs/development/python-modules/myuplink/default.nix
@ -1,23 +1,24 @@
-{ lib
-, aiohttp
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, setuptools
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "myuplink";
-  version = "0.5.0";
+  version = "0.6.0";
  pyproject = true;

-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "pajzo";
    repo = "myuplink";
    rev = "refs/tags/${version}";
-    hash = "sha256-UJGRQqgtbYBwfjys2sYiC3dx8Doesu34EBys5Y++qBY=";
+    hash = "sha256-QIFTM4RQR3C67q+sBUCPhUyXylzplNAppHjzvU7i2YU=";
  };

  postPatch = ''
@ -25,17 +26,11 @@ buildPythonPackage rec {
      --replace-fail "%%VERSION_NO%%" "${version}"
  '';

-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
-    aiohttp
-  ];
+  dependencies = [ aiohttp ];

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

  meta = with lib; {
    description = "Module to interact with the myUplink API";
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@ -1,22 +1,23 @@
-{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchFromGitHub
-, setuptools-scm
-, matplotlib
-, mizani
-, pandas
-, patsy
-, scipy
-, statsmodels
-, geopandas
-, pytestCheckHook
-, scikit-misc
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  geopandas,
+  matplotlib,
+  mizani,
+  pandas,
+  patsy,
+  pytestCheckHook,
+  pythonOlder,
+  scikit-misc,
+  scipy,
+  setuptools-scm,
+  statsmodels,
 }:

 buildPythonPackage rec {
  pname = "plotnine";
-  version = "0.13.3";
+  version = "0.13.4";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -25,19 +26,17 @@ buildPythonPackage rec {
    owner = "has2k1";
    repo = "plotnine";
    rev = "refs/tags/v${version}";
-    hash = "sha256-dbfbXYYmVdufTtrrllrqwe87LL1nYRar4RMLef7ajTQ=";
+    hash = "sha256-ylsaV5yWVbxvD74spAI5tDwIjjue7MOMaGgp4Dc8Nhk=";
  };

-  nativeBuildInputs = [
-    setuptools-scm
-  ];
-
  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace " --cov=plotnine --cov-report=xml" ""
+      --replace-fail " --cov=plotnine --cov-report=xml" ""
  '';

-  propagatedBuildInputs = [
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
    matplotlib
    mizani
    pandas
@ -56,9 +55,7 @@ buildPythonPackage rec {
    export HOME=$(mktemp -d)
  '';

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

  disabledTestPaths = [
    # Assertion Errors:
@ -103,7 +100,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
-    description = "Grammar of graphics for python";
+    description = "Grammar of graphics for Python";
    homepage = "https://plotnine.readthedocs.io/";
    changelog = "https://github.com/has2k1/plotnine/releases/tag/v${version}";
    license = licenses.mit;
--- a/pkgs/development/python-modules/policy-sentry/default.nix
+++ b/pkgs/development/python-modules/policy-sentry/default.nix
@ -1,19 +1,21 @@
-{ lib
-, beautifulsoup4
-, buildPythonPackage
-, click
-, fetchFromGitHub
-, pytestCheckHook
-, pythonOlder
-, pyyaml
-, requests
-, schema
+{
+  lib,
+  beautifulsoup4,
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  pyyaml,
+  requests,
+  schema,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "policy-sentry";
-  version = "0.12.10";
-  format = "setuptools";
+  version = "0.12.12";
+  pyproject = true;

  disabled = pythonOlder "3.7";

@ -21,10 +23,12 @@ buildPythonPackage rec {
    owner = "salesforce";
    repo = "policy_sentry";
    rev = "refs/tags/${version}";
-    hash = "sha256-Kha5fq5l1yXWjDZq9GFKk3gYRtrEyiCFjbEAdYGPSa8=";
+    hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    beautifulsoup4
    click
    requests
@ -32,20 +36,16 @@ buildPythonPackage rec {
    schema
  ];

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

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

  meta = with lib; {
    description = "Python module for generating IAM least privilege policies";
-    mainProgram = "policy_sentry";
    homepage = "https://github.com/salesforce/policy_sentry";
    changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}";
    license = licenses.bsd3;
    maintainers = with maintainers; [ fab ];
+    mainProgram = "policy_sentry";
  };
 }
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "pyathena";
-  version = "3.5.1";
+  version = "3.6.0";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-9T5qm3Vmg6eZQtdxaLnj4+d5SAglJo2wKo+8y25gQik=";
+    hash = "sha256-2jf7mw/cTS5xW3GLZYk60uULUIIlk01on4942Ow2rwY=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@ -1,6 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, ldc, dub }:
+{
+  lib,
+  buildDubPackage,
+  fetchFromGitHub,
+}:

-stdenv.mkDerivation {
+buildDubPackage {
  pname = "Literate";
  version = "unstable-2021-01-22";

@ -8,21 +12,29 @@ stdenv.mkDerivation {
    owner = "zyedidia";
    repo = "Literate";
    rev = "7004dffec0cff3068828514eca72172274fd3f7d";
-    sha256 = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ=";
+    hash = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ=";
    fetchSubmodules = true;
  };

-  buildInputs = [ ldc dub ];
+  # as there aren't any non-local dub dependencies, this file just has any empty list
+  dubLock = ./dub-lock.json;

-  HOME = "home";
+  # generate the actual .d source files defined in .lit files
+  preBuild = ''
+    make d-files
+  '';

-  installPhase = "install -D bin/lit $out/bin/lit";
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/lit -t $out/bin
+    runHook preInstall
+  '';

-  meta = with lib; {
+  meta = {
    description = "A literate programming tool for any language";
    homepage = "https://zyedidia.github.io/literate/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
    mainProgram = "lit";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/tools/literate-programming/Literate/dub-lock.json
+++ b/pkgs/development/tools/literate-programming/Literate/dub-lock.json
@ -0,0 +1,3 @@
+{
+  "dependencies": {}
+}
--- a/pkgs/development/web/nodejs/v21.nix
+++ b/pkgs/development/web/nodejs/v21.nix
@ -8,8 +8,8 @@ let
 in
 buildNodejs {
  inherit enableNpm;
-  version = "21.7.1";
-  sha256 = "sha256-EnK24SnVZNveF1J7hEIQuXHCCnCucpJoGGt8udmQpks=";
+  version = "21.7.2";
+  sha256 = "sha256-tLHioH6W+F9s40ovv+o0hpGu/lyyGappUeI8zJkfni8=";
  patches = [
    ./disable-darwin-v8-system-instrumentation-node19.patch
    ./bypass-darwin-xcrun-node16.patch
--- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
@ -40,8 +40,5 @@ stdenvNoCC.mkDerivation rec {
    priority = 6; # give precedence to kernel firmware
  };

-  passthru = {
-    inherit version;
-    updateScript = ./update.sh;
-  };
+  passthru.updateScript = ./update.sh;
 }
--- a/pkgs/tools/misc/btdu/default.nix
+++ b/pkgs/tools/misc/btdu/default.nix
@ -1,93 +1,42 @@
-{ lib
-, stdenv
-, fetchurl
-, dub
-, ncurses
-, ldc
-, zlib
-, removeReferencesTo
+{
+  lib,
+  buildDubPackage,
+  fetchFromGitHub,
+  ncurses,
+  zlib,
 }:

-let
-    _d_ae_ver              = "0.0.3236";
-    _d_btrfs_ver           = "0.0.18";
-    _d_ncurses_ver         = "1.0.0";
-    _d_emsi_containers_ver = "0.9.0";
-in
-stdenv.mkDerivation rec {
-    pname = "btdu";
-    version = "0.5.1";
+buildDubPackage rec {
+  pname = "btdu";
+  version = "0.5.1";

-    srcs = [
-      (fetchurl {
-        url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz";
-        sha256 = "566269f365811f6db53280fc5476a7fcf34791396ee4e090c150af4280b35ba5";
-      })
-      (fetchurl {
-        url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz";
-        sha256 = "5ea3f0d9d2d13012ce6a1ee1b52d9fdff9dfb1d5cc7ee5d1b04cab1947ed4d36";
-      })
-      (fetchurl {
-        url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz";
-        sha256 = "32af4891d93c7898b0596eefb8297b88d3ed5c14c84a5951943b7b54c7599dbd";
-      })
-      (fetchurl {
-        url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz";
-        sha256 = "b5db677b75ebef7a1365ca4ef768f7344a2bc8d07ec223a2ada162f185d0d9c6";
-      })
-      (fetchurl {
-        url = "https://github.com/dlang-community/containers/archive/v${_d_emsi_containers_ver}.tar.gz";
-        sha256 = "5e256b84bbdbd2bd625cba0472ea27a1fde6d673d37a85fe971a20d52874acaa";
-      })
-    ];
+  src = fetchFromGitHub {
+    owner = "CyberShadow";
+    repo = "btdu";
+    rev = "v${version}";
+    hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE=";
+  };

-    sourceRoot = ".";
+  dubLock = ./dub-lock.json;

-    postUnpack = ''
-      mv ae-${_d_ae_ver} "ae"
-    '';
+  buildInputs = [
+    ncurses
+    zlib
+  ];

+  installPhase = ''
+    runHook preInstall
+    install -Dm755 btdu -t $out/bin
+    runHook postInstall
+  '';

-    nativeBuildInputs = [ dub ldc ];
-    buildInputs = [ ncurses zlib ];
-
-    configurePhase = ''
-      runHook preConfigure
-      mkdir home
-      HOME="home" dub add-local ae ${_d_ae_ver}
-      HOME="home" dub add-local d-btrfs-${_d_btrfs_ver} ${_d_btrfs_ver}
-      HOME="home" dub add-local ncurses-${_d_ncurses_ver} ${_d_ncurses_ver}
-      HOME="home" dub add-local containers-${_d_emsi_containers_ver} ${_d_emsi_containers_ver}
-      runHook postConfigure
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-      cd ${pname}-${version}
-      HOME="../home" dub --skip-registry=all build -b release
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $out/bin
-      cp btdu $out/bin/
-      runHook postInstall
-    '';
-
-    postInstall = ''
-      ${removeReferencesTo}/bin/remove-references-to -t ${ldc} $out/bin/btdu
-    '';
-
-    passthru.updateScript = ./update.py;
-
-    meta = with lib; {
-      description = "Sampling disk usage profiler for btrfs";
-      homepage = "https://github.com/CyberShadow/btdu";
-      changelog = "https://github.com/CyberShadow/btdu/releases/tag/v${version}";
-      license = licenses.gpl2Only;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ atila ];
-      mainProgram = "btdu";
-    };
+  meta = with lib; {
+    description = "Sampling disk usage profiler for btrfs";
+    homepage = "https://github.com/CyberShadow/btdu";
+    changelog = "https://github.com/CyberShadow/btdu/releases/tag/${src.rev}";
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ atila ];
+    mainProgram = "btdu";
+  };
 }
--- a/pkgs/tools/misc/btdu/dub-lock.json
+++ b/pkgs/tools/misc/btdu/dub-lock.json
@ -0,0 +1,20 @@
+{
+  "dependencies": {
+    "ae": {
+      "version": "0.0.3236",
+      "sha256": "0by9yclvk795nw7ilwhv7wh17j2dd7xk54phs8s5jxrwpqx10x52"
+    },
+    "btrfs": {
+      "version": "0.0.18",
+      "sha256": "0m8r4skfiryn2nk4wyb61lpvlga1330crr4y1h0q39g9xl3g6myf"
+    },
+    "ncurses": {
+      "version": "1.0.0",
+      "sha256": "0ivl88vp2dy9rpv6x3f9jlyqa7aps2x1kkyx80w2d4vcs31pzmb2"
+    },
+    "emsi_containers": {
+      "version": "0.9.0",
+      "sha256": "1viz1fjh6jhfvl0d25bb1q7aclm1hrs0d7hhcx1d9c0gg5k6lcpm"
+    }
+  }
+}
--- a/pkgs/tools/misc/btdu/update.py
+++ b/pkgs/tools/misc/btdu/update.py
@ -1,82 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i python -p python39Packages.requests
-
-import requests
-import subprocess
-
-pkgbuild = requests.get('https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=btdu').text
-
-def grabDepVersions(depDict, pkgbuild=pkgbuild):
-    for line in pkgbuild.split('\n'):
-        if depDict["string"] in line:
-            start = len(depDict["string"]) + 1
-            depDict["version"] = line[start:]
-            break
-
-def grabDepHashes(key,pkgbuild=pkgbuild):
-    start = pkgbuild.find(key) + len(key)
-    end = start+64
-    hashes = []
-    for i in range(5):
-        hashes.append(pkgbuild[start:end])
-        start     = pkgbuild.find("'",end+1) + 1
-        end       = start+64
-    return hashes
-
-def findLine(key,derivation):
-    count = 0
-    lines = []
-    for line in derivation:
-        if key in line:
-            lines.append(count)
-        count += 1
-    return lines
-
-def updateVersions(btdu,ae,btrfs,ncurses,containers,derivation):
-    key = "let"
-    line = findLine(key,derivation)[0] + 1
-    derivation[line+0] = f'    _d_ae_ver              = "{ae["version"]}";\n'
-    derivation[line+1] = f'    _d_btrfs_ver           = "{btrfs["version"]}";\n'
-    derivation[line+2] = f'    _d_ncurses_ver         = "{ncurses["version"]}";\n'
-    derivation[line+3] = f'    _d_emsi_containers_ver = "{containers["version"]}";\n'
-
-    key = "version = "
-    line = findLine(key,derivation)[0]
-    derivation[line] = f'    version = "{btdu["version"]}";\n'
-
-    return derivation
-
-def updateHashes(btdu,ae,btrfs,ncurses,containers,derivation):
-    key = "sha256 = "
-    hashLines = findLine(key,derivation)
-    for i in range(len(hashes)):
-        derivation[hashLines[i]] = f'        sha256 = "{hashes[i]}";\n'
-
-    return derivation
-
-if __name__ == "__main__":
-
-    btdu       = {"string": "pkgver"}
-    ae         = {"string": "_d_ae_ver"}
-    btrfs      = {"string": "_d_btrfs_ver"}
-    ncurses    = {"string": "_d_ncurses_ver"}
-    containers = {"string": "_d_emsi_containers_ver"}
-
-    grabDepVersions(btdu)
-    grabDepVersions(ae)
-    grabDepVersions(btrfs)
-    grabDepVersions(ncurses)
-    grabDepVersions(containers)
-
-    hashes = grabDepHashes("sha256sums=('")
-
-    nixpkgs = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip('\n')
-    btduFolder = "/pkgs/tools/misc/btdu/"
-    with open(nixpkgs + btduFolder + "default.nix", 'r') as arq:
-        derivation = arq.readlines()
-
-    derivation = updateVersions(btdu,ae,btrfs,ncurses,containers,derivation)
-    derivation = updateHashes(btdu,ae,btrfs,ncurses,containers,derivation)
-
-    with open(nixpkgs + btduFolder + "default.nix", 'w') as arq:
-        arq.writelines(derivation)
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec {
  # skip flaky test
  checkFlags = [
    "--skip=test_owner_current_group"
+    # Fails if the filesystem performs UTF-8 validation (such as ZFS with utf8only=on)
+    "--skip=test_exec_invalid_utf8"
+    "--skip=test_invalid_utf8"
  ];

  postInstall = ''
--- a/pkgs/tools/misc/phrase-cli/default.nix
+++ b/pkgs/tools/misc/phrase-cli/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "phrase-cli";
-  version = "2.22.0";
+  version = "2.23.0";

  src = fetchFromGitHub {
    owner = "phrase";
    repo = "phrase-cli";
    rev = version;
-    sha256 = "sha256-k0Di69toio7uZiTCI34H0N+PnYXfxygQW9sZ9GpG3rU=";
+    sha256 = "sha256-ucuksG3T4cI/cuEsHe4+7RtY+n05p3RvW/tijZ49lVY=";
  };

-  vendorHash = "sha256-/V1jAF3Uf0AT8JF7hERK3Kc4fX15lDnoEsjeHS0QjpE=";
+  vendorHash = "sha256-ZWCwSiKoU/zXD9JJ/8qW2tiXWAMqkh0Md0MLz0V4P4E=";

  ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];

--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "dnsproxy";
-  version = "0.66.0";
+  version = "0.67.0";

  src = fetchFromGitHub {
    owner = "AdguardTeam";
    repo = "dnsproxy";
    rev = "v${version}";
-    hash = "sha256-6cTqAKhPtSNlUHe/DqzrxjjxwfRc4Zn79h5CBLgqchA=";
+    hash = "sha256-CqEvGE1MSll+khEFvH8Y0q4XyxbTjwNRr9h9FKf5Kfs=";
  };

-  vendorHash = "sha256-98fwlPbOuCUBHR1xsp5Ff6AO89zYVTUYbhYOfQ/+AZU=";
+  vendorHash = "sha256-AZQl70NJwE6lVMO/G1RG1NIfXK1SbYWh4/wAIi4Ac5o=";

  ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ];

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -7553,6 +7553,9 @@ with pkgs;

  dub = callPackage ../development/tools/build-managers/dub { };

+  inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; })
+    buildDubPackage dub-to-nix;
+
  duc = callPackage ../tools/misc/duc { };

  duff = callPackage ../tools/filesystems/duff {
@ -18920,8 +18923,6 @@ with pkgs;

  funzzy = callPackage ../development/tools/misc/funzzy { };

-  fzf-make = callPackage ../development/tools/misc/fzf-make { };
-
  gede = libsForQt5.callPackage ../development/tools/misc/gede { };

  gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };