Merge master into staging-next

2025-03-09 00:13:41 +00:00
parent 7f25f5fed5 13a8d610e2
commit a77f267067
103 changed files with 1092 additions and 17496 deletions
@@ -17308,6 +17308,12 @@
    githubId = 56591727;
    keys = [ { fingerprint = "25FF 8464 F062 7EC0 0129 6A43 14AA 30A8 65EA 1209"; } ];
  };
+  nyukuru = {
+    name = "nyukuru";
+    github = "nyukuru";
+    email = "nyu@nyuku.ru";
+    githubId = 97425873;
+  };
  nzbr = {
    email = "nixos@nzbr.de";
    github = "nzbr";
@@ -112,10 +112,13 @@ in
        MATRIX_ROOMS = concatenatedRooms;
        MATRIX_USER = cfg.matrixUser;
        MENTION_ROOM = if cfg.mention then "1" else "0";
+        NODE_ENV = "production";
      };

      script = ''
+        # shellcheck disable=SC2155
        export APP_ALERTMANAGER_SECRET=$(cat "''${CREDENTIALS_DIRECTORY}/secret")
+        # shellcheck disable=SC2155
        export MATRIX_TOKEN=$(cat "''${CREDENTIALS_DIRECTORY}/token")
        exec ${lib.getExe cfg.package}
      '';
@@ -13,7 +13,7 @@
  ];

  config = lib.modules.mkIf config.services.hylafax.enable {
-    environment.systemPackages = [ pkgs.hylafaxplus ];
+    environment.systemPackages = [ config.services.hylafax.package ];
    users.users.uucp = {
      uid = config.ids.uids.uucp;
      group = "uucp";
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:

 # see man:hylafax-config(5)

@@ -16,7 +16,7 @@
  SessionTracing = "0x78701";
  UUCPLockDir = "/var/lock";

-  SendPageCmd = "${pkgs.coreutils}/bin/false"; # prevent pager transmit
-  SendUUCPCmd = "${pkgs.coreutils}/bin/false"; # prevent UUCP transmit
+  SendPageCmd = lib.getExe' pkgs.coreutils "false"; # prevent pager transmit
+  SendUUCPCmd = lib.getExe' pkgs.coreutils "false"; # prevent UUCP transmit

 }
@@ -7,20 +7,28 @@

 let

-  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib)
+    getExe'
+    literalExpression
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkMerge
+    mkOption
+    mkPackageOption
+    ;
  inherit (lib.types)
+    attrsOf
    bool
    enum
    ints
    lines
-    attrsOf
    nonEmptyStr
    nullOr
    path
    str
    submodule
    ;
-  inherit (lib.modules) mkDefault mkIf mkMerge;

  commonDescr = ''
    Values can be either strings or integers
@@ -104,11 +112,11 @@ let
      # Otherwise, we use `false` to provoke
      # an error if hylafax tries to use it.
      c.sendmailPath = mkMerge [
-        (mkIfDefault noWrapper "${pkgs.coreutils}/bin/false")
+        (mkIfDefault noWrapper (getExe' pkgs.coreutils "false"))
        (mkIfDefault (!noWrapper) "${wrapperDir}/${program}")
      ];
      importDefaultConfig =
-        file: lib.attrsets.mapAttrs (lib.trivial.const mkDefault) (import file { inherit pkgs; });
+        file: lib.attrsets.mapAttrs (lib.trivial.const mkDefault) (import file { inherit lib pkgs; });
      c.commonModemConfig = importDefaultConfig ./modem-default.nix;
      c.faxqConfig = importDefaultConfig ./faxq-default.nix;
      c.hfaxdConfig = importDefaultConfig ./hfaxd-default.nix;
@@ -136,6 +144,8 @@ in

    enable = mkEnableOption "HylaFAX server";

+    package = mkPackageOption pkgs "HylaFAX" { default = "hylafaxplus"; };
+
    autostart = mkOption {
      type = bool;
      default = true;
@@ -80,7 +80,7 @@ touch clientlog faxcron.lastrun xferfaxlog
 chown @faxuser@:@faxgroup@ clientlog faxcron.lastrun xferfaxlog

 # create symlinks for frozen directories/files
-lnsym --target-directory=. "@hylafaxplus@"/spool/{COPYRIGHT,bin,config}
+lnsym --target-directory=. "@package@"/spool/{COPYRIGHT,bin,config}

 # create empty temporary directories
 update --mode=0700 -d client dev status
@@ -93,7 +93,7 @@ install -d "@spoolAreaPath@/etc"
 cd "@spoolAreaPath@/etc"

 # create symlinks to all files in template's etc
-lnsym --target-directory=. "@hylafaxplus@/spool/etc"/*
+lnsym --target-directory=. "@package@/spool/etc"/*

 # set LOCKDIR in setup.cache
 sed --regexp-extended 's|^(UUCP_LOCKDIR=).*$|\1'"'@lockPath@'|g" --in-place setup.cache
@@ -7,12 +7,29 @@

 let

-  inherit (lib) mkIf mkMerge;
-  inherit (lib) concatStringsSep optionalString;
+  inherit (lib)
+    concatLines
+    escapeShellArgs
+    mkIf
+    mkMerge
+    optional
+    ;
+  inherit (lib.cli) toGNUCommandLine;

  cfg = config.services.hylafax;
  mapModems = lib.forEach (lib.attrValues cfg.modems);

+  mkSpoolCmd =
+    prefix: program: posArg: options:
+    let
+      start = "${prefix}${cfg.package}/spool/bin/${program}";
+      optionsList = toGNUCommandLine { mkOptionName = k: "-${k}"; } (
+        { q = cfg.spoolAreaPath; } // options
+      );
+      posArgList = optional (posArg != null) posArg;
+    in
+    "${start} ${escapeShellArgs (optionsList ++ posArgList)}";
+
  mkConfigFile =
    name: conf:
    # creates hylafax config file,
@@ -25,7 +42,7 @@ let
      include = mkLines { Include = conf.Include or [ ]; };
      other = mkLines (conf // { Include = [ ]; });
    in
-    pkgs.writeText "hylafax-config${name}" (concatStringsSep "\n" (include ++ other));
+    pkgs.writeText "hylafax-config${name}" (concatLines (include ++ other));

  globalConfigPath = mkConfigFile "" cfg.faxqConfig;

@@ -37,7 +54,7 @@ let
        { name, type, ... }@modem:
        ''
          # check if modem config file exists:
-          test -f "${pkgs.hylafaxplus}/spool/config/${type}"
+          test -f "${cfg.package}/spool/config/${type}"
          ln \
            --symbolic \
            --no-target-directory \
@@ -47,7 +64,7 @@ let
    in
    pkgs.runCommand "hylafax-config-modems" {
      preferLocalBuild = true;
-    } ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}'';
+    } ''mkdir --parents "$out/" ${concatLines (mapModems mkLine)}'';

  setupSpoolScript = pkgs.replaceVarsWith {
    name = "hylafax-setup-spool.sh";
@@ -58,8 +75,8 @@ let
      faxgroup = "uucp";
      lockPath = "/var/lock";
      inherit globalConfigPath modemConfigPath;
-      inherit (cfg) spoolAreaPath userAccessFile;
-      inherit (pkgs) hylafaxplus runtimeShell;
+      inherit (cfg) package spoolAreaPath userAccessFile;
+      inherit (pkgs) runtimeShell;
    };
  };

@@ -155,7 +172,7 @@ let
    wants = mapModems ({ name, ... }: "hylafax-faxgetty@${name}.service");
    wantedBy = mkIf cfg.autostart [ "multi-user.target" ];
    serviceConfig.Type = "forking";
-    serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"'';
+    serviceConfig.ExecStart = mkSpoolCmd "" "faxq" null { };
    # This delays the "readiness" of this service until
    # all modems are initialized (or a timeout is reached).
    # Otherwise, sending a fax with the fax service
@@ -165,7 +182,7 @@ let
    serviceConfig.ExecStartPost = [ "${waitFaxqScript}" ];
    # faxquit fails if the pipe is already gone
    # (e.g. the service is already stopping)
-    serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"'';
+    serviceConfig.ExecStop = mkSpoolCmd "-" "faxquit" null { };
    # disable some systemd hardening settings
    serviceConfig.PrivateDevices = null;
    serviceConfig.RestrictRealtime = null;
@@ -178,7 +195,10 @@ let
    requires = [ "hylafax-faxq.service" ];
    serviceConfig.StandardInput = "socket";
    serviceConfig.StandardOutput = "socket";
-    serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/hfaxd -q "${cfg.spoolAreaPath}" -d -I'';
+    serviceConfig.ExecStart = mkSpoolCmd "" "hfaxd" null {
+      d = true;
+      I = true;
+    };
    unitConfig.RequiresMountsFor = [ cfg.userAccessFile ];
    # disable some systemd hardening settings
    serviceConfig.PrivateDevices = null;
@@ -192,13 +212,11 @@ let
    requires = [ "hylafax-spool.service" ];
    wantedBy = mkIf cfg.faxcron.enable.spoolInit requires;
    startAt = mkIf (cfg.faxcron.enable.frequency != null) cfg.faxcron.enable.frequency;
-    serviceConfig.ExecStart = concatStringsSep " " [
-      "${pkgs.hylafaxplus}/spool/bin/faxcron"
-      ''-q "${cfg.spoolAreaPath}"''
-      ''-info ${toString cfg.faxcron.infoDays}''
-      ''-log  ${toString cfg.faxcron.logDays}''
-      ''-rcv  ${toString cfg.faxcron.rcvDays}''
-    ];
+    serviceConfig.ExecStart = mkSpoolCmd "" "faxcron" null {
+      info = cfg.faxcron.infoDays;
+      log = cfg.faxcron.logDays;
+      rcv = cfg.faxcron.rcvDays;
+    };
  };

  services.hylafax-faxqclean = rec {
@@ -208,15 +226,13 @@ let
    requires = [ "hylafax-spool.service" ];
    wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires;
    startAt = mkIf (cfg.faxqclean.enable.frequency != null) cfg.faxqclean.enable.frequency;
-    serviceConfig.ExecStart = concatStringsSep " " [
-      "${pkgs.hylafaxplus}/spool/bin/faxqclean"
-      ''-q "${cfg.spoolAreaPath}"''
-      "-v"
-      (optionalString (cfg.faxqclean.archiving != "never") "-a")
-      (optionalString (cfg.faxqclean.archiving == "always") "-A")
-      ''-j ${toString (cfg.faxqclean.doneqMinutes * 60)}''
-      ''-d ${toString (cfg.faxqclean.docqMinutes * 60)}''
-    ];
+    serviceConfig.ExecStart = mkSpoolCmd "" "faxqclean" null {
+      v = true;
+      a = cfg.faxqclean.archiving != "never";
+      A = cfg.faxqclean.archiving == "always";
+      j = 60 * cfg.faxqclean.doneqMinutes;
+      d = 60 * cfg.faxqclean.docqMinutes;
+    };
  };

  mkFaxgettyService =
@@ -238,10 +254,10 @@ let
      serviceConfig.Restart = "always";
      serviceConfig.KillMode = "process";
      serviceConfig.IgnoreSIGPIPE = false;
-      serviceConfig.ExecStart = ''-${pkgs.hylafaxplus}/spool/bin/faxgetty -q "${cfg.spoolAreaPath}" /dev/%I'';
+      serviceConfig.ExecStart = mkSpoolCmd "-" "faxgetty" "/dev/%I" { };
      # faxquit fails if the pipe is already gone
      # (e.g. the service is already stopping)
-      serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}" %I'';
+      serviceConfig.ExecStop = mkSpoolCmd "-" "faxquit" "%I" { };
      # disable some systemd hardening settings
      serviceConfig.PrivateDevices = null;
      serviceConfig.RestrictRealtime = null;
@@ -23,6 +23,7 @@
  check,
  glib,
  buildPackages,
+  pandoc,
 }:

 stdenv.mkDerivation rec {
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
    pkg-config
    flex
    bison
+    pandoc
  ];
  buildInputs = [
    libxkbcommon
@@ -9,7 +9,7 @@
 let
  librewolf-src = callPackage ./librewolf.nix { };
 in
-(buildMozillaMach rec {
+(buildMozillaMach {
  pname = "librewolf";
  applicationName = "LibreWolf";
  binaryName = "librewolf";
@@ -31,6 +31,7 @@ in
    maintainers = with lib.maintainers; [
      squalus
      dwrege
+      fpletz
    ];
    platforms = lib.platforms.unix;
    broken = stdenv.buildPlatform.is32bit;
@@ -10,26 +10,36 @@ rec {

  extraConfigureFlags = [
    "--with-unsigned-addon-scopes=app,system"
+    "--disable-default-browser-agent"
  ];

  extraPostPatch = ''
    while read patch_name; do
-      if ! sed -n '/nvidia-wayland-backported-fixes-.*-Bug-1898476/p'; then
-        echo "applying LibreWolf patch: $patch_name"
-        patch -p1 < ${source}/$patch_name
-      fi
+      echo "applying LibreWolf patch: $patch_name"
+      patch -p1 < ${source}/$patch_name
    done <${source}/assets/patches.txt

    cp -r ${source}/themes/browser .
    cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json
    sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure
-    sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure

    cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences
    cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences
    cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences
    cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences
-    cat ${source}/browser/preferences/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl
+
+    # override firefox version
+    for fn in browser/config/version.txt browser/config/version_display.txt; do
+      echo "${packageVersion}" > "$fn"
+    done
+
+    echo "patching appstrings.properties"
+    find . -path '*/appstrings.properties' -exec sed -i s/Firefox/LibreWolf/ {} \;
+
+    for fn in $(find "${source}/l10n/en-US/browser" -type f -name '*.inc.ftl'); do
+      target_fn=$(echo "$fn" | sed "s,${source}/l10n,browser/locales," | sed "s,\.inc\.ftl$,.ftl,")
+      cat "$fn" >> "$target_fn"
+    done
  '';

  extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ];
@@ -1,8 +1,8 @@
 {
-  "packageVersion": "136.0-1",
+  "packageVersion": "136.0-2",
  "source": {
-    "rev": "136.0-1",
-    "hash": "sha256-ELxcS33lYgYcBUjpfDBMGZfeWanUzcUb3gXI2kEE7O0="
+    "rev": "136.0-2",
+    "hash": "sha256-X5DkaqqwZF4piRg/KPoV/SS1DtDG6AqR89UeWqFxZX0="
  },
  "firefox": {
    "version": "136.0",
@@ -162,11 +162,11 @@
    "vendorHash": null
  },
  "bigip": {
-    "hash": "sha256-qTYHtkwgNlroct+HPfiexny9lBCDXwnlNRKRXmW0tXQ=",
+    "hash": "sha256-I77ERUEEBIwco1t/fCZ266gJ7G6GXIug+6Df0OC6XgU=",
    "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
    "owner": "F5Networks",
    "repo": "terraform-provider-bigip",
-    "rev": "v1.22.7",
+    "rev": "v1.22.8",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -399,11 +399,11 @@
    "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM="
  },
  "doppler": {
-    "hash": "sha256-6q6MqtaEDmPo2zBHeZ+rVWMqgF/b3eGX0EZWJarB9iA=",
+    "hash": "sha256-Gxeq6uAkLW2ZI6FcgLb08DHGr/kCaEXrrSI8C7God2Y=",
    "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler",
    "owner": "DopplerHQ",
    "repo": "terraform-provider-doppler",
-    "rev": "v1.14.1",
+    "rev": "v1.15.0",
    "spdx": "Apache-2.0",
    "vendorHash": "sha256-riWi+l7MsqaatRbo74w0c+oB+8RB7F3VEx4cj/NX72A="
  },
@@ -417,13 +417,13 @@
    "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
  },
  "equinix": {
-    "hash": "sha256-o72eGd3yDR381UZI/em8Txy/ofnnv0LqjfhHizQe8ak=",
+    "hash": "sha256-VkzGGrUV4fhp6lcMV9sni1pYL1CFluCsfP4aI8fsVAg=",
    "homepage": "https://registry.terraform.io/providers/equinix/equinix",
    "owner": "equinix",
    "repo": "terraform-provider-equinix",
-    "rev": "v3.2.0",
+    "rev": "v3.4.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-iJ4eHoYkVRoFwJ+rDtCiabdwb1+iv2QOtjc0xawPgjQ="
+    "vendorHash": "sha256-aTQreRL0UTMYWLs25qsdwdN+PaJcOHwLRA8CjIAsYi0="
  },
  "exoscale": {
    "hash": "sha256-r5wQQVbonGqZrzsr/gdbhrrbXC8ej/sMGvB1xk3pvUA=",
@@ -687,13 +687,13 @@
    "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs="
  },
  "kafka": {
-    "hash": "sha256-cY0B1kGjlak3REHi4k/sxyPdawX4gGJFtJMJkJgU/hI=",
+    "hash": "sha256-O8fD974eEmIgMAbLsENBkHiS1+2onx7OOrhnwv+cGoo=",
    "homepage": "https://registry.terraform.io/providers/Mongey/kafka",
    "owner": "Mongey",
    "repo": "terraform-provider-kafka",
-    "rev": "v0.8.3",
+    "rev": "v0.9.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-DnE9tA8VYgtzJWN8j3IOsQs1SiA3NX1mDQzp/Fpqh/U="
+    "vendorHash": "sha256-fp4r3Eh4EcMHK1F9mGr1iEQ/ZmI4+PbzsDjEK0AqXk8="
  },
  "kafka-connect": {
    "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=",
@@ -1210,13 +1210,13 @@
    "vendorHash": "sha256-8K5ye/QD7Iy8GNb+BCfJ2oo/5dATHpEXM+qD7c0NEu8="
  },
  "spotinst": {
-    "hash": "sha256-hdBP9OPx/upZG04r0Tz8H9O54IicHUsTQP3V63HFtXk=",
+    "hash": "sha256-1fX8ojz1EOhwehVkKfnUEwLxHfXc72tH7mBw5sKo640=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.209.2",
+    "rev": "v1.211.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-HNKdEwG+7IJ2YpX97qkvXZbsoJWx+u+rZXRoZzvB1XA="
+    "vendorHash": "sha256-xvA7znqcCESUOsNGaik2xHeZNSV70VQww31sQGhEvm0="
  },
  "ssh": {
    "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",
@@ -1246,11 +1246,11 @@
    "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
  },
  "sumologic": {
-    "hash": "sha256-jGfBRem860KZfu0HjgAPm8Qwp3nM6993px7Gkt1BUGA=",
+    "hash": "sha256-/ysh6W9vSZ8uwfebjVTktsxLm7CDnOqXx2wh+N7RfJ0=",
    "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
    "owner": "SumoLogic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v3.0.4",
+    "rev": "v3.0.5",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
  },
@@ -68,13 +68,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "obs-studio";
-  version = "31.0.1";
+  version = "31.0.2";

  src = fetchFromGitHub {
    owner = "obsproject";
    repo = "obs-studio";
    rev = finalAttrs.version;
-    hash = "sha256-dwS/90j4WfcneAsGFwuABM7xqvq1+VSD2uDVdU/GgQo=";
+    hash = "sha256-I8VExGFr0thEaT8vHvdNwck7AYSpdpfLVPjij1Utt0E=";
    fetchSubmodules = true;
  };

@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ ulrikstrid ];
    platforms = platforms.linux;
+    broken = true;
  };
 }
@@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.gpl2Only;
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [ hlad ];
+    broken = true;
  };
 })
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
    "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON"
  ];

+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
  preConfigure = ''
    rm -rf external/flatbuffers
  '';
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Only;
    maintainers = with maintainers; [ babbaj ];
    platforms = [ "x86_64-linux" ];
+    broken = true;
  };
 }
@@ -42,13 +42,13 @@ let
 in
 buildGoModule rec {
  pname = "amazon-ssm-agent";
-  version = "3.3.1802.0";
+  version = "3.3.1957.0";

  src = fetchFromGitHub {
    owner = "aws";
    repo = "amazon-ssm-agent";
    tag = version;
-    hash = "sha256-xJ4yl93/Wr+R29YmRsGNfkRGhlvfhkXiP8FMgxhqjdE=";
+    hash = "sha256-lOfeGkImwRxua3dSmefb1WcgnviHhOYtYK1VaRW9C6A=";
  };

  vendorHash = null;
@@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  pname = "armadillo";
-  version = "14.2.2";
+  version = "14.4.0";

  src = fetchurl {
    url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-MFTI5j2zq98aXI+f235rStgz+bz7WDJMD/ht4HhMcOA=";
+    hash = "sha256-AjJC/VkHHZjHX7AV/TKTySETLcOb9G0iHUsFmq6NefQ=";
  };

  nativeBuildInputs = [ cmake ];
@@ -5,17 +5,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "automatic-timezoned";
-  version = "2.0.60";
+  version = "2.0.64";

  src = fetchFromGitHub {
    owner = "maxbrunet";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-O7Hnp+fCBq8RUCjBVyu8h9tpB9kxk+E8q6pvDI457fg=";
+    sha256 = "sha256-S8VMvFP6MGhZ6zjAbgRGH7WfL5X4KELx60cOrey2/4Q=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-+84aMQIfHsHkP8m7JzR3oRdUcRFgwidIeHAmk0jFj0I=";
+  cargoHash = "sha256-LdGwdzXsmNUAVm4EtG4i0GvZcJmc0iscgnccutGXTms=";

  meta = with lib; {
    description = "Automatically update system timezone based on location";
@@ -10,13 +10,13 @@

 buildGoModule rec {
  pname = "aws-nuke";
-  version = "3.48.1";
+  version = "3.48.2";

  src = fetchFromGitHub {
    owner = "ekristen";
    repo = "aws-nuke";
    tag = "v${version}";
-    hash = "sha256-DpLxETXnY7u7YrFaODpfziwxIq5BlOswzznsuFXGS9Q=";
+    hash = "sha256-1uNZy4XN2hscsvPGWO/dDRToX94lo9HZpU4AKsZ4ATU=";
  };

  vendorHash = "sha256-YLk560F2YBwWsWFhQ8KsUuW/kIAlWBkihynREppQ+40=";
@@ -30,17 +30,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "libc-0.2.140" = "sha256-5cP25BDfkrybiZjmwmzeqd0nzdItFdNSZ4te7FdLpnk=";
-      "nix-0.26.1" = "sha256-AsOX8sLGHJNJhq0P9WDxWsNiRXgZJl15paTcGdPMQXA=";
-      "pdb-0.8.0" = "sha256-CEglHzBpS3rN7+05tS09FbBcOM0jjyvR+DWrEbvRYwE=";
-      "tree-sitter-c-0.21.0" = "sha256-7L3Ua6LBeX2492RTikKYeCNIG5e5XSrCu4UyXX1eQiI=";
-      "tree-sitter-cpp-0.21.0" = "sha256-WZy3S8+bRkpzUFpnLVp18rY5DxN70fdEPYIYx0UqJhs=";
-      "tree-sitter-rust-0.21.0" = "sha256-kZT4Hil7u4GFWImuQCt9nQJ+HL3B5yHD5wjalpDLlSE=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-ESGX1hnDnU2taKQXre4AQRzQxTC7W+0cEIoQPPC9Lfs=";

  nativeBuildInputs = [
    pkg-config
@@ -0,0 +1,55 @@
+diff --git a/apps/desktop/desktop_native/napi/index.js b/apps/desktop/desktop_native/napi/index.js
+index acfd0df..31a0c6a 100644
+--- a/apps/desktop/desktop_native/napi/index.js
+++ b/apps/desktop/desktop_native/napi/index.js
+@@ -17,6 +17,7 @@ function loadFirstAvailable(localFiles, nodeModule) {
+   require(nodeModule);
+ }
+ 
+/*
+ switch (platform) {
+   case "android":
+     switch (arch) {
+@@ -121,6 +122,8 @@ switch (platform) {
+   default:
+     throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`);
+ }
+*/
+nativeBinding = require('./desktop_napi.node')
+ 
+ if (!nativeBinding) {
+   if (loadError) {
+diff --git a/apps/desktop/desktop_native/napi/package.json b/apps/desktop/desktop_native/napi/package.json
+index d557ccf..2e47c79 100644
+--- a/apps/desktop/desktop_native/napi/package.json
+++ b/apps/desktop/desktop_native/napi/package.json
+@@ -3,7 +3,7 @@
+   "version": "0.1.0",
+   "description": "",
+   "scripts": {
+-    "build": "napi build --platform --js false",
+    "build": "napi build --js false",
+     "test": "cargo test"
+   },
+   "author": "",
+diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
+index 2922035..6497a38 100644
+--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
+@@ -18,7 +18,7 @@
+     "**/*",
+     "!**/node_modules/@bitwarden/desktop-napi/**/*",
+     "**/node_modules/@bitwarden/desktop-napi/index.js",
+-    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
+    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.node"
+   ],
+   "electronVersion": "34.0.0",
+   "generateUpdatesFilesForAllChannels": true,
+@@ -67,7 +67,6 @@
+       ],
+       "CFBundleDevelopmentRegion": "en"
+     },
+-    "singleArchFiles": "node_modules/@bitwarden/desktop-napi/desktop_napi.darwin-*.node",
+     "extraFiles": [
+       {
+         "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}",
@@ -1,23 +1,25 @@
 {
  lib,
+  apple-sdk_14,
  buildNpmPackage,
  cargo,
  copyDesktopItems,
+  darwin,
  electron_34,
  fetchFromGitHub,
  gnome-keyring,
  jq,
+  llvmPackages_18,
  makeDesktopItem,
  makeWrapper,
  napi-rs-cli,
  nix-update-script,
  nodejs_20,
-  patchutils_0_4_2,
  pkg-config,
-  runCommand,
  rustc,
  rustPlatform,
  stdenv,
+  xcbuild,
 }:

 let
@@ -25,16 +27,12 @@ let
  icon = "bitwarden";
  electron = electron_34;

-  bitwardenDesktopNativeArch =
-    {
-      aarch64 = "arm64";
-      x86_64 = "x64";
-    }
-    .${stdenv.hostPlatform.parsed.cpu.name}
-      or (throw "bitwarden-desktop: unsupported CPU family ${stdenv.hostPlatform.parsed.cpu.name}");
-
+  # argon2 npm dependency is using `std::basic_string<uint8_t>`, which is no longer allowed in LLVM 19
+  buildNpmPackage' = buildNpmPackage.override {
+    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
+  };
 in
-buildNpmPackage rec {
+buildNpmPackage' rec {
  pname = "bitwarden-desktop";
  version = "2025.2.0";

@@ -49,7 +47,8 @@ buildNpmPackage rec {
    ./electron-builder-package-lock.patch
    ./dont-auto-setup-biometrics.patch
    ./set-exe-path.patch # ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
-    ./skip-afterpack.diff # this modifies bin/electron etc., but we wrap read-only bin/electron ourselves
+    ./skip-afterpack-and-aftersign.patch # on linux: don't flip fuses, don't create wrapper script, on darwin: don't try copying safari extensions, don't try re-signing app
+    ./dont-use-platform-triple.patch # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
  ];

  postPatch = ''
@@ -57,6 +56,11 @@ buildNpmPackage rec {
    rm -r bitwarden_license

    substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
+
+    # force canUpdate to false
+    # will open releases page instead of trying to update files
+    substituteInPlace apps/desktop/src/main/updater.main.ts \
+      --replace-fail 'this.canUpdate =' 'this.canUpdate = false; let _dummy ='
  '';

  nodejs = nodejs_20;
@@ -75,31 +79,43 @@ buildNpmPackage rec {
  npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs=";

  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    patches = map (
-      patch:
-      runCommand (builtins.baseNameOf patch) { nativeBuildInputs = [ patchutils_0_4_2 ]; } ''
-        < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out
-      ''
-    ) patches;
-    patchFlags = [ "-p4" ];
-    sourceRoot = "${src.name}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      patches
+      ;
    hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc=";
  };
  cargoRoot = "apps/desktop/desktop_native";

  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

-  nativeBuildInputs = [
-    cargo
-    copyDesktopItems
-    jq
-    makeWrapper
-    napi-rs-cli
-    pkg-config
-    rustc
-    rustPlatform.cargoCheckHook
-    rustPlatform.cargoSetupHook
+  # make electron-builder not attempt to codesign the app on darwin
+  env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
+
+  nativeBuildInputs =
+    [
+      cargo
+      jq
+      makeWrapper
+      napi-rs-cli
+      pkg-config
+      rustc
+      rustPlatform.cargoCheckHook
+      rustPlatform.cargoSetupHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      copyDesktopItems
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      xcbuild
+      darwin.autoSignDarwinBinariesHook
+    ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_14
  ];

  preBuild = ''
@@ -116,26 +132,32 @@ buildNpmPackage rec {
  postBuild = ''
    pushd apps/desktop

-    # desktop_native/index.js loads a file of that name regardless of the libc being used
-    mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-${bitwardenDesktopNativeArch}-musl.node
+    # electron-dist needs to be writable on darwin or when using fuses
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist

    npm exec electron-builder -- \
      --dir \
-      -c.electronDist=${electron.dist} \
+      -c.electronDist=electron-dist \
      -c.electronVersion=${electron.version}

    popd
  '';

-  doCheck = true;
+  # there seem to be issues with missing libs on darwin when running tests
+  doCheck = !stdenv.hostPlatform.isDarwin;

-  nativeCheckInputs = [
+  nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
    (gnome-keyring.override { useWrappedDaemon = false; })
  ];

-  checkFlags = [
-    "--skip=password::password::tests::test"
-  ];
+  checkFlags =
+    [
+      "--skip=password::password::tests::test"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "--skip=clipboard::tests::test_write_read"
+    ];

  preCheck = ''
    pushd ${cargoRoot}
@@ -147,39 +169,43 @@ buildNpmPackage rec {
    popd
  '';

-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    ''
+      runHook preInstall
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      cp -r apps/desktop/dist/mac*/Bitwarden.app $out/Applications
+      makeWrapper $out/Applications/Bitwarden.app/Contents/MacOS/Bitwarden $out/bin/bitwarden
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      mkdir -p $out/opt/Bitwarden
+      cp -r apps/desktop/dist/linux-*unpacked/{locales,resources{,.pak}} $out/opt/Bitwarden

-    mkdir $out
+      makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
+        --add-flags $out/opt/Bitwarden/resources/app.asar \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+        --set-default ELECTRON_IS_DEV 0 \
+        --inherit-argv0

-    pushd apps/desktop/dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked
-    mkdir -p $out/opt/Bitwarden
-    cp -r locales resources{,.pak} $out/opt/Bitwarden
-    popd
+      # Extract the polkit policy file from the multiline string in the source code.
+      # This may break in the future but its better than copy-pasting it manually.
+      mkdir -p $out/share/polkit-1/actions/
+      pushd apps/desktop/src/key-management/biometrics
+      awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
+      popd

-    makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
-      --add-flags $out/opt/Bitwarden/resources/app.asar \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --set-default ELECTRON_IS_DEV 0 \
-      --inherit-argv0
-
-    # Extract the polkit policy file from the multiline string in the source code.
-    # This may break in the future but its better than copy-pasting it manually.
-    mkdir -p $out/share/polkit-1/actions/
-    pushd apps/desktop/src/key-management/biometrics
-    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
-    popd
-
-    pushd apps/desktop/resources/icons
-    for icon in *.png; do
-      dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
-      mkdir -p "$dir"
-      cp "$icon" "$dir"/${icon}.png
-    done
-    popd
-
-    runHook postInstall
-  '';
+      pushd apps/desktop/resources/icons
+      for icon in *.png; do
+        dir=$out/share/icons/hicolor/"''${icon%.png}"/apps
+        mkdir -p "$dir"
+        cp "$icon" "$dir"/${icon}.png
+      done
+      popd
+    ''
+    + ''
+      runHook postInstall
+    '';

  desktopItems = [
    (makeDesktopItem {
@@ -212,6 +238,8 @@ buildNpmPackage rec {
    platforms = [
      "x86_64-linux"
      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
    ];
    mainProgram = "bitwarden";
  };
@@ -0,0 +1,28 @@
+diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js
+index 45b79c0..65a6fd5 100644
+--- a/apps/desktop/scripts/after-pack.js
+++ b/apps/desktop/scripts/after-pack.js
+@@ -13,6 +13,9 @@ async function run(context) {
+   console.log("## After pack");
+   // console.log(context);
+ 
+  // skip after-pack
+  return;
+
+   if (context.packager.platform.nodeName !== "darwin" || context.arch === builder.Arch.universal) {
+     await addElectronFuses(context);
+   }
+diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js
+index 20c24c8..acaf867 100644
+--- a/apps/desktop/scripts/after-sign.js
+++ b/apps/desktop/scripts/after-sign.js
+@@ -12,6 +12,9 @@ async function run(context) {
+   console.log("## After sign");
+   // console.log(context);
+ 
+  // skip after-sign
+  return;
+
+   const appName = context.packager.appInfo.productFilename;
+   const appPath = `${context.appOutDir}/${appName}.app`;
+   const macBuild = context.electronPlatformName === "darwin";
@@ -1,39 +0,0 @@
-diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js
-index fd16cd5ffb..05a2325ee1 100644
--- a/apps/desktop/scripts/after-pack.js
-+++ b/apps/desktop/scripts/after-pack.js
-@@ -13,25 +13,6 @@ async function run(context) {
-   console.log("## After pack");
-   // console.log(context);
- 
-  if (context.packager.platform.nodeName !== "darwin" || context.arch === builder.Arch.universal) {
-    await addElectronFuses(context);
-  }
-
-  if (context.electronPlatformName === "linux") {
-    console.log("Creating memory-protection wrapper script");
-    const appOutDir = context.appOutDir;
-    const oldBin = path.join(appOutDir, context.packager.executableName);
-    const newBin = path.join(appOutDir, "bitwarden-app");
-    fse.moveSync(oldBin, newBin);
-    console.log("Moved binary to bitwarden-app");
-
-    const wrapperScript = path.join(__dirname, "../resources/memory-dump-wrapper.sh");
-    const wrapperBin = path.join(appOutDir, context.packager.executableName);
-    fse.copyFileSync(wrapperScript, wrapperBin);
-    fse.chmodSync(wrapperBin, "755");
-    console.log("Copied memory-protection wrapper script");
-  }
-
-   if (["darwin", "mas"].includes(context.electronPlatformName)) {
-     const is_mas = context.electronPlatformName === "mas";
-     const is_mas_dev = context.targets.some((e) => e.name === "mas-dev");
-@@ -140,6 +121,8 @@ function getIdentities() {
-  * @param {import("electron-builder").AfterPackContext} context
-  */
- async function addElectronFuses(context) {
-+  return;
-+
-   const platform = context.packager.platform.nodeName;
- 
-   const ext = {
@@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.75.181";
+  version = "1.76.73";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-auFTQKwcnRwWaNHnO6GBQGV1RlSThmYnvOElKt2TvCc=";
+      hash = "sha256-9rpH7A63AJRlHRohSa9Pp6Hdq57LwUCfM9KkvewzXKQ=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-1nAdmjo16yQDyEZOR4mS95j9I5/ifWXjlq8zy26vaFM=";
+      hash = "sha256-HkQkIvUdkV4pMdAaO7Oa7pR22UXFtTiH2BAsp2/gLQg=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-ap+OPfCaKOwNkhFcAN6p0gT54sdRVpEvQPGoaK4ezl0=";
+      hash = "sha256-sgdmvQ7Po5JygHoxCOs2aufL8meHP27lyW8omyl5BY8=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-knAWVxKaYOevNbYDNe78htCb4QVUQ8X+AZim33DN3MU=";
+      hash = "sha256-auGpQicHJLJpEeVS0tIkvqjbzAfrn6h7vDgeERqT5kk=";
    };
  };

@@ -25,13 +25,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-qLqyv5XXG7cpW+/eNCWguqemT3G2BhnolntHi2zZJ0o=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "druid-0.8.3" = "sha256-s9csjZ0ZimOrPnjJpPjrrMdNKAXFfroWHBPeR369Phk=";
-      "rolling-file-0.2.0" = "sha256-3xeOSXFVVgeKRE39gtzTURt0OkKScQ4uwtvLl4CE3R4=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-b8sqzv7Mg8w3eA381r9vkB7yh3G8fgTvQFqmkoX4JQk=";

  nativeBuildInputs = [
    pkg-config
@@ -23,12 +23,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-acS4yKppvIBiwBMoa5Ero4G9mUf8OLG/TbrZOolAwuc=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "passkey-0.2.0" = "sha256-dCQUu4lWqdQ6EiNLPRVHL1dLVty4r8//ZQzV8XCBhmY=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-SJn00C7vkNoghdVPUszep40RSL8fD+/ELUeuf9GBD7c=";

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

 buildGoModule rec {
  pname = "c2FmZQ";
-  version = "0.4.28";
+  version = "0.4.29";

  src = fetchFromGitHub {
    owner = "c2FmZQ";
    repo = "c2FmZQ";
    rev = "v${version}";
-    hash = "sha256-R9CYgP444S9LinGT2fUnmOvaBHHv2thy1I2TQSPbnOs=";
+    hash = "sha256-2Hdsakol6uHOITg8qgMTXZMtgvExKUrThxr/J93vInc=";
  };

  ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {

  sourceRoot = "${src.name}/c2FmZQ";

-  vendorHash = "sha256-yv/PNzWvEAiKyXw9XVAty67vRgXJmi4eq+i352yKKck=";
+  vendorHash = "sha256-Evx81YLXUWBZ0Wk55TToVGxuOPFlKbULwAOeDilsUFA=";

  subPackages = [
    "c2FmZQ-client"
@@ -11,15 +11,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-public-api";
-  version = "0.44.1";
+  version = "0.44.2";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-eKTFLvyP/RhQJJPswfzCjxKGE+fXSPfVrEQBMcK3ytU=";
+    hash = "sha256-Rdwn3izKSy5733KJw3OyGsBJ55xdxg9+MuI8ZNdei3s=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-KT7tAisaIjhiLdt1Nkk6lg5hVqRt9fZWP74VHICWThM=";
+  cargoHash = "sha256-11Y9BTtprv7EmBx7hsV8UnGDWmogj9azHOCAc/JdY7o=";

  nativeBuildInputs = [ pkg-config ];

@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "castxml";
-  version = "0.6.10";
+  version = "0.6.11";

  src = fetchFromGitHub {
    owner = "CastXML";
    repo = "CastXML";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-3TVJu63O1spleR9hNZKfSNoVa+q+oxtMWCOXetFNrgI=";
+    hash = "sha256-qT7uIZU6DoEQqqhaHEPzPUAFF+KCT4Ybtl8zk495Jko=";
  };

  nativeBuildInputs = [ cmake ] ++ lib.optionals (withManual || withHTML) [ sphinx ];
@@ -7,7 +7,7 @@

 let
  pname = "certificate-ripper";
-  version = "2.4.0";
+  version = "2.4.1";

  jar = maven.buildMavenPackage {
    pname = "${pname}-jar";
@@ -17,7 +17,7 @@ let
      owner = "Hakky54";
      repo = "certificate-ripper";
      tag = version;
-      hash = "sha256-2EXALTGeGkHne335B1R42VrA5vMCMkFF5FBatAfO9Tc=";
+      hash = "sha256-qQ5BHH+DT1sGNDGzSbclqc6+byBxyP16qvm3k9E/Yks=";
    };

    patches = [
@@ -25,7 +25,7 @@ let
      ./fix-test-temp-dir-path.patch
    ];

-    mvnHash = "sha256-Nv/V2+QPSPMxkDcUh6gJrI6aSi+9O+brxpOZg/JPGxI=";
+    mvnHash = "sha256-G2+Z1JyxTzCZzWjB8MQH1T9kwHjtRPag+bmzGXpQXw4=";

    mvnParameters =
      let
@@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "ckbcomp";
-  version = "1.232";
+  version = "1.234";

  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "installer-team";
    repo = "console-setup";
    rev = version;
-    sha256 = "sha256-65DStrG1OXnkFVCEyXNi6/3dOgw+5Y9RJBJjyc+k6qo=";
+    sha256 = "sha256-Sd2/bSBv7kb7CiPYGdK/3AkZQtIY0bCVSN7pGZzyvfM=";
  };

  buildInputs = [ perl ];
@@ -5,13 +5,13 @@
  "packages": {
    "": {
      "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.30"
+        "@anthropic-ai/claude-code": "^0.2.32"
      }
    },
    "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.30",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.30.tgz",
-      "integrity": "sha512-dX0CNMRpbJ3ZrIPuDzCowAdn5P0CZsa8ncBHOHt9WbqFy7y1wMbgUacJbGB41AgKp9YC7QD0C3G4nhfjW9onUA==",
+      "version": "0.2.32",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.32.tgz",
+      "integrity": "sha512-BhVAlBGkgMbkiWPein6fADLgfZKakR9FQNYGzReSebvBxxQRy9jypYuuZgd+4p5RIYsOtyevlUltAm0KHDgs7A==",
      "hasInstallScript": true,
      "license": "SEE LICENSE IN README.md",
      "bin": {
@@ -6,14 +6,14 @@

 buildNpmPackage rec {
  pname = "claude-code";
-  version = "0.2.30";
+  version = "0.2.32";

  src = fetchzip {
    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-i8C4lYryWUoLWLGryrte10nmKFbHLHJpoVD0z0CbdPo=";
+    hash = "sha256-yIj/+m1LKIN51X5zmBnayucpAzz2cdE/QXfwQapeEqI=";
  };

-  npmDepsHash = "sha256-p8ghlzCQ++gsVNmm3BliG3Q8VBu/PqJalBUJwP7GiyU=";
+  npmDepsHash = "sha256-NkMPBbLgr6MuMWNswDsulAYR7A8M6H9EGF2rw1tC33E=";

  postPatch = ''
    cp ${./package-lock.json} package-lock.json
@@ -11,13 +11,13 @@

 buildGoModule rec {
  pname = "coroot";
-  version = "1.8.6";
+  version = "1.8.11";

  src = fetchFromGitHub {
    owner = "coroot";
    repo = "coroot";
    rev = "v${version}";
-    hash = "sha256-0jBlpeG5JMM2iPc4G9lo/fqcCupA/gay3BguilQr0e0=";
+    hash = "sha256-DUagBuGHght6kt63V+o1Rr51KN/yUK7qCfBgbqnAiAU=";
  };

  vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864=";
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "credhub-cli";
-  version = "2.9.42";
+  version = "2.9.43";

  src = fetchFromGitHub {
    owner = "cloudfoundry-incubator";
    repo = "credhub-cli";
    rev = version;
-    sha256 = "sha256-VszKDdLXvcXNXUyCWc+FQnzM3gaOLwnXn0bEV2Obe8M=";
+    sha256 = "sha256-w3TGXv5Lz5yQiyYQZHGEncljDd54f8GfkKQoC51hQVU=";
  };

  # these tests require network access that we're not going to give them
@@ -6,14 +6,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "cyclonedx-python";
-  version = "5.2.0";
+  version = "5.3.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "CycloneDX";
    repo = "cyclonedx-python";
    tag = "v${version}";
-    hash = "sha256-wUXSmZeCiHxVgufP3g5AaZtfAQil5sqAJF6q6bngZps=";
+    hash = "sha256-H3r/ypD3aEkrCnclf+zh0BK4ZzDQBMNvWS7V7xKX43g=";
  };

  build-system = with python3Packages; [ poetry-core ];
@@ -15,11 +15,11 @@ assert odbcSupport -> unixODBC != null;

 stdenv.mkDerivation rec {
  pname = "freetds";
-  version = "1.4.24";
+  version = "1.4.26";

  src = fetchurl {
    url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
-    hash = "sha256-B86htFf4/Vutdbw0I3G35+CS+SR6gT3HtifJI139tkI=";
+    hash = "sha256-dGQaZswr+uMCwqZKSyaKPbj7DMc2TceXXETFfWXNjRw=";
  };

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

 rustPlatform.buildRustPackage rec {
  pname = "gql";
-  version = "0.36.0";
+  version = "0.37.0";

  src = fetchFromGitHub {
    owner = "AmrDeveloper";
    repo = "GQL";
    rev = version;
-    hash = "sha256-KVyd59NHDkUdbSNkru7uEWI46RMbWUO6lRf7xMYEaWs=";
+    hash = "sha256-5n95+BcdjdjZyT3fvRv8acPV3jK9IppsKklI0zuA5mw=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-eDJJ0Gcd3VJjqp3XbHwgQRSE/Ut5zSEumvvdgb31r+8=";
+  cargoHash = "sha256-2JaPT/83672qnF2y3YKFhnQ/hNQ/GXnHfRcQIn0rnc8=";

  nativeBuildInputs = [
    pkg-config
@@ -19,14 +19,14 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "home-manager";
-  version = "0-unstable-2025-02-22";
+  version = "0-unstable-2025-03-08";

  src = fetchFromGitHub {
    name = "home-manager-source";
    owner = "nix-community";
    repo = "home-manager";
-    rev = "cb3f6e9b59d3a5e51ef9f7da2b8418d5c72aaef8";
-    hash = "sha256-MwxDtYB/MSGZlr/xS+ExGYH2QgHk73ShD40shxjad/Y=";
+    rev = "26f6b862645ff281f3bada5d406e8c20de8d837c";
+    hash = "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=";
  };

  nativeBuildInputs = [
@@ -32,10 +32,6 @@

 let

-  pname = "hylafaxplus";
-  version = "7.0.9";
-  hash = "sha512-3OJwM4vFC9pzPozPobFLiNNx/Qnkl8BpNNziRUpJNBDLBxjtg/eDm3GnprS2hpt7VUoV4PCsFvp1hxhNnhlUwQ==";
-
  configSite = replaceVars ./config.site {
    config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${builtins.toString maxgid}'';
    ghostscript_version = ghostscript.version;
@@ -66,11 +62,12 @@ let

 in

-stdenv.mkDerivation {
-  inherit pname version;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hylafaxplus";
+  version = "7.0.10";
  src = fetchurl {
-    url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
-    inherit hash;
+    url = "mirror://sourceforge/hylafax/hylafax-${finalAttrs.version}.tar.gz";
+    hash = "sha512-6HdYMHq4cLbS06UXs+FEg3XtsMRyXflrgn/NEsgyMFkTS/MoGW8RVXgbXxAhcArpFvMsY0NUPLE3jdbqqWWQCw==";
  };
  patches = [
    # adjust configure check to work with libtiff > 4.1
@@ -94,16 +91,13 @@ stdenv.mkDerivation {
    openldap # optional
    pam # optional
  ];
-  # Disable parallel build, errors:
-  #  *** No rule to make target '../util/libfaxutil.so.7.0.4', needed by 'faxmsg'.  Stop.
-  enableParallelBuilding = false;

  postPatch = ". ${postPatch}";
  dontAddPrefix = true;
  postInstall = ". ${postInstall}";
  postInstallCheck = ". ${./post-install-check.sh}";
  meta = {
-    changelog = "https://hylafax.sourceforge.io/news/${version}.php";
+    changelog = "https://hylafax.sourceforge.io/news/${finalAttrs.version}.php";
    description = "enterprise-class system for sending and receiving facsimiles";
    downloadPage = "https://hylafax.sourceforge.io/download.php";
    homepage = "https://hylafax.sourceforge.io";
@@ -127,4 +121,4 @@ stdenv.mkDerivation {
      and the server parts of HylaFAX+.
    '';
  };
-}
+})
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "imsprog";
-  version = "1.5.1";
+  version = "1.5.2";

  src = fetchFromGitHub {
    owner = "bigbigmdm";
    repo = "IMSProg";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cgMjXfquftiGngIYjSnC/HkWRmb15kyLNzp+ekWXM+I=";
+    hash = "sha256-G2hD9h9hcuUO35z/k46+24KTgqGiufa3dwa4LQVA1yY=";
  };

  strictDeps = true;
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "32.5.0";
+  version = "33.0.1";

  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 = "1w7043q2pxllry2njrk4cpqwvralb0a1d3bxac36y0ai9al3m5w0";
-  IosevkaAile = "10sf5q4f3l9z4pai46sszkswnwfnjmyqzs6ark1dlsifxh8c86wb";
-  IosevkaCurly = "0qg4r8hid50hnjj3gs0xagdymm15z919s0pn6n2dnlmmxvw1c5nv";
-  IosevkaCurlySlab = "1lkcs3aqxvdlpgbplhpd4i6vza1xyqnim2awak9b310byyf35d0c";
-  IosevkaEtoile = "1yh8vlhrcczmsir87f84qr605rf1kp86bvf1c459myc4a6hcqc3z";
-  IosevkaSlab = "03r7ldsk3qrvy46ag08fhs3ppxmzycn8gh6xxmi3pw972hn9kgpi";
-  IosevkaSS01 = "0h1ln3bisbgwd7cc6c9jcmplzvgca42csd5cfxj1jjs4i2vmx2d6";
-  IosevkaSS02 = "0z0b14cwhbb85fjp508cb1ihscxcc75asjmq9fw5rfl3kx85w6h8";
-  IosevkaSS03 = "18gs7h6mb5c9fqmx7ip1a5k3garqbgp640m338h776pcq9mlnndv";
-  IosevkaSS04 = "1yjywm9r390gnagla6g5yjach0ydng0m0q752k39fb2z5rpjzphp";
-  IosevkaSS05 = "1jn8xb7f3hxs4yl54hmiar49wwdl7489xv0f0sqr5c66ip2jar0k";
-  IosevkaSS06 = "0c6wysyg8nzgan39z4w6l41abx2d0gj89mli63ydagqlljk7vs71";
-  IosevkaSS07 = "006khr7hh14dcq81mqzn3fkfrpbix1vghrvwff289r7cfy45ijkk";
-  IosevkaSS08 = "1dbnhbljybal9l61iq88h85jkmc16aaw8kxcq3r0ikzv2pq3vslm";
-  IosevkaSS09 = "0b218h42n5qg920q95ip3mva2xz012ijzgxj8r9m638qar0ba1qi";
-  IosevkaSS10 = "005i3am8amvwg8skq5lh5pisq1ll8hi9nj3imlcvcwj0w2i8b04w";
-  IosevkaSS11 = "0gnk9arz1dfksjx2d7gnb6vx0p0p7hpz4gcnkaj6ppdry9a5lmdn";
-  IosevkaSS12 = "17ri9f2ka7jsb4n3bbb18vxnjxk432f8740hzbjpnvzy16av5nhk";
-  IosevkaSS13 = "1nb3vd7q3xcbijawk9pqznkcfrjdykrc83jl58dnx7jf0znk7j4d";
-  IosevkaSS14 = "0dqkrf86h77ps90rdbsndngzg0l8c4jh8l3f3vcmdy1vlcrycpbi";
-  IosevkaSS15 = "0qd2di4phlxakprm5bqi0kz9yy48wqrhkxidzjswagf6bnm3mk5v";
-  IosevkaSS16 = "15yr94a3faribc19j91q7jna0hx3dsdpz1axkzr5gy56w7hg6bw4";
-  IosevkaSS17 = "0k8blbzymyvwczngafz3vijwdy4iwhxc4lrfqxgddrfi57lbnj5r";
-  IosevkaSS18 = "08ijx9rbcx95yiaiwv6k25xmsi24rdy50mkmmaw94mmwv22mxdra";
-  SGr-Iosevka = "0spg11xj3wz7mfs7b1p9vk7gv3p2kblvnnjvlg29wg1xdywnb9g3";
-  SGr-IosevkaCurly = "17xmazjk4q8f67piwgzjbh30dpcczmhxjrbms27d2987bvnxrp9y";
-  SGr-IosevkaCurlySlab = "1qzq93l4a2j0w3r0a2pnar29ycw9kkx9kb8czw7a29jbkg36d5hj";
-  SGr-IosevkaFixed = "02pvwamiyva6ccaxdczc8ws3s4rh4jbcscaw083l87fwlg8727lm";
-  SGr-IosevkaFixedCurly = "0iqf2hjr5455ifngcr4njjd39cbzx9b15872k2h912h027i0jk7g";
-  SGr-IosevkaFixedCurlySlab = "11nfw5s7dsmhwrh7cw6v0qg9ydhgnd0apmyanw7gslbq579x1zgc";
-  SGr-IosevkaFixedSlab = "0fjal7wnidcikbpvpkgm4nm0c4266szd947hqh71vhkprq8dk46l";
-  SGr-IosevkaFixedSS01 = "1qnmpzgmfq9hmb60k5y0r01ghdilczcdgq0gngqfr4nkqah84bcz";
-  SGr-IosevkaFixedSS02 = "11b13lm8vm7i02lxc759cdqiym7n3ybhkwmg3zhhs7fwfaxa3l8f";
-  SGr-IosevkaFixedSS03 = "02c7l1gsvil4pbf8hc94r1sgsrql2h4llw06miww22484sylzsn5";
-  SGr-IosevkaFixedSS04 = "1mnlqrwr4yq8fnl8q7rll32x0bk8jy4fspnpw00q263hcjwnmghg";
-  SGr-IosevkaFixedSS05 = "0fl3pgshmvi212lk1h805zaf5a7xa3w0qc1dykd7gnf49nwhjngc";
-  SGr-IosevkaFixedSS06 = "1hw0k2f7anr5z3l9iwbvpvwwhv1gz8wyp0if142j33nmcggqc6b3";
-  SGr-IosevkaFixedSS07 = "03klp7vyi2kgk7hs2c2m0kpr6hd9hyyh61ygc0nggxqi7ynl08g6";
-  SGr-IosevkaFixedSS08 = "0ic1cyxlq4hbsp4bikxln08l5797409wykyadyhfac73hcc1xnf0";
-  SGr-IosevkaFixedSS09 = "08sl9wgc6dz088mi2h1c0yxv8rj8b7rr6qy9bqxgvbl3qdz427h4";
-  SGr-IosevkaFixedSS10 = "1dwzh2j6lrdcby0hwxs72cbmikvyljr1wvisg543rhmp8wnpzd8j";
-  SGr-IosevkaFixedSS11 = "1glb4s15ah61xx22jliy1z7q5xyn3m80gakzyannqdnncf6dw7px";
-  SGr-IosevkaFixedSS12 = "0mfm9g7370jvw6x14dfqfqy2fsvrjid9f5y50lxsm0hd13kwp345";
-  SGr-IosevkaFixedSS13 = "1dvxb109dy7kg3jq9m3b8q7ijc33jbd6gg05wwyid4hryc75wyri";
-  SGr-IosevkaFixedSS14 = "1vjnzckxxv8hlcr9kgf0wlw30s1yfnbw937zdfy7ah238qw0bh86";
-  SGr-IosevkaFixedSS15 = "10l0728ncxsb6fpl2krr6hn4ff4h4ix2xn8ip2qpa42cjzf79gnc";
-  SGr-IosevkaFixedSS16 = "0s0j9m6hjykrgd28akx57v9mlxm9p3k52c1pslj5k8mw8ihrig9i";
-  SGr-IosevkaFixedSS17 = "0xnlh3kv4acf2cnqrja6hi29fs2kn2bxbcay7acc69ld3yjvhi1c";
-  SGr-IosevkaFixedSS18 = "0a92nmmrb76my45bqdk9iq7mcwpdjh15jf3kh6zhbbzkzmb6v6dk";
-  SGr-IosevkaSlab = "1mbl3ynnvp5i8fvvc775iwsh6qkpnrmxx0663q402kq7p7ss9a5q";
-  SGr-IosevkaSS01 = "0sv6hiyzjzpaapnl7gpp77dfwkrn3s4w95nkk6sj3j7x4mk9misr";
-  SGr-IosevkaSS02 = "1rlyysp1qr98r0ps3wy7hg9cj6v95r25ksk7b22mcx9rlnji9466";
-  SGr-IosevkaSS03 = "16l22hfqlkh23hhvv64c3z29s07m1rg97wql3czn4xdvx85rh9sl";
-  SGr-IosevkaSS04 = "0c5h9lmmp6721kdn1jiqy22q11b1jx7l4z4mk6ckl51p665ralb3";
-  SGr-IosevkaSS05 = "0mvvki7fmfcqvcx3bmxnjy70imxpiwfqhyph1i55491hksm6k4id";
-  SGr-IosevkaSS06 = "1lmig6sfrjl592n60iwa4znfm3rg8zkh5h57kdkxybf3549x6axf";
-  SGr-IosevkaSS07 = "0hxwwlp8qwjagjwx2l0g2qiks1ci4s57324l2hfwb49nlmk6vi9i";
-  SGr-IosevkaSS08 = "0yhlrlbxjkyw587xaw9970930r080818j4vgpz5n7vcapdn8lgni";
-  SGr-IosevkaSS09 = "1x9i84ahhfnnibvm7jfds5b808ngskz90njc7l2q2d32vh4xy5pn";
-  SGr-IosevkaSS10 = "14y9i9a2w7n20zsgglbd6mccd4z055yripzhakclbgygd0vh4ya2";
-  SGr-IosevkaSS11 = "0v9i0xjk98lryxb6ndhrjwkdrmxshrzxykpf1yrba3xr5nnxz7db";
-  SGr-IosevkaSS12 = "0yzgcsjxvg3q4z2s6lsspqwm3bibj8yb4d42vmjxrhz4dgi9i32m";
-  SGr-IosevkaSS13 = "1s2g54gf7fwmyrb471mg89ssai0ypjbpwn5dfzyqjrsa263clkpv";
-  SGr-IosevkaSS14 = "1vr0p8km6dd02d5y59k67wx1hs5wjfny33v4hkc1w62ii430x12r";
-  SGr-IosevkaSS15 = "1j48d45s9rkf5q61i5vvl10j4w4hzj2530nnwarxp8lzzdg06ikh";
-  SGr-IosevkaSS16 = "0n3cddv5vhk7p0a5xnf5dh7yn69hxwyfyw6lx8vrxfbfxzqywl6i";
-  SGr-IosevkaSS17 = "1wpnvhklri2kv6h93gc9gabfrznqaxf69iydqkb2vxsqhxr60ijh";
-  SGr-IosevkaSS18 = "0h20vy0f8lyslz6468jhs4p8xm72jzrna6cz1c7q99xgsv3ijp55";
-  SGr-IosevkaTerm = "1fwbx626hiqf777w9kalgpi9r8kmqvc0rlfk2in2hbg69gz68qms";
-  SGr-IosevkaTermCurly = "18grrzxckmr3iyf5qibx7lw9sqkggx10k77cwpswy4z51ny8jldr";
-  SGr-IosevkaTermCurlySlab = "0admr05sxv6cxip18wabrd1g9p2zr6dbql9j171a4nsmvi0ycnsd";
-  SGr-IosevkaTermSlab = "0l4iph71msqbdiz8m7ad81ifsp8c9v3l7kdwmh0jd2ycw37wrfwy";
-  SGr-IosevkaTermSS01 = "1bi0jlz8lxx1ip65abcbfzj7knvipvpcv9pi83357wzsxganwhm9";
-  SGr-IosevkaTermSS02 = "0a95pwrsyhlrqji5ylv923sy5kmsf1x1cqr2yfcf94dkf95hs9xw";
-  SGr-IosevkaTermSS03 = "0absxpvl4kvsprhza7wf8pixqmdvr43sn98rihl9s4kd2sncjxzp";
-  SGr-IosevkaTermSS04 = "0li19wgdc0s71kdfajamsk8k947i7pv0686nj6yv030cfvd1af48";
-  SGr-IosevkaTermSS05 = "1ad1963y1wy0qm6wl5vvmzm313ir4fikk8c60vrsdqw8knamczlv";
-  SGr-IosevkaTermSS06 = "10nsi9vy508x8nysl08dskdvvklsy2qrr5vd71jv6cimwlh714l8";
-  SGr-IosevkaTermSS07 = "0lgb07mzcbycwl382b4f59bz87xslmbk65faf02m6q17ajvwja97";
-  SGr-IosevkaTermSS08 = "0gvaxjcm56m260j205svhbxfln20d8a74yqh9brd7mzrm76lxpfh";
-  SGr-IosevkaTermSS09 = "0db35zlcbfqxc78yfqwjc1k3ryb452r0n5jsff6ym2k5313c47gm";
-  SGr-IosevkaTermSS10 = "12v4r49k3bz9zcyjmgxlw5v945aqb41sh4l86b26hvc5ay0h0gs0";
-  SGr-IosevkaTermSS11 = "18vpfkvxq87am007i0f8r1ngli3mjkdq5f9q2q2f8m2cwfiyqbqv";
-  SGr-IosevkaTermSS12 = "0msr21g7gwn9yvjkhk0zl391snddh53wx3qk7pki9hpjghcgrg5q";
-  SGr-IosevkaTermSS13 = "1mxwqq71640671rmxyirsjhda83flm3kkflcwi7rzy8c4n9pzm0f";
-  SGr-IosevkaTermSS14 = "0m5gg34pmcj8a4a3fig9fnw4ymclijcz29wnk9sg5zhyfgmaafaj";
-  SGr-IosevkaTermSS15 = "04vs3sxqkdp0jkrdpnknvxz22cdyxknvcry31yhvi42v6lj7zjxh";
-  SGr-IosevkaTermSS16 = "1pv3n718jj0ikpzwjj9rfakvzjvh1gxv5iyza28b77fl4a2sji06";
-  SGr-IosevkaTermSS17 = "0c5fzf5hjlfdbkxncij6fw2gy28ia8zy31gdy9bcm1phjwnwiwm8";
-  SGr-IosevkaTermSS18 = "1kc50d6ain2ijlja2s9dwyw97adnknjw6d6m8mmdp0gw96pj4bvc";
+  Iosevka = "1abwdisa8v4af2jw7abfrjkhh5wg293da3v96p7irpgha3hg50hc";
+  IosevkaAile = "0mzqkx9if9hcb7dk4nil55r1ybh908v3ncbl1ckmbvxrsh5s1b9l";
+  IosevkaCurly = "0yv6nr96dbq0pvs80mq6m3laagl70jqbk9szbvnwzwj1a5c6vnvq";
+  IosevkaCurlySlab = "0l1gls5kxiq1nxv68jnlww5ygi6qgi1h0dhnsd6xv2f0f85wvzc1";
+  IosevkaEtoile = "1hzg1jvjcql925bwwv99g3kjm31gq9jbkq4fap6m5x504aihcxni";
+  IosevkaSlab = "1wvp2r6972akxl20k5fjnkkj2kiv33k4g09gkgd97j40zsbk808j";
+  IosevkaSS01 = "00xw9cnzx4b054mmlphx949z3av47wykmkwjgaihnqv0j7yypwxg";
+  IosevkaSS02 = "0rrfy32r7ikkxr6b9b2zcb8a2441411fkgjj1k519ixr8zf6f3ja";
+  IosevkaSS03 = "02dnfjyjapgch45gydyyl7m9lcz85vx8csqkvxkxll93hmipippm";
+  IosevkaSS04 = "0rgk652607kh4i9xasjg8m1ll6qj6l7v2fw7bwb5xwi68s38b0kf";
+  IosevkaSS05 = "15sk5l8dchp5w9b2yw6w1kq90673pq147sid253wampjdrc7z222";
+  IosevkaSS06 = "1j9znczpz3hvxrzbm4zqh8vbv81sbar58ayh3dmv1bwgb5mq658m";
+  IosevkaSS07 = "1g6jrdwd5hf61wapix179ry22yzjc3g88vpqy6j5s2knq3l4ni6c";
+  IosevkaSS08 = "0drnqwnmkpazjhrp8v1ly2fix1x4paa11cy7yr6kc354bxb6krc1";
+  IosevkaSS09 = "0wvrwwg5md4jdxsxc9rc2r62sraixq4xdznb901iblzxylk5cfpp";
+  IosevkaSS10 = "0zg84i6kf88ahg6m6q9z9lpgh2bmphviciqcrky8bdcc7bda96zw";
+  IosevkaSS11 = "1b7bw2y5p48y0qks6dc8dxiva7xjz7mkzwnxw19jrwas5is4q8wr";
+  IosevkaSS12 = "1c8r8cz6s9wl3wcra42qajk6nnvzijwrvbhxah2b9q8qf5z1ycj5";
+  IosevkaSS13 = "1fa9q895rdgif3xrdx5hsgzynx0zwah33rvycnfvwgwcayi5jfj0";
+  IosevkaSS14 = "05cbb8qav3vyx79gri2naxlwg0b13phr8b3gg3iddklb4zck88ac";
+  IosevkaSS15 = "1k6wyk0w7gmc7z0p596lgfi8p9xi4m99nan2fhgzclkmvpyz07hx";
+  IosevkaSS16 = "117yh5n9kgqlyisfizr422z6ig7yxj0zkqlarjvbpdby5v541mv5";
+  IosevkaSS17 = "1smlyrynirjwcqw2ddx6zkkbdcvcjr8qqmmn9r011j794j9dhl75";
+  IosevkaSS18 = "1zdify73ziq7jcg26hj70z25ywmc1jp64zdnwjs2dwq5fhvl6lc9";
+  SGr-Iosevka = "11h20s9dl6hwz0vz8fk5m4cqzpw1dn97ys7imhp3clzj9nij6c9f";
+  SGr-IosevkaCurly = "06pr490jq0z84y7kj2hbfc3jl14xsawpjsxcyd33bb9ab9p1yzfc";
+  SGr-IosevkaCurlySlab = "02l3ppclgcw72hr90pw3skp7dr13qyx88qkf8w4ki4qyn0mbdjhv";
+  SGr-IosevkaFixed = "1arkc7yygskfywv9hwnz4jks6fsrw5fky6xznnbh840v524a9pmb";
+  SGr-IosevkaFixedCurly = "07mww0732w1in5v2g1m7r78q3yk7ivwlc2ckv4bqr76xf48vrwzb";
+  SGr-IosevkaFixedCurlySlab = "0y0mnxjh868nnlmn8m37078fjkjhv4242jqzvbxidknxz1giwcvc";
+  SGr-IosevkaFixedSlab = "1xfh54ybb3h95spdjf1ns5ps32hglhnrc4lfibn5dpvz1xdis94x";
+  SGr-IosevkaFixedSS01 = "1g9ymiixhs8axqbk44ggsiip0jcd48xy9i0fxlpqcwnclm31by1z";
+  SGr-IosevkaFixedSS02 = "0abvhswiflpd6lc7yx7dlr08z1d250asc1z6pc7f60f3vj6hlry5";
+  SGr-IosevkaFixedSS03 = "0wi7kacxrmjc96zpwxg3nnkdhfnwxn0ykaqwryi2h9x0va2dlxf6";
+  SGr-IosevkaFixedSS04 = "0pziw1jlzbd2d2f6aqxc4amzcwaps197w3f3kg0s0kk8gpbcksc8";
+  SGr-IosevkaFixedSS05 = "1nc2ps34hk1913snl77rx4sp7h8zcip2m4yr0b7ym6710n7mdj47";
+  SGr-IosevkaFixedSS06 = "1054z104prssjx8x4a5mbr384vkxc7xya9xpal7ffj50mhl9wivi";
+  SGr-IosevkaFixedSS07 = "1jpd5v445fbf02ngbgs4cxxid1cqya1gjspamiidfbz9ixyx0rib";
+  SGr-IosevkaFixedSS08 = "12d22n0lmbvyjj76igvmypr148rd62sfkxkf29xl4yjqawml1yia";
+  SGr-IosevkaFixedSS09 = "1x89d80gnf1g7fm593dn50w8lrgbplasmsc1g9y9628wn3x85zdw";
+  SGr-IosevkaFixedSS10 = "1cx5pk4rxpay140vjfsx1v32k5gp4dfkmh3kj4sl2yqarxbjy886";
+  SGr-IosevkaFixedSS11 = "00fynnbh7v3nn574a3a04bx41pghzbdqm6522pwdhwkqp35ds8fp";
+  SGr-IosevkaFixedSS12 = "18zrpy61axkyyigklkv652azfjl1v2nhs1qgakq20b1bwg28xbrp";
+  SGr-IosevkaFixedSS13 = "0c0y34v9bwfnprpv1pgml2ah5ichpwwk70c44qm3p53m6mjx44sw";
+  SGr-IosevkaFixedSS14 = "1q5wjj98my02kkdsqnqyndqc1crmv0ksiiv10pq0d12cl9748drn";
+  SGr-IosevkaFixedSS15 = "1qx644g8abpydb3bamlnxxilwv55j62xya88vq03pjzy94z9jpsc";
+  SGr-IosevkaFixedSS16 = "1pi7w0b5y7bbkjj7rhpi4isd7db37n2vzq1f1qd0mv9f7z9zic6i";
+  SGr-IosevkaFixedSS17 = "1afynn5j5k3lljlhl1pgglvcjfc14r0x64rk5nmh17j37fqypxs8";
+  SGr-IosevkaFixedSS18 = "0khaa4k4pyfp2p6vz9nnx4jp6ff0b260x17l6q7f2ahpf7lhnvvw";
+  SGr-IosevkaSlab = "03hzzl21p4m4yw4ad61q16ail2c53r8w6hazvyz0401pvnw75v7c";
+  SGr-IosevkaSS01 = "0y5ga8d8r7nqkjk6hk5hwki23920cf07v5dkx98x69f5y03l8y9a";
+  SGr-IosevkaSS02 = "1b4biawj8mz7klwp5dww7kw4l3kjd8wyzl9rdgvk74k4r60af404";
+  SGr-IosevkaSS03 = "0v592zg675a2ajf0v6vf3hmx1as7rb7s12lw9xzly0c15lry4zv4";
+  SGr-IosevkaSS04 = "19xg28zwnrbdwlngy5ac69jxf4g3di7di55irc8mg2mirfj2g8nj";
+  SGr-IosevkaSS05 = "0p49pidz9xr1xswxixib175gxdlphg6y3fvi5izg11xybr71yy2y";
+  SGr-IosevkaSS06 = "1x46df043i8z97m5s8j35nisyc5wj6ihqb4kyrxc2jqz0128bkjg";
+  SGr-IosevkaSS07 = "0pn6cdsig8nwza6z0dh19nrg83smxrlsjgqc8gsw41nxfbf121pv";
+  SGr-IosevkaSS08 = "091n2gmzrfqiav48gly7cz62q39nm2aym7yyyj627w4kswd9xfsh";
+  SGr-IosevkaSS09 = "1jsd3fw80fgq6jwcpf6cqpvd9s59lapgjy088rsb6pmww17gkd15";
+  SGr-IosevkaSS10 = "027f7f003gc05rls5zycywzknrbviaw3zm78fqzrd4ka8wm39fpp";
+  SGr-IosevkaSS11 = "076xiy33w5gf1gyhqc7ywzfasp7ibywmmff248r6jiishvk8c50p";
+  SGr-IosevkaSS12 = "0chgzb85f3l5c46fg301wm8353sga139i4qb0pb9gk7p2y5fzrhc";
+  SGr-IosevkaSS13 = "0ackkxyib1n4qmzp8bc88lqgymsv389x3fnas8d0idjp5zzivlgi";
+  SGr-IosevkaSS14 = "05gh1r39g01lvxgkdbv9awk009svlp94i490q8wj74c084y39mab";
+  SGr-IosevkaSS15 = "19w7zbgwzw58gqbqgkz57g5hbaaikailmwjjf51i0j4zbg9ycqx7";
+  SGr-IosevkaSS16 = "09qb2c9bqxwhqycl829pgx690dqqhmvjgkz1qhdpr2hfp9wscyx2";
+  SGr-IosevkaSS17 = "0ghfsfpq5j5rx86ggv4slsxfaz3x7j3hkh19671j799mhizwjf2v";
+  SGr-IosevkaSS18 = "0ahf8l7fg354ppi2ym59xbnxrm58k9lkclxa0idig2h7xqjcrfnc";
+  SGr-IosevkaTerm = "0ilqld2x7af90345i62j3m0agsnsbrldxqlvmavhm6wwv0r7m274";
+  SGr-IosevkaTermCurly = "0hy553x9s7w8i2zx3bi5ib8c7ia7zfb76236dy65s5i6jayvnpmr";
+  SGr-IosevkaTermCurlySlab = "1vqdagirfhab2ac534jpxw1hsk9svajpkfaak5q7rhiff6s919zb";
+  SGr-IosevkaTermSlab = "0m1lmfb7g11fpixar24njg575cza3zf8pq8qpnfchj1dz8yhfi7n";
+  SGr-IosevkaTermSS01 = "1wrixpzqi1midaybgwg7dr5fg5ijpby1i4b4dllwv3hh1h68dl1k";
+  SGr-IosevkaTermSS02 = "0bw5mx89mizdzgwhaslgyiaq5ivz2vadrdrhpvc5p2bbrq6vjk8f";
+  SGr-IosevkaTermSS03 = "1za8s20saxn6iyrsdngyqzfl4i2w3v7pg1drr5g02hx0z74pm3k8";
+  SGr-IosevkaTermSS04 = "0yx6mn584fmnilaksiwnkfs8gg96n6bd8igalsl7912kv5hgrl57";
+  SGr-IosevkaTermSS05 = "0yl41all8xl2h1jq6nfax2j9x5ncg5qzid8r77knz30a1x7k5kis";
+  SGr-IosevkaTermSS06 = "147ji66rhbii7jcs1hjzyiy0sk47iin5nwys9vpfc3cb8qbyxinp";
+  SGr-IosevkaTermSS07 = "1nvs5j5cqa3nn97akisr4li5iavxplj5ix102ay9pahh7699prxj";
+  SGr-IosevkaTermSS08 = "09yw7p07gmi6dykxwll5zgacsxgyd9nqsglkilpy726bqq1y9bm0";
+  SGr-IosevkaTermSS09 = "1373ana5i04y42phm8djvldqhxp23c560k58dplfmrijkxg9v9ah";
+  SGr-IosevkaTermSS10 = "01wppyqf41fk3v8wsb20m4xa10mmhjh1fqwvygkxg6bdhrls9h65";
+  SGr-IosevkaTermSS11 = "05shlbgcknwslm1h78qgcx0snr0gmb92hyc84h10jzrh2rhwpmdr";
+  SGr-IosevkaTermSS12 = "19q8mywksarwff4h9izcbl91swxskqcj1x6yagbyfd2v7wbmzhiw";
+  SGr-IosevkaTermSS13 = "07ix812bw4q6img8lnds5rq5z08sc39jkmpinwxgn6j1yz8fhsk6";
+  SGr-IosevkaTermSS14 = "17cwfqlx9962biypc7sqihx58645xgvs4bb1jkfvjz0rj8f699jq";
+  SGr-IosevkaTermSS15 = "16c0bpal9i2pjbgn4rwqbcwwzins5qp1llqjspi1967sn9v3y0nk";
+  SGr-IosevkaTermSS16 = "08r0jr98z8z3wh3p4pdd9249kggixina4v2cxyb886rqc5vj2263";
+  SGr-IosevkaTermSS17 = "1115qx8gafyxnmvf1m107sg048yy0k14787qv9l20y3h09kvi2qd";
+  SGr-IosevkaTermSS18 = "1pf151qwr9yh166fssv161ajkid75m2nl3p9y7b2189qvmds8a9m";
 }
@@ -5,17 +5,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "jql";
-  version = "8.0.3";
+  version = "8.0.4";

  src = fetchFromGitHub {
    owner = "yamafaktory";
    repo = pname;
    rev = "jql-v${version}";
-    hash = "sha256-Xnu7rw8C+NiF6vkEixt/RchlUjkswzN3E+Py0M7Xtyo=";
+    hash = "sha256-J+Zqmfev2DyD0SLFGaI0egVgmEC+a2nqBrNDGX4zNnE=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-4pWyQVrREDjk901ihpeDPjcApPt29Vc2zlJveA+36Jw=";
+  cargoHash = "sha256-tMxy0bi3518VjzJuy4Agpq+UydMEyJRqavX5kIsBYjY=";

  meta = with lib; {
    description = "JSON Query Language CLI tool built with Rust";
@@ -7,17 +7,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "kittycad-kcl-lsp";
-  version = "0.1.69";
+  version = "0.1.71";

  src = fetchFromGitHub {
    owner = "KittyCAD";
    repo = "kcl-lsp";
    tag = "v${version}";
-    hash = "sha256-qMVzOck0PgdphAAqXrrzC0gnxQXfzCa/3KEBnWB19mE=";
+    hash = "sha256-IQfR2B9HyZXEDKcp5J7466SRbq2qWS+eodtTKkgJprM=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-y36Xft21NkdlcLuxQRRENjAOW128+rcc47uUmB9wPVc=";
+  cargoHash = "sha256-OlAy/WqoLRwkk1x4dOXE8MzBzeLyofQDVv81aR/sIMQ=";

  nativeBuildInputs = [ pkg-config ];

@@ -7,15 +7,15 @@

 buildGoModule rec {
  pname = "konstraint";
-  version = "0.40.0";
+  version = "0.41.0";

  src = fetchFromGitHub {
    owner = "plexsystems";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-xSDJ9UaAYjsyEy+VGOQNrJSYh+Fulp+vDnXxPjRSotk=";
+    sha256 = "sha256-45zCzjzbKYLsLxmo7yGbbyeYP1WyULD9d+nnNLP9Zzo=";
  };
-  vendorHash = "sha256-pb34eqOmGBdYMRw8mIP4upnKEhevxoCkPVnH9E7W2Q8=";
+  vendorHash = "sha256-ZPK3+x0GOMs2RXxIs90BvEg25lb/j11J9zECaMHg4zY=";

  # Exclude go within .github folder
  excludedPackages = ".github";
@@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "kubevela";
-  version = "1.10.1";
+  version = "1.10.2";

  src = fetchFromGitHub {
    owner = "kubevela";
    repo = "kubevela";
    rev = "v${version}";
-    hash = "sha256-McQz9K0l5RVvBF9X9r/p2yzpC463Eyi7jYk1fiWO+TU=";
+    hash = "sha256-YfIYQSJynI4Ou4oiq7yxZlfdCnpuwsuUUPYKDmFdIKg=";
  };

-  vendorHash = "sha256-hlNGkE3/PzRSdJyyoJdcoDPa6UUUU55z2Ql8tD5dE3I=";
+  vendorHash = "sha256-iBhRvlG4agErynZMEFu6XWYK3c657GiOwcn5bw4VtQA=";

  ldflags = [
    "-s" "-w"
@@ -14,13 +14,13 @@

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

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc-tweaks-gtk";
-    rev = "5b811cc25dac6a024a50175ef56c4831883965d9";
-    hash = "sha256-wBiHcSYczOjSm9X46oOUt1rRm0QioHOovbPMZMnLYmM=";
+    rev = "24635c72d4da21df0b66fa23fb4a15686d257521";
+    hash = "sha256-rDmY4+xUBv6Vw150X/3rP5bhW8Dmd8zEAyt86/c1+ss=";
  };

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

 stdenv.mkDerivation rec {
  pname = "libelfin";
-  version = "unstable-2018-08-25";
+  version = "0.3-unstable-2024-03-11";

  src = fetchFromGitHub {
    owner = "aclements";
-    repo = pname;
-    rev = "ac45a094fadba77ad840063fb7aab82571546be0";
-    sha256 = "143x680c6hsy51kngs04ypg4ql3lp498llcwj4lh1v0qp5qvjhyz";
+    repo = "libelfin";
+    rev = "e0172767b79b76373044118ef0272b49b02a0894";
+    hash = "sha256-xb5/DM2XOFM/w71OwRC/sCRqOSQvxVL1SS2zj2+dD/U=";
  };

  patches = [
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {

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

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/aclements/libelfin/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
    description = "C++11 ELF/DWARF parser";
-    maintainers = [ ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
  };
 }
@@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "libmysqlconnectorcpp";
-  version = "9.1.0";
+  version = "9.2.0";

  src = fetchurl {
    url = "mirror://mysql/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
-    hash = "sha256-cPtsoorBVKV4QJCz2MxPkWNsIIzwfAAA49IvcrVXvhM=";
+    hash = "sha256-JJ6sLHfy5HgODWGxw/ZxrJPMbjfu58nLgWVZMOOjhDU=";
  };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "libpqxx";
-  version = "7.9.2";
+  version = "7.10.0";

  src = fetchFromGitHub {
    owner = "jtv";
    repo = "libpqxx";
    rev = finalAttrs.version;
-    hash = "sha256-I5e0iqXlZqDOMa1PlnrxpcKt1c2mbnSbVQrpi1Gh25o=";
+    hash = "sha256-llsnd1bxAyiEgo9PfWYdQp1RPPk1oF/02IgMvPhodZ0=";
  };

  outputs = [
@@ -10,14 +10,14 @@

 stdenv.mkDerivation rec {
  pname = "libslirp";
-  version = "4.8.0";
+  version = "4.9.0";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "slirp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-t2LpOPx+S2iABQv3+xFdHj/FjWns40cNKToDKMZhAuw=";
+    sha256 = "sha256-Eqdw6epFkLv4Dnw/s1pcKW0P70ApZwx/J2VkCwn50Ew=";
  };

  separateDebugInfo = true;
@@ -6,11 +6,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "lxgw-neoxihei";
-  version = "1.213";
+  version = "1.214";

  src = fetchurl {
    url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-5vztvpOkUMbnZb7apT19ksLQlro7lQeT0iTqGjlPJdM=";
+    hash = "sha256-hIor7mkGdAo+WBDhdnT3IZGP0o3/vYtgUS7AJ5Si1PQ=";
  };

  dontUnpack = true;
@@ -3,23 +3,19 @@
  rustPlatform,
  fetchFromGitHub,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "markdown-oxide";
  version = "0.25.1";

  src = fetchFromGitHub {
    owner = "Feel-ix-343";
    repo = "markdown-oxide";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-hgXqJwmIpXJNIl67Jjbg5MR4PlwB5XbqnFo+rNLoqbE=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "tower-lsp-0.20.0" = "sha256-QRP1LpyI52KyvVfbBG95LMpmI8St1cgf781v3oyC3S4=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-o4wn6L5PVZM0SN8kA34NOp6ogTSoCv2xiN4vfj+ptc8=";

  meta = {
    description = "Markdown LSP server inspired by Obsidian";
@@ -28,7 +24,8 @@ rustPlatform.buildRustPackage rec {
    maintainers = with lib.maintainers; [
      linsui
      jukremer
+      HeitorAugustoLN
    ];
    mainProgram = "markdown-oxide";
  };
-}
+})
@@ -2,34 +2,23 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
-  pkg-config,
  freerdp,
-  openssl,
  libssh2,
+  openssl,
+  pkg-config,
 }:

 stdenv.mkDerivation rec {
-  pname = "medusa-unstable";
-  version = "2018-12-16";
+  pname = "medusa";
+  version = "2.3";

  src = fetchFromGitHub {
    owner = "jmk-foofus";
    repo = "medusa";
-    rev = "292193b3995444aede53ff873899640b08129fc7";
-    sha256 = "0njlz4fqa0165wdmd5y8lfnafayf3c4la0r8pf3hixkdwsss1509";
+    tag = version;
+    hash = "sha256-devirQMmS8mtxT5H5XafRRvCyfcvwoWxtTp0V1SJeSM=";
  };

-  patches = [
-    # Pull upstream fix for -fno-common tollchains like gcc-10:
-    #  https://github.com/jmk-foofus/medusa/pull/36
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/jmk-foofus/medusa/commit/a667656ad085b3eb95309932666c250d97a92767.patch";
-      sha256 = "01marqqhjd3qwar3ymp50y1h2im5ilgpaxk7wrc2kcxgmzvbdfxc";
-    })
-  ];
-
  outputs = [
    "out"
    "man"
@@ -38,6 +27,7 @@ stdenv.mkDerivation rec {
  configureFlags = [ "--enable-module-ssh=yes" ];

  nativeBuildInputs = [ pkg-config ];
+
  buildInputs = [
    freerdp
    openssl
@@ -45,10 +35,11 @@ stdenv.mkDerivation rec {
  ];

  meta = with lib; {
-    homepage = "https://github.com/jmk-foofus/medusa";
    description = "Speedy, parallel, and modular, login brute-forcer";
-    mainProgram = "medusa";
+    homepage = "https://github.com/jmk-foofus/medusa";
+    changelog = "https://github.com/jmk-foofus/medusa/releases/tag/${src.tag}";
    license = licenses.gpl2Plus;
    maintainers = [ ];
+    mainProgram = "medusa";
  };
 }
@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "minijinja";
-  version = "2.7.0";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "mitsuhiko";
    repo = "minijinja";
    rev = version;
-    hash = "sha256-8MKd1sT+zg03tkKppd8/Zu6ZZWoVTMTmQXSrcDKp0xw=";
+    hash = "sha256-U/cncTfMyEvJbD+pr4kUxHcdsf9BxnMcL5bNvE8ard4=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-cOaHJsgzCTxY1JGpSamajyWfmAc+M+s2OS5xhcvUN8I=";
+  cargoHash = "sha256-Pbb2cq7IEA1ZqWnHoOtIRgBDXf6GjT7G8plswlWG2Ko=";

  # The tests relies on the presence of network connection
  doCheck = false;
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "mqtt-exporter";
-  version = "1.6.1";
+  version = "1.7.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "kpetremann";
    repo = "mqtt-exporter";
    tag = "v${version}";
-    hash = "sha256-XTgnD3H48KKclPhfmBPiWQPaJkfiBxjq2YQusOPLFJQ=";
+    hash = "sha256-aEuwJeNMB6sou6oyAwCj11lOdMCjCyEsrDcMF/pHzcg=";
  };

  pythonRelaxDeps = [ "prometheus-client" ];
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = {
    description = "Generic MQTT Prometheus exporter for IoT";
    homepage = "https://github.com/kpetremann/mqtt-exporter";
-    changelog = "https://github.com/kpetremann/mqtt-exporter/releases/tag/v${version}";
+    changelog = "https://github.com/kpetremann/mqtt-exporter/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
    mainProgram = "mqtt-exporter";
@@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "neatvnc";
-  version = "0.9.3";
+  version = "0.9.4";

  src = fetchFromGitHub {
    owner = "any1";
    repo = "neatvnc";
    rev = "v${version}";
-    hash = "sha256-1ouvhMCjKsrnjD5/E13BFKXw7i0cDGOhsbcyuHNyWYI=";
+    hash = "sha256-D9dwD5i9mScc5vn0mUxe7+0cxMI65F7LyivXn9J0aic=";
  };

  strictDeps = true;
@@ -4,7 +4,7 @@
  buildEnv,
  makeWrapper,
  writers,
-  treefmt2,
+  treefmt,
  nixfmt-rfc-style,
  nixfmt-tree,

@@ -27,7 +27,7 @@ buildEnv {
  name = "nixfmt-tree";

  # Allows this derivation to be used as a shell providing both treefmt and nixfmt
-  paths = [ treefmt2 ] ++ runtimePackages;
+  paths = [ treefmt ] ++ runtimePackages;
  pathsToLink = [ "/bin" ];

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

 rustPlatform.buildRustPackage rec {
  pname = "nixpacks";
-  version = "1.33.0";
+  version = "1.34.0";

  src = fetchFromGitHub {
    owner = "railwayapp";
    repo = "nixpacks";
    rev = "v${version}";
-    hash = "sha256-YI/4hr1910ScL3HvjiijRmFq4P3xMxn3el1xPd7i53o=";
+    hash = "sha256-pCCyGFAeeRV9OV6bp5KIUb8/ZD7mktBR0pV+bB14AZc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-WQqGKkOSmbAcVoVVxL9YdNl9DnirNKGsg5d+s9uwTWc=";
+  cargoHash = "sha256-/Q92s2I/JG745Nd2ZewKx4P/SMdyhXIMsR4oa7TImm8=";

  # skip test due FHS dependency
  doCheck = false;
@@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "osinfo-db";
-  version = "20240701";
+  version = "20250124";

  src = fetchurl {
    url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    hash = "sha256-HXOBpy8MRfRzvvpKkvoBCjf8T3srtdH2jgbaRA72kF0=";
+    hash = "sha256-fKcX8JdaeYE1orOe790UNqCwaC4paFx/0B73+DolclA=";
  };

  nativeBuildInputs = [
@@ -8,21 +8,21 @@
  enableShared ? !stdenv.hostPlatform.isStatic,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "paho.mqtt.c";
-  version = "1.3.13";
+  version = "1.3.14";

  src = fetchFromGitHub {
    owner = "eclipse";
    repo = "paho.mqtt.c";
-    rev = "v${version}";
-    hash = "sha256-dKQnepQAryAjImh2rX1jdgiKBtJQy9wzk/7rGQjUtPg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-42P55qzt3FUp6yQdsP82va0wXg0EWDRGL/KuZpjp04g=";
  };

  postPatch = ''
    substituteInPlace src/MQTTVersion.c \
-      --replace "namebuf[60]" "namebuf[120]" \
-      --replace "lib%s" "$out/lib/lib%s"
+      --replace-warn "namebuf[60]" "namebuf[120]" \
+      --replace-warn "lib%s" "$out/lib/lib%s"
  '';

  nativeBuildInputs = [ cmake ];
@@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
    (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared)
  ];

-  meta = with lib; {
+  meta = {
    description = "Eclipse Paho MQTT C Client Library";
    mainProgram = "MQTTVersion";
    homepage = "https://www.eclipse.org/paho/";
-    license = licenses.epl20;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.epl20;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
  };
-}
+})
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "paho.mqtt.cpp";
-  version = "1.4.1";
+  version = "1.5.1";

  src = fetchFromGitHub {
    owner = "eclipse";
    repo = "paho.mqtt.cpp";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-xP3M7d7ig19kP7MfOgI0S3UHGgzkJZyv4F+ayXqMtuE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LJ2V+TIVKCNftBk4fK0rCsuNudYg9dSYw/MAL+/raz0=";
  };

  nativeBuildInputs = [ cmake ];
@@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared)
  ];

-  meta = with lib; {
+  meta = {
    description = "Eclipse Paho MQTT C++ Client Library";
    homepage = "https://www.eclipse.org/paho/";
-    license = licenses.epl10;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.epl10;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
  };
 })
@@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "pdf2svg";
-  version = "0.2.3";
+  version = "0.2.4";

  src = fetchFromGitHub {
    owner = "db9052";
    repo = "pdf2svg";
    rev = "v${version}";
-    sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k";
+    sha256 = "sha256-zME0U+PyENnoLyjo9W2i2MRM00wNmHkYcR2LMEtTbBY=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,103 @@
+diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs
+index f6f1209..e08490b 100644
+--- a/src-tauri/src/qf_client/modules/analytics.rs
+++ b/src-tauri/src/qf_client/modules/analytics.rs
+@@ -115,52 +115,6 @@ impl AnalyticsModule {
+                         }
+                     };
+                 }
+-                loop {
+-                    let send_metrics = qf.analytics().send_metrics;
+-                    if !send_metrics {
+-                        tokio::time::sleep(std::time::Duration::from_secs(60)).await;
+-                        continue;
+-                    }
+-                    if last_metric_time.elapsed() > Duration::from_secs(15)
+-                        || qf.analytics().is_user_active()
+-                    {
+-                        if last_metric_time.elapsed() > Duration::from_secs(60)
+-                            && qf.analytics().is_user_active()
+-                        {
+-                            continue;
+-                        }
+-
+-                        last_metric_time = Instant::now();
+-                        logger::info_con(
+-                            &qf.analytics().get_component("TrySendAnalytics"),
+-                            "Sending user activity",
+-                        );
+-                        match qf
+-                            .analytics()
+-                            .try_send_analytics(
+-                                "metrics/periodic",
+-                                3,
+-                                json!(qf.analytics().metricAndLabelPairsScheduledToSend),
+-                            )
+-                            .await
+-                        {
+-                            Ok(_) => {
+-                                qf.analytics().clear_metrics();
+-                            }
+-                            Err(e) => {
+-                                if e.cause().contains("Unauthorized")
+-                                    || e.cause().contains("Banned")
+-                                    || e.cause().contains("WFMBanned")
+-                                {
+-                                    error::create_log_file("analytics.log".to_string(), &e);
+-                                    break;
+-                                }
+-                                error::create_log_file("analytics.log".to_string(), &e);
+-                            }
+-                        };
+-                    }
+-                    tokio::time::sleep(std::time::Duration::from_secs(5)).await;
+-                }
+                 qf.analytics().is_init = false;
+             }
+         });
+@@ -176,44 +130,6 @@ impl AnalyticsModule {
+         mut retry_count: i64,
+         data: Value,
+     ) -> Result<(), AppError> {
+-        let mut parameters: Vec<String> = vec![];
+-        if self.is_user_active() {
+-            parameters.push(format!("Active_Page={}", self.current_page));
+-        }
+-
+-        while retry_count >= 0 {
+-            let err = match self
+-                .client
+-                .post::<Value>(
+-                    format!("analytics/{}?{}", url, parameters.join("&")).as_str(),
+-                    data.clone(),
+-                )
+-                .await
+-            {
+-                Ok(ApiResult::Success(_, _)) => {
+-                    return Ok(());
+-                }
+-                Ok(ApiResult::Error(e, _headers)) => AppError::new_api(
+-                    &self.get_component("TrySendAnalytics"),
+-                    e,
+-                    eyre!("Failed to send analytics"),
+-                    LogLevel::Error,
+-                ),
+-                Err(e) => e,
+-            };
+-            if retry_count == 0 {
+-                return Err(err);
+-            }
+-            retry_count -= 1;
+-            logger::warning_con(
+-                &self.get_component("TrySendAnalytics"),
+-                &format!(
+-                    "Failed to send analytics, retrying in 5 seconds, retries left: {}",
+-                    retry_count
+-                ),
+-            );
+-            tokio::time::sleep(std::time::Duration::from_secs(5)).await;
+-        }
+-        Ok(())
+        return Ok(());
+     }
+ }
@@ -0,0 +1,76 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cargo-tauri_1,
+  nodejs,
+  pnpm_9,
+  pkg-config,
+  glib-networking,
+  openssl,
+  webkitgtk_4_0,
+  wrapGAppsHook3,
+  libsoup_2_4,
+  libayatana-appindicator,
+  gtk3,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "quantframe";
+  version = "1.3.4";
+
+  src = fetchFromGitHub {
+    owner = "Kenya-DK";
+    repo = "quantframe-react";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/cjlYQHb23DY4RSjc2HosTar6p1epsqlWQX6TlrzSe8=";
+  };
+
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+  '';
+
+  patches = [
+    ./0001-disable-telemetry.patch
+  ];
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-4uyjvwvrMDe+86wcB7MBBWWc4NGKzqBsgG3TScf7BMk=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-mtHbWTNrWh4hq4IAncE9TCWr7sozIy2zf3DK3WN7wqI=";
+
+  nativeBuildInputs = [
+    cargo-tauri_1.hook
+
+    pkg-config
+    wrapGAppsHook3
+
+    nodejs
+    pnpm_9.configHook
+  ];
+
+  buildInputs = [
+    openssl
+    libsoup_2_4
+    glib-networking
+    gtk3
+    libayatana-appindicator
+    webkitgtk_4_0
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  meta = {
+    description = "Warframe Market listings and transactions manager";
+    mainProgram = "quantframe";
+    homepage = "https://quantframe.app/";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nyukuru ];
+  };
+})
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "rootlesskit";
-  version = "2.3.1";
+  version = "2.3.2";

  src = fetchFromGitHub {
    owner = "rootless-containers";
    repo = "rootlesskit";
    rev = "v${version}";
-    hash = "sha256-5aQwXNtGAZuVwOpX700VVFTxM/kxOT6c1NtpJR4s1xQ=";
+    hash = "sha256-NovlOvR+nOx1J6R63LTiXoiCy9JJBKwGtTiVV5xx/1E=";
  };

-  vendorHash = "sha256-Wj3wthDMNkuWVWFIqRsVUeJfoUvjyyu2gCvFBjh8mGw=";
+  vendorHash = "sha256-o4STAcsxR5iOQaHKlg41ol8gsEfDLB9Yox4wFGO0FSQ=";

  passthru = {
    updateScript = nix-update-script { };
@@ -2,12 +2,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "scdl";
-  version = "2.12.3";
+  version = "2.12.4";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-24X+UAabxjyUYF/0qgXEpHgBNXDNn/q8/Nxw2jXKQdM=";
+    hash = "sha256-5+3ok7UcJEdUW45bdPGkkvk+k/NYIpEi0URNuQ6e0vk=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -22,7 +22,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "spotube";
-  version = "3.9.0";
+  version = "4.0.0";

  src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};

@@ -93,19 +93,19 @@ stdenv.mkDerivation (finalAttrs: {
    {
      "aarch64-linux" = fetchArtifact {
        filename = "Spotube-linux-aarch64.deb";
-        hash = "sha256-KBuUAgUU6c/rBkkbpYjSarzckIoi+gRtCkumvtaoras=";
+        hash = "sha256-q+0ah6C83zVdrWWMmaBvZebRQP0Ie83Ewp7hjnp2NPw=";
      };
      "x86_64-linux" = fetchArtifact {
        filename = "Spotube-linux-x86_64.deb";
-        hash = "sha256-vzzK3csyKYP6fKKIoysziBsc2tqrg5LXS/6KoXBtNVI=";
+        hash = "sha256-pk+xi7y0Qilmzk70T4u747zzFn4urZ6Kwuiqq+/q8uM=";
      };
      "x86_64-darwin" = fetchArtifact {
        filename = "Spotube-macos-universal.dmg";
-        hash = "sha256-wwIIKY+bmMJZigc2AK/QMg142uvZ+D6LOddzedJM5f8=";
+        hash = "sha256-ielRdH+D1QdrKH4OxQFdw6rpzURBs/dRf/synS/Vrdk=";
      };
      "aarch64-darwin" = fetchArtifact {
        filename = "Spotube-macos-universal.dmg";
-        hash = "sha256-wwIIKY+bmMJZigc2AK/QMg142uvZ+D6LOddzedJM5f8=";
+        hash = "sha256-ielRdH+D1QdrKH4OxQFdw6rpzURBs/dRf/synS/Vrdk=";
      };
    };

@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "sqldef";
-  version = "0.17.32";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "sqldef";
    repo = "sqldef";
    rev = "v${version}";
-    hash = "sha256-xGFepNalT2UIIFYh9BQnFzvC1SxlcLDxMX+zGEutD+I=";
+    hash = "sha256-eg2iy0vQyg7ZyTejgmJEKD1s6b2ikk7gMFIEudn2PZs=";
  };

  proxyVendor = true;
@@ -15,11 +15,11 @@

 stdenv.mkDerivation rec {
  pname = "tdb";
-  version = "1.4.12";
+  version = "1.4.13";

  src = fetchurl {
    url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
-    hash = "sha256-bOSydJiBLQkjfs5loNbfrAlBYQ5wmEjsuCKqJBCEzXo=";
+    hash = "sha256-XuJ252RNcT4Z5LatwAtECvtYUf8h5lgh/67YnhWl4Wc=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,85 @@
+diff --git a/Makefile b/Makefile
+index a6a140f..fb9a8b9 100644
+--- a/Makefile
+++ b/Makefile
+@@ -518,7 +518,7 @@ src/po/%.po: _build/toppler.pot
+ # TODO dist and windist..
+ 
+ .PHONY: install
+-install: toppler.dat toppler $(TRANSLATIONFILES_INST)
+install: toppler $(TRANSLATIONFILES_INST)
+ 	$(INSTALL) -m755 -d $(DESTDIR)$(PKGDATADIR)
+ 	$(INSTALL) -m755 -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m755 -d $(DESTDIR)$(MANDIR)/man6
+diff --git a/src/decl.cc b/src/decl.cc
+index f80f83e..8a7bbd9 100644
+--- a/src/decl.cc
+++ b/src/decl.cc
+@@ -22,6 +22,7 @@
+ #include <SDL.h>
+ 
+ #include <cstdlib>
+#include <algorithm>
+ #include <cstring>
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff --git a/src/keyb.cc b/src/keyb.cc
+index c3c13df..7d37847 100644
+--- a/src/keyb.cc
+++ b/src/keyb.cc
+@@ -156,7 +156,7 @@ static void handleEvents(void) {
+       mouse_button = e.button.button;
+       break;
+     case SDL_QUIT:
+-      fprintf(stderr, _("Wheee!!\n").c_str());
+      fprintf(stderr, "%s", _("Wheee!!\n").c_str());
+       exit(0);
+       break;
+ 
+diff --git a/src/level.cc b/src/level.cc
+index e1e2bb8..ac2faf3 100644
+--- a/src/level.cc
+++ b/src/level.cc
+@@ -27,6 +27,7 @@
+ #endif
+ 
+ #include "decl.h"
+#include <algorithm>
+ 
+ #ifdef _WIN32
+ #include <direct.h>
+diff --git a/src/main.cc b/src/main.cc
+index 522d041..ffc8e40 100644
+--- a/src/main.cc
+++ b/src/main.cc
+@@ -46,7 +46,7 @@ static bool parse_arguments(int argc, char *argv[]) {
+       if (parm >= '0' && parm <= '9') {
+         printf(_("Debug level is now %c.\n").c_str(), parm);
+         config.debug_level(parm - '0');
+-      } else printf(_("Illegal debug level value, using default.\n").c_str());
+      } else printf("%s", _("Illegal debug level value, using default.\n").c_str());
+     } else {
+       printhelp();
+       return false;
+@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
+     atexit(QuitFunction);
+     srand(time(0));
+     startgame();
+-    printf(_("Thanks for playing!\n").c_str());
+    printf("%s", _("Thanks for playing!\n").c_str());
+     SDL_ShowCursor(mouse);
+     SDL_Quit();
+   }
+diff --git a/src/screen.cc b/src/screen.cc
+index eb18543..ce23571 100644
+--- a/src/screen.cc
+++ b/src/screen.cc
+@@ -30,6 +30,8 @@
+ #include "keyb.h"
+ #include "configuration.h"
+ 
+#include <algorithm>
+
+ static SDL_Surface *display = nullptr;
+ static SDL_Window *sdlWindow = nullptr;
+ static SDL_Renderer *sdlRenderer = nullptr;
@@ -0,0 +1,91 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  nix-update-script,
+  writableTmpDirAsHomeHook,
+
+  buildPackages,
+  pkg-config,
+  gettext,
+  povray,
+  imagemagick,
+  gimp,
+
+  sdl2-compat,
+  SDL2_mixer,
+  SDL2_image,
+  libpng,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "toppler";
+  version = "1.3";
+
+  src = fetchFromGitLab {
+    owner = "roever";
+    repo = "toppler";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330=";
+  };
+
+  strictDeps = true;
+  enableParallelBuilding = true;
+
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+    pkg-config
+    sdl2-compat
+    SDL2_image
+    libpng
+    zlib
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    povray
+    imagemagick
+    gimp
+    # GIMP needs a writable home
+    writableTmpDirAsHomeHook
+  ];
+
+  buildInputs = [
+    sdl2-compat
+    SDL2_mixer
+    zlib
+  ];
+
+  patches = [
+    # Based on https://gitlab.com/roever/toppler/-/merge_requests/3
+    ./gcc14.patch
+  ];
+
+  makeFlags = [
+    "CXX_NATIVE=$(CXX_FOR_BUILD)"
+    "PKG_CONFIG_NATIVE=$(PKG_CONFIG_FOR_BUILD)"
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  preBuild = ''
+    # The `$` is escaped in `makeFlags` so using it for these parameters results in infinite recursion
+    makeFlagsArray+=(CXX=$CXX PKG_CONFIG=$PKG_CONFIG);
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Jump and run game, reimplementation of Tower Toppler/Nebulus";
+    homepage = "https://gitlab.com/roever/toppler";
+    license = with lib.licenses; [
+      gpl2Plus
+      # Makefile
+      gpl3Plus
+    ];
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
+    mainProgram = "toppler";
+  };
+})
@@ -1,27 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "treefmt";
-  version = "0.6.1";
-
-  src = fetchFromGitHub {
-    owner = "numtide";
-    repo = "treefmt";
-    rev = "v${version}";
-    hash = "sha256-icAe54Mv1xpOjUPSk8QDZaMk2ueNvjER6UyJ9uyUL6s=";
-  };
-
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-OLKqfAYHGgEkjU5lVkbuH2eVZIZ3cw9w9n4/MkqbX/8=";
-
-  meta = {
-    description = "one CLI to format the code tree";
-    homepage = "https://github.com/numtide/treefmt";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.zimbatm ];
-    mainProgram = "treefmt";
-  };
-}
@@ -40,14 +40,14 @@ let
  inherit (lib) optional optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  version = "1.34.1";
+  version = "1.34.2";
  pname = "unit";

  src = fetchFromGitHub {
    owner = "nginx";
    repo = pname;
    rev = version;
-    sha256 = "sha256-p3n0j/sZr+aLwfZuXTbb5+J4T48FWdsZBbSH3Yiex9g=";
+    sha256 = "sha256-tu1JqGWtfTznTDmZqEEVF3FmiDEXvaAdgQPsvLHCWy8=";
  };

  nativeBuildInputs = [ which ];
@@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "wabt";
-  version = "1.0.36";
+  version = "1.0.37";

  src = fetchFromGitHub {
    owner = "WebAssembly";
    repo = "wabt";
    rev = version;
-    hash = "sha256-CswVvL6yxTf0ju/UPvEGMgTuNZ8mumSIcnVbYVfy178=";
+    hash = "sha256-Ejr+FxaYRDI01apHhKTs11iwcv72a8ZxyPmVetEvadU=";
    fetchSubmodules = true;
  };

@@ -33,7 +33,7 @@
 let
  selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
  pname = "waveterm";
-  version = "0.11.0";
+  version = "0.11.1";

  passthru.updateScript = ./update.sh;

@@ -64,8 +64,8 @@ let
      fetchurl {
        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb";
        hash = selectSystem {
-          x86_64-linux = "sha256-4GKsO7gIQaIC7e7IH1QgIpXQqIX6NHyw8wXO0OWXRUI=";
-          aarch64-linux = "sha256-xbNBNwQNBwvAcx/sp8bchNtqUpXXILZADOr2wwQOrPk=";
+          x86_64-linux = "sha256-At6mNL1M0/zcDb+IbQi0+eUAGMcCmgLYk6XAlU1+8cw=";
+          aarch64-linux = "sha256-N6tTCfB9MqDX+OnFmuYbWs0XKEmQH7PSGuCadjM8Rmg=";
        };
      };

@@ -142,8 +142,8 @@ let
      fetchurl {
        url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
        hash = selectSystem {
-          x86_64-darwin = "sha256-qmBNZ6ovvDd2Kv3l94kl/p05xnSN21mjPTwzDP21Knc=";
-          aarch64-darwin = "sha256-GyLXmoBVpVKdrZcJGtVNxBk8vqsssAhNF+YNgnL6oVY=";
+          x86_64-darwin = "sha256-QkSsoMW0Ry4aLF9XtRpC7pIY84WAhtCbZGBZ1RCeMN8=";
+          aarch64-darwin = "sha256-mVVThER1h0EB0ONNTxaBrSvAU9PP35MSPc0eW4mfJXo=";
        };
      };

@@ -0,0 +1,123 @@
+diff --git a/include/libc.h b/include/libc.h
+index d056f70..1a2679d 100644
+--- a/include/libc.h
+++ b/include/libc.h
+@@ -60,3 +60,8 @@ extern	int	notify (void(*)(void *, char *));
+ extern	int	errstr(char *);
+ extern	char*	getuser(void);
+ extern	void	exits(char*);
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+diff --git a/libXg/arith.c b/libXg/arith.c
+index 5cf6f65..5fe0703 100644
+--- a/libXg/arith.c
+++ b/libXg/arith.c
+@@ -107,17 +107,20 @@ rshift(Rectangle r, int a)
+ 	return r;
+ }
+ 
+int
+ eqpt(Point p, Point q)
+ {
+ 	return p.x==q.x && p.y==q.y;
+ }
+ 
+int
+ eqrect(Rectangle r, Rectangle s)
+ {
+ 	return r.min.x==s.min.x && r.max.x==s.max.x &&
+ 	       r.min.y==s.min.y && r.max.y==s.max.y;
+ }
+ 
+int
+ rectXrect(Rectangle r, Rectangle s)
+ {
+ 	return r.min.x<s.max.x && s.min.x<r.max.x &&
+@@ -134,6 +137,7 @@ rectinrect(Rectangle r, Rectangle s)
+ 	return r.max.x<=s.max.x && r.max.y<=s.max.y;
+ }
+ 
+int
+ ptinrect(Point p, Rectangle r)
+ {
+ 	return p.x>=r.min.x && p.x<r.max.x &&
+diff --git a/libXg/clipline.c b/libXg/clipline.c
+index b8bbaad..dd3870a 100644
+--- a/libXg/clipline.c
+++ b/libXg/clipline.c
+@@ -133,6 +133,7 @@ gsetline(Point *pp0, Point *pp1, Linedesc *l)
+  */
+ 
+ static
+int
+ code(Point *p, Rectangle *r)
+ {
+ 	return( (p->x<r->min.x? 1 : p->x>=r->max.x? 2 : 0) |
+diff --git a/libXg/gcs.c b/libXg/gcs.c
+index 4d7d3d6..959cfbe 100644
+--- a/libXg/gcs.c
+++ b/libXg/gcs.c
+@@ -160,7 +160,7 @@ GC
+ _getgc(Bitmap *b, unsigned long gcvm, XGCValues *pgcv)
+ {
+ 	static GC gc0, gcn;
+-	static clipset = 0;
+	static int clipset = 0;
+ 	GC g;
+ 	XRectangle xr;
+ 
+diff --git a/libXg/gwin.c b/libXg/gwin.c
+index 24abb61..172cb46 100644
+--- a/libXg/gwin.c
+++ b/libXg/gwin.c
+@@ -25,6 +25,9 @@ static void Keyaction(Widget, XEvent *, String *, Cardinal*);
+ static void Mouseaction(Widget, XEvent *, String *, Cardinal*);
+ static String SelectSwap(Widget, String);
+ 
+long unicode(unsigned char *k);
+long latin1(unsigned char *k);
+
+ /* Data */
+ 
+ #define Offset(field) XtOffsetOf(GwinRec, gwin.field)
+diff --git a/libXg/rectclip.c b/libXg/rectclip.c
+index 9e03614..ae01bf6 100644
+--- a/libXg/rectclip.c
+++ b/libXg/rectclip.c
+@@ -2,6 +2,7 @@
+ #include <libc.h>
+ #include <libg.h>
+ 
+int
+ rectclip(Rectangle *rp, Rectangle b)		/* first by reference, second by value */
+ {
+ 	Rectangle *bp = &b;
+diff --git a/libXg/xtbinit.c b/libXg/xtbinit.c
+index a711319..2870805 100644
+--- a/libXg/xtbinit.c
+++ b/libXg/xtbinit.c
+@@ -127,6 +127,12 @@ ioerr(Display *d)
+ 	return 0;
+ }
+ 
+static
+int ioerr_wrapped(Display *d, XErrorEvent *_)
+{
+    return ioerr(d);
+}
+
+ void
+ xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
+ {
+@@ -174,7 +180,7 @@ xtbinit(Errfunc f, char *class, int *pargc, char **argv, char **fallbacks)
+ 	XtSetArg(args[n], XtNcomposeMod, &compose);	n++;
+ 	XtGetValues(widg, args, n);
+ 	XSetIOErrorHandler(ioerr);
+-	XSetErrorHandler(ioerr);
+	XSetErrorHandler(ioerr_wrapped);
+ 
+ 	if (compose < 0 || compose > 5) {
+ 		n = 0;
@@ -20,13 +20,7 @@ stdenv.mkDerivation rec {
    libXt
  ];

-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.cc.isClang [
-      "-Wno-error=implicit-int"
-      "-Wno-error=implicit-function-declaration"
-      "-Wno-error=incompatible-function-pointer-types"
-    ]
-  );
+  patches = [ ./fix-gcc14-build.patch ];

  preInstall = ''
    mkdir -p $out/bin
@@ -12,11 +12,11 @@

 stdenv.mkDerivation rec {
  pname = "libwpe";
-  version = "1.16.0";
+  version = "1.16.2";

  src = fetchurl {
    url = "https://wpewebkit.org/releases/libwpe-${version}.tar.xz";
-    sha256 = "sha256-x/OjxrPQBnkNSG3HzO2ittLjKd4H8zvEffxT8A8zSyo=";
+    sha256 = "sha256-lgvdEcPyz1vZFWlgPtbSqkL9QADtfKyTCoBOrDZ4iNc=";
  };

  nativeBuildInputs = [
@@ -1,223 +0,0 @@
-final: prev:
-let
-
-  inherit (final) callPackage;
-  inherit (prev)
-    cudatoolkit
-    cudaVersion
-    lib
-    pkgs
-    ;
-
-  ### TensorRT
-
-  buildTensorRTPackage = args: callPackage ./generic.nix { } args;
-
-  toUnderscore = str: lib.replaceStrings [ "." ] [ "_" ] str;
-
-  majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str));
-
-  tensorRTPackages =
-    let
-      # Check whether a file is supported for our cuda version
-      isSupported = fileData: lib.elem cudaVersion fileData.supportedCudaVersions;
-      # Return the first file that is supported. In practice there should only ever be one anyway.
-      supportedFile = files: lib.findFirst isSupported null files;
-
-      # Compute versioned attribute name to be used in this package set
-      computeName = version: "tensorrt_${toUnderscore version}";
-
-      # Supported versions with versions as keys and file as value
-      supportedVersions =
-        lib.recursiveUpdate
-          {
-            tensorrt = {
-              enable = false;
-              fileVersionCuda = null;
-              fileVersionCudnn = null;
-              fullVersion = "0.0.0";
-              sha256 = null;
-              tarball = null;
-              supportedCudaVersions = [ ];
-            };
-          }
-          (
-            lib.mapAttrs' (version: attrs: lib.nameValuePair (computeName version) attrs) (
-              lib.filterAttrs (version: file: file != null) (
-                lib.mapAttrs (version: files: supportedFile files) tensorRTVersions
-              )
-            )
-          );
-
-      # Add all supported builds as attributes
-      allBuilds = lib.mapAttrs (
-        name: file: buildTensorRTPackage (lib.removeAttrs file [ "fileVersionCuda" ])
-      ) supportedVersions;
-
-      # Set the default attributes, e.g. tensorrt = tensorrt_8_4;
-      defaultName = computeName tensorRTDefaultVersion;
-      defaultBuild = lib.optionalAttrs (allBuilds ? ${defaultName}) {
-        tensorrt = allBuilds.${computeName tensorRTDefaultVersion};
-      };
-    in
-    {
-      inherit buildTensorRTPackage;
-    }
-    // allBuilds
-    // defaultBuild;
-
-  tarballURL =
-    {
-      fullVersion,
-      fileVersionCuda,
-      fileVersionCudnn ? null,
-    }:
-    "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}"
-    + lib.optionalString (fileVersionCudnn != null) ".cudnn${fileVersionCudnn}"
-    + ".tar.gz";
-
-  tensorRTVersions = {
-    "8.6.1" = [
-      rec {
-        fileVersionCuda = "12.0";
-        fullVersion = "8.6.1.6";
-        sha256 = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ=";
-        tarball = tarballURL { inherit fileVersionCuda fullVersion; };
-        supportedCudaVersions = [
-          "12.0"
-          "12.1"
-        ];
-      }
-    ];
-    "8.5.3" = [
-      rec {
-        fileVersionCuda = "11.8";
-        fileVersionCudnn = "8.6";
-        fullVersion = "8.5.3.1";
-        sha256 = "sha256-BNeuOYvPTUAfGxI0DVsNrX6Z/FAB28+SE0ptuGu7YDY=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [
-          "11.0"
-          "11.1"
-          "11.2"
-          "11.3"
-          "11.4"
-          "11.5"
-          "11.6"
-          "11.7"
-          "11.8"
-        ];
-      }
-      rec {
-        fileVersionCuda = "10.2";
-        fileVersionCudnn = "8.6";
-        fullVersion = "8.5.3.1";
-        sha256 = "sha256-WCt6yfOmFbrjqdYCj6AE2+s2uFpISwk6urP+2I0BnGQ=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [ "10.2" ];
-      }
-    ];
-    "8.5.2" = [
-      rec {
-        fileVersionCuda = "11.8";
-        fileVersionCudnn = "8.6";
-        fullVersion = "8.5.2.2";
-        sha256 = "sha256-Ov5irNS/JETpEz01FIFNMs9YVmjGHL7lSXmDpgCdgao=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [
-          "11.0"
-          "11.1"
-          "11.2"
-          "11.3"
-          "11.4"
-          "11.5"
-          "11.6"
-          "11.7"
-          "11.8"
-        ];
-      }
-      rec {
-        fileVersionCuda = "10.2";
-        fileVersionCudnn = "8.6";
-        fullVersion = "8.5.2.2";
-        sha256 = "sha256-UruwQShYcHLY5d81lKNG7XaoUsZr245c+PUpUN6pC5E=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [ "10.2" ];
-      }
-    ];
-    "8.5.1" = [
-      rec {
-        fileVersionCuda = "11.8";
-        fileVersionCudnn = "8.6";
-        fullVersion = "8.5.1.7";
-        sha256 = "sha256-Ocx/B3BX0TY3lOj/UcTPIaXb7M8RFrACC6Da4PMGMHY=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [
-          "11.0"
-          "11.1"
-          "11.2"
-          "11.3"
-          "11.4"
-          "11.5"
-          "11.6"
-          "11.7"
-          "11.8"
-        ];
-      }
-      rec {
-        fileVersionCuda = "10.2";
-        fileVersionCudnn = "8.6";
-        fullVersion = "8.5.1.7";
-        sha256 = "sha256-CcFGJhw7nFdPnSYYSxcto2MHK3F84nLQlJYjdIw8dPM=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [ "10.2" ];
-      }
-    ];
-    "8.4.0" = [
-      rec {
-        fileVersionCuda = "11.6";
-        fileVersionCudnn = "8.3";
-        fullVersion = "8.4.0.6";
-        sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [
-          "11.0"
-          "11.1"
-          "11.2"
-          "11.3"
-          "11.4"
-          "11.5"
-          "11.6"
-        ];
-      }
-      rec {
-        fileVersionCuda = "10.2";
-        fileVersionCudnn = "8.3";
-        fullVersion = "8.4.0.6";
-        sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I=";
-        tarball = tarballURL { inherit fileVersionCuda fileVersionCudnn fullVersion; };
-        supportedCudaVersions = [ "10.2" ];
-      }
-    ];
-  };
-
-  # Default attributes
-  tensorRTDefaultVersion =
-    {
-      "10.2" = "8.4.0";
-      "11.0" = "8.4.0";
-      "11.1" = "8.4.0";
-      "11.2" = "8.4.0";
-      "11.3" = "8.4.0";
-      "11.4" = "8.4.0";
-      "11.5" = "8.4.0";
-      "11.6" = "8.4.0";
-      "11.7" = "8.5.3";
-      "11.8" = "8.5.3";
-      "12.0" = "8.6.1";
-      "12.1" = "8.6.1";
-    }
-    .${cudaVersion} or "8.4.0";
-
-in
-tensorRTPackages
@@ -18,14 +18,14 @@

 buildPythonPackage rec {
  pname = "array-api-compat";
-  version = "1.10";
+  version = "1.11";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "data-apis";
    repo = "array-api-compat";
    tag = version;
-    hash = "sha256-4QuyJwS7ff0rAcALXbMG7PIt3YCL/aouVcovlq02wyQ=";
+    hash = "sha256-sQgNHYjLqTP7tTAuYSjsIJCtrzLIlms1ayeeTWGpaQk=";
  };

  build-system = [ setuptools ];
@@ -48,13 +48,9 @@ buildPythonPackage rec {
  # Package uses old version.
  patches = [ ./remove-docs-test.patch ];

-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "columnation-0.1.0" = "sha256-RAyZKR+sRmeWGh7QYPZnJgX9AtWqmca85HcABEFUgX8=";
-      "timely-0.12.0" = "sha256-sZuVLBDCXurIe38m4UAjEuFeh73VQ5Jawy+sr3U/HbI=";
-      "libsqlite3-sys-0.26.0" = "sha256-WpJA+Pm5dWKcdUrP0xS5ps/oE/yAXuQvvsdyDfDet1o=";
-    };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-osLr4u5vQa3/2whytC9PsXKURAwMCNObykY5Us7P3kQ=";
  };

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

 buildPythonPackage rec {
  pname = "cyclopts";
-  version = "3.9.1";
+  version = "3.9.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "BrianPugh";
    repo = "cyclopts";
    tag = "v${version}";
-    hash = "sha256-t8GRDvKnPg/y6cvITNJ7OCL+TGvs30vuZ4jbc/0TvAc=";
+    hash = "sha256-Juu9OeSygHzhny9leS250YhsP+/3/0Dor9SXFP+wMPA=";
  };

  build-system = [
@@ -3,9 +3,10 @@
  buildPythonPackage,
  django,
  fetchFromGitHub,
+  hatch-vcs,
+  hatchling,
  python,
  pythonOlder,
-  setuptools,
 }:

 buildPythonPackage rec {
@@ -22,9 +23,12 @@ buildPythonPackage rec {
    hash = "sha256-EAjDK3rkjoPw8jyVVZdhMNHmTqr0/ERiMwGMxmVbsls=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];

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

  pythonImportsCheck = [ "pwa" ];

@@ -35,7 +39,7 @@ buildPythonPackage rec {
  '';

  meta = with lib; {
-    description = "Django app to include a manifest.json and Service Worker instance to enable progressive web app behavoir";
+    description = "Django app to include a manifest.json and Service Worker instance to enable progressive web app behavior";
    homepage = "https://github.com/silviolleite/django-pwa";
    changelog = "https://github.com/silviolleite/django-pwa/releases/tag/${src.tag}";
    license = licenses.mit;
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "gspread";
-  version = "6.1.4";
+  version = "6.2.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "burnash";
    repo = "gspread";
    tag = "v${version}";
-    hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw=";
+    hash = "sha256-DTKSH8FtzOXlB7TzNqahDm8PY3ZarpZg8GYQ1kcdfdg=";
  };

  nativeBuildInputs = [ flit-core ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Google Spreadsheets client library";
    homepage = "https://github.com/burnash/gspread";
-    changelog = "https://github.com/burnash/gspread/blob/v${version}/HISTORY.rst";
+    changelog = "https://github.com/burnash/gspread/blob/${src.tag}/HISTORY.rst";
    license = licenses.mit;
    maintainers = [ ];
  };
@@ -37,14 +37,14 @@

 buildPythonPackage rec {
  pname = "monty";
-  version = "2025.1.9";
+  version = "2025.3.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "materialsvirtuallab";
    repo = "monty";
    tag = "v${version}";
-    hash = "sha256-+9nxuvrtl04Fb+GQJUn+fxg4sq1pXK59UkUTkKH16YQ=";
+    hash = "sha256-3UoACKJtPm2BrkJP8z7BFrh3baRyL/S3VwCG3K8AQn0=";
  };

  build-system = [
@@ -111,7 +111,7 @@ buildPythonPackage rec {
      patterns such as singleton and cached_class, and many more.
    ";
    homepage = "https://github.com/materialsvirtuallab/monty";
-    changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/v${version}";
+    changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ psyanticy ];
  };
@@ -2,13 +2,13 @@

 stdenv.mkDerivation {
  pname = "patchelf";
-  version = "0.18.0-unstable-2025-01-07";
+  version = "0.18.0-unstable-2025-02-15";

  src = fetchFromGitHub {
    owner = "NixOS";
    repo = "patchelf";
-    rev = "43b75fbc9ffbc1190fee7c8693ad74cb8286cfd4";
-    sha256 = "sha256-rqFH9xUu36Hky763cQ9D1V7iuWteItAFDM2jIQGP5Us=";
+    rev = "523f401584d9584e76c9c77004e7abeb9e6c4551";
+    sha256 = "sha256-KYFHARMXv4cXJezf41enxmU8MX1RWP4L2E7Ueq6mtRM=";
  };

  # Drop test that fails on musl (?)
@@ -1,62 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-
-  pkg-config,
-  gettext,
-  povray,
-  imagemagick,
-  gimp,
-
-  SDL2,
-  SDL2_mixer,
-  SDL2_image,
-  libpng,
-  zlib,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "toppler";
-  version = "1.3";
-
-  src = fetchFromGitLab {
-    owner = "roever";
-    repo = "toppler";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    gettext
-    povray
-    imagemagick
-    gimp
-  ];
-
-  buildInputs = [
-    SDL2
-    SDL2_mixer
-    SDL2_image
-    libpng
-    zlib
-  ];
-
-  # GIMP needs a writable home
-  preBuild = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  hardeningDisable = [ "format" ];
-
-  meta = with lib; {
-    description = "Jump and run game, reimplementation of Tower Toppler/Nebulus";
-    homepage = "https://gitlab.com/roever/toppler";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
-  };
-})
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "corefreq";
-  version = "2.0.0";
+  version = "2.0.1";

  src = fetchFromGitHub {
    owner = "cyring";
    repo = "CoreFreq";
    rev = version;
-    hash = "sha256-onpr9SsoYifomdSijZ2M5cSShfs8s2q9cbVYN4g3bBo=";
+    hash = "sha256-gdJ3yaE/Q10NV9TTbBUwzlF2wogiXFNy8gA36Fr/S7o=";
  };

  nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libedit, autoreconfHook271, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }:
+{ lib, stdenv, fetchFromGitHub, libedit, autoreconfHook271, zlib, unzip, libtommath, libtomcrypt, icu73, superServer ? false }:

 let base = {
  pname = "firebird";
@@ -10,14 +10,14 @@ let base = {
    changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md";
    license = [ "IDPL" "Interbase-1.0" ];
    platforms = platforms.linux;
-    maintainers = with maintainers; [ marcweber ];
+    maintainers = with maintainers; [ bbenno marcweber ];
  };

  nativeBuildInputs = [ autoreconfHook271 ];

-  buildInputs = [ libedit icu ];
+  buildInputs = [ libedit icu73 ];

-  LD_LIBRARY_PATH = lib.makeLibraryPath [ icu ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ icu73 ];

  configureFlags = [
    "--with-system-editline"
@@ -55,13 +55,13 @@ let base = {
  });

  firebird_3 = stdenv.mkDerivation (base // rec {
-    version = "3.0.10";
+    version = "3.0.12";

    src = fetchFromGitHub {
      owner = "FirebirdSQL";
      repo = "firebird";
      rev = "v${version}";
-      sha256 = "sha256-PT2b3989n/7xLGNREWinEey9SGnAXShITdum+yiFlHY=";
+      hash = "sha256-po8tMrOahfwayVXa7Eadr9+ZEmZizHlCmxi094cOJSY=";
    };

    buildInputs = base.buildInputs ++ [ zlib libtommath ];
--- a/Show More
+++ b/Show More