Merge staging-next into staging

2025-01-28 00:14:58 +00:00
parent 7ce527cf44 a6df8fd654
commit 41d4ce7026
104 changed files with 608 additions and 911 deletions
@@ -22994,6 +22994,12 @@
    githubId = 5409166;
    name = "Rishi Desai";
  };
+  therobot2105 = {
+    email = "felix.kimmel@web.de";
+    github = "TheRobot2105";
+    githubId = 91203390;
+    name = "Felix Kimmel";
+  };
  thesola10 = {
    email = "me@thesola.io";
    github = "Thesola10";
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/wsa13yx6kl6zzjlhjb8vmcqb6msbxym3-nix-2.24.11";
-  i686-linux = "/nix/store/rn1449hjxh77f723m5rc1skgv4paknic-nix-2.24.11";
-  aarch64-linux = "/nix/store/psrkach0v2s66rw30nxzpz7hgsqrvg28-nix-2.24.11";
-  riscv64-linux = "/nix/store/zc8clmxxi9zr7vx7y8v8kg1rsmhwsp42-nix-riscv64-unknown-linux-gnu-2.24.11";
-  x86_64-darwin = "/nix/store/nc81g85wlkzqck5mxdfbnxscavg2xh09-nix-2.24.11";
-  aarch64-darwin = "/nix/store/nqzxb4h7sbkk6876zx8yc88ahlgl5kkl-nix-2.24.11";
+  x86_64-linux = "/nix/store/kwck2vdfdp2v4jr9c4daryyk9mlbx406-nix-2.24.12";
+  i686-linux = "/nix/store/s9qqyxzcgjl7xrfhnnjiiy9v876pcphi-nix-2.24.12";
+  aarch64-linux = "/nix/store/pmj4g05d4nlr3gcr8nyadgwir3svbkmx-nix-2.24.12";
+  riscv64-linux = "/nix/store/nzr3m4x3mcnfpnmyap31f9pviwv29vyc-nix-riscv64-unknown-linux-gnu-2.24.12";
+  x86_64-darwin = "/nix/store/pf6msb0yzccznd75yil32mzk284h90z4-nix-2.24.12";
+  aarch64-darwin = "/nix/store/vaaakw66qnbw4g007rf2nggy0rmhf8fh-nix-2.24.12";
 }
@@ -3,6 +3,7 @@
 with lib;
 let
  cfg = config.services.freshrss;
+  webserver = config.services.${cfg.webserver};

  extension-env = pkgs.buildEnv {
    name = "freshrss-extensions";
@@ -129,13 +130,25 @@ in
      example = "/mnt/freshrss";
    };

+    webserver = mkOption {
+      type = types.enum [ "nginx" "caddy" "none"];
+      default = "nginx";
+      description = ''
+        Whether to use nginx or caddy for virtual host management.
+
+        Further nginx configuration can be done by adapting `services.nginx.virtualHosts.<name>`.
+        See [](#opt-services.nginx.virtualHosts) for further information.
+
+        Further caddy configuration can be done by adapting `services.caddy.virtualHosts.<name>`.
+        See [](#opt-services.caddy.virtualHosts) for further information.
+      '';
+    };
+
    virtualHost = mkOption {
-      type = types.nullOr types.str;
+      type = types.str;
      default = "freshrss";
      description = ''
-        Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
-        You may need to configure the virtualhost further through services.nginx.virtualHosts.<virtualhost>,
-        for example to enable SSL.
+        Name of the caddy/nginx virtualhost to use and setup.
      '';
    };

@@ -204,8 +217,21 @@ in
          '';
        }
      ];
+
+      # Set up a Caddy virtual host.
+      services.caddy = mkIf (cfg.webserver == "caddy") {
+        enable = true;
+        virtualHosts.${cfg.virtualHost}.extraConfig = ''
+          root * ${config.services.freshrss.package}/p
+          php_fastcgi unix/${config.services.phpfpm.pools.freshrss.socket} {
+            env FRESHRSS_DATA_PATH ${config.services.freshrss.dataDir}
+          }
+          file_server
+        '';
+      };
+
      # Set up a Nginx virtual host.
-      services.nginx = mkIf (cfg.virtualHost != null) {
+      services.nginx = mkIf (cfg.webserver == "nginx") {
        enable = true;
        virtualHosts.${cfg.virtualHost} = {
          root = "${cfg.package}/p";
@@ -237,8 +263,8 @@ in
        ${cfg.pool} = {
          user = "freshrss";
          settings = {
-            "listen.owner" = "nginx";
-            "listen.group" = "nginx";
+            "listen.owner" = webserver.user;
+            "listen.group" = webserver.group;
            "listen.mode" = "0600";
            "pm" = "dynamic";
            "pm.max_children" = 32;
@@ -109,7 +109,7 @@ in {
          }
        '';
        description = ''
-          With this option, you can customize an nginx virtual host which already has sensible defaults for Dolibarr.
+          With this option, you can customize an nginx virtual host which already has sensible defaults for Pixelfed.
          Set to {} if you do not need any customization to the virtual host.
          If enabled, then by default, the {option}`serverName` is
          `''${domain}`,
@@ -0,0 +1,30 @@
+import ../make-test-python.nix (
+  { lib, pkgs, ... }:
+  {
+    name = "freshrss-caddy-sqlite";
+    meta.maintainers = with lib.maintainers; [
+      etu
+      stunkymonkey
+    ];
+
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        services.freshrss = {
+          enable = true;
+          baseUrl = "http://localhost";
+          passwordFile = pkgs.writeText "password" "secret";
+          dataDir = "/srv/freshrss";
+          webserver = "caddy";
+          virtualHost = "freshrss:80";
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_open_port(80)
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
+      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
+    '';
+  }
+)
@@ -5,5 +5,6 @@
  http-auth = import ./http-auth.nix { inherit system pkgs; };
  none-auth = import ./none-auth.nix { inherit system pkgs; };
  pgsql = import ./pgsql.nix { inherit system pkgs; };
-  sqlite = import ./sqlite.nix { inherit system pkgs; };
+  nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; };
+  caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; };
 }
@@ -17,7 +17,7 @@ import ../make-test-python.nix (
    testScript = ''
      machine.wait_for_unit("multi-user.target")
      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/?c=extension")
+      response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
      assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
    '';
  }
@@ -18,7 +18,7 @@ import ../make-test-python.nix (
    testScript = ''
      machine.wait_for_unit("multi-user.target")
      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")
      assert 'Account: testuser' in response, "http_auth method didn't work."
    '';
  }
@@ -1,7 +1,7 @@
 import ../make-test-python.nix (
  { lib, pkgs, ... }:
  {
-    name = "freshrss-sqlite";
+    name = "freshrss-nginx-sqlite";
    meta.maintainers = with lib.maintainers; [
      etu
      stunkymonkey
@@ -21,7 +21,7 @@ import ../make-test-python.nix (
    testScript = ''
      machine.wait_for_unit("multi-user.target")
      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
    '';
  }
@@ -17,7 +17,7 @@ import ../make-test-python.nix (
    testScript = ''
      machine.wait_for_unit("multi-user.target")
      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s http://localhost:80/i/")
      assert '<title>Main stream · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"
    '';
  }
@@ -47,7 +47,7 @@ import ../make-test-python.nix (
      machine.wait_for_unit("multi-user.target")
      machine.wait_for_open_port(5432)
      machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
    '';
  }
@@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
  };

-  cargoHash = "sha256-GScAUqALoocqvsHz4XgPytI8cl0hiuWjqaO/ItNo4v4=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";

  nativeBuildInputs =
    [
@@ -6529,18 +6529,6 @@ final: prev:
    meta.homepage = "https://github.com/nvim-java/lua-async/";
  };

-  lua-async-await = buildVimPlugin {
-    pname = "lua-async-await";
-    version = "2024-03-31";
-    src = fetchFromGitHub {
-      owner = "nvim-java";
-      repo = "lua-async";
-      rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98";
-      sha256 = "0jpw9008xghqmzjnikwq417p497lj7v9hkjbrach5p652yca07s8";
-    };
-    meta.homepage = "https://github.com/nvim-java/lua-async/";
-  };
-
  lualine-lsp-progress = buildVimPlugin {
    pname = "lualine-lsp-progress";
    version = "2021-10-23";
@@ -2255,7 +2255,7 @@ in

  nvim-java = super.nvim-java.overrideAttrs {
    dependencies = with self; [
-      lua-async-await
+      lua-async
      mason-nvim
      nui-nvim
      nvim-dap
@@ -2384,6 +2384,22 @@ let
        };
      };

+      hirse.vscode-ungit = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-ungit";
+          publisher = "hirse";
+          version = "2.5.2";
+          hash = "sha256-0CFYL6rBecB8rNnk4IAtg03ZPdSJ9qxwnVdhdQedxsQ=";
+        };
+        meta = {
+          description = "Ungit in Visual Studio Code.";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=Hirse.vscode-ungit";
+          homepage = "https://github.com/hirse/vscode-ungit";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.therobot2105 ];
+        };
+      };
+
      hiukky.flate = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "flate";
@@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}:
 in rec {

  stable = fetchurl rec {
-    version = "9.0";
-    url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
-    hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
+    version = "10.0";
+    url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
+    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";

    ## see http://wiki.winehq.org/Gecko
    gecko32 = fetchurl rec {
@@ -69,9 +69,9 @@ in rec {

  unstable = fetchurl rec {
    # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.0-rc5";
+    version = "10.0";
    url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
-    hash = "sha256-7IlPe1wH0tTCHVNNf0OUZnuO8ngH4w4hKJhpp02XbtI=";
+    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";
    inherit (stable) patches;

    ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
  staging = fetchFromGitLab rec {
    # https://gitlab.winehq.org/wine/wine-staging
    inherit (unstable) version;
-    hash = "sha256-no+yYF/xhy0kRfBqPer0UbpJNEh9LtKCmyVvhQB58K4=";
+    hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4=";
    domain = "gitlab.winehq.org";
    owner = "wine";
    repo = "wine-staging";
@@ -126,35 +126,7 @@ in rec {
    disabledPatchsets = [ ];
  };

-  wayland = fetchFromGitLab {
-    # https://gitlab.collabora.com/alf/wine/-/tree/wayland
-    version = "8.2";
-    hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo=";
-    domain = "gitlab.collabora.com";
-    owner = "alf";
-    repo = "wine";
-    rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536";
-
-    inherit (unstable) gecko32 gecko64;
-
-    inherit (unstable) mono;
-
-    updateScript = writeShellScript "update-wine-wayland" ''
-      ${updateScriptPreamble}
-      wayland_rev=$(get_source_attr wayland.rev)
-
-      latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id)
-
-      if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then
-          latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ')
-          wayland_url=$(get_source_attr wayland.url)
-          set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")"
-          set_source_attr wayland rev "\"$latest_wayland_rev\""
-      fi
-
-      do_update
-    '';
-  };
+  wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23

  winetricks = fetchFromGitHub rec {
    # https://github.com/Winetricks/winetricks/releases
@@ -6,18 +6,14 @@
  threadweaver,
  ktexteditor,
  kdevelop-unwrapped,
-  python39,
+  python3,
 }:
-let
-  # FIXME: stick with python 3.9 until MR supporting 3.10 is ready:
-  # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16
-  python = python39;
-in
-mkDerivation rec {
+
+mkDerivation {
  pname = "kdev-python";

  cmakeFlags = [
-    "-DPYTHON_EXECUTABLE=${python}/bin/python"
+    "-DPYTHON_EXECUTABLE=${lib.getExe python3}"
  ];

  nativeBuildInputs = [
@@ -9,13 +9,13 @@

 buildMozillaMach rec {
  pname = "firefox-devedition";
-  version = "135.0b4";
+  version = "135.0b9";
  applicationName = "Mozilla Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "d3ee20d264c4c26308b814f4cc997349a6df32da17b9a29514b0504f7548606f4b6793ccd2e7464babf6588f13bfcc0e0641f9ac8d620f7da7d7e45684fdf775";
+    sha512 = "bf09f999b347492b841a26fcbcfb4d37e5f74528a05ffab47572dcaae01cb43e70baf58e83cc5153498a6a6ad2cb69507b628fba840090c91f4dbca62717a435";
  };

  meta = {
@@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "treesheets";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-16";

  src = fetchFromGitHub {
    owner = "aardappel";
    repo = "treesheets";
-    rev = "89b40de858f598975098a0436637bca8357a4a86";
-    hash = "sha256-kduZ+1EYxwuKAIVNBg9u32UD463gpBIjcxSj1FgvIIg=";
+    rev = "f8edf8abe4d7f18528cec6460831d34ee30881e3";
+    hash = "sha256-6EwlpdbLEBu5oUQx6IawaFMkBbmfoRb+lZMZiVLAk8k=";
  };

  nativeBuildInputs = [
@@ -74,8 +74,9 @@ let
  buildType = "release";
  # Use maintainers/scripts/update.nix to update the version and all related hashes or
  # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.1.4";
-  virtualboxSha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e";
+  virtualboxVersion = "7.1.6";
+  virtualboxSubVersion = "a";
+  virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";

  kvmPatchVersion = "20241220";
  kvmPatchHash = "sha256-SYyD79iN6Sp/Mxat+ml3fee9X1vFUFyrwHPnQNboc1c=";
@@ -84,7 +85,9 @@ let
  # modsrc at all.
  withModsrc = !enableKvm;

-  virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { };
+  virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix {
+    inherit virtualboxVersion;
+  };

  inherit (lib)
    optional
@@ -104,11 +107,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "virtualbox";
-  version = finalAttrs.virtualboxVersion;
+  version = "${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}";

  inherit
    buildType
    virtualboxVersion
+    virtualboxSubVersion
    virtualboxSha256
    kvmPatchVersion
    kvmPatchHash
@@ -116,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
    ;

  src = fetchurl {
-    url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2";
+    url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}.tar.bz2";
    sha256 = finalAttrs.virtualboxSha256;
  };

@@ -4,17 +4,17 @@
  virtualbox,
 }:
 let
-  inherit (virtualbox) version;
+  virtualboxExtPackVersion = "7.1.6";
 in
 fetchurl rec {
-  name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack";
-  url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
+  name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
+  url = "https://download.virtualbox.org/virtualbox/${virtualboxExtPackVersion}/${name}";
  sha256 =
    # Manually sha256sum the extensionPack file, must be hex!
    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
    # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
    let
-      value = "9dd60ef3c52c2a318fbbb6faace5862a299b61f678a579988869865dcf7390b6";
+      value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b";
    in
    assert (builtins.stringLength value) == 64;
    value;
@@ -1,15 +1,11 @@
 {
  fetchurl,
  lib,
-  virtualbox,
+  virtualboxVersion,
 }:
-
-let
-  inherit (virtualbox) version;
-in
 fetchurl {
-  url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-  sha256 = "80c91d35742f68217cf47b13e5b50d53f54c22c485bacce41ad7fdc321649e61";
+  url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
+  sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc";
  meta = {
    description = "Guest additions ISO for VirtualBox";
    longDescription = ''
@@ -20,19 +20,23 @@
  makeself,
  linuxHeaders,
  openssl,
+  virtualboxVersion,
+  virtualboxSubVersion,
+  virtualboxSha256,
 }:

 let
  buildType = "release";
-
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "VirtualBox-GuestAdditions-builder-${kernel.version}";
-  version = "7.1.4";
+  version = "${virtualboxVersion}${virtualboxSubVersion}";
+
+  inherit virtualboxVersion virtualboxSubVersion;

  src = fetchurl {
-    url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2";
-    sha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e";
+    url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}.tar.bz2";
+    sha256 = virtualboxSha256;
  };

  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
@@ -12,7 +12,13 @@
  libX11,
 }:
 let
-  virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { };
+  virtualboxVersion = "7.1.6";
+  virtualboxSubVersion = "a";
+  virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";
+
+  virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
+    inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;
+  };

  # Specifies how to patch binaries to make sure that libraries loaded using
  # dlopen are found. We grep binaries for specific library names and patch
@@ -46,7 +52,7 @@ let
 in
 stdenv.mkDerivation {
  pname = "VirtualBox-GuestAdditions";
-  version = "${virtualBoxNixGuestAdditionsBuilder.version}-${kernel.version}";
+  version = "${virtualboxVersion}${virtualboxSubVersion}-${kernel.version}";

  src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${
    if stdenv.hostPlatform.is32bit then "x86" else "amd64"
@@ -70,7 +76,7 @@ stdenv.mkDerivation {
    runHook preBuild

    # Build kernel modules.
-    cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS
+    cd src/vboxguest-${virtualboxVersion}_NixOS
    # Run just make first. If we only did make install, we get symbol warnings during build.
    make
    cd ../..
@@ -102,7 +108,7 @@ stdenv.mkDerivation {
    mkdir -p $out/bin

    # Install kernel modules.
-    cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS
+    cd src/vboxguest-${virtualboxVersion}_NixOS
    make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers
    cd ../..

@@ -29,19 +29,23 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then
  virtualboxNixFile=$(nixFile ${attr})
  extpackNixFile=$(nixFile ${attr}Extpack)
  guestAdditionsIsoNixFile="pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix"
-  virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix"
+  virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/default.nix"

  virtualBoxOldShaSum=$(oldHash ${attr}Extpack)
  extpackOldShaSum=$(oldHash ${attr}Extpack)

-  sed -e "s/virtualboxVersion =.*;/virtualboxVersion = \"$latestVersion\";/g" \
-      -e "s/virtualboxSha256 =.*;/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \
+  sed -e "s/virtualboxVersion = \".*\";/virtualboxVersion = \"$latestVersion\";/g" \
+      -e "s/virtualboxSubVersion = \".*\";/virtualboxSubVersion = \"\";/g" \
+      -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \
      -i "$virtualboxNixFile"
-  sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile
-  sed -e "s/sha256 =.*;/sha256 = \"$guestAdditionsIsoShaSum\";/g" \
+  sed -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' \
+      -e "s/virtualboxExtPackVersion = \".*\";/virtualboxExtPackVersion = \"$latestVersion\";/g" \
+      -i $extpackNixFile
+  sed -e "s/sha256 = \".*\";/sha256 = \"$guestAdditionsIsoShaSum\";/g" \
      -i "$guestAdditionsIsoNixFile"
-  sed -e "s/version =.*;/version = \"$latestVersion\";/g" \
-      -e "s/sha256 =.*;/sha256 = \"$virtualBoxShaSum\";/g" \
+  sed -e "s/virtualboxVersion = \".*\";/virtualboxVersion = \"$latestVersion\";/g" \
+      -e "s/virtualboxSubVersion = \".*\";/virtualboxSubVersion = \"\";/g" \
+      -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \
      -i "$virtualboxGuestAdditionsNixFile"

  git add "$virtualboxNixFile" "$extpackNixFile" "$guestAdditionsIsoNixFile" "$virtualboxGuestAdditionsNixFile"
@@ -2,7 +2,6 @@
  lib,
  buildGoModule,
  fetchFromSourcehut,
-  fetchpatch,
  ncurses,
  notmuch,
  scdoc,
@@ -10,6 +9,8 @@
  w3m,
  dante,
  gawk,
+  versionCheckHook,
+  nix-update-script,
 }:

 buildGoModule rec {
@@ -31,9 +32,7 @@ buildGoModule rec {
    python3Packages.wrapPython
  ];

-  patches = [
-    ./runtime-libexec.patch
-  ];
+  patches = [ ./runtime-libexec.patch ];

  postPatch = ''
    substituteAllInPlace config/aerc.conf
@@ -47,9 +46,7 @@ buildGoModule rec {

  makeFlags = [ "PREFIX=${placeholder "out"}" ];

-  pythonPath = [
-    python3Packages.vobject
-  ];
+  pythonPath = [ python3Packages.vobject ];

  buildInputs = [
    python3Packages.python
@@ -85,12 +82,22 @@ buildGoModule rec {
    patchShebangs $out/libexec/aerc/filters
  '';

-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Email client for your terminal";
    homepage = "https://aerc-mail.org/";
-    maintainers = [ ];
+    changelog = "https://git.sr.ht/~rjarry/aerc/tree/${version}/item/CHANGELOG.md";
+    maintainers = with lib.maintainers; [
+      defelo
+      sikmir
+    ];
    mainProgram = "aerc";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
  };
 }
@@ -42,13 +42,13 @@ let
 in
 buildGoModule rec {
  pname = "amazon-ssm-agent";
-  version = "3.3.1345.0";
+  version = "3.3.1611.0";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "amazon-ssm-agent";
    tag = version;
-    hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0=";
+    hash = "sha256-mwru2BAnVSYLXoA+g7eizadSYLr9c3ikEJipo7N1n4Y=";
  };

  vendorHash = null;
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitLab,
  bzip2,
  cmake,
  curl,
@@ -34,11 +34,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "apt";
-  version = "2.9.18";
+  version = "2.9.25";

-  src = fetchurl {
-    url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz";
-    hash = "sha256-mQO7u8ibtqRoeggKG/kLuLo2gC7BlrNUmkwf0FAtGjo=";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "apt-team";
+    repo = "apt";
+    rev = finalAttrs.version;
+    hash = "sha256-YVMqqWF4heSF11b0uKD/EUUBPPzkTtGP3QxnLVY6/l8=";
  };

  # cycle detection; lib can't be split
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "asn";
-  version = "0.78.0";
+  version = "0.78.3";

  src = fetchFromGitHub {
    owner = "nitefood";
    repo = "asn";
    tag = "v${version}";
-    hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI=";
+    hash = "sha256-ydCpCmW6NK3LM05YLw6KtJWo7UtMcsxQt2RH/Xl+bFw=";
  };

  nativeBuildInputs = [
@@ -7,14 +7,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "baddns";
-  version = "1.6.68";
+  version = "1.7.86";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "blacklanternsecurity";
    repo = "baddns";
    tag = version;
-    hash = "sha256-TQPjSmLXgcHYxBQFO1QPozs1XRaJDTakGN24LLuFdfY=";
+    hash = "sha256-Jj36aNNYCwqK/Yux92YmCxywftoizXZE39qLhLpjAaw=";
  };

  pythonRelaxDeps = true;
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "capslock";
-  version = "0.2.6";
+  version = "0.2.7";

  src = fetchFromGitHub {
    owner = "google";
    repo = "capslock";
    rev = "v${version}";
-    hash = "sha256-8B9L/lLRxDI6/qUCbL8VM37glDFBTaqb0fGI9BYfICU=";
+    hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ=";
  };

-  vendorHash = "sha256-gmvnpJurjhCGS3/FH6HBZ0Zwx57ArSaw5dLHtJXCFc8=";
+  vendorHash = "sha256-CUw4ukSAs12dprgcQRfdoKzY7gbzUCHk0t2SrUMtrxo=";

  subPackages = [ "cmd/capslock" ];

@@ -16,17 +16,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "cargo-leptos";
-  version = "0.2.25";
+  version = "0.2.26";

  src = fetchFromGitHub {
    owner = "leptos-rs";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-vgYr6mMS2O4/102R+6iCW9IBziM1tIav569d36iIbl8=";
+    hash = "sha256-v1gNH3pq5db/swsk79nEzgtR4jy3f/xHs4QaLnVcVYU=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-pKf6CN+AgcWLZzTRoupSJFD5s97mIimgWU9IhqQmpVo=";
+  cargoHash = "sha256-fyOlMagXrpfMsaLffeXolTgMldN9u6RQ08Zak9MdC4U=";

  buildInputs = optionals isDarwin [
    SystemConfiguration
@@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "commandergenius";
-  version = "3.5.1";
+  version = "3.5.2";

  src = fetchFromGitLab {
    owner = "Dringgstein";
    repo = "Commander-Genius";
    rev = "v${version}";
-    hash = "sha256-sWnx2UdnuuLcTxhuXhfG2ssnFvuGi9kOBrpc4jiKgTs=";
+    hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE=";
  };

  buildInputs = [
@@ -7,7 +7,7 @@
  makeBinaryWrapper,
 }:
 let
-  version = "2.1.2";
+  version = "2.1.3";
 in
 buildNpmPackage {
  pname = "gfn-electron";
@@ -17,10 +17,10 @@ buildNpmPackage {
    owner = "hmlendea";
    repo = "gfn-electron";
    tag = "v${version}";
-    hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY=";
+    hash = "sha256-o5p7INuyrs4Fw0uoP9f3UpqpmJzHIFSBCBTTU2NfUMQ=";
  };

-  npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo=";
+  npmDepsHash = "sha256-xp9uZAMrsPut91tQD3XfeENr7fXFg2bE89xShG1AcZk=";

  nativeBuildInputs = [ makeBinaryWrapper ];

@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "gitxray";
-  version = "1.0.16.4";
+  version = "1.0.17";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "kulkansecurity";
    repo = "gitxray";
    tag = version;
-    hash = "sha256-rxG/FXIvPPCmV8//Bq3Upu4kNjwVhPVTK4ADp9X3OL0=";
+    hash = "sha256-wPqjCIHYvU1QuQIXCrbzr8+JtwQmFNHzAjxr8AXkxrc=";
  };

  build-system = with python3.pkgs; [ setuptools ];
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "glooctl";
-  version = "1.18.5";
+  version = "1.18.6";

  src = fetchFromGitHub {
    owner = "solo-io";
    repo = "gloo";
    rev = "v${version}";
-    hash = "sha256-0ITszVZnxbXSCie9lFotMwZYSVTAhqDgKiz19apPkog=";
+    hash = "sha256-kxNlTVU4VFqEhismth5qb0Ar335TYhO/2oE8tt9km3c=";
  };

  vendorHash = "sha256-AEfDeUD7A4ZFgctNa8b1XeJMFnmcQCLvlQqNFM/gSCc=";
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "grafana-kiosk";
-  version = "1.0.8";
+  version = "1.0.9";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "grafana-kiosk";
    rev = "v${version}";
-    hash = "sha256-M0Gz0+MQNTIOYBxVRaxk5kYZwoJy1nPckGcYF29EzHA=";
+    hash = "sha256-kh62qGMVHNTssQMEBwLaEW0tRtP3iWMrxXeQU+fe+44=";
  };

-  vendorHash = "sha256-dnA5Z6VX7+RLpV7+PPuckH+v407dK8nbe0OVJtfG1YE=";
+  vendorHash = "sha256-LZLmXGPYvNR4meqen0h0UHj62392hfPs9BLNK+X6sKA=";

  nativeBuildInputs = [ makeWrapper ];
  postFixup = ''
@@ -17,13 +17,13 @@

 stdenv.mkDerivation {
  pname = "gtuber";
-  version = "0-unstable-2024-10-11";
+  version = "0-unstable-2025-01-19";

  src = fetchFromGitHub {
    owner = "Rafostar";
    repo = "gtuber";
-    rev = "468bf02a8adcf69b1bd6dd7b5dbcdcc0bfdb6922";
-    hash = "sha256-pEiHqcxkrxZRD9xW/R9DNDdp5foxaHK2SAuzmPNegaY=";
+    rev = "446e26668a4e01fc2ca9c261a7f1c281577e566d";
+    hash = "sha256-5Z6sID7Alm4FWl1qCQV1w5DmGsmor2vbnZUJi3Is650=";
  };

  nativeBuildInputs = [
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "gum";
-  version = "0.15.0";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-DHIFU+dfZpeQo9kN9Krc1dhTf2HlnC7PEwTfN6RYmSU=";
+    hash = "sha256-5/ifKAKKl4adhTsrfIzViLuYpHyf1W6L0KQXk9EObow=";
  };

-  vendorHash = "sha256-BcHwFj4nGmKcbVnLEVd9rK54DAyVNc2Dlt085N+HtFA=";
+  vendorHash = "sha256-H29cyhgC+ZI7CjFTfYb4ekvHfkMfUUzgCDtWXYW6iYM=";

  nativeBuildInputs = [
    installShellFiles
@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "harper";
-  version = "0.16.0";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "Automattic";
    repo = "harper";
    rev = "v${version}";
-    hash = "sha256-lpaE1yb9Yt1AVpZWBnvDOjTpVeKdTlXDnqNDrF0fCZ8=";
+    hash = "sha256-cUN7e82CncDzA9m+pcvtrAn10E6AYaMcAuu6hpt85tA=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-7XXNNVATIrpUdse1JfIlHazx2DxkuDBtGgdJuF+D6jI=";
+  cargoHash = "sha256-svB+Oo51lmsOPBn9hs4gNiJ2Ih2S/i06xaJqNBxo/HU=";

  meta = {
    description = "Grammar Checker for Developers";
@@ -5,10 +5,10 @@
 }:
 let
  pname = "heptabase";
-  version = "1.50.1";
+  version = "1.51.1";
  src = fetchurl {
    url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-rxCpgetkm8Ma3d5PvTCM2SBcPffImw380UPuR+q0LaQ=";
+    hash = "sha256-ANVgH20I6pCy2WI3Umni8YCCWxgGrnyP154iHttlQTs=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -19,14 +19,14 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "home-manager";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-27";

  src = fetchFromGitHub {
    name = "home-manager-source";
    owner = "nix-community";
    repo = "home-manager";
-    rev = "fc52a210b60f2f52c74eac41a8647c1573d2071d";
-    hash = "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=";
+    rev = "e1ae908bcc30af792b0bb0a52e53b03d2577255e";
+    hash = "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=";
  };

  nativeBuildInputs = [
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "32.3.1";
+  version = "32.4.0";

  src = fetchurl {
    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1lpjvk31is2wm7705ilb826cpsgwfsx5182ic6lavpjigjnwi4qr";
-  IosevkaAile = "0bagp60c44ksl1irh02hdjn4dw963l1z0k77nkmipqrgxl8g00vc";
-  IosevkaCurly = "1sp72p2vxmjqjlxfkiyzg5gibymss8vxrvp7c32fybi5dfyixy28";
-  IosevkaCurlySlab = "0wbrca2qjwd5g1jic10lfzgg3rpd70plx0q73fjlj7gpx4af7j25";
-  IosevkaEtoile = "0jnbn5w04brx87ir708vi9nh0zx41znvk8anbxhi8smn7p8krd52";
-  IosevkaSlab = "1l70z14xrh4aiib3yx32ypnxaj96gimiq72ar1w06mi445s3bka1";
-  IosevkaSS01 = "0wfcjlkl2l6nyxy8gpsrmmvp5dsjz5qbz94ixviian2067lmy9n6";
-  IosevkaSS02 = "0lj1vjvk3977kszc21p2pjmmfj68gj43dj69qn01wzfh6sy8qjwm";
-  IosevkaSS03 = "0qd8nrd1j62khj865w52p9sanliyw19i8i3c49haw5pcwpylsgw5";
-  IosevkaSS04 = "0dpm6jkszr75w6v023wd4yk1zrvfw1p3q7a9n4svr8vxmimn0b7m";
-  IosevkaSS05 = "1naqv4nfl1bkl1gkmccls7104ixah9bkjyw6hn1434dgfgb7fhh3";
-  IosevkaSS06 = "1cknkhcj8pqaz65s62rvpw1c6mr59hkn623lr8jzfz5wy018xy73";
-  IosevkaSS07 = "0skn5i6wd40kzrlh6b483j0861imwa0zfalv6d022lxadznzld9f";
-  IosevkaSS08 = "0lj48zk5il5jd7p3wyhcgqszkcyjzdmskbldjp31avjhjpmv0l78";
-  IosevkaSS09 = "0w7w7jvs3jk6iimkb2g3c6w1a6rmmwnvh7gzh7zs5dirzyx2wcsd";
-  IosevkaSS10 = "0f61cpjlw05r21i8pjx005yjy3wiw1rkrxmp12fd5v5hmj88m7wh";
-  IosevkaSS11 = "138svbwr42hhhxbi330adhbyjqp1zfxvbv1nnc74pj94zijj6vzp";
-  IosevkaSS12 = "1dil93hrghpg38wz3988zfd25hm7bx69zm6qw369x5216hcknz2v";
-  IosevkaSS13 = "1ah6s1akc1m4hl21j64xnvd2jy2pmdafkkkvi1jhdvcq36k6nsm9";
-  IosevkaSS14 = "1v2780dzyaazp0r2z1nclms2f26v4g2s7k1wqxw34fjzlzpkfcfa";
-  IosevkaSS15 = "0m2fkvrnbz4h6ncsim9ixvp15g6rl1lsb62cvhfpq9bnydpzzxby";
-  IosevkaSS16 = "0b3d6zkd5rn5dg6zq9airj96cjmbc30ds8qi3c610jvca865gh1m";
-  IosevkaSS17 = "16x4n7cvhp017dg3a94chg5pg2svimlblmhbxnyic5nzy27hq26f";
-  IosevkaSS18 = "18iab2dafsj1y18rvhvr53dyfawk6gxxsss4h4r9vajvp08y3qra";
-  SGr-Iosevka = "0523fpvvypb0a1zj881n352vkbgybwz8859i8rqayxn1l766w8kx";
-  SGr-IosevkaCurly = "0gfpw0ilk5j4r7kz53w99jsc309j8c4a9cxcahpssb6cnygpm6cp";
-  SGr-IosevkaCurlySlab = "1gig9h22x9nw3zds3z9bqry9kvvgl197lkjf5x9pbbc8ah9m25iz";
-  SGr-IosevkaFixed = "1bqn0v3z2vqi7lgxhwmbm7s62llyammpbs524na59m99g8rxa8dr";
-  SGr-IosevkaFixedCurly = "1pwv91cpf672wdrvmv6adjkbnnrrdqqla2iyd9baxni44qmk9dji";
-  SGr-IosevkaFixedCurlySlab = "0wsgx32d45a1iwz67hl40kwbz6j7g6c83f3nhq156pqa5v0afk2d";
-  SGr-IosevkaFixedSlab = "04ms0gnz55fp6y01f6qskwmxfj8hy3kwxigpmqlghlzygbyfx7mf";
-  SGr-IosevkaFixedSS01 = "0ffrhysjr5qggx5ccglsa44j5l25jz7a7kypcanpglpfzja011q2";
-  SGr-IosevkaFixedSS02 = "1a0khkqs6fw9vzrd23a1nnjzz5vimgx1d5m1bzk761fsbrgv9jn0";
-  SGr-IosevkaFixedSS03 = "0h25vb2d3qs778pv01l6slx3d4q5mz9vmqr5lb6ch1zczilz5i9q";
-  SGr-IosevkaFixedSS04 = "0za23nay4909cyy3vjh2k28975cbabrqqxifw5wlyqwsi8ajr8hs";
-  SGr-IosevkaFixedSS05 = "1kgfryzqddywdv8wyc38fwhx6nbh9fij2g4xfs25xiwfsprl36lm";
-  SGr-IosevkaFixedSS06 = "0z9y16sipzqdgi36315zsa3hr4cy394g0f6j99lz8p027r14mbd1";
-  SGr-IosevkaFixedSS07 = "1rfpri0fl7iihi6850zr96jlvcsarvv1jfsyhkmj8rclpd1zqgwk";
-  SGr-IosevkaFixedSS08 = "046pwn81w7ijda9v7hwwgxja76n15l70c2zaa3wx5cqpkkadm4f3";
-  SGr-IosevkaFixedSS09 = "1dqb4d8dr1mj34625pzvp8sngky98900vv9m1n8fid9lg1kix0jp";
-  SGr-IosevkaFixedSS10 = "0d29vzvw1mhb6i1i8fmwgiycx30lpjgv38jmx8gnb837q5295r62";
-  SGr-IosevkaFixedSS11 = "0khvm0bxm207va69a932v45dsafqlgzyx4fi146msx67h9nz9i57";
-  SGr-IosevkaFixedSS12 = "1l1imghykch93n11y0a6hs1512xlcsxq3c4mk040zzy8dflbl9w4";
-  SGr-IosevkaFixedSS13 = "1xb6janlz1cpns2pacsj2pbchghgzbz6mqgnq14z2x646ag90290";
-  SGr-IosevkaFixedSS14 = "085q55s1rn52swlizcxw6wrdy73ilv6h0ypysh6zjqcrlgpda3x6";
-  SGr-IosevkaFixedSS15 = "1m2adjy4rh7w2hjfb86kdagwasvai5fk83lincbh84avxlwz28sf";
-  SGr-IosevkaFixedSS16 = "1w2f2glipy3h9sdw8l3ng7abl0421v176fi7phxjci90mxdj1i2l";
-  SGr-IosevkaFixedSS17 = "1dvnxfyp89x7qrmjrkgzc14c0xxdfq1qb71bbks69zcnsmcm4zr1";
-  SGr-IosevkaFixedSS18 = "1hms6c5g0p0j2dxyp1jdkc0kar1jwqzmjafafm6vjpnm8gaz5pz1";
-  SGr-IosevkaSlab = "04539yj4yq854af0lm9p68njjigarigpk16h3qv8x8n1l2rkrq0z";
-  SGr-IosevkaSS01 = "1gfcnj0wbm1x6zb1w9acp0q7775wdahdwd397fmpg662l0ss25mq";
-  SGr-IosevkaSS02 = "0pm76nkpgjsnz44ngk93slsy5jv32821l4vrzn5d785bbdzzzf8d";
-  SGr-IosevkaSS03 = "0cvmam87jzk83zfzjb2pcqvzh2zvr4ljjbg55ij1q7xhd64rqpaj";
-  SGr-IosevkaSS04 = "1jq16mz0p8xy4ikyn7bjbvnrhlpvkz6y0ih84xbfkgig66hq43g1";
-  SGr-IosevkaSS05 = "1phvc0ssssh7l5rdn1xby0bp4q3asr333xrf3dfiavx7ldysyipq";
-  SGr-IosevkaSS06 = "0ybb7slxwsg87avhyyyvyrx469lf00bb8aw4371ypp34bbs10zr8";
-  SGr-IosevkaSS07 = "0c2ym41kzxq3jnj131qc4q451blmaks5rd5ai1fb8xkzzwzfjin3";
-  SGr-IosevkaSS08 = "0305v7pzxwp34kvwp6ysiirw0vl0z81hh629nsg3dm8a4da86b7h";
-  SGr-IosevkaSS09 = "14zl7lab38xwp2k1fmqgnmm3bxf6ribk23bk531l6bgwdzxd84ds";
-  SGr-IosevkaSS10 = "19a24pfcwiidpvfncf955q856kz2imqwmcvf93afwmpd7aya5gi2";
-  SGr-IosevkaSS11 = "1b9ayk0ykxdcxlafqh49g5gyck1s9kpyd66nfg6jd1d3ql3ryajh";
-  SGr-IosevkaSS12 = "01rby2jx0gc6n5ch79qjdfq8sp2bm4ji28dcixycv03sjq96agdz";
-  SGr-IosevkaSS13 = "0rmkx6bzwvbcqaa950lng8aizkm9m3zrrwxzrfydgf6xx1s37ac5";
-  SGr-IosevkaSS14 = "0xf41gjq55xk1fkys1j324zrh1ds545s8bdlliq1kzik0i6gbjli";
-  SGr-IosevkaSS15 = "0izk1snd2rsh1gaa6rikr1grn3lwfkg3hnsikfqj16fixpxm752j";
-  SGr-IosevkaSS16 = "1zr5706wq1jbfhngwnd6i9dy4izhv43p8pz0l0ly6f4zgcx3533a";
-  SGr-IosevkaSS17 = "1lwj5mdhmnq9qkjkql2vawihbjf0dp50s8s8i2gq5cciy861i0qx";
-  SGr-IosevkaSS18 = "155kwdny6fcaavd8mg8j1j6s9sfj35ig2cx75h7dkqsblbmcz2z2";
-  SGr-IosevkaTerm = "0snj7i9ipa1ilancqcdwcw12s427nj9z3vgmmf71hbba9f82az1c";
-  SGr-IosevkaTermCurly = "119ay1rxci8bg59687ckd2n61a6g09h4a6lk7319caw3s1w3mj6d";
-  SGr-IosevkaTermCurlySlab = "0j1pis6aj1sblm4png0y1mihz3b1f4l8g768grnrfzl338nfg90v";
-  SGr-IosevkaTermSlab = "05vqfdhrxrbsb81j2yrsfjqzmrhin9qf9jncx220dp7qvkjpjsza";
-  SGr-IosevkaTermSS01 = "1j2sgpgnavll25ah6dr408bbq1i0mp0jvd5cgdfa4lq9nk9aa6c2";
-  SGr-IosevkaTermSS02 = "0rx3kdin2rf8nr1jf7kw1ch6zgilgirflgkq9lyx83qq79dhakma";
-  SGr-IosevkaTermSS03 = "1984r56grgrcm6lmm8mkik6n79pvwhzpfygd204rcqm267mw3hml";
-  SGr-IosevkaTermSS04 = "168dxikfxqc66j3k8amf9bqcdzw053g4rl1cbxw3mxa72ay822j9";
-  SGr-IosevkaTermSS05 = "0fy5mxw3yb82mr7jqm5fr2990xav794x3w419n7zs5bx8gj3l28c";
-  SGr-IosevkaTermSS06 = "1fiw3qmkfhfzhns0b9gkb6bzfn17qkwyx3a8i3y2q2567hr6j1v4";
-  SGr-IosevkaTermSS07 = "14fmhhrv1f39b6shp4y8aqmmvf245l12ga00af75mdan13mqsj1s";
-  SGr-IosevkaTermSS08 = "1mcjlhvg1sci7y3whj4zc3lf8k880pvl8w2lf2fkyyz01x4x3ixw";
-  SGr-IosevkaTermSS09 = "17wlci26hzjxawgars1dfdj0nn4a64r24fh1m8xvay8c6n0id50d";
-  SGr-IosevkaTermSS10 = "113mjv8hxzjcimzwg1fy1z3ii44ncaxd1kcq1n2f5czdcsawx1lj";
-  SGr-IosevkaTermSS11 = "0hp6b8c4ggzl6j4bjbw6dwphh4klwg6qrfmksqng0p8hvsf5lkp6";
-  SGr-IosevkaTermSS12 = "1v7l7x8c7dmaim5rjdlvn66parfpzslc8y5c77r0c1rxafxgkycd";
-  SGr-IosevkaTermSS13 = "1z855ikw3d8gnsz8xsdnfzl4pzxyp6p6yx6mjkw8rigjgk95kq8s";
-  SGr-IosevkaTermSS14 = "1m7csblfpc0i6ly6jlizma5h6j73y9c2dhgqgqqw0r3cgrg249wi";
-  SGr-IosevkaTermSS15 = "10l5b9p0b5m1884wmq0jk5i31hbizy6rn19i3qj6ifnf0mni3zxs";
-  SGr-IosevkaTermSS16 = "07rb6vpa9rq7czdc68jw68n9k742hbd1hcwa9zgd0njnwf78fjjr";
-  SGr-IosevkaTermSS17 = "0sm63f8r27lfvk7is9ldaa9shcfwbkydd16zd78g0n13nniiw0h7";
-  SGr-IosevkaTermSS18 = "1rx38sqclkxiql402fc33d9v4y65y3cz9wyx1p97c5wa3j686ngh";
+  Iosevka = "1wmp1xsvq6d7ybxdiscb04ry5fl3p7pbnqrm551pklgp30afcb0k";
+  IosevkaAile = "19hrycbav3r134i1f3135j68lzk4r6iq996qv45nfy5vdiwka56n";
+  IosevkaCurly = "1ibybiad4nx7n3q89ffw5d3q72c221v2vmb47hs4xiax8kjajijx";
+  IosevkaCurlySlab = "09856251vpgch7d989kamyw7f46vwjlyhy22r82vvfvlfni9qvip";
+  IosevkaEtoile = "11c3ky7f5k2qi5jq5jdai2s9nav5z5kqy8p8klhc9nqr7qbsgknc";
+  IosevkaSlab = "0pd70bzgxwi0mgb9j5b3bz4zd8q5s85x6ipq0b3adxa3n0lni2xj";
+  IosevkaSS01 = "01j36nxdh91rjkx3ccqdqj7czl5w35s4ml3y0fhjk13rfi3ikqk5";
+  IosevkaSS02 = "193lwrz5bza0rrfab1mginq90ar0icxrysbiv8nm9d9cq6k67spk";
+  IosevkaSS03 = "0x2g4q0ina97pv1rpm9mhw5as6il3nqpixpjy5nskb47vklnww0z";
+  IosevkaSS04 = "1nr2nzp51swvxmkbsipppixjqdqqp28q7njh0zhwrw9ln2mv5ykf";
+  IosevkaSS05 = "1sgbszbzgznkkjw3xiffbvfh9wx4rmw4a2332dwl3hqjsky2yb0c";
+  IosevkaSS06 = "0bdxgm5v9xngwyygqxaihsaryj9nk7jr86a35sh83p8x92696dr3";
+  IosevkaSS07 = "00cjyy477pllfcl84pms3hs7v59iz4xx24rh6mrp6gwm1dixk0lj";
+  IosevkaSS08 = "0k4aifq8d6ry0q23yjfhmsz0hq55xg0ja8skjsnba67mmw3lmhls";
+  IosevkaSS09 = "12z6bircf48p4i1pfglrdmm7dnrbg48d34d6x0andcshckh2z32m";
+  IosevkaSS10 = "1jm8jdrlydwdi2ahgyw691j0akq7xv7xki6v4qdwdccjblzq38x4";
+  IosevkaSS11 = "1p27lbp48rbr501al4hh1n10v2mi2l8jncyr2b16x6lx699dragh";
+  IosevkaSS12 = "0mpjh3v072xvxl258b9700x4x0z17fwhq526z7v6pfvr1bpa7qd6";
+  IosevkaSS13 = "029jhjymzq0x48mwds1yawp6v57zrsb1y9riy1rw3d5cq307p8np";
+  IosevkaSS14 = "0bvi0nyn0rbrg0i8xq2zhr9sc8sl1xjbjslrd7x6h9xh8vpk67yn";
+  IosevkaSS15 = "00dw3gy3ib151zlizbfac3zsxs0ap8qmfx4apghv5n9y815lsdfz";
+  IosevkaSS16 = "16jrjv6rjh1xwj4yf91c17n1qpqv3vnnnbz7dj4g7rmpb9s5hqkz";
+  IosevkaSS17 = "05nkynn2ri2lkm2ghd4vcb67qm00rl8f1fp17x4l84id36qbzy14";
+  IosevkaSS18 = "1zb96ll1q514av1qqmlaf38py66jqyfy7f0ka8r8ln7jnnfbmsr1";
+  SGr-Iosevka = "1knzbqr8yzbdwrbq9v00p87xp3gbnspcn9lwg5kx7y4s9k4xx4d3";
+  SGr-IosevkaCurly = "1ggnp299h8n54v7l7526phwczcr30ssy58lp4as64jh3kdrpkm5s";
+  SGr-IosevkaCurlySlab = "1wr15jsjnkyqf4vaxv0ckbsjnqcdzhp28xhma7h46invmicamz0b";
+  SGr-IosevkaFixed = "0b89p0f6f2igyg930w7izs2y6027s0p6i9v7hd6y60h1c1g4h3zr";
+  SGr-IosevkaFixedCurly = "09j0jpm2ym7m1gryphvdjy07bdadjfq2k33rkxdi3mm5c9ryr497";
+  SGr-IosevkaFixedCurlySlab = "15ycyyi9y2671gdswvdg56wbiixfa3xdgh0rfbp5gxamaji52jba";
+  SGr-IosevkaFixedSlab = "0rgkdji5figxa8fvl5f0xnw5sx1300g77h92bvn19p1479cpkqnd";
+  SGr-IosevkaFixedSS01 = "074l13i6vfyvj4dr4373vhck6wx451xbinsy2nkmh1l0f4ybk722";
+  SGr-IosevkaFixedSS02 = "0dmsncllnb09h9s4874v0ayadyx6ysacyd4px8gpzdgd5vwyddp5";
+  SGr-IosevkaFixedSS03 = "001zgvyrls4ajklsinz003rvqx9aqhc4b65xksinm0n88p8c6l5v";
+  SGr-IosevkaFixedSS04 = "146f0cmq28g1lkfapj78grqpsrl22208h6vj7k838rbkxx2vqazy";
+  SGr-IosevkaFixedSS05 = "1ax08sgfnwki6qkfnzk3wc5i4i6r8nfzwdn4srz8mfwfm1mlcyps";
+  SGr-IosevkaFixedSS06 = "0ypcnsqifmrh005hql6f6lql5ykgsfvanc2p24x521nrn1dy73va";
+  SGr-IosevkaFixedSS07 = "15xijwfirrwph6n8pky350k5gfx5mhfhgbhhaahvd3wgl1wc3z1d";
+  SGr-IosevkaFixedSS08 = "02l00b0zp8nxw7ma6rr8gvvkw2hxk8d3d3p0vrcf1fq1rarsrdhh";
+  SGr-IosevkaFixedSS09 = "1hf9zdzgxgjdqd1msb2n8vmfqmz66vh7ksf436yddyzcmlflkg54";
+  SGr-IosevkaFixedSS10 = "1k7z4bkf63a621p36ldgilj7d3x8cnkfjqma74l0a5m2cf8nhlhk";
+  SGr-IosevkaFixedSS11 = "091cz89i7igh61ni7cnd8w7yx29x90v96ckjdaw2mvhg0bdkydxi";
+  SGr-IosevkaFixedSS12 = "0mydmf6g8cybl00bzxr5l9ak8marp94wi73926xhks2saap9lzmj";
+  SGr-IosevkaFixedSS13 = "1q3aa628k0wvyi20xgvwh6j2b9c6sfln1dvqwk89fa6cpqjd15qx";
+  SGr-IosevkaFixedSS14 = "1hazszzhv7c3y242bk9v913v11l4f8difl7g3rk9w16x8bhcqykj";
+  SGr-IosevkaFixedSS15 = "05i6sdspi33l5l4lc68xcnpq9jsfjd21xz2cblgg8mpxi5pcxwnx";
+  SGr-IosevkaFixedSS16 = "0zcpgs611hicd9snhvwlbk2n94dnr76y8vg8ai41gy3d5ss5wgvc";
+  SGr-IosevkaFixedSS17 = "1kgmiznjwlspq3sb4mz5p94cc9jakq00sg934sjj24kh4pxpc17p";
+  SGr-IosevkaFixedSS18 = "1c6sbvbwlpyiq4vh1ydg2a963k001kcvgvw50r6ajv2dkq3b5hxf";
+  SGr-IosevkaSlab = "1lprgw2ckvp1v9b0q6ygrij9mk6mnr7bjzhdp3v5r1mpyzhxznf8";
+  SGr-IosevkaSS01 = "07ksz7bva2b47h6320rzg8wdpq2240rlym0988w8chslyi2g9cya";
+  SGr-IosevkaSS02 = "0dj5f7v1m78rp0ahzp99dir8b87cdbmf2lzrp3m8g37hwjpjzi6h";
+  SGr-IosevkaSS03 = "1v35nwwzkmbvrwil8kydw19v44gniyx7d77ri6kzxliwb86nd2rz";
+  SGr-IosevkaSS04 = "1cmvm37jm7mzmv1llpi6091xvpvh6mvimgbiqwxr6vysaal7iwz2";
+  SGr-IosevkaSS05 = "1v19ry9bpa5gdg8n1ni9kb4qrjw7jj8haqgaazkxqd5kqd0i0xbf";
+  SGr-IosevkaSS06 = "0bn4c99ipf6ij52cia788wplhgpppb82pfwpd9h94775cy1qnwmp";
+  SGr-IosevkaSS07 = "0cxw5in1v5pb0955c8pql7lla5cc70c7jvphx95kg17xdn0vf7zy";
+  SGr-IosevkaSS08 = "1qy4ah3qrdcd8vm98njhycinp282b68picc1xzyrb1cs73wcmymx";
+  SGr-IosevkaSS09 = "1hnzbjnfrg068gscia60cx5r1wvkylnnvnwxbbr49kx19j4nb9mw";
+  SGr-IosevkaSS10 = "0x1h6j4731ain7s91sjkifm0zz2l18dv7qk4d4vg99am0mykr0kr";
+  SGr-IosevkaSS11 = "0m8wd4shac32w4lhx3a1zcgg515bdgj29121342aasj8in65hzsw";
+  SGr-IosevkaSS12 = "1h79lqih6xdvzzgb4xi3v3c1v9x08vby7l1rkiypkl66s7n2qmvz";
+  SGr-IosevkaSS13 = "1kgksvsl35v4vjypw3qi5kcnnwcalwbh878p9q4wqrnx7x9q6f21";
+  SGr-IosevkaSS14 = "1kv5zk7habxi85v7ihkgm857r81v52h6qwqcva55y8cycicbxc6f";
+  SGr-IosevkaSS15 = "1a1wsi4vbfmnhvwh17k4z4zdcgsprqx15hkkpbv1ndshdmd0cnac";
+  SGr-IosevkaSS16 = "1gy1a38x79yay6396qdn3a56hhyrslskriar58lxyjdzd8v052m4";
+  SGr-IosevkaSS17 = "1flhbavmzdbi1pcnjdk0zfxh4lg284w7czw472y28xsawdpa6ylx";
+  SGr-IosevkaSS18 = "1yva22hc60v22r1gsa06wxg6zdq7xg7kznq3zdicaa1z9jaj5is3";
+  SGr-IosevkaTerm = "0nf100ymnmkcnj3pvrnsnsb8nanw4asvmmahbvbjwbscq9y5v1pp";
+  SGr-IosevkaTermCurly = "1c6csjl5mhw7rvpkx36v57h5nd2mwy8xlpcisbv2x6mr6cmiypq0";
+  SGr-IosevkaTermCurlySlab = "1mpfzk4pdpiwk7i93alw8whv6j6qq3by7mar33hqdfnwc8ry971s";
+  SGr-IosevkaTermSlab = "19fjijgcfr368c946lkr7xac1gs74bxrax1rn1c0nr8b9qw8y241";
+  SGr-IosevkaTermSS01 = "1q9j91mg19mgpx7a5bbkg5dfwza60zc5yakqb7ifcaybxphwzgzc";
+  SGr-IosevkaTermSS02 = "1v4m60y7z4v6kjrsi16ibslf5bfxmh70qp4q6id5w83307acx4af";
+  SGr-IosevkaTermSS03 = "062p5n78ny74ndhfywdv0ggm3hzscqq6z41yhz0x6pc6390ab3vn";
+  SGr-IosevkaTermSS04 = "08s8140vf1bib5rg5slzp3w2zckf7czdij11jznj61qj5z6069qd";
+  SGr-IosevkaTermSS05 = "01fa9hwznvls1shwglzvh6lvhwn2c2ys7pzvw131qd5fbj11nfxs";
+  SGr-IosevkaTermSS06 = "0k22nm9y7zsbw9wyvkcnh8r7a9p78fdnqhr4k72winhnj0az4nhi";
+  SGr-IosevkaTermSS07 = "0n4cds8bar6w420g6plvs8iwizskgs04m216bsnxa7mfmr368d8v";
+  SGr-IosevkaTermSS08 = "1agzv2vsiry7x6681ic33cxyryv34fr66qpxcihx5xf2ky565vwv";
+  SGr-IosevkaTermSS09 = "1x82wii0hpcnffvbkql6r8yj0s3m4vl6iyrd15dnhs38qrvahkj2";
+  SGr-IosevkaTermSS10 = "0jpar4ggsr0gg2b6y3bjl5k6ffnwdi2l2vz4i24n10ldcdb6kygd";
+  SGr-IosevkaTermSS11 = "0kpq91wdzkfkfldkcbxjddjvznaanz5nycvqh66zbvsfsy89i69c";
+  SGr-IosevkaTermSS12 = "0q8vkmkzxszhi9mqmb0jyjqaiss2z588iqvy3xp0qzzqs6w4vvcp";
+  SGr-IosevkaTermSS13 = "1n0isq8vfn5lfwxn2cjfaymkaiw131ykllzbv5b7kqlj32cj3q42";
+  SGr-IosevkaTermSS14 = "1hjdbpc264b1glwvfzbfrrkjxpr238byk9pw55swklzrj6q0v7sw";
+  SGr-IosevkaTermSS15 = "1sfxic3268bz7b6psnkkwbjmr4ipaf5alscr3kfwz5g03avhiz9x";
+  SGr-IosevkaTermSS16 = "0l74n9mafv0zh1qcy4gxmfkf2mjhjcplfxkcxmm4ymgybgxcqrc8";
+  SGr-IosevkaTermSS17 = "00q78cwj368rgk5lhlncs39h99w1dqbpg9nkqxqjqkgdqyd2ivwb";
+  SGr-IosevkaTermSS18 = "128c6d1bblhfn9npgp56l5zyk4gyyq9p854mi3950r1zg89963x3";
 }
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "jetbrains-runner";
-  version = "3.0.4";
+  version = "3.0.5";

  src = fetchFromGitHub {
    owner = "alex1701c";
    repo = "JetBrainsRunner";
    rev = version;
-    hash = "sha256-uLUtxKGXa8MjpdrT7X0EpRCWQTBYm8mt0NcyOLoGd5Y=";
+    hash = "sha256-fzGwwvBgvUVU6Ra66KrIAqRjWWR6pWYbWVkOk2tDwkc=";
    fetchSubmodules = true;
  };

@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "jx";
-  version = "3.11.4";
+  version = "3.11.27";

  src = fetchFromGitHub {
    owner = "jenkins-x";
    repo = "jx";
    rev = "v${version}";
-    sha256 = "sha256-6M5mY3VoKyoKRd3K6TstGdJ6sfYcIHkCESDUWhl3VCc=";
+    sha256 = "sha256-Qh7Mjo4fwB3FF83GARLgYbQfwLmzJcOvqTAWe9XN/0I=";
  };

-  vendorHash = "sha256-GzkAIGy9CCBIbIWUkPOPM3GlKvlEVm6YXnQUUGjItXE=";
+  vendorHash = "sha256-MJ8gYB8MQADQbhfyWHdGoGzyKPTk7LrltI3Hd2xBN0k=";

  subPackages = [ "cmd" ];

@@ -11,8 +11,8 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "kubedb";
    repo = "cli";
-    rev = "v${version}";
-    sha256 = "sha256-6AhL3IBAQ9Mngquh7XbnXEb4jDX1k2d3bwKBFRhEzHA=";
+    tag = "v${version}";
+    hash = "sha256-e3kP1N6uhLKrOWfvl29vVB9D/bpj1W+1dGlaAuc8es0=";
  };

  vendorHash = null;
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "labwc-tweaks-gtk";
-  version = "0-unstable-2025-01-11";
+  version = "0-unstable-2025-01-26";

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc-tweaks-gtk";
-    rev = "d954bc6bce2e86893c0470de36beae0542eceaad";
-    hash = "sha256-c+6AolglEF/+voa5mDwm3JLIA4btFOBI8e2/ZxCApGg=";
+    rev = "5b811cc25dac6a024a50175ef56c4831883965d9";
+    hash = "sha256-wBiHcSYczOjSm9X46oOUt1rRm0QioHOovbPMZMnLYmM=";
  };

  nativeBuildInputs = [
@@ -10,13 +10,13 @@

 buildGoModule rec {
  pname = "lazysql";
-  version = "0.3.3";
+  version = "0.3.4";

  src = fetchFromGitHub {
    owner = "jorgerojas26";
    repo = "lazysql";
    rev = "v${version}";
-    hash = "sha256-+7KchZbd/XJ+c5ndA4arbKabeMxX1ZTOVs7Nw+TSxGI=";
+    hash = "sha256-APbfaAHufpEaBdXO13afmdnpSA98LhXUhYZ6TK/gazk=";
  };

  vendorHash = "sha256-ef3GngaaoNEJAOF5IlTQhTrO5P22w5p7G91TYJasfGk=";
@@ -119,6 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch";
      hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs=";
    })
+
+    # Fix boost 1.87
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/5c4497d9b67fa6f2fa327b2f2ce4cb5be8c9f2f7/games-emulation/lime3ds/files/lime3ds-0003-boost-1.87-fixes.patch";
+      hash = "sha256-mwfI7fTx9aWF/EjMW3bxoz++A+6ONbNA70tT5nkhDUU=";
+    })
  ];

  postPatch = ''
@@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "marmite";
-  version = "0.2.3";
+  version = "0.2.4";

  src = fetchFromGitHub {
    owner = "rochacbruno";
    repo = "marmite";
    tag = version;
-    hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs=";
+    hash = "sha256-IfmwPN2PbBXJJXHgwseC5L3sDOjaVlRE//H8uHazSNA=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-gVFyhWVtj9zU0FEGeN+BI0hvz0qSH5dCz1/d/i9wCyo=";
+  cargoHash = "sha256-C2GGQQ4Aphi1hNQjSWGK9ZnvbwdZSWugKxsUrB5KtHU=";

  nativeBuildInputs = [
    pkg-config
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "mieru";
-  version = "3.11.0";
+  version = "3.11.1";

  src = fetchFromGitHub {
    owner = "enfein";
    repo = "mieru";
    rev = "v${version}";
-    hash = "sha256-xwi9T7M4FEl79kyGj+F1HX8000PFLrBfTmnEaLwnEFg=";
+    hash = "sha256-FFV1zF/sKgIVSSTcDcuB3QWfcFKbI3RJFG9RveSVe+w=";
  };

  vendorHash = "sha256-AOtq6bGijQqpNMNZA3XeMjzKAo7tWTpdrKB6KxQsdMM=";
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "naabu";
-  version = "2.3.3";
+  version = "2.3.4";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "naabu";
    tag = "v${version}";
-    hash = "sha256-ffE/PlLUH2qO4QJpSGHmEh7/ghputTCnTYplzP+Umw0=";
+    hash = "sha256-Xri3kdpK1oPb2doL/x7PkZQBtFugesbNX3GGc/w3GY8=";
  };

-  vendorHash = "sha256-YSE6WQkq47A+D9ff3UHbc0Kdik9b4KjRpwYWkXDD5zA=";
+  vendorHash = "sha256-HpkFUHD3B09nxGK75zELTsjr4wXivY2o/DCjYSDepRI=";

  buildInputs = [ libpcap ];

@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "nomino";
-  version = "1.5.0";
+  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "yaa110";
    repo = pname;
    rev = version;
-    hash = "sha256-/5rKlPRo3+BsqPgHJ0M/JDGwA0c4rAiOd7gGClPfxMg=";
+    hash = "sha256-BWfgXg3DYdhSzO3qtkwDZ+BZGcIqm82G3ZryaetLYgM=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-lHDMOOvdtjPPXfz/ducTqXFAO/1zCJZKwKGRdEHDhmg=";
+  cargoHash = "sha256-lfArBtwaMeeofE1cBgXFJg2UOMcOhBGF4htJwzNthyc=";

  meta = with lib; {
    description = "Batch rename utility for developers";
@@ -13,14 +13,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "nsxiv";
-  version = "32";
+  version = "33";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "nsxiv";
    repo = "nsxiv";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-UWaet7hVtgfuWTiNY4VcsMWTfS6L9r5w1fb/0dWz8SI=";
+    hash = "sha256-H1s+pLpHTmoDssdudtAq6Ru0jwZZ55/qamEVgtHTGfk=";
  };

  outputs = [
@@ -6,12 +6,12 @@

 buildGoModule rec {
  pname = "oauth2-proxy";
-  version = "7.8.0";
+  version = "7.8.1";

  src = fetchFromGitHub {
    repo = pname;
    owner = "oauth2-proxy";
-    sha256 = "sha256-fNnneMsqwxO0CMJAr1pUSCMDt0/fS7tS6KLs8ExKMTE=";
+    sha256 = "sha256-NU9/BLyTEWGqt9SJNbvF4kSG/op8TEpYV2A24/V29PM=";
    rev = "v${version}";
  };

@@ -1,46 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchurl,
-  rustPlatform,
-  runCommand,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "pax-rs";
-  version = "0.4.0";
-
-  meta = with lib; {
-    description = "Fastest JavaScript bundler in the galaxy";
-    longDescription = ''
-      The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>).
-    '';
-    homepage = "https://github.com/nathan/pax";
-    license = licenses.mit;
-    maintainers = [ maintainers.klntsky ];
-    platforms = platforms.linux;
-    mainProgram = "px";
-  };
-
-  src =
-    let
-      source = fetchFromGitHub {
-        owner = "nathan";
-        repo = "pax";
-        rev = "pax-v${version}";
-        sha256 = "1l2xpgsms0bfc0i3l0hyw4dbp6d4qdxa9vxyp704p27vvn4ndhv2";
-      };
-
-      cargo-lock = fetchurl {
-        url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock";
-        sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb";
-      };
-    in
-    runCommand "pax-rs-src" { } ''
-      cp -R ${source} $out
-      chmod +w $out
-      cp ${cargo-lock} $out/Cargo.lock
-    '';
-
-  cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ=";
-}
@@ -7,14 +7,14 @@

 python3.pkgs.buildPythonApplication {
  pname = "renode-dts2repl";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-14";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "antmicro";
    repo = "dts2repl";
-    rev = "d9b880c36988c0500f67d2206c4b2fdf42fd6e65";
-    hash = "sha256-Apu5WEwlUhO8/j84jH/CzWae17H5U1cwV7h9J8Nx5J0=";
+    rev = "cba1604ee130e7fa831392b315b55a142c5adc46";
+    hash = "sha256-8xFixNOPFL5af+6Lbp84Z6C/ZFWsCcKPf6G4KpBbj/A=";
  };

  nativeBuildInputs = [
@@ -32,18 +32,18 @@ in
 buildDotnetModule rec {
  inherit pname dotnet-sdk dotnet-runtime;

-  vsVersion = "2.61.27";
+  vsVersion = "2.62.18";
  src = fetchFromGitHub {
    owner = "dotnet";
    repo = "roslyn";
    rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E=";
+    hash = "sha256-oy1xYM6Kd/8uAQQdvsxLNkycs9OOs7SEe+dzYc4RMeM=";
  };

  # versioned independently from vscode-csharp
  # "roslyn" in here:
  # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "4.13.0-3.25051.1";
+  version = "4.14.0-1.25060.2";
  projectFile = "src/LanguageServer/${project}/${project}.csproj";
  useDotnetFromEnv = true;
  nugetDeps = ./deps.json;
@@ -1,27 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rustfilt";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "luser";
-    repo = pname;
-    rev = version;
-    hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ=";
-  };
-
-  cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
-
-  meta = with lib; {
-    description = "Demangle Rust symbol names using rustc-demangle";
-    homepage = "https://github.com/luser/rustfilt";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ wykurz ];
-    mainProgram = "rustfilt";
-  };
-}
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20250122";
+  version = "20250127-1";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = "signalbackup-tools";
    rev = version;
-    hash = "sha256-rsA0i87zC6hyQa8xIyveID/nNwAD2YMG3BHYtWKxg1I=";
+    hash = "sha256-6JHHiT1OwLPKxA0rbGiwhwF4PiuS5yguoNtB7dpTJPI=";
  };

  nativeBuildInputs = [
@@ -12,11 +12,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "spring-boot-cli";
-  version = "3.4.1";
+  version = "3.4.2";

  src = fetchzip {
    url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-XJGopVQclKVfVXNlHj9LXu8Kt3hcfsajH5p63k6nQ94=";
+    hash = "sha256-pxGibIyg4C902pmth1rsgMb95yNVyYQenFmbQLDZSEo=";
  };

  nativeBuildInputs = [
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "sqldef";
-  version = "0.17.27";
+  version = "0.17.28";

  src = fetchFromGitHub {
    owner = "sqldef";
    repo = "sqldef";
    rev = "v${version}";
-    hash = "sha256-h0WOd3w6G9jmdhKzfD0AtdTzeLZgEPQ9LPlbIsASm34=";
+    hash = "sha256-DfH+5QArv3aI3ECQ5XK/mjNsKbZ4yEEY3LFZPuPvxDo=";
  };

  proxyVendor = true;
@@ -19,16 +19,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "stgit";
-  version = "2.5.0";
+  version = "2.5.1";

  src = fetchFromGitHub {
    owner = "stacked-git";
    repo = "stgit";
    rev = "v${version}";
-    hash = "sha256-XyBVboNrvhOSZBPd5ZqdMuF261TpFzduC6XQtKJGntE=";
+    hash = "sha256-p6qEzkiRAuzvaPrUXtE+Ixdcu7W0aQFY2NQUyO+kESo=";
  };
  useFetchCargoVendor = true;
-  cargoHash = "sha256-G2n9vSs+9N0v/rR5qo9HstHOfvJVeE8MPyABs2XD0Ic=";
+  cargoHash = "sha256-eleTawI5wJxzzuTS3npJTh3ZlhKYxLxHEJnK6K2DP20=";

  nativeBuildInputs = [
    pkg-config
@@ -4,18 +4,17 @@
  fetchurl,
  makeWrapper,
  electron,
-  common-updater-scripts,
-  writeShellScript,
  makeDesktopItem,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "stretchly";
-  version = "1.16.0";
+  version = "1.17.2";

  src = fetchurl {
    url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz";
-    hash = "sha256-gOMUXGldtZUfqLABJHfbToYe0pcAn8dRWEFxCi/gY9Y=";
+    hash = "sha256-IsVmdsmLfNkZ7B9i8TjTHMymsmYLJY5AJleAoEwnUKk=";
  };

  icon = fetchurl {
@@ -40,19 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

-  passthru = {
-    updateScript = writeShellScript "update-stretchly" ''
-      set -eu -o pipefail
-
-      # get the latest release version
-      latest_version=$(curl -s https://api.github.com/repos/hovancik/stretchly/releases/latest | jq --raw-output .tag_name | sed -e 's/^v//')
-
-      echo "updating to $latest_version..."
-
-      ${common-updater-scripts}/bin/update-source-version stretchly "$latest_version"
-    '';
-  };
-
  desktopItem = makeDesktopItem {
    name = finalAttrs.pname;
    exec = finalAttrs.pname;
@@ -62,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
    categories = [ "Utility" ];
  };

-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
    description = "Break time reminder app";
    longDescription = ''
      stretchly is a cross-platform electron app that reminds you to take
@@ -73,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
    '';
    homepage = "https://hovancik.net/stretchly";
    downloadPage = "https://hovancik.net/stretchly/downloads/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ _1000101 ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ _1000101 ];
+    platforms = lib.platforms.linux;
    mainProgram = "stretchly";
  };
 })
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "tootik";
-  version = "0.15.0";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "dimkr";
    repo = "tootik";
    tag = version;
-    hash = "sha256-Onl64ps8rfLVnZYQ2KPzS+mslgeNz2wpJuabwsqhXlM=";
+    hash = "sha256-uq0mDlJ5NPXw1fsNcoyTbqqpZsYDkX8OSdZ5ToO0rYQ=";
  };

-  vendorHash = "sha256-GSi+sQz7kgp1YHEzH/Y7rOOEEhhvzd75cVhSow3URaU=";
+  vendorHash = "sha256-p/pgoGzrukd4mzzoyLI9g6vL4k+lTnMZOha1KrYjHJ0=";

  nativeBuildInputs = [ openssl ];

@@ -29,16 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    autoconf
    automake
+    gettext # autopoint
    libtool
  ];

-  buildInputs =
-    [
-      gettext
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    libiconv
+  ];

  preConfigure = ''
    ./utils/autogen.sh
@@ -21,7 +21,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
  python3.pkgs.buildPythonApplication
  rec {
    pname = "tuifimanager";
-    version = "5.0.9";
+    version = "5.1.5";

    pyproject = true;

@@ -29,7 +29,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
      owner = "GiorgosXou";
      repo = "TUIFIManager";
      tag = "v.${version}";
-      hash = "sha256-15PXua3kLf3Mpgft2msFBn+fS2bzfTAIC9bmOkNKqlU=";
+      hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8=";
    };

    build-system = with python3.pkgs; [
@@ -16,18 +16,18 @@

 buildGoModule rec {
  pname = "v2ray-core";
-  version = "5.24.0";
+  version = "5.25.1";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "v2ray-core";
    rev = "v${version}";
-    hash = "sha256-3xbXqfac1Kv77uBxykoX1nDB5NqTJDYmmzRloZUL/dA=";
+    hash = "sha256-XJVWja2LGBIXGdzYL8oHMcZn15Bg01t/ro/SRI6Xi/A=";
  };

  # `nix-update` doesn't support `vendorHash` yet.
  # https://github.com/Mic92/nix-update/pull/95
-  vendorHash = "sha256-z0ScEkXQu6YSXESdaTAs3vkPPlHEDmJ5xAwJQERwhWo=";
+  vendorHash = "sha256-8SFQUe52zZLii1XnFg2GBMseBlDxKAE0V56VVXGDlck=";

  ldflags = [
    "-s"
@@ -8,17 +8,17 @@

 buildGoModule rec {
  pname = "vacuum-go";
-  version = "0.15.3";
+  version = "0.16.1";

  src = fetchFromGitHub {
    owner = "daveshanley";
    repo = "vacuum";
    # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
    tag = "v${version}";
-    hash = "sha256-SI32ODbd3X4zMhS3LI4vwVn9/gwgabWZ/8Nx+L3KPYE=";
+    hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo=";
  };

-  vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog=";
+  vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU=";

  env.CGO_ENABLED = 0;
  ldflags = [
@@ -36,7 +36,7 @@ python.pkgs.buildPythonApplication rec {
  ];

  pythonRelaxDeps = [
-    "wyoming"
+    "pyring-buffer"
    "zeroconf"
  ];

@@ -95,7 +95,7 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "zed-editor";
-  version = "0.170.2";
+  version = "0.170.4";

  outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";

@@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${version}";
-    hash = "sha256-E9p/JHHIQ2nQ6LeFob1tDf6UopeEWL/Z7INstehvfEI=";
+    hash = "sha256-sfvTvz5RUBQiO9XxPVZNxc1xyx/BN6oU16uYfxgruuY=";
  };

  patches = [
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
  '';

  useFetchCargoVendor = true;
-  cargoHash = "sha256-A9sTR5MCLXskhvJHVGRQ/rSLwOKqhfgJi5zaGsgglL0=";
+  cargoHash = "sha256-W1olZKtbt7TCVh8KRJf5+NL/eILdO2j1Jx1OBXGL+CY=";

  nativeBuildInputs =
    [
@@ -1,196 +0,0 @@
-From 9c4cd4fa938244cc2e319555d372e4e32029964a Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Tue, 14 Jan 2025 23:06:20 +0100
-Subject: [PATCH] tests/unittests/qml/tst_AddressBar.qml: Replace wait +
- compare with tryCompare
-
---
- tests/unittests/qml/tst_AddressBar.qml | 75 +++++++++++---------------
- 1 file changed, 30 insertions(+), 45 deletions(-)
-
-diff --git a/tests/unittests/qml/tst_AddressBar.qml b/tests/unittests/qml/tst_AddressBar.qml
-index 5c27acff..dc0ec4c6 100644
--- a/tests/unittests/qml/tst_AddressBar.qml
-+++ b/tests/unittests/qml/tst_AddressBar.qml
-@@ -73,6 +73,15 @@ Item {
-         name: "AddressBar"
-         when: windowShown
- 
-+        function verifyAddressBarText(text) {
-+            tryCompare(addressBar, "text", text)
-+        }
-+
-+        function typeStringAndVerify(text) {
-+            typeString(text)
-+            verifyAddressBarText(text)
-+        }
-+
-         function init() {
-             addressBar.actualUrl = ""
-             validatedSpy.clear()
-@@ -101,9 +110,7 @@ Item {
-         }
- 
-         function test_validUrlShouldNotBeRewritten(data) {
-            typeString(data.url)
-            wait(500)
-            compare(addressBar.text, data.url)
-+            typeStringAndVerify(data.url)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.url)
-@@ -120,9 +127,7 @@ Item {
-         }
- 
-         function test_urlWithoutSchemeShouldBeRewritten(data) {
-            typeString(data.text)
-            wait(500)
-            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -137,9 +142,7 @@ Item {
-         }
- 
-         function test_leadingAndTrailingWhitespacesShouldBeTrimmed(data) {
-            typeString(data.text)
-            wait(500)
-            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -153,9 +156,7 @@ Item {
-         }
- 
-         function test_searchQueryShouldBeRewritten(data) {
-            typeString(data.text)
-            wait(500)
-            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl.toString().indexOf(data.start), 0)
-@@ -174,9 +175,7 @@ Item {
-         }
- 
-         function test_htmlEntitiesShouldBeEscapedInSearchQueries(data) {
-            typeString(data.text)
-            wait(500)
-            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0)
-@@ -191,9 +190,7 @@ Item {
-         }
- 
-         function test_uppercaseDomainsShouldBeRewritten(data) {
-            typeString(data.text)
-            wait(500)
-            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -213,9 +210,7 @@ Item {
-         }
- 
-         function test_uppercaseSchemeShouldBeRewritten(data) {
-            typeString(data.text)
-            wait(500)
-            compare(addressBar.text, data.text)
-+            typeStringAndVerify(data.text)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             compare(addressBar.requestedUrl, data.requestedUrl)
-@@ -266,9 +261,7 @@ Item {
-         }
- 
-         function test_urlShouldBeSimplifiedWhenUnfocused(data) {
-            typeString(data.input)
-            wait(500)
-            compare(addressBar.text, data.input)
-+            typeStringAndVerify(data.input)
-             keyClick(Qt.Key_Return)
-             validatedSpy.wait()
-             addressBar.actualUrl = addressBar.requestedUrl
-@@ -289,9 +282,7 @@ Item {
- 
-         function test_clickingWhenUnfocusedShouldSelectAll() {
-             var url = "http://example.org/"
-            typeString(url)
-            wait(500)
-            compare(addressBar.text, url)
-+            typeStringAndVerify(url)
-             addressBar.actualUrl = url
-             clickItem(textInput)
-             verify(!addressBar.activeFocus)
-@@ -301,9 +292,7 @@ Item {
- 
-         function test_clickingWhenFocusedShouldDeselectText() {
-             var url = "http://example.org/"
-            typeString(url)
-            wait(500)
-            compare(addressBar.text, url)
-+            typeStringAndVerify(url)
-             addressBar.actualUrl = url
-             clickItem(textInput)
-             verify(!addressBar.activeFocus)
-@@ -316,9 +305,7 @@ Item {
- 
-         function test_clickingActionButtonWhenUnfocusedShouldNotSelectAll() {
-             var url = "http://example.org/"
-            typeString(url)
-            wait(500)
-            compare(addressBar.text, url)
-+            typeStringAndVerify(url)
-             clickItem(textInput)
-             verify(!addressBar.activeFocus)
-             clickItem(addressBar.__actionButton)
-@@ -355,31 +342,29 @@ Item {
-         }
- 
-         function test_unfocusingWhileEditingShouldResetUrl() {
-            var url = "http://example.org/"
-            typeString(url)
-            wait(500)
-            compare(addressBar.text, url)
-+            var host = "example.org"
-+            var url = "http://" + host + "/"
-+            typeStringAndVerify(url)
-             addressBar.actualUrl = url
-             var clearButton = findChild(addressBar, "clear_button")
-             verify(clearButton != null)
-             clickItem(clearButton)
-            compare(addressBar.text, "")
-+            verifyAddressBarText("")
-             clickItem(textInput)
-            compare(addressBar.text, "example.org")
-+            verifyAddressBarText(host)
-             clickItem(addressBar)
-            compare(addressBar.text, url)
-+            verifyAddressBarText(url)
-         }
- 
-         function test_exitingFindInPageRestoresUrl() {
-            addressBar.actualUrl = "http://example.org/"
-+            var host = "example.org"
-+            addressBar.actualUrl = "http://" + host + "/"
-             addressBar.findInPageMode = true
-             verify(addressBar.activeFocus)
-             compare(addressBar.text, "")
-            typeString("hello")
-            wait(500)
-+            typeStringAndVerify("hello")
-             addressBar.findInPageMode = false
-            wait(500)
-            compare(addressBar.text, "example.org")
-+            verifyAddressBarText(host)
-         }
-     }
- }
-- 
-2.47.0
-
@@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitLab,
-  fetchpatch,
  gitUpdater,
  nixosTests,
  cmake,
@@ -30,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "morph-browser";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromGitLab {
    owner = "ubports";
    repo = "development/core/morph-browser";
-    rev = finalAttrs.version;
-    hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0=";
+    tag = finalAttrs.version;
+    hash = "sha256-CW+8HEGxeDDfqbBtNHDKTvsZkbu0tCmD6OEDW07KG2k=";
  };

  outputs = [
@@ -44,18 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
    "doc"
  ];

-  patches = [
-    # Remove when version > 1.1.1
-    (fetchpatch {
-      name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch";
-      url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/3d9777fdc7d5b302a9f17679e4ea125e94468772.patch";
-      hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/589 merged & in release
-    ./1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch
-  ];
-
  postPatch =
    ''
      substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ callPackage, fetchpatch2 }:

 let
  juliaWithPackages = callPackage ../../julia-modules { };
@@ -29,12 +29,12 @@ in
    { });
  julia_110-bin = wrapJulia (callPackage
    (import ./generic-bin.nix {
-      version = "1.10.4";
+      version = "1.10.8";
      sha256 = {
-        x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1";
-        aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4";
-        x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763";
-        aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10";
+        x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735";
+        aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd";
+        x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f";
+        aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b";
      };
    })
    { });
@@ -60,10 +60,18 @@ in
    { });
  julia_110 = wrapJulia (callPackage
    (import ./generic.nix {
-      version = "1.10.4";
-      hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE=";
+      version = "1.10.8";
+      hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc=";
      patches = [
        ./patches/1.10/0002-skip-failing-and-flaky-tests.patch
+        # Revert https://github.com/JuliaLang/julia/pull/55354
+        # [build] Some improvements to the LLVM build system
+        # Related: https://github.com/JuliaLang/julia/issues/55617
+        (fetchpatch2 {
+          url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch";
+          revert = true;
+          hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y=";
+        })
      ];
    })
    { });
@@ -4,18 +4,18 @@
  php,
 }:

-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
  pname = "phive";
  version = "0.15.3";

  src = fetchFromGitHub {
    owner = "phar-io";
    repo = "phive";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
    hash = "sha256-6vNhmIDE3kwZGMrDnGNGVV6/lb32Yb3ooWDYOC7SUcs=";
  };

-  vendorHash = "sha256-iBNH4n4AVE47CYmwO6s6WBAuRe7JzzvoNruYfVbxPck=";
+  vendorHash = "sha256-wNqQfVRm4kEWpYfdo8HBESh0L4cXPrTlHnBI79b1Al0=";

  meta = {
    changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}";
@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "aiohomeconnect";
-  version = "0.11.2";
+  version = "0.11.4";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = "aiohomeconnect";
    tag = "v${version}";
-    hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI=";
+    hash = "sha256-feAjp1DjZeNTOf0lWN23pap7oDiqSx0v6tf6uIVf1fU=";
  };

  pythonRelaxDeps = [ "httpx" ];
@@ -49,17 +49,28 @@ buildPythonPackage rec {
    pytest-xdist
  ];

-  disabledTestPaths =
-    [ "tests/test_benchmarks.py" ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Assertion errors on numerical values
-      "tests/mcmc/test_integrators.py"
-    ];
+  disabledTestPaths = [
+    "tests/test_benchmarks.py"
+
+    # Assertion errors on numerical values
+    "tests/mcmc/test_integrators.py"
+  ];

  disabledTests =
    [
      # too slow
      "test_adaptive_tempered_smc"
+
+      # AssertionError on numerical values
+      "test_barker"
+      "test_mclmc"
+      "test_mcse4"
+      "test_normal_univariate"
+      "test_nuts__with_device"
+      "test_nuts__with_jit"
+      "test_nuts__without_device"
+      "test_nuts__without_jit"
+      "test_smc_waste_free__with_jit"
    ]
    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
      # Numerical test (AssertionError)
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
  pname = "conda-libmamba-solver";
-  version = "24.11.1";
+  version = "25.1.1";
  pyproject = true;

  src = fetchFromGitHub {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "conda";
    repo = "conda-libmamba-solver";
    tag = version;
-    hash = "sha256-lIpMzm3wjkugMDwqmVFXDKVJyX/SdzFG5jelZRys8PQ=";
+    hash = "sha256-d6KLUhc7+KZ5H9vkI84S9TyximSwatu6lg7XIdMqtk0=";
  };


@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "cyclopts";
-  version = "3.3.0";
+  version = "3.3.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "BrianPugh";
    repo = "cyclopts";
    tag = "v${version}";
-    hash = "sha256-sXTKBDfQSqMWBX+wrhP6fCugGSuXM8mOkEroFWPalVs=";
+    hash = "sha256-PrhaUUzFQJ7tqUdu7nwi9k+NxQUPQWYDUc9vsvnmfeY=";
  };

  build-system = [
@@ -47,10 +47,10 @@ buildPythonPackage rec {
    hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg=";
  };

-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
    name = "datafusion-cargo-deps";
    inherit src;
-    hash = "sha256-hN03tbnH77VsMDxSMddMHIH00t7lUs5h8rTHbiMIExw=";
+    hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U=";
  };

  nativeBuildInputs = with rustPlatform; [
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "ldfparser";
-  version = "0.25.0";
+  version = "0.26.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "c4deszes";
    repo = "ldfparser";
    tag = "v${version}";
-    hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4=";
+    hash = "sha256-SVl/O0/2k1Y4lta+3BFkddyBZfYO2vqh4Xx1ZXNwXN4=";
  };

  build-system = [ setuptools ];
@@ -5,16 +5,15 @@
  matplotlib,
  numpy,
  pytestCheckHook,
-  pythonOlder,
+  pytest-cov-stub,
  seaborn,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "pycm";
  version = "4.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "sepandhaghighi";
@@ -23,36 +22,38 @@ buildPythonPackage rec {
    hash = "sha256-oceLARBP9D6NlMQiDvzIpJNNcod5D1O4xo3YzrUstso=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    matplotlib
    numpy
    seaborn
  ];

-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    matplotlib
+  ];

  disabledTests = [
-    # Minor tolerance issues with Python 3.12; should be fixed in next release
-    # (see https://github.com/sepandhaghighi/pycm/pull/528)
-    "verified_test"
-    "function_test"
+    "plot_error_test" # broken doctest (expects matplotlib import exception)
  ];

  postPatch = ''
    # Remove a trivial dependency on the author's `art` Python ASCII art library
    rm pycm/__main__.py
-    # Also depends on python3Packages.notebook
-    rm Otherfiles/notebook_check.py
    substituteInPlace setup.py \
      --replace-fail '=get_requires()' '=[]'
  '';

  pythonImportsCheck = [ "pycm" ];

-  meta = with lib; {
+  meta = {
    description = "Multiclass confusion matrix library";
    homepage = "https://pycm.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcdarwin ];
+    changelog = "https://github.com/sepandhaghighi/pycm/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
  };
 }
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "python-gvm";
-  version = "25.1.0";
+  version = "25.1.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "greenbone";
    repo = "python-gvm";
    tag = "v${version}";
-    hash = "sha256-Xu4hrZtAMvDVow8GVxCdLSI89WY5YRrFTXQiN539WkA=";
+    hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y=";
  };

  build-system = [ poetry-core ];
@@ -25,10 +25,10 @@ buildPythonPackage rec {
    hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E=";
  };

-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ=";
+    hash = "sha256-OHJQlGwgaQ2ELWvjaA8qsuXOQGSdgirK/yTff7POOmE=";
  };

  build-system = [
@@ -113,7 +113,7 @@
  grpcio,
 }:
 let
-  version = "0.16.13";
+  version = "0.16.15";
 in
 buildPythonPackage {
  pname = "unstructured";
@@ -124,7 +124,7 @@ buildPythonPackage {
    owner = "Unstructured-IO";
    repo = "unstructured";
    tag = version;
-    hash = "sha256-VVgSrXqfWEOjZAU54rGBW3m4FxZKJDmbFsWdgjiqMSs=";
+    hash = "sha256-Wp51LOgM/zE81324Qzu83XGupUMAzz2wn+COmNq95H8=";
  };

  propagatedBuildInputs = [
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "fswatch";
-  version = "1.18.0";
+  version = "1.18.2";

  src = fetchFromGitHub {
    owner = "emcrisostomo";
    repo = "fswatch";
    rev = version;
-    sha256 = "sha256-n9EDEF5swC7UyvC0cd+U/u4Wd050Jf9h2AVtEVbUICA=";
+    sha256 = "sha256-u9+sayp0U6TudffGP2Bb2PbbSMjUHCb6gGBq3jKQ3EQ=";
  };

  nativeBuildInputs = [
@@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "rbspy";
-  version = "0.28.0";
+  version = "0.29.0";

  src = fetchFromGitHub {
    owner = "rbspy";
    repo = "rbspy";
    tag = "v${version}";
-    hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0=";
+    hash = "sha256-KEF98h51F4sZ/eX08hggabnBji/8e/yJTP1VNzuLOlw=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-yb0AvWrXAyi3HOBxlF59//DrwqWwSK1LQNhzrrO4QD8=";
+  cargoHash = "sha256-Wn5H+h7+UKm/AYRZ6e68E6W8h5bnweUPTsY2z6y4Ahc=";

  # error: linker `aarch64-linux-gnu-gcc` not found
  postPatch = ''
@@ -1,38 +1,67 @@
-{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre
-, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }:
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoreconfHook,
+  pkg-config,
+  glib,
+  pcre,
+  json_c,
+  flex,
+  bison,
+  dtc,
+  pciutils,
+  dmidecode,
+  acpica-tools,
+  libbsd,
+}:

 stdenv.mkDerivation rec {
  pname = "fwts";
  version = "24.09.00";

  src = fetchzip {
-    url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
-    sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
+    url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
+    hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
    stripRoot = false;
  };

-  # fails with make 4.4
-  nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ];
-  buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    pcre
+    json_c
+    flex
+    bison
+    dtc
+    pciutils
+    dmidecode
+    acpica-tools
+    libbsd
+  ];

  postPatch = ''
    substituteInPlace src/lib/include/fwts_binpaths.h \
-      --replace "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
-      --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
-      --replace "/usr/bin/iasl"       "${acpica-tools}/bin/iasl"
+      --replace-fail "/usr/bin/lspci"      "${pciutils}/bin/lspci" \
+      --replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
+      --replace-fail "/usr/bin/iasl"       "${acpica-tools}/bin/iasl"

    substituteInPlace src/lib/src/fwts_devicetree.c \
                      src/devicetree/dt_base/dt_base.c \
-      --replace "dtc -I" "${dtc}/bin/dtc -I"
+      --replace-fail "dtc -I" "${dtc}/bin/dtc -I"
  '';

  enableParallelBuilding = true;

-  meta = with lib; {
+  meta = {
    homepage = "https://wiki.ubuntu.com/FirmwareTestSuite";
    description = "Firmware Test Suite";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ tadfisher ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ tadfisher ];
  };
 }
@@ -30,6 +30,7 @@ stdenv.mkDerivation (
      "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
      "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
      "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
+      "DATE="
      {
        aarch64-linux = "TARGET_ARCH=aarch64";
        x86_64-linux = "TARGET_ARCH=x86_64";
@@ -120,21 +120,21 @@ mkDerivation rec {
      null;
  corrosionDeps =
    if rustSupport then
-      rustPlatform.fetchCargoTarball {
+      rustPlatform.fetchCargoVendor {
        src = corrosionSrc;
        name = "corrosion-deps";
        preBuild = "cd generator";
-        hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8=";
+        hash = "sha256-ok1QLobiGBccmbEEWQxHz3ivvuT6FrOgG6wLK4gIbgU=";
      }
    else
      null;
  rustDeps =
    if rustSupport then
-      rustPlatform.fetchCargoTarball {
+      rustPlatform.fetchCargoVendor {
        inherit src;
        name = "rust-deps";
        preBuild = "cd rust";
-        hash = "sha256-rbEfCRB2QAZ2WBgSLYYUqeYtI4Y5d9oQ2G8/mPirIp4=";
+        hash = "sha256-nX5wBM8rVMbaf/IrPsqkdT2KQklQbBIGomeWSTjclR4=";
      }
    else
      null;
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  fetchYarnDeps,
+  nodejs,
+  yarnConfigHook,
+  yarnBuildHook,
+}:
+stdenvNoCC.mkDerivation rec {
+  pname = "clock-weather-card";
+  version = "2.8.7";
+
+  src = fetchFromGitHub {
+    owner = "pkissling";
+    repo = "clock-weather-card";
+    tag = "v${version}";
+    hash = "sha256-ylJNI0DE+3j8EZFpUmuuBnII8nBMrJ5bhlGVh3M25eo=";
+  };
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = src + "/yarn.lock";
+    hash = "sha256-EUuPF2kS6CaJ2MUYoBocLOQyOgkhRHd34ul+efJua7Q=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarnConfigHook
+    yarnBuildHook
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp ./dist/clock-weather-card.js $out/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A Home Assistant Card indicating today's date/time, along with an iOS inspired weather forecast for the next days with animated icons";
+    homepage = "https://github.com/pkissling/clock-weather-card";
+    changelog = "https://github.com/pkissling/clock-weather-card/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ oddlama ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -43,7 +43,8 @@ let
        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
    '';
    sourceRoot = "${src.name}/libflux";
-    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU=";
    nativeBuildInputs = [ rustPlatform.bindgenHook ];
    buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
    pkgcfg = ''
@@ -59,7 +59,8 @@ let
        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
    '';
    sourceRoot = "${src.name}/libflux";
-    cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU=";
    nativeBuildInputs = [ rustPlatform.bindgenHook ];
    buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
    pkgcfg = ''
@@ -1,86 +1,62 @@
 {
  lib,
  fetchFromGitHub,
-  fetchpatch,
-  python3,
+  python3Packages,
 }:

-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "ansible-later";
-  version = "3.3.1";
-  format = "pyproject";
+  version = "4.0.8";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "thegeeklab";
    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8=";
+    tag = "v${version}";
+    hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I=";
  };

-  patches = [
-    # https://github.com/thegeeklab/ansible-later/pull/658
-    (fetchpatch {
-      name = "poetry-dynamic-versioning-pep517.patch";
-      url = "https://github.com/thegeeklab/ansible-later/commit/a2c278fb45769648df1439df5bb25883dddfc58a.patch";
-      hash = "sha256-++CiwwHZoaPC8XHaYbNQeU3zqEi2a4eIYbuSQkO0jTI=";
-    })
-  ];
-
-  pythonRelaxDeps = [
-    "anyconfig"
-    "flake8"
-    "jsonschema"
-    "pathspec"
-    "python-json-logger"
-    "PyYAML"
-    "toolz"
-    "unidiff"
-    "yamllint"
-  ];
-
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3Packages; [
    poetry-core
    poetry-dynamic-versioning
  ];

-  propagatedBuildInputs = with python3.pkgs; [
-    ansible
+  dependencies = with python3Packages; [
+    pyyaml
    ansible-core
+    ansible
    anyconfig
    appdirs
    colorama
-    flake8
    jsonschema
    nested-lookup
    pathspec
    python-json-logger
-    pyyaml
    toolz
    unidiff
    yamllint
-    distutils
  ];

-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
    pytest-cov-stub
    pytest-mock
    pytestCheckHook
  ];

-  postInstall = ''
-    rm $out/lib/python*/site-packages/LICENSE
-  '';
-
  pythonImportsCheck = [
    "ansiblelater"
  ];

-  meta = with lib; {
+  preCheck = ''
+    export HOME="$TMPDIR"
+  '';
+
+  meta = {
    description = "Best practice scanner for Ansible roles and playbooks";
    mainProgram = "ansible-later";
    homepage = "https://github.com/thegeeklab/ansible-later";
-    changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tboerger ];
+    changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tboerger ];
  };
 }
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  rustPlatform,
-  libiconv,
-  Security,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "anevicon";
-  version = "0.1.0";
-
-  src = fetchFromGitHub {
-    owner = "rozgo";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1m3ci7g7nn28p6x5m85av3ljgszwlg55f1hmgjnarc6bas5bapl7";
-  };
-
-  cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    Security
-  ];
-
-  cargoPatches = [
-    # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1
-    (fetchpatch {
-      name = "cargo-lock-file.patch";
-      url = "https://github.com/rozgo/anevicon/commit/205440a0863aaea34394f30f4255fa0bb1704aed.patch";
-      sha256 = "02syzm7irn4slr3s5dwwhvg1qx8fdplwlhza8gfkc6ajl7vdc7ri";
-    })
-  ];
-
-  # Tries to send large UDP packets that Darwin rejects.
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  meta = with lib; {
-    description = "UDP-based load generator";
-    homepage = "https://github.com/rozgo/anevicon";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
-    mainProgram = "anevicon";
-  };
-}
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-  Security,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wireguard-vanity-address";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "warner";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-SjzcVIQ9HwhP6Y/uCwXGSdZgrYcUQ9kE/Bow8pyOKNo=";
-  };
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
-  cargoHash = "sha256-0bkyopkssqH0vfaWkFC3dV2o7Q3EuDEOM8JvRB9ekLU=";
-
-  meta = with lib; {
-    description = "Find Wireguard VPN keypairs with a specific readable string";
-    homepage = "https://github.com/warner/wireguard-vanity-address";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcc32 ];
-    mainProgram = "wireguard-vanity-address";
-  };
-}
@@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo=";
  };

-  cargoHash = "sha256-c1Ivsj9of/cjEKU0lo4I9BfIUQZ3pPf2QF9fAlZTQn0=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-BKVxtd+gbCHzpnr5LZmKMUMEEZvsZMT0AdlfrLpMYpc=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
@@ -149,8 +149,8 @@ in lib.makeExtensible (self: ({
  };

  nix_2_24 = common {
-    version = "2.24.11";
-    hash = "sha256-ZizmbJM+DbhkaizxbjKg9fNfMrxh3PfAZ6jApQrazks=";
+    version = "2.24.12";
+    hash = "sha256-lPiheE0D146tstoUInOUf1451stezrd8j6H6w7+RCv8=";
    self_attribute_name = "nix_2_24";
  };

@@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec {
    sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns=";
  };

-  cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-tcE2TugvTJyUsgkxff31U/PIiO1IMr4rO6FKYP/oEiw=";

  buildInputs = [
    zlib
--- a/Show More
+++ b/Show More