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

2023-05-10 16:32:00 +02:00 · 2023-05-10 16:32:00 +02:00 · bd8335552e
parent dd6a74bdbe a1386a8f2d
commit bd8335552e
154 changed files with 5532 additions and 11924 deletions
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@ -121,7 +121,7 @@ rec {
        ({
          linux-kernel = args.linux-kernel or {};
          gcc = args.gcc or {};
-          rustc = args.rust or {};
+          rustc = args.rustc or {};
        } // platforms.select final)
        linux-kernel gcc rustc;

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -6222,6 +6222,12 @@
    githubId = 982322;
    name = "Henrik Olsson";
  };
+  henrirosten = {
+    email = "henri.rosten@unikie.com";
+    github = "henrirosten";
+    githubId = 49935860;
+    name = "Henri Rosten";
+  };
  henrytill = {
    email = "henrytill@gmail.com";
    github = "henrytill";
@ -9041,6 +9047,12 @@
      fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";
    }];
  };
+  lizelive = {
+    email = "nixpkgs@lize.live";
+    github = "lizelive";
+    githubId = 40217331;
+    name = "LizeLive";
+  };
  lluchs = {
    email = "lukas.werling@gmail.com";
    github = "lluchs";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -151,6 +151,7 @@ with lib.maintainers; {

  cuda = {
    members = [
+      connorbaker
      SomeoneSerge
    ];
    scope = "Maintain CUDA-enabled packages";
--- a/nixos/modules/services/monitoring/uptime-kuma.nix
+++ b/nixos/modules/services/monitoring/uptime-kuma.nix
@ -43,6 +43,8 @@ in
    services.uptime-kuma.settings = {
      DATA_DIR = "/var/lib/uptime-kuma/";
      NODE_ENV = mkDefault "production";
+      HOST = mkDefault "127.0.0.1";
+      PORT = mkDefault "3001";
    };

    systemd.services.uptime-kuma = {
--- a/nixos/modules/services/network-filesystems/webdav-server-rs.nix
+++ b/nixos/modules/services/network-filesystems/webdav-server-rs.nix
@ -28,6 +28,12 @@ in
        description = lib.mdDoc "Group to run under when setuid is not enabled.";
      };

+      debug = mkOption {
+        type = types.bool;
+        default = false;
+        description = lib.mdDoc "Enable debug mode.";
+      };
+
      settings = mkOption {
        type = format.type;
        default = { };
@ -111,7 +117,7 @@ in
      after = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];
      serviceConfig = {
-        ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server -c ${cfg.configFile}";
+        ExecStart = "${pkgs.webdav-server-rs}/bin/webdav-server ${lib.optionalString cfg.debug "--debug"} -c ${cfg.configFile}";

        CapabilityBoundingSet = [
          "CAP_SETUID"
--- a/nixos/tests/aaaaxy.nix
+++ b/nixos/tests/aaaaxy.nix
@ -3,14 +3,16 @@
  meta.maintainers = with lib.maintainers; [ Luflosi ];

  nodes.machine = {
-    hardware.opengl.enable = true;
+    imports = [
+      ./common/x11.nix
+    ];
  };

  # This starts the game from a known state, feeds it a prerecorded set of button presses
  # and then checks if the final game state is identical to the expected state.
  # This is also what AAAAXY's CI system does and serves as a good sanity check.
  testScript = ''
-    machine.wait_for_unit("basic.target")
+    machine.wait_for_x()

    machine.succeed(
      # benchmark.dem needs to be in a mutable directory,
@ -18,7 +20,6 @@
      "mkdir -p '/tmp/aaaaxy/assets/demos/'",
      "ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'",
      """
-        '${pkgs.xvfb-run}/bin/xvfb-run' \
        '${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \
        'aaaaxy' 'on track for Any%, All Paths and No Teleports' \
        '${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem'
--- a/nixos/tests/geth.nix
+++ b/nixos/tests/geth.nix
@ -19,6 +19,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        enable = true;
        port = 18545;
      };
+      authrpc = {
+        enable = true;
+        port = 18551;
+      };
    };
  };

@ -31,11 +35,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
    machine.wait_for_open_port(18545)

    machine.succeed(
-        'geth attach --exec eth.blockNumber http://localhost:8545 | grep \'^0$\' '
+        'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
    )

    machine.succeed(
-        'geth attach --exec "eth.chainId()" http://localhost:18545 | grep \'"0x5"\' '
+        'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
    )
  '';
 })
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@ -87,15 +87,23 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        return etag


-    webserver.wait_for_unit("nginx")
-    webserver.wait_for_open_port(80)
+    def wait_for_nginx_on_port(port):
+        webserver.wait_for_unit("nginx")
+        webserver.wait_for_open_port(port)
+
+
+    # nginx can be ready before multi-user.target, in which case switching to
+    # a different configuration might not realize it needs to restart nginx.
+    webserver.wait_for_unit("multi-user.target")
+
+    wait_for_nginx_on_port(80)

    with subtest("check ETag if serving Nix store paths"):
        old_etag = check_etag()
        webserver.succeed(
            "${etagSystem}/bin/switch-to-configuration test >&2"
        )
-        webserver.sleep(1)
+        wait_for_nginx_on_port(80)
        new_etag = check_etag()
        assert old_etag != new_etag

@ -103,7 +111,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        webserver.succeed(
            "${justReloadSystem}/bin/switch-to-configuration test >&2"
        )
-        webserver.wait_for_open_port(8080)
+        wait_for_nginx_on_port(8080)
        webserver.fail("journalctl -u nginx | grep -q -i stopped")
        webserver.succeed("journalctl -u nginx | grep -q -i reloaded")

@ -111,7 +119,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        webserver.succeed(
            "${reloadRestartSystem}/bin/switch-to-configuration test >&2"
        )
-        webserver.wait_for_unit("nginx")
+        wait_for_nginx_on_port(80)
        webserver.succeed("journalctl -u nginx | grep -q -i stopped")

    with subtest("nixos-rebuild --switch should fail when there are configuration errors"):
--- a/pkgs/applications/audio/pbpctrl/default.nix
+++ b/pkgs/applications/audio/pbpctrl/default.nix
@ -1,25 +1,23 @@
-{ rustPlatform
+{ lib
+, rustPlatform
 , fetchFromGitHub
 , pkg-config
 , dbus
 , protobuf
-, lib
 }:

 rustPlatform.buildRustPackage rec {
  pname = "pbpctrl";
-
-  # https://github.com/qzed/pbpctrl/issues/4
-  version = "unstable-2023-02-07";
+  version = "0.1.3";

  src = fetchFromGitHub {
    owner = "qzed";
    repo = "${pname}";
-    rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6";
-    hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA=";
+    rev = "v${version}";
+    hash = "sha256-CYroQb6x2d4ay3RZUSiSrcGDF0IL3ETZtHAFt18sa5s=";
  };

-  cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA==";
+  cargoHash = "sha256-+YtnPKbxZENL6/u36RFFZA6F+19qHDAVx6Q8FSB/LCU=";

  nativeBuildInputs = [ pkg-config protobuf ];
  buildInputs = [ dbus ];
--- a/pkgs/applications/editors/imhex/default.nix
+++ b/pkgs/applications/editors/imhex/default.nix
@ -1,5 +1,5 @@
 { lib
-, gcc12Stdenv
+, stdenv
 , cmake
 , llvm
 , fetchFromGitHub
@ -32,7 +32,7 @@ let
  };

 in
-gcc12Stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "imhex";
  inherit version;

--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }:
+{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texlive, perl, ghostscript }:

 stdenv.mkDerivation rec {
  pname = "ne";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    substituteInPlace src/makefile --replace "-lcurses" "-lncurses"
  '';

-  nativeBuildInputs = [ texlive.combined.scheme-medium texinfo perl ghostscript ];
+  nativeBuildInputs = [ texlive.combined.scheme-medium texinfo6 perl ghostscript ];
  buildInputs = [ ncurses ];

  makeFlags = [ "PREFIX=${placeholder "out"}" ];
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
    '';
    license = licenses.gpl3;
    platforms = platforms.unix;
+    maintainers = with maintainers; [ geri1701 ];
  };
 }
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@ -51,6 +51,14 @@ in
      # necessary so that nix can handle `UpdateRemotePlugins` for the plugins
      # it installs. See https://github.com/neovim/neovim/issues/9413.
      ./system_rplugin_manifest.patch
+
+      # fix bug with the gsub directive
+      # https://github.com/neovim/neovim/pull/23015
+      (fetchpatch {
+        name = "use-the-correct-replacement-args-for-gsub-directive.patch";
+        url = "https://github.com/neovim/neovim/commit/ccc0980f86c6ef9a86b0e5a3a691f37cea8eb776.patch";
+        hash = "sha256-sZWM6M8jCL1e72H0bAc51a6FrH0mFFqTV1gGLwKT7Zo=";
+      })
    ];

    dontFixCmake = true;
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -29,12 +29,12 @@ final: prev:

  ChatGPT-nvim = buildVimPluginFrom2Nix {
    pname = "ChatGPT.nvim";
-    version = "2023-05-07";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "jackMort";
      repo = "ChatGPT.nvim";
-      rev = "da445ce3fbfe3d657090a621940123bba5eff034";
-      sha256 = "0jf803zssdghq24qfgs88pmra3f06plqg9f210z7dn02qi3h6xia";
+      rev = "b73a36b4fd9da33e6c488dc5588c1dcd27b9aea9";
+      sha256 = "19bb79rljpmp352skidhnza376cki1sx5vnbgyyyw8qicqlnxxzd";
    };
    meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
  };
@ -173,12 +173,12 @@ final: prev:

  LazyVim = buildVimPluginFrom2Nix {
    pname = "LazyVim";
-    version = "2023-05-04";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "LazyVim";
      repo = "LazyVim";
-      rev = "25d37a2cdd6202f1d767595454a7f84f77bbd83e";
-      sha256 = "04c66zbnx2xfgfzik56lyk0pzsn1bnkgrylw86j1wv1aa3nn19nr";
+      rev = "cbf1d335ed6a478a2e6144aa2d462a8330b2b0fc";
+      sha256 = "0pc0br58ckbd8whnp6lf3vwgds99rzbsm8kx77wfbld84d63cin8";
    };
    meta.homepage = "https://github.com/LazyVim/LazyVim/";
  };
@ -571,12 +571,12 @@ final: prev:

  alpha-nvim = buildVimPluginFrom2Nix {
    pname = "alpha-nvim";
-    version = "2023-05-05";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "goolord";
      repo = "alpha-nvim";
-      rev = "89eaa18a472be680539dee5977e2255f4dbd0738";
-      sha256 = "0xhpv2pdw4hkpkki1b1kgq894qv57h97d9yfva88pk52ly898jga";
+      rev = "effcde1c41ccf82b77354e70598c60d7e5f7ab7d";
+      sha256 = "0xc5bs3llcac19w9wq3dy5iqbrlmw6m64hxl5kdic68pjqszklrz";
    };
    meta.homepage = "https://github.com/goolord/alpha-nvim/";
  };
@ -653,6 +653,30 @@ final: prev:
    meta.homepage = "https://github.com/prabirshrestha/async.vim/";
  };

+  asyncomplete-buffer-vim = buildVimPluginFrom2Nix {
+    pname = "asyncomplete-buffer.vim";
+    version = "2020-06-26";
+    src = fetchFromGitHub {
+      owner = "prabirshrestha";
+      repo = "asyncomplete-buffer.vim";
+      rev = "018bcf0f712ce0fde3f1f2eaabd7004fccb2d34a";
+      sha256 = "0ixc37gzgsf93sl52fa3ywz6bw7cn1406fgimmy5rz0d62b0y8yi";
+    };
+    meta.homepage = "https://github.com/prabirshrestha/asyncomplete-buffer.vim/";
+  };
+
+  asyncomplete-file-vim = buildVimPluginFrom2Nix {
+    pname = "asyncomplete-file.vim";
+    version = "2022-07-11";
+    src = fetchFromGitHub {
+      owner = "prabirshrestha";
+      repo = "asyncomplete-file.vim";
+      rev = "770772daf1ff6ae29193bed02f8a7907913415d3";
+      sha256 = "1zvll94h2cx631z5xwii1mgx3lhm6i4pfppszk4p2mwk9hp9c4g4";
+    };
+    meta.homepage = "https://github.com/prabirshrestha/asyncomplete-file.vim/";
+  };
+
  asyncomplete-lsp-vim = buildVimPluginFrom2Nix {
    pname = "asyncomplete-lsp.vim";
    version = "2022-11-21";
@ -665,6 +689,42 @@ final: prev:
    meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/";
  };

+  asyncomplete-omni-vim = buildVimPluginFrom2Nix {
+    pname = "asyncomplete-omni.vim";
+    version = "2018-04-04";
+    src = fetchFromGitHub {
+      owner = "prabirshrestha";
+      repo = "asyncomplete-omni.vim";
+      rev = "f707e07f0c367c672ac24012b362b48ea3fd1611";
+      sha256 = "14kk15dqdjylj8x9m79ajrsqprf4yzcrv2k71y7lq8j6h4ybdcgr";
+    };
+    meta.homepage = "https://github.com/prabirshrestha/asyncomplete-omni.vim/";
+  };
+
+  asyncomplete-tags-vim = buildVimPluginFrom2Nix {
+    pname = "asyncomplete-tags.vim";
+    version = "2021-04-29";
+    src = fetchFromGitHub {
+      owner = "prabirshrestha";
+      repo = "asyncomplete-tags.vim";
+      rev = "041af0565f2c16634277cd29d2429c573af1dac4";
+      sha256 = "0i1ahg96j1ixyps0lfzl7w7skd64y6br1zn3bms447341zw4lc0k";
+    };
+    meta.homepage = "https://github.com/prabirshrestha/asyncomplete-tags.vim/";
+  };
+
+  asyncomplete-ultisnips-vim = buildVimPluginFrom2Nix {
+    pname = "asyncomplete-ultisnips.vim";
+    version = "2023-01-13";
+    src = fetchFromGitHub {
+      owner = "prabirshrestha";
+      repo = "asyncomplete-ultisnips.vim";
+      rev = "4cca37143274cc6947ee2d85bbd6dc1bfec5e53e";
+      sha256 = "0hh27i47qm0sqij2608b21qlggj8jn9czanw4yh5rh7kzd2c4lg3";
+    };
+    meta.homepage = "https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/";
+  };
+
  asyncomplete-vim = buildVimPluginFrom2Nix {
    pname = "asyncomplete.vim";
    version = "2023-04-11";
@ -859,12 +919,12 @@ final: prev:

  barbar-nvim = buildVimPluginFrom2Nix {
    pname = "barbar.nvim";
-    version = "2023-05-02";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "romgrk";
      repo = "barbar.nvim";
-      rev = "de37647f05a5b556b6426b78c4608bbd40a8089f";
-      sha256 = "0c8bf8ikz6vpy3284cb820f88gh97fgiyhnw7nb4cw86hhxkviv7";
+      rev = "de10307c2d49a1b567adc020448dbeac3f667bb0";
+      sha256 = "0sxi7fwb8vvpayda2hc1b2psqlqj7s29ls10sbvn803gzn3f554p";
    };
    meta.homepage = "https://github.com/romgrk/barbar.nvim/";
  };
@ -1241,6 +1301,18 @@ final: prev:
    meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/";
  };

+  close-buffers-vim = buildVimPluginFrom2Nix {
+    pname = "close-buffers.vim";
+    version = "2020-09-23";
+    src = fetchFromGitHub {
+      owner = "asheq";
+      repo = "close-buffers.vim";
+      rev = "0b29fbc483344e2ebec96a28070698d72a8a767c";
+      sha256 = "08pqnal5zfspg1wmg6laf9k46xrh3cg0yzdhl853j3ys96mfk8pf";
+    };
+    meta.homepage = "https://github.com/asheq/close-buffers.vim/";
+  };
+
  cmd-parser-nvim = buildVimPluginFrom2Nix {
    pname = "cmd-parser.nvim";
    version = "2022-02-23";
@ -2011,12 +2083,12 @@ final: prev:

  compiler-explorer-nvim = buildVimPluginFrom2Nix {
    pname = "compiler-explorer.nvim";
-    version = "2023-04-15";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "krady21";
      repo = "compiler-explorer.nvim";
-      rev = "6708947a47479bc922847432f0909cbeb19ee557";
-      sha256 = "1ky0pqjkjhxxgllzk0rml9xnpjwv83rvsrz2f9vqjn7wn9k4rkpr";
+      rev = "42979d2da0696da244f1e8f08de0a0ecaeceb718";
+      sha256 = "13n7fw03yyagml8ddvqqpi9gcng7kpz4bb0j9n63g9xfirpxszvj";
    };
    meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
  };
@ -2143,12 +2215,12 @@ final: prev:

  copilot-lua = buildVimPluginFrom2Nix {
    pname = "copilot.lua";
-    version = "2023-05-07";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "zbirenbaum";
      repo = "copilot.lua";
-      rev = "3bfdf96d5eb7704ece1013ef04d0b0d211d12ee7";
-      sha256 = "1dz0rip3ansn97vz98kl3fdfifhzpgbrpqbbv95l1zaj3abp4v9z";
+      rev = "653bbdc44cd569a5fd0617e5a9d3df2b1359e230";
+      sha256 = "1ym30fl7aw5x5wwr5bz5n4vh1hala66z4cdqk5pisin3270b1npr";
    };
    meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
  };
@ -2345,6 +2417,18 @@ final: prev:
    meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
  };

+  dash-vim = buildVimPluginFrom2Nix {
+    pname = "dash.vim";
+    version = "2017-09-12";
+    src = fetchFromGitHub {
+      owner = "rizzatti";
+      repo = "dash.vim";
+      rev = "25b17d9488454a1fcdbb2cbe829a23226f95e3c2";
+      sha256 = "1pzc6bzmh38ivmcn37hgjaq21zc692smwfb39chh8hj853il183c";
+    };
+    meta.homepage = "https://github.com/rizzatti/dash.vim/";
+  };
+
  dashboard-nvim = buildVimPluginFrom2Nix {
    pname = "dashboard-nvim";
    version = "2023-05-03";
@ -2443,12 +2527,12 @@ final: prev:

  deol-nvim = buildVimPluginFrom2Nix {
    pname = "deol.nvim";
-    version = "2023-05-04";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "deol.nvim";
-      rev = "2f4cf55846774c70996b009adb030b109d90d4af";
-      sha256 = "1gx3742v9hcfa9zwmsfba2pwjssys6n7jbs99n50z04lrndjnnk4";
+      rev = "3e39af5e21948db1592b8789d10c87b66b524908";
+      sha256 = "0j9j6wkp4rhxj87xp9akc52d0mqz1rkwpdk57549s5lmh1r65ylz";
    };
    meta.homepage = "https://github.com/Shougo/deol.nvim/";
  };
@ -2866,12 +2950,12 @@ final: prev:

  elixir-tools-nvim = buildVimPluginFrom2Nix {
    pname = "elixir-tools.nvim";
-    version = "2023-05-06";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "elixir-tools";
      repo = "elixir-tools.nvim";
-      rev = "08b7843979266cbf928815fdc8859dc1136f6ef3";
-      sha256 = "0nfq62hfp34bfh7yb229ihfmh4kdi7kl17bgxd121g33cq4hdsmm";
+      rev = "3fbcf9c0802cc28f8f621c4b02a7db1e7dfbcc26";
+      sha256 = "1dghdlhn3x4r7qa999q3m80bnh1jvvl2scp76284v9gg244ciq08";
    };
    meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
  };
@ -3059,12 +3143,12 @@ final: prev:

  firenvim = buildVimPluginFrom2Nix {
    pname = "firenvim";
-    version = "2023-03-31";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "glacambre";
      repo = "firenvim";
-      rev = "ee4ef314bd990b2b05b7fbd95b857159e444a2fe";
-      sha256 = "0lv0dlbabjm5bcx1g36ncsiqaki7lc0iqapfbp2dvyij1rqq93l5";
+      rev = "386239e1b1e6e3884db4da8bb7057709bec3dc51";
+      sha256 = "0srvka4bl6nwh66p04zdlb8qr35j1i0gcxakaavjamrs3qqk6b1k";
    };
    meta.homepage = "https://github.com/glacambre/firenvim/";
  };
@ -3520,8 +3604,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "go.nvim";
-      rev = "8ea5439288bf5a88c5e191bea47a5c60935f2e34";
-      sha256 = "10fzb2pgf4y8aynzhii2k80ka2z59dmb6wd2ddghr09d61l27wrk";
+      rev = "b119217e8324f13a2be12935f5d2d15a1df09b09";
+      sha256 = "10wfmf2m5g22blks6fgi3x6mmmirhd452pi6r91jzxqliwf41pzc";
    };
    meta.homepage = "https://github.com/ray-x/go.nvim/";
  };
@ -4391,12 +4475,12 @@ final: prev:

  legendary-nvim = buildVimPluginFrom2Nix {
    pname = "legendary.nvim";
-    version = "2023-05-04";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "legendary.nvim";
-      rev = "42e32d51b685f16fe6b56367b308dbdd9c01dbd0";
-      sha256 = "1mc5lkw1alijl936iwahrawl0j4k8s4y10zb0inb8svdbjwd9wsd";
+      rev = "729cb6203b7b2a47a996a3540ca86e860fc3823b";
+      sha256 = "02i4cckxilkmjkxlq8mwsgyrnqjjhmhyj6i2451gg0bdss0ln5d9";
    };
    meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
  };
@ -4727,12 +4811,12 @@ final: prev:

  lsp-zero-nvim = buildVimPluginFrom2Nix {
    pname = "lsp-zero.nvim";
-    version = "2023-04-18";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "VonHeikemen";
      repo = "lsp-zero.nvim";
-      rev = "8f7436b5df998515d9e15073b16f1bd142c406f9";
-      sha256 = "06jdi7qg9nhqjb2isldndjkbn4z3jminhn7rp036bc2rp3r6l3iw";
+      rev = "6f7192ab78e4e2f29fddf44f617bea42a0979e3e";
+      sha256 = "1hmg4fkv8w1vrg6bmb8368yiy47b0pj2vinpk89h1g37dgl21aj9";
    };
    meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
  };
@ -4943,12 +5027,12 @@ final: prev:

  mason-lspconfig-nvim = buildVimPluginFrom2Nix {
    pname = "mason-lspconfig.nvim";
-    version = "2023-05-02";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason-lspconfig.nvim";
-      rev = "cec0e6dd534ade486b5eeb59ebcfa8d51c3e8c5e";
-      sha256 = "0gv5bhc7jpsaxg7rgj52kvsnxrkqpww63zychrxc8mafbc3jfnn0";
+      rev = "90a8bbf106b85b76951a34c542058ffa807de2b1";
+      sha256 = "0gwm937hjc8x184zxdajrfvbjjn64n06li4g4iqqjzlypgpy8ild";
    };
    meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
  };
@ -5375,12 +5459,12 @@ final: prev:

  neo-tree-nvim = buildVimPluginFrom2Nix {
    pname = "neo-tree.nvim";
-    version = "2023-04-23";
+    version = "2023-05-04";
    src = fetchFromGitHub {
      owner = "nvim-neo-tree";
      repo = "neo-tree.nvim";
-      rev = "8d485aab32da9b8841d4af977f992b82b14af469";
-      sha256 = "192q4z6sy4kcyc57h2n4hsis7rirswfd83zcq1r0zvk7j1sbzzsr";
+      rev = "8a600830a358639b0e630fa424d668e095901231";
+      sha256 = "1j9gf4p3ns31g7bsw3sxg9qwccnzm8g0ramrilgx9imnb8jfai1x";
    };
    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
  };
@ -5399,12 +5483,12 @@ final: prev:

  neoconf-nvim = buildVimPluginFrom2Nix {
    pname = "neoconf.nvim";
-    version = "2023-05-08";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neoconf.nvim";
-      rev = "3927733e7d1b2f987089642d6959926b7c273289";
-      sha256 = "19yjhycv9662lh8z3qbvlijr5h8f8dgxhicwv1rgphs16f8mpazv";
+      rev = "6086792a14a4490b227075a847f4226c07ed7eac";
+      sha256 = "162vbsirid5l963ar46lawlfs4cdv0ph3vgg299bxhxr30pwalzi";
    };
    meta.homepage = "https://github.com/folke/neoconf.nvim/";
  };
@ -5459,12 +5543,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-05-03";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "TimUntersberger";
      repo = "neogit";
-      rev = "d7c66e5e8752e0cc76336a78c4432648cf3102e1";
-      sha256 = "0h5q4i8q2nz4a4lwr9gkrllqmn2dz4b14yazdyvq2ljjaqziv03q";
+      rev = "917fb24c9b7e0506ebfa94ccdbeaaea5eff2f916";
+      sha256 = "1554jri0cydga475vg3ink1cd9lc7pjx9akq0lds4fmwcrdq08zh";
    };
    meta.homepage = "https://github.com/TimUntersberger/neogit/";
  };
@ -5723,12 +5807,12 @@ final: prev:

  neotest-rspec = buildVimPluginFrom2Nix {
    pname = "neotest-rspec";
-    version = "2023-04-24";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "neotest-rspec";
-      rev = "fa28be514ceff6465e491bcab08989d8011453fd";
-      sha256 = "1q2fp6csz6178bjks40n5kbccs0pq3i5p46n4vv9nq0xggs7fqpx";
+      rev = "e9e9083ed7d741c25b6890ce12b70ff6f1e7a57a";
+      sha256 = "0bph1jilga84s87d5xjiiqfb311b84hininypwf9qlq6h6jdh37k";
    };
    meta.homepage = "https://github.com/olimorris/neotest-rspec/";
  };
@ -5831,12 +5915,12 @@ final: prev:

  nerdcommenter = buildVimPluginFrom2Nix {
    pname = "nerdcommenter";
-    version = "2023-04-26";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "preservim";
      repo = "nerdcommenter";
-      rev = "1fe9e1cfea9bb0dbc77174d776759ed67899ee50";
-      sha256 = "1h2j3f6fmlxggz1ghmb1b4kwpdiwzr7bfccbbxzyabvf04gdsn8h";
+      rev = "277bdfc6796479639b4c580d2089e2a34962cd1f";
+      sha256 = "1dg9jibmcsjfnb3ahzs2vdmiyzgphjslbrsc128d9sll7w0baq0j";
    };
    meta.homepage = "https://github.com/preservim/nerdcommenter/";
  };
@ -5951,12 +6035,12 @@ final: prev:

  nlsp-settings-nvim = buildVimPluginFrom2Nix {
    pname = "nlsp-settings.nvim";
-    version = "2023-05-07";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "f0930cf5a25924f0f952a0b22c79f4fc801fdd08";
-      sha256 = "0wlv7n6lra7aylhikrz7csnhra83ms4f2fgy897xb3qsg27zrlik";
+      rev = "b4691419660362793d552bf4503d26d7917efbad";
+      sha256 = "1z9zwwj68wmxs0zbr6mnpy3aq7fiklmgcq9psmappvxn5a2lwgmj";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -6275,12 +6359,12 @@ final: prev:

  nvim-config-local = buildVimPluginFrom2Nix {
    pname = "nvim-config-local";
-    version = "2023-05-03";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "klen";
      repo = "nvim-config-local";
-      rev = "55b9f8520a39b45fbfc9526c39765c7c9ed2c166";
-      sha256 = "062dvy8fdpg3zgh70hqsk0n29mz0izfll9g6hs34ssg6gkn2b3vf";
+      rev = "b038a54768a55875417a242dc40833904de1c9c5";
+      sha256 = "0f55lxzccflipn4yh4zp618g8zn501j949ln1j5a025c8kxh29ij";
    };
    meta.homepage = "https://github.com/klen/nvim-config-local/";
  };
@ -6323,12 +6407,12 @@ final: prev:

  nvim-dap-python = buildVimPluginFrom2Nix {
    pname = "nvim-dap-python";
-    version = "2023-04-05";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-dap-python";
-      rev = "972b8b8b65823c433ee834ed02a7f06edf590dfc";
-      sha256 = "154fspyyxh8s0z5bywi8266ns3vhxk4b6rgvd8qy9zkqm42spq3v";
+      rev = "51ecb08dbff57fca8add396b93dc765aba262e0a";
+      sha256 = "07pxdw9hx6qd4rs673jmai86zi0ggxpby3qyxim0hvir4w15000h";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/";
  };
@ -6467,12 +6551,12 @@ final: prev:

  nvim-jdtls = buildVimPluginFrom2Nix {
    pname = "nvim-jdtls";
-    version = "2023-05-05";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-jdtls";
-      rev = "b041dd4308d8c715187274ece9bc8d501a6f3041";
-      sha256 = "01ns87mfd93q82adwyb5whnsnn6p7qnmshdcmpza6j1wsayhkj6s";
+      rev = "355de7458fd63ccef9c6485d952ea118ba2cb46a";
+      sha256 = "16319zrfqdxml6sl7jf7bf15ia9v579ihanba7bqfby6dbw6c40f";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
  };
@ -6551,12 +6635,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-05-07";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "5ba7ab746d814413c84ed98c0214c71cd28f130a";
-      sha256 = "0h3izsxism4j9lfcgzalw09kynnpk6mpznblkd5gr52n8fhdwxcz";
+      rev = "8356319af6e8012a5797b647e946b377d1ba3d9c";
+      sha256 = "026n4pkgasfa9r7rnsdrcp0x9fc48qzxri1wkyqlk3hrzv8d2iyw";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -6623,12 +6707,12 @@ final: prev:

  nvim-navic = buildVimPluginFrom2Nix {
    pname = "nvim-navic";
-    version = "2023-04-22";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "smiteshp";
      repo = "nvim-navic";
-      rev = "83dc174da915f9dbc9b51169e9b62a2e0d42b527";
-      sha256 = "19lr5mlhnfd9s47mvhhkxl343slsvhw8ni5gqb9p11k1zznl2h9b";
+      rev = "15704c607569d6c5cfeab486d3ef9459645a70ce";
+      sha256 = "0wsrpz61ndgi2imzyn18s69zixvbmky5j1h5srfgv2cxjzdm67gh";
    };
    meta.homepage = "https://github.com/smiteshp/nvim-navic/";
  };
@ -6839,12 +6923,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-05-08";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "402f1b8d3b424bb2379fc2fde522cd782de68cf4";
-      sha256 = "0x2f5dp8hiinjpp93rwfq8s150ha143gdwj3w6vzvzbxrh7xg1l1";
+      rev = "6e8ad92031ff3b07db8980ab4a5491d1c40398ea";
+      sha256 = "1adjxg359j101d43k700nr3p43id2rb4yqqplfd4a897gxq60znj";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -7127,12 +7211,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2023-05-04";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "d9d6cd9ba5b4e9d15ea2e9730ccf569f7fd0ffaa";
-      sha256 = "0lpsdcic1nllbx2q6dgg6s8sw5is3j52ckyxii8prcy3rqg20f00";
+      rev = "7ba6cff6147b4b32ffc614f2bee4c4da75e64e91";
+      sha256 = "0dga10gn12ra4wl39hq8hi36gb4fln7wipx1qxxxlw8s66sd1iji";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -7211,12 +7295,12 @@ final: prev:

  oxocarbon-nvim = buildVimPluginFrom2Nix {
    pname = "oxocarbon.nvim";
-    version = "2023-05-07";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "nyoom-engineering";
      repo = "oxocarbon.nvim";
-      rev = "ece6aefe395717d92dd0d4f567eef836337ff761";
-      sha256 = "16z1131vmqwhf7xql2cg4xyisxybxgp63vrvzrrkbilc7zd3xy7d";
+      rev = "91fdca604c34af4e85e8cd7c3ab08724c86565cd";
+      sha256 = "1aqxkz6zlr7xvgw641wg5i451ff7m0g700wvg5132ipa3s0ndw16";
    };
    meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
  };
@ -7861,12 +7945,12 @@ final: prev:

  scope-nvim = buildVimPluginFrom2Nix {
    pname = "scope.nvim";
-    version = "2023-04-24";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "tiagovla";
      repo = "scope.nvim";
-      rev = "6c5d5d73701e45b1fad50fa821fe9bf88ab2eec6";
-      sha256 = "1ryfnjl0384aq0mi2i8b9993hx9s2wgriixf02pmb8mz9hv38rpm";
+      rev = "aae18f209049bca84075a8adccc934e463bfe7fe";
+      sha256 = "08i0ygcf0v520c0n0l6idjb9gm2vg37wzj0jxm5rw9d5qzrdqxa4";
    };
    meta.homepage = "https://github.com/tiagovla/scope.nvim/";
  };
@ -8042,12 +8126,12 @@ final: prev:

  smart-splits-nvim = buildVimPluginFrom2Nix {
    pname = "smart-splits.nvim";
-    version = "2023-05-02";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "smart-splits.nvim";
-      rev = "a2668b59bf3f9b87d47b42e7e8d08200ff0ab3b5";
-      sha256 = "0lgm0vp42q6sz4ncv0mrss39c0sidb085plkww9k62n1pdwd8kwv";
+      rev = "d1feced4a556677722862389964cb0e0ca646e52";
+      sha256 = "06aw2si7f02vghqnp2ln3mmpay2168kn6wi9frjc3snrnrvw5y1i";
    };
    meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
  };
@ -9380,12 +9464,12 @@ final: prev:

  unison = buildVimPluginFrom2Nix {
    pname = "unison";
-    version = "2023-05-05";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "c33b29bad9270cdfd78fe511b914feefa6c15c77";
-      sha256 = "0j76y4c55pq520v8wq1n4p9gfjyykcm5cx7aqb3ggnf5bhnd32bf";
+      rev = "c4a4cfb1606b95d16bc1029183ad239d3208fe48";
+      sha256 = "076zs2wgvk69g9z4b3a4af18hr1ksfqz9gyzw16zkdhavpfxkh3f";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -10333,7 +10417,7 @@ final: prev:
      owner = "flazz";
      repo = "vim-colorschemes";
      rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9";
-      sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416";
+      sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5";
    };
    meta.homepage = "https://github.com/flazz/vim-colorschemes/";
  };
@ -10542,6 +10626,18 @@ final: prev:
    meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
  };

+  vim-dim = buildVimPluginFrom2Nix {
+    pname = "vim-dim";
+    version = "2021-01-29";
+    src = fetchFromGitHub {
+      owner = "jeffkreeftmeijer";
+      repo = "vim-dim";
+      rev = "8320a40f12cf89295afc4f13eb10159f29c43777";
+      sha256 = "0mnwr4kxhng4mzds8l72s5km1qww4bifn5pds68c7zzyyy17ffxh";
+    };
+    meta.homepage = "https://github.com/jeffkreeftmeijer/vim-dim/";
+  };
+
  vim-diminactive = buildVimPluginFrom2Nix {
    pname = "vim-diminactive";
    version = "2017-08-27";
@ -11900,6 +11996,18 @@ final: prev:
    meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
  };

+  vim-lsp-ale = buildVimPluginFrom2Nix {
+    pname = "vim-lsp-ale";
+    version = "2021-12-28";
+    src = fetchFromGitHub {
+      owner = "rhysd";
+      repo = "vim-lsp-ale";
+      rev = "db0f9a8a33c0480988dc420cd2fba8a07743e4a4";
+      sha256 = "17ygzvmg3nqvf2vqnryazpcpdl20rgahkqwl4d1c40sfrmsqpwgi";
+    };
+    meta.homepage = "https://github.com/rhysd/vim-lsp-ale/";
+  };
+
  vim-lsp-cxx-highlight = buildVimPluginFrom2Nix {
    pname = "vim-lsp-cxx-highlight";
    version = "2021-10-20";
@ -11912,6 +12020,42 @@ final: prev:
    meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
  };

+  vim-lsp-settings = buildVimPluginFrom2Nix {
+    pname = "vim-lsp-settings";
+    version = "2023-05-05";
+    src = fetchFromGitHub {
+      owner = "mattn";
+      repo = "vim-lsp-settings";
+      rev = "af35b04c2d6c12fd2350a18757f3d08830886eb1";
+      sha256 = "1givbnmg8w72cfg359hqn8lcxqdnk2rplnxbb5yd3g66wbqvfq38";
+    };
+    meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
+  };
+
+  vim-lsp-snippets = buildVimPluginFrom2Nix {
+    pname = "vim-lsp-snippets";
+    version = "2020-01-15";
+    src = fetchFromGitHub {
+      owner = "thomasfaingnaert";
+      repo = "vim-lsp-snippets";
+      rev = "7d9bca7f5b37285cfec412caf92e1d6132e1fffb";
+      sha256 = "0ikjds0y0r3iq3b8dpw2pl3a3vh7kvn7jrlvz16s1n2ckixgirx4";
+    };
+    meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-snippets/";
+  };
+
+  vim-lsp-ultisnips = buildVimPluginFrom2Nix {
+    pname = "vim-lsp-ultisnips";
+    version = "2023-04-07";
+    src = fetchFromGitHub {
+      owner = "thomasfaingnaert";
+      repo = "vim-lsp-ultisnips";
+      rev = "e6e903f4c5442004965890907e4318acbc61d375";
+      sha256 = "004qv3yq16riq02wdv349xv06qngykh1i58bq3y04rny5bbdjl4i";
+    };
+    meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-ultisnips/";
+  };
+
  vim-lua = buildVimPluginFrom2Nix {
    pname = "vim-lua";
    version = "2020-08-05";
@ -12791,12 +12935,12 @@ final: prev:

  vim-qf = buildVimPluginFrom2Nix {
    pname = "vim-qf";
-    version = "2021-07-20";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "romainl";
      repo = "vim-qf";
-      rev = "65f115c350934517382ae45198a74232a9069c2a";
-      sha256 = "0pylxkmhcanks59imah3q2xyn8lp5735xm17p13yx9vx90779nwp";
+      rev = "7e65325651ff5a0b06af8df3980d2ee54cf10e14";
+      sha256 = "0w1hqngpflngjg0pvrpd6a61p7i4f06qg6h2kiyjnqkwaq5zsyym";
    };
    meta.homepage = "https://github.com/romainl/vim-qf/";
  };
@ -13944,12 +14088,12 @@ final: prev:

  vim-wakatime = buildVimPluginFrom2Nix {
    pname = "vim-wakatime";
-    version = "2023-04-13";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "wakatime";
      repo = "vim-wakatime";
-      rev = "515dbcc2278a9279a19de838fa29fc5078e34e56";
-      sha256 = "186p9v00j7sag46wh9w0x7nvc52k5ki19smxfi1mwjpfrfizxywn";
+      rev = "02be9238319937e04afea73fd0fc7da5413ee041";
+      sha256 = "0izlgvx9p64wpv1ycwy2viyqgb75f10dhy0jq13r2zjprskgx20c";
    };
    meta.homepage = "https://github.com/wakatime/vim-wakatime/";
  };
@ -14244,12 +14388,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2023-05-02";
+    version = "2023-05-09";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "e69222931721673d48fa9177325b1740e93e6ac7";
-      sha256 = "090kcz3jzz1yk52hv8l4l80aszs2cs782f07ca6l40v33ng4pgkk";
+      rev = "6d818bb04381c41a5a3fbdd0063cc0bff2a5cfb8";
+      sha256 = "0392dc8jgnmfz7pxllr2wz2p0ins3hlbzkxqlcvs2r2flfdj3637";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
@ -14666,12 +14810,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2023-05-07";
+    version = "2023-05-08";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "ce06ac2d31e0ec390d308c52809da869c8568812";
-      sha256 = "1p7x4pa945027n79rdaiaj8x6pyicbqb5r3rdapjdjsw7kmw4ah8";
+      rev = "b2f566d43e04557b1b83065cae706d461de04e66";
+      sha256 = "1bvwzrwz0s8mj5bhr046z9x72n3cmhszy6pgaid4kmxqf89bfrxz";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -1597,12 +1597,12 @@
  };
  slint = buildGrammar {
    language = "slint";
-    version = "0.0.0+rev=0754752";
+    version = "0.0.0+rev=6f12865";
    src = fetchFromGitHub {
      owner = "jrmoulton";
      repo = "tree-sitter-slint";
-      rev = "07547525cdf4627343dca5891f1743ae45e879bb";
-      hash = "sha256-FB5uDzvJKBN3KH+g71kn2/SX8KIZdLv3OamX8f1NeVE=";
+      rev = "6f128658eb22cfd15a801f52369d517c25253d5c";
+      hash = "sha256-zW6WlzVSea8F1E2HJP5DPNEnxnFQMFLXnyRECiIkXR8=";
    };
    meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint";
  };
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -53,7 +53,12 @@ https://github.com/ckarnell/antonys-macro-repeater/,,
 https://github.com/solarnz/arcanist.vim/,,
 https://github.com/vim-scripts/argtextobj.vim/,,
 https://github.com/prabirshrestha/async.vim/,,
+https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
 https://github.com/prabirshrestha/asyncomplete-lsp.vim/,,
+https://github.com/prabirshrestha/asyncomplete-omni.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-tags.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/,HEAD,
 https://github.com/prabirshrestha/asyncomplete.vim/,,
 https://github.com/skywind3000/asyncrun.vim/,,
 https://github.com/skywind3000/asynctasks.vim/,,
@ -104,6 +109,7 @@ https://github.com/p00f/clangd_extensions.nvim/,HEAD,
 https://github.com/rhysd/clever-f.vim/,,
 https://github.com/bbchung/clighter8/,,
 https://github.com/ekickx/clipboard-image.nvim/,,
+https://github.com/asheq/close-buffers.vim/,HEAD,
 https://github.com/winston0410/cmd-parser.nvim/,,
 https://github.com/hrsh7th/cmp-buffer/,,
 https://github.com/hrsh7th/cmp-calc/,,
@ -196,6 +202,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,,
 https://github.com/amiorin/ctrlp-z/,,
 https://github.com/ctrlpvim/ctrlp.vim/,,
 https://github.com/dart-lang/dart-vim-plugin/,,
+https://github.com/rizzatti/dash.vim/,HEAD,
 https://github.com/glepnir/dashboard-nvim/,,
 https://github.com/kristijanhusak/defx-git/,,
 https://github.com/kristijanhusak/defx-icons/,,
@ -887,6 +894,7 @@ https://github.com/kristijanhusak/vim-dadbod-ui/,,
 https://github.com/sunaku/vim-dasht/,,
 https://github.com/ajmwagar/vim-deus/,,
 https://github.com/ryanoasis/vim-devicons/,,
+https://github.com/jeffkreeftmeijer/vim-dim/,HEAD,
 https://github.com/blueyed/vim-diminactive/,,
 https://github.com/will133/vim-dirdiff/,,
 https://github.com/justinmk/vim-dirvish/,,
@ -1000,7 +1008,11 @@ https://github.com/andreshazard/vim-logreview/,,
 https://github.com/mlr-msft/vim-loves-dafny/,,
 https://github.com/natebosch/vim-lsc/,,
 https://github.com/prabirshrestha/vim-lsp/,,
+https://github.com/rhysd/vim-lsp-ale/,HEAD,
 https://github.com/jackguo380/vim-lsp-cxx-highlight/,,
+https://github.com/mattn/vim-lsp-settings/,HEAD,
+https://github.com/thomasfaingnaert/vim-lsp-snippets/,HEAD,
+https://github.com/thomasfaingnaert/vim-lsp-ultisnips/,HEAD,
 https://github.com/tbastos/vim-lua/,,
 https://github.com/google/vim-maktaba/,,
 https://github.com/lambdalisue/vim-manpager/,,
--- a/pkgs/applications/emulators/rpcs3/default.nix
+++ b/pkgs/applications/emulators/rpcs3/default.nix
@ -1,4 +1,4 @@
-{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
+{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
 , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
 , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
 , sdl2Support ? true, SDL2
@ -21,7 +21,7 @@ let
    sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
  };
 in
-gcc12Stdenv.mkDerivation {
+stdenv.mkDerivation {
  pname = "rpcs3";
  version = rpcs3Version;

--- a/pkgs/applications/emulators/yuzu/default.nix
+++ b/pkgs/applications/emulators/yuzu/default.nix
@ -1,45 +1,68 @@
 { branch ? "mainline"
-, libsForQt5
+, qt6Packages
 , fetchFromGitHub
+, fetchgit
 , fetchurl
+, fetchzip
+, runCommand
+, gnutar
 }:

 let
-  # Mirror of https://api.yuzu-emu.org/gamedb, last updated 2022-08-13
-  # Please make sure to update this when updating yuzu!
+  sources = import ./sources.nix;
+
  compat-list = fetchurl {
    name = "yuzu-compat-list";
-    url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/d83401d2ee3fd5e1922e31baed1f3bdb1c0f036c/compatibility_list.json";
-    sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw=";
+    url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${sources.compatList.rev}/compatibility_list.json";
+    hash = sources.compatList.hash;
  };
+
+  mainlineSrc = fetchFromGitHub {
+    owner = "yuzu-emu";
+    repo = "yuzu-mainline";
+    rev = "mainline-0-${sources.mainline.version}";
+    hash = sources.mainline.hash;
+    fetchSubmodules = true;
+  };
+
+  # The mirror repo for early access builds is missing submodule info,
+  # but the Windows distributions include a source tarball, which in turn
+  # includes the full git metadata. So, grab that and rehydrate it.
+  # This has the unfortunate side effect of requiring two FODs, one
+  # for the Windows download and one for the full repo with submodules.
+  eaZip = fetchzip {
+    name = "yuzu-ea-windows-dist";
+    url = "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${sources.ea.version}/Windows-Yuzu-EA-${sources.ea.version}.zip";
+    hash = sources.ea.distHash;
+  };
+
+  eaGitSrc = runCommand "yuzu-ea-dist-unpacked" {
+    src = eaZip;
+    nativeBuildInputs = [ gnutar ];
+  }
+  ''
+    mkdir $out
+    tar xf $src/*.tar.xz --directory=$out --strip-components=1
+  '';
+
+  eaSrcRehydrated = fetchgit {
+    url = eaGitSrc;
+    fetchSubmodules = true;
+    hash = sources.ea.fullHash;
+  };
+
 in {
-  mainline = libsForQt5.callPackage ./generic.nix rec {
-    pname = "yuzu-mainline";
-    version = "1245";
-
-    src = fetchFromGitHub {
-      owner = "yuzu-emu";
-      repo = "yuzu-mainline";
-      rev = "mainline-0-${version}";
-      sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A=";
-      fetchSubmodules = true;
-    };
-
-    inherit branch compat-list;
+  mainline = qt6Packages.callPackage ./generic.nix {
+    branch = "mainline";
+    version = sources.mainline.version;
+    src = mainlineSrc;
+    inherit compat-list;
  };

-  early-access = libsForQt5.callPackage ./generic.nix rec {
-    pname = "yuzu-ea";
-    version = "2945";
-
-    src = fetchFromGitHub {
-      owner = "pineappleEA";
-      repo = "pineapple-src";
-      rev = "EA-${version}";
-      sha256 = "sha256-/051EtQxhB5oKH/JxZZ2AjnxOBcRxCBIwd4Qr8lq7Ok=";
-      fetchSubmodules = true;
-    };
-
-    inherit branch compat-list;
+  early-access = qt6Packages.callPackage ./generic.nix {
+    branch = "early-access";
+    version = sources.ea.version;
+    src = eaSrcRehydrated;
+    inherit compat-list;
  };
 }.${branch}
--- a/pkgs/applications/emulators/yuzu/generic.nix
+++ b/pkgs/applications/emulators/yuzu/generic.nix
@ -1,22 +1,25 @@
-{ pname
-, version
+{ version
 , src
 , branch
 , compat-list

 , lib
 , stdenv
-, runCommandLocal
-, substituteAll
 , wrapQtAppsHook
 , alsa-lib
 , boost
-, catch2
+, catch2_3
 , cmake
+, cpp-jwt
+, cubeb
+, discord-rpc
 , doxygen
+, enet
 , ffmpeg
-, fmt_8
+, fmt
 , glslang
+, httplib
+, inih
 , libjack2
 , libopus
 , libpulseaudio
@ -29,7 +32,9 @@
 , pkg-config
 , python3
 , qtbase
+, qtmultimedia
 , qttools
+, qtwayland
 , qtwebengine
 , rapidjson
 , SDL2
@ -42,8 +47,10 @@
 , zstd
 }:

-stdenv.mkDerivation rec {
-  inherit pname version src;
+stdenv.mkDerivation {
+  pname = "yuzu-${branch}";
+
+  inherit version src;

  nativeBuildInputs = [
    cmake
@ -57,49 +64,64 @@ stdenv.mkDerivation rec {
  buildInputs = [
    alsa-lib
    boost
-    catch2
+    catch2_3
+    cpp-jwt
+    cubeb
+    discord-rpc
+    # intentionally omitted: dynarmic - prefer vendored version for compatibility
+    enet
    ffmpeg
-    fmt_8
+    fmt
    glslang
+    httplib
+    inih
    libjack2
    libopus
    libpulseaudio
    libusb1
    libva
    libzip
+    # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
    lz4
    nlohmann_json
    qtbase
+    qtmultimedia
    qttools
+    qtwayland
    qtwebengine
    rapidjson
    SDL2
    sndio
    speexdsp
    udev
+    vulkan-headers
+    # intentionally omitted: xbyak - prefer vendored version for compatibility
    zlib
    zstd
  ];

-  doCheck = true;
-
  # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
  # making the build fail, as that path does not exist
  dontFixCmake = true;

-  # -Werror causes build failures for deprecation warnings introduced by transitive dependency updates
-  postPatch = ''
-    sed -i '/-Werror/d' src/common/CMakeLists.txt
-  '';
-
  cmakeFlags = [
-    "-DYUZU_USE_BUNDLED_QT=OFF"
-    "-DYUZU_USE_BUNDLED_FFMPEG=OFF"
-    "-DYUZU_USE_BUNDLED_OPUS=OFF"
-    "-DYUZU_USE_EXTERNAL_SDL2=OFF"
+    # actually has a noticeable performance impact
+    "-DYUZU_ENABLE_LTO=ON"

+    # build with qt6
+    "-DENABLE_QT6=ON"
    "-DENABLE_QT_TRANSLATION=ON"
+
+    # use system libraries
+    "-DYUZU_USE_EXTERNAL_SDL2=OFF"
+    "-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF"
+
+    # don't check for missing submodules
+    "-DYUZU_CHECK_SUBMODULES=OFF"
+
+    # enable some optional features
    "-DYUZU_USE_QT_WEB_ENGINE=ON"
+    "-DYUZU_USE_QT_MULTIMEDIA=ON"
    "-DUSE_DISCORD_PRESENCE=ON"

    # We dont want to bother upstream with potentially outdated compat reports
@ -107,21 +129,17 @@ stdenv.mkDerivation rec {
    "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
  ];

+  # Fixes vulkan detection.
+  # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
  qtWrapperArgs = [
-    # Fixes vulkan detection
    "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
-    # Without yuzu doesnt start on wayland. See https://github.com/yuzu-emu/yuzu/issues/6088
-    "--set QT_QPA_PLATFORM xcb"
  ];

  preConfigure = ''
-    # This prevents a check for submodule directories.
-    rm -f .gitmodules
-
    # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
    cmakeFlagsArray+=(
-      "-DTITLE_BAR_FORMAT_IDLE=yuzu ${branch} ${version}"
-      "-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branch} ${version} | {3}"
+      "-DTITLE_BAR_FORMAT_IDLE=yuzu | ${branch} ${version} (nixpkgs) {}"
+      "-DTITLE_BAR_FORMAT_RUNNING=yuzu | ${branch} ${version} (nixpkgs) | {}"
    )
  '';

@ -130,12 +148,7 @@ stdenv.mkDerivation rec {
    ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
  '';

-  passthru.updateScript = runCommandLocal "yuzu-${branch}-updateScript" {
-    script = substituteAll {
-      src = ./update.sh;
-      inherit branch;
-    };
-  } "install -Dm755 $script $out";
+  passthru.updateScript = ./update.sh;

  meta = with lib; {
    homepage = "https://yuzu-emu.org";
@ -143,8 +156,8 @@ stdenv.mkDerivation rec {
    description = "The ${branch} branch of an experimental Nintendo Switch emulator written in C++";
    longDescription = ''
      An experimental Nintendo Switch emulator written in C++.
-      Using the mainline branch is recommanded for general usage.
-      Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability.
+      Using the mainline branch is recommended for general usage.
+      Using the early-access branch is recommended if you would like to try out experimental features, with a cost of stability.
    '';
    mainProgram = "yuzu";
    platforms = [ "x86_64-linux" ];
@ -158,6 +171,7 @@ stdenv.mkDerivation rec {
      ivar
      joshuafern
      sbruder
+      k900
    ];
  };
 }
--- a/pkgs/applications/emulators/yuzu/sources.nix
+++ b/pkgs/applications/emulators/yuzu/sources.nix
@ -0,0 +1,19 @@
+# Generated by ./update.sh - do not update manually!
+# Last updated: 2023-05-05
+{
+  compatList = {
+    rev = "773d28cbc699427c8baa427452d7b229920eec59";
+    hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
+  };
+
+  mainline = {
+    version = "1421";
+    hash = "sha256:1ldxframs7a8rmna9ymyx20n89594q0d1266kr7ah8yvh1gp04r3";
+  };
+
+  ea = {
+    version = "3557";
+    distHash = "sha256:0bddx5d88cfaaqbzr59w9kqjjsf9xvgvdn1g0l9w3ifr9zc2vlwr";
+    fullHash = "sha256:0w1ji3a8iridh4dpyal8lscgwddf9pwz1pfigksmvbn8mm9d9xwl";
+  };
+}
--- a/pkgs/applications/emulators/yuzu/update.sh
+++ b/pkgs/applications/emulators/yuzu/update.sh
@ -1,105 +1,66 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p nix nix-prefetch-git coreutils curl jq gnused
+#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq

 set -euo pipefail

-# Will be replaced with the actual branch when running this from passthru.updateScript
-BRANCH="@branch@"
-DEFAULT_NIX="$(dirname "${BASH_SOURCE[@]}")/default.nix"
+cd "$(dirname "$(readlink -f "$0")")"

-if [[ "$(basename "$PWD")" = "yuzu" ]]; then
-    echo "error: Script must be ran from nixpkgs's root directory for compatibility with the maintainer script"
-    exit 1
-fi
-
-updateBranch() {
-    local branch attribute oldVersion oldHash newVersion newHash
-    branch="$1"
-    attribute="yuzu-$branch"
-    [[ "$branch" = "early-access" ]] && attribute="yuzu-ea" # Attribute path doesnt match the branch name
-    oldVersion="$(nix eval --raw -f "./default.nix" "$attribute".version)"
-    oldHash="$(nix eval --raw -f "./default.nix" "$attribute".src.drvAttrs.outputHash)"
-
-    if [[ "$branch" = "mainline" ]]; then
-        newVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" \
-            | jq -r '.[0].name' | cut -d" " -f2)"
-    elif [[ "$branch" = "early-access" ]]; then
-        newVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" \
-            | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)"
-    fi
-
-    if [[ "${oldVersion}" = "${newVersion}" ]]; then
-        echo "$attribute is already up to date."
-        return
-    else
-        echo "$attribute: ${oldVersion} -> ${newVersion}"
-    fi
-
-    echo "  fetching source code to generate hash..."
-    if [[ "$branch" = "mainline" ]]; then
-        newHash="$(nix-prefetch-git --quiet --fetch-submodules --rev "mainline-0-${newVersion}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')"
-    elif [[ "$branch" = "early-access" ]]; then
-        newHash="$(nix-prefetch-git --quiet --fetch-submodules --rev "EA-${newVersion}" "https://github.com/pineappleEA/pineapple-src" | jq -r '.sha256')"
-    fi
-    newHash="$(nix hash to-sri --type sha256 "${newHash}")"
-
-    sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX"
-    sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
-    echo "  successfully updated $attribute. new hash: $newHash"
+log() {
+    tput bold
+    echo "#" "$@"
+    tput sgr0
 }

-updateCompatibilityList() {
-    local latestRevision oldUrl newUrl oldHash newHash oldDate newDate
-    latestRevision="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')"
+alias curl='curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"}'

-    oldUrl="$(sed -n '/yuzu-compat-list/,/url/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)"
-    newUrl="https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${latestRevision}/compatibility_list.json"
+log "Updating compatibility list..."
+compatListRev="$(curl "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')"

-    oldDate="$(sed -n '/last updated.*/p' "$DEFAULT_NIX" | rev | cut -d' ' -f1 | rev)"
-    newDate="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/${latestRevision}" \
-        | jq -r '.commit.committer.date' | cut -d'T' -f1)"
+log "Downloading rev: ${compatListRev}"
+compatListHash="$(nix-prefetch-url "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${compatListRev}/compatibility_list.json")"

-    oldHash="$(sed -n '/yuzu-compat-list/,/sha256/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)"
-    newHash="$(nix hash to-sri --type sha256 "$(nix-prefetch-url --quiet "$newUrl")")"
+log "Updating mainline..."
+mainlineVersion="$(curl "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" | jq -r '.[0].name' | cut -d" " -f2)"

-    if [[ "$oldHash" = "$newHash" ]]; then
-        echo "compatibility_list is already up to date."
-        return
-    else
-        echo "compatibility_list: $oldDate -> $newDate"
-    fi
+log "Downloading version: ${mainlineVersion}"
+mainlineHash="$(nix-prefetch-git --fetch-submodules --rev "mainline-0-${mainlineVersion}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')"

-    sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX"
-    sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
-    sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX"
-    echo "  successfully updated compatibility_list. new hash: $newHash"
+log "Updating early access..."
+eaVersion="$(curl "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2)"
+
+log "Downloading dist version: ${eaVersion}"
+fetched="$(nix-prefetch-url --unpack --print-path "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${eaVersion}/Windows-Yuzu-EA-${eaVersion}.zip")"
+
+eaDistHash="$(echo "${fetched}" | head -n1)"
+eaDist="$(echo "${fetched}" | tail -n1)"
+
+eaDistUnpacked="$(mktemp -d)"
+trap 'rm -rf "$eaDistUnpacked"' EXIT
+
+log "Unpacking dist..."
+tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1
+
+log "Rehydrating..."
+eaFullHash="$(nix-prefetch-git --fetch-submodules "$eaDistUnpacked" | jq -r '.sha256')"
+
+cat >sources.nix <<EOF
+# Generated by ./update.sh - do not update manually!
+# Last updated: $(date +%F)
+{
+  compatList = {
+    rev = "$compatListRev";
+    hash = "sha256:$compatListHash";
+  };
+
+  mainline = {
+    version = "$mainlineVersion";
+    hash = "sha256:$mainlineHash";
+  };
+
+  ea = {
+    version = "$eaVersion";
+    distHash = "sha256:$eaDistHash";
+    fullHash = "sha256:$eaFullHash";
+  };
 }
-
-if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then
-    updateBranch "$BRANCH"
-    updateCompatibilityList
-else # Script is not ran from passthru.updateScript
-    if (( $# == 0 )); then
-        updateBranch "mainline"
-        updateBranch "early-access"
-    fi
-
-    while (( "$#" > 0 )); do
-        case "$1" in
-            mainline|yuzu-mainline)
-                updateBranch "mainline"
-                ;;
-            early-access|yuzu-early-access|ea|yuzu-ea)
-                updateBranch "early-access"
-                ;;
-            *)
-                echo "error: invalid branch: $1."
-                echo "usage: $(basename "$0") [mainline|early-access]"
-                exit 1
-                ;;
-        esac
-        shift
-    done
-
-    updateCompatibilityList
-fi
+EOF
--- a/pkgs/applications/misc/authy/default.nix
+++ b/pkgs/applications/misc/authy/default.nix
@ -10,12 +10,12 @@
 stdenv.mkDerivation rec {
  pname = "authy";
  # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
-  version = "2.2.2";
-  rev = "12";
+  version = "2.3.0";
+  rev = "19";

  src = fetchurl {
    url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
-    sha256 = "sha256-vSbqT2s5lLEU1SSDaC+sS6qt446iSKYUgKudO5WMOu4=";
+    hash = "sha256-WN/vcY3kfF/HQZ7opyIdDevU5oDYDGjshS7XVU7yrj8=";
  };

  nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
--- a/pkgs/applications/misc/health/default.nix
+++ b/pkgs/applications/misc/health/default.nix
@ -0,0 +1,79 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, fetchpatch
+, meson
+, ninja
+, pkg-config
+, rustPlatform
+, rustc
+, cargo
+, wrapGAppsHook4
+, blueprint-compiler
+, libadwaita
+, libsecret
+, tracker
+, darwin
+}:
+
+stdenv.mkDerivation rec {
+  pname = "health";
+  version = "0.94.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "World";
+    repo = pname;
+    rev = version;
+    hash = "sha256-KS0sdCQg2LqQB0K1cUbAjA8VITn5rAb8XCWjOKYbPqM=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    patches = [ ./update_gtk4_cargo_deps.patch ];
+    name = "${pname}-${version}";
+    hash = "sha256-j0I0vKoGaf2pce2C/xkz+nJYCfLvHB5F6Q9XpJtABMI=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/max_size_tightending_thresh_0.94.0.patch?h=health&id=d35d89760964b00ad457eca07855143a1dcbabdf";
+      hash = "sha256-ndoxyrm+SVGVxfUbc5sQItQwzK75ZtKMSGUOB9mzBmo=";
+    })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/max_value_0.94.0.patch?h=health&id=d35d89760964b00ad457eca07855143a1dcbabdf";
+      hash = "sha256-YKVQNtz+RWN6Ydw+kbStCVf0vu0eTrMKGd6kEijFG00=";
+    })
+    # patch both or it will complain Cargo.lock mismatch
+    ./update_gtk4_cargo_deps.patch
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    wrapGAppsHook4
+    blueprint-compiler
+  ];
+
+  buildInputs = [
+    libadwaita
+    libsecret
+    tracker
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.Foundation
+  ];
+
+  meta = with lib; {
+    description = "A health tracking app for the GNOME desktop";
+    homepage = "https://apps.gnome.org/app/dev.Cogitri.Health";
+    license = licenses.gpl3Plus;
+    mainProgram = "dev.Cogitri.Health";
+    maintainers = with maintainers; [ aleksana ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/applications/misc/health/update_gtk4_cargo_deps.patch
+++ b/pkgs/applications/misc/health/update_gtk4_cargo_deps.patch
@ -0,0 +1,28 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 0331121..8d290e4 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -829,9 +829,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a"
+ 
+ [[package]]
+ name = "gtk4"
+-version = "0.4.8"
+version = "0.4.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396"
+checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc"
+ dependencies = [
+  "bitflags",
+  "cairo-rs",
+@@ -852,9 +852,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "gtk4-macros"
+-version = "0.4.8"
+version = "0.4.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7"
+checksum = "6aba0b544e91a753068e279e99d34e9624b8cfd26282167024c8a5773b8a826c"
+ dependencies = [
+  "anyhow",
+  "proc-macro-crate",
--- a/pkgs/applications/misc/inlyne/default.nix
+++ b/pkgs/applications/misc/inlyne/default.nix
@ -1,40 +1,34 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, installShellFiles
 , stdenv
 , pkg-config
 , fontconfig
 , xorg
 , libGL
 , openssl
-, AppKit
-, ApplicationServices
-, CoreFoundation
-, CoreGraphics
-, CoreServices
-, CoreText
-, CoreVideo
-, Foundation
-, Metal
-, QuartzCore
-, Security
-, libobjc
+, darwin
 }:

 rustPlatform.buildRustPackage rec {
  pname = "inlyne";
-  version = "0.2.1";
+  version = "0.3.1";

  src = fetchFromGitHub {
    owner = "trimental";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-jFocERr2cW7zdLiYfAay5Dh1issKAHp6vRWYWR1Axcg=";
+    hash = "sha256-B+H3G4jVysqrzWIP+1hktSGnycZLizxhmBCO/lYIr0I=";
  };

-  cargoSha256 = "sha256-mH8tu8koprmHo6JJ9AwYMexy2SFR2yukZmFT060cuZ4=";
+  cargoHash = "sha256-LFL2DVKu/UM7effikZN/IhSD6DrlwO+CF+S60PXULa0=";

-  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [
+    installShellFiles
+  ] ++ lib.optionals stdenv.isLinux [
+    pkg-config
+  ];

  buildInputs = lib.optionals stdenv.isLinux [
    fontconfig
@ -44,20 +38,16 @@ rustPlatform.buildRustPackage rec {
    xorg.libxcb
    openssl
  ] ++ lib.optionals stdenv.isDarwin [
-    AppKit
-    ApplicationServices
-    CoreFoundation
-    CoreGraphics
-    CoreServices
-    CoreText
-    CoreVideo
-    Foundation
-    Metal
-    QuartzCore
-    Security
-    libobjc
+    darwin.apple_sdk_11_0.frameworks.AppKit
  ];

+  postInstall = ''
+    installShellCompletion --cmd inlyne \
+      --bash <($out/bin/inlyne --gen-completions bash) \
+      --fish <($out/bin/inlyne --gen-completions fish) \
+      --zsh <($out/bin/inlyne --gen-completions zsh)
+  '';
+
  postFixup = lib.optionalString stdenv.isLinux ''
    patchelf $out/bin/inlyne \
      --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
@ -66,6 +56,7 @@ rustPlatform.buildRustPackage rec {
  meta = with lib; {
    description = "A GPU powered browserless markdown viewer";
    homepage = "https://github.com/trimental/inlyne";
+    changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}";
    license = licenses.mit;
    maintainers = with maintainers; [ figsoda ];
  };
--- a/pkgs/applications/misc/osmscout-server/default.nix
+++ b/pkgs/applications/misc/osmscout-server/default.nix
@ -14,13 +14,13 @@ let
 in
 mkDerivation rec {
  pname = "osmscout-server";
-  version = "2.2.2";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "rinigus";
    repo = "osmscout-server";
    rev = version;
-    sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw=";
+    hash = "sha256-jcg/0SKeLviEC+vszh5DployKDAI7N+a8lzvImzFTvY=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/osmtogeojson/default.nix
+++ b/pkgs/applications/misc/osmtogeojson/default.nix
@ -0,0 +1,27 @@
+{ lib, buildNpmPackage, fetchFromGitHub }:
+
+buildNpmPackage rec {
+  pname = "osmtogeojson";
+  version = "3.0.0-beta.5";
+
+  src = fetchFromGitHub {
+    owner = "tyrasd";
+    repo = pname;
+    rev = version;
+    hash = "sha256-T6d/KQQGoXHgV0iNhOms8d9zfjYMfnBNwPLShrEkHG4=";
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} ./package-lock.json
+  '';
+
+  npmDepsHash = "sha256-stAVuyjuRQthQ3jQdekmZYjeau9l0GzEEMkV1q5fT2k=";
+  dontNpmBuild = true;
+
+  meta = with lib; {
+    description = "Converts OSM data to GeoJSON";
+    homepage = "https://tyrasd.github.io/osmtogeojson/";
+    maintainers = with maintainers; [ thibautmarty ];
+    license = licenses.mit;
+  };
+}
--- a/pkgs/applications/misc/osmtogeojson/package-lock.json
+++ b/pkgs/applications/misc/osmtogeojson/package-lock.json
--- a/pkgs/applications/misc/rusty-psn/default.nix
+++ b/pkgs/applications/misc/rusty-psn/default.nix
@ -5,6 +5,11 @@
 , makeDesktopItem
 , copyDesktopItems
 , pkg-config
+, cmake
+, fontconfig
+, glib
+, gtk3
+, freetype
 , openssl
 , xorg
 , libGL
@ -26,10 +31,18 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [
    pkg-config
+  ] ++ lib.optionals withGui [
    copyDesktopItems
+    cmake
  ];

-  buildInputs = if withGui then [
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals withGui [
+    fontconfig
+    glib
+    gtk3
+    freetype
    openssl
    xorg.libxcb
    xorg.libX11
@ -39,8 +52,6 @@ rustPlatform.buildRustPackage rec {
    xorg.libxcb
    libGL
    libGL.dev
-  ] else [
-    openssl
  ];

  buildNoDefaultFeatures = true;
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@ -23,7 +23,7 @@ let
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
  pname = "vivaldi";
-  version = "6.0.2979.15";
+  version = "6.0.2979.18";

  suffix = {
    aarch64-linux = "arm64";
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
    hash = {
-      aarch64-linux = "sha256-6rETxeExtHxWrKFO0MHzjLgnaHUeREVqsOB9264jZr8=";
-      x86_64-linux = "sha256-vvN0AxrKotphYIpkyOKHBgEOQtF4LvYBV1cB591ICbc=";
+      aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs=";
+      x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64=";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };

--- a/pkgs/applications/networking/cluster/nova/default.nix
+++ b/pkgs/applications/networking/cluster/nova/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "nova";
-  version = "3.6.2";
+  version = "3.6.3";

  src = fetchFromGitHub {
    owner = "FairwindsOps";
    repo = pname;
    rev = version;
-    hash = "sha256-l2HBjM5DyeWkdAwQGzPp+A3UuXXc0OTizInsVL0k/0I=";
+    hash = "sha256-bu0iIhoRRi2dzBGGjWy9YJVSHtdO3T1NkLpGMseyK/E=";
  };

  vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U=";
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@ -31,7 +31,8 @@ let
        mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
        mv * $out/lib/${untarDir}

-        cp $out/lib/${untarDir}/conf/log4j.properties{.template,}
+        cp $out/lib/${untarDir}/conf/log4j.properties{.template,} || \
+          cp $out/lib/${untarDir}/conf/log4j2.properties{.template,}

        cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF
        export JAVA_HOME="${jdk}"
@ -70,20 +71,9 @@ let
    };
 in
 {
-  spark_3_2 = spark rec {
+  spark_3_4 = spark rec {
    pname = "spark";
-    version = "3.2.2";
-    sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0=";
-  };
-  spark_3_1 = spark rec {
-    pname = "spark";
-    version = "3.1.3";
-    sha256 = "sha256-RIQyN5YjxFLfNIrETR3Vv99zsHxt77rhOXHIThCI2Y8=";
-  };
-  spark_2_4 = spark rec {
-    pname = "spark";
-    version = "2.4.8";
-    sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
-    extraMeta.knownVulnerabilities = [ "CVE-2021-38296" ];
+    version = "3.4.0";
+    sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk=";
  };
 }
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -327,13 +327,13 @@
    "vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw="
  },
  "dnsimple": {
-    "hash": "sha256-I5TUhq8OZqcLQs/jr8LB22Uc9s5M/WH9LRzV8EsgRnc=",
+    "hash": "sha256-XLye6cuVZN9AdLuISJOw9aOSFXMdFNqrOCBGASVC2Bw=",
    "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
    "owner": "dnsimple",
    "repo": "terraform-provider-dnsimple",
-    "rev": "v1.1.0",
+    "rev": "v1.1.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2FZWc+i4mSLDo143CULLmsVhjs2otN8bSqcfZROZPTM="
+    "vendorHash": "sha256-rCM+PL78zD1FYK2v9ihdLkoFwbkgtJTSEq5vKXZPAsU="
  },
  "docker": {
    "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=",
@ -1026,13 +1026,13 @@
    "vendorHash": null
  },
  "snowflake": {
-    "hash": "sha256-ScGBo04qWjSuYXKHynn/rpd+2iKf+K+musYt/eWJfok=",
+    "hash": "sha256-2eS56WAEVz1nYiYmfthharyX9giEQ/8kufAwyHCG6PM=",
    "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
    "owner": "Snowflake-Labs",
    "repo": "terraform-provider-snowflake",
-    "rev": "v0.63.0",
+    "rev": "v0.64.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-3Ry+XQxF39lXr3Ev+KOx0GatVbD0Sjs9Jai1VPjEDBE="
+    "vendorHash": "sha256-lJUkSd3v8VVoOI9ywiUh7wEPyvhF9Ip2v9kJ43hCwsI="
  },
  "sops": {
    "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",
@ -1044,11 +1044,11 @@
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
  },
  "spotinst": {
-    "hash": "sha256-RrnDjmzQIOR/dZjiNMqL4fw4nayLZrsaD5mtg+3OWMU=",
+    "hash": "sha256-dEHRN3JXncWC1fua293hKc27jjPdFvyO7p0Zx9YNfWk=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.116.0",
+    "rev": "v1.117.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-6ZxurzzOa/1TXOApQNLFUrY+Ryxc7n+JwZG76JuePGc="
  },
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "PortfolioPerformance";
-  version = "0.62.0";
+  version = "0.62.1";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-V3CHp0r+3Vya9lcuCfHeVQqmy9rxlN9cs5ZShoJ9XTA=";
+    hash = "sha256-tENX2F+kZSrltvaZm3ZaUld3es8Bt8LCpEVGxAOFVm0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/math/labplot/default.nix
+++ b/pkgs/applications/science/math/labplot/default.nix
@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
    homepage = "https://labplot.kde.org";
    license = with licenses; [ asl20 bsd3 cc-by-30 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus mit ];
    maintainers = with maintainers; [ hqurve ];
+    mainProgram = "labplot2";
    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/version-management/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-cola/default.nix
@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-VAn4zXypOugPIVyXQ/8Yt0rCDM7hVdIY+jpmoTHqssU=";
  };

-  buildInputs = [ qt5.qtwayland ];
+  buildInputs = lib.optionals stdenv.isLinux [ qt5.qtwayland ];
  propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ];
  nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ];
  nativeCheckInputs = with python3Packages; [ git pytestCheckHook ];
--- a/pkgs/applications/window-managers/sway/osd.nix
+++ b/pkgs/applications/window-managers/sway/osd.nix
@ -0,0 +1,38 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, gtk3
+, gtk-layer-shell
+, libpulseaudio
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "swayosd";
+  version = "unstable-2023-05-09";
+
+  src = fetchFromGitHub {
+    owner = "ErikReider";
+    repo = "SwayOSD";
+    rev = "5c2176ae6a01a18fdc2b0f5d5f593737b5765914";
+    hash = "sha256-rh42J6LWgNPOWYLaIwocU1JtQnA5P1jocN3ywVOfYoc=";
+  };
+
+  cargoHash = "sha256-ZcgrUcRQTcEYhw2mpJDuYDz3I/u/2Q+O60ajXYRMeow=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    gtk3
+    gtk-layer-shell
+    libpulseaudio
+  ];
+
+  meta = with lib; {
+    description = "A GTK based on screen display for keyboard shortcuts";
+    homepage = "https://github.com/ErikReider/SwayOSD";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ aleksana ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@ -45,7 +45,7 @@
 , buildFeatures ? [ ]
 , checkFeatures ? buildFeatures
 , useNextest ? false
-, auditable ? true
+, auditable ? !cargo-auditable.meta.broken

 , depsExtraArgs ? {}

--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "wireless-regdb";
-  version = "2023.02.13";
+  version = "2023.05.03";

  src = fetchurl {
    url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-/oHoqGlNxHU6RQh6HEx+G0je5aWfX3ls43TqVQ8LLnM=";
+    sha256 = "sha256-8lTQirN2WuriuFYiLhGpXUSu9RmmZjh3xx72j65MjBI=";
  };

  dontBuild = true;
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.5/ -A '*.tar.xz' )
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@ -4,475 +4,475 @@

 {
  aura-browser = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/aura-browser-5.27.4.tar.xz";
-      sha256 = "0m69p3pnb4kwpibqi8p4kg15sd47298hbhxgkj6ijpbd0422p4c9";
-      name = "aura-browser-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/aura-browser-5.27.5.tar.xz";
+      sha256 = "0vqw9kxskx3d6wfgrfbhrsw2vy71zr3cwhmfk7qj4vfpmilmsvy5";
+      name = "aura-browser-5.27.5.tar.xz";
    };
  };
  bluedevil = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/bluedevil-5.27.4.tar.xz";
-      sha256 = "18wnr31rdpk70g7l3ig03kw99ss6qkfjmhqysrkyd6m1dpsp260h";
-      name = "bluedevil-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/bluedevil-5.27.5.tar.xz";
+      sha256 = "1vadllkv4fjjwqb30jyawi56jflslw5nc391r0bixg55cpk5llv1";
+      name = "bluedevil-5.27.5.tar.xz";
    };
  };
  breeze = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/breeze-5.27.4.tar.xz";
-      sha256 = "008rdgyn10wdm393hgxvshfcqrxg6y5yr6xi0nzj4y0cd6yhxn32";
-      name = "breeze-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/breeze-5.27.5.tar.xz";
+      sha256 = "0s68zr21wniqsdkb14lzqz0hj7hb4mbvcwrq7sf8yxf0z1ds7n3h";
+      name = "breeze-5.27.5.tar.xz";
    };
  };
  breeze-grub = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/breeze-grub-5.27.4.tar.xz";
-      sha256 = "0ymivw0pwia1vbf45pr04f825r8w6gsgn450s5x35144vg6lqkqb";
-      name = "breeze-grub-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/breeze-grub-5.27.5.tar.xz";
+      sha256 = "0kkrsda7ml3cbvfxb0ng3np1bk61fnl1jndk3c13lyi0jj97na7f";
+      name = "breeze-grub-5.27.5.tar.xz";
    };
  };
  breeze-gtk = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/breeze-gtk-5.27.4.tar.xz";
-      sha256 = "17wr4ri1jxsfx8pcm41mp0fsszlf6wi80gxlkixghrc04p6pv5nb";
-      name = "breeze-gtk-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/breeze-gtk-5.27.5.tar.xz";
+      sha256 = "0s69alp490yhm2v42vkngz99ji4b10n6fd36ybf72m6nnkd6v5f4";
+      name = "breeze-gtk-5.27.5.tar.xz";
    };
  };
  breeze-plymouth = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/breeze-plymouth-5.27.4.tar.xz";
-      sha256 = "1fzidj0dqmr5baphffr5fyxww7v6bigfvbj1hndhk5silm28krkv";
-      name = "breeze-plymouth-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/breeze-plymouth-5.27.5.tar.xz";
+      sha256 = "0k014dvx2sw4hd63n74vjglg8dgyjjlvipxhb5cfp44x7ch52wii";
+      name = "breeze-plymouth-5.27.5.tar.xz";
    };
  };
  discover = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/discover-5.27.4.tar.xz";
-      sha256 = "0rpr0c87nlm3fanv5fxs930rp5mrw357cfar6d81mwacmp86d7yw";
-      name = "discover-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/discover-5.27.5.tar.xz";
+      sha256 = "06xk780a60f4a1n2052q1wxydjvvb8nlw9r2cj7x4rg02s57hpvq";
+      name = "discover-5.27.5.tar.xz";
    };
  };
  drkonqi = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/drkonqi-5.27.4.tar.xz";
-      sha256 = "1lcidwcsm216acr6ybhyma64gl37n1pn7y8ilkh2iilwm1fwwfnn";
-      name = "drkonqi-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/drkonqi-5.27.5.tar.xz";
+      sha256 = "0mmcp5fzlygcchv5v10mn39iqfxjxig9x8h74n3hq0rw7arax3a4";
+      name = "drkonqi-5.27.5.tar.xz";
    };
  };
  flatpak-kcm = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/flatpak-kcm-5.27.4.tar.xz";
-      sha256 = "0i917li4cm8p0qq28m4jfasy5lph58spf9bfsbp3ka1x7i25cqdd";
-      name = "flatpak-kcm-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/flatpak-kcm-5.27.5.tar.xz";
+      sha256 = "16ms8l7cncbmll808mb0hfjsfjpg1m3f1j38y9zh1hal0rw42xbv";
+      name = "flatpak-kcm-5.27.5.tar.xz";
    };
  };
  kactivitymanagerd = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kactivitymanagerd-5.27.4.tar.xz";
-      sha256 = "0wnsj5mbzjc3bylzyhgj8bw0qsf5c9jcyxmfr0h7w4hj414zvqfr";
-      name = "kactivitymanagerd-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kactivitymanagerd-5.27.5.tar.xz";
+      sha256 = "06dn0cnspp2qsjxa10vz81vrhhb6przr9lcfyia4gi65gdrg82d2";
+      name = "kactivitymanagerd-5.27.5.tar.xz";
    };
  };
  kde-cli-tools = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kde-cli-tools-5.27.4.tar.xz";
-      sha256 = "06dl811mwssjylgkn74wjhxi98q1qacf5c2m0jfyny7hbphgv565";
-      name = "kde-cli-tools-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kde-cli-tools-5.27.5.tar.xz";
+      sha256 = "0rzggjsly44wxpsqqxylnzw2n3sf7s1584rf1qp1040jf0vmcx7d";
+      name = "kde-cli-tools-5.27.5.tar.xz";
    };
  };
  kde-gtk-config = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kde-gtk-config-5.27.4.tar.xz";
-      sha256 = "1qi0cbx9yilbxs19nbh8iplj5hi19mllk63ldyah2vn5bgwavxcq";
-      name = "kde-gtk-config-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kde-gtk-config-5.27.5.tar.xz";
+      sha256 = "0a0hbif6xvlfg6jm2kmzsfjr2f73c7pxbn8amam6z4h1171bfys7";
+      name = "kde-gtk-config-5.27.5.tar.xz";
    };
  };
  kdecoration = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kdecoration-5.27.4.tar.xz";
-      sha256 = "0vpshfjb2m1m4lx4sh1mhfpx70wvy6laaids9q1cip3k22i24ps1";
-      name = "kdecoration-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kdecoration-5.27.5.tar.xz";
+      sha256 = "0hmy621b8zb8jvanw6w6y8mgrfspkl5d92sgl5zx00lqqz2zdyzg";
+      name = "kdecoration-5.27.5.tar.xz";
    };
  };
  kdeplasma-addons = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kdeplasma-addons-5.27.4.tar.xz";
-      sha256 = "128zjkbvxkibh1d5d1m5xsg3f6hrkgs1f0k371bk8dpki1wsb0ka";
-      name = "kdeplasma-addons-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kdeplasma-addons-5.27.5.tar.xz";
+      sha256 = "1y8gaqmbqcjvzpxk6bb7bjgycrmsnw3cjk741csb0xbw66q1ldf9";
+      name = "kdeplasma-addons-5.27.5.tar.xz";
    };
  };
  kgamma5 = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kgamma5-5.27.4.tar.xz";
-      sha256 = "00jq6pc40k1dd6g38bjyb52z8xf3iz9s2n0bwvqaddcngw5wb0aa";
-      name = "kgamma5-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kgamma5-5.27.5.tar.xz";
+      sha256 = "1nadx1fgpz1k7c2j93wk4ipzp6pydz8ak1p9p2pv9a24753jcrkv";
+      name = "kgamma5-5.27.5.tar.xz";
    };
  };
  khotkeys = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/khotkeys-5.27.4.tar.xz";
-      sha256 = "08qhj9m5dkg1vgjyzm93ns8c5yvbwfa5r6z7xgn0filvlzg284l4";
-      name = "khotkeys-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/khotkeys-5.27.5.tar.xz";
+      sha256 = "087cws4g8p0fzalspnizsd8fxk3745g9ar03pl746fqyvqk57s43";
+      name = "khotkeys-5.27.5.tar.xz";
    };
  };
  kinfocenter = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kinfocenter-5.27.4.tar.xz";
-      sha256 = "15g4czd8pm4vliaax8kgy8zdgxqj73x1icy4gc09y4zwqhaclxb8";
-      name = "kinfocenter-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kinfocenter-5.27.5.tar.xz";
+      sha256 = "0j6w9b4pf353l0dfv8b8a90q4swylqxwx818271abs1bkq271s8b";
+      name = "kinfocenter-5.27.5.tar.xz";
    };
  };
  kmenuedit = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kmenuedit-5.27.4.tar.xz";
-      sha256 = "1cx7ih68by4slrxrgf8yh49fxszfrzgfhrajk8xjgq9s34nvgarp";
-      name = "kmenuedit-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kmenuedit-5.27.5.tar.xz";
+      sha256 = "09qiydq3v4yl51cn0l2ndsr54m33n6x3ngz9q18j4nf4pk266qj4";
+      name = "kmenuedit-5.27.5.tar.xz";
    };
  };
  kpipewire = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz";
-      sha256 = "0r9ii0mwv2d8nlq3p0g5hsp3m0j8my17ji1an7hzw5pajf340lx6";
-      name = "kpipewire-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kpipewire-5.27.5.tar.xz";
+      sha256 = "166xggr22k2ksnsx97kngc02r8fy0fagd2m7zghdbl5axvf6lcj1";
+      name = "kpipewire-5.27.5.tar.xz";
    };
  };
  kscreen = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz";
-      sha256 = "1vf5lhbm1r55l1y06sib1fdv5mbmd77ns1xmq3f0ff7mfabj8vs5";
-      name = "kscreen-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kscreen-5.27.5.tar.xz";
+      sha256 = "0s24halra8gnczmlj8kvbqvls1njck2abxbdsvn7gm3rkg1sm5vj";
+      name = "kscreen-5.27.5.tar.xz";
    };
  };
  kscreenlocker = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kscreenlocker-5.27.4.tar.xz";
-      sha256 = "14bip40nkkj6xhmws14hqzjmw23348dpvip4vad8fdgyndcpznm9";
-      name = "kscreenlocker-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kscreenlocker-5.27.5.tar.xz";
+      sha256 = "14pch0w4cgsx1q18hssdnjxdbdcparyrqqr9kd5a33zdqbqhg22c";
+      name = "kscreenlocker-5.27.5.tar.xz";
    };
  };
  ksshaskpass = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/ksshaskpass-5.27.4.tar.xz";
-      sha256 = "0spl7v7narfpvx37f1fqyk9mbsqhymy7jvd3gbxyln0x31j041d9";
-      name = "ksshaskpass-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/ksshaskpass-5.27.5.tar.xz";
+      sha256 = "1mqckg3j5flx02fji7lcqv2iip4nblrzf2wqq23q7six7rljdvgn";
+      name = "ksshaskpass-5.27.5.tar.xz";
    };
  };
  ksystemstats = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/ksystemstats-5.27.4.tar.xz";
-      sha256 = "1knykvf6ygg75y7qj8087v8sg6m54ywsk8v9d5yc7f0g8mhqkmhz";
-      name = "ksystemstats-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/ksystemstats-5.27.5.tar.xz";
+      sha256 = "1y6w6v1vf2bphspk7a3lgwgmz6ahdycbbsrr6qn8mkf9z36q97fm";
+      name = "ksystemstats-5.27.5.tar.xz";
    };
  };
  kwallet-pam = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kwallet-pam-5.27.4.tar.xz";
-      sha256 = "0v0jzkmdbwry6k70nk4gmzv758744q4qi50gry9bcz619imkz8ff";
-      name = "kwallet-pam-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kwallet-pam-5.27.5.tar.xz";
+      sha256 = "144ijabyj9w2yi9j5r0m945l6ysccwyq27cc0mc21mjyqa6sm6ka";
+      name = "kwallet-pam-5.27.5.tar.xz";
    };
  };
  kwayland-integration = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kwayland-integration-5.27.4.tar.xz";
-      sha256 = "027y4r02g26mv5a76s2yr0fxyx7dq81md41lgjnr3gg0jdm8ajpp";
-      name = "kwayland-integration-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kwayland-integration-5.27.5.tar.xz";
+      sha256 = "1y8qrdyvz61zcxsp9ylz7bg6hp7wk7is5p0n3s25650dlx0grqcs";
+      name = "kwayland-integration-5.27.5.tar.xz";
    };
  };
  kwin = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.1.tar.xz";
-      sha256 = "1c821szi4vvxc0aw49nb2xbdgnkc1pl5hadpvc9m4l18qly1v7xk";
-      name = "kwin-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kwin-5.27.5.tar.xz";
+      sha256 = "1si01jrhxa6sfqgl2ljl5czyls5mli7b4n6yy6jiws0rb6qjc4mv";
+      name = "kwin-5.27.5.tar.xz";
    };
  };
  kwrited = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/kwrited-5.27.4.tar.xz";
-      sha256 = "1z07fjw3b8q7cgy7vvlh1bmx4qm609mipgm5wjf6lb63ss04nfpd";
-      name = "kwrited-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/kwrited-5.27.5.tar.xz";
+      sha256 = "14fcby31017mmplcp5v2mfmfnlds5mgn35b725d06z584xcfrfpj";
+      name = "kwrited-5.27.5.tar.xz";
    };
  };
  layer-shell-qt = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/layer-shell-qt-5.27.4.tar.xz";
-      sha256 = "1znhwg86wnjrmw5lfbwarl2va90zf4b0lpafia73q0i39g0ysfiv";
-      name = "layer-shell-qt-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/layer-shell-qt-5.27.5.tar.xz";
+      sha256 = "088xilf31485mqxw09v2h7v3dayzd19c6yipmlxpyhzhg6jnmpyc";
+      name = "layer-shell-qt-5.27.5.tar.xz";
    };
  };
  libkscreen = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz";
-      sha256 = "0zps0z0j4yln2yda4sj15rn3i6y3qipb5yb4q90qm5a0iiggp7d8";
-      name = "libkscreen-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/libkscreen-5.27.5.tar.xz";
+      sha256 = "0rgbdlchhks5bxicdc8v7388wlg5b6ms9phlp5jfh1l7iprg7br9";
+      name = "libkscreen-5.27.5.tar.xz";
    };
  };
  libksysguard = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/libksysguard-5.27.4.tar.xz";
-      sha256 = "1y7q4bkgpg1j9yw9glm0566fbx6vf9ccz9f46vg3zfjwa468s4p0";
-      name = "libksysguard-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/libksysguard-5.27.5.tar.xz";
+      sha256 = "052yx04sihlvf7j94y140g9hldq9fjad9ziqdgmczvszy0xbazky";
+      name = "libksysguard-5.27.5.tar.xz";
    };
  };
  milou = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/milou-5.27.4.tar.xz";
-      sha256 = "1a2p3y3zcmjigwywl7k7mgwvilpyjzjnbylx8zadp0051yw6f3sd";
-      name = "milou-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/milou-5.27.5.tar.xz";
+      sha256 = "1602imffywir1il1xsq3n413fjxg4s3w9c49z20yn1igcwz0l6qv";
+      name = "milou-5.27.5.tar.xz";
    };
  };
  oxygen = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/oxygen-5.27.4.tar.xz";
-      sha256 = "1sz3rnsz8qabln3jn5bg1f5vgijgmm13242k65kiksvigfdrc3p2";
-      name = "oxygen-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/oxygen-5.27.5.tar.xz";
+      sha256 = "1gby4a9sf666i10nwjv4wswsbi34idcczz0cknfan08ahal4wxpv";
+      name = "oxygen-5.27.5.tar.xz";
    };
  };
  oxygen-sounds = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/oxygen-sounds-5.27.4.tar.xz";
-      sha256 = "1v44jcy0zkvpqkc6yih55j6xmb0g3pd26szk95mpjkn7jxsav8wy";
-      name = "oxygen-sounds-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/oxygen-sounds-5.27.5.tar.xz";
+      sha256 = "0rl55k6h34bcf5pk71942m3bf831ymh4kk89xkimczq4qki33yr1";
+      name = "oxygen-sounds-5.27.5.tar.xz";
    };
  };
  plank-player = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plank-player-5.27.4.tar.xz";
-      sha256 = "0650v644nvbnl9b0caa83pbq8y7jrklqzqxdlcrml6km85avhx5n";
-      name = "plank-player-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plank-player-5.27.5.tar.xz";
+      sha256 = "0anws5npjdqq0p94fdrqmvyc55x3vwfx8v59l10k8qmj6habarph";
+      name = "plank-player-5.27.5.tar.xz";
    };
  };
  plasma-bigscreen = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-bigscreen-5.27.4.tar.xz";
-      sha256 = "18jdgk3aydk394r91c279fnlhyrvmklqznxjikq25mx449wa3acp";
-      name = "plasma-bigscreen-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-bigscreen-5.27.5.tar.xz";
+      sha256 = "1wab0l0cz5a82lgq83s9ipmjqmj5nzzfk689lbz3swxns71qx03n";
+      name = "plasma-bigscreen-5.27.5.tar.xz";
    };
  };
  plasma-browser-integration = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-browser-integration-5.27.4.tar.xz";
-      sha256 = "0rpljxnir2nbh4ww5ycgpdrj739cr1dg46mmfqj65h8yn60zfynk";
-      name = "plasma-browser-integration-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-browser-integration-5.27.5.tar.xz";
+      sha256 = "09frs7yxaiqi10j9f7vnr05nk53mvx0jshjk9wlz1cibcwflb45l";
+      name = "plasma-browser-integration-5.27.5.tar.xz";
    };
  };
  plasma-desktop = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-desktop-5.27.4.tar.xz";
-      sha256 = "0068wcm586gv31aqjgppj1n5a81jv10q01spsxl24c91y7aiqkxr";
-      name = "plasma-desktop-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-desktop-5.27.5.tar.xz";
+      sha256 = "1c8wx4al96vnz9p02ml8ax6dzna1xvm6gvnn2w3n93v56hqmfasg";
+      name = "plasma-desktop-5.27.5.tar.xz";
    };
  };
  plasma-disks = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-disks-5.27.4.tar.xz";
-      sha256 = "08w3x7hd3wkgj41g9xcaylsz8lsjv1d4pgmzq7dy436vwbiaxx4p";
-      name = "plasma-disks-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-disks-5.27.5.tar.xz";
+      sha256 = "02s8n7da2i2zjqi2q9k8fddqr4868dqyx9bf1lyfag3bb64y447a";
+      name = "plasma-disks-5.27.5.tar.xz";
    };
  };
  plasma-firewall = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-firewall-5.27.4.tar.xz";
-      sha256 = "1b538c9jngyj5zg6bvih2x7nskzdn8g9g04bxdjnayldj2hb979l";
-      name = "plasma-firewall-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-firewall-5.27.5.tar.xz";
+      sha256 = "0hav4d2pgsvzvr9lw93v3zm473gii44x012fs1gx6dgcaam90b73";
+      name = "plasma-firewall-5.27.5.tar.xz";
    };
  };
  plasma-integration = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-integration-5.27.4.tar.xz";
-      sha256 = "0bl99gr2clqs6wxlx0652gcypgxqw9s34yxvhc9df0fn53v9b84s";
-      name = "plasma-integration-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-integration-5.27.5.tar.xz";
+      sha256 = "0ywzz2s46kaidzg5cagx2wp4kqndynfssz6a29czpw1811iwbvcd";
+      name = "plasma-integration-5.27.5.tar.xz";
    };
  };
  plasma-mobile = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-mobile-5.27.4.tar.xz";
-      sha256 = "1a05lnhnxnizzs9fswsrlddwb0629xfl3wmm2rw635gqldd0f66m";
-      name = "plasma-mobile-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-mobile-5.27.5.tar.xz";
+      sha256 = "0h61q8nkwl5adrgm0353l2kada76760rqzwb94xdc7r9cjxjy6yc";
+      name = "plasma-mobile-5.27.5.tar.xz";
    };
  };
  plasma-nano = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-nano-5.27.4.tar.xz";
-      sha256 = "1z70bj5s3qkx2rbrbn9xqf4vzyj7yx9vq9givcagncxnldi1x3pa";
-      name = "plasma-nano-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-nano-5.27.5.tar.xz";
+      sha256 = "1w6pq6wrnb3lq2jyfx9lpn11vmfka5rw4mn52cdz8997g4zyrhlj";
+      name = "plasma-nano-5.27.5.tar.xz";
    };
  };
  plasma-nm = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-nm-5.27.4.tar.xz";
-      sha256 = "0jr1a4d9qj43925abr36nvc9fhvyd58qhdg4w5i805p533wbzrif";
-      name = "plasma-nm-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-nm-5.27.5.tar.xz";
+      sha256 = "0bm6ihcg5cgfzz1pcj7zg2bjm8gik3rcjj4mp03ac1v29gj4hbqm";
+      name = "plasma-nm-5.27.5.tar.xz";
    };
  };
  plasma-pa = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-pa-5.27.4.tar.xz";
-      sha256 = "1rpjscmfb7i9h50m9xglxf4rgca63y0i8x341jgmf5kmpm9lad7d";
-      name = "plasma-pa-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-pa-5.27.5.tar.xz";
+      sha256 = "1241v4igi3d1n2x46vp9qgqvw2gngsk75gx3rnjnivfypxrkzay2";
+      name = "plasma-pa-5.27.5.tar.xz";
    };
  };
  plasma-remotecontrollers = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-remotecontrollers-5.27.4.tar.xz";
-      sha256 = "0l9n0q318720yx02whrp9qfhhwcnw261sdvyw78y9c3n4v22k31n";
-      name = "plasma-remotecontrollers-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-remotecontrollers-5.27.5.tar.xz";
+      sha256 = "04d0rp4jpavn999lbvfni007l98i1zglwv7byrkb494zs40gqylc";
+      name = "plasma-remotecontrollers-5.27.5.tar.xz";
    };
  };
  plasma-sdk = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-sdk-5.27.4.tar.xz";
-      sha256 = "08fv6rnb7vc3wxkwk3xrrvb3k1gac7sncjdvk0lik6y1c7ilk27r";
-      name = "plasma-sdk-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-sdk-5.27.5.tar.xz";
+      sha256 = "05b9n2h7qkxm5yws4mi4f929dassi6hng0p730dx5fw7fsr4a0pi";
+      name = "plasma-sdk-5.27.5.tar.xz";
    };
  };
  plasma-systemmonitor = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-systemmonitor-5.27.4.tar.xz";
-      sha256 = "1sy38lmkrvma4kkf96n68f65hdjvpyaszx13hynhrplsgn24fj19";
-      name = "plasma-systemmonitor-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-systemmonitor-5.27.5.tar.xz";
+      sha256 = "0d1ficiqv7zjcc1fkh7jx4f7pcpkygk1pyfm8gsp10i0iwwm3rc2";
+      name = "plasma-systemmonitor-5.27.5.tar.xz";
    };
  };
  plasma-thunderbolt = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-thunderbolt-5.27.4.tar.xz";
-      sha256 = "1zzl59qyajf8xcxxs5lijx85v8gm3y4izf3qd502smq2841hbxi8";
-      name = "plasma-thunderbolt-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-thunderbolt-5.27.5.tar.xz";
+      sha256 = "1mchvgh180m8anjznpwihay934c331fqc88l1wyiqqn6072n819i";
+      name = "plasma-thunderbolt-5.27.5.tar.xz";
    };
  };
  plasma-vault = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-vault-5.27.4.1.tar.xz";
-      sha256 = "1bh2662ghdq5qkvn4347yc2dh6c616qiax4k4yylkf37czqdil77";
-      name = "plasma-vault-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-vault-5.27.5.tar.xz";
+      sha256 = "1s176masmip1qzv5am3phkwvb7yalmiasgzbx7r2rq705bh2pwkl";
+      name = "plasma-vault-5.27.5.tar.xz";
    };
  };
  plasma-welcome = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz";
-      sha256 = "0rg80rc07q63z0ds4q8lf9yrv3ys9cvjcfwx39ibjy9nrkismrca";
-      name = "plasma-welcome-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-welcome-5.27.5.tar.xz";
+      sha256 = "1ddfyi1a2ccs8ny9is0x8fjz0yh2v65sin85nrv6j483n3qqxjfb";
+      name = "plasma-welcome-5.27.5.tar.xz";
    };
  };
  plasma-workspace = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-5.27.4.1.tar.xz";
-      sha256 = "19b5mydi995aa634v57dlc769nmbz6mb2hs8c620gzabjnn0cffb";
-      name = "plasma-workspace-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-5.27.5.tar.xz";
+      sha256 = "05rayz8n3qgpnddr4wpzjwgvk3if4vnnwb1ccpm841zxxsr9a2zd";
+      name = "plasma-workspace-5.27.5.tar.xz";
    };
  };
  plasma-workspace-wallpapers = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-wallpapers-5.27.4.1.tar.xz";
-      sha256 = "0sv58kp088vxqd5dfs3hvc93xlydk7nyxm1ly0xy377r2v3pnkg4";
-      name = "plasma-workspace-wallpapers-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-wallpapers-5.27.5.tar.xz";
+      sha256 = "0h6871pwn000jzilhh4w5wa3s017cgkphhj4sxxpqds7q7f5x013";
+      name = "plasma-workspace-wallpapers-5.27.5.tar.xz";
    };
  };
  plymouth-kcm = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/plymouth-kcm-5.27.4.1.tar.xz";
-      sha256 = "0x20dswpy1vg1rh01m7pbicd1fn0rbh5gfaqdlizdcpnd6gjjfh5";
-      name = "plymouth-kcm-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/plymouth-kcm-5.27.5.tar.xz";
+      sha256 = "0r00kmqzkzpjvp3s02h7vjiiyzfpvzn5j158jf6khvb4vywljqjr";
+      name = "plymouth-kcm-5.27.5.tar.xz";
    };
  };
  polkit-kde-agent = {
-    version = "1-5.27.4.1";
+    version = "1-5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/polkit-kde-agent-1-5.27.4.1.tar.xz";
-      sha256 = "1ikhrs17ffrsji6phwxhz8b6gxldksjb4625zpin8vkf07v9brr6";
-      name = "polkit-kde-agent-1-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/polkit-kde-agent-1-5.27.5.tar.xz";
+      sha256 = "0brab8hn2qdnxzzx0q37m40h67s00s0zpc2wx1gzbnbl1kzv9qra";
+      name = "polkit-kde-agent-1-5.27.5.tar.xz";
    };
  };
  powerdevil = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/powerdevil-5.27.4.1.tar.xz";
-      sha256 = "0s6k7kcfa717lcjdlx61h21ldk4fg67is6r2vzcq0507gp3r8jb4";
-      name = "powerdevil-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/powerdevil-5.27.5.tar.xz";
+      sha256 = "03jhzcwg1kjhm8ly3w12slgdxbyycqymijgnh3llrvzgawn8cy83";
+      name = "powerdevil-5.27.5.tar.xz";
    };
  };
  qqc2-breeze-style = {
-    version = "5.27.4";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/qqc2-breeze-style-5.27.4.tar.xz";
-      sha256 = "0x96xa5j3726i4ci6g51hk364hhcq9xip4jrb1qssb9l0v1324n4";
-      name = "qqc2-breeze-style-5.27.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/qqc2-breeze-style-5.27.5.tar.xz";
+      sha256 = "0vcq59m074zvcivlhk0jp7k5vywmamfdq4bsacvsjzxhlvzkvjlh";
+      name = "qqc2-breeze-style-5.27.5.tar.xz";
    };
  };
  sddm-kcm = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/sddm-kcm-5.27.4.1.tar.xz";
-      sha256 = "0l85mk8mj3g5fga6z93w5k88pkpf8wrx6vaf4f1q9lgy2dkm4ylp";
-      name = "sddm-kcm-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/sddm-kcm-5.27.5.tar.xz";
+      sha256 = "16hrmbl413zy89if8yj9jsvnzv58rvs7w6y5isq33drkzvgz41an";
+      name = "sddm-kcm-5.27.5.tar.xz";
    };
  };
  systemsettings = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/systemsettings-5.27.4.1.tar.xz";
-      sha256 = "03kk2bangg9nixdwpyrp2k4wgv3r3d3ymklqfx37b7c25wpiv7az";
-      name = "systemsettings-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/systemsettings-5.27.5.tar.xz";
+      sha256 = "1nxla37vr1j1h2vklm6cdzr5h5my9d3m05nr9dr1wcxsmaq4wifm";
+      name = "systemsettings-5.27.5.tar.xz";
    };
  };
  xdg-desktop-portal-kde = {
-    version = "5.27.4.1";
+    version = "5.27.5";
    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.27.4/xdg-desktop-portal-kde-5.27.4.1.tar.xz";
-      sha256 = "0hrxlql13yab3w778wgdsr92g65q81qk5dvlqnn0fdc9lbfw5ipg";
-      name = "xdg-desktop-portal-kde-5.27.4.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.27.5/xdg-desktop-portal-kde-5.27.5.tar.xz";
+      sha256 = "1aqsiwfhca7nimdflwnq86fai4lhjqpi4pi4xyp8pcgrrwj3zykw";
+      name = "xdg-desktop-portal-kde-5.27.5.tar.xz";
    };
  };
 }
--- a/pkgs/development/compilers/dmd/binary.nix
+++ b/pkgs/development/compilers/dmd/binary.nix
@ -28,6 +28,7 @@ in stdenv.mkDerivation {
    tzdata
  ] ++ lib.optionals hostPlatform.isLinux [
    glibc
+    stdenv.cc.cc.libgcc
  ];

  installPhase = ''
--- a/pkgs/development/compilers/julia/1.9.nix
+++ b/pkgs/development/compilers/julia/1.9.nix
@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "julia";
-  version = "1.9.0-rc1";
+  version = "1.9.0";

  src = fetchurl {
    url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
-    hash = "sha256-BjHuS1pP8S+iZndyGS8HiNzApr7xUYPRPRkX55DEy4Y=";
+    hash = "sha256-Ii61M8ncVHNJSes6QWn1Su+hvCC+OF/Bz3mMghn+ZAA=";
  };

  patches = [
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
+{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
 , fetchurl, file, python3
 , darwin, cmake, rust, rustPlatform
@ -21,7 +21,7 @@ let
  inherit (lib) optionals optional optionalString concatStringsSep;
  inherit (darwin.apple_sdk.frameworks) Security;
 in stdenv.mkDerivation rec {
-  pname = "${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}rustc";
+  pname = "${targetPackages.stdenv.cc.targetPrefix}rustc";
  inherit version;

  src = fetchurl {
--- a/pkgs/development/embedded/openocd/default.nix
+++ b/pkgs/development/embedded/openocd/default.nix
@ -3,6 +3,8 @@
 , fetchurl
 , pkg-config
 , hidapi
+, jimtcl
+, libjaylink
 , libusb1
 , libgpiod

@ -22,11 +24,13 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ hidapi libftdi1 libusb1 ]
+  buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ]
    ++ lib.optional stdenv.isLinux libgpiod;

  configureFlags = [
    "--disable-werror"
+    "--disable-internal-jimtcl"
+    "--disable-internal-libjaylink"
    "--enable-jtag_vpi"
    "--enable-buspirate"
    "--enable-remote-bitbang"
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@ -1,57 +1,91 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , python3
 , libffi
 , git
 , cmake
 , zlib
 , fetchgit
+, fetchFromGitHub
 , makeWrapper
 , runCommand
-, llvmPackages_5
+, llvmPackages_9
 , glibc
 , ncurses
 }:

 let
+  # The LLVM 9 headers have a couple bugs we need to patch
+  fixedLlvmDev = runCommand "llvm-dev-${llvmPackages_9.llvm.version}" { buildInputs = [git]; } ''
+    mkdir $out
+    cp -r ${llvmPackages_9.llvm.dev}/include $out
+    cd $out
+    chmod -R u+w include
+    git apply ${./fix-llvm-include.patch}
+  '';
+
  unwrapped = stdenv.mkDerivation rec {
    pname = "cling-unwrapped";
-    version = "0.7";
+    version = "0.9";

    src = fetchgit {
      url = "http://root.cern/git/clang.git";
-      # This commit has the tag cling-0.7 so we use it, even though cpt.py
-      # tries to use refs/tags/cling-patches-rrelease_50
-      rev = "354b25b5d915ff3b1946479ad07f3f2768ea1621";
-      branchName = "cling-patches";
-      sha256 = "0q8q2nnvjx3v59ng0q3qqqhzmzf4pmfqqiy3rz1f3drx5w3lgyjg";
+      rev = "cling-v0.9";
+      sha256 = "sha256-ft1NUIclSiZ9lN3Z3DJCWA0U9q/K1M0TKkZr+PjsFYk=";
    };

-    clingSrc = fetchgit {
-      url = "http://root.cern/git/cling.git";
-      rev = "70163975eee5a76b45a1ca4016bfafebc9b57e07";
-      sha256 = "1mv2fhk857kp5rq714bq49iv7gy9fgdwibydj5wy1kq2m3sf3ysi";
+    clingSrc = fetchFromGitHub {
+      owner = "root-project";
+      repo = "cling";
+      rev = "v0.9";
+      sha256 = "0wx3fi19wfjcph5kclf8108i436y79ddwakrcf0lgxnnxhdjyd29";
    };

-    preConfigure = ''
+    prePatch = ''
      echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt
+
      cp -r $clingSrc ./tools/cling
      chmod -R a+w ./tools/cling
    '';

-    nativeBuildInputs = [ python3 git cmake llvmPackages_5.llvm.dev ];
-    buildInputs = [ libffi llvmPackages_5.llvm zlib ncurses ];
+    patches = [
+      ./no-clang-cpp.patch
+
+      # https://github.com/root-project/root/commit/286d96b12aad8688b9d8e4b3b5df843dcfb716a8
+      ./fix-llvm-dylib-usage.patch
+
+      ./force-install-cling-targets.patch
+    ];
+
+    nativeBuildInputs = [ python3 git cmake ];
+    buildInputs = [ libffi zlib ncurses ];

    strictDeps = true;

    cmakeFlags = [
+      "-DLLVM_BINARY_DIR=${llvmPackages_9.llvm.out}"
+      "-DLLVM_CONFIG=${llvmPackages_9.llvm.dev}/bin/llvm-config"
+      "-DLLVM_LIBRARY_DIR=${llvmPackages_9.llvm.lib}/lib"
+      "-DLLVM_MAIN_INCLUDE_DIR=${fixedLlvmDev}/include"
+      "-DLLVM_TABLEGEN_EXE=${llvmPackages_9.llvm.out}/bin/llvm-tblgen"
+      "-DLLVM_TOOLS_BINARY_DIR=${llvmPackages_9.llvm.out}/bin"
+      "-DLLVM_TOOL_CLING_BUILD=ON"
+
      "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
      "-DLLVM_ENABLE_RTTI=ON"

      # Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
      # see cling/tools/CMakeLists.txt
      "-DCLING_INCLUDE_TESTS=ON"
+      "-DCLANG-TOOLS=OFF"
+      # "--trace-expand"
    ];

+    postInstall = lib.optionalString (!stdenv.isDarwin) ''
+      mkdir -p $out/share/Jupyter
+      cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter
+    '';
+
    meta = with lib; {
      description = "The Interactive C++ Interpreter";
      homepage = "https://root.cern/cling/";
@ -77,7 +111,7 @@ let
    "-nostdinc++"
    "-isystem" "${lib.getDev stdenv.cc.libc}/include"
    "-I" "${lib.getDev unwrapped}/include"
-    "-I" "${lib.getLib unwrapped}/lib/clang/5.0.2/include"
+    "-I" "${lib.getLib unwrapped}/lib/clang/9.0.1/include"
  ];

  # Autodetect the include paths for the compiler used to build Cling, in the same way Cling does at
--- a/pkgs/development/interpreters/cling/fix-llvm-dylib-usage.patch
+++ b/pkgs/development/interpreters/cling/fix-llvm-dylib-usage.patch
@ -0,0 +1,24 @@
+diff --git a/tools/cling/tools/driver/CMakeLists.txt b/tools/cling/tools/driver/CMakeLists.txt
+--- a/tools/cling/tools/driver/CMakeLists.txt
+++ b/tools/cling/tools/driver/CMakeLists.txt
+@@ -9,10 +9,10 @@
+ # Keep symbols for JIT resolution
+ set(LLVM_NO_DEAD_STRIP 1)
+
+set(LLVM_LINK_COMPONENTS support)
+
+ if(BUILD_SHARED_LIBS)
+   set(LIBS
+-    LLVMSupport
+-
+     clangFrontendTool
+
+     clingInterpreter
+@@ -25,8 +25,6 @@ if(BUILD_SHARED_LIBS)
+   )
+ else()
+   set(LIBS
+-    LLVMSupport
+-
+     clangASTMatchers
+     clangFrontendTool
--- a/pkgs/development/interpreters/cling/fix-llvm-include.patch
+++ b/pkgs/development/interpreters/cling/fix-llvm-include.patch
@ -0,0 +1,27 @@
+diff --git a/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h b/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+index 16202d8..3afdac3 100644
+--- a/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+++ b/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+@@ -220,7 +220,7 @@ public:
+   Error removeModule(VModuleKey K) {
+     auto I = ModuleMap.find(K);
+     assert(I != ModuleMap.end() && "VModuleKey K not valid here");
+-    auto EDM = std::move(I.second);
+    auto EDM = std::move(I->second);
+     ModuleMap.erase(I);
+     return EDM->removeModuleFromBaseLayer(BaseLayer);
+   }
+diff --git a/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h b/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
+index d9535ce..4c688c3 100644
+--- a/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
+++ b/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
+@@ -472,7 +472,9 @@ private:
+ 
+   // NB!  `LinkedObjects` needs to be destroyed before `NotifyFreed` because
+   // `~ConcreteLinkedObject` calls `NotifyFreed`
+protected:
+   std::map<VModuleKey, std::unique_ptr<LinkedObject>> LinkedObjects;
+private:
+   bool ProcessAllSections = false;
+ };
+ 
--- a/pkgs/development/interpreters/cling/force-install-cling-targets.patch
+++ b/pkgs/development/interpreters/cling/force-install-cling-targets.patch
@ -0,0 +1,16 @@
+diff --git a/tools/cling/cmake/modules/CMakeLists.txt b/tools/cling/cmake/modules/CMakeLists.txt
+--- a/tools/cling/cmake/modules/CMakeLists.txt
+++ b/tools/cling/cmake/modules/CMakeLists.txt
+@@ -54,10 +54,8 @@ set(CLING_CONFIG_EXPORTS_FILE)
+
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   get_property(cling_has_exports GLOBAL PROPERTY CLING_HAS_EXPORTS)
+-  if(cling_has_exports)
+-    install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR}
+-            COMPONENT cling-cmake-exports)
+-  endif()
+  install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR}
+          COMPONENT cling-cmake-exports)
+
+   install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClingConfig.cmake
--- a/pkgs/development/interpreters/cling/no-clang-cpp.patch
+++ b/pkgs/development/interpreters/cling/no-clang-cpp.patch
@ -0,0 +1,13 @@
+diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
+index 590d708d83..340ae529d4 100644
+--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif()
+ add_dependencies(clang clang-resource-headers)
+
+ if(NOT CLANG_LINKS_TO_CREATE)
+-  set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)
+  set(CLANG_LINKS_TO_CREATE clang++ clang-cl)
+ endif()
+
+ foreach(link ${CLANG_LINKS_TO_CREATE})
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@ -2,6 +2,7 @@
 { lib
 , lua
 , wrapLua
+, luarocks

 # Whether the derivation provides a lua module or not.
 , luarocksCheckHook
@ -89,7 +90,7 @@ let

  nativeBuildInputs = [
    wrapLua
-    lua.pkgs.luarocks
+    luarocks
  ];

  inherit doCheck extraVariables rockspecFilename knownRockspec externalDeps nativeCheckInputs;
--- a/pkgs/development/libraries/gexiv2/default.nix
+++ b/pkgs/development/libraries/gexiv2/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "gexiv2";
-  version = "0.14.0";
+  version = "0.14.1";

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

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "5YJ5pv8gtvZPpJlhXaXptXz2W6eFC3L6/fFyIanW1p4=";
+    sha256 = "7D7j7DhguceJWKVdqJz3auIwWEjhL0GUW3tSEk2PbPk=";
  };

  nativeBuildInputs = [
@ -51,9 +51,14 @@ stdenv.mkDerivation rec {

  mesonFlags = [
    "-Dgtk_doc=true"
-    "-Dpython3_girdir=${placeholder "out"}/${python3.sitePackages}/gi/overrides"
+    "-Dtests=true"
  ];

+  # Needed for darwin due to std::auto_ptr in exiv2 header files & enabling C++ 17
+  # https://github.com/Exiv2/exiv2/issues/2359
+  # https://gitlab.gnome.org/GNOME/gexiv2/-/issues/73
+  env.NIX_CFLAGS_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR";
+
  doCheck = true;

  preCheck = let
--- a/pkgs/development/libraries/libfsm/default.nix
+++ b/pkgs/development/libraries/libfsm/default.nix
@ -1,21 +1,30 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib
+, stdenv
+, fetchFromGitHub
 , bmake
+, docbook_xsl
+, libxslt
 }:

 stdenv.mkDerivation rec {
  pname = "libfsm";
-  version = "0.1pre2442_${builtins.substring 0 8 src.rev}";
+  version = "0.1pre2987_${builtins.substring 0 8 src.rev}";

  src = fetchFromGitHub {
    owner  = "katef";
    repo   = pname;
-    rev    = "9c5095f7364fa464efff6c81fad9b60b19dfcc99";
-    sha256 = "1bs51agvrrwqid0slq2svj2yj7kkjdsnv3xsrk8zmf1jbgza6jrm";
+    rev    = "087e3389ad2cd5e5c40caeb40387e632567d7258";
+    hash   = "sha256-XWrZxnRbMB609l+sYFf8VsXy3NxqBsBPUrHgKLIyu/I=";
    fetchSubmodules = true;
  };

-  nativeBuildInputs = [ bmake ];
+  nativeBuildInputs = [
+    bmake
+    docbook_xsl
+    libxslt # xsltproc
+  ];
  enableParallelBuilding = true;
+  enableParallelInstalling = false;

  # note: build checks value of '$CC' to add some extra cflags, but we don't
  # necessarily know which 'stdenv' someone chose, so we leave it alone (e.g.
--- a/pkgs/development/libraries/libjaylink/default.nix
+++ b/pkgs/development/libraries/libjaylink/default.nix
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
    description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices.";
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ felixsinger ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/libraries/mapbox-gl-native/default.nix
+++ b/pkgs/development/libraries/mapbox-gl-native/default.nix
@ -35,6 +35,11 @@ mkDerivation rec {
      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native";
      hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI=";
    })
+    (fetchpatch {
+      name = "fix-narrowing-conversion.patch";
+      url = "https://github.com/mapbox/mapbox-gl-native/commit/2955d0e479f57a39a0af4a0fa7ca7683455cca58.patch";
+      hash = "sha256-Jk7OLb9/mVtc2mm0AL1h9zcSiQ54jogNI+q6ojY0HEo=";
+    })
  ];

  postPatch = ''
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];

-  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
+  env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/qcoro/default.nix
+++ b/pkgs/development/libraries/qcoro/default.nix
@ -1,6 +1,5 @@
-{ stdenv
-, gcc12Stdenv
-, lib
+{ lib
+, stdenv
 , fetchFromGitHub
 , cmake
 , libpthreadstubs
@ -9,7 +8,7 @@
 , wrapQtAppsHook
 }:

-gcc12Stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "qcoro";
  version = "0.9.0";

--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
    "--with-fastcgi"
  ];

-  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
+  env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";

  enableParallelBuilding = true;

--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
  nativeBuildInputs = [ autoreconfHook pkg-config ];

-  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
+  env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";

  enableParallelBuilding = true;

--- a/pkgs/development/lisp-modules/patches/log4cl-fix-build.patch
+++ b/pkgs/development/lisp-modules/patches/log4cl-fix-build.patch
@ -0,0 +1,5 @@
+--- a/src/naming-sbcl.lisp
+++ b/src/naming-sbcl.lisp
+@@ -108,1 +108,1 @@
+-              then (sb-c::lambda-parent lambda)
+              then (sb-c::lexenv-lambda (sb-c::lambda-lexenv lambda))
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@ -164,6 +164,9 @@ let
    cl-readline = super.cl-readline.overrideLispAttrs (o: {
      nativeLibs = [ pkgs.readline ];
    });
+    log4cl = super.log4cl.overrideLispAttrs (o: {
+      patches = [ ./patches/log4cl-fix-build.patch ];
+    });
    md5 = super.md5.overrideLispAttrs (o: {
      lispLibs = [ super.flexi-streams ];
    });
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@ -1,42 +1,43 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, fuse, adb }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, fuse
+, android-tools
+}:

 stdenv.mkDerivation rec {
  pname = "adbfs-rootless";
-  version = "2016-10-02";
+  version = "unstable-2023-03-21";

  src = fetchFromGitHub {
    owner = "spion";
-    repo = "adbfs-rootless";
-    rev = "b58963430e40c9246710a16cec58e7ffc88baa48";
-    sha256 = "1kjibl86k6pf7vciwaaxwv5m4q28zdpd2g7yhp71av32jq6j3wm8";
+    repo = pname;
+    rev = "fd56381af4dc9ae2f09b904c295686871a46ed0f";
+    sha256 = "atiVjRfqvhTlm8Q+3iTNNPQiNkLIaHDLg5HZDJvpl2Q=";
  };

-  patches = [
-    (fetchpatch {
-      # https://github.com/spion/adbfs-rootless/issues/14
-      url = "https://github.com/kronenpj/adbfs-rootless/commit/35f87ce0a7aeddaaad118daed3022e01453b838d.patch";
-      sha256 = "1iigla74n3hphnyx9ffli9wqk7v71ylvsxama868czlg7851jqj9";
-    })
-  ];
-
  nativeBuildInputs = [ pkg-config ];
+
  buildInputs = [ fuse ];

  postPatch = ''
    # very ugly way of replacing the adb calls
-    sed -e 's|"adb |"${adb}/bin/adb |g' \
-        -i adbfs.cpp
+    substituteInPlace adbfs.cpp \
+      --replace '"adb ' '"${android-tools}/bin/adb '
  '';

  installPhase = ''
+    runHook preInstall
    install -D adbfs $out/bin/adbfs
+    runHook postInstall
  '';

  meta = with lib; {
    description = "Mount Android phones on Linux with adb, no root required";
    inherit (src.meta) homepage;
    license = licenses.bsd3;
-    maintainers = with maintainers; [ Profpatsch ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ Profpatsch aleksana ];
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/nim-packages/vmath/default.nix
+++ b/pkgs/development/nim-packages/vmath/default.nix
@ -1,4 +1,4 @@
-{ lib, buildNimPackage, fetchFromGitHub }:
+{ lib, stdenv, buildNimPackage, fetchFromGitHub }:

 buildNimPackage rec {
  pname = "vmath";
@ -11,7 +11,7 @@ buildNimPackage rec {
    hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30=";
  };

-  doCheck = true;
+  doCheck = !stdenv.isDarwin;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "adafruit-platformdetect";
-  version = "3.45.1";
+  version = "3.45.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "Adafruit-PlatformDetect";
    inherit version;
-    hash = "sha256-dMXHjI4J/Bp4dBpymyzgWZxBi0al3N5eY7QxVoSNdxc=";
+    hash = "sha256-bHrFOf6Qb1z3uB5HpTq4T+TWl7YYVL849pDycHekynk=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.2.49";
+  version = "9.2.50";
  format = "pyproject";

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

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@ -3,12 +3,13 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
+, setuptools
 }:

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

  disabled = pythonOlder "3.8";

@ -16,9 +17,13 @@ buildPythonPackage rec {
    owner = "Noltari";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-A2jk8gXqKeQ3b2p9/bkPat1NdhUOFdJCZeSFg//D/hA=";
+    hash = "sha256-6PBNwCfh5ryR3Jub3GDykY6lRQt9wdkV8yWkvivuQpM=";
  };

+  nativeBuildInputs = [
+    setuptools
+  ];
+
  propagatedBuildInputs = [
    aiohttp
  ];
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , poetry-core
 , importlib-metadata
 , pytest-asyncio
@ -12,7 +11,7 @@

 buildPythonPackage rec {
  pname = "aiolimiter";
-  version = "1.0.0";
+  version = "1.1.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -21,7 +20,7 @@ buildPythonPackage rec {
    owner = "mjpieters";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-4wByVZoOLhrXFx9oK19GBmRcjGoJolQ3Gwx9vQV/n8s=";
+    hash = "sha256-BpLh9utf2oJe+83rsIZeV5+MjbJ3aO5slMNVbUywQIo=";
  };

  nativeBuildInputs = [
@ -38,15 +37,6 @@ buildPythonPackage rec {
    toml
  ];

-  patches = [
-    # Switch to poetry-core, https://github.com/mjpieters/aiolimiter/pull/77
-    (fetchpatch {
-      name = "switch-to-peotry-core.patch";
-      url = "https://github.com/mjpieters/aiolimiter/commit/84a85eff42621b0daff8fcf6bb485db313faae0b.patch";
-      hash = "sha256-xUfJwLvMF2Xt/V1bKBFn/fjn1uyw7bGNo9RpWxtyr50=";
-    })
-  ];
-
  postPatch = ''
    substituteInPlace tox.ini \
      --replace " --cov=aiolimiter --cov-config=tox.ini --cov-report term-missing" ""
@ -59,6 +49,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Implementation of a rate limiter for asyncio";
    homepage = "https://github.com/mjpieters/aiolimiter";
+    changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@ -32,7 +32,7 @@

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.2.49";
+  version = "9.2.50";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-6SHg1topRXQlZ2kDCcOyPbNpGl7Na9vcOgOthQ44tCs=";
+    hash = "sha256-lsQ0pMabd1nC9ysR38u2rlGOGY+onk3qV1V68AZBQy4=";
  };

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

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.2.49";
+  version = "9.2.50";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-FbI2XX5/gc3bTW28alT8qEEQ46UEkQf5cO37jJcFVBs=";
+    hash = "sha256-36BWuqK6/cPPSpL4sb97+w4re65bUU3ySiCcOUXh79M=";
  };

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

 buildPythonPackage rec {
  pname = "asyncsleepiq";
-  version = "1.3.4";
+  version = "1.3.5";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-eW6iSGuaZ/cQZKN55b6tHsBPdYglxGYt7OoxV7czB8w=";
+    hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag=";
  };

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

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.2.49";
+  version = "9.2.50";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-PTlkyu8Thm81VO9HIhNUwGxDBEQedfs3RYfZW5ZEAaY=";
+    hash = "sha256-bHo1hpLLrJVZ8BxupsavreY6JTmuGboLODT8so6Fx1c=";
  };

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

 let
  # The binaries are following the argr projects release cycle
-  version = "9.2.49";
+  version = "9.2.50";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-xNYAYXKrfpvY9oYPmiR6GNaWAIUi9w1T9YznosIABSs=";
+    hash = "sha256-pThCJlxx2IkLJhc+U5H6fSQy8QLFQr6cIILsdlEA8wM=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/dataset/default.nix
+++ b/pkgs/development/python-modules/dataset/default.nix
@ -37,5 +37,8 @@ buildPythonPackage rec {
    homepage = "https://dataset.readthedocs.io";
    license = licenses.mit;
    maintainers = with maintainers; [ xfnw ];
+    # SQLAlchemy >= 2.0.0 is unsupported
+    # https://github.com/pudo/dataset/issues/411
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/django-cryptography/default.nix
+++ b/pkgs/development/python-modules/django-cryptography/default.nix
@ -3,6 +3,7 @@
 , django
 , django-appconf
 , fetchFromGitHub
+, fetchpatch
 , lib
 , python
 , pythonOlder
@ -32,6 +33,11 @@ buildPythonPackage rec {
    django-appconf
  ];

+  patches = [
+    # See: https://github.com/georgemarshall/django-cryptography/pull/88
+    ./fix-setup-cfg.patch
+  ];
+
  pythonImportsCheck = [ "django_cryptography" ];

  checkPhase = ''
--- a/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch
+++ b/pkgs/development/python-modules/django-cryptography/fix-setup-cfg.patch
@ -0,0 +1,16 @@
+diff --git a/setup.cfg b/setup.cfg
+index 865b4c3..577d917 100644
+--- a/setup.cfg
+++ b/setup.cfg
+@@ -35,7 +35,10 @@ project_urls =
+     Documentation = https://django-cryptography.readthedocs.io
+ 
+ [options]
+-packages = django_cryptography
+packages =
+    django_cryptography
+    django_cryptography.core
+    django_cryptography.utils
+ python_requires = >=3.6
+ include_package_data = True
+ install_requires =
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "dvc-data";
-  version = "0.47.2";
+  version = "0.48.1";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-5DbnvIScSq+bu8ki0eUwUZd9Gf3KlhD+I0/PpWfGOu0=";
+    hash = "sha256-h4E4nwACnGPtmQjEi+O2WNvlDsfJBSngh4CYHQVxDkY=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/lightwave/default.nix
+++ b/pkgs/development/python-modules/lightwave/default.nix
@ -6,14 +6,14 @@

 buildPythonPackage rec {
  pname = "lightwave";
-  version = "0.21";
+  version = "0.24";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-h/ztEY473XjvUCWu6vr7FA3WSYPHaLKNMc2fpu/wRC0=";
+    hash = "sha256-l9hwdAKrpdXj/pkrgyiuhbPaGgT6tjfoOw/TBpR+k1I=";
  };

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "nbdime";
-  version = "3.1.1";
+  version = "3.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Z3ZzIOlxN09wGhdapZq9OlVHIwOdOfrpCOctFjMNZIs=";
+    hash = "sha256-5Q0aDPZy4CNW4Q5tPQrqjoYSpTSubhub/VmsO2DEBes=";
  };

  nativeBuildInputs = [
@ -92,7 +92,5 @@ buildPythonPackage rec {
    description = "Tools for diffing and merging of Jupyter notebooks.";
    license = licenses.bsd3;
    maintainers = with maintainers; [ tbenst ];
-    # https://github.com/jupyter/nbdime/issues/645
-    broken = lib.versionAtLeast jupyter-server.version "2";
  };
 }
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@ -44,8 +44,11 @@ buildPythonPackage rec {
    "test_is_fqdn_resolvable"
    "test_fqdn_to_ip"
    "test_tcp_ping"
-    # Skip SPhinx test
+    # Skip Sphinx test
    "test_sphinx_build"
+    # OSError: [Errno 22] Invalid argument
+    "test_compare_type5"
+    "test_encrypt_type5"
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@ -3,8 +3,7 @@
 , buildPythonPackage
 , colorlog
 , fetchFromGitHub
-, fetchpatch
-, setuptools
+, hatchling
 , importlib-metadata
 , jinja2
 , packaging
@ -17,7 +16,7 @@

 buildPythonPackage rec {
  pname = "nox";
-  version = "2022.11.21";
+  version = "2023.04.22";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -26,20 +25,11 @@ buildPythonPackage rec {
    owner = "wntrblm";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-N70yBZyrtdQvgaJzkskG3goHit8eH0di9jHycuAwzfU=";
+    hash = "sha256-WuyNp3jxIktI72zbk+1CK8xflTKrYE5evn/gVdMx+cQ=";
  };

-  patches = [
-    # Remove rogue mocking of py._path, https://github.com/wntrblm/nox/pull/677
-    (fetchpatch {
-      name = "remove-py-pyth.patch";
-      url = "https://github.com/wntrblm/nox/commit/44d06b679761e21d76bb96b2b8ffe0ffbe3d4fd0.patch";
-      hash = "sha256-KRDVwbBMBd4GdiAcGJyS7DTNUw3Pumt0JO1igx6npnc=";
-    })
-  ];
-
  nativeBuildInputs = [
-    setuptools
+    hatchling
  ];

  propagatedBuildInputs = [
@ -52,7 +42,6 @@ buildPythonPackage rec {
    importlib-metadata
  ];

-
  checkInputs = [
    jinja2
    tox
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "pontos";
-  version = "23.5.0";
+  version = "23.5.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "greenbone";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-GboOp0lsJ5nsZ6PIUqqCVLmroppKFR/xBnd9DqNw030=";
+    hash = "sha256-nUVJjBebHOY0/oN/Cl2HdaLGnDVgLsUK7Yd+johP1PM=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pygtfs/default.nix
+++ b/pkgs/development/python-modules/pygtfs/default.nix
@ -22,6 +22,12 @@ buildPythonPackage rec {
    hash = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8=";
  };

+  postPatch = ''
+    # https://github.com/jarondl/pygtfs/pull/72
+    substituteInPlace setup.py \
+      --replace "pytz>=2012d" "pytz"
+  '';
+
  nativeBuildInputs = [
    setuptools-scm
  ];
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "python-roborock";
-  version = "0.13.4";
+  version = "0.15.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "humbertogontijo";
    repo = "python-roborock";
    rev = "refs/tags/v${version}";
-    hash = "sha256-gR8fp2ppVxc1ALRNQn+I8oXZWkQN5yd5vQlnATp6PoM=";
+    hash = "sha256-Cyp/uCSQTDB21v+nRu73gfJgTGm3qvdkyXXMPXMsMVA=";
  };

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

 buildPythonPackage rec {
  pname = "pytrafikverket";
-  version = "0.3.1";
+  version = "0.3.3";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-foTIzWk/Y1H6OK+OAIU5VPlb/+gevc8WP9TzpYtnWvM=";
+    hash = "sha256-Lq6YAYScBYRA2ltv+ohWfMasqohCH5zrnCi+sQbQWLI=";
  };

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

 buildPythonPackage rec {
  pname = "pyvex";
-  version = "9.2.49";
+  version = "9.2.50";
  format = "pyproject";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-RtTejAkyvFLOr2zA7AKJUkz3Zjhxsz8ippn64T37qXU=";
+    hash = "sha256-DfC1POGV6bR3p0LqZBfmX2BkFvhdn4QjHgZkDwznSyE=";
  };

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

 buildPythonPackage rec {
  pname = "pyvicare";
-  version = "2.27.1";
+  version = "2.27.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "somm15";
    repo = "PyViCare";
    rev = "refs/tags/${version}";
-    hash = "sha256-PlXVsDLCEBjsll9cXPJqvNSFyjtGol9jXYWzaYHWNw4=";
+    hash = "sha256-BLvHZRIHj+HysdGcq51Ry3unbT2BQd7lwslAo9n9SdY=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/rouge-score/default.nix
+++ b/pkgs/development/python-modules/rouge-score/default.nix
@ -0,0 +1,61 @@
+{ lib
+, fetchPypi
+, fetchFromGitHub
+, python
+, buildPythonPackage
+, absl-py
+, nltk
+, numpy
+, six
+, pytestCheckHook
+, pythonOlder
+}:
+let
+  testdata = fetchFromGitHub {
+    owner = "google-research";
+    repo = "google-research";
+    sparseCheckout = [ "rouge/testdata" ];
+    rev = "1d4d2f1aa6f2883a790d2ae46a6ee8ab150d8f31";
+    hash = "sha256-ojqk6U2caS7Xz4iGUC9aQVHrKb2QNvMlPuQAL/jJat0=";
+  };
+in buildPythonPackage rec {
+  pname = "rouge-score";
+  version = "0.1.2";
+  format = "setuptools";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    pname = "rouge_score";
+    inherit version;
+    extension = "tar.gz";
+    hash = "sha256-x9TaJoPmjJq/ATXvkV1jpGZDZm+EjlWKG59+rRf/DwQ=";
+  };
+
+  # the tar file from pypi doesn't come with the test data
+  postPatch = ''
+    substituteInPlace rouge_score/test_util.py \
+      --replace 'os.path.join(os.path.dirname(__file__), "testdata")' '"${testdata}/rouge/testdata/"'
+  '';
+
+  propagatedBuildInputs = [ absl-py nltk numpy six ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  doCheck = true;
+
+  disabledTests = [
+    # https://github.com/google-research/google-research/issues/1203
+    "testRougeLSumSentenceSplitting"
+    # tries to download external tokenizers via nltk
+    "testRougeLsumLarge"
+  ];
+
+  pythonImportsCheck = [ "rouge_score" ];
+
+  meta = {
+    description = "Python ROUGE Implementation";
+    homepage = "https://github.com/google-research/google-research/tree/master/rouge";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nviets ];
+  };
+}
--- a/pkgs/development/python-modules/ruyaml/default.nix
+++ b/pkgs/development/python-modules/ruyaml/default.nix
@ -37,6 +37,10 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  pytestFlagsArray = [
+    "-W" "ignore::DeprecationWarning"
+  ];
+
  pythonImportsCheck = [
    "ruyaml"
  ];
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "samsungtvws";
-  version = "2.5.0";
+  version = "2.6.0";
  format = "setuptools";
  disabled = isPy27;

@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "xchwarze";
    repo = "samsung-tv-ws-api";
    rev = "v${version}";
-    hash = "sha256-AimG5tyTRBETpivC2BwCuoR4o7y98YT6u5sogJlcmoo=";
+    hash = "sha256-mkjfimzu7paz+ZskartL052AfUBtL1xU0eOlrHgD1UE=";
  };

  propagatedBuildInputs = [
@ -63,6 +63,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Samsung Smart TV WS API wrapper";
    homepage = "https://github.com/xchwarze/samsung-tv-ws-api";
+    changelog = "https://github.com/xchwarze/samsung-tv-ws-api/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ hexa ];
  };
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@ -31,7 +31,7 @@

 buildPythonPackage rec {
  pname = "scrapy";
-  version = "2.8.0";
+  version = "2.9.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -39,7 +39,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "Scrapy";
-    hash = "sha256-gHGsbGXxhewsdv6FCflNmf6ggFGf3CBvkIqSDV4F/kM=";
+    hash = "sha256-VkyXK1blS4MUHzlc4/aiW/4gk9YdE/m4HQU4ThnbmNo=";
  };

  nativeBuildInputs = [
@ -76,12 +76,6 @@ buildPythonPackage rec {

  LC_ALL = "en_US.UTF-8";

-  preCheck = ''
-    # Disable doctest plugin because it causes pytest to hang
-    substituteInPlace pytest.ini \
-      --replace "--doctest-modules" ""
-  '';
-
  disabledTestPaths = [
    "tests/test_proxy_connect.py"
    "tests/test_utils_display.py"
--- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
@ -38,5 +38,8 @@ buildPythonPackage rec {
    homepage = "https://github.com/snowflakedb/snowflake-sqlalchemy";
    license = licenses.asl20;
    maintainers = [ ];
+
+    # https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
+    broken = versionAtLeast sqlalchemy.version "2";
  };
 }
--- a/pkgs/development/python-modules/sonos-websocket/default.nix
+++ b/pkgs/development/python-modules/sonos-websocket/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "sonos-websocket";
-  version = "0.1.0";
+  version = "0.1.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "jjlawren";
    repo = "sonos-websocket";
    rev = "refs/tags/${version}";
-    hash = "sha256-Pb+L+823Clka0IjVMVEx4A0tJsI1IUhrFbx5Jy+xkgg=";
+    hash = "sha256-8fHHaHvJKZOnzSaclt+TSQgcP2O6fmjU3+cF1nJpjOI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@ -74,5 +74,8 @@ buildPythonPackage rec {
    changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst";
    license = licenses.bsd3;
    maintainers = with maintainers; [ ];
+
+    # https://github.com/kvesteri/sqlalchemy-continuum/issues/326
+    broken = versionAtLeast sqlalchemy.version "2";
  };
 }
--- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "sqlalchemy-jsonfield";
-  version = "1.0.1.post0";
+  version = "1.0.1.post0+2023-04-24";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -22,8 +22,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "penguinolog";
    repo = "sqlalchemy_jsonfield";
-    rev = "refs/tags/${version}";
-    hash = "sha256-dSvqUXZzr+s/v8QEtqrv6slI7p1akXwAxi68D9ctyuU=";
+    rev = "a1efda9755055c1d382257fb4ef78006b713d07e";
+    hash = "sha256-6l4LEGpA8dKPw8M4quStd1nWyshMNiwQojBCxKwRRXA=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@ -23,5 +23,11 @@ buildPythonPackage rec {
    description = "SQLAlchemy backend for Telethon session storage";
    license = licenses.mit;
    maintainers = with maintainers; [ nyanloutre ];
+
+    # Package requires SQLAlchemy <2
+    # https://github.com/tulir/telethon-session-sqlalchemy/blob/d498503ddde332e190bfa47e70f0bfa59fe6b5ef/setup.py#L17
+    # Repo is archived and so this is unlikely to change unless someone forks
+    # and takes over development
+    broken = versionAtLeast sqlalchemy.version "2";
  };
 }
--- a/pkgs/development/python-modules/theano-pymc/default.nix
+++ b/pkgs/development/python-modules/theano-pymc/default.nix
@ -44,5 +44,6 @@ buildPythonPackage rec {
    homepage = "https://github.com/majidaldo/Theano-PyMC";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ nidabdella ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/theano/default.nix
+++ b/pkgs/development/python-modules/theano/default.nix
@ -100,5 +100,6 @@ in buildPythonPackage rec {
    description = "A Python library for large-scale array computation";
    license = licenses.bsd3;
    maintainers = [ ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/upb-lib/default.nix
+++ b/pkgs/development/python-modules/upb-lib/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "upb-lib";
-  version = "0.5.3";
+  version = "0.5.4";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    pname = "upb_lib";
    inherit version;
-    hash = "sha256-I1lnIr8ptDCyK8r0bvFWFPUGRwoMsQcNnSCSwzdt1Bc=";
+    hash = "sha256-KEnSADj+sQtz37Xbi6fXoe2TN+F5Z9SYnlvCgXtxVnk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -22,14 +22,14 @@ with py.pkgs;

 buildPythonApplication rec {
  pname = "checkov";
-  version = "2.3.224";
+  version = "2.3.234";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-WvNGHFAGJfW0IutlIulxNTYG4q/pzd5Bn5AKyh1o24w=";
+    hash = "sha256-PLeqYD9aIv/nmFvfW2QjDz1xDD2PIFUvr9lkQ2Rh6k8=";
  };

  patches = [
--- a/pkgs/development/tools/benthos/default.nix
+++ b/pkgs/development/tools/benthos/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "benthos";
-  version = "4.14.0";
+  version = "4.15.0";

  src = fetchFromGitHub {
    owner = "benthosdev";
    repo = "benthos";
    rev = "refs/tags/v${version}";
-    hash = "sha256-i+B5SfIfaAkZNKftD5iMObsRostwDThu+C1gEAir4Sc=";
+    hash = "sha256-RqfTDE4dcVUegiaHsJMm9z9WV2dxFpgT/5LlM5105Oc=";
  };

-  vendorHash = "sha256-mRT/23ieJbN5EjcMH1J9E/zYaiUb0TCRkp7PGlMV4jA=";
+  vendorHash = "sha256-jfRmzCrw0qZJqt9tHkr/FmLWEAc911Z1hmk+nc6Lyb4=";

  doCheck = false;

--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@ -10,11 +10,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bmake";
-  version = "20230126";
+  version = "20230414";

  src = fetchurl {
    url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    hash = "sha256-hk9yGFgs95Dsc7ILcQVCXLn/ozUiJUF3LwMTMGtqC8Q=";
+    hash = "sha256-KcsdJqrn3p3vkr2us6rUUg6JlRzpey518LibrhuVOZ8=";
  };

  # Make tests work with musl
--- a/Show more
+++ b/Show more