Merge staging-next into staging

2025-03-10 12:06:31 +00:00
parent 06370e0b01 7ca362baba
commit aaf5a9e6a6
107 changed files with 1270 additions and 34516 deletions
@@ -36,6 +36,8 @@

 - NetBox version 4.0.X available as `netbox_4_0` was removed. Please upgrade to `4.2`.

+- `i3status-rust`-package no longer enables `notmuch` by default. It can be enabled via `withNotmuch`.
+
 - Default ICU version updated from 74 to 76

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -58,6 +58,15 @@ with lib.maintainers;
    enableFeatureFreezePing = true;
  };

+  apm = {
+    scope = "Team for packages maintained by employees of Akademie für Pflegeberufe und Management GmbH.";
+    shortName = "apm employees";
+    # Edits to this list should only be done by an already existing member.
+    members = [
+      wolfgangwalther
+    ];
+  };
+
  bazel = {
    members = [
      mboes
@@ -551,6 +551,8 @@

 - hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes.

+- `services.cloudflared` now uses a dynamic user, and its `user` and `group` options have been removed. If the user or group is still necessary, they can be created manually.
+
 - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories.

 - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
@@ -111,6 +111,7 @@ in
        SystemCallFilter = [
          "@system-service @pkey"
          "~@privileged @resources"
+          "@chown"
        ];
        UMask = "0077";
      };
@@ -7,6 +7,16 @@
 let
  cfg = config.services.cloudflared;

+  certificateFile = lib.mkOption {
+    type = with lib.types; nullOr path;
+    description = ''
+      Cert.pem file.
+
+      See [Cert.pem](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#certpem).
+    '';
+    default = null;
+  };
+
  originRequest = {
    connectTimeout = lib.mkOption {
      type = with lib.types; nullOr str;
@@ -144,21 +154,39 @@ let
  };
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule
+      [
+        "services"
+        "cloudflared"
+        "user"
+      ]
+      ''
+        Cloudflared now uses a dynamic user, and this option no longer has any effect.
+
+        If the user is still necessary, please define it manually using users.users.cloudflared.
+      ''
+    )
+
+    (lib.mkRemovedOptionModule
+      [
+        "services"
+        "cloudflared"
+        "group"
+      ]
+      ''
+        Cloudflared now uses a dynamic user, and this option no longer has any effect.
+
+        If the group is still necessary, please define it manually using users.groups.cloudflared.
+      ''
+    )
+  ];
+
  options.services.cloudflared = {
+    inherit certificateFile;
+
    enable = lib.mkEnableOption "Cloudflare Tunnel client daemon (formerly Argo Tunnel)";

-    user = lib.mkOption {
-      type = lib.types.str;
-      default = "cloudflared";
-      description = "User account under which Cloudflared runs.";
-    };
-
-    group = lib.mkOption {
-      type = lib.types.str;
-      default = "cloudflared";
-      description = "Group under which cloudflared runs.";
-    };
-
    package = lib.mkPackageOption pkgs "cloudflared" { };

    tunnels = lib.mkOption {
@@ -170,10 +198,10 @@ in
          { name, ... }:
          {
            options = {
-              inherit originRequest;
+              inherit certificateFile originRequest;

              credentialsFile = lib.mkOption {
-                type = lib.types.str;
+                type = lib.types.path;
                description = ''
                  Credential file.

@@ -273,6 +301,12 @@ in
  };

  config = lib.mkIf cfg.enable {
+    assertions = lib.mapAttrsToList (name: tunnel: {
+      assertion =
+        tunnel.ingress == { } || (cfg.certificateFile != null || tunnel.certificateFile != null);
+      message = "Cloudflare Tunnel ${name} has a declarative configuration, but no certificate file was defined.";
+    }) cfg.tunnels;
+
    systemd.targets = lib.mapAttrs' (
      name: tunnel:
      lib.nameValuePair "cloudflared-tunnel-${name}" {
@@ -303,7 +337,7 @@ in

        fullConfig = filterConfig {
          tunnel = name;
-          "credentials-file" = tunnel.credentialsFile;
+          credentials-file = "/run/credentials/cloudflared-tunnel-${name}.service/credentials.json";
          warp-routing = filterConfig tunnel.warp-routing;
          originRequest = filterConfig tunnel.originRequest;
          ingress =
@@ -322,8 +356,9 @@ in
        };

        mkConfigFile = pkgs.writeText "cloudflared.yml" (builtins.toJSON fullConfig);
+        certFile = if (tunnel.certificateFile != null) then tunnel.certificateFile else cfg.certificateFile;
      in
-      lib.nameValuePair "cloudflared-tunnel-${name}" ({
+      lib.nameValuePair "cloudflared-tunnel-${name}" {
        after = [
          "network.target"
          "network-online.target"
@@ -334,24 +369,20 @@ in
        ];
        wantedBy = [ "multi-user.target" ];
        serviceConfig = {
-          User = cfg.user;
-          Group = cfg.group;
+          RuntimeDirectory = "cloudflared-tunnel-${name}";
+          RuntimeDirectoryMode = "0400";
+          LoadCredential = [
+            "credentials.json:${tunnel.credentialsFile}"
+          ] ++ (lib.optional (certFile != null) "cert.pem:certFile");
+
          ExecStart = "${cfg.package}/bin/cloudflared tunnel --config=${mkConfigFile} --no-autoupdate run";
          Restart = "on-failure";
+          DynamicUser = true;
        };
-      })
+
+        environment.TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) ''%d/cert.pem'';
+      }
    ) config.services.cloudflared.tunnels;
-
-    users.users = lib.mkIf (cfg.user == "cloudflared") {
-      cloudflared = {
-        group = cfg.group;
-        isSystemUser = true;
-      };
-    };
-
-    users.groups = lib.mkIf (cfg.group == "cloudflared") {
-      cloudflared = { };
-    };
  };

  meta.maintainers = with lib.maintainers; [
@@ -25,7 +25,7 @@ import ./make-test-python.nix (
      machine.wait_for_unit("zwave-js-ui.service")
      machine.wait_for_open_port(9999)
      machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js-ui --grep 'Listening on port 9999host :: protocol HTTP'")
-      machine.wait_for_file("/var/lib/zwave-js-ui/nodes.json")
+      machine.wait_for_file("/var/lib/zwave-js-ui/users.json")
    '';
  }
 )
@@ -38,17 +38,17 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "reaper";
-  version = "7.33";
+  version = "7.34";

  src = fetchurl {
    url = url_for_platform version stdenv.hostPlatform.qemuArch;
    hash =
      if stdenv.hostPlatform.isDarwin then
-        "sha256-EBPMuW2cuuw9B6nbUDQiRyugQOItWHldGPvlijW7s9Y="
+        "sha256-Z3m9qwNFH4bHNG1DD4Lbcr7N9b2swwE73iIh6NPX0l4="
      else
        {
-          x86_64-linux = "sha256-C+iJO6hQib2Z5FKB2dBRD963x9ezSt8G3E3ocaY56TI=";
-          aarch64-linux = "sha256-Lbf8yY6UqtfqHWYkLRzUkasdjxyPxFoxdehJG0+0u44=";
+          x86_64-linux = "sha256-R6nFi6OPBTIJhg752o9r0lGb24VYobiaWgp5bfvFykg=";
+          aarch64-linux = "sha256-uoPf9rfYk0JyHcbqV3hXBqzmInuUd0xrrWCAYiT3/9I=";
        }
        .${stdenv.hostPlatform.system};
  };
@@ -164,6 +164,7 @@ runCommand (lib.appendToName "with-packages" emacs).name
          # buffer.
          rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
          cat >"$siteStart" <<EOF
+          ;;; -*- lexical-binding: t -*-
          (let ((inhibit-message t))
            (load "$emacs/share/emacs/site-lisp/site-start"))
          ;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh
@@ -175,11 +176,14 @@ runCommand (lib.appendToName "with-packages" emacs).name
          EOF

          # Generate a subdirs.el that statically adds all subdirectories to load-path.
+          cat >"$subdirs" <<EOF
+          ;;; -*- lexical-binding: t -*-
+          EOF
          $emacs/bin/emacs \
            --batch \
            --load ${./mk-wrapper-subdirs.el} \
            --eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \
-            > "$subdirs"
+            >> "$subdirs"

          # Byte-compiling improves start-up time only slightly, but costs nothing.
          $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
@@ -3961,6 +3961,19 @@ final: prev:
    meta.hydraPlatforms = [ ];
  };

+  devdocs-nvim = buildVimPlugin {
+    pname = "devdocs.nvim";
+    version = "2025-03-09";
+    src = fetchFromGitHub {
+      owner = "maskudo";
+      repo = "devdocs.nvim";
+      rev = "1f39d611427af27befbf0edb3284ef0def830dd7";
+      sha256 = "11adw0b3kg0324gvpk9kb0s9crkg1rp1pgqgr1v08sc5lix7wjc5";
+    };
+    meta.homepage = "https://github.com/maskudo/devdocs.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  devdocs-vim = buildVimPlugin {
    pname = "devdocs.vim";
    version = "2018-08-27";
@@ -15115,6 +15128,19 @@ final: prev:
    meta.hydraPlatforms = [ ];
  };

+  vim-apathy = buildVimPlugin {
+    pname = "vim-apathy";
+    version = "2021-11-22";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-apathy";
+      rev = "27128a0f55189724c841843ba41cd33cf7186032";
+      sha256 = "166cvm3xr46n7bmzglkx0k4akdshhq3a1kw2011v39r64jh5p5hk";
+    };
+    meta.homepage = "https://github.com/tpope/vim-apathy/";
+    meta.hydraPlatforms = [ ];
+  };
+
  vim-apm = buildVimPlugin {
    pname = "vim-apm";
    version = "2024-02-03";
@@ -83,6 +83,8 @@
  cmake,
  icu,
  ncurses,
+  # devdocs-nvim dependencies
+  pandoc,
  # Preview-nvim dependencies
  md-tui,
  # sved dependencies
@@ -1012,6 +1014,18 @@ in
    };
  };

+  devdocs-nvim = super.devdocs-nvim.overrideAttrs {
+    nvimSkipModule = [
+      # Error initializing Devdocs state
+      "devdocs.state"
+    ];
+    runtimeDeps = [
+      curl
+      jq
+      pandoc
+    ];
+  };
+
  diagram-nvim = super.diagram-nvim.overrideAttrs {
    dependencies = [ self.image-nvim ];
  };
@@ -303,6 +303,7 @@ https://github.com/carlitux/deoplete-ternjs/,,
 https://github.com/lighttiger2505/deoplete-vim-lsp/,,
 https://github.com/deoplete-plugins/deoplete-zsh/,,
 https://github.com/Shougo/deoplete.nvim/,,
+https://github.com/maskudo/devdocs.nvim/,HEAD,
 https://github.com/rhysd/devdocs.vim/,,
 https://github.com/vmchale/dhall-vim/,,
 https://github.com/onsails/diaglist.nvim/,,
@@ -1159,6 +1160,7 @@ https://github.com/vim-airline/vim-airline-themes/,,
 https://github.com/Konfekt/vim-alias/,,
 https://github.com/hsanson/vim-android/,,
 https://github.com/osyo-manga/vim-anzu/,,
+https://github.com/tpope/vim-apathy/,HEAD,
 https://github.com/ThePrimeagen/vim-apm/,,
 https://github.com/PeterRincker/vim-argumentative/,,
 https://github.com/FooSoft/vim-argwrap/,,
@@ -15,7 +15,7 @@
  pipewire,
  withICUCalendar ? false,
  withPipewire ? true,
-  withNotmuch ? true,
+  withNotmuch ? false,
 }:

 rustPlatform.buildRustPackage rec {
@@ -0,0 +1,33 @@
+diff --git a/lib/imagelib.c b/lib/imagelib.c
+index f71b96a..49c7545 100644
+--- a/lib/imagelib.c
+++ b/lib/imagelib.c
+@@ -2,6 +2,7 @@
+ #include <string.h>
+ #include "imagelib.h"
+ #include "cards.h"
+#include <stdlib.h>
+
+ image_list *image_root = 0;
+
+diff --git a/lib/make-imglib.c b/lib/make-imglib.c
+index 84cda12..8edaa0f 100644
+--- a/lib/make-imglib.c
+++ b/lib/make-imglib.c
+@@ -7,6 +7,7 @@
+ #include <dirent.h>
+
+ #include <png.h>
+#include <ctype.h>
+
+ static int verbose = 0;
+ static char *basename = "images";
+@@ -202,7 +203,7 @@ tokenize(char *string)
+   char *rv;
+   if (string) {
+     next = string;
+-    return;
+    return NULL; // this value is unused, so it can be anything
+   }
+   while (*next && !isgraph(*next)) next++;
+   if (!*next) return 0;
@@ -10,18 +10,21 @@
  zlib,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "ace-of-penguins";
  version = "1.4";

  src = fetchurl {
-    url = "http://www.delorie.com/store/ace/ace-${version}.tar.gz";
+    url = "http://www.delorie.com/store/ace/ace-${finalAttrs.version}.tar.gz";
    hash = "sha256-H+47BTOSGkKHPAYj8z2HOgZ7HuxY8scMAUSRRueaTM4=";
  };

  patches = [
    # Fixes a bunch of miscompilations in modern environments
    ./fixup-miscompilations.patch
+    # make-imglib.c:205:5: error: 'return' with no value, in function returning non-void [-Wreturn-mismatch]
+    # imagelib.c:109:17: error: implicit declaration of function 'malloc' [-Wimplicit-function-declaration]
+    ./fix-gcc-14.patch
  ];

  nativeBuildInputs = [
@@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
  desktopItems =
    let
      generateItem = gameName: {
-        name = "${pname}-${gameName}";
+        name = "ace-of-penguins-${gameName}";
        exec = "${placeholder "out"}/bin/${gameName}";
        comment = "Ace of Penguins ${gameName} Card Game";
        desktopName = gameName;
@@ -61,7 +64,7 @@ stdenv.mkDerivation rec {
      "thornq"
    ];

-  meta = with lib; {
+  meta = {
    homepage = "http://www.delorie.com/store/ace/";
    description = "Solitaire games in X11";
    longDescription = ''
@@ -73,8 +76,8 @@ stdenv.mkDerivation rec {
      minesweeper, pegged, solitaire, taipei (with editor!), and thornq (by
      Martin Thornquist).
    '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
  };
-}
+})
@@ -18,13 +18,11 @@ stdenv.mkDerivation {

  nativeBuildInputs = [ perl ];

-  env.NIX_CFLAGS_COMPILE = toString (
-    [
-      "-fcommon"
-      "-O2"
-    ]
-    ++ lib.optional stdenv.cc.isClang "-Wno-error=implicit-int"
-  );
+  env.NIX_CFLAGS_COMPILE = toString ([
+    "-fcommon"
+    "-O2"
+    "-Wno-implicit-int" # clang, gcc 14
+  ]);

  configureFlags = [
    "--with-erlangstorage"
@@ -7,7 +7,7 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "autosuspend";
-  version = "7.1.0";
+  version = "7.2.0";
  pyproject = true;

  disabled = python3.pythonOlder "3.10";
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "languitar";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-Sug42L4D9lgtc7AWIOcgC+e9WCHfmqB4O1Gez/sR6jE=";
+    hash = "sha256-of2b5K4ccONPGZfUwEIoFs86xLM2aLCV8tVGxVqykiQ=";
  };

  build-system = with python3.pkgs; [
@@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = with lib; {
    description = "Daemon to automatically suspend and wake up a system";
    homepage = "https://autosuspend.readthedocs.io";
-    changelog = "https://github.com/languitar/autosuspend/releases/tag/v${version}";
+    changelog = "https://github.com/languitar/autosuspend/releases/tag/${src.tag}";
    license = licenses.gpl2Only;
    maintainers = with maintainers; [
      bzizou
@@ -2,45 +2,34 @@
  lib,
  buildNpmPackage,
  fetchFromGitHub,
-  installShellFiles,
  python3,
 }:

 buildNpmPackage rec {
  pname = "balanceofsatoshis";
-  version = "15.8.15";
+  version = "19.4.10";

  src = fetchFromGitHub {
    owner = "alexbosworth";
    repo = "balanceofsatoshis";
-    rev = "v${version}";
-    hash = "sha256-8GWITeFn7ELUH7bxcNlmQvgperQutBwVUhp2yjeEWrM=";
+    tag = "v${version}";
+    hash = "sha256-WJuxe3k8ZLlkB5SpvE1DSyxQsc5bYEKVsM8tt5vdYOU=";
  };

-  npmDepsHash = "sha256-lTXv4pEjrzcOK68RO1K007r7dCbAyc45G8Oy8V3XLts=";
+  npmDepsHash = "sha256-dsWYUCPbiF/L3RcdcaWVn6TnU1/XMy9l7eQgHrBYW4o=";

-  nativeBuildInputs = [
-    installShellFiles
-    python3
-  ];
+  nativeBuildInputs = [ python3 ];

  dontNpmBuild = true;

  npmFlags = [ "--ignore-scripts" ];

-  postInstall = ''
-    installShellCompletion --cmd bos \
-        --bash <($out/bin/bos completion bash) \
-        --zsh <($out/bin/bos completion zsh) \
-        --fish <($out/bin/bos completion fish)
-  '';
-
  meta = {
    changelog = "https://github.com/alexbosworth/balanceofsatoshis/blob/${src.rev}/CHANGELOG.md";
    description = "Tool for working with the balance of your satoshis on LND";
    homepage = "https://github.com/alexbosworth/balanceofsatoshis";
    license = lib.licenses.mit;
    mainProgram = "bos";
-    maintainers = with lib.maintainers; [ mmilata ];
+    maintainers = with lib.maintainers; [ mariaa144 ];
  };
 }
@@ -13,16 +13,20 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "blueprint-compiler";
-  version = "0.14.0";
+  version = "0.16.0";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "jwestman";
    repo = "blueprint-compiler";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-pkbTxCN7LagIbOtpiUCkh40aHw6uRtalQVFa47waXjU=";
+    hash = "sha256-FnMQtqy+uejWn3tDeaj92h2x9TzyiK5KdlRm55ObgPg=";
  };

+  postPatch = ''
+    patchShebangs docs/collect-sections.py
+  '';
+
  nativeBuildInputs = [
    meson
    ninja
@@ -5,8 +5,10 @@
  alsa-lib,
  libjack2,
  pkg-config,
+  libX11,
+  libXext,
+  xorgproto,
  libpulseaudio,
-  xorg,
  copyDesktopItems,
  makeDesktopItem,
 }:
@@ -17,31 +19,38 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz";
-    sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
+    hash = "sha256-fR8LvQ19MD/HfGuVSbYXCNeoO03AB4GAEbH1XR+pIro=";
  };

  nativeBuildInputs = [
    pkg-config
    copyDesktopItems
  ];
+
  buildInputs = [
    alsa-lib
    libjack2
    libpulseaudio
-    xorg.libX11
-    xorg.libXext
-    xorg.xorgproto
+    libX11
+    libXext
+    xorgproto
  ];

-  patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic
+  postPatch = ''
+    sed -i '41,43d' libbristolaudio/audioEngineJack.c  # disable alsa/iatomic
+    sed -i '35i void doPitchWheel(Baudio *baudio);' bristol/bristolmemorymoog.c
+  '';

-  configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi";
+  configureFlags = [
+    "--enable-jack-default-audio"
+    "--enable-jack-default-midi"
+  ];

  # Workaround build failure on -fno-common toolchains like upstream
  # gcc-10. Otherwise build fails as:
  #  ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of
  #    `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
+  env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-implicit-int";

  preInstall = ''
    sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
@@ -64,10 +73,10 @@ stdenv.mkDerivation rec {
    })
  ];

-  meta = with lib; {
+  meta = {
    description = "Range of synthesiser, electric piano and organ emulations";
    homepage = "https://bristol.sourceforge.net";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
    platforms = [
      "x86_64-linux"
      "i686-linux"
@@ -19,19 +19,19 @@
 rustPlatform.buildRustPackage rec {
  pname = "cinny-desktop";
  # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.5.0";
+  version = "4.5.1";

  src = fetchFromGitHub {
    owner = "cinnyapp";
    repo = "cinny-desktop";
    tag = "v${version}";
-    hash = "sha256-FXGziCGd3537VcO4dzO8ZvsFSK/k6QSyQlcEC4RyQto=";
+    hash = "sha256-xWHR0lg/3w2K+hExKCD84hdQ7UCZRrOnH2dNybaYMFE=";
  };

  sourceRoot = "${src.name}/src-tauri";

  useFetchCargoVendor = true;
-  cargoHash = "sha256-NESiUh8ylGna2uasyyo59TpViRorE7Cxo0ivmIKkUdU=";
+  cargoHash = "sha256-iI0oWuETVVPuoKlWplsgocF7DEvwTVSp5r1WmQd7R04=";

  postPatch =
    let
@@ -13,16 +13,16 @@

 buildNpmPackage rec {
  pname = "cinny-unwrapped";
-  version = "4.5.0";
+  version = "4.5.1";

  src = fetchFromGitHub {
    owner = "cinnyapp";
    repo = "cinny";
    rev = "v${version}";
-    hash = "sha256-Mb9TEQAFtP73rBBP6gLwEdAtWKSoxP2lNcrs4qsnp5g=";
+    hash = "sha256-uwazJSd9I80ExKv22Ycg/fBDGZ1GuW4pcBo83lUwhoc=";
  };

-  npmDepsHash = "sha256-sXwqNKm7j/Ju70l2Zk5uIByVO3ldN7HkDoGX/01vID0=";
+  npmDepsHash = "sha256-o5txGbuNl+ZMk5acu/0/5CTNTvdP+Tqyw7heFRaZ4lM=";

  nativeBuildInputs = [
    python3
@@ -21,12 +21,8 @@ rustPlatform.buildRustPackage rec {
    ./cargo-lock-bump-time.patch
  ];

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "hdf5-0.8.1" = "sha256-qWF2mURVblSLPbt4oZSVxIxI/RO3ZNcZdwCdaOTACYs=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-I0hY2WmaHu/HKQJHyZp0C6wIi0++w5dFeExVMyhInJY=";

  # only the ladspa plugin part has been packaged so far...

@@ -36,12 +36,8 @@ rustPlatform.buildRustPackage rec {

  sourceRoot = "${src.name}/src-tauri";

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "postflop-solver-0.1.0" = "sha256-coEl09eMbQqSos1sqWLnfXfhujSTsnVnOlOQ+JbdFWY=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-pMvh2Rr+rMe0nMB9yRDrGatrS36+VM7os0eeBR31oCM=";

  postPatch = ''
    substituteInPlace tauri.conf.json \
@@ -1,669 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "time",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "dns-message-parser"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b393503f9263e08ba3efe0a3578cdde90d6da5ae1af232cc338640670451c992"
-dependencies = [
- "base64",
- "bytes 1.1.0",
- "hex",
- "thiserror",
-]
-
-[[package]]
-name = "dnspeep"
-version = "0.1.3"
-dependencies = [
- "bytes 1.1.0",
- "chrono",
- "dns-message-parser",
- "etherparse",
- "eyre",
- "futures",
- "getopts",
- "hex",
- "libc",
- "pcap",
- "tokio",
-]
-
-[[package]]
-name = "etherparse"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fa20922281f9ee5ffcda45e80d56085829279f1270f79fbabc39809a4354807"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
-
-[[package]]
-name = "futures-task"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
-
-[[package]]
-name = "futures-util"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite 0.2.6",
- "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
- "slab",
-]
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
-
-[[package]]
-name = "libloading"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "memchr"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow 0.2.2",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-named-pipes"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
-dependencies = [
- "log",
- "mio",
- "miow 0.3.7",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
-
-[[package]]
-name = "pcap"
-version = "0.8.1"
-source = "git+https://github.com/jvns/pcap#ae2aa7f501ae5bb7069155cf7c5c700b7482681d"
-dependencies = [
- "futures",
- "libc",
- "libloading",
- "mio",
- "regex",
- "tokio",
- "widestring",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "regex"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-
-[[package]]
-name = "syn"
-version = "1.0.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
- "libc",
- "memchr",
- "mio",
- "mio-named-pipes",
- "mio-uds",
- "num_cpus",
- "pin-project-lite 0.1.12",
- "signal-hook-registry",
- "slab",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "widestring"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
@@ -11,12 +11,8 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-QpUbHiMDQFRCTVyjrO9lfQQ62Z3qanv0j+8eEXjE3n4=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "pcap-0.8.1" = "sha256-baoHK3Q+5Qp9ccGqDGd5K5q87c5JufpNJHRdBin0zto=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-tZlh7+END6oOy3uWOrjle+nwqFhMU6bbXmr4hdt6gqY=";

  LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ];
  LIBPCAP_VER = libpcap.version;
@@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation {
  dontUnpack = true;
  dontInstall = true;

-  buildInputs = [
+  nativeBuildInputs = [
    cpio
    xz
  ];
@@ -14,13 +14,13 @@

 stdenv.mkDerivation {
  pname = "flatter";
-  version = "0-unstable-2024-03-04";
+  version = "0-unstable-2025-02-03";

  src = fetchFromGitHub {
    owner = "keeganryan";
    repo = "flatter";
-    rev = "c2ed0ee94b6d281df7bcbce31ca275197ef9a562";
-    hash = "sha256-1Pjn0lANXaMOqlwwdOx6X/7jtAvfa2ZWa0nDfS3T5XU=";
+    rev = "96993e47874c302395721d76d06f7ab4fee09839";
+    hash = "sha256-eMZZsgLeTzMAHohmvR13KQERtYQpB2nj/v5MCKtGFaI=";
  };

  strictDeps = true;
@@ -46,19 +46,19 @@ in

 stdenv.mkDerivation rec {
  pname = "frama-c";
-  version = "29.0";
-  slang = "Copper";
+  version = "30.0";
+  slang = "Zinc";

  src = fetchurl {
    url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
-    hash = "sha256-0vuzuND/g5RYcunm+iWOk0pwY2DmmNrjtNX5ca3fdJM=";
+    hash = "sha256-OsD5lSYeyCmnvQQr9w/CmsY3kCnrnfMLzARHSOtNKlY=";
  };

  preConfigure = ''
-    substituteInPlace src/dune --replace " bytes " " "
+    substituteInPlace src/dune --replace-warn " bytes " " "
  '';

-  postConfigure = "patchShebangs src/plugins/eva/gen-api.sh";
+  postConfigure = "patchShebangs ivette/api.sh";

  strictDeps = true;

@@ -74,11 +74,9 @@ stdenv.mkDerivation rec {
  buildInputs = with ocamlPackages; [
    dune-site
    dune-configurator
-    ltl2ba
    ocamlgraph
    yojson
    menhirLib
-    camlzip
    lablgtk3
    lablgtk3-sourceview3
    coq
@@ -89,7 +87,6 @@ stdenv.mkDerivation rec {
    mlgmpidl
    doxygen
    ppx_deriving
-    ppx_import
    ppx_deriving_yaml
    ppx_deriving_yojson
    gdk-pixbuf
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "galene";
-  version = "0.96.2";
+  version = "0.96.3";

  src = fetchFromGitHub {
    owner = "jech";
    repo = "galene";
    rev = "galene-${version}";
-    hash = "sha256-Jp8kG4i1UVKIrBjPFx2FAfw/QoO6OIP3CpuzX2//if0=";
+    hash = "sha256-loAiPfwTyPi4BKn4TNgVVde2mO119h443A+HwlLvi4g=";
  };

  vendorHash = "sha256-LDLKjD4qYn/Aae6GUX6gZ57+MUfKc058H+YHM0bNZV0=";
@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "go2rtc";
-  version = "1.9.8";
+  version = "1.9.9";

  src = fetchFromGitHub {
    owner = "AlexxIT";
    repo = "go2rtc";
    tag = "v${version}";
-    hash = "sha256-gX1hNm3X0OQdmslQ/2pw0F05TO43YsGtz1yn8bbaxR0=";
+    hash = "sha256-TUUIEr90ZUMxsuF86CWZVpfo277mnefJ/ofPgwpKhcE=";
  };

-  vendorHash = "sha256-6QVqBTWI2BJFttWbHHjfSztvOx2oyk7ShxAZmz51oVI=";
+  vendorHash = "sha256-BU31vb+qhMQtO9PXUjrQP3mEA0iOTEK/ZYXW6jL0UNo=";

  env.CGO_ENABLED = 0;

@@ -171,11 +171,11 @@ let

  linux = stdenv.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "133.0.6943.141";
+    version = "134.0.6998.35";

    src = fetchurl {
      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-iMW9V3dARAG7kJgCCWIT0OBDsxYqDnp+CpwgcjAT8zI=";
+      hash = "sha256-9byRWcAqSlggSGYISqnja7a38rZ3uNSC9HrZmY+zyjA=";
    };

    # With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "133.0.6943.142";
+    version = "134.0.6998.45";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/ejubi5y7bpapjhrevtxffszuji_133.0.6943.142/GoogleChrome-133.0.6943.142.dmg";
-      hash = "sha256-cDnCnswvtRkyrwv52/GFHPTsmRZItN3rgqqc62mS7Ao=";
+      url = "http://dl.google.com/release2/chrome/acywna3py5h6xead7weymurbrefq_134.0.6998.45/GoogleChrome-134.0.6998.45.dmg";
+      hash = "sha256-l4EgwwPjmYX7nlJF8AkeDcYP0sTswAwfr27sxtPw/08=";
    };

    dontPatch = true;
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "grpc-gateway";
-  version = "2.26.1";
+  version = "2.26.3";

  src = fetchFromGitHub {
    owner = "grpc-ecosystem";
    repo = "grpc-gateway";
    tag = "v${version}";
-    sha256 = "sha256-9P7bWhW3GZmvJeyOtrCM//riLkTkm+r+u3qq+J3h0YQ=";
+    sha256 = "sha256-e/TPCli2wXyzEpn84hZdtVaAmXJK+d0vMRLilXohiN8=";
  };

-  vendorHash = "sha256-x3uOAhQYG2Jd3WdTlTWylWeTdPJ18gqiOqpLOd3Lqw4=";
+  vendorHash = "sha256-Des02yenoa6am0xIqto7xlOWHh44F5EBVEhi9t+v644=";

  ldflags = [
    "-X=main.version=${version}"
@@ -0,0 +1,13 @@
+diff --git a/scripts/folders-color-chooser b/scripts/folders-color-chooser
+index 749725212..989bdf78c 100755
+--- a/scripts/folders-color-chooser
+++ b/scripts/folders-color-chooser
+@@ -33,6 +33,8 @@ icon_pack_path() {
+     echo "${XDG_DATA_HOME:-"${HOME}/.local/share"}/icons/${icon_pack_theme}"
+   elif [[ -d "${HOME}/.icons/${icon_pack_theme}" ]]; then
+     echo "${HOME}/.icons/${icon_pack_theme}"
+  elif [[ -d "$out/share/icons/${icon_pack_theme}" ]]; then
+    echo "$out/share/icons/${icon_pack_theme}"
+   else
+     data_dirs=$(echo "${XDG_DATA_DIRS:-"/usr/local/share:/usr/share"}" | tr ":" "\n")
+     for path in $data_dirs; do
@@ -1,33 +1,43 @@
 {
-  lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
-, plasma5Packages
-, gnome-icon-theme
-, hicolor-icon-theme
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+  plasma5Packages,
+  gnome-icon-theme,
+  hicolor-icon-theme,
+  nix-update-script,
+  folder-color ? "plasma", # Supported colors: black blue caramel citron firebrick gold green grey highland jade lavender lime olive orange pistachio plasma pumpkin purple red rust sapphire tomato violet white yellow
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "gruvbox-plus-icons";
-  version = "5.5.0";
+  version = "6.2.0";

  src = fetchFromGitHub {
    owner = "SylEleuth";
    repo = "gruvbox-plus-icon-pack";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-G7F+69K2aJVBM3yOQIMTH2pDXBfLmYScKIIAza3YNw8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MCof2CFQfh/ChFNlsxw9BmrFf1A804HzWoHJdNsrW74=";
  };

+  patches = [ ./folder-color.patch ];
+
  nativeBuildInputs = [ gtk3 ];

-  propagatedBuildInputs = [ plasma5Packages.breeze-icons gnome-icon-theme hicolor-icon-theme ];
+  propagatedBuildInputs = [
+    plasma5Packages.breeze-icons
+    gnome-icon-theme
+    hicolor-icon-theme
+  ];

  installPhase = ''
    runHook preInstall

    mkdir -p $out/share/icons
    cp -r Gruvbox-Plus-Dark $out/share/icons/
+    patchShebangs scripts/folders-color-chooser
+    ./scripts/folders-color-chooser -c ${folder-color}
    gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark

    runHook postInstall
@@ -37,11 +47,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  dontBuild = true;
  dontConfigure = true;

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Icon pack for Linux desktops based on the Gruvbox color scheme";
    homepage = "https://github.com/SylEleuth/gruvbox-plus-icon-pack";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ eureka-cpu ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      eureka-cpu
+      Gliczy
+    ];
  };
 })
@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  buildNpmPackage,
  fetchFromGitHub,
  fetchpatch2,
@@ -166,6 +167,13 @@ buildNpmPackage' {
    # see https://github.com/immich-app/immich/issues/13971
    substituteInPlace src/services/backup.service.ts \
      --replace-fail '`/usr/lib/postgresql/''${databaseMajorVersion}/bin/pg_dumpall`' '`pg_dump`'
+
+    # some part of the build wants to use un-prefixed binaries. let them.
+    mkdir -p $TMP/bin
+    ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config
+    ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt
+    ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf
+    export PATH="$TMP/bin:$PATH"
  '';

  nativeBuildInputs = [
@@ -254,7 +262,7 @@ buildNpmPackage' {
      Scrumplex
      titaniumtown
    ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
    mainProgram = "server";
  };
 }
@@ -127,6 +127,7 @@ in stdenv.mkDerivation (finalAttrs: rec {
    for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do
      rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}*
    done
+    rm -rf contrib/*/src

    substituteInPlace lib/Tools/env \
      --replace-fail /usr/bin/env ${coreutils}/bin/env
@@ -42,7 +42,7 @@ let
    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
  };

-  linux = appimageTools.wrapType2 rec {
+  linux = appimageTools.wrapType2 {
    inherit pname version src meta;
    nativeBuildInputs = [ makeWrapper ];

@@ -51,13 +51,12 @@ let
    '';

    extraInstallCommands = ''
-      wrapProgram $out/bin/${pname} \
+      wrapProgram $out/bin/joplin-desktop \
        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-      install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
-      install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps
-      substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \
-        --replace 'Exec=AppRun' 'Exec=${pname}' \
-        --replace 'Icon=joplin' "Icon=@joplinapp-desktop"
+      install -Dm644 ${appimageContents}/@joplinapp-desktop.desktop $out/share/applications/joplin.desktop
+      install -Dm644 ${appimageContents}/@joplinapp-desktop.png $out/share/pixmaps/joplin.png
+      substituteInPlace $out/share/applications/joplin.desktop \
+        --replace-fail 'Exec=AppRun' 'Exec=joplin-desktop'
    '';
  };

@@ -15,11 +15,18 @@ stdenv.mkDerivation rec {
    sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
  };

+  nativeBuildInputs = [
+    perl
+    taktuk
+  ];
+
  preBuild = ''
-    substituteInPlace ./kanif --replace "/usr/bin/perl" "${perl}/bin/perl"
-    substituteInPlace ./kanif --replace '$taktuk_command = "taktuk";' '$taktuk_command = "${taktuk}/bin/taktuk";'
+    substituteInPlace ./kanif --replace-fail "/usr/bin/perl" "${perl}/bin/perl"
+    substituteInPlace ./kanif --replace-fail '$taktuk_command = "taktuk";' '$taktuk_command = "${taktuk}/bin/taktuk";'
  '';

+  strictDeps = true;
+
  meta = {
    description = "Cluster management and administration swiss army knife";
    longDescription = ''
@@ -6,28 +6,33 @@
  xorg,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "maiko";
-  version = "2021-04-14";
+  version = "250201-55e20ea9";
+
  src = fetchFromGitHub {
    owner = "Interlisp";
    repo = "maiko";
-    rev = "91fe7d51f9d607bcedde0e78e435ee188a8c84c0";
-    hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM=";
+    tag = "maiko-${finalAttrs.version}";
+    hash = "sha256-7TmMvDaSmdbMa2fVbETRcyKndGM3CuaxI2cJj00WlSc=";
  };
+
  nativeBuildInputs = [ cmake ];
+
  buildInputs = [ xorg.libX11 ];
+
  installPhase = ''
    runHook preInstall
    find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \;
    runHook postInstall
  '';
-  meta = with lib; {
+
+  meta = {
    description = "Medley Interlisp virtual machine";
    homepage = "https://interlisp.org/";
    changelog = "https://github.com/Interlisp/maiko/releases";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ehmry ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
    inherit (xorg.libX11.meta) platforms;
  };
-}
+})
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "matrix-org";
    repo = "matrix-rust-sdk";
-    rev = "${pname}-v${version}";
+    tag = "${pname}-v${version}";
    hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";
  };

@@ -27,11 +27,14 @@ stdenv.mkDerivation rec {
    ./remove-duplicate-dependency.patch
  ];

-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo-beta.3.lock;
-    outputHashes = {
-      "uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";
-    };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit
+      pname
+      version
+      src
+      patches
+      ;
+    hash = "sha256-utpqRh5FIVgEX0dbYIS3GL/np6g6Itz8t27ov5CBrG8=";
  };

  nativeBuildInputs = [
@@ -63,11 +66,11 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients";
    homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
      winter
      dandellion
    ];
@@ -22,14 +22,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI=";
  };

-  # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
-  # inheritance within Git dependencies, but importCargoLock does.
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ruma-0.10.1" = "sha256-VmIZ24vULpm6lF24OFZdsI5JG+XqVPpUWM/R64X17jo=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-r7fOzTug0cKQUGrpXDn1JKb6/lLQDgnA3/colmldA4c=";

  # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
  preBuild = ''
@@ -21,12 +21,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-Jm9ZsqCKOIxZsXQbCluYu7MgOD7hXYljcv/URaNVUW0=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "hematite-nbt-0.5.2" = "sha256-ohhsMlRLFNesccxhqn0GAiVswcdMldD3gv0AXcviHU8=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-YDfyixNfJsKigf3W5265CWl4ETQDeBHYpquBoFoj4Tw=";

  nativeBuildInputs = [
    pkg-config
@@ -3,7 +3,6 @@
  clangStdenv,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  pkg-config,
  openssl,
@@ -23,10 +22,10 @@
  xdg-utils,
 }:

-# gcc doesn't support __has_feature
+# Bionic libc part doesn't compile with GCC
 clangStdenv.mkDerivation (finalAttrs: {
  pname = "mcpelauncher-client";
-  version = "1.1.2-qt6";
+  version = "1.2.0-qt6";

  # NOTE: check mcpelauncher-ui-qt when updating
  src = fetchFromGitHub {
@@ -34,34 +33,19 @@ clangStdenv.mkDerivation (finalAttrs: {
    repo = "mcpelauncher-manifest";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-PmCq6Zgtp17UV0kIbNouFwj/DMiTqwE31+tTb2LUp5o=";
+    hash = "sha256-SyIiBUZCGcV4NFD7IcQv8YdRkDGhkBeqE0qVsKp+44Y=";
  };

-  patches = [
-    ./dont_download_glfw_client.patch
-    # These are upcoming changes that have been merged upstream. Once these get in a release, remove these patches.
-    (fetchpatch {
-      url = "https://github.com/minecraft-linux/game-window/commit/feea8c0e0720eea7093ed95745c17f36d6c40671.diff";
-      hash = "sha256-u4uveoKwwklEooT+i+M9kZ0PshjL1IfWhlltmulsQJo=";
-      stripLen = 1;
-      extraPrefix = "game-window/";
-    })
-    (fetchpatch {
-      url = "https://github.com/minecraft-linux/mcpelauncher-client/commit/db9c31e46d7367867c85a0d0aba42c8144cdf795.diff";
-      hash = "sha256-za/9oZYwKCYyZ1BXQ/zeEjRy81B1NpTlPHEfWAOtzHk=";
-      stripLen = 1;
-      extraPrefix = "mcpelauncher-client/";
-    })
-  ];
+  patches = [ ./dont_download_glfw_client.patch ];

  # Path hard-coded paths.
  postPatch = lib.optionalString stdenv.isLinux ''
    substituteInPlace mcpelauncher-client/src/jni/main_activity.cpp \
      --replace-fail /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open \
-      --replace-fail /usr/bin/zenity ${zenity}/bin/zenity
+      --replace-fail /usr/bin/zenity ${lib.getExe zenity}

    substituteInPlace file-picker/src/file_picker_zenity.cpp \
-      --replace-fail /usr/bin/zenity ${zenity}/bin/zenity
+      --replace-fail 'EXECUTABLE_NAME = "zenity"' 'EXECUTABLE_NAME = "${lib.getExe zenity}"'
  '';

  # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile
@@ -125,6 +109,7 @@ clangStdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      aleksana
      morxemplum
+      phanirithvij
    ];
    mainProgram = "mcpelauncher-client";
    platforms = lib.platforms.unix;
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
    repo = "mcpelauncher-ui-manifest";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-R9wE1lS7x1IIPgVahXjF5Yg2ca+GsiQuF41pWf2edXY=";
+    hash = "sha256-333PwfBWhdfJSi1XrJNHidMYZrzSReb8s4VxBASFQ6Q=";
  };

  patches = [
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdq";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "yshavit";
+    repo = "mdq";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IMDyPIuG5Zyp323XYsFcFo0yNimCm2DV9rY+Ac0DiZo=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-GxQ9YyofalnIP3EtGVpIpg7s8QW2d1Z/gFF2CUBg1P0=";
+
+  passthru.updateScript = nix-update-script { };
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Like jq but for Markdown: find specific elements in a md doc";
+    homepage = "https://github.com/yshavit/mdq";
+    changelog = "https://github.com/yshavit/mdq/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ DimitarNestorov ];
+    mainProgram = "mdq";
+  };
+})
@@ -15,13 +15,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-V1FToLhBzeZd3ve+eKAHniHN6oveEg0FBHnkSZPxBqo=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "chain-map-0.1.0" = "sha256-nds+lPGCbxw3GqrgfmTbKnPkiV3F6f5A2xr82qV33iI=";
-      "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-49dJ1USxdGK8WmPmO3z8Tkexjn4xi+qJRxawqFeIQBg=";

  postPatch = ''
    rm .cargo/config.toml
@@ -17,16 +17,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-q4C4YAs8Q1jHA5P2OApkFZnYM4/aZGxnE8Pd6Hmwd1I=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ratatui-binary-data-widget-0.1.0" = "sha256-5HBqugXAb76+LDsDj+FjsyVqbLMNy503qUkZjWE6tRg=";
-    };
-  };
-
-  postPatch = ''
-    ln -sf ${./Cargo.lock} Cargo.lock
-  '';
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-pn4wmlMW8p6IAHrYjmvmZxNMjIJwJ2MYRsANz4D6xCU=";

  buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security;

@@ -21,13 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "opensc";
-  version = "0.26.0";
+  version = "0.26.1";

  src = fetchFromGitHub {
    owner = "OpenSC";
    repo = "OpenSC";
-    rev = version;
-    sha256 = "sha256-EIQ9YpIGwckg/JjpK0S2ZYdFf/0YC4KaWcLXRNRMuzA=";
+    tag = version;
+    hash = "sha256-H5df+x15fz28IlL/G9zPBxbNBzc+BlDmmgNZVEYQgac=";
  };

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

 stdenv.mkDerivation rec {
  pname = "openxr-loader";
-  version = "1.1.43";
+  version = "1.1.46";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "OpenXR-SDK-Source";
-    rev = "release-${version}";
-    sha256 = "sha256-Ze7r3qcYomcAIAoAO6FZDraKfFr/Wwrnv0HxmY6uE6w=";
+    tag = "release-${version}";
+    hash = "sha256-C2PGPIDA4C/d37jjXLO+2lqD5VSV3skSqraRiT8RT+c=";
  };

  nativeBuildInputs = [ cmake python3 pkg-config ];
@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchpatch,
+  imagemagick,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "pop-hp-wallpapers";
+  version = "0-unstable-2022-04-01";
+
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "hp-wallpapers";
+    rev = "df86078846b0a2a4e3e64f584aaf2a21be47a7eb";
+    forceFetchGit = true;
+    fetchLFS = true;
+    hash = "sha256-NGSvPC9GadqqqgGH9uDNAYuSwfagosmCAE6QmDtmdMw=";
+  };
+
+  nativeBuildInputs = [ imagemagick ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Wallpapers for High-Performance System76 products";
+    homepage = "https://pop.system76.com/";
+    license = with lib.licenses; [ cc-by-sa-40 ];
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchpatch,
+  imagemagick,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pop-wallpapers";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "wallpapers";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-JST5Rt4Ec1lRu62PUt98S2G1vKthAyOSpyCpuCnkGmw=";
+  };
+
+  nativeBuildInputs = [ imagemagick ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Wallpapers for Pop!_OS";
+    homepage = "https://pop.system76.com/";
+    license = with lib.licenses; [
+      #
+      # Kate Hazen:
+      #
+      # kate-hazen-fractal-mountains.png
+      # kate-hazen-mort1mer.png
+      # kate-hazen-pop-m3lvin.png
+      # kate-hazen-pop-retro1.png
+      # kate-hazen-pop-retro2.png
+      # kate-hazen-pop-space.png
+      # kate-hazen-unleash-your-robot.png
+      # kate-hazen-unleash-your-robot-blue.png
+      # kate-hazen-COSMIC-desktop-wallpaper.png
+      #
+      # Nick Nazzaro:
+      #
+      # nick-nazzaro-bedroom.png
+      # nick-nazzaro-desert.png
+      # nick-nazzaro-ice-cave.png
+      # nick-nazzaro-jungle-green.png
+      # nick-nazzaro-jungle-red.png
+      # nick-nazzaro-space-blue.png
+      # nick-nazzaro-space-red.png
+      # nick-nazzaro-underwater.png
+      cc-by-sa-40
+
+      # Unsplash:
+      #
+      # ahmadreza-sajadi-10140-edit.jpg
+      # benjamin-voros-250200.jpg
+      # ferdinand-stohr-149422.jpg
+      # galen-crout-175291.jpg
+      # jad-limcaco-183877.jpg
+      # jake-hills-36605.jpg
+      # jared-evans-119758.jpg
+      # jasper-van-der-meij-97274-edit.jpg
+      # kait-herzog-8242.jpg
+      # nasa-45068.jpg
+      # nasa-53884.jpg
+      # nasa-89125.jpg
+      # nasa-89127.jpg
+      # ng-32703.jpg
+      # ricardo-gomez-angel-180819-blue.jpg
+      # samuel-zeller-337041.jpg
+      # sean-afnan-244576.jpg
+      # sebastien-gabriel-232361.jpg
+      # spacex-81773.jpg
+      # tim-mccartney-39907.jpg
+      # tony-webster-97532.jpg
+      publicDomain
+    ];
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    platforms = lib.platforms.all;
+  };
+})
@@ -1,19 +1,20 @@
-{ lib, stdenv, fetchsvn
+{ lib, stdenv, fetchurl
 , autoreconfHook, pkg-config, txt2man, which
-, openssl, apr, aprutil
+, openssl, nss, p11-kit, libical, ldns, unbound, apr, aprutil
 }:

 stdenv.mkDerivation rec {
  pname = "redwax-tool";
-  version = "0.9.1";
+  version = "0.9.9";

-  src = fetchsvn {
-    url = "https://source.redwax.eu/svn/redwax/rt/redwax-tool/tags/redwax-tool-${version}/";
-    sha256 = "sha256-MWSB1AkkRS18UUHGq8EWv3OIXPSVHpmrdD5Eq1VdbkA=";
+  src = fetchurl {
+    url = "https://archive.redwax.eu/dist/rt/redwax-tool-${version}/redwax-tool-${version}.tar.gz";
+    hash = "sha256-gA9YWR3v66lSn4KkwG49l7V4/HUTrBXXl1uDCLr1tu8=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config txt2man which ];
-  buildInputs = [ openssl apr aprutil ];
+  buildInputs = [ openssl nss p11-kit libical ldns unbound apr aprutil ];
+  configureFlags = [ "--with-openssl" "--with-nss" "--with-p11-kit" "--with-libical" "--with-ldns" "--with-unbound" "--with-bash-completion-dir=yes" ];

  meta = with lib; {
    homepage = "https://redwax.eu/rt/";
@@ -6,13 +6,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "silx";
-  version = "2.2.0";
+  version = "2.2.1";

  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ff2YUp0GjOKAm2k+eBF+WlYlo8Z7gmUjFgTFTvOxRzI=";
+    hash = "sha256-9di3TNjhhoOT4bRwPfaM/jTbVW5+V9b8V2V6ZBwXZjo=";
  };

  build-system = with python3Packages; [
@@ -1,23 +1,23 @@
 {
-  version = "1.20.0";
+  version = "1.21.0";

  x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-zN8s7Ztc1yz6bbLlbIesnbv6CfrsB8VFaXyixPVR40E=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-QFI6mXrI6TXRVgjYyKhMIT4EAZzKdH4aWvRkURSHN6c=";
  };

  aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-b1SE9q1NZQeHjjX3dyXzCc5/ZuiOWKON623eu8TlzhI=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-JsGbIZkwOSTJ3kDg3yxaHMVeH5ZCx49iAvMYkiP0iYI=";
  };

  x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-Rwq8en8dt1VKoPdHWTIYr67ppBlFI+br/H8jKepfqKQ=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-CQVmeZK2+Ezba7v6FURh5DPCqDxXYR62O+xw4gAzj6M=";
  };

  aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-LWlCemjODa29NA+/Skzw8hWtbOmtMWYSI3G3e1PvUDo=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.21.0/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-F/FBkqsS7RCVktxwHJhiP7uS5XAW53BJjlRsLQ4DWAc=";
  };
 }
@@ -0,0 +1,52 @@
+BACKGROUNDS=$(wildcard backgrounds/*)
+SCALED=$(sort $(patsubst backgrounds/%, scaled/%, $(BACKGROUNDS)))
+
+prefix ?= /usr
+datarootdir = $(prefix)/share
+datadir = $(datarootdir)
+
+.PHONY: all clean install uninstall
+
+all: $(SCALED) scaled/info.xml
+
+clean:
+	rm -rf build scaled
+
+install: all
+	for file in $(SCALED); do \
+		install -D -m 0644 "$$file" "$(DESTDIR)$(datadir)/backgrounds/system76/$$(basename "$$file")"; \
+	done
+	install -D -m 0644 "scaled/info.xml" "$(DESTDIR)$(datadir)/gnome-background-properties/system76-wallpapers.xml"
+
+uninstall:
+	for file in $(SCALED); do \
+		rm -f "$(DESTDIR)$(datadir)/backgrounds/system76/$$(basename "$$file")"; \
+	done
+	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(datadir)/backgrounds/system76/"
+	rm -f "$(DESTDIR)$(datadir)/gnome-background-properties/system76-wallpapers.xml"
+	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(datadir)/gnome-background-properties/"
+
+scaled/%: backgrounds/%
+	@mkdir -p build scaled
+	magick "$<" -resize "3840x2160^" "build/$*"
+	mv "build/$*" "$@"
+
+scaled/info.xml: $(SCALED)
+	@mkdir -p build scaled
+	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > "build/info.xml"
+	echo "<!DOCTYPE wallpapers SYSTEM \"gnome-wp-list.dtd\">" >> "build/info.xml"
+	echo "<wallpapers>" >> "build/info.xml"
+	for file in $(SCALED); do \
+		filename="$$(basename "$$file")"; \
+		name="$${filename%.*}"; \
+		echo "    <wallpaper>" >> "build/info.xml"; \
+		echo "        <name>$$name</name>" >> "build/info.xml"; \
+		echo "        <filename>/usr/share/backgrounds/system76/$$(basename "$$file")</filename>" >> "build/info.xml"; \
+		echo "        <options>zoom</options>" >> "build/info.xml"; \
+		echo "        <pcolor>#000000</pcolor>" >> "build/info.xml"; \
+		echo "        <scolor>#000000</scolor>" >> "build/info.xml"; \
+		echo "        <shade_type>solid</shade_type>" >> "build/info.xml"; \
+		echo "    </wallpaper>" >> "build/info.xml"; \
+	done
+	echo "</wallpapers>" >> "build/info.xml"
+	mv "build/info.xml" "$@"
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchpatch,
+  imagemagick,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "system76-wallpapers";
+  version = "0-unstable-2024-04-26";
+
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "system76-wallpapers";
+    rev = "ff1e25c79d10c699dfb695374d5ae7b3f8031b2b";
+    forceFetchGit = true;
+    fetchLFS = true;
+    hash = "sha256-5rddxbi/hRPy93DqswG54HzWK33Y5TteGB8SKjLXJZk=";
+  };
+
+  prePatch = ''
+    cp ${./Makefile} Makefile
+  '';
+
+  nativeBuildInputs = [ imagemagick ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Wallpapers for System76 products";
+    homepage = "https://system76.com/";
+    license = with lib.licenses; [
+      unfree # No license specified
+    ];
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "taterclient-ddnet";
-  version = "10.1.1";
+  version = "10.1.2";

  src = fetchFromGitHub {
    owner = "sjrc6";
    repo = "taterclient-ddnet";
    tag = "V${finalAttrs.version}";
-    hash = "sha256-B5J8LctMYkb6X1tEI5H4oMEDDWLLpLW5v4NRWplhncY=";
+    hash = "sha256-0N4nzGcmHrWkIFHEREtSBCTHPBE4UI8RmCuRsehX1YU=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
-    sha256 = "sha256-TIs/xLxLBkKBN0a0CRB2KMmCq8QgICH1++i485WDU3A=";
+    hash = "sha256-TIs/xLxLBkKBN0a0CRB2KMmCq8QgICH1++i485WDU3A=";
  };

  buildInputs = [
@@ -34,14 +34,21 @@ stdenv.mkDerivation rec {
    substituteInPlace docs/Makefile --replace /usr/share /share
  '';

+  postPatch = ''
+    # compute the allocated size from the pointed type, to avoid the warning
+    substituteInPlace lcptools-v2/pconf_legacy.c \
+      --replace-fail "digest = malloc(SHA1_DIGEST_SIZE);" \
+        "digest = malloc(sizeof *digest);"
+  '';
+
  installFlags = [ "DESTDIR=$(out)" ];

-  meta = with lib; {
+  meta = {
    description = "Pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";
    homepage = "https://sourceforge.net/projects/tboot/";
    changelog = "https://sourceforge.net/p/tboot/code/ci/v${version}/tree/CHANGELOG";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ak ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ak ];
    platforms = [
      "x86_64-linux"
      "i686-linux"
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "unrar-free";
-  version = "0.3.1";
+  version = "0.3.1-unstable-2024-09-19";

  src = fetchFromGitLab {
    owner = "bgermann";
    repo = "unrar-free";
-    rev = finalAttrs.version;
-    hash = "sha256-Dg+KGZcqbE1nBPaemZlWQPaUQQJmaSe0nyDQRXJzwuE=";
+    rev = "a7f9a157276ae68987fb44fe5ccf4f4255eb0a5e";
+    hash = "sha256-aCO1vklG5MneEiqS/IBvC09YrvWa+OndfvCblDFKA1E=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "uv-sort";
+  version = "0.5.0";
+  pyproject = true;
+
+  # Build from GitHub does not work. Use fetchPypi instead of fetchFromGitHub.
+  # See https://github.com/NixOS/nixpkgs/pull/388382#issuecomment-2708857805
+  src = fetchPypi {
+    pname = "uv_sort";
+    inherit version;
+    hash = "sha256-qCShDuKBFS4omcsntZ1wzRtAKTbp8CfTw0IIAgxBvcE=";
+  };
+
+  build-system = with python3Packages; [
+    hatchling
+    uv-dynamic-versioning
+  ];
+
+  dependencies = with python3Packages; [
+    packaging
+    tomlkit
+    typer
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+  ];
+
+  meta = {
+    description = "Sort uv's dependencies alphabetically";
+    homepage = "https://github.com/ninoseki/uv-sort";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    mainProgram = "uv-sort";
+  };
+}
@@ -27,6 +27,15 @@ stdenv.mkDerivation {

  hardeningDisable = [ "format" ];

+  postPatch = ''
+    substituteInPlace vncpasswd/vncpasswd.c \
+      --replace-fail "return;" "return 0;"
+
+    sed -i '7i #include <stdlib.h>' vncconnect/vncconnect.c
+    sed -i '8i #include <string.h>' vncconnect/vncconnect.c
+    sed -i '31i #include <time.h>' libvncauth/vncauth.c
+  '';
+
  nativeBuildInputs = [
    imake
    gccmakedep
@@ -14,13 +14,16 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://xearth.org/${pname}-${version}.tar.gz";
-    sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
+    hash = "sha256-vLFAfMNbP23TYGssYHInO2qRLL2e0a4i+y0maUVBMJw=";
  };

+  postPatch = "sed -i '48i #include <stdlib.h>' gifout.c";
+
  nativeBuildInputs = [
    imake
    gccmakedep
  ];
+
  buildInputs = [
    libXt
    libXext
@@ -31,12 +34,13 @@ stdenv.mkDerivation rec {
    "BINDIR=bin"
    "MANDIR=man/man1"
  ];
+
  installTargets = [
    "install"
    "install.man"
  ];

-  meta = with lib; {
+  meta = {
    description = "sets the X root window to an image of the Earth";
    mainProgram = "xearth";
    homepage = "https://xearth.org";
@@ -45,13 +49,12 @@ stdenv.mkDerivation rec {
      correctly shaded for the current position of the Sun.
      By default, xearth updates the displayed image every  five  minutes.
    '';
-    maintainers = [ maintainers.mafo ];
+    maintainers = with lib.maintainers; [ mafo ];
    license = {
      fullName = "xearth license";
      url = "https://xearth.org/copyright.html";
      free = true;
    };
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
  };
-
 }
@@ -4,6 +4,7 @@
  fetchurl,
  libX11,
  libXt,
+  autoreconfHook,

  libjpeg ? null,
  libpng ? null,
@@ -35,6 +36,8 @@ stdenv.mkDerivation rec {
    sha256 = "17k518vrdrya5c9dqhpmm4g0h2vlkq1iy87sg2ngzygypbli1xvn";
  };

+  nativeBuildInputs = [ autoreconfHook ];
+
  buildInputs =
    [
      libX11
@@ -55,16 +58,19 @@ stdenv.mkDerivation rec {
  # $SOURCE_DATE_EPOCH, but we want to make sure we don't even call these.
  preConfigure = ''
    substituteInPlace build-info \
-      --replace '[ -x /bin/date ]' 'false' \
-      --replace '[ -x /bin/id ]' 'false' \
-      --replace '[ -x /bin/uname ]' 'false' \
-      --replace '[ -x /usr/bin/id ]' 'false'
+      --replace-fail '[ -x /bin/date ]' 'false' \
+      --replace-fail '[ -x /bin/id ]' 'false' \
+      --replace-fail '[ -x /bin/uname ]' 'false' \
+      --replace-fail '[ -x /usr/bin/id ]' 'false'

    chmod +x build-info configure
  '';

  enableParallelBuilding = true;

+  # creating patch would add more complexity
+  env.CFLAGS = "-Wno-implicit-int";
+
  # NOTE: we're not installing the `uufilter` binary; if needed, the standard
  # `uudecode` tool should work just fine.
  installPhase = ''
@@ -31,7 +31,12 @@ stdenv.mkDerivation rec {
    [ ]
    # Undocumented darwin hack (assembly is probably disabled due to an
    # issue with nasm, however yasm is now used)
-    ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-macosx_module --disable-assembly";
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "--enable-macosx_module"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
+      "--disable-assembly"
+    ];

  nativeBuildInputs = [ ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) yasm;

@@ -1,20 +1,34 @@
-# generated by zon2nix (https://github.com/figsoda/zon2nix)
+# generated by zon2nix (https://github.com/nix-community/zon2nix)

 { linkFarm, fetchzip }:

 linkFarm "zig-packages" [
  {
-    name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147";
-    path = fetchzip {
-      url = "https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz";
-      hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g=";
-    };
-  }
-  {
-    name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d";
+    name = "N-V-__8AABhrAQAQLLLGadghhPsdxTgBk9N9aLVOjXW3ay0V";
    path = fetchzip {
      url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz";
      hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo=";
    };
  }
+  {
+    name = "N-V-__8AAMeOlQEipHjcyu0TCftdAi9AQe7EXUDJOoVe0k-t";
+    path = fetchzip {
+      url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.11.1.tar.gz";
+      hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
+    };
+  }
+  {
+    name = "known_folders-0.0.0-Fy-PJtLDAADGDOwYwMkVydMSTp_aN-nfjCZw6qPQ2ECL";
+    path = fetchzip {
+      url = "https://github.com/ziglibs/known-folders/archive/aa24df42183ad415d10bc0a33e6238c437fc0f59.tar.gz";
+      hash = "sha256-YiJ2lfG1xsGFMO6flk/BMhCqJ3kB3MnOX5fnfDEcmMY=";
+    };
+  }
+  {
+    name = "lsp_codegen-0.1.0-CMjjo0ZXCQB-rAhPYrlfzzpU0u0u2MeGvUucZ-_g32eg";
+    path = fetchzip {
+      url = "https://github.com/zigtools/zig-lsp-codegen/archive/063a98c13a2293d8654086140813bdd1de6501bc.tar.gz";
+      hash = "sha256-KzRi/a3FCS11Mryin9skkf3rFrIuoMP8+RcU0IuYNBA=";
+    };
+  }
 ]
@@ -1,28 +1,24 @@
 {
  lib,
  stdenv,
+  zig_0_14,
  fetchFromGitHub,
-  zig_0_13,
  callPackage,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "zls";
-  version = "0.13.0";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "zigtools";
    repo = "zls";
    rev = finalAttrs.version;
    fetchSubmodules = true;
-    hash = "sha256-vkFGoKCYUk6B40XW2T/pdhir2wzN1kpFmlLcoLwJx1U=";
+    hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";
  };

-  zigBuildFlags = [
-    "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in"
-  ];
-
-  nativeBuildInputs = [ zig_0_13.hook ];
+  nativeBuildInputs = [ zig_0_14.hook ];

  postPatch = ''
    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
@@ -7,15 +7,15 @@

 buildNpmPackage rec {
  pname = "zwave-js-ui";
-  version = "9.30.1";
+  version = "9.31.0";

  src = fetchFromGitHub {
    owner = "zwave-js";
    repo = "zwave-js-ui";
    tag = "v${version}";
-    hash = "sha256-z0d+8CtQfe7iyj7SBPWqe4Q+8d6miZo8ImB1Pj8Jarc=";
+    hash = "sha256-KlJqzAgMyjA9OxCsKRICZ82ZBe+GpNuBvEHCtG5jvc4=";
  };
-  npmDepsHash = "sha256-aiJdUmJpV9RzixS9jwt65Mu2ZyrP2Kd5pDGEQ5/b3Jw=";
+  npmDepsHash = "sha256-qy3hnZ9KvMRBJ+XVjxFdS8jQvlhvOEEZDcZUgQaFUT0=";

  passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;

@@ -8,12 +8,12 @@

 buildPythonPackage rec {
  pname = "ago";
-  version = "0.0.95";
+  version = "0.1.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q=";
+    hash = "sha256-FWBBWXEcR+CPISUfKL+0ODlCCHU1Zg2+ZAsvYZP5K+Q=";
  };

  build-system = [ setuptools ];
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  nix-update-script,
-
  buildPythonPackage,
  unittestCheckHook,
  pythonOlder,
@@ -24,11 +23,10 @@ buildPythonPackage rec {
    tag = "v${version}";
    hash = "sha256-DslG+XxIYb04I3B7m0fmRmE3hFCczF039QhSVdHGPL8=";
  };
-  passthru.updateScript = nix-update-script { };

-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes."async-tar-0.4.2" = "sha256-C8M/5YEo3OIfN+654pVTfDm8C8qmKX5qy61NKFt7Jb4=";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-e3NbFlBQu9QkGnIwqy2OmlQFVHjlfpMVRFWD2ADGGSc=";
  };

  nativeBuildInputs = [
@@ -39,15 +37,18 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [ unittestCheckHook ];
+
  unittestFlagsArray = [ "tests/" ]; # Not sure why it isn't autodiscovered

  pythonImportsCheck = [ "aiotarfile" ];

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Stream-based, asynchronous tarball processing";
    homepage = "https://github.com/rhelmot/aiotarfile";
    changelog = "https://github.com/rhelmot/aiotarfile/commits/v{version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nicoo ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nicoo ];
  };
 }
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "aiounittest";
-  version = "1.4.3";
+  version = "1.5.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "kwarunek";
    repo = "aiounittest";
    tag = version;
-    hash = "sha256-hcfcB2SMduTopqdRdMi63UTTD7BWc5g2opAfahWXjlw=";
+    hash = "sha256-zX3KpDw7AaEwOLkiHX/ZD+rSMeN7qi9hOVAmVH6Jxgg=";
  };

  build-system = [ setuptools ];
@@ -1,539 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "dbt-extractor"
-version = "0.5.1"
-dependencies = [
- "pyo3",
- "quickcheck",
- "quickcheck_macros",
- "rayon",
- "thiserror",
- "tree-sitter",
- "tree-sitter-jinja2",
-]
-
-[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "env_logger"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
-[[package]]
-name = "indoc"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
-
-[[package]]
-name = "libc"
-version = "0.2.147"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-
-[[package]]
-name = "lock_api"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "pyo3"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59"
-dependencies = [
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "parking_lot",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0"
-dependencies = [
- "once_cell",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "quickcheck"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-dependencies = [
- "env_logger",
- "log",
- "rand",
-]
-
-[[package]]
-name = "quickcheck_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rayon"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "smallvec"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
-
-[[package]]
-name = "thiserror"
-version = "1.0.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.26",
-]
-
-[[package]]
-name = "tree-sitter"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
-dependencies = [
- "cc",
- "regex",
-]
-
-[[package]]
-name = "tree-sitter-jinja2"
-version = "0.2.0"
-source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.2.0#c9b092eff38bd6943254ad0373006d83c100a8c0"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-
-[[package]]
-name = "unindent"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "windows-targets"
-version = "0.48.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
@@ -21,11 +21,9 @@ buildPythonPackage rec {
    hash = "sha256-zV2VV2qN6kGQJAqvmTajf9dLS3kTymmjw2j8RHK7fhM=";
  };

-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "tree-sitter-jinja2-0.2.0" = "sha256-Hfw85IcxwqFDKjkUxU+Zd9vyL7gaE0u5TZGKol2I9qg=";
-    };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-luPAuRl+yrHinLs6H0ZRVnce2zz1DUrniVOCa1hu1S4=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,108 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  flit-core,
+  jinja2,
+  loguru,
+  matplotlib,
+  numpy,
+  orjson,
+  pandas,
+  pydantic,
+  pydantic-settings,
+  pydantic-extra-types,
+  pyyaml,
+  qrcode,
+  rectpack,
+  rich,
+  scipy,
+  shapely,
+  toolz,
+  types-pyyaml,
+  typer,
+  kfactory,
+  watchdog,
+  freetype-py,
+  mapbox-earcut,
+  networkx,
+  scikit-image,
+  trimesh,
+  ipykernel,
+  attrs,
+  graphviz,
+  # tests
+  jsondiff,
+  jsonschema,
+  pytest-regressions,
+}:
+buildPythonPackage rec {
+  pname = "gdsfactory";
+  version = "8.18.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gdsfactory";
+    repo = "gdsfactory";
+    rev = "v${version}";
+    hash = "sha256-wDz8QpRgu40FB8+otnGsHVn2e6/SWXIZgA1aeMqMhPQ=";
+  };
+
+  build-system = [ flit-core ];
+
+  dependencies = [
+    jinja2
+    loguru
+    matplotlib
+    numpy
+    orjson
+    pandas
+    pydantic
+    pydantic-settings
+    pydantic-extra-types
+    pyyaml
+    qrcode
+    rectpack
+    rich
+    scipy
+    shapely
+    toolz
+    types-pyyaml
+    typer
+    kfactory
+    watchdog
+    freetype-py
+    mapbox-earcut
+    networkx
+    scikit-image
+    trimesh
+    ipykernel
+    attrs
+    graphviz
+  ];
+
+  nativeCheckInputs = [
+    jsondiff
+    jsonschema
+    pytestCheckHook
+    pytest-regressions
+  ];
+
+  pythonRelaxDeps = [
+    "pydantic"
+    "trimesh"
+  ];
+
+  # tests require >32GB of RAM
+  doCheck = false;
+
+  pythonImportsCheck = [ "gdsfactory" ];
+
+  meta = with lib; {
+    description = "Python library to generate GDS layouts";
+    homepage = "https://github.com/gdsfactory/gdsfactory";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fbeffa ];
+  };
+}
@@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  isPy27,
  fetchFromGitea,
  replaceVars,
  fetchpatch,
@@ -24,17 +23,15 @@

 buildPythonPackage rec {
  pname = "img2pdf";
-  version = "0.5.1";
-  disabled = isPy27;
-
+  version = "0.6.0";
  pyproject = true;

  src = fetchFromGitea {
    domain = "gitlab.mister-muffin.de";
    owner = "josch";
    repo = "img2pdf";
-    rev = version;
-    hash = "sha256-mrNTc37GrHTc7NW0sYI1FlAOlnvXum02867enqHsAEQ=";
+    tag = version;
+    hash = "sha256-/nxXgGsnj5ktxUYt9X8/9tJzXgoU8idTjVgLh+8jol8=";
  };

  patches = [
@@ -48,16 +45,11 @@ buildPythonPackage rec {
            cp ${colord}/share/color/icc/colord/sRGB.icc $out
          '';
    })
-    (fetchpatch {
-      # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
-      url = "https://salsa.debian.org/debian/img2pdf/-/raw/4a7dbda0f473f7c5ffcaaf68ea4ad3f435e0920d/debian/patches/fix_tests.patch";
-      hash = "sha256-A1zK6yINhS+dvyckZjqoSO1XJRTaf4OXFdq5ufUrBs8=";
-    })
  ];

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

-  propagatedBuildInputs = [
+  dependencies = [
    pikepdf
    pillow
  ];
@@ -86,40 +78,20 @@ buildPythonPackage rec {

  disabledTests = [
    # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
-    "test_miff_cmyk16"
-    # https://gitlab.mister-muffin.de/josch/img2pdf/issues/205
+    "test_jpg_cmyk"
    "test_miff_cmyk8"
-    "test_miff_rgb8"
-    "test_tiff_ccitt_lsb_m2l_white"
-    "test_tiff_ccitt_msb_l2m_white"
-    "test_tiff_ccitt_msb_m2l_white"
-    "test_tiff_ccitt_nometa1"
-    "test_tiff_ccitt_nometa2"
    "test_tiff_cmyk8"
-    "test_tiff_cmyk16"
-    "test_tiff_float"
-    "test_tiff_gray1"
-    "test_tiff_gray2"
-    "test_tiff_gray4"
-    "test_tiff_gray8"
-    "test_tiff_gray16"
-    "test_tiff_multipage"
-    "test_tiff_palette8"
-    "test_tiff_rgb8"
-    "test_tiff_rgb12"
-    "test_tiff_rgb14"
-    "test_tiff_rgb16"
  ];

  pythonImportsCheck = [ "img2pdf" ];

-  meta = with lib; {
-    changelog = "https://gitlab.mister-muffin.de/josch/img2pdf/src/tag/${src.rev}/CHANGES.rst";
+  meta = {
+    changelog = "https://gitlab.mister-muffin.de/josch/img2pdf/src/tag/${src.tag}/CHANGES.rst";
    description = "Convert images to PDF via direct JPEG inclusion";
    homepage = "https://gitlab.mister-muffin.de/josch/img2pdf";
-    license = licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
    mainProgram = "img2pdf";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
      veprbl
      dotlambda
    ];
@@ -0,0 +1,77 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  klayout,
+  aenum,
+  cachetools,
+  gitpython,
+  loguru,
+  pydantic,
+  pydantic-settings,
+  rectangle-packer,
+  requests,
+  ruamel-yaml-string,
+  scipy,
+  tomli,
+  toolz,
+  typer,
+  numpy,
+  ruamel-yaml,
+}:
+
+buildPythonPackage rec {
+  pname = "kfactory";
+  version = "0.21.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gdsfactory";
+    repo = "kfactory";
+    rev = "v${version}";
+    sha256 = "sha256-VLhAJ5rOBKEO1FDCnlaseA+SmrMSoyS+BaEzjdHm59Y=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    aenum
+    cachetools
+    gitpython
+    klayout
+    loguru
+    numpy
+    pydantic
+    pydantic-settings
+    rectangle-packer
+    requests
+    ruamel-yaml
+    ruamel-yaml-string
+    scipy
+    tomli
+    toolz
+    typer
+  ];
+
+  pythonImportsCheck = [ "kfactory" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  # https://github.com/gdsfactory/kfactory/issues/511
+  disabledTestPaths = [
+    "tests/test_pdk.py"
+  ];
+
+  meta = with lib; {
+    description = "KLayout API implementation of gdsfactory";
+    homepage = "https://github.com/gdsfactory/kfactory";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fbeffa ];
+  };
+}
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  curl,
+  cython,
+  expat,
+  libpng,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "klayout";
+  version = "0.29.8";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-21EPhFb/JMZdyuHDXIxhnLTpHUPxKU24cnodH9oX2q8=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  buildInputs = [
+    curl
+    expat
+    libpng
+  ];
+
+  pythonImportsCheck = [ "klayout" ];
+
+  meta = with lib; {
+    description = "KLayout’s Python API";
+    homepage = "https://github.com/KLayout/klayout";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ fbeffa ];
+    platforms = platforms.linux;
+  };
+}
@@ -18,7 +18,6 @@
  pngquant,
  pytest-xdist,
  pytestCheckHook,
-  pythonOlder,
  rich,
  reportlab,
  replaceVars,
@@ -29,10 +28,7 @@

 buildPythonPackage rec {
  pname = "ocrmypdf";
-  version = "16.7.0";
-
-  disabled = pythonOlder "3.10";
-
+  version = "16.10.0";
  pyproject = true;

  src = fetchFromGitHub {
@@ -45,7 +41,7 @@ buildPythonPackage rec {
    postFetch = ''
      rm "$out/.git_archival.txt"
    '';
-    hash = "sha256-81maXJjdGlzWy3TaQ8cabjJl6ZE5tbfc8m/+Px7ONhs=";
+    hash = "sha256-tRq3qskZK39xfSof4RUTWC2h9mi7eGDHR6nI7reltm4=";
  };

  patches = [
@@ -29,14 +29,14 @@
 }:
 buildPythonPackage rec {
  pname = "open-clip-torch";
-  version = "2.30.0";
+  version = "2.31.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mlfoundations";
    repo = "open_clip";
    tag = "v${version}";
-    hash = "sha256-Ht59pYJfcBkfoWSTDipsoy/71pMzc5rlDD6xHgvUs1g=";
+    hash = "sha256-VOfjxQjIC6IL7WyhTc8JpIAa9eknmU4LpnA9DtQJ+oQ=";
  };

  build-system = [ pdm-backend ];
@@ -91,7 +91,7 @@ buildPythonPackage rec {
  meta = {
    description = "Open source implementation of CLIP";
    homepage = "https://github.com/mlfoundations/open_clip";
-    changelog = "https://github.com/mlfoundations/open_clip/releases/tag/v${version}";
+    changelog = "https://github.com/mlfoundations/open_clip/releases/tag/${src.tag}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ iynaix ];
    mainProgram = "open-clip";
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pyqtgraph,
+  numpy,
+  pyqt5,
+  pyqt6,
+  pyside6,
+}:
+
+buildPythonPackage rec {
+  pname = "pglive";
+  version = "0.8.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "domarm-comat";
+    repo = "pglive";
+    rev = "76185c40850b607d9a83843292748463fcaa8089";
+    hash = "sha256-/z4hpWqxW4WkHa9SXfu7UXHoNrVpbqR7+YbsRQUuEA8=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    pyqtgraph
+    numpy
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  passthru.optional-dependencies = {
+    pyqt5 = [ pyqt5 ];
+    pyqt6 = [ pyqt6 ];
+    pyside6 = [ pyside6 ];
+  };
+
+  pythonImportsCheck = [ "pglive" ];
+
+  meta = {
+    changelog = "https://github.com/domarm-comat/pglive/releases/tag/v${version}";
+    description = "Live plot for PyqtGraph";
+    homepage = "https://github.com/domarm-comat/pglive";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fsagbuya ];
+  };
+}
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "pydal";
-  version = "20250215.2";
+  version = "20250228.1";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-FbykqwXXCse8CPD6Dm/w5I8lco5XWLH3BlJJtHuU8Vk=";
+    hash = "sha256-/1FeoGXGWqVL3T54w84JUys4e9heOyXWkPdWy3MSzcA=";
  };

  build-system = [ setuptools ];
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "rectangle-packer";
+  version = "2.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Penlect";
+    repo = "rectangle-packer";
+    rev = version;
+    hash = "sha256-YsMLB9jfAC5yB8TnlY9j6ybXM2ILireOgQ8m8wYo4ts=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail 'Cython<3.0.0' 'Cython'
+  '';
+
+  pythonImportsCheck = [ "rpack" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    rm -r rpack
+  '';
+
+  meta = with lib; {
+    description = "Pack a set of rectangles into a bounding box with minimum area";
+    homepage = "https://github.com/Penlect/rectangle-packer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fbeffa ];
+  };
+}
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "rectpack";
+  version = "0.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "secnot";
+    repo = "rectpack";
+    rev = version;
+    hash = "sha256-kU0TT3wiudcLXrT+lYPYHYRtf7aNj/IKpnYKb/H91ng=";
+  };
+
+  build-system = [ setuptools ];
+
+  # tests are base on nose
+  doCheck = false;
+
+  pythonImportsCheck = [ "rectpack" ];
+
+  meta = with lib; {
+    description = "Collection of algorithms for solving the 2D knapsack problem";
+    homepage = "https://github.com/secnot/rectpack";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fbeffa ];
+  };
+}
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  ruamel-yaml,
+}:
+
+buildPythonPackage rec {
+  pname = "ruamel-yaml-string";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "ruamel.yaml.string";
+    hash = "sha256-enrtzAVdRcAE04t1b1hHTr77EGhR9M5WzlhBVwl4Q1A=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ ruamel-yaml ];
+
+  pythonImportsCheck = [ "ruamel.yaml" ];
+
+  meta = with lib; {
+    description = "Add dump_to_string/dumps method that returns YAML document as string";
+    homepage = "https://sourceforge.net/projects/ruamel-yaml-string/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fbeffa ];
+  };
+}
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "scim2-models";
-  version = "0.3.0";
+  version = "0.3.1";

  pyproject = true;

@@ -19,7 +19,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit version;
    pname = "scim2_models";
-    hash = "sha256-odtiOF54IOZ8lP11gkaBU5frOzvRvKeXoqPvNG6B2Cc=";
+    hash = "sha256-oV6OGgsIHEvekc39TqS2egQ1tUz8BL2dTADNWNwdrxE=";
  };

  build-system = [ hatchling ];
@@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "translate-toolkit";
-  version = "3.14.7";
+  version = "3.15.0";

  pyproject = true;
  build-system = [ setuptools-scm ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "translate_toolkit";
    inherit version;
-    hash = "sha256-5xpvNxEQBuMggHCb2RPCQ/lQWop6Hiep8BpRSey31R0=";
+    hash = "sha256-16evXSr6Znwber/UNSMVd86toWZGswPSQO7Y5ySCYIY=";
  };

  dependencies = [
@@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "uv-dynamic-versioning";
-  version = "0.4.1";
+  version = "0.6.0";
  pyproject = true;

  src = fetchFromGitHub {
@@ -30,7 +30,7 @@ buildPythonPackage rec {
    tag = "v${version}";
    # Tests perform mock operations on the local repo
    leaveDotGit = true;
-    hash = "sha256-5pc05yazeHyQvmNk0uy6XkLrmX4ZQF6Lj7fDDtVcpu4=";
+    hash = "sha256-rcvNQ6QrVu2pp1aWTalNK2R7CW/NfFGmu4Dea1EN2ZA=";
  };

  build-system = [
@@ -104,12 +104,8 @@ rec {

      sourceRoot = "${src.name}/desktop/src-tauri";

-      cargoLock = {
-        lockFile = ./Cargo.lock;
-        outputHashes = {
-          "tauri-plugin-log-0.0.0" = "sha256-tM6oLJe/wwqDDNMKBeMa5nNVvsmi5b104xMOvtm974Y=";
-        };
-      };
+      useFetchCargoVendor = true;
+      cargoHash = "sha256-HD9b7OWilltL5Ymj28zoZwv5TJV3HT3LyCdagMqLH6E=";

      # Workaround:
      #   The `tauri` dependency features on the `Cargo.toml` file does not match the allowlist defined under `tauri.conf.json`.
@@ -16,8 +16,8 @@ let
      hash = "sha256-HBjZi6W/BzT8fij2yPG0OxvNhmd33s3igdFIWTkGA/w=";
    };
    "10" = {
-      version = "10.6.1";
-      hash = "sha256-gSBIRaOWliqcS0nMLWyvu0mnWGUtPCQ/ISjLxjgIT+I=";
+      version = "10.6.2";
+      hash = "sha256-IAcqH27dF2RuqSNL8yxC1WPa03spc+l6Ld5cF3dKgk0=";
    };
  };

@@ -68,7 +68,7 @@
        "version": "1.21.3-82"
    },
    "1.21.4": {
-        "hash": "sha256-X7HNd2TbVyG7OSRvWY4QUiMxC7UBxuqPtXPbA7U+i2U=",
-        "version": "1.21.4-175"
+        "hash": "sha256-s9n3qmcRa6zBgUY+m29O76i8q6gPBdI3tNVeQnKyKmw=",
+        "version": "1.21.4-207"
    }
 }
@@ -1,7 +1,7 @@
 {
    "testing": {
-        "version": "6.14-rc5",
-        "hash": "sha256:18lwpf9z45dfvcbnfrbkl5s2m00cb7r9anxlr2kmwf11xmxg5pax"
+        "version": "6.14-rc6",
+        "hash": "sha256:01fzqqb32aazyg4jayiphzqy0y3q7k8545i7p940gdah8ck017vc"
    },
    "6.1": {
        "version": "6.1.130",
@@ -20,8 +20,8 @@
        "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc"
    },
    "6.6": {
-        "version": "6.6.81",
-        "hash": "sha256:13ri43badja4bprxah9ssjj16v5hvff7i3a3phc9j6vzwql3hj5g"
+        "version": "6.6.82",
+        "hash": "sha256:0h8fhb23l1lsqnlb7gxv4mvnxjh1891kwjhhgxsbxji3ijdkihpk"
    },
    "6.11": {
        "version": "6.11.11",
@@ -2,6 +2,7 @@
  lib,
  callPackage,
  fetchFromGitHub,
+  fetchpatch2,
 }:
 let
  scx-common = rec {
@@ -16,6 +17,15 @@ let
      inherit (versionInfo.scx) hash;
    };

+    patches = [
+      # Remove after new release
+      (fetchpatch2 {
+        name = "fix-builds-on-debug-fs-kernels";
+        url = "https://github.com/sched-ext/scx/commit/3c09e8c8c62efd701107f4c2071211db02341d62.patch?full_index=1";
+        hash = "sha256-jLMlCKBYQKS6sf5pZy5z19iSmX9bu9rlXHmGVaxTOho=";
+      })
+    ];
+
    meta = {
      homepage = "https://github.com/sched-ext/scx";
      changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}";
--- a/Show More
+++ b/Show More