Merge master into staging-next

2023-02-02 18:01:08 +00:00 · 2023-02-02 18:01:08 +00:00 · 6d7be19afb
commit 6d7be19afb
parent 9476ff1600 695a83030f
80 changed files with 1757 additions and 1393 deletions
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@ -527,6 +527,16 @@
          will no longer render properly or cause errors.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          NixOS now defaults to using nsncd (a non-caching
+          reimplementation in Rust) as NSS lookup dispatcher, instead of
+          the buggy and deprecated glibc-provided nscd. If you need to
+          switch back, set
+          <literal>services.nscd.enableNsncd = false</literal>, but
+          please open an issue in nixpkgs so your issue can be fixed.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The <literal>dnsmasq</literal> service now takes configuration
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -130,6 +130,8 @@ In addition to numerous new and upgraded packages, this release has the followin

  DocBook option documentation support will be removed in the next release and CommonMark will become the default. DocBook option documentation that has not been migrated until then will no longer render properly or cause errors.

+- NixOS now defaults to using nsncd (a non-caching reimplementation in Rust) as NSS lookup dispatcher, instead of the buggy and deprecated glibc-provided nscd. If you need to switch back, set `services.nscd.enableNsncd = false`, but please open an issue in nixpkgs so your issue can be fixed.
+
 - The `dnsmasq` service now takes configuration via the
  `services.dnsmasq.settings` attribute set. The option
  `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@ -168,6 +168,7 @@ in
          "${config.boot.initrd.systemd.package.kbd}/bin/setfont"
          "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys"
          "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed
+          "${config.boot.initrd.systemd.package.kbd.gzip}/bin/.gzip-wrapped"
        ] ++ optionals (hasPrefix builtins.storeDir cfg.font) [
          "${cfg.font}"
        ] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@ -29,10 +29,11 @@ in

      enableNsncd = mkOption {
        type = types.bool;
-        default = false;
+        default = true;
        description = lib.mdDoc ''
-          Whether to use nsncd instead of nscd.
+          Whether to use nsncd instead of nscd from glibc.
          This is a nscd-compatible daemon, that proxies lookups, without any caching.
+          Using nscd from glibc is discouraged.
        '';
      };

@ -55,7 +56,10 @@ in
      config = mkOption {
        type = types.lines;
        default = builtins.readFile ./nscd.conf;
-        description = lib.mdDoc "Configuration to use for Name Service Cache Daemon.";
+        description = lib.mdDoc ''
+          Configuration to use for Name Service Cache Daemon.
+          Only used in case glibc-nscd is used.
+        '';
      };

      package = mkOption {
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@ -109,6 +109,7 @@ in
        xapp
      ];
      services.cinnamon.apps.enable = mkDefault true;
+      services.gnome.evolution-data-server.enable = true;
      services.gnome.glib-networking.enable = true;
      services.gnome.gnome-keyring.enable = true;
      services.gvfs.enable = true;
@ -214,7 +215,6 @@ in
      programs.geary.enable = mkDefault true;
      programs.gnome-disks.enable = mkDefault true;
      programs.gnome-terminal.enable = mkDefault true;
-      programs.evince.enable = mkDefault true;
      programs.file-roller.enable = mkDefault true;

      environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
@ -232,6 +232,7 @@ in
        # external apps shipped with linux-mint
        hexchat
        gnome-calculator
+        gnome-calendar
        gnome-screenshot
      ] config.environment.cinnamon.excludePackages;
    })
--- a/nixos/tests/nscd.nix
+++ b/nixos/tests/nscd.nix
@ -40,11 +40,12 @@ in
    };

    specialisation = {
-      withUnscd.configuration = { ... }: {
-        services.nscd.package = pkgs.unscd;
+      withGlibcNscd.configuration = { ... }: {
+        services.nscd.enableNsncd = false;
      };
-      withNsncd.configuration = { ... }: {
-        services.nscd.enableNsncd = true;
+      withUnscd.configuration = { ... }: {
+        services.nscd.enableNsncd = false;
+        services.nscd.package = pkgs.unscd;
      };
    };
  };
@ -118,6 +119,14 @@ in
      test_host_lookups()
      test_nss_myhostname()

+      with subtest("glibc-nscd"):
+          machine.succeed('${specialisations}/withGlibcNscd/bin/switch-to-configuration test')
+          machine.wait_for_unit("default.target")
+
+          test_dynamic_user()
+          test_host_lookups()
+          test_nss_myhostname()
+
      with subtest("unscd"):
          machine.succeed('${specialisations}/withUnscd/bin/switch-to-configuration test')
          machine.wait_for_unit("default.target")
@ -129,13 +138,5 @@ in

          # known to fail, unscd doesn't load external NSS modules
          # test_nss_myhostname()
-
-      with subtest("nsncd"):
-          machine.succeed('${specialisations}/withNsncd/bin/switch-to-configuration test')
-          machine.wait_for_unit("default.target")
-
-          test_dynamic_user()
-          test_host_lookups()
-          test_nss_myhostname()
    '';
 })
--- a/pkgs/applications/audio/aaxtomp3/default.nix
+++ b/pkgs/applications/audio/aaxtomp3/default.nix
@ -27,10 +27,6 @@ resholve.mkDerivation rec {
    hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg=";
  };

-  # use whitespace to show osh arithmetic is not file redirection
-  # see: https://github.com/oilshell/oil/issues/1446
-  patches = [./osh.patch];
-
  postPatch = ''
    substituteInPlace AAXtoMP3 \
      --replace 'AAXtoMP3' 'aaxtomp3'
--- a/pkgs/applications/audio/aaxtomp3/osh.patch
+++ b/pkgs/applications/audio/aaxtomp3/osh.patch
@ -1,15 +0,0 @@
-diff --git a/AAXtoMP3 b/AAXtoMP3
-index 90566ad..71e94da 100755
--- a/AAXtoMP3
-+++ b/AAXtoMP3
-@@ -200,8 +200,8 @@ progressbar() {
- 
-   #draw progressbar with one # for every 5% and blank spaces for the missing part.
-   progressbar=""
-  for (( n=0; n<(percentage/5); n++ )) ; do progressbar="$progressbar#"; done
-  for (( n=0; n<(20-(percentage/5)); n++ )) ; do progressbar="$progressbar "; done
-+  for (( n=0; n< (percentage/5); n++ )) ; do progressbar="$progressbar#"; done
-+  for (( n=0; n< (20-(percentage/5)); n++ )) ; do progressbar="$progressbar "; done
- 
-   #print progressbar
-   echo -ne "Chapter splitting: |$progressbar| $print_percentage% ($part/$total chapters)\r"
--- a/pkgs/applications/audio/ashuffle/default.nix
+++ b/pkgs/applications/audio/ashuffle/default.nix
@ -6,7 +6,7 @@
 , meson
 , ninja
 , libmpdclient
-, libyamlcpp
+, yaml-cpp
 }:

 stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

  dontUseCmakeConfigure = true;
  nativeBuildInputs = [ cmake pkg-config meson ninja ];
-  buildInputs = [ libmpdclient libyamlcpp ];
+  buildInputs = [ libmpdclient yaml-cpp ];

  mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ];

--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@ -25,7 +25,7 @@
 , makeWrapper
 , pandoc
 , llvmPackages
-, libyamlcpp
+, yaml-cpp
 , soci
 , postgresql
 , nodejs
@ -95,7 +95,7 @@ in
      openssl
      R
      libuuid
-      libyamlcpp
+      yaml-cpp
      soci
      postgresql
    ] ++ (if server then [
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -293,12 +293,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2023-01-26";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "e942fac8de03539dc07ea96e70a8ec262dccadda";
-      sha256 = "0iznxnl5m3kkmbqyynjvr3mgsrcm0a8g12s5cx42g0v9i9xpjf1y";
+      rev = "d98828169af99624031d8535785a099cdf60d4c3";
+      sha256 = "0j3lkz7lbd0naqqp6y2nlk9zawd453m41diia7f0saiyix76r6cp";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -341,12 +341,12 @@ final: prev:

  SpaceCamp = buildVimPluginFrom2Nix {
    pname = "SpaceCamp";
-    version = "2022-11-15";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "jaredgorski";
      repo = "SpaceCamp";
-      rev = "8ff0ed105d1403a60e1f79150b8b645a3465b3a0";
-      sha256 = "06bddfpmnabhw7q8q459qa55gh3x7xqzb0lq7qpq1i4kg6qsc7ck";
+      rev = "fab8e52ec7d67000c8d96028b2d643573a4289b1";
+      sha256 = "0kk482si63v67a4086hk9va1lsjqpmbaf71y2cqyrw9vidbmy38g";
    };
    meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
  };
@ -498,12 +498,12 @@ final: prev:

  aerial-nvim = buildVimPluginFrom2Nix {
    pname = "aerial.nvim";
-    version = "2023-01-28";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "911373eb6be91700a3597aeb228f553d4a29aec1";
-      sha256 = "1w7yp0rw3ij5gv4nnjzzhfqx9z5n4ayxg9phlxxpvysmma90sfar";
+      rev = "30a64f8590482dcd461123cb66464ff371aeeb84";
+      sha256 = "15rzr9p685ylv37amkfv0finnimhzlp2lmzkm8gdqzl0xhsfa2rn";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -727,12 +727,12 @@ final: prev:

  aurora = buildVimPluginFrom2Nix {
    pname = "aurora";
-    version = "2023-01-04";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "aurora";
-      rev = "76ce329f419d615f52335e2c18153674a4598276";
-      sha256 = "0l4g18d86wibsl4jmnm4kmjrgnk1dfzr2x7xwhx0s2dqkm2g1rqc";
+      rev = "a55448018d75817e820c03b21d28a2cd65b7d353";
+      sha256 = "1vlbpw4mgkh5rd2mqwjsvz9sxnq5zjci4jddhmnmkilrlgancfg0";
    };
    meta.homepage = "https://github.com/ray-x/aurora/";
  };
@ -835,24 +835,24 @@ final: prev:

  barbar-nvim = buildVimPluginFrom2Nix {
    pname = "barbar.nvim";
-    version = "2023-01-22";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "romgrk";
      repo = "barbar.nvim";
-      rev = "e9da670e3fd58598bd0d2cf7e32e1af24cb2fcca";
-      sha256 = "0bsid941ybaibwwq5hgp13n8xqh8z2yjldggrcamhm9hga5sy0a0";
+      rev = "065c6d792a2a3aaf67a754ccd46800c8d1964812";
+      sha256 = "1y04sfcnzw4hnygbgg91bfsn7jas5xbcsxrhp7766whd22rl6dsh";
    };
    meta.homepage = "https://github.com/romgrk/barbar.nvim/";
  };

  barbecue-nvim = buildVimPluginFrom2Nix {
    pname = "barbecue.nvim";
-    version = "2023-01-29";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "utilyre";
      repo = "barbecue.nvim";
-      rev = "b03479533f8b17f1b5b3dc625ddf2c528e914e6c";
-      sha256 = "0g1rxpk74iq05ji1bb7kffmfjizn6i4r0b82y5a2vm7kqbb2sdpi";
+      rev = "e3db3c4e25f5531bcb74b7951f52e425731433e5";
+      sha256 = "0b69g3vr78x4hy5sj354iws43x4mm8qlqwfzl6cbiga16pa659ay";
    };
    meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
  };
@ -1123,12 +1123,12 @@ final: prev:

  circles-nvim = buildVimPluginFrom2Nix {
    pname = "circles.nvim";
-    version = "2022-11-28";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "projekt0n";
      repo = "circles.nvim";
-      rev = "91ae7e0ddf95e1984528cf3129879f4841bcbc82";
-      sha256 = "0wmy9h2m4zdqaw7cmg1dz5w8l0x5269is0r8bb3ns7clilrknjhm";
+      rev = "06357817f6944de132f0a58ee5c1486e4dcc6dda";
+      sha256 = "1rvbz9m02vmjs5dg9yhnzzdr46ck1rqdrc7a94sybj8qvw3l5nq1";
    };
    meta.homepage = "https://github.com/projekt0n/circles.nvim/";
  };
@ -1303,12 +1303,12 @@ final: prev:

  cmp-dictionary = buildVimPluginFrom2Nix {
    pname = "cmp-dictionary";
-    version = "2022-11-23";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "uga-rosa";
      repo = "cmp-dictionary";
-      rev = "b7c0629e10c8a3a10311aa4ad952d207509d5e67";
-      sha256 = "1hs3pying86zbrk3vnrpv4nfa8nl8b2ify5wks8675x5rc9z8iyh";
+      rev = "06876deb8b82e2cc6a318f22196c39218f4f59bd";
+      sha256 = "1m723a5qrs281n9sghmcgm8cnp9nrjxkaajnlq34bg3s56d32hik";
    };
    meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
  };
@ -1735,24 +1735,24 @@ final: prev:

  coc-fzf = buildVimPluginFrom2Nix {
    pname = "coc-fzf";
-    version = "2022-12-24";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "antoinemadec";
      repo = "coc-fzf";
-      rev = "4f8d072df2609219b8d79b67641a9753e3d7fff0";
-      sha256 = "1nsv5ag13yzcffq404darfk0vz4sbchj941bcf960znnlynlcya0";
+      rev = "5fae5a15497750483e21fc207aa6005f340f02f2";
+      sha256 = "1r9jhdxm3y1lpdmwmlk48skihf7jxdm2sxirzyd1kwb88nvn4c3r";
    };
    meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
  };

  coc-lua = buildVimPluginFrom2Nix {
    pname = "coc-lua";
-    version = "2023-01-17";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "josa42";
      repo = "coc-lua";
-      rev = "e74d1173689dccde72fdccaabae19cbe93d2f1be";
-      sha256 = "0pmx80b4s0nvdz5ps0jrlgrsir00q0s4ighjl7598gfh59ic8jhl";
+      rev = "80858aa01d57ed2f93c6bc388bad373810d41a21";
+      sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9";
    };
    meta.homepage = "https://github.com/josa42/coc-lua/";
  };
@ -2083,24 +2083,24 @@ final: prev:

  copilot-lua = buildVimPluginFrom2Nix {
    pname = "copilot.lua";
-    version = "2023-01-25";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "zbirenbaum";
      repo = "copilot.lua";
-      rev = "cfedeb726dc18b25f69d2f2a084b41061ae16e8f";
-      sha256 = "1ysg39cmvk3cw2dwkdx9gjirq8lkfdh3zskxrbw6zkc0xl7zs31a";
+      rev = "bfae743805d5f16fc31f6d3a8f2e46b3f3dbb175";
+      sha256 = "1gkb9w1ad8fq6hbvr96p6sp1kzx8vlk0x6wy47mqbliqpxgp3vhr";
    };
    meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
  };

  copilot-vim = buildVimPluginFrom2Nix {
    pname = "copilot.vim";
-    version = "2023-01-18";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "github";
      repo = "copilot.vim";
-      rev = "8c8416488ef21483dd5d2922ea194c05e9a3baaf";
-      sha256 = "08zs24jqwv6z5fih1701wxlpbb2bjp5zlj0incw7vyi87zk2i3va";
+      rev = "c7d166ebda265370f38cec374e33f02eeec2f857";
+      sha256 = "1j2q62sac9gwcdzgc2cdxvvpxjgxi12sy33p49lk3gh5mlld53ij";
    };
    meta.homepage = "https://github.com/github/copilot.vim/";
  };
@ -2287,12 +2287,12 @@ final: prev:

  dashboard-nvim = buildVimPluginFrom2Nix {
    pname = "dashboard-nvim";
-    version = "2023-01-30";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "glepnir";
      repo = "dashboard-nvim";
-      rev = "9688f9d8df356d4bc06b42a74b78f0e374f6c534";
-      sha256 = "0p64q1kbq03dgrpqxhl7pn85j8rqwxn6yqw8a29x09nahjrxkfrw";
+      rev = "df68a1943ac2f08a73e3284b266ea50e7d381db4";
+      sha256 = "1m2c7xqsb5fp41j0sbv7z5w34pi372x21gxifkvhx6znv4l5r9f7";
    };
    meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
  };
@ -2975,12 +2975,12 @@ final: prev:

  firenvim = buildVimPluginFrom2Nix {
    pname = "firenvim";
-    version = "2023-01-09";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "glacambre";
      repo = "firenvim";
-      rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810";
-      sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q";
+      rev = "35b34ba566d9d9f6761cde3574f668d505c5137f";
+      sha256 = "06lrhk7xladf9vf5d3qk06ffh4fw3s1wzpckwrk285lqz3mqc2gm";
    };
    meta.homepage = "https://github.com/glacambre/firenvim/";
  };
@ -3192,12 +3192,12 @@ final: prev:

  fzf-lua = buildVimPluginFrom2Nix {
    pname = "fzf-lua";
-    version = "2023-01-15";
+    version = "2023-02-02";
    src = fetchFromGitHub {
      owner = "ibhagwan";
      repo = "fzf-lua";
-      rev = "292de730ebbd3834e87f864c8c4115dc1035db37";
-      sha256 = "068rwvq5q264lpfxgg4gw259rsy4wp6n6bf4877azk19f1b4j0ys";
+      rev = "bc7fd1253aff19ae5514fc11b0f947cc4b052a90";
+      sha256 = "1maddqgwdxxsp6ar6csbxsvd1ng3i3ybqdy4b2jslj9f8v54znds";
    };
    meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
  };
@ -3240,12 +3240,12 @@ final: prev:

  gentoo-syntax = buildVimPluginFrom2Nix {
    pname = "gentoo-syntax";
-    version = "2023-01-02";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "gentoo";
      repo = "gentoo-syntax";
-      rev = "9e4f5360b69558799c6974ed72248b86d09c6549";
-      sha256 = "1pv64p2g385h4awapg99m39r3qipkpwg4rkicvdsc0dsnamqmis3";
+      rev = "8abf42d2035374df1c87cb1b26039393c807ddd5";
+      sha256 = "1vka4b9qs54wrs2wzk8msbpadc01wc5b1py0zng8hq67dplcg9yx";
    };
    meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
  };
@ -3372,12 +3372,12 @@ final: prev:

  glance-nvim = buildVimPluginFrom2Nix {
    pname = "glance.nvim";
-    version = "2023-01-29";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "DNLHC";
      repo = "glance.nvim";
-      rev = "3275558ac586c2778318d36cf1bf48c071c286c2";
-      sha256 = "0xzd6i1nx2ijcl0r6nzspgcqv5c2m97k0nm5q92ivgkr5cgvw96g";
+      rev = "3b7fbbe4e785bedbdaa1a9573dcd800261a7e32b";
+      sha256 = "09jcq6315njcw0khasnv41vi0lscbxk07cajzxqbm5pgjzww26fq";
    };
    meta.homepage = "https://github.com/DNLHC/glance.nvim/";
  };
@ -3599,12 +3599,12 @@ final: prev:

  haskell-tools-nvim = buildVimPluginFrom2Nix {
    pname = "haskell-tools.nvim";
-    version = "2023-01-29";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "haskell-tools.nvim";
-      rev = "5e1b41ef7338c0aa764425144378d8d1b3b59242";
-      sha256 = "0y7xkfy2jf28xam2j0z4b95w477sjr077gas0j1vvr16n4grg8wi";
+      rev = "2e63d6336822a3676fdd27b0aa49cb2da08d1b17";
+      sha256 = "0v4hc613smq1gry56imfy65cqy5128za4i5zfy1zvh3x1ppbqqvw";
    };
    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
  };
@ -3645,6 +3645,18 @@ final: prev:
    meta.homepage = "https://github.com/travitch/hasksyn/";
  };

+  heirline-nvim = buildVimPluginFrom2Nix {
+    pname = "heirline.nvim";
+    version = "2023-01-30";
+    src = fetchFromGitHub {
+      owner = "rebelot";
+      repo = "heirline.nvim";
+      rev = "81ceb3025e6c7030c42accc3951dad94f31ff0c8";
+      sha256 = "0m8z7k0pw7vmwmw21lcil0iprdb9l9yfx4yjk05h65027j8xhk7c";
+    };
+    meta.homepage = "https://github.com/rebelot/heirline.nvim/";
+  };
+
  hiPairs = buildVimPluginFrom2Nix {
    pname = "hiPairs";
    version = "2020-12-10";
@ -4139,12 +4151,12 @@ final: prev:

  lazy-nvim = buildVimPluginFrom2Nix {
    pname = "lazy.nvim";
-    version = "2023-01-25";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "lazy.nvim";
-      rev = "15fe46a728b7473d4cae368838bbc1c79c3a3f48";
-      sha256 = "0vw5p1cl9cblq39wvcsh6bq0li6qfqhxqvbn786b3xidlsw8wzv4";
+      rev = "3d2dcb2d5ef99106c5ff412da88c6f59a9f8a693";
+      sha256 = "0gac6zw7zp53szjd8rfhb5ysgnhrsn01gb759pczmkayp2b2x4fd";
    };
    meta.homepage = "https://github.com/folke/lazy.nvim/";
  };
@ -4547,12 +4559,12 @@ final: prev:

  lsp-zero-nvim = buildVimPluginFrom2Nix {
    pname = "lsp-zero.nvim";
-    version = "2023-01-28";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "VonHeikemen";
      repo = "lsp-zero.nvim";
-      rev = "d3e00eb9ac9131cd9241ba28c06678d11ba83dcf";
-      sha256 = "1wkad9iygialmbjxfs0zp6il9p5327g0fhwc22sld8h72298ca9p";
+      rev = "42bc5a1081666098a7154532e6ff5e3edc483b39";
+      sha256 = "1y6jv9sldap59466v8jivbd5w6xs31anr8iqg3zyapdmr6pwflck";
    };
    meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
  };
@ -4582,12 +4594,12 @@ final: prev:

  lsp_signature-nvim = buildVimPluginFrom2Nix {
    pname = "lsp_signature.nvim";
-    version = "2023-01-21";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "lsp_signature.nvim";
-      rev = "b86f249cba85ec2f0f74c62b65898bade00b4413";
-      sha256 = "0kbcws9dwsvjg6psfax4azd6j46n05jhkkdgsc1c4wjhyg74jas9";
+      rev = "c15369260448d81cb65e5c6965850232ed22fbbc";
+      sha256 = "07s83hn47rnvb96fz7h9kxdy9qxmz7h0v23m0ij8c4yhk9z8xyxj";
    };
    meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
  };
@ -4727,12 +4739,12 @@ final: prev:

  mason-lspconfig-nvim = buildVimPluginFrom2Nix {
    pname = "mason-lspconfig.nvim";
-    version = "2023-01-26";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason-lspconfig.nvim";
-      rev = "422b9745143150e16cd3fe331c74f6737de75e72";
-      sha256 = "0imsx0zz5059anxbglfvfimnffjw7pzi3byp5arj7qwjmkrwgyay";
+      rev = "53f3a8bdcb77d4a95b082fd57e12173f353c6c3e";
+      sha256 = "0588rpf28fk922nmj44nl5m74a9762g2xx8y72b61k5iwpi2vp3h";
    };
    meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
  };
@ -4751,12 +4763,12 @@ final: prev:

  mason-nvim = buildVimPluginFrom2Nix {
    pname = "mason.nvim";
-    version = "2023-01-28";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "williamboman";
      repo = "mason.nvim";
-      rev = "2469bfc2538652cb0cf88c129f67d38e46a9cb59";
-      sha256 = "13ymyc881zkd7c47ayc9cknkzabcgmskm94cq9qjk34r00zgd2jh";
+      rev = "07de1d12940a6580c125720d37e26abc318f778a";
+      sha256 = "19m2j1kmc0mnzbjyp266dqqgfp2fw1mlzcsc9286ggbbvgisadih";
    };
    meta.homepage = "https://github.com/williamboman/mason.nvim/";
  };
@ -4823,12 +4835,12 @@ final: prev:

  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
-    version = "2023-01-30";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "e742f416df94846cb0c5936db46d650ac1339058";
-      sha256 = "0jxy9pmg8k45wxsk4npp46x2xdwyriimnfd92fvbls2s2px0myc8";
+      rev = "8e007cf3ae8db59bd926a9fbaf7f0d25a7fe67ca";
+      sha256 = "02pq68d5c3g009qsjsbns0bswg1riq61l8giykhg09r0lbj28zn1";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -5183,12 +5195,12 @@ final: prev:

  neoconf-nvim = buildVimPluginFrom2Nix {
    pname = "neoconf.nvim";
-    version = "2023-01-28";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neoconf.nvim";
-      rev = "d65df617fd98d1224b342fc6a6ee3cfcc2b6c751";
-      sha256 = "1ca1p6cpwps43v7nl661ljsnrhiafx41nap73hvyjblm1c732cjx";
+      rev = "9fb68ebc1b5632b2e3e93ddb5ad1985c75c59fbd";
+      sha256 = "0p2n2k28z0qjdsiyxq0frfl7y6lvf96bl5c7w8zk0amvabkh23wf";
    };
    meta.homepage = "https://github.com/folke/neoconf.nvim/";
  };
@ -5231,12 +5243,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-01-27";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "TimUntersberger";
      repo = "neogit";
-      rev = "da8b0931724864e20c541ec1ec51f998cf8212f9";
-      sha256 = "1hww128m01k9b3zyp1zfjj7scshafafxssn1cwgbczjc5y10yhja";
+      rev = "089d388876a535032ac6a3f80e19420f09e4ddda";
+      sha256 = "0h44l14frinh9mcbjps04d0s853pppw0qlwdjkdg5wrfnh975vya";
    };
    meta.homepage = "https://github.com/TimUntersberger/neogit/";
  };
@ -5531,12 +5543,12 @@ final: prev:

  nlsp-settings-nvim = buildVimPluginFrom2Nix {
    pname = "nlsp-settings.nvim";
-    version = "2023-01-27";
+    version = "2023-02-02";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "69f4018faa021027d4b0651b4836bc8ac127d573";
-      sha256 = "0a5rqbq821aiqfam0iw6jmwz07rcf1r68r9k5bs06cm7pdai3784";
+      rev = "5541d073b93a404445907e0aec3ebd9cf8914e53";
+      sha256 = "0r4bbppp95rdhpz9j24w6smpzv891gk1ja6dis7j4gf3sra57hqy";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -5627,24 +5639,24 @@ final: prev:

  nui-nvim = buildVimPluginFrom2Nix {
    pname = "nui.nvim";
-    version = "2023-01-16";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "MunifTanjim";
      repo = "nui.nvim";
-      rev = "b99e6cb13dc51768abc1c4c8585045a0c0459ef1";
-      sha256 = "0fgwi68ks7qalr2nn1pzf3jdzyx5scmziz2dhp3yyw7mc1nq3fi1";
+      rev = "d147222a1300901656f3ebd5b95f91732785a329";
+      sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2";
    };
    meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
  };

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2023-01-28";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "7b2b28e207a1df4ebb13c7dc0bd83f69b5403d71";
-      sha256 = "02ing7v31xk43161986b7np04d58cxkm19h00mq95gdbqy3gnaz8";
+      rev = "c3e678110d5f31854c6575cf4bda3b82f3d4a884";
+      sha256 = "045anxnny6rlfrj18wqqrdy69j0b6qpgiirabjas6hcyh3sjgrx6";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -5735,12 +5747,12 @@ final: prev:

  nvim-bqf = buildVimPluginFrom2Nix {
    pname = "nvim-bqf";
-    version = "2023-01-17";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-bqf";
-      rev = "d15b59d7429d45f0b057aa63a0266989adc95715";
-      sha256 = "0fsb8ybymxppkbdg45f7vr5vys2nl7b45nw6dprarh8bwp2qnkcr";
+      rev = "da1cd2557a16386829a213330e0fd46b61db7632";
+      sha256 = "0ws45yilaq9kyssm5s1rj65k0xsiflg8fivjgggb3g3fvr6286p3";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
  };
@ -5915,12 +5927,12 @@ final: prev:

  nvim-dap-ui = buildVimPluginFrom2Nix {
    pname = "nvim-dap-ui";
-    version = "2023-01-29";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "rcarriga";
      repo = "nvim-dap-ui";
-      rev = "395382466f12325919708da238e90add967d0912";
-      sha256 = "1jpp88lm1fxd21f21rmsysc1h9h943kg1k8mfs5bwmh063pxwpfn";
+      rev = "885e958ff9de30cfbc359259eccf28cc493ad46b";
+      sha256 = "1j7nbrilk63vdmnr1dp3gdzhdpa2m001jzd6ch6i8j8dzjjnbyss";
    };
    meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
  };
@ -6023,12 +6035,12 @@ final: prev:

  nvim-hlslens = buildVimPluginFrom2Nix {
    pname = "nvim-hlslens";
-    version = "2023-01-18";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-hlslens";
-      rev = "fc83bd515c21c7912a6b9f97088e0492e923dfe0";
-      sha256 = "03wpjgr8ziw9dllngh06l7wkf39vd9z96ivbyhzvdq801v0lyyw7";
+      rev = "5e3e9088fba7508cee3612ee50b14dfdd3ab19af";
+      sha256 = "1ih4zkb025wvns0bgk3g9ps9krwj5jfzi49qqvg5v3v707ypq2kj";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
  };
@ -6131,12 +6143,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-01-27";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "1e988250a0f52a68ddb72905d623405d634e9c5d";
-      sha256 = "1l3mdym1a0h8d6dsv6wr7whgsml7z9r9g0f6qraj4yp93l3n3wd4";
+      rev = "902d6aa31450d26e11bedcbef8af5b6fe2e1ffe8";
+      sha256 = "1hmkm3znqm7c6fi0qai1i424qjm5b9dh9l0srzyy7cax3629yyfr";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -6299,12 +6311,12 @@ final: prev:

  nvim-snippy = buildVimPluginFrom2Nix {
    pname = "nvim-snippy";
-    version = "2023-01-28";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "dcampos";
      repo = "nvim-snippy";
-      rev = "04f602f931e81dc330a0c4dd51f3dd896f0be920";
-      sha256 = "1vvh9mgqspw3q3qhv0assvjmx9hkm5ihqxdgjbh7z471g9jzhz78";
+      rev = "a5580956e2c1841a248fae6ba88e21f72df9f04d";
+      sha256 = "1607d7igrhrzhfaypnf20awgi1l32w57i5g1jdz4d5dpch1wi6wn";
    };
    meta.homepage = "https://github.com/dcampos/nvim-snippy/";
  };
@ -6371,24 +6383,24 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree.lua";
-    version = "2023-01-30";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "f3b73725c5a007b8195118bec5868c32a5eff81f";
-      sha256 = "04f95q5w80kpj3f0gygfm4m1f6mdpnbim1fv10mkqiq3gpkxp8mf";
+      rev = "215b29bfad74518442621b9d0483a621483b066b";
+      sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-01-30";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "adeb6e02d3bd682f7bea99a988b0deadd407e888";
-      sha256 = "1grgs2a3rps80kmpsa1idfslcmg6zzssqi07g0zzlvrrqf96h36y";
+      rev = "f0e083912ac42e9001e02a89f70269aa0698e9ec";
+      sha256 = "0yd2rfy2vsrnnxz0ih8j1f975kww9xcdwzp7241dbdyvy9h7ra7d";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -6431,12 +6443,12 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-textobjects";
-    version = "2023-01-28";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "9011d333aa411ae71ca8762ca3a277ce6b9e6527";
-      sha256 = "09pb0miwm2wzsn4d1jyayay3b3ig67y30mjnncz1jxx688blvc86";
+      rev = "249d90a84df63f3ffff65fcc06a45d58415672de";
+      sha256 = "01wm4gnwimsxgvdhjgn15d23nq6d1304jjvkr1wdjz7xk5g0xvaz";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };
@ -6671,12 +6683,12 @@ final: prev:

  onenord-nvim = buildVimPluginFrom2Nix {
    pname = "onenord.nvim";
-    version = "2023-01-07";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "rmehri01";
      repo = "onenord.nvim";
-      rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b";
-      sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1";
+      rev = "09aab5d7ea230c9c4829e44698020b642e00d840";
+      sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad";
    };
    meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
  };
@ -6707,12 +6719,12 @@ final: prev:

  orgmode = buildVimPluginFrom2Nix {
    pname = "orgmode";
-    version = "2023-01-26";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "nvim-orgmode";
      repo = "orgmode";
-      rev = "458fac9f6c33400dd6976514ea29f88fa34fe1cd";
-      sha256 = "06hp5ylp7xi22w9q5bssdfc9hamgvlsnvxppkgqk0glidsy90pbd";
+      rev = "7ddbdc0741fdc90f73faa17fb332bc8700acadbf";
+      sha256 = "01pf6pi9mm88slf7667np60a7x9zk0rwxz40cyxrfc4d012ivs3a";
    };
    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
  };
@ -6863,12 +6875,12 @@ final: prev:

  plenary-nvim = buildNeovimPluginFrom2Nix {
    pname = "plenary.nvim";
-    version = "2023-01-10";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "nvim-lua";
      repo = "plenary.nvim";
-      rev = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826";
-      sha256 = "12hp9a2q80hg93ynfa97v03fmxqwv4d6f1yb92bi6ih3kbjyjsji";
+      rev = "9a0d3bf7b832818c042aaf30f692b081ddd58bd9";
+      sha256 = "1xy4hs0pckzbxd249zwg2r0vi94fy9arb966nypw1dx4vxw8072z";
    };
    meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
  };
@ -7201,12 +7213,12 @@ final: prev:

  rnvimr = buildVimPluginFrom2Nix {
    pname = "rnvimr";
-    version = "2023-01-30";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "rnvimr";
-      rev = "8e98463b7a940c1ffee1930d18d3c499db366585";
-      sha256 = "0nlcx5dnzxrv3kdsih411ng90sxlbbfw0xvr3q8x680jxqs3dzky";
+      rev = "40b4e0be0231eabc7406168b432d507c6b6332f9";
+      sha256 = "1wap2hazm84yzd1x6in6mnglnx67xbavg17k5fqd117biyw8i5ir";
    };
    meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
  };
@ -8298,12 +8310,12 @@ final: prev:

  telescope-nvim = buildVimPluginFrom2Nix {
    pname = "telescope.nvim";
-    version = "2023-01-30";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "d5f6c0911d6066397f1757c6b55a8bd6851bd6dc";
-      sha256 = "0s6s7g1vzgk1wz6d2vqxh967da41hym9ignwi5x5khyq3xzgdf6v";
+      rev = "203bf5609137600d73e8ed82703d6b0e320a5f36";
+      sha256 = "1h64qyvvnzv7ph49vciv2izv9ws7ds1z9cncrmxs7jwlh3vv10ig";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -8683,12 +8695,12 @@ final: prev:

  ultisnips = buildVimPluginFrom2Nix {
    pname = "ultisnips";
-    version = "2022-10-02";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "SirVer";
      repo = "ultisnips";
-      rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401";
-      sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09";
+      rev = "0ad238b1910d447476b2d98f593322c1cdb71285";
+      sha256 = "1ii9bb2h45ngy3a9ycqiw6i6vg5lyv59ibidgasg4xirnmsrmk1y";
    };
    meta.homepage = "https://github.com/SirVer/ultisnips/";
  };
@ -8803,12 +8815,12 @@ final: prev:

  vifm-vim = buildVimPluginFrom2Nix {
    pname = "vifm.vim";
-    version = "2023-01-25";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "vifm";
      repo = "vifm.vim";
-      rev = "347d6125495ee87d6f6066e4830f70ddba18722e";
-      sha256 = "1xdhyml77k5fgmd9rl8g643bd7qywgzg3hqapns0xcj8axiigmvf";
+      rev = "13a24c0a09d29db4a1683ef950f929d97c57ef90";
+      sha256 = "044s9di41cif3d7ij349v135vnxqhrl10fnagq6lyn364jw3lad1";
    };
    meta.homepage = "https://github.com/vifm/vifm.vim/";
  };
@ -9835,12 +9847,12 @@ final: prev:

  vim-dasht = buildVimPluginFrom2Nix {
    pname = "vim-dasht";
-    version = "2022-12-11";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "sunaku";
      repo = "vim-dasht";
-      rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52";
-      sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9";
+      rev = "fcfd4ec32d681745d6c1855097b30b988053fc2f";
+      sha256 = "1y97fcmz8lvpj9z0cq46x6m6ac2ck8syfdgyjj62x2m1j40sv63m";
    };
    meta.homepage = "https://github.com/sunaku/vim-dasht/";
  };
@ -10772,12 +10784,12 @@ final: prev:

  vim-illuminate = buildVimPluginFrom2Nix {
    pname = "vim-illuminate";
-    version = "2023-01-23";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "RRethy";
      repo = "vim-illuminate";
-      rev = "4e1d43cdc39e35f495c7b39a78a349b4d5badad0";
-      sha256 = "135274m0q9gclg1lqr9aw3063w3m7csmibri3jzx3lk444gqmh9v";
+      rev = "d6ca7f77eeaf61b3e6ce9f0e5a978d606df44298";
+      sha256 = "02sgnp9yr0bdg8r5w24cxdvy01vw2whkh0fx11d9vfg0gqshi2hh";
    };
    meta.homepage = "https://github.com/RRethy/vim-illuminate/";
  };
@ -11205,12 +11217,12 @@ final: prev:

  vim-lsp = buildVimPluginFrom2Nix {
    pname = "vim-lsp";
-    version = "2023-01-28";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "prabirshrestha";
      repo = "vim-lsp";
-      rev = "ad6d61b13c64499163f2430245f410bf9e75e89e";
-      sha256 = "0q1zzn73399h9zllfrdh50lgfw66n8b0swiyqaxyzyxspl882cm1";
+      rev = "25337623cf11e2ac9c73dcba1a48b86fe103d887";
+      sha256 = "020c8m76yp0ddwln4iajy231ifia2bxvly0b4ibfn5sgnqqf2cxm";
    };
    meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
  };
@ -12622,12 +12634,12 @@ final: prev:

  vim-startuptime = buildVimPluginFrom2Nix {
    pname = "vim-startuptime";
-    version = "2022-12-12";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "vim-startuptime";
-      rev = "cb4c112b9e0f224236ee4eab6bf5153406b3f88b";
-      sha256 = "1n1m27vvqcik4c9f80d0blqggyh29s8h20jn3v7gy1fx94bi2n2w";
+      rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834";
+      sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx";
    };
    meta.homepage = "https://github.com/dstein64/vim-startuptime/";
  };
@ -12923,12 +12935,12 @@ final: prev:

  vim-tmux-clipboard = buildVimPluginFrom2Nix {
    pname = "vim-tmux-clipboard";
-    version = "2023-01-28";
+    version = "2023-02-02";
    src = fetchFromGitHub {
      owner = "roxma";
      repo = "vim-tmux-clipboard";
-      rev = "21be1d22b82448292d8f290384b48e9ad372f833";
-      sha256 = "09fd216nyv0b00078hipz871hilhpx9zf740s9c9lmw1cd80cs9g";
+      rev = "e1be6608410c260479dc4807ad8c103faf5460d8";
+      sha256 = "07a8jj1j8422a8grvp440qbrxmzchqxc3mgmpa7hsyqlkw5fjkj8";
    };
    meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/";
  };
@ -13199,12 +13211,12 @@ final: prev:

  vim-wakatime = buildVimPluginFrom2Nix {
    pname = "vim-wakatime";
-    version = "2023-01-30";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "wakatime";
      repo = "vim-wakatime";
-      rev = "413e9c4e44baaeb60beded33e26c37d9d22130b0";
-      sha256 = "13i45y66ch7wkvrc3i4m77xhgr0klrbancd6csxn5hl2qwgn6122";
+      rev = "b67957731086466ed5d967cd1dac7f6981603156";
+      sha256 = "0s35cx7yxx6rc7qs88c4j0109y7b9lgwd15p0a33pwbwj0h3x6ap";
    };
    meta.homepage = "https://github.com/wakatime/vim-wakatime/";
  };
@ -13499,12 +13511,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2023-01-25";
+    version = "2023-01-31";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "0224789989392a9a6b958afa9fce9db5ff1e7a4f";
-      sha256 = "0fvdyi9ipzk5crw4gfvvjhir7zw5g2gr3gnzgniwgap79nnhb1aq";
+      rev = "ecf0c51b07ffedeca054581623bdda0d458e39d2";
+      sha256 = "0xvpfsbglr65zjs26slwms9n8ibjy4s93vny2p5s2q5f5mgnlsd7";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
@ -13512,12 +13524,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2023-01-27";
+    version = "2023-01-30";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "13fa591e82f7fe0fedbb097e9869d32f6af207fe";
-      sha256 = "040v6764iagzyy6iya1rq6zacqyqqnwd4xqv3jf15ns5bzb73lam";
+      rev = "b8607084b324ab0c98892ca20f78433904aecef5";
+      sha256 = "15n8mfiq8mxcjlp13mv17prdfc59cd2kqjsbk7wg89khhbg81sq3";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -13801,12 +13813,12 @@ final: prev:

  zen-mode-nvim = buildVimPluginFrom2Nix {
    pname = "zen-mode.nvim";
-    version = "2023-01-24";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "zen-mode.nvim";
-      rev = "2c8f9f3758a4c430ff867e547741424ac16208bb";
-      sha256 = "0iv87ixlb9ajzszkyih7ydd8644zd61njsjb0s94pwydqhxs8bsi";
+      rev = "136dda65769cee45119f16e4bc3d3f13a7aecb28";
+      sha256 = "0bsnvcixvk2vrimbyhxblj9anhig69jwxscyd2l05pp1njpzb424";
    };
    meta.homepage = "https://github.com/folke/zen-mode.nvim/";
  };
@ -13897,12 +13909,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2023-01-29";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "491f0a58ba8901258f84de94d848811a6eaf5b98";
-      sha256 = "0xqvi82z2mhjb1dc4xzcmqn8h6psz1591dqr5wn15kli9vrn00id";
+      rev = "8769e767f12f5bf0b7d1250ee067088e7054809a";
+      sha256 = "1k57sb89abypkiwx94w0dadbg5qc73q5lfragmnvm81hhikdbf5p";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -13921,12 +13933,12 @@ final: prev:

  chad = buildVimPluginFrom2Nix {
    pname = "chad";
-    version = "2023-01-29";
+    version = "2023-02-02";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "d6841f9002ec98ad0ae9989e2c2f51133703f1de";
-      sha256 = "00zic7fb3a3r59231fxyw2n9dw0rcsi11q97p6pk71sy4gpkq0pa";
+      rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053";
+      sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -13969,12 +13981,12 @@ final: prev:

  lspsaga-nvim-original = buildVimPluginFrom2Nix {
    pname = "lspsaga-nvim-original";
-    version = "2023-01-30";
+    version = "2023-02-01";
    src = fetchFromGitHub {
      owner = "glepnir";
      repo = "lspsaga.nvim";
-      rev = "705a8e9ae28a60a0ccb219c79085d57fdcd1b2a8";
-      sha256 = "0w541cp9kqs7mfaq43r66x1dhd1hwmxpdjsxg1v3402xgsxl6hx4";
+      rev = "f514660f65983d33613bf605bfd0adf583c06a8b";
+      sha256 = "1xgkwfacglm3f96mvs5q799h5vxa7a0dsik562jzi20vhgm49x9x";
    };
    meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -214,12 +214,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "98265a0";
+    version = "a02c214";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "98265a0a190c116234da73240ac8e373833ff5f7";
-      hash = "sha256-AOZJ29JELZi8Jafd4StXVY9gCKZj8y2nx1Z8XVlYV9E=";
+      rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85";
+      hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@ -338,12 +338,12 @@
  };
  elsa = buildGrammar {
    language = "elsa";
-    version = "86fb3db";
+    version = "c83c21c";
    src = fetchFromGitHub {
      owner = "glapa-grossklag";
      repo = "tree-sitter-elsa";
-      rev = "86fb3dbe8462f299dfc9a93c718a11363d69e90f";
-      hash = "sha256-OL3FJTwBkCIXdhqkSbn7BBiTylmhOC3e5KE97SfUpyA=";
+      rev = "c83c21c1f8f6b38dfc5bd1392de03a7b05bb78f4";
+      hash = "sha256-6PnI58jxuRuluK11/6hjTI24AVq2IQcuIplhvCv10nA=";
    };
    meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa";
  };
@ -1366,6 +1366,17 @@
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-smali";
  };
+  smithy = buildGrammar {
+    language = "smithy";
+    version = "cf8c7eb";
+    src = fetchFromGitHub {
+      owner = "indoorvivants";
+      repo = "tree-sitter-smithy";
+      rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0";
+      hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=";
+    };
+    meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy";
+  };
  solidity = buildGrammar {
    language = "solidity";
    version = "52ed088";
@ -1390,12 +1401,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "4fe05b2";
+    version = "286e10c";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52";
-      hash = "sha256-rfx4jBKC2zXo+zWBBb2WkFopF00KB7WHzz7LZ3M026M=";
+      rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1";
+      hash = "sha256-sIZ6615ioSz2wzjQLxcMaXKxd17qGR6nFDMxuwOx0Z8=";
    };
    generate = true;
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -305,6 +305,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
 https://github.com/neovimhaskell/haskell-vim/,,
 https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
+https://github.com/rebelot/heirline.nvim/,,
 https://github.com/Yggdroot/hiPairs/,,
 https://git.sr.ht/~soywod/himalaya-vim,,
 https://github.com/mpickering/hlint-refactor-vim/,,
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.1/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.2/src -A '*.tar.xz' )
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@ -3,7 +3,7 @@
 , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
 , kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
 , libvncserver, libXtst, libXdamage
-, qtx11extras
+, qtx11extras, pipewire, plasma-wayland-protocols, wayland
 }:

 mkDerivation {
@ -20,6 +20,9 @@ mkDerivation {
    kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
    kwindowsystem kxmlgui kwayland
    qtx11extras
+    pipewire
+    plasma-wayland-protocols
+    wayland
  ];
  propagatedBuildInputs = [ kdnssd ];
 }
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
--- a/pkgs/applications/misc/huggle/default.nix
+++ b/pkgs/applications/misc/huggle/default.nix
@ -8,7 +8,7 @@
 , unzip
 , wrapQtAppsHook
 , qtwebengine
-, libyamlcpp
+, yaml-cpp
 , libirc
 }:

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    which
    cmake
  ];
-  buildInputs = [ ncurses libyamlcpp qtwebengine libirc ];
+  buildInputs = [ ncurses yaml-cpp qtwebengine libirc ];

  patches = [ ./00-remove-third-party.patch ./01-extensions.patch ];
  postPatch = ''
--- a/pkgs/applications/misc/osm2xmap/default.nix
+++ b/pkgs/applications/misc/osm2xmap/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } :
+{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, yaml-cpp_0_3, boost } :

 stdenv.mkDerivation rec {
  pname = "osm2xmap";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";

-  buildInputs = [ libroxml proj_7 libyamlcpp boost ];
+  buildInputs = [ libroxml proj_7 yaml-cpp_0_3 boost ];

  meta = with lib; {
    homepage = "https://github.com/sembruk/osm2xmap";
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@ -150,7 +150,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "A free and open source, mature, fast and robust network threat detection engine";
-    homepage = "https://suricata-ids.org";
+    homepage = "https://suricata.io";
    license = licenses.gpl2;
    platforms = platforms.linux;
    maintainers = with maintainers; [ magenbluten ];
--- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  name = "cinny-desktop";
-  version = "2.2.3";
+  version = "2.2.4";

  src = fetchurl {
    url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb";
-    sha256 = "sha256-siEAIZ9cCIJZTkeZkvT5yrPjRGoOl7vjU98AUrhgJNw=";
+    sha256 = "sha256-ibUXNGgc23ndTqQKD0np5EH1T3xipVAmETbIy7akqkg=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
@ -21,7 +21,7 @@
 , libnatpmp
 , libpulseaudio
 , libupnp
-, libyamlcpp
+, yaml-cpp
 , msgpack
 , opendht-jami
 , openssl
@ -62,7 +62,7 @@ stdenv.mkDerivation {
    libnatpmp
    libpulseaudio
    libupnp
-    libyamlcpp
+    yaml-cpp
    msgpack
    opendht-jami
    openssl
--- a/pkgs/applications/science/biology/dcm2niix/default.nix
+++ b/pkgs/applications/science/biology/dcm2niix/default.nix
@ -4,7 +4,7 @@
 , substituteAll
 , cmake
 , openjpeg
-, libyamlcpp
+, yaml-cpp
 , batchVersion ? false
 , withJpegLs ? true
 , withOpenJpeg ? true
@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
  ];

  nativeBuildInputs = [ cmake ];
-  buildInputs = lib.optionals batchVersion [ libyamlcpp ]
+  buildInputs = lib.optionals batchVersion [ yaml-cpp ]
    ++ lib.optionals withOpenJpeg [ openjpeg openjpeg.dev ];

  cmakeFlags = lib.optionals batchVersion [
    "-DBATCH_VERSION=ON"
-    "-DYAML-CPP_DIR=${libyamlcpp}/lib/cmake/yaml-cpp"
+    "-DYAML-CPP_DIR=${yaml-cpp}/lib/cmake/yaml-cpp"
  ] ++ lib.optionals withJpegLs [
    "-DUSE_JPEGLS=ON"
  ] ++ lib.optionals withOpenJpeg [
--- a/pkgs/applications/science/chemistry/d-seams/default.nix
+++ b/pkgs/applications/science/chemistry/d-seams/default.nix
@ -1,4 +1,4 @@
-{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, libyamlcpp, cmake
+{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, yaml-cpp, cmake
 , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:

 clangStdenv.mkDerivation rec {
@ -20,7 +20,7 @@ clangStdenv.mkDerivation rec {
    })
  ];
  nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ];
-  buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ];
+  buildInputs = [ fmt rang yaml-cpp eigen catch2 boost gsl liblapack blas ];

  meta = with lib; {
    description =
--- a/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix
@ -5,7 +5,7 @@
 , libconfig
 , boost
 , libyaml
-, libyamlcpp
+, yaml-cpp
 , ncurses
 , gpm
 , enableAccelergy ? true
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    libconfig
    boost
    libyaml
-    libyamlcpp
+    yaml-cpp
    ncurses
    accelergy
   ] ++ lib.optionals stdenv.isLinux [ gpm ];
--- a/pkgs/applications/science/physics/nnpdf/default.nix
+++ b/pkgs/applications/science/physics/nnpdf/default.nix
@ -8,7 +8,7 @@
 , gsl
 , lhapdf
 , libarchive
-, libyamlcpp
+, yaml-cpp
 , python3
 , sqlite
 , swig
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
    gsl
    lhapdf
    libarchive
-    libyamlcpp
+    yaml-cpp
    python3
    python3.pkgs.numpy
    sqlite
--- a/pkgs/applications/science/physics/xfitter/default.nix
+++ b/pkgs/applications/science/physics/xfitter/default.nix
@ -13,7 +13,7 @@
 , lhapdf
 , libtirpc
 , libyaml
-, libyamlcpp
+, yaml-cpp
 , pkg-config
 , qcdnum
 , root
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake gfortran pkg-config ];
  buildInputs =
-    [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl libyamlcpp zlib ]
+    [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl yaml-cpp zlib ]
    ++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ]
    ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
    ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc
--- a/pkgs/applications/terminal-emulators/contour/default.nix
+++ b/pkgs/applications/terminal-emulators/contour/default.nix
@ -13,7 +13,7 @@
 , fmt
 , microsoft_gsl
 , range-v3
-, libyamlcpp
+, yaml-cpp
 , ncurses
 , file
 , darwin
@ -64,7 +64,7 @@ mkDerivation rec {
    fmt
    microsoft_gsl
    range-v3
-    libyamlcpp
+    yaml-cpp
  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];

  preConfigure = ''
--- a/pkgs/data/fonts/edwin/default.nix
+++ b/pkgs/data/fonts/edwin/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "edwin";
-  version = "0.52";
+  version = "0.54";

  src = fetchurl {
    url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz";
-    hash = "sha256-7yQUiLZupGc+RCZdhyO08JWqhROYqMOZ9wRdGJ6uixU=";
+    hash = "sha256-F6BzwnrsaELegdo6Bdju1OG+RI9zKnn4tIASR3q6zYk=";
  };

  installPhase = ''
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@ -7,7 +7,7 @@
 , cinnamon-session
 , cinnamon-translations
 , cjs
-, clutter
+, evolution-data-server
 , fetchFromGitHub
 , gdk-pixbuf
 , gettext
@ -23,6 +23,7 @@
 , libstartup_notification
 , libXtst
 , libXdamage
+, mesa
 , muffin
 , networkmanager
 , pkg-config
@ -52,6 +53,23 @@
 , perl
 }:

+let
+  pythonEnv = python3.withPackages (pp: with pp; [
+    dbus-python
+    setproctitle
+    pygobject3
+    pycairo
+    pp.xapp # don't omit `pp.`, see #213561
+    pillow
+    pyinotify # for looking-glass
+    pytz
+    tinycss2
+    python-pam
+    pexpect
+    distro
+    requests
+  ]);
+in
 stdenv.mkDerivation rec {
  pname = "cinnamon-common";
  version = "5.6.7";
@ -69,28 +87,14 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    (python3.withPackages (pp: with pp; [
-      dbus-python
-      setproctitle
-      pygobject3
-      pycairo
-      python3.pkgs.xapp # The scope prefix is required
-      pillow
-      pytz
-      tinycss2
-      python-pam
-      pexpect
-      distro
-      requests
-    ]))
    atk
    cacert
    cinnamon-control-center
    cinnamon-desktop
    cinnamon-menus
    cjs
-    clutter
    dbus
+    evolution-data-server # for calendar-server
    gdk-pixbuf
    glib
    gsound
@ -100,9 +104,11 @@ stdenv.mkDerivation rec {
    libstartup_notification
    libXtst
    libXdamage
+    mesa
    muffin
    networkmanager
    polkit
+    pythonEnv
    libxml2
    libgnomekbd
    gst_all_1.gstreamer
@ -151,9 +157,9 @@ stdenv.mkDerivation rec {

    sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py

-    sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py
+    sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py

-    sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+    sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py

    sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
      -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@ -101,12 +101,6 @@

 , ... } @ attrs:

-
-# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-if disabled
-then throw "${name} not supported for interpreter ${python.executable}"
-else
-
 let
  inherit (python) stdenv;

@ -114,6 +108,7 @@ let

  name_ = name;

+  # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
  self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
    "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
    "disabledTestPaths" "outputs"
@ -204,4 +199,7 @@ let
  passthru.updateScript = let
      filename = builtins.head (lib.splitString ":" self.meta.position);
    in attrs.passthru.updateScript or [ update-python-libraries filename ];
-in lib.extendDerivation true passthru self
+in lib.extendDerivation
+  (disabled -> throw "${name} not supported for interpreter ${python.executable}")
+  passthru
+  self
--- a/pkgs/development/libraries/ctre/default.nix
+++ b/pkgs/development/libraries/ctre/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "ctre";
-  version = "3.7.1";
+  version = "3.7.2";

  src = fetchFromGitHub {
    owner = "hanickadot";
    repo = "compile-time-regular-expressions";
    rev = "v${version}";
-    hash = "sha256-KqYBSY45x8FDQ0YgjrKoZdOiuhf33gv5w160/dSsSsg=";
+    hash = "sha256-pO6PW4oZsCA2xaMCsaJz2Bu203zyMUkbjO3OOBEbSiw=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
-  libyamlcpp, gtest, capnproto, pkg-config, plugins ? [ ] }:
+  yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }:

 let
  copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake pkg-config ];

-  buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ]
+  buildInputs = [ boost glog leveldb marisa opencc yaml-cpp gtest capnproto ]
              ++ plugins; # for propagated build inputs

  preConfigure = copyPlugins;
--- a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix
+++ b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix
@ -1,32 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "libyaml-cpp";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "jbeder";
-    repo = "yaml-cpp";
-    rev = "release-${version}";
-    sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8=";
-  };
-
-  # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \
-                'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})'
-  '';
-
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "A YAML parser and emitter for C++";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
-  };
-}
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@ -1,40 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
-
-stdenv.mkDerivation rec {
-  pname = "libyaml-cpp";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    owner = "jbeder";
-    repo = "yaml-cpp";
-    rev = "yaml-cpp-${version}";
-    sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
-  };
-
-  patches = [
-    # https://github.com/jbeder/yaml-cpp/issues/774
-    # https://github.com/jbeder/yaml-cpp/pull/1037
-    (fetchpatch {
-      url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
-      sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
-    })
-    # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available
-    (fetchpatch {
-      name = "libyaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patchj";
-      url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch";
-      sha256 = "12g5h7lxzd5v16ykay03zww5g28j3k69k228yr3v8fnmyv2spkfl";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "A YAML parser and emitter for C++";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
-  };
-}
--- a/pkgs/development/libraries/opencolorio/1.x.nix
+++ b/pkgs/development/libraries/opencolorio/1.x.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
  cmakeFlags = [
    "-DUSE_EXTERNAL_LCMS=ON"
    "-DUSE_EXTERNAL_TINYXML=ON"
-    # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
+    # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
    "-DUSE_EXTERNAL_YAML=OFF"
  ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
    ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@ -4,7 +4,7 @@
 , fetchpatch
 , cmake
 , expat
-, libyamlcpp
+, yaml-cpp
 , ilmbase
 , pystring
 , imath
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake ];
  buildInputs = [
    expat
-    libyamlcpp
+    yaml-cpp
    ilmbase
    pystring
    imath
--- a/pkgs/development/libraries/yaml-cpp/0.3.0.nix
+++ b/pkgs/development/libraries/yaml-cpp/0.3.0.nix
@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "yaml-cpp";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "jbeder";
+    repo = "yaml-cpp";
+    rev = "release-${version}";
+    hash = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  cmakeFlags = [
+    "-DYAML_CPP_BUILD_TOOLS=${lib.boolToString doCheck}"
+    "-DBUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  meta = with lib; {
+    description = "A YAML parser and emitter for C++";
+    homepage = "https://github.com/jbeder/yaml-cpp";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ OPNA2608 ];
+  };
+}
--- a/pkgs/development/libraries/yaml-cpp/default.nix
+++ b/pkgs/development/libraries/yaml-cpp/default.nix
@ -0,0 +1,61 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gitUpdater
+, cmake
+, fetchpatch
+}:
+
+stdenv.mkDerivation rec {
+  pname = "yaml-cpp";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "jbeder";
+    repo = "yaml-cpp";
+    rev = "yaml-cpp-${version}";
+    hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
+  };
+
+  patches = [
+    # https://github.com/jbeder/yaml-cpp/issues/774
+    # https://github.com/jbeder/yaml-cpp/pull/1037
+    (fetchpatch {
+      name = "yaml-cpp-Fix-generated-cmake-config.patch";
+      url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
+      hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
+    })
+    # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available
+    (fetchpatch {
+      name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch";
+      url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch";
+      hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk=";
+    })
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  cmakeFlags = [
+    "-DYAML_CPP_BUILD_TOOLS=false"
+    "-DYAML_BUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+    "-DINSTALL_GTEST=false"
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "yaml-cpp-";
+  };
+
+  meta = with lib; {
+    description = "A YAML parser and emitter for C++";
+    homepage = "https://github.com/jbeder/yaml-cpp";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ OPNA2608 ];
+  };
+}
--- a/pkgs/development/python-modules/abodepy/default.nix
+++ b/pkgs/development/python-modules/abodepy/default.nix
@ -1,26 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, colorlog, lomond
-, requests, isPy3k, requests-mock }:
-
-buildPythonPackage rec {
-  pname = "abodepy";
-  version = "1.2.2";
-
-  disabled = !isPy3k;
-
-  src = fetchFromGitHub {
-    owner = "MisterWil";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-GrvNCgWGGBbUUONwS18csh4/A0MMkSk5Z6LlDhlQqok=";
-  };
-
-  propagatedBuildInputs = [ colorlog lomond requests ];
-  nativeCheckInputs = [ pytestCheckHook requests-mock ];
-
-  meta = with lib; {
-    homepage = "https://github.com/MisterWil/abodepy";
-    description = "An Abode alarm Python library running on Python 3";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jamiemagee ];
-  };
-}
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@ -0,0 +1,73 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry-core
+, beautifulsoup4
+, boto3
+, lxml
+, pdoc
+, pytestCheckHook
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "bx-py-utils";
+  version = "75";
+
+  disabled = pythonOlder "3.9";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "boxine";
+    repo = "bx_py_utils";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+RHt5QTXxuaY1tDe1M66TrQfT9I7X56oVQAW36mzSwM=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  pythonImportsCheck = [
+    "bx_py_utils.anonymize"
+    "bx_py_utils.auto_doc"
+    "bx_py_utils.compat"
+    "bx_py_utils.dict_utils"
+    "bx_py_utils.environ"
+    "bx_py_utils.error_handling"
+    "bx_py_utils.file_utils"
+    "bx_py_utils.graphql_introspection"
+    "bx_py_utils.hash_utils"
+    "bx_py_utils.html_utils"
+    "bx_py_utils.iteration"
+    "bx_py_utils.path"
+    "bx_py_utils.processify"
+    "bx_py_utils.rison"
+    "bx_py_utils.stack_info"
+    "bx_py_utils.string_utils"
+    "bx_py_utils.test_utils"
+    "bx_py_utils.text_tools"
+  ];
+
+  nativeCheckInputs = [
+    beautifulsoup4
+    boto3
+    lxml
+    pdoc
+    pytestCheckHook
+    requests-mock
+  ];
+
+  disabledTestPaths = [
+    "bx_py_utils_tests/tests/test_project_setup.py"
+  ];
+
+  meta = {
+    description = "Various Python utility functions";
+    homepage = "https://github.com/boxine/bx_py_utils";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/findpython/default.nix
+++ b/pkgs/development/python-modules/findpython/default.nix
@ -15,7 +15,7 @@

 let
  pname = "findpython";
-  version = "0.2.3";
+  version = "0.2.4";
 in
 buildPythonPackage {
  inherit pname version;
@ -25,7 +25,7 @@ buildPythonPackage {

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-wmWo/p/QVzYDHu1uWK1VUWNO8IGaocHkX6NTDltqRlY=";
+    hash = "sha256-YfF2jN2EPcL4pFlxJyxYwlZBpQsZ2pEwLiSS4ypmc2I=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/jaraco-abode/default.nix
+++ b/pkgs/development/python-modules/jaraco-abode/default.nix
@ -0,0 +1,99 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, fetchPypi
+, fetchpatch
+, setuptools
+, setuptools-scm
+, requests
+, lomond
+, colorlog
+, keyring
+, requests-toolbelt
+, jaraco_collections
+, jaraco-context
+, jaraco_classes
+, jaraco-net
+, more-itertools
+, importlib-resources
+, bx-py-utils
+, platformdirs
+, jaraco_itertools
+, pytestCheckHook
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "jaraco-abode";
+  version = "3.2.1";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.abode";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E=";
+  };
+
+  patches = [
+    # https://github.com/jaraco/jaraco.abode/issues/19
+    (fetchpatch {
+      name = "specify-options-package-data.patch";
+      url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch";
+      hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  propagatedBuildInputs = [
+    requests
+    lomond
+    colorlog
+    keyring
+    requests-toolbelt
+    jaraco_collections
+    jaraco-context
+    jaraco_classes
+    jaraco-net
+    more-itertools
+    importlib-resources
+    bx-py-utils
+    platformdirs
+    jaraco_itertools
+  ];
+
+  pythonImportsCheck = [ "jaraco.abode" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  preCheck = ''
+    export HOME=$TEMP
+  '';
+
+  disabledTests = [
+    "_cookie_string"
+    "test_cookies"
+    "test_empty_cookies"
+    "test_invalid_cookies"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/jaraco/jaraco.abode";
+    description = "Library interfacing to the Abode home security system";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jamiemagee dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/jaraco-email/default.nix
+++ b/pkgs/development/python-modules/jaraco-email/default.nix
@ -0,0 +1,55 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, setuptools
+, setuptools-scm
+, jaraco_text
+, jaraco_collections
+, keyring
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "jaraco-email";
+  version = "3.1.0";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.email";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  propagatedBuildInputs = [
+    jaraco_text
+    jaraco_collections
+    keyring
+  ];
+
+  pythonImportsCheck = [ "jaraco.email" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/jaraco/jaraco.email/blob/${src.rev}/CHANGES.rst";
+    description = "E-mail facilities by jaraco";
+    homepage = "https://github.com/jaraco/jaraco.email";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/jaraco-net/default.nix
+++ b/pkgs/development/python-modules/jaraco-net/default.nix
@ -0,0 +1,97 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, setuptools
+, setuptools-scm
+, more-itertools
+, beautifulsoup4
+, mechanize
+, keyring
+, requests
+, feedparser
+, jaraco_text
+, jaraco_logging
+, jaraco-email
+, jaraco_functools
+, jaraco_collections
+, path
+, python-dateutil
+, pathvalidate
+, jsonpickle
+, ifconfig-parser
+, pytestCheckHook
+, cherrypy
+, importlib-resources
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "jaraco-net";
+  version = "9.3.0";
+
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "jaraco.net";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Ks8e3xPjIWgSO0PSpjMYftxAuDt3ilogoDFuJqfN74o=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  propagatedBuildInputs = [
+    more-itertools
+    beautifulsoup4
+    mechanize
+    keyring
+    requests
+    feedparser
+    jaraco_text
+    jaraco_logging
+    jaraco-email
+    jaraco_functools
+    jaraco_collections
+    path
+    python-dateutil
+    pathvalidate
+    jsonpickle
+  ] ++ lib.optionals stdenv.isDarwin [
+    ifconfig-parser
+  ];
+
+  pythonImportsCheck = [ "jaraco.net" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    cherrypy
+    importlib-resources
+    requests-mock
+  ];
+
+  disabledTestPaths = [
+    # doesn't actually contain tests
+    "fabfile.py"
+    # require networking
+    "jaraco/net/ntp.py"
+    "jaraco/net/scanner.py"
+    "tests/test_cookies.py"
+  ];
+
+  meta = {
+    changelog = "https://github.com/jaraco/jaraco.net/blob/${src.rev}/CHANGES.rst";
+    description = "Networking tools by jaraco";
+    homepage = "https://github.com/jaraco/jaraco.net";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/ovoenergy/default.nix
+++ b/pkgs/development/python-modules/ovoenergy/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "ovoenergy";
-  version = "1.3.0";
+  version = "1.3.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "timmo001";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-ZbLs8w0qeaV2qWP08FKnlZ3fefj15Bw2A2bGpL6/d0I=";
+    hash = "sha256-oeNwBmzlkE8JewSwuFG8OYigyispP4xdwO3s2CAcfW4=";
  };

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

 # psycopg-c
 , cython_3
+, tomli

 # docs
 , furo
@ -32,13 +33,13 @@

 let
  pname = "psycopg";
-  version = "3.1.3";
+  version = "3.1.8";

  src = fetchFromGitHub {
    owner = "psycopg";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-cAfFxUDgfI3KTlBU9wV/vQkPun4cR3se8eSIHHcEr4g=";
+    hash = "sha256-VmuotHcLWd+k8/GLv0N2wSZR0sZjY+TmGBQjhpYE3YA=";
  };

  patches = [
@ -70,9 +71,10 @@ let
    '';

    nativeBuildInputs = [
-      setuptools
      cython_3
      postgresql
+      setuptools
+      tomli
    ];

    # tested in psycopg
@ -96,7 +98,7 @@ let
      cd psycopg_pool
    '';

-    propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
+    propagatedBuildInputs = [
      typing-extensions
    ];

@ -181,10 +183,6 @@ buildPythonPackage rec {
    # don't depend on mypy for tests
    "test_version"
    "test_package_version"
-  ] ++ lib.optionals (stdenv.isDarwin) [
-    # racy test
-    "test_sched"
-    "test_sched_error"
  ];

  disabledTestPaths = [
@ -197,7 +195,8 @@ buildPythonPackage rec {
  ];

  pytestFlagsArray = [
-    "-o cache_dir=$TMPDIR"
+    "-o" "cache_dir=$TMPDIR"
+    "-m" "'not timing'"
  ];

  postCheck = ''
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "telethon";
-  version = "1.25.1";
+  version = "1.26.1";
  format = "pyproject";
  disabled = pythonOlder "3.5";

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "LonamiWebs";
    repo = "Telethon";
    rev = "refs/tags/v${version}";
-    hash = "sha256-xmFoCUqYo600RH72KWG/aM7hKGiTYdCBsbPOFipxIzA=";
+    hash = "sha256-RxnC+PVSnLeCZ1xap6n6CjpeA8Ig6oLGiB0LDxqUmsA=";
  };

  patchPhase = ''
--- a/pkgs/development/tools/datree/default.nix
+++ b/pkgs/development/tools/datree/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "datree";
-  version = "1.8.20";
+  version = "1.8.21";

  src = fetchFromGitHub {
    owner = "datreeio";
    repo = "datree";
    rev = "refs/tags/${version}";
-    hash = "sha256-w49nnWdmQuhXUpf35AK+fNRfJbRYLF6aflOUi3vjBOM=";
+    hash = "sha256-OURnQo38ofiDRu01GeEFTNiTYUeiDLMr1j28HzHVxds=";
  };

  vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA=";
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ginkgo";
-  version = "2.7.1";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "onsi";
    repo = "ginkgo";
    rev = "v${version}";
-    sha256 = "sha256-Ny0lZRNeQSJtxAURFnSuPNiUVWHE47GLbA1mtHgA3O4=";
+    sha256 = "sha256-KqDGnEvPGIRz41IMaHhmDWTMvTRVhGHwGDd8IpzxVDE=";
  };
  vendorHash = "sha256-jqDZmlCEgU4Nqc2vNH6NGdM74mywdVIj5v96tmRCvjQ=";

--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "golangci-lint";
-  version = "1.50.1";
+  version = "1.51.0";

  src = fetchFromGitHub {
    owner = "golangci";
    repo = "golangci-lint";
    rev = "v${version}";
-    sha256 = "sha256-7HoneQtKxjQVvaTdkjPeu+vJWVOZG3AOiRD87/Ntgn8=";
+    hash = "sha256-mmnzbgnu/S9DhFY5JQSs8U5tvsGqIcDaX5Y7dhCgr68=";
  };

-  vendorSha256 = "sha256-6ttRd2E8Zsf/2StNYt6JSC64A57QIv6EbwAwJfhTDaY=";
+  vendorHash = "sha256-QoUxZBl0wOpbD2xPCQAeTNiLxdtXZ3+KWB/TLSt53v4=";

  doCheck = false;

--- a/pkgs/development/tools/luaformatter/default.nix
+++ b/pkgs/development/tools/luaformatter/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }:

 let
  antlr4 = antlr4_9;
@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
    (substituteAll {
      src = ./fix-lib-paths.patch;
      antlr4RuntimeCpp = antlr4.runtime.cpp.dev;
-      inherit libargs catch2 libyamlcpp;
+      inherit libargs catch2 yaml-cpp;
    })
  ];

  nativeBuildInputs = [ cmake ];

-  buildInputs = [ antlr4.runtime.cpp libyamlcpp ];
+  buildInputs = [ antlr4.runtime.cpp yaml-cpp ];

  meta = with lib; {
    description = "Code formatter for Lua";
--- a/pkgs/development/tools/luaformatter/fix-lib-paths.patch
+++ b/pkgs/development/tools/luaformatter/fix-lib-paths.patch
@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644
 -  ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src
 +  @libargs@/include
 +  @catch2@/include
-+  @libyamlcpp@/include
+  @yaml-cpp@/include
 +  @antlr4RuntimeCpp@/include/antlr4-runtime
   ${PROJECT_SOURCE_DIR}/src/
   )
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "circleci-cli";
-  version = "0.1.23241";
+  version = "0.1.23272";

  src = fetchFromGitHub {
    owner = "CircleCI-Public";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-GpW7mSmUSp1lLgPJmSGmAzYTn2vPsJKorTNQVAHKwU0=";
+    sha256 = "sha256-Yj7bIVVCG2q6Q2ij+rH3AAC4xW7Drz+pmdIM2ToPJX4=";
  };

  vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY=";
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@ -15,16 +15,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "texlab";
-  version = "5.1.0";
+  version = "5.2.0";

  src = fetchFromGitHub {
    owner = "latex-lsp";
    repo = "texlab";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-rTRUiRL8zGZ6F1hzCPpsakXkxSrumLRRNd+CykXw0vo=";
+    sha256 = "sha256-OHfJJ3Oth6mu3UQkZeTcbxaivduIuZzmrMmkWQ8FB/4=";
  };

-  cargoSha256 = "sha256-c7/5koNdIaQx4x54qvaKI/mdioPICAjrvRhi1Jzxpu0=";
+  cargoSha256 = "sha256-Vqm8KBNABYuRsn3HviRw93BQqPUj9EHD9L+ddUb1X+M=";

  outputs = [ "out" ] ++ lib.optional (!isCross) "man";

@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
  # generate the man page
  postInstall = lib.optionalString (!isCross) ''
    # TexLab builds man page separately in CI:
-    # https://github.com/latex-lsp/texlab/blob/v5.1.0/.github/workflows/publish.yml#L127-L131
+    # https://github.com/latex-lsp/texlab/blob/v5.2.0/.github/workflows/publish.yml#L127-L131
    help2man --no-info "$out/bin/texlab" > texlab.1
    installManPage texlab.1
  '';
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@ -7,7 +7,7 @@
 , libGL
 , zlib
 , openssl
-, libyamlcpp
+, yaml-cpp
 , boost
 , SDL
 , SDL_image
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake pkg-config ];

-  buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ];
+  buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost yaml-cpp libGLU libGL openssl zlib ];

  meta = with lib; {
    description = "Open source clone of UFO: Enemy Unknown";
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@ -4,16 +4,16 @@ let
  # comments with variant added for update script
  # ./update-zen.py zen
  zenVariant = {
-    version = "6.1.8"; #zen
+    version = "6.1.9"; #zen
    suffix = "zen1"; #zen
-    sha256 = "1n7b21mw326j35fw1wb53ws5wghy005mgllvspav8vc3mxm729ps"; #zen
+    sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen
    isLqx = false;
  };
  # ./update-zen.py lqx
  lqxVariant = {
-    version = "6.1.8"; #lqx
+    version = "6.1.9"; #lqx
    suffix = "lqx1"; #lqx
-    sha256 = "06q5a2p6m5r891pkgisbj8irgv09qb77lnjc26gh4nyc9qzg2d3f"; #lqx
+    sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx
    isLqx = true;
  };
  zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
 , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
-, libyamlcpp, nlohmann_json, re2
+, yaml-cpp, nlohmann_json, re2
 }:

 let
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
    re2
    protobuf
    grpc
-    libyamlcpp
+    yaml-cpp
    jsoncpp
    nlohmann_json
  ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
--- a/pkgs/servers/dns/pdns/default.nix
+++ b/pkgs/servers/dns/pdns/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, nixosTests
-, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
+, boost, yaml-cpp, libsodium, sqlite, protobuf, openssl, systemd
 , mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb
 }:

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip
-    libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb
+    yaml-cpp libsodium curl unixODBC openssl systemd lmdb tinycdb
  ];

  # Configure phase requires 64-bit time_t even on 32-bit platforms.
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -7,7 +7,8 @@
    "3_day_blinds" = ps: with ps; [
    ];
    "abode" = ps: with ps; [
-    ]; # missing inputs: jaraco.abode
+      jaraco-abode
+    ];
    "accuweather" = ps: with ps; [
      accuweather
    ];
@ -4427,6 +4428,7 @@
  };
  # components listed in tests/components for which all dependencies are packaged
  supportedComponentsWithTests = [
+    "abode"
    "accuweather"
    "acmeda"
    "adax"
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@ -23,7 +23,7 @@
 , libxcb
 , libxkbcommon
 , libxmlxx
-, libyamlcpp
+, yaml-cpp
 , lttng-ust
 , mesa
 , nettle
@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
    libxcb
    libxkbcommon
    libxmlxx
-    libyamlcpp
+    yaml-cpp
    lttng-ust
    mesa
    nettle
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@ -7,7 +7,7 @@
 , pcre-cpp
 , snappy
 , zlib
-, libyamlcpp
+, yaml-cpp
 , sasl
 , openssl
 , libpcap
@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
    curl
    gperftools
    libpcap
-    libyamlcpp
+    yaml-cpp
    openssl
    pcre-cpp
    variants.python
--- a/pkgs/servers/scylladb/default.nix
+++ b/pkgs/servers/scylladb/default.nix
@ -19,7 +19,7 @@
  protobuf,
  cryptopp,
  libxfs,
-  libyamlcpp,
+  yaml-cpp,
  libsystemtap,
  lksctp-tools,
  lz4,
@ -64,7 +64,7 @@ gcc8Stdenv.mkDerivation {
   protobuf
   cryptopp
   libxfs
-   libyamlcpp
+   yaml-cpp
   libsystemtap
   lksctp-tools
   lz4
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "unrar";
-  version = "6.2.3";
+  version = "6.2.5";

  src = fetchurl {
    url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    hash = "sha256-Egk25B+CbNY9d6WArupkwbef0+JDT1jOgYTng7UeWwE=";
+    hash = "sha256-mjl0QQ0dNA45mN0qb5j6776DjK1VYmbnFK37Doz5N3w=";
  };

  postPatch = ''
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp,
+{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, yaml-cpp,
  libevdev, udev, boost }:

 stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ libevdev udev libyamlcpp boost ];
+  buildInputs = [ libevdev udev yaml-cpp boost ];

  meta = {
    description = "A minimal composable infrastructure on top of libudev and libevdev";
--- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
+++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }:
+{ stdenv, lib, fetchFromGitLab, pkg-config, yaml-cpp, libevdev }:

 stdenv.mkDerivation rec {
  pname = "dual-function-keys";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ libevdev libyamlcpp ];
+  buildInputs = [ libevdev yaml-cpp ];

  prePatch = ''
    substituteInPlace config.mk --replace \
--- a/pkgs/tools/inputmethods/lisgd/default.nix
+++ b/pkgs/tools/inputmethods/lisgd/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "lisgd";
-  version = "0.3.6";
+  version = "0.3.7";

  src = fetchFromSourcehut {
    owner = "~mil";
    repo = "lisgd";
    rev = version;
-    hash = "sha256-VH+wZyVnfPqFxRwITU/LzkOAexFKm39LlcFxzhjRMdY=";
+    hash = "sha256-3kmGpgZpCH7CkN+d1+5ygXOi8E0Ojcgw6Fbd0T9z7z0=";
  };

  inherit patches;
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@ -1,5 +1,5 @@
 { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2
-, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python
+, kservice, libatasmart, libxcb, yaml-cpp, libpwquality, parted, polkit-qt, python
 , qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata
 , ckbcomp, xkeyboard_config, mkDerivation
 , nixos-extensions ? false
@ -43,7 +43,7 @@ mkDerivation rec {
  nativeBuildInputs = [ cmake extra-cmake-modules ];
  buildInputs = [
    boost kparts.dev kpmcore.out kservice.dev kirigami2
-    libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python
+    libatasmart libxcb yaml-cpp libpwquality parted polkit-qt python
    qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
  ];

--- a/pkgs/tools/misc/coreboot-configurator/default.nix
+++ b/pkgs/tools/misc/coreboot-configurator/default.nix
@ -5,7 +5,7 @@
 , meson
 , ninja
 , pkg-config
-, libyamlcpp
+, yaml-cpp
 , nvramtool
 , qtbase
 , qtsvg
@ -24,7 +24,7 @@ stdenv.mkDerivation {
  };

  nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ];
-  buildInputs = [ libyamlcpp qtbase qtsvg ];
+  buildInputs = [ yaml-cpp qtbase qtsvg ];

  postPatch = ''
    substituteInPlace src/application/*.cpp \
--- a/pkgs/tools/misc/torrenttools/default.nix
+++ b/pkgs/tools/misc/torrenttools/default.nix
@ -10,7 +10,7 @@
 , fmt
 , gsl-lite
 , howard-hinnant-date
-, libyamlcpp
+, yaml-cpp
 , ninja
 , nlohmann_json
 , openssl
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
    fmt
    gsl-lite
    howard-hinnant-date
-    libyamlcpp
+    yaml-cpp
    nlohmann_json
    openssl
    re2
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libyamlcpp, systemd
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd
 , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
 , libxml2, docbook5
 }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
    systemd
  ];

-  buildInputs = [ libyamlcpp ];
+  buildInputs = [ yaml-cpp ];

  doCheck = true;

--- a/pkgs/tools/networking/sing-box/default.nix
+++ b/pkgs/tools/networking/sing-box/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "sing-box";
-  version = "1.1.4";
+  version = "1.1.5";

  src = fetchFromGitHub {
    owner = "SagerNet";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-OH4tuSnMdrJSkD7vxEA8dpQxWqh6bUXCOJ/y0fe2pME=";
+    hash = "sha256-FEwyJL6pFdp9vXIq1TUFGGDfKefFsVaajjX2U0R5Vog=";
  };

-  vendorHash = "sha256-kCNtbtDnB7JZzsfUd2yMDi+pascHfxIbPVMwUVsP78g=";
+  vendorHash = "sha256-QTk4kKPPOhnCf/1NhWObwf8EsZC+k0EtdSBecD6jq04=";

  tags = [
    "with_quic"
--- a/pkgs/tools/package-management/micromamba/default.nix
+++ b/pkgs/tools/package-management/micromamba/default.nix
@ -9,7 +9,7 @@
 , ghc_filesystem
 , libarchive
 , libsolv
-, libyamlcpp
+, yaml-cpp
 , nlohmann_json
 , python3
 , reproc
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
    nlohmann_json
    curl
    libarchive
-    libyamlcpp
+    yaml-cpp
    libsolv'
    reproc
    spdlog'
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }:
+{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, yaml-cpp, openssl, ruby, util-linux }:

 stdenv.mkDerivation rec {
  pname = "facter";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  NIX_CFLAGS_COMPILE = "-Wno-error";

  nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ];
+  buildInputs = [ boost cpp-hocon curl leatherman libwhereami yaml-cpp openssl ruby util-linux ];

  meta = with lib; {
    homepage = "https://github.com/puppetlabs/facter";
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, libyamlcpp
+, yaml-cpp
 , pkg-config
 , procps
 , coreutils
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake pkg-config ];

-  buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart;
+  buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart;

  meta = {
    description = "A simple, lightweight fan control program";
--- a/pkgs/tools/virtualization/govc/default.nix
+++ b/pkgs/tools/virtualization/govc/default.nix
@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "govc";
-  version = "0.30.1";
+  version = "0.30.2";

  subPackages = [ "govc" ];

@ -10,7 +10,7 @@ buildGoModule rec {
    rev = "v${version}";
    owner = "vmware";
    repo = "govmomi";
-    sha256 = "sha256-hG+yaaSmABosCIkVPLzv0J5VnoPaYqCMpDingQ1apEs=";
+    sha256 = "sha256-Jt71nrviElNj5UjWzdP51x3My59KAT+EtrQfodR3GfA=";
  };

  vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";
--- a/pkgs/tools/wayland/way-displays/default.nix
+++ b/pkgs/tools/wayland/way-displays/default.nix
@ -4,7 +4,7 @@
 , pkg-config
 , wayland
 , libinput
-, libyamlcpp
+, yaml-cpp
 }:

 stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    wayland
-    libyamlcpp
+    yaml-cpp
    libinput
  ];

--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -828,6 +828,8 @@ mapAliases ({
  libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22
  libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22
  libwnck3 = libwnck;
+  libyamlcpp = yaml-cpp; # Added 2023-01-29
+  libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
  lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
  lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15
  lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -21930,9 +21930,9 @@ with pkgs;

  libyaml = callPackage ../development/libraries/libyaml { };

-  libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
+  yaml-cpp = callPackage ../development/libraries/yaml-cpp { };

-  libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { };
+  yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };

  libyang = callPackage ../development/libraries/libyang { };

@ -31922,9 +31922,7 @@ with pkgs;

  organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { };

-  osm2xmap = callPackage ../applications/misc/osm2xmap {
-    libyamlcpp = libyamlcpp_0_3;
-  };
+  osm2xmap = callPackage ../applications/misc/osm2xmap { };

  osmctools = callPackage ../applications/misc/osmctools { };

--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -33,6 +33,7 @@ in
  ### Deprecated aliases - for backward compatibility

 mapAliases ({
+  abodepy = jaraco-abode; # added 2023-02-01
  aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
  ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
  anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -18,8 +18,6 @@ self: super: with self; {

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

-  abodepy = callPackage ../development/python-modules/abodepy { };
-
  absl-py = callPackage ../development/python-modules/absl-py { };

  accuweather = callPackage ../development/python-modules/accuweather { };
@ -1487,6 +1485,8 @@ self: super: with self; {

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

+  bx-py-utils = callPackage ../development/python-modules/bx-py-utils { };
+
  bx-python = callPackage ../development/python-modules/bx-python { };

  bwapy = callPackage ../development/python-modules/bwapy { };
@ -4788,10 +4788,14 @@ self: super: with self; {

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

+  jaraco-abode = callPackage ../development/python-modules/jaraco-abode { };
+
  jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };

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

+  jaraco-email = callPackage ../development/python-modules/jaraco-email { };
+
  jaraco-context = callPackage ../development/python-modules/jaraco-context { };

  jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
@ -4800,6 +4804,8 @@ self: super: with self; {

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

+  jaraco-net = callPackage ../development/python-modules/jaraco-net { };
+
  jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };

  jaraco-test = callPackage ../development/python-modules/jaraco-test { };