Merge master into staging-next

2025-02-08 00:14:03 +00:00
parent c3801523ae b8d3fd79ec
commit a9159228c8
103 changed files with 1673 additions and 5684 deletions
@@ -1197,6 +1197,45 @@ lib.mapAttrs mkLicense ({
    redistributable = false; # only free to redistribute "for non-commercial purposes"
  };

+  teamspeak = {
+    fullName = "Teamspeak client license";
+    url = "https://www.teamspeak.com/en/privacy-and-terms/";
+    free = false;
+    redistributable = true; # we got a permit to redistribute it:
+    # License issues:
+    # Date: Mon, 10 Dec 2007 19:55:16 -0500
+    # From: TeamSpeak Sales <sales@tritoncia.com>
+    # To: 'Marc Weber' <marco-oweber@gmx.de>
+    # Subject: RE: teamspeak on nix?
+    #
+    # Yes, that would be fine.  As long as you are not renting servers or selling
+    # TeamSpeak then you are more than welcome to distribute it.
+    #
+    # Thank you,
+    #
+    # TeamSpeak Sales Team
+    # ________________________________
+    # e-Mail: sales@tritoncia.com
+    # TeamSpeak: http://www.TeamSpeak.com
+    # Account Login: https://sales.TritonCIA.com/users
+    #
+    #
+    #
+    # -----Original Message-----
+    # From: Marc Weber [mailto:marco-oweber@gmx.de]
+    # Sent: Monday, December 10, 2007 5:03 PM
+    # To: sales@tritoncia.com
+    # Subject: teamspeak on nix?
+    #
+    # Hello,
+    #
+    # nix is very young software distribution system (http://nix.cs.uu.nl/)
+    # I'd like to ask wether you permit us to add teamspeak (server/ client?)
+    #
+    # Sincerly
+    # Marc Weber (small nix contributor)
+  };
+
  tsl = {
    shortName = "TSL";
    fullName = "Timescale License Agreegment";
@@ -18752,6 +18752,12 @@
    githubId = 4633847;
    name = "Ben Hamlin";
  };
+  proux01 = {
+    email = "pierre.roux@onera.fr";
+    github = "proux01";
+    githubId = 15833376;
+    name = "Pierre ROux";
+  };
  prrlvr = {
    email = "po@prrlvr.fr";
    github = "prrlvr";
@@ -123,10 +123,10 @@ let
  };

  modulesTree = pkgs.aggregateModules (
-    with config.boot.kernelPackages;
+    with config.boot;
    [
-      kernel
-      zfs
+      kernelPackages.kernel
+      kernelPackages.${pkgs.zfs.kernelModuleAttribute}
    ]
  );

@@ -254,11 +254,12 @@ let
  image =
    (pkgs.vmTools.override {
      rootModules = [
-        "zfs"
        "9p"
        "9pnet_virtio"
-        "virtio_pci"
        "virtio_blk"
+        "virtio_pci"
+        "virtiofs"
+        "zfs"
      ];
      kernel = modulesTree;
    }).runInLinuxVM
@@ -111,10 +111,10 @@ let
  };

  modulesTree = pkgs.aggregateModules (
-    with config.boot.kernelPackages;
+    with config.boot;
    [
-      kernel
-      zfs
+      kernelPackages.kernel
+      kernelPackages.${pkgs.zfs.kernelModuleAttribute}
    ]
  );

@@ -242,11 +242,12 @@ let
  image =
    (pkgs.vmTools.override {
      rootModules = [
-        "zfs"
        "9p"
        "9pnet_virtio"
-        "virtio_pci"
        "virtio_blk"
+        "virtio_pci"
+        "virtiofs"
+        "zfs"
      ];
      kernel = modulesTree;
    }).runInLinuxVM
@@ -1420,18 +1420,7 @@ final: prev:
      sha256 = "17c41flnjp25c5gry4lq8ik8mk3pbh1qwj86rby57jr4f4wvfykk";
    };
    meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/";
-  };
-
-  blink-cmp-spell = buildVimPlugin {
-    pname = "blink-cmp-spell";
-    version = "2025-02-01";
-    src = fetchFromGitHub {
-      owner = "ribru17";
-      repo = "blink-cmp-spell";
-      rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d";
-      sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6";
-    };
-    meta.homepage = "https://github.com/ribru17/blink-cmp-spell/";
+    meta.hydraPlatforms = [ ];
  };

  blink-cmp-git = buildVimPlugin {
@@ -1444,6 +1433,20 @@ final: prev:
      sha256 = "08hfwnjgsl88bkphpdxkdswdnc10mlxpsrk084kgzk4j19w55gyq";
    };
    meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/";
+    meta.hydraPlatforms = [ ];
+  };
+
+  blink-cmp-spell = buildVimPlugin {
+    pname = "blink-cmp-spell";
+    version = "2025-02-01";
+    src = fetchFromGitHub {
+      owner = "ribru17";
+      repo = "blink-cmp-spell";
+      rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d";
+      sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6";
+    };
+    meta.homepage = "https://github.com/ribru17/blink-cmp-spell/";
+    meta.hydraPlatforms = [ ];
  };

  blink-compat = buildVimPlugin {
@@ -1664,6 +1667,7 @@ final: prev:
      sha256 = "1s0zmpwg7z76l3ca1p426mkh33cw94m18q7rfsvnz4h4xwlsafpa";
    };
    meta.homepage = "https://github.com/kwkarlwang/bufresize.nvim/";
+    meta.hydraPlatforms = [ ];
  };

  bullets-vim = buildVimPlugin {
@@ -3315,6 +3319,7 @@ final: prev:
      sha256 = "06h388vkp8nv15wbh96pza85994xf979s7kjqrli4s6y5ygw6m02";
    };
    meta.homepage = "https://github.com/netmute/ctags-lsp.nvim/";
+    meta.hydraPlatforms = [ ];
  };

  ctrlp-cmatcher = buildVimPlugin {
@@ -8072,6 +8077,7 @@ final: prev:
      sha256 = "06d7s9949aylda4vq36h4s9hnnp3lycwm2nrjid5vxb98gy3d3xn";
    };
    meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
+    meta.hydraPlatforms = [ ];
  };

  mkdir-nvim = buildVimPlugin {
@@ -9819,6 +9825,19 @@ final: prev:
    meta.hydraPlatforms = [ ];
  };

+  nvim-dap-cortex-debug = buildVimPlugin {
+    pname = "nvim-dap-cortex-debug";
+    version = "2024-12-01";
+    src = fetchFromGitHub {
+      owner = "jedrzejboczar";
+      repo = "nvim-dap-cortex-debug";
+      rev = "e09ad083da385fdb74f81fe808f3d2a1593d910d";
+      sha256 = "02yv6byx207wgfgsck9g25mrbqhc607cyqfvc13j0dfjc6f7lfka";
+    };
+    meta.homepage = "https://github.com/jedrzejboczar/nvim-dap-cortex-debug/";
+    meta.hydraPlatforms = [ ];
+  };
+
  nvim-dap-go = buildVimPlugin {
    pname = "nvim-dap-go";
    version = "2025-01-14";
@@ -13662,6 +13681,7 @@ final: prev:
      sha256 = "18m46gj68xv6basaqzbschr60sc9xzi4dx21cvnx401bk97cqpgi";
    };
    meta.homepage = "https://github.com/xiyaowong/telescope-emoji.nvim/";
+    meta.hydraPlatforms = [ ];
  };

  telescope-file-browser-nvim = buildVimPlugin {
@@ -13766,6 +13786,7 @@ final: prev:
      sha256 = "0n1mdiwkkciqpxjad1nngrc7px5yziyan0daxgs9jsgdqmy1lzp8";
    };
    meta.homepage = "https://github.com/ghassan0/telescope-glyph.nvim/";
+    meta.hydraPlatforms = [ ];
  };

  telescope-live-grep-args-nvim = buildVimPlugin {
@@ -14052,6 +14073,7 @@ final: prev:
      sha256 = "0bp6m6b7bsw9d4iyn1b8bw3avnvjlk7pi8h941m68fw54n3mf06f";
    };
    meta.homepage = "https://github.com/rebelot/terminal.nvim/";
+    meta.hydraPlatforms = [ ];
  };

  terminus = buildVimPlugin {
@@ -2267,6 +2267,10 @@ in
    dependencies = [ self.plenary-nvim ];
  };

+  nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
  nvim-coverage = super.nvim-coverage.overrideAttrs {
    dependencies = with self; [
      neotest
@@ -752,6 +752,7 @@ https://github.com/klen/nvim-config-local/,,
 https://github.com/andythigpen/nvim-coverage/,HEAD,
 https://github.com/ya2s/nvim-cursorline/,,
 https://github.com/mfussenegger/nvim-dap/,,
+https://github.com/jedrzejboczar/nvim-dap-cortex-debug/,HEAD,
 https://github.com/leoluz/nvim-dap-go/,HEAD,
 https://github.com/julianolf/nvim-dap-lldb/,HEAD,
 https://github.com/mfussenegger/nvim-dap-python/,HEAD,
@@ -36,22 +36,22 @@ let

  sha256 =
    {
-      x86_64-linux = "0grp4295kdamdc7w7bf06dzp4fcx41ry2jif9yx983dd0wgcgbrn";
-      x86_64-darwin = "0yjjf5zqrgpj27kivn03i77by8f0535xxa6l5767d274jx35dj4s";
-      aarch64-linux = "1a8b53bd687sfdvfqzdgrf2ij4969zv9f15qy9wihkc4vzrjlgf9";
-      aarch64-darwin = "12zxvwqhavs6srvx5alhxcfwicayqs5caxmf2wcjb2qjxrlij6ik";
-      armv7l-linux = "08bpcylq6izac4dp5xalgrxzm06jpcm245qdrp95qf0c5gb6rlp2";
+      x86_64-linux = "0a4siy3is9bzbzmhhaf4l2djabv1yxjb20yp48i094wk0lpwbgcm";
+      x86_64-darwin = "1pdx07ibylfk8zx71cjfjmsd8650kpd8rvkknixg1nm1jar9zsb3";
+      aarch64-linux = "0x2qg7ixgkq637qvd218zk8ykfq97l55az17fqgp9dm9g73xn85f";
+      aarch64-darwin = "0jlfkkc99wv875n2h5v3lnyhjhh74w53yd07jp02fbg4hs8sds92";
+      armv7l-linux = "13a7s1il860g7v41wwdac3zdawc9w0bkrg9yif99s5ll0nakfs88";
    }
    .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
  # Please backport all compatible updates to the stable release.
  # This is important for the extension ecosystem.
-  version = "1.96.4";
+  version = "1.97.0";
  pname = "vscode" + lib.optionalString isInsiders "-insiders";

  # This is used for VS Code - Remote SSH test
-  rev = "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba";
+  rev = "33fc5a94a3f99ebe7087e8fe79fbe1d37a251016";

  executableName = "code" + lib.optionalString isInsiders "-insiders";
  longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
    src = fetchurl {
      name = "vscode-server-${rev}.tar.gz";
      url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "115dhhcbn0lnk09m4w6cqc0wa1f8wrriwxf5vfjqffxbm8pj6d3g";
+      sha256 = "1vqqrcyrb8kigdwap5rkpil8lrahngix16hyqpvsmf0gsyjh46h0";
    };
    stdenv = stdenvNoCC;
  };
@@ -117,13 +117,13 @@
    "vendorHash": null
  },
  "aws": {
-    "hash": "sha256-G4frE2m7kjxiGSjIKbWltkTZ9Lba0CTgsOE+13+2bbo=",
+    "hash": "sha256-Ep/P1h1mR/cl8rKCWGBjYWiaUZLouMH2i+FfIg+eVjU=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v5.84.0",
+    "rev": "v5.86.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-u4xQyCDOZEczAqxgkxaKeS0Gy+PbIyYWtTxdPRiXMCw="
+    "vendorHash": "sha256-jz4nDldbf/oXsQs3etDhQGROSvrylo/e0brXYRVqgZ4="
  },
  "azuread": {
    "hash": "sha256-UV6jgVS8tzWiEBC/C/U7/2bGZ1sqk2MnS8xNRBuL+C8=",
@@ -507,13 +507,13 @@
    "vendorHash": "sha256-RoMknYUy73fiLrexhpM94qZ7l1F68o5/vfg8RXRtvHw="
  },
  "google": {
-    "hash": "sha256-cRxUE6Ztys60AL4vHL4eBGlIfDtAxyFFhL7nh2LC7xo=",
+    "hash": "sha256-t+/Wx/OQtLARnSXFkEddbKeVUPJwRYQJXm/Kmwg/vNo=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google",
    "owner": "hashicorp",
    "repo": "terraform-provider-google",
-    "rev": "v6.17.0",
+    "rev": "v6.19.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-NTUwfD1f6qtv0KKwzuxzMMCXgV7MgolbBWbwo9UxOaA="
+    "vendorHash": "sha256-Ywn2xP1oAYlCz7PwsG0Wu5J+G0iuG6tqq7HWsc0M3q0="
  },
  "google-beta": {
    "hash": "sha256-O8pDsBTfr8Ep2pZmb2btKVuNrKx6PxLczmwTwwdJZ/c=",
@@ -1,32 +0,0 @@
-License issues:
-Date: Mon, 10 Dec 2007 19:55:16 -0500
-From: TeamSpeak Sales <sales@tritoncia.com>
-To: 'Marc Weber' <marco-oweber@gmx.de>
-Subject: RE: teamspeak on nix?
-
-Yes, that would be fine.  As long as you are not renting servers or selling
-TeamSpeak then you are more than welcome to distribute it.
-
-Thank you,
-
-TeamSpeak Sales Team
-________________________________
-e-Mail: sales@tritoncia.com
-TeamSpeak: http://www.TeamSpeak.com
-Account Login: https://sales.TritonCIA.com/users
-
-
-
-----Original Message-----
-From: Marc Weber [mailto:marco-oweber@gmx.de]
-Sent: Monday, December 10, 2007 5:03 PM
-To: sales@tritoncia.com
-Subject: teamspeak on nix?
-
-Hello,
-
-nix is very young software distribution system (http://nix.cs.uu.nl/)
-I'd like to ask wether you permit us to add teamspeak (server/ client?)
-
-Sincerly
-Marc Weber (small nix contributor)
@@ -13,6 +13,7 @@
 , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14
 , glib, adwaita-icon-theme, wrapGAppsHook3, makeDesktopItem, copyDesktopItems
 , csdp ? null
+, rocq-core  # for versions >= 9.0 that are transition shims on top of Rocq
 , version, coq-version ? null
 }@args:
 let
@@ -207,9 +208,6 @@ self = stdenv.mkDerivation {
    cp bin/votour $out/bin/
  '' + ''
    ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix}
-  '' + lib.optionalString (coqAtLeast "8.21") ''
-    ln -s $out/lib/rocq-runtime $OCAMLFIND_DESTDIR/rocq-runtime
-    ln -s $out/lib/rocq-core $OCAMLFIND_DESTDIR/rocq-core
  '' + lib.optionalString (coqAtLeast "8.14") ''
    ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server
  '' + lib.optionalString buildIde ''
@@ -233,17 +231,24 @@ self = stdenv.mkDerivation {
    mainProgram = "coqide";
  };
 }; in
-if coqAtLeast "8.21" then self.overrideAttrs(_: {
+if coqAtLeast "8.21" then self.overrideAttrs(o: {
  # coq-core is now a shim for rocq
+  propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocq-core ];
  buildPhase = ''
    runHook preBuild
-    make dunestrap
-    dune build -p rocq-runtime,rocq-core,coq-core,coqide-server${lib.optionalString buildIde ",rocqide"} -j $NIX_BUILD_CORES
+    dune build -p coq-core,coqide-server${lib.optionalString buildIde ",rocqide"} -j $NIX_BUILD_CORES
    runHook postBuild
  '';
  installPhase = ''
    runHook preInstall
-    dune install --prefix $out rocq-runtime rocq-core coq-core coqide-server${lib.optionalString buildIde " rocqide"}
+    dune install --prefix $out coq-core coqide-server${lib.optionalString buildIde " rocqide"}
+    # coq and rocq are now in different directories, which sometimes confuses coq_makefile
+    # which expects both in the same /nix/store/.../bin/ directory
+    # adding symlinks to content it
+    ROCQBIN=$(dirname ''$(command -v rocq))
+    for b in csdpcert ocamllibdep rocq rocq.byte rocqchk votour ; do
+      ln -s ''${ROCQBIN}/''${b} $out/bin/
+    done
    runHook postInstall
  '';
 }) else if coqAtLeast "8.17" then self.overrideAttrs(_: {
@@ -0,0 +1,152 @@
+# - The csdp program used for the Micromega tactic is statically referenced.
+#   However, rocq can build without csdp by setting it to null.
+#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
+# - The exact version can be specified through the `version` argument to
+#   the derivation; it defaults to the latest stable version.
+
+{ lib, stdenv, fetchzip, fetchurl, writeText, pkg-config
+, customOCamlPackages ? null
+, ocamlPackages_4_14
+, ncurses
+, csdp ? null
+, version, rocq-version ? null
+}@args:
+let
+  lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; };
+
+  release = {
+   "9.0+rc1".sha256 = "sha256-TLq925HFdizxyHjKRMeHBH9rLRpLNUiVIfA1JSMgYXA=";
+  };
+  releaseRev = v: "V${v}";
+  fetched = import ../../../../build-support/coq/meta-fetch/default.nix
+    { inherit lib stdenv fetchzip fetchurl; }
+    { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; }
+    args.version;
+  version = fetched.version;
+  rocq-version = args.rocq-version or (if version != "dev" then lib.versions.majorMinor version else "dev");
+  csdpPatch = lib.optionalString (csdp != null) ''
+    substituteInPlace plugins/micromega/sos.ml --replace-warn "; csdp" "; ${csdp}/bin/csdp"
+    substituteInPlace plugins/micromega/coq_micromega.ml --replace-warn "System.is_in_system_path \"csdp\"" "true"
+  '';
+  ocamlPackages = if customOCamlPackages != null then customOCamlPackages
+    else ocamlPackages_4_14;
+  ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.dune_3 ];
+  ocamlPropagatedBuildInputs = [ ocamlPackages.zarith ];
+self = stdenv.mkDerivation {
+  pname = "rocq";
+  inherit (fetched) version src;
+
+  passthru = {
+    inherit rocq-version;
+    inherit ocamlPackages ocamlNativeBuildInputs;
+    inherit ocamlPropagatedBuildInputs;
+    emacsBufferSetup = pkgs: ''
+      ; Propagate rocq paths to children
+      (inherit-local-permanent coq-prog-name "${self}/bin/rocq repl")
+      (inherit-local-permanent coq-dependency-analyzer "${self}/bin/rocq dep")
+      (inherit-local-permanent coq-compiler "${self}/bin/rocq c")
+      ; If the coq-library path was already set, re-set it based on our current rocq
+      (when (fboundp 'get-coq-library-directory)
+        (inherit-local-permanent coq-library-directory (get-coq-library-directory))
+        (coq-prog-args))
+      (mapc (lambda (arg)
+        (when (file-directory-p (concat arg "/lib/coq/${rocq-version}/user-contrib"))
+          (setenv "ROCQPATH" (concat (getenv "ROCQPATH") ":" arg "/lib/coq/${rocq-version}/user-contrib")))) '(${lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
+      ; TODO Abstract this pattern from here and nixBufferBuilders.withPackages!
+      (defvar nixpkgs--rocq-buffer-count 0)
+      (when (eq nixpkgs--rocq-buffer-count 0)
+        (make-variable-buffer-local 'nixpkgs--is-nixpkgs-rocq-buffer)
+        (defun nixpkgs--rocq-inherit (buf)
+          (inherit-local-inherit-child buf)
+          (with-current-buffer buf
+            (setq nixpkgs--rocq-buffer-count (1+ nixpkgs--rocq-buffer-count))
+            (add-hook 'kill-buffer-hook 'nixpkgs--decrement-rocq-buffer-count nil t))
+          buf)
+        ; When generating a scomint buffer, do inherit-local inheritance and make it a nixpkgs-rocq buffer
+        (defun nixpkgs--around-scomint-make (orig &rest r)
+          (if nixpkgs--is-nixpkgs-rocq-buffer
+              (progn
+                (advice-add 'get-buffer-create :filter-return #'nixpkgs--rocq-inherit)
+                (apply orig r)
+                (advice-remove 'get-buffer-create #'nixpkgs--rocq-inherit))
+            (apply orig r)))
+        (advice-add 'scomint-make :around #'nixpkgs--around-scomint-make)
+        ; When we have no more rocq buffers, tear down the buffer handling
+        (defun nixpkgs--decrement-rocq-buffer-count ()
+          (setq nixpkgs--rocq-buffer-count (1- nixpkgs--rocq-buffer-count))
+          (when (eq nixpkgs--rocq-buffer-count 0)
+            (advice-remove 'scomint-make #'nixpkgs--around-scomint-make)
+            (fmakunbound 'nixpkgs--around-scomint-make)
+            (fmakunbound 'nixpkgs--rocq-inherit)
+            (fmakunbound 'nixpkgs--decrement-rocq-buffer-count))))
+      (setq nixpkgs--rocq-buffer-count (1+ nixpkgs--rocq-buffer-count))
+      (add-hook 'kill-buffer-hook 'nixpkgs--decrement-rocq-buffer-count nil t)
+      (setq nixpkgs--is-nixpkgs-rocq-buffer t)
+      (inherit-local 'nixpkgs--is-nixpkgs-rocq-buffer)
+    '';
+  };
+
+  nativeBuildInputs = [ pkg-config ]
+    ++ ocamlNativeBuildInputs;
+  buildInputs = [ ncurses ];
+
+  propagatedBuildInputs = ocamlPropagatedBuildInputs;
+
+  postPatch = ''
+    UNAME=$(type -tp uname)
+    RM=$(type -tp rm)
+    substituteInPlace tools/beautify-archive --replace-warn "/bin/rm" "$RM"
+    ${csdpPatch}
+  '';
+
+  setupHook = writeText "setupHook.sh" ''
+    addRocqPath () {
+      if test -d "''$1/lib/coq/${rocq-version}/user-contrib"; then
+        export ROCQPATH="''${ROCQPATH-}''${ROCQPATH:+:}''$1/lib/coq/${rocq-version}/user-contrib/"
+      fi
+    }
+
+    addEnvHooks "$targetOffset" addRocqPath
+  '';
+
+  preConfigure = ''
+    patchShebangs dev/tools/
+  '';
+
+  prefixKey = "-prefix ";
+
+  enableParallelBuilding = true;
+
+  createFindlibDestdir = true;
+
+  buildPhase = ''
+    runHook preBuild
+    make dunestrap
+    dune build -p rocq-runtime,rocq-core -j $NIX_BUILD_CORES
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix $out rocq-runtime rocq-core
+    ln -s $out/lib/rocq-runtime $OCAMLFIND_DESTDIR/rocq-runtime
+    ln -s $out/lib/rocq-core $OCAMLFIND_DESTDIR/rocq-core
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "The Rocq Prover";
+    longDescription = ''
+      The Rocq Prover is an interactive theorem prover, or proof assistant. It provides
+      a formal language to write mathematical definitions, executable
+      algorithms and theorems together with an environment for
+      semi-interactive development of machine-checked proofs.
+    '';
+    homepage = "https://rocq-prover.org";
+    license = licenses.lgpl21;
+    branch = rocq-version;
+    maintainers = with maintainers; [ proux01 roconnor vbgl Zimmi48 ];
+    platforms = platforms.unix;
+    mainProgram = "rocq";
+  };
+}; in self
@@ -0,0 +1,239 @@
+{
+  lib,
+  stdenv,
+  rocqPackages,
+  rocq-core,
+  which,
+  fetchzip,
+  fetchurl,
+}@args:
+
+let
+  lib = import ../coq/extra-lib.nix {
+    inherit (args) lib;
+  };
+
+  inherit (lib)
+    concatStringsSep
+    flip
+    foldl
+    isFunction
+    isString
+    optional
+    optionalAttrs
+    optionals
+    optionalString
+    pred
+    remove
+    switch
+    versions
+    ;
+
+  inherit (lib.attrsets) removeAttrs;
+  inherit (lib.strings) match;
+
+  isGitHubDomain = d: match "^github.*" d != null;
+  isGitLabDomain = d: match "^gitlab.*" d != null;
+in
+
+{
+  pname,
+  version ? null,
+  fetcher ? null,
+  owner ? "coq-community",
+  domain ? "github.com",
+  repo ? pname,
+  defaultVersion ? null,
+  releaseRev ? (v: v),
+  displayVersion ? { },
+  release ? { },
+  buildInputs ? [ ],
+  nativeBuildInputs ? [ ],
+  extraBuildInputs ? [ ],
+  extraNativeBuildInputs ? [ ],
+  overrideBuildInputs ? [ ],
+  overrideNativeBuildInputs ? [ ],
+  namePrefix ? [ "rocq-core" ],
+  enableParallelBuilding ? true,
+  extraInstallFlags ? [ ],
+  setROCQBIN ? true,
+  mlPlugin ? false,
+  useMelquiondRemake ? null,
+  dropAttrs ? [ ],
+  keepAttrs ? [ ],
+  dropDerivationAttrs ? [ ],
+  useDuneifVersion ? (x: false),
+  useDune ? false,
+  opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])),
+  ...
+}@args:
+let
+  args-to-remove = foldl (flip remove) (
+    [
+      "version"
+      "fetcher"
+      "repo"
+      "owner"
+      "domain"
+      "releaseRev"
+      "displayVersion"
+      "defaultVersion"
+      "useMelquiondRemake"
+      "release"
+      "buildInputs"
+      "nativeBuildInputs"
+      "extraBuildInputs"
+      "extraNativeBuildInputs"
+      "overrideBuildInputs"
+      "overrideNativeBuildInputs"
+      "namePrefix"
+      "meta"
+      "useDuneifVersion"
+      "useDune"
+      "opam-name"
+      "extraInstallFlags"
+      "setROCQBIN"
+      "mlPlugin"
+      "dropAttrs"
+      "dropDerivationAttrs"
+      "keepAttrs"
+    ]
+    ++ dropAttrs
+  ) keepAttrs;
+  fetch =
+    import ../coq/meta-fetch/default.nix
+      {
+        inherit
+          lib
+          stdenv
+          fetchzip
+          fetchurl
+          ;
+      }
+      (
+        {
+          inherit release releaseRev;
+          location = { inherit domain owner repo; };
+        }
+        // optionalAttrs (args ? fetcher) { inherit fetcher; }
+      );
+  fetched = fetch (if version != null then version else defaultVersion);
+  display-pkg =
+    n: sep: v:
+    let
+      d = displayVersion.${n} or (if sep == "" then ".." else true);
+    in
+    n
+    + optionalString (v != "" && v != null) (
+      switch d [
+        {
+          case = true;
+          out = sep + v;
+        }
+        {
+          case = ".";
+          out = sep + versions.major v;
+        }
+        {
+          case = "..";
+          out = sep + versions.majorMinor v;
+        }
+        {
+          case = "...";
+          out = sep + versions.majorMinorPatch v;
+        }
+        {
+          case = isFunction;
+          out = optionalString (d v != "") (sep + d v);
+        }
+        {
+          case = isString;
+          out = optionalString (d != "") (sep + d);
+        }
+      ] ""
+    )
+    + optionalString (v == null) "-broken";
+  append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-";
+  prefix-name = foldl append-version "" namePrefix;
+  useDune = args.useDune or (useDuneifVersion fetched.version);
+  rocqlib-flags =
+      [
+        "COQLIBINSTALL=$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib"
+        "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)"
+      ];
+  docdir-flags =
+      [ "COQDOCINSTALL=$(out)/share/coq/${rocq-core.rocq-version}/user-contrib" ];
+in
+
+stdenv.mkDerivation (
+  removeAttrs (
+    {
+
+      name = prefix-name + (display-pkg pname "-" fetched.version);
+
+      inherit (fetched) version src;
+
+      nativeBuildInputs =
+        args.overrideNativeBuildInputs or (
+          [ which ]
+          ++ optional useDune rocq-core.ocamlPackages.dune_3
+          ++ optionals (useDune || mlPlugin) [
+            rocq-core.ocamlPackages.ocaml
+            rocq-core.ocamlPackages.findlib
+          ]
+          ++ (args.nativeBuildInputs or [ ])
+          ++ extraNativeBuildInputs
+        );
+      buildInputs =
+        args.overrideBuildInputs or ([ rocq-core ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs);
+      inherit enableParallelBuilding;
+
+      meta =
+        (
+          {
+            platforms = rocq-core.meta.platforms;
+          }
+          // (switch domain [
+            {
+              case = pred.union isGitHubDomain isGitLabDomain;
+              out = {
+                homepage = "https://${domain}/${owner}/${repo}";
+              };
+            }
+          ] { })
+          // optionalAttrs (fetched.broken or false) {
+            rocqFilter = true;
+            broken = true;
+          }
+        )
+        // (args.meta or { });
+
+    }
+    // (optionalAttrs setROCQBIN { ROCQBIN = "${rocq-core}/bin/"; })
+    // (optionalAttrs (!args ? installPhase && !args ? useMelquiondRemake) {
+      installFlags = rocqlib-flags ++ docdir-flags ++ extraInstallFlags;
+    })
+    // (optionalAttrs useDune {
+      buildPhase = ''
+        runHook preBuild
+        dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+        runHook postBuild
+      '';
+      installPhase = ''
+        runHook preInstall
+        dune install --prefix=$out --libdir $OCAMLFIND_DESTDIR ${opam-name}
+        mkdir $out/lib/coq/
+        mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${rocq-core.rocq-version}
+        runHook postInstall
+      '';
+    })
+    // (optionalAttrs (args ? useMelquiondRemake) rec {
+      COQUSERCONTRIB = "$out/lib/coq/${rocq-core.rocq-version}/user-contrib";
+      preConfigurePhases = [ "autoconf" ];
+      configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ];
+      buildPhase = "./remake -j$NIX_BUILD_CORES";
+      installPhase = "./remake install";
+    })
+    // (removeAttrs args args-to-remove)
+  ) dropDerivationAttrs
+)
@@ -237,10 +237,9 @@ rec {
  vmRunCommand = qemuCommand: writeText "vm-run" ''
    ${coreutils}/bin/mkdir xchg
    export > xchg/saved-env
-    PATH=${coreutils}/bin

    if [ -f "''${NIX_ATTRS_SH_FILE-}" ]; then
-      cp $NIX_ATTRS_JSON_FILE $NIX_ATTRS_SH_FILE xchg
+      ${coreutils}/bin/cp $NIX_ATTRS_JSON_FILE $NIX_ATTRS_SH_FILE xchg
      source "$NIX_ATTRS_SH_FILE"
    fi
    source $stdenv/setup
@@ -258,7 +257,7 @@ rec {
    # Write the command to start the VM to a file so that the user can
    # debug inside the VM if the build fails (when Nix is called with
    # the -K option to preserve the temporary build directory).
-    cat > ./run-vm <<EOF
+    ${coreutils}/bin/cat > ./run-vm <<EOF
    #! ${bash}/bin/sh
    ''${diskImage:+diskImage=$diskImage}
    # GitHub Actions runners seems to not allow installing seccomp filter: https://github.com/rcambrj/nix-pi-loader/issues/1#issuecomment-2605497516
@@ -268,7 +267,7 @@ rec {
    ${qemuCommand}
    EOF

-    chmod +x ./run-vm
+    ${coreutils}/bin/chmod +x ./run-vm
    source ./run-vm

    if ! test -e xchg/in-vm-exit; then
@@ -276,7 +275,7 @@ rec {
      exit 1
    fi

-    exitCode="$(cat xchg/in-vm-exit)"
+    exitCode="$(${coreutils}/bin/cat xchg/in-vm-exit)"
    if [ "$exitCode" != "0" ]; then
      exit "$exitCode"
    fi
@@ -9,17 +9,18 @@
  ncurses,
  argtable,
  versionCheckHook,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "astroterm";
-  version = "1.0.6";
+  version = "1.0.7";

  src = fetchFromGitHub {
    owner = "da-luce";
    repo = "astroterm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-BjqurPp0WI/wI5n2TibnyOqZ3NjRcLYB2MxqqNvTQtw=";
+    hash = "sha256-SQR5Q369LUtQum5a4f0/sy7GdPB8sBfn6mkAjxyTbg8=";
  };

  bsc5File = fetchurl {
@@ -49,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: {

  doCheck = true;

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Celestial viewer for the terminal, written in C";
    homepage = "https://github.com/da-luce/astroterm/";
@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "auth0-cli";
-  version = "1.8.0";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "auth0";
    repo = "auth0-cli";
    tag = "v${version}";
-    hash = "sha256-D982lmu44JFrxGcn0G1BssGkE3juUoB6qbCHWCTg9kw=";
+    hash = "sha256-hX4KzDIR0CLcEoY5XOcSmSVn/ORW8JsGZrUQYTh5L/k=";
  };

-  vendorHash = "sha256-OEHJTMcoaB4BZ06GjXIFPbCyoMGeumjTzWWFmgqLML8=";
+  vendorHash = "sha256-GVaazikFySK+qDGRSA2n7q5amqgUVvPY5VRFh5JXEiI=";

  ldflags = [
    "-s"
@@ -6,21 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "bao";
-  version = "0.12.1";
+  version = "0.13.0";

  src = fetchCrate {
    inherit version;
    pname = "${pname}_bin";
-    hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg=";
+    hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI=";
  };

-  cargoPatches = [
-    # https://github.com/oconnor663/bao/pull/55
-    ./test-exe.patch
-  ];
-
  useFetchCargoVendor = true;
-  cargoHash = "sha256-gJj+4NAtvSpAlX3q2GEQh1CgqKhw5vd6huPrV8NRsiE=";
+  cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8=";

  meta = {
    description = "Implementation of BLAKE3 verified streaming";
@@ -1,40 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2f66e42..34240e8 100644
--- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -26,6 +26,9 @@ path = "src/main.rs"
- [dependencies.arrayref]
- version = "0.3.5"
- 
-+[dependencies.assert_cmd]
-+version = "2.0.16"
-+
- [dependencies.bao]
- version = "0.12"
- 
-diff --git a/tests/test.rs b/tests/test.rs
-index f9427bd..48aabca 100644
--- a/tests/test.rs
-+++ b/tests/test.rs
-@@ -1,8 +1,7 @@
- use duct::cmd;
- use rand::prelude::*;
-use std::env::consts::EXE_EXTENSION;
- use std::fs;
-use std::path::{Path, PathBuf};
-+use std::path::PathBuf;
- use std::sync::Once;
- use tempfile::tempdir;
- 
-@@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf {
-             .expect("build failed");
-     });
- 
-    Path::new("target")
-        .join("debug")
-        .join("bao")
-        .with_extension(EXE_EXTENSION)
-+    assert_cmd::cargo::cargo_bin("bao")
- }
- 
- #[test]
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bsc";
-  version = "3.3.4";
+  version = "3.3.5";

  src = fetchFromGitHub {
    owner = "IlyaGrebnov";
    repo = "libbsc";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q=";
+    hash = "sha256-k+uGPcr5LNxKAtIICLJU1uIWDP/tvT05v/Oc0NHUQ+E=";
  };

  enableParallelBuilding = true;
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "composefs";
-  version = "1.0.7";
+  version = "1.0.8";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "composefs";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-kbXmDdyRrtsERkUomjZUWP3QC2q27AWUTc/J2jCSXg4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nuQ3R/0eDS58HmN+0iXcYT5EtkY3J257EdtLir5vm4c=";
  };

  strictDeps = true;
@@ -5,7 +5,7 @@
  nixosTests,
 }:

-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
  pname = "davis";
  version = "5.0.2";

@@ -16,9 +16,10 @@ php.buildComposerProject (finalAttrs: {
    hash = "sha256-Zl+6nrgspyg6P9gqYwah81Z6Mtni6nUlCp4gTjJWn9M=";
  };

-  vendorHash = "sha256-ZV5GNNtex+yKaMP5KaQkx5EaJRAJSwJjIZOCcXlnVW4=";
+  vendorHash = "sha256-pCWM1kgk30Au9i8TflrmZXw/PJmo3tdW565BXwncsZU=";

  postInstall = ''
+    chmod -R u+w $out/share
    # Only include the files needed for runtime in the derivation
    mv $out/share/php/${finalAttrs.pname}/{migrations,public,src,config,bin,templates,tests,translations,vendor,symfony.lock,composer.json,composer.lock} $out
    # Save the upstream .env file for reference, but rename it so it is not loaded
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  gitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "duckx";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "amiremohamadi";
+    repo = "DuckX";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qRqYcBi/a2tUSlLAa7DKPqwQsctw5/0hjV/Og1pHPQU=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  cmakeFlags = [
+    # https://github.com/amiremohamadi/DuckX/issues/92
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
+  ];
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "C++ library for creating and modifying Microsoft Word (.docx) files";
+    homepage = "https://github.com/amiremohamadi/DuckX";
+    changelog = "https://github.com/amiremohamadi/DuckX/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ titaniumtown ];
+  };
+})
@@ -7,11 +7,11 @@

 stdenv.mkDerivation rec {
  pname = "fastjet-contrib";
-  version = "1.055";
+  version = "1.100";

  src = fetchurl {
    url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
-    sha256 = "sha256-2apGVg/f2FCC8gKlqc5kdo/gxZhmDwEyBqjJwX7NDzY=";
+    sha256 = "sha256-Uq2UXZGVxA80eVjcBAQeQccTDoRevfDBPxu91bbSQps=";
  };

  buildInputs = [ fastjet ];
@@ -8,16 +8,16 @@
 }:
 buildNpmPackage rec {
  pname = "firebase-tools";
-  version = "13.29.3";
+  version = "13.30.0";

  src = fetchFromGitHub {
    owner = "firebase";
    repo = "firebase-tools";
    tag = "v${version}";
-    hash = "sha256-ZY4hbo84qdvBGOpGWKKWR3bHHTP2+Poa1od7FCy9uSE=";
+    hash = "sha256-QeFkZJAdXs9+buE1qQqKZkEh9LYTlR1IQiueLx3rUbs=";
  };

-  npmDepsHash = "sha256-UqrTyK5IOK4N6z1UfApqzGCHj0H1/FujWdgJPrQoNxQ=";
+  npmDepsHash = "sha256-IIYHtePMsgh3WfuspYaQEGMYnn9KrAg0pE39mlhldO8=";

  postPatch = ''
    ln -s npm-shrinkwrap.json package-lock.json
@@ -8,7 +8,7 @@

 let
  pname = "gallery-dl";
-  version = "1.28.4";
+  version = "1.28.5";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-bfE3QUu+ytxd4YkWxsnQ3hTEDE1OgJN8zJxSah2u08I=";
+    hash = "sha256-wFQtpHkMPscrGhk5tNGc38rPHbFuoDMuvO50KYR+j9M=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -19,14 +19,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gancio";
-  version = "1.22.0";
+  version = "1.23.1";

  src = fetchFromGitLab {
    domain = "framagit.org";
    owner = "les";
    repo = "gancio";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-aKZnMtxKEjnvNLoFPnXxxvhj4jmK109+7qF2vZdERpw=";
+    hash = "sha256-mX+6MhuvfrQFiqheM2iWrXZAzQcAzGfjSSVGX60pfXs=";
  };

  offlineCache = fetchYarnDeps {
@@ -9,7 +9,7 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "git-pw";
-  version = "2.7.0";
+  version = "2.7.1";
  format = "pyproject";

  PBR_VERSION = version;
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "getpatchwork";
    repo = "git-pw";
    tag = version;
-    hash = "sha256-y5qbvhuT+tjXvIFgCrM7RIPF6zhCkMu+/qByValrEXE=";
+    hash = "sha256-Ce+Nc2NZ42dIpeLg8OutD8ONxj1XRiNodGbTWlkK9qw=";
  };

  nativeBuildInputs = with python3.pkgs; [
@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "go-judge";
-  version = "1.8.5";
+  version = "1.8.7";

  src = fetchFromGitHub {
    owner = "criyle";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-yvuljBNPkAsTJ7jT1BrInTfUlBuE8zSV60MBWuIlW5I=";
+    hash = "sha256-Qjo9cJwgfULjVsD05H6tlIJHLaNJGjpcLJqQuxoLS8I=";
  };

-  vendorHash = "sha256-LvKLhC9I/hJSIP3zRkJAYNvTFLiNTTu87Fe4DDTWnMo=";
+  vendorHash = "sha256-vkjpD3IbERW/l9ieVncC/9ulrNGyextXx7/f9CTKmqg=";

  tags = [ "nomsgpack" ];

@@ -28,11 +28,11 @@

 stdenv.mkDerivation rec {
  pname = "gparted";
-  version = "1.6.0";
+  version = "1.7.0";

  src = fetchurl {
    url = "mirror://sourceforge/gparted/gparted-${version}.tar.gz";
-    sha256 = "sha256-m59Rs85JTdy1mlXhrmZ5wJQ2YE4zHb9aU21g3tbG6ls=";
+    sha256 = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI=";
  };

  # Tries to run `pkexec --version` to get version.
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
      $out/share/polkit-1/actions/org.gnome.gparted.policy
  '';

-  meta = with lib; {
+  meta = {
    description = "Graphical disk partitioning tool";
    longDescription = ''
      GNOME Partition Editor for creating, reorganizing, and deleting disk
@@ -104,8 +104,8 @@ stdenv.mkDerivation rec {
      while preserving the partition contents.
    '';
    homepage = "https://gparted.org";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
    mainProgram = "gparted";
  };
 }
@@ -1,12 +1,11 @@
-diff -ru old/gparted-1.0.0/configure gparted-1.0.0/configure
--- old/gparted-1.0.0/configure	2019-05-29 12:02:13.000000000 -0400
-+++ gparted-1.0.0/configure	2019-08-08 18:09:52.792795781 -0400
-@@ -16145,7 +16145,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5
- $as_echo_n "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; }
+--- old/gparted-1.0.0/configure	2025-01-30 18:31:10.000000000 +0100
+++ gparted-1.0.0/configure	2025-02-06 14:07:24.264733753 +0100
+@@ -17041,7 +17041,7 @@
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5
+ printf %s "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; }
 PKEXEC_REQUIRED_INT=`echo "$PKEXEC_REQUIRED_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'`
 -PKEXEC_VERSION_OUTPUT=`pkexec --version 2> /dev/null` ||
 +PKEXEC_VERSION_OUTPUT='pkexec version @polkit_version@' ||
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
- $as_echo "not found" >&6; }
+ 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+ printf "%s\n" "not found" >&6; }
 if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then
@@ -4,10 +4,15 @@
  stdenv,
  fetchFromGitHub,
  fetchurl,
-  fetchpatch,
  cmake,
-  qt6,
+  boost,
  fmt,
+  duckx,
+  expected-lite,
+  optional-lite,
+  string-view-lite,
+  variant-lite,
+  qt6,
  shaderc,
  vulkan-headers,
  wayland,
@@ -18,14 +23,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gpt4all";
-  version = "3.4.2";
+  version = "3.9.0";

  src = fetchFromGitHub {
    fetchSubmodules = true;
-    hash = "sha256-QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM=";
+    hash = "sha256-DbMoDdP7tEku3zZiCOmPz3iHQF5acg97gd+tLKoFu/o=";
    owner = "nomic-ai";
    repo = "gpt4all";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
  };

  embed_model = fetchurl {
@@ -35,14 +40,13 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    ./embedding-local.patch
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051";
-      sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU=";
-      # remove the `gpt4all-chat` part of the paths as sourceRoot is gpt4all-chat
-      stripLen = 1;
-    })
  ];

+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "duckx::duckx QXlsx" "duckx QXlsx"
+  '';
+
  sourceRoot = "${finalAttrs.src.name}/gpt4all-chat";

  nativeBuildInputs =
@@ -57,7 +61,13 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs =
    [
+      expected-lite
+      optional-lite
+      string-view-lite
+      variant-lite
+      boost
      fmt
+      duckx
      qt6.qtwayland
      qt6.qtquicktimeline
      qt6.qtsvg
@@ -80,14 +90,16 @@ stdenv.mkDerivation (finalAttrs: {

  cmakeFlags =
    [
-      "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF"
-      "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON"
-      "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF"
-      "-DGGML_VULKAN=ON"
-      "-DGGML_KOMPUTE=ON"
+      (lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER" false)
+      (lib.cmakeBool "KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK" true)
+      (lib.cmakeBool "KOMPUTE_OPT_USE_BUILT_IN_FMT" false)
+
+      # https://github.com/NixOS/nixpkgs/issues/298997
+      # https://github.com/nomic-ai/gpt4all/issues/3468
+      (lib.cmakeBool "LLMODEL_KOMPUTE" false)
    ]
    ++ lib.optionals (!cudaSupport) [
-      "-DLLMODEL_CUDA=OFF"
+      (lib.cmakeBool "LLMODEL_CUDA" false)
    ];

  postInstall = ''
@@ -24,18 +24,18 @@ let
    hash = "sha256-ME8ornP2uevvH8DzuI25Z8OV0EP98CBgbunvb2Hbr9M=";
  };
 in
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
  pname = "invoiceplane";
  inherit version;

  src = fetchFromGitHub {
    owner = "InvoicePlane";
    repo = "InvoicePlane";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-E2TZ/FhlVKZpGuczXb/QLn27gGiO7YYlAkPSolTEoeQ=";
  };

-  vendorHash = "sha256-k7YBs6x/ABNTHPx9/EZXa4W9kcLQqpruV7YFGAADZq0=";
+  vendorHash = "sha256-eq3YKIZZzZihDYgFH3YTETHvNG6hAE/oJ5Ul2XRMn4U=";

  buildInputs = [ libsass ];

@@ -75,6 +75,7 @@ php.buildComposerProject (finalAttrs: {

  # Cleanup and language files
  postInstall = ''
+    chmod -R u+w $out/share
    mv $out/share/php/invoiceplane/* $out/
    cp -r ${languages}/application/language $out/application/
    rm -r $out/{composer.json,composer.lock,CONTRIBUTING.md,docker-compose.yml,Gruntfile.js,package.json,node_modules,yarn.lock,share}
@@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "livepeer";
-  version = "0.8.1";
+  version = "0.8.3";

  proxyVendor = true;
-  vendorHash = "sha256-vNZ2HHMv2cdMcd1xMdwFNIo3lYh3N88o60GfiG4+eAs=";
+  vendorHash = "sha256-bHlBHoofFBd34tp3Qsefr4Bpo7Zp1xn5F4z8kFtKeWQ=";

  src = fetchFromGitHub {
    owner = "livepeer";
    repo = "go-livepeer";
    tag = "v${version}";
-    hash = "sha256-vJeYlMOJ0/C+IKVx5gqzb8LGwLP1ca9OreCUMryqWKs=";
+    hash = "sha256-93sy+NX934Dh2vJwYpzlmz69yzbThpAw+eSQsZ1bMd0=";
  };

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

 stdenvNoCC.mkDerivation rec {
  pname = "lxgw-wenkai-tc";
-  version = "1.501";
+  version = "1.510";
  src = fetchurl {
    url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz";
-    hash = "sha256-GnllwWRO2Pa7hlehZKrGJr2f4kRJN1JPxtz4UGMbqyg=";
+    hash = "sha256-gcPEGs1oawxRGcKZawxJsJ0q179Zd9iAFIplnF4oWY4=";
  };

  installPhase = ''
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule rec {
+  pname = "memogram";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "usememos";
+    repo = "telegram-integration";
+    tag = "v${version}";
+    hash = "sha256-CUo5fPWNE4FP1Dtwb1rPNSPP/CAJvYGYYIMAx/oeSOc=";
+  };
+
+  vendorHash = "sha256-BDGA7GpXS3/esBvb3+rC8ZgtER2OgBJ1bHZ6AHP/i4s=";
+
+  subPackages = [ "bin/memogram" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Easy to use integration service for syncing messages and images from a Telegram bot into your Memos";
+    homepage = "https://github.com/usememos/telegram-integration";
+    changelog = "https://github.com/usememos/telegram-integration/releases/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ merrkry ];
+    mainProgram = "memogram";
+    platforms = lib.platforms.linux;
+  };
+}
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
  meta = {
    description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats";
    homepage = "https://mergiraf.org/";
-    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/v${version}";
+    changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${version}";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      zimbatm
@@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "microsocks";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitHub {
    owner = "rofl0r";
    repo = "microsocks";
    rev = "v${version}";
-    hash = "sha256-cB2XMWjoZ1zLAmAfl/nqjdOyBDKZ+xtlEmqsZxjnFn0=";
+    hash = "sha256-5NR2gtm+uMkjmkV/dv3DzSedfNvYpHZgFHVSrybl0Tk=";
  };

  installPhase = ''
@@ -6,13 +6,13 @@

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

  src = fetchFromGitHub {
    owner = "enfein";
    repo = "mieru";
    rev = "v${version}";
-    hash = "sha256-FFV1zF/sKgIVSSTcDcuB3QWfcFKbI3RJFG9RveSVe+w=";
+    hash = "sha256-Qb+uZiKnrGNoSqH0QR+QUBtmFM3AE/2WziTtkPxu55o=";
  };

  vendorHash = "sha256-AOtq6bGijQqpNMNZA3XeMjzKAo7tWTpdrKB6KxQsdMM=";
@@ -23,17 +23,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "mise";
-  version = "2025.2.0";
+  version = "2025.2.1";

  src = fetchFromGitHub {
    owner = "jdx";
    repo = "mise";
    rev = "v${version}";
-    hash = "sha256-mZZBazE8QCaz3osbLoeaIHa7tsGji6B4UkaMlKAvF0M=";
+    hash = "sha256-SqFug6Z1VAbERwiho73YDSzVPtzl7fBsE8++NfGkeW4=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-ObvBSaBtf9PiC2zjcToNn59ihzR6qIxSRgi0FKNCIpY=";
+  cargoHash = "sha256-kz6WJyK+eb1I+ZjgL94je0HYNHWfcUvnxD7UThlP7wU=";

  nativeBuildInputs = [
    installShellFiles
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  name = "nm-file-secret-agent";
-  version = "1.0.0";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "lilioid";
    repo = "nm-file-secret-agent";
    rev = "v${version}";
-    hash = "sha256-5L4bhf6nsINZD+oINC1f71P2cebPG7bzDYtlsU8UMMk=";
+    hash = "sha256-xQWgNxrbpHOfnKXa57cV1F3JmtJcvQsqUfgwfWg5Ni4=";
  };
  useFetchCargoVendor = true;
-  cargoHash = "sha256-o8uqdDx3N/12Uvap0gl02lrNyzyBZxDOEmuueoRLVag=";
+  cargoHash = "sha256-Q2RQ6pWYKOr/6nD7PLpTonVldOfyUu2lvwNRAc8zkLg=";
  buildInputs = [ dbus ];
  nativeBuildInputs = [ pkg-config ];

@@ -1,7 +1,8 @@
 {
  lib,
-  fetchFromGitHub,
  rustPlatform,
+  fetchFromGitHub,
+  autoAddDriverRunpath,
  versionCheckHook,
 }:

@@ -19,6 +20,10 @@ rustPlatform.buildRustPackage rec {
  useFetchCargoVendor = true;
  cargoHash = "sha256-DuuHqBhL25ghgcYxcOtWRArUqL9+c3d5mBrAcWTAFW8=";

+  nativeBuildInputs = [
+    autoAddDriverRunpath
+  ];
+
  doInstallCheck = true;

  nativeInstallCheckInputs = [
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  gitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "optional-lite";
+  version = "3.6.0";
+
+  src = fetchFromGitHub {
+    owner = "martinmoene";
+    repo = "optional-lite";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qmKuxYc0cpoOtRRb4okJZ8pYPvzQid1iqBctnhGlz6M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  doCheck = true;
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library";
+    homepage = "https://github.com/martinmoene/optional-lite";
+    changelog = "https://github.com/martinmoene/optional-lite/blob/v${finalAttrs.version}/CHANGES.txt";
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [ titaniumtown ];
+  };
+})
@@ -1,23 +1,26 @@
 {
  lib,
  stdenv,
-  fetchurl,
+  fetchFromGitHub,
  autoreconfHook,
  pkg-config,
  libglvnd,
-  SDL,
-  SDL_image,
-  SDL_mixer,
+  libtool,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
  xorg,
 }:

 stdenv.mkDerivation rec {
  pname = "pinball";
-  version = "0.3.20201218";
+  version = "0.3.20201218-unstable-2024-11-14";

-  src = fetchurl {
-    url = "mirror://sourceforge/pinball/pinball-${version}.tar.gz";
-    sha256 = "0vacypp3ksq1hs6hxpypx7nrfkprbl4ksfywcncckwrh4qcir631";
+  src = fetchFromGitHub {
+    owner = "adoptware";
+    repo = "pinball";
+    rev = "7f6887d8912340c0eee7f96b4c4bb84c8d889246";
+    hash = "sha256-8wuux7eC0OkgL/m20eyRGRrAF1lBGAbd7Gmid9cNPto=";
  };

  postPatch = ''
@@ -30,26 +33,23 @@ stdenv.mkDerivation rec {
  ];
  buildInputs = [
    libglvnd
-    SDL
-    SDL_image
-    SDL_mixer
+    libtool
+    SDL2
+    SDL2_image
+    SDL2_mixer
    xorg.libSM
  ];
  strictDeps = true;

-  configureFlags = [
-    "--with-sdl-prefix=${lib.getDev SDL}"
-  ];
-
  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${lib.getDev SDL_image}/include/SDL"
-    "-I${lib.getDev SDL_mixer}/include/SDL"
+    "-I${lib.getDev SDL2_image}/include/SDL2"
+    "-I${lib.getDev SDL2_mixer}/include/SDL2"
  ];

  enableParallelBuilding = true;

  meta = with lib; {
-    homepage = "https://purl.org/rzr/pinball";
+    homepage = "https://github.com/adoptware/pinball";
    description = "Emilia Pinball simulator";
    license = licenses.gpl2Only;
    maintainers = with maintainers; [ qyliss ];
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "projectable";
-  version = "1.3.0";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "dzfrias";
    repo = "projectable";
    rev = version;
-    hash = "sha256-yN4OA3glRCzjk87tTadwlhytMoh6FM/ke37BsX4rStQ=";
+    hash = "sha256-GM/dPmLnv1/Qj6QhBxPu5kO/SDnbY7Ntupf1FGkmrUY=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-3ZRdh2EeUBy5FqzBWYEsGO1oaw279b5oOmEqO9HZ+VE=";
+  cargoHash = "sha256-b/jB34Y1QXJsOLBliNeOxm1l4TIoEex5y6pDVPC4UVw=";

  nativeBuildInputs = [
    pkg-config
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
  pname = "starlark";
-  version = "0-unstable-2024-12-26";
+  version = "0-unstable-2025-02-05";

  src = fetchFromGitHub {
    owner = "google";
    repo = "starlark-go";
-    rev = "8dfa5b98479f2a537a9cd1289348fb6c2878bf41";
-    hash = "sha256-cZqjyrraD3nzK/pCVjT9yPX6Ysyh5ZN0Axv+X87hzOg=";
+    rev = "492d3672b3f4a001a9ad46d16bfdb1ad2f891912";
+    hash = "sha256-zObkWX6IKXXsa4ZH9EjudeVgz2KK9eJn3uTa387HfKY=";
  };

  vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  gitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "string-view-lite";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "martinmoene";
+    repo = "string-view-lite";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hXm3MLskeZzTegSj79dQV+VcwBatT1VIAUydjisd19U=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  doCheck = true;
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library";
+    homepage = "https://github.com/martinmoene/string-view-lite";
+    changelog = "https://github.com/martinmoene/string-view-lite/blob/v${finalAttrs.version}/CHANGES.txt";
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [ titaniumtown ];
+  };
+})
@@ -126,12 +126,7 @@ stdenv.mkDerivation rec {
    description = "TeamSpeak voice communication tool";
    homepage = "https://teamspeak.com/";
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = {
-      # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
-      fullName = "Teamspeak client license";
-      url = "https://www.teamspeak.com/en/privacy-and-terms/";
-      free = false;
-    };
+    license = lib.licenses.teamspeak;
    maintainers = with lib.maintainers; [
      lhvwb
      lukegb
@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  stdenvNoCC,
  fetchurl,
  autoPatchelfHook,
  copyDesktopItems,
@@ -23,17 +23,17 @@
  libgbm,
  nss,
  udev,
+  libGL,
  xorg,
 }:

-stdenv.mkDerivation rec {
-  pname = "teamspeak5-client";
-  version = "5.0.0-beta77";
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "teamspeak6-client";
+  version = "6.0.0-beta2";

  src = fetchurl {
-    # check https://teamspeak.com/en/downloads/#ts5 for version and checksum
-    url = "https://files.teamspeak-services.com/pre_releases/client/${version}/teamspeak-client.tar.gz";
-    sha256 = "6f3bf97b120d3c799cefc90c448e45836708a826d7caa07ad32b5c868eb9181b";
+    url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
+    hash = "sha256-3jNPv3uQ2RztR1p4XQNLUg5IVrvW/dcdtqXdiGJKVSs=";
  };

  sourceRoot = ".";
@@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
    xorg.libXdamage
    xorg.libXfixes
    xorg.libxshmfence
+    xorg.libXtst
  ];

  nativeBuildInputs = [
@@ -72,8 +73,8 @@ stdenv.mkDerivation rec {
    (makeDesktopItem {
      name = "TeamSpeak";
      exec = "TeamSpeak";
-      icon = pname;
-      desktopName = pname;
+      icon = "teamspeak6-client";
+      desktopName = "teamspeak6-client";
      comment = "TeamSpeak Voice Communication Client";
      categories = [
        "Audio"
@@ -90,26 +91,33 @@ stdenv.mkDerivation rec {
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/bin $out/share/${pname} $out/share/icons/hicolor/64x64/apps/
+    mkdir -p $out/bin $out/share/teamspeak6-client $out/share/icons/hicolor/64x64/apps/

-    cp -a * $out/share/${pname}
-    cp logo-256.png $out/share/icons/hicolor/64x64/apps/${pname}.png
+    cp -a * $out/share/teamspeak6-client
+    cp logo-256.png $out/share/icons/hicolor/64x64/apps/teamspeak6-client.png

-    makeWrapper $out/share/${pname}/TeamSpeak $out/bin/TeamSpeak \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ udev ]}"
+    makeWrapper $out/share/teamspeak6-client/TeamSpeak $out/bin/TeamSpeak \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          udev
+          libGL
+        ]
+      }"

    runHook postInstall
  '';

-  meta = with lib; {
+  updateScript = ./update.sh;
+
+  meta = {
    description = "TeamSpeak voice communication tool (beta version)";
    homepage = "https://teamspeak.com/";
-    license = {
-      fullName = "Teamspeak client license";
-      url = "https://www.teamspeak.com/en/privacy-and-terms/";
-      free = false;
-    };
-    maintainers = with maintainers; [ jojosch ];
+    license = lib.licenses.teamspeak;
+    mainProgram = "TeamSpeak";
+    maintainers = with lib.maintainers; [
+      gepbird
+      jojosch
+    ];
    platforms = [ "x86_64-linux" ];
  };
-}
+})
@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p bash curl cacert ripgrep nix nix-update
+set -euo pipefail
+
+latest_version=$(
+    curl https://teamspeak.com/en/downloads/#ts6client | \
+    rg -o 'https://files.teamspeak-services.com/pre_releases/client/.*/teamspeak-client.tar.gz' | \
+    head -n1 | \
+    sed -n 's|.*/client/\(.*\)/teamspeak-client.tar.gz|\1|p'
+)
+current_version=$(nix eval --raw .#teamspeak6-client.version)
+
+echo "latest  version: $latest_version"
+echo "current version: $current_version"
+
+if [[ "$latest_version" == "$current_version" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+nix-update teamspeak6-client --version $latest_version
@@ -72,9 +72,8 @@ stdenv.mkDerivation rec {
    description = "TeamSpeak voice communication server";
    homepage = "https://teamspeak.com/";
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    license = licenses.teamspeak;
+    platforms = [ "x86_64-linux" ];
    maintainers = with maintainers; [
      arobyn
      gerschtli
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "the-powder-toy";
-  version = "99.0.377";
+  version = "99.2.382";

  src = fetchFromGitHub {
    owner = "The-Powder-Toy";
    repo = "The-Powder-Toy";
    tag = "v${version}";
-    hash = "sha256-U8qgA/YZ10Vy1uuPtOZ7sEIV3sC2mtmC8y7O9FUE62Y=";
+    hash = "sha256-qf5Bh7f4nNNhzh+3id7+lW/eKnZ4ZKgrJxR1EWurKy8=";
  };

  nativeBuildInputs = [
@@ -29,5 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.unfree;
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
    maintainers = with lib.maintainers; [ aaronjheng ];
+    mainProgram = "trunk";
  };
 })
@@ -7,16 +7,16 @@

 buildGoModule {
  pname = "txtpbfmt";
-  version = "0-unstable-2024-11-12";
+  version = "0-unstable-2025-01-29";

  src = fetchFromGitHub {
    owner = "protocolbuffers";
    repo = "txtpbfmt";
-    rev = "20d2c9ebc01daa87ca2b7b697a757613012b104d";
-    hash = "sha256-gCGJQldwTa6Lq7Fvc4NAVRpmMs204qeKEsNFEjErTMA=";
+    rev = "feedd8250727ff9e001e735bc7700800b79e0f29";
+    hash = "sha256-ePJOTlRvyPAgqbaLkEhYzblUZzqBIyhpvuECWZu42bs=";
  };

-  vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY=";
+  vendorHash = "sha256-iWY0b6PAw9BhA8WrTEECnVAKWTGXuIiGvOi9uhJO4PI=";

  ldflags = [
    "-s"
@@ -0,0 +1,31 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  cmake,
+  SDL2,
+}:
+
+stdenv.mkDerivation {
+  pname = "clunk";
+  version = "1.0-unstable-2020-06-25";
+
+  src = fetchFromGitHub {
+    owner = "stalkerg";
+    repo = "clunk";
+    rev = "6d4cbbe1b6f1e202b9945d20073952b254e8d530";
+    hash = "sha256-cz6v7rQYIoLf53Od7THmDPmBfhn8DBP7+uOIZRF0gc8=";
+  };
+
+  buildInputs = [ SDL2 ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Clunk - real-time binaural sound generation library. Versions for Vangers game. Porting to SDL2 and fix some errors";
+    homepage = "https://github.com/stalkerg/clunk";
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [ lgpl21Plus ];
+    maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
+  };
+
+}
@@ -0,0 +1,55 @@
+{
+  lib,
+  fetchFromGitHub,
+  callPackage,
+  stdenv,
+  cmake,
+  SDL2,
+  SDL2_net,
+  libogg,
+  libvorbis,
+  ffmpeg,
+  zlib,
+}:
+
+let
+  clunk = callPackage ./clunk.nix { };
+in
+stdenv.mkDerivation {
+  pname = "vangers";
+  version = "2.0-unstable-2024-09-30";
+
+  src = fetchFromGitHub {
+    owner = "KranX";
+    repo = "Vangers";
+    rev = "72145feed605856c6711bbbcb4f9db99db3434fd";
+    hash = "sha256-IhCQh60wBzaRsj72Y8NUHrv9lvss0fmgHjzrO/subOI=";
+  };
+
+  buildInputs = [
+    SDL2
+    SDL2_net
+    libogg
+    libvorbis
+    ffmpeg
+    clunk
+    zlib
+  ];
+  nativeBuildInputs = [ cmake ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -T -m755 server/vangers_server $out/bin/vangers_server
+    install -T -m755 src/vangers $out/bin/vangers
+    install -T -m755 surmap/surmap $out/bin/surmap
+  '';
+
+  meta = {
+    description = "The video game that combines elements of the racing and role-playing genres";
+    homepage = "https://github.com/KranX/Vangers";
+    mainProgram = "vangers";
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
+  };
+}
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  gitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "variant-lite";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "martinmoene";
+    repo = "variant-lite";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zLyzNzeD0C4e7CYqCCsPzkqa2cH5pSbL9vNVIxdkEfc=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  cmakeFlags = [
+    # https://github.com/martinmoene/variant-lite/issues/50
+    (lib.cmakeBool "VARIANT_LITE_OPT_BUILD_TESTS" false)
+  ];
+
+  doCheck = true;
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library";
+    homepage = "https://github.com/martinmoene/variant-lite";
+    changelog = "https://github.com/martinmoene/variant-lite/blob/v${finalAttrs.version}/CHANGES.txt";
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [ titaniumtown ];
+  };
+})
@@ -9,7 +9,7 @@

 stdenv.mkDerivation rec {
  pname = "vpl-gpu-rt";
-  version = "25.1.0";
+  version = "25.1.1";

  outputs = [ "out" "dev" ];

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    owner = "intel";
    repo = "vpl-gpu-rt";
    rev = "intel-onevpl-${version}";
-    hash = "sha256-J3yp9KbAmXVE0jhFcNkEIsPdMe/LsWxLes3zC56FS08=";
+    hash = "sha256-QMEUCMfhPRMXCSI/gDCSzPVL1fQM79QFATQaYjXel6A=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
@@ -2,31 +2,21 @@
  lib,
  stdenvNoCC,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
+  nix-update-script,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "vulkan-memory-allocator";
-  version = "3.1.0";
+  version = "3.2.0";

  src = fetchFromGitHub {
    owner = "GPUOpen-LibrariesAndSDKs";
    repo = "VulkanMemoryAllocator";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg=";
+    hash = "sha256-f9TmMUbWqS00Ib3gpPQpd/0D02nDBUgYvPJ8rSFizFY=";
  };

-  patches = [
-    # Allows specifying version constraints on the CMake module
-    # Remove when version > 3.1.0
-    (fetchpatch {
-      name = "0001-vulkan-memory-allocator-add-cmake-package-version-file.patch";
-      url = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/257138b8f5686ae84491a3df9f90a77d5660c3bd.patch";
-      hash = "sha256-qbQhIJho/WQqzAwB2zzWgGKx4QK9zKmbaGisbNOV8mg=";
-    })
-  ];
-
  # A compiler is only required for the samples. This lets us use stdenvNoCC.
  postPatch = ''
    substituteInPlace CMakeLists.txt \
@@ -39,6 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  strictDeps = true;

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Easy to integrate Vulkan memory allocation library";
    homepage = "https://gpuopen.com/vulkan-memory-allocator/";
@@ -15,16 +15,16 @@

 buildGoModule rec {
  pname = "xray";
-  version = "25.1.1";
+  version = "25.1.30";

  src = fetchFromGitHub {
    owner = "XTLS";
    repo = "Xray-core";
    rev = "v${version}";
-    hash = "sha256-6Ybo8jYDdYlnrLkYV4Wo9T/3lHYByNJN2G0A+YGe504=";
+    hash = "sha256-wO2AetcOdM0hEQmcSHNP8hOuE5856SZ9+FQSryEEeT0=";
  };

-  vendorHash = "sha256-f61PmgSojDq6TAfWEd+q0WZ9fvmABdll+Ta3q8fHtEU=";
+  vendorHash = "sha256-Bt5yJtbC9GWgR6IrL84ojMBm0iUcoPkkF77k7itUpgM=";

  nativeBuildInputs = [ makeWrapper ];

@@ -96,7 +96,7 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "zed-editor";
-  version = "0.172.9";
+  version = "0.172.10";

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

@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${version}";
-    hash = "sha256-mS2LyeqaFRL0M+6ZkmBowOOK0AJJIKiLpLjAvO7nqX0=";
+    hash = "sha256-4R7s+575ofL9JK1Axvvk2Z9QgHPxvJrgl9zCv3m+sZY=";
  };

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

  useFetchCargoVendor = true;
-  cargoHash = "sha256-G+/dAVlh+uHsQx7Lymi8tkKclwPjgtuKBX2d9KUc/IU=";
+  cargoHash = "sha256-yzShyOn90U79Ts+sKLhAK6SYiqPX7MKT/9fgF2plgI4=";

  nativeBuildInputs =
    [
@@ -1,5 +1,7 @@
 { lib
+, fetchFromGitLab
 , fetchzip
+, cpio
 , ddcutil
 , easyeffects
 , gjs
@@ -18,6 +20,8 @@
 , procps
 , smartmontools
 , replaceVars
+, stdenvNoCC
+, substituteAll
 , touchegg
 , util-linux
 , vte
@@ -110,6 +114,35 @@ super: lib.trivial.pipe super [
    ];
  }))

+  (patchExtension "lunarcal@ailin.nemui" (old: let
+    chinese-calendar = stdenvNoCC.mkDerivation (finalAttrs: {
+      pname = "chinese-calendar";
+      version = "20240107";
+      nativeBuildInputs = [
+        cpio # used in install.sh
+      ];
+      src = fetchFromGitLab {
+        domain = "gitlab.gnome.org";
+        owner = "Nei";
+        repo = "ChineseCalendar";
+        tag = finalAttrs.version;
+        hash = "sha256-z8Af9e70bn3ztUZteIEt/b3nJIFosbnoy8mwKMM6Dmc=";
+      };
+      installPhase = ''
+        runHook preInstall
+        HOME=$out ./install.sh
+        runHook postInstall
+      '';
+    });
+  in {
+    patches = [
+      (substituteAll {
+        src = ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch;
+        chinese_calendar_path = chinese-calendar;
+      })
+    ];
+  }))
+
  (patchExtension "pano@elhan.io" (final: prev: {
    version = "v23-alpha3";
    src = fetchzip {
@@ -0,0 +1,31 @@
+diff --git a/backend/ytliu0-loader.js b/backend/ytliu0-loader.js
+index 4862c17..25fe9e8 100644
+--- a/backend/ytliu0-loader.js
+++ b/backend/ytliu0-loader.js
+@@ -8,7 +8,11 @@ import GLib from 'gi://GLib'
+ // Code from gnome-shell 44 : extenstionUtils.js:installImporter
+ let custom_importer
+ const origSearchPath = imports.searchPath.slice()
+-imports.searchPath = [GLib.get_user_data_dir(), ...GLib.get_system_data_dirs()]
+imports.searchPath = [
+  GLib.get_user_data_dir(),
+  ...GLib.get_system_data_dirs(),
+  '@chinese_calendar_path@/.local/share'
+]
+ try {
+   // importing a "subdir" creates a new importer object that doesn't affect
+   // the global one
+diff --git a/backend/ytliu0.js b/backend/ytliu0.js
+index 94abd2c..df6241b 100644
+--- a/backend/ytliu0.js
+++ b/backend/ytliu0.js
+@@ -60,7 +60,8 @@ class LunarDateX {
+       const [ok, file] = this._holidayData.load_from_dirs(holiday_fn, [
+         GLib.get_user_config_dir(),
+         GLib.get_user_data_dir(),
+-        ...GLib.get_system_data_dirs()
+        ...GLib.get_system_data_dirs(),
+        '@chinese_calendar_path@/.config'
+       ], GLib.KeyFileFlags.KEEP_TRANSLATIONS)
+       if (this._notifyHoliday)
+         this._notifyHoliday()
@@ -14,13 +14,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "gleam";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "gleam-lang";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-Nr8OpinQ1Dmo6e8XpBYrtaRRhcX2s1TW/5nM1LxApGg=";
+    hash = "sha256-gBVr4kAec8hrDBiRXa/sQUNYvgSX3nTVMwFGYRFCbSA=";
  };

  nativeBuildInputs = [
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
    ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-3McEZ/qwrLm8W2Umtah5shU74iFxLfe4ihp7x4YEvKc=";
+  cargoHash = "sha256-tYSqE+bn0GUQe/xVBZTh37XsMyzFnmxgVCL0II2/3jQ=";

  passthru.updateScript = nix-update-script { };

@@ -0,0 +1,68 @@
+From 5eaae2daff7722ee01eee239e131ee1f62643abe Mon Sep 17 00:00:00 2001
+From: Peter Waller <peter.waller@arm.com>
+Date: Wed, 5 Feb 2025 19:46:15 +0000
+Subject: [PATCH] [compiler-rt][AArch64] Enable libc-free builtins Linux build
+
+Without this change, libc++abi.so.1.0 fails to link with:
+
+```
+error: undefined sybol: __aarch64_sme_accessible
+```
+
+This symbol is provided by baremetal libc's such as newlib.
+
+In order to compile a libc with compiler-rt, it is necessary first to
+build a compiler-rt with no dependency on libc to acquire the builtins.
+The intended linux test requires getauxval which is provided by libc.
+
+To that end, there are examples in the wild of building a compiler-rt
+without libc by specifying -DCOMPILER_RT_BAREMETAL_BUILD=ON.
+On Linux, this gives a builtins build with (almost) no libc dependencies.
+
+See for example:
+
+https://github.com/NixOS/nixpkgs/blob/d7fe3bcaca37e79d8b3cbde4dd69edeafbd35313/pkgs/development/compilers/llvm/common/compiler-rt/default.nix#L116-L118
+
+```
+  ] ++ lib.optionals (!haveLibc || bareMetal) [
+    "-DCMAKE_C_COMPILER_WORKS=ON"
+    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+```
+
+The above specifies that a !haveLibc build sets
+`-DCOMPILER_RT_BAREMETAL_BUILD`, which is done for example in a `pkgsLLVM` build.
+
+AIUI, acquiring such a builtins build of compiler-rt is necessary to build a
+pure LLVM toolchain, since builtins are required to build libc (and
+libcxx is required to build a full compiler-rt).
+
+The effect of falling back to unimplemented is that this early-stage
+builtins build is incapable of doing function multiversioning tests and
+falls back to behaving as-if the feature is unavailable.
+
+This behaviour changed in
+https://github.com/llvm/llvm-project/pull/119414, which introduced a
+subtle change in semantics in the removal of
+compiler-rt/lib/builtins/aarch64/sme-abi-init.c (definition of getauxval
+macro, which was bracketed by `#if defined(__linux__)`) vs the new
+definition which does not test for linux.
+
+The proposed change is reinstating things as they were before #119414.
+---
+ compiler-rt/lib/builtins/cpu_model/aarch64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/builtins/cpu_model/aarch64.c b/lib/builtins/cpu_model/aarch64.c
+index 4082fd62ea11a25..50438bcc7ddd885 100644
+--- a/lib/builtins/cpu_model/aarch64.c
+++ b/lib/builtins/cpu_model/aarch64.c
+@@ -80,7 +80,7 @@ struct {
+ #include "aarch64/fmv/getauxval.inc"
+ #elif defined(_WIN32)
+ #include "aarch64/fmv/windows.inc"
+-#elif defined(ENABLE_BAREMETAL_AARCH64_FMV)
+#elif defined(ENABLE_BAREMETAL_AARCH64_FMV) && !defined(__linux__)
+ #include "aarch64/fmv/baremetal.inc"
+ #else
+ #include "aarch64/fmv/unimplemented.inc"
+
@@ -0,0 +1,139 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c9ff3696e22d..bd96aab5e237 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1133,9 +1133,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   install(TARGETS tf_xla_runtime EXPORT LLVMDevelopmentExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
+   # Once we add more modules, we should handle this more automatically.
+   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index baf47677b247..81954240a9bf 100644
+--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
+@@ -974,8 +974,8 @@ macro(add_llvm_library name)
+       endif()
+       install(TARGETS ${name}
+               ${export_to_llvmexports}
+-              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+-              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}
+               RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})
+ 
+       if (NOT LLVM_ENABLE_IDE)
+@@ -2243,7 +2243,7 @@ function(llvm_install_library_symlink name dest type)
+     set(LLVM_LINK_OR_COPY copy)
+   endif()
+ 
+-  set(output_dir lib${LLVM_LIBDIR_SUFFIX})
+  set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
+   if(WIN32 AND "${type}" STREQUAL "SHARED")
+     set(output_dir "${CMAKE_INSTALL_BINDIR}")
+   endif()
+@@ -2519,16 +2519,37 @@ function(llvm_setup_rpath name)
+ 
+   if (APPLE)
+     set(_install_name_dir INSTALL_NAME_DIR "@rpath")
+-    set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+    set(_install_rpath ${extra_libdir})
+   elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
+     # $ORIGIN is not interpreted at link time by aix ld.
+     # Since BUILD_SHARED_LIBS is only recommended for use by developers,
+     # hardcode the rpath to build/install lib dir first in this mode.
+     # FIXME: update this when there is better solution.
+-    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+   elseif(UNIX)
+    # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back
+    # to `_install_rpath` here.
+    #
+    # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.
+    # clang); instead LLVM is its own package and thus lands at its own nix
+    # store path. This makes it so that the default relative rpath (`../lib/`)
+    # does not point at the LLVM shared objects.
+    #
+    # More discussion here:
+    #   - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329
+    #   - https://reviews.llvm.org/D146918 (16.0.5+)
+    #
+    # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is
+    # no potential that this will result in us pulling in the "wrong" LLVM.
+    # Adding this to the build rpath means we aren't forced to use
+    # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build
+    # dir, pre-install, will have the right rpath for LLVM).
+    #
+    # As noted in the differential above, an alternative solution is to have
+    # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set
+    # `CMAKE_INSTALL_RPATH`.
+     set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+-    set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
+    set(_install_rpath ${extra_libdir})
+     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
+       set_property(TARGET ${name} APPEND_STRING PROPERTY
+                    LINK_FLAGS " -Wl,-z,origin ")
+diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake
+index 2d9116b08a52..2dd7cad4ec66 100644
+--- a/cmake/modules/AddOCaml.cmake
+++ b/cmake/modules/AddOCaml.cmake
+@@ -147,9 +147,9 @@ function(add_ocaml_library name)
+   endforeach()
+ 
+   if( APPLE )
+-    set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}")
+    set(ocaml_rpath ${LLVM_LIBRARY_DIR})
+   elseif( UNIX )
+-    set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}")
+    set(ocaml_rpath ${LLVM_LIBRARY_DIR})
+   endif()
+   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")
+ 
+diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+index ef4cfa3acdb5..7478e157a7c2 100644
+--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
+@@ -130,7 +130,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS
+   )
+ list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)
+ 
+-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")
+extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")
+ set(LLVM_CONFIG_LIBRARY_DIRS
+   "${LLVM_CONFIG_LIBRARY_DIR}"
+   # FIXME: Should there be other entries here?
+diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
+index 370005cd8d7d..7e790bc52111 100644
+--- a/tools/llvm-config/BuildVariables.inc.in
+++ b/tools/llvm-config/BuildVariables.inc.in
+@@ -23,6 +23,7 @@
+ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"
+ #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
+ #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"
+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"
+ #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"
+ #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"
+ #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index d5b76b1bb6c1..1dbdb2a8f10d 100644
+--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
+@@ -366,7 +366,11 @@ int main(int argc, char **argv) {
+       sys::fs::make_absolute(ActivePrefix, Path);
+       ActiveBinDir = std::string(Path);
+     }
+-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
+    {
+      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);
+      sys::fs::make_absolute(ActivePrefix, Path);
+      ActiveLibDir = std::string(Path);
+    }
+     {
+       SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
+       sys::fs::make_absolute(ActivePrefix, Path);
@@ -0,0 +1,53 @@
+From 03d6f704d07aa3650a2f59be6f7802a8735460c3 Mon Sep 17 00:00:00 2001
+From: Lang Hames <lhames@gmail.com>
+Date: Wed, 29 Jan 2025 03:58:29 +0000
+Subject: [PATCH] [ORC][LLI] Remove redundant eh-frame registration plugin
+ construction from lli.
+
+As of d0052ebbe2e the setUpGenericLLVMIRPlatform function will automatically
+add an instance of the EHFrameRegistrationPlugin (for LLJIT instances whose
+object linking layers are ObjectLinkingLayers, not RTDyldObjectLinkingLayers).
+
+This commit removes the redundant plugin creation in the object linking
+layer constructor function in lli.cpp to prevent duplicate registration of
+eh-frames, which is likely the cause of recent bot failures, e.g.
+https://lab.llvm.org/buildbot/#/builders/108/builds/8685.
+
+(cherry picked from commit 9052b37ab1aa67a039b34356f37236fecc42bac2)
+---
+ llvm/tools/lli/lli.cpp | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/llvm/tools/lli/lli.cpp b/tools/lli/lli.cpp
+index 448660a539a0b0..19246f03941673 100644
+--- a/llvm/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
+@@ -27,9 +27,7 @@
+ #include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h"
+ #include "llvm/ExecutionEngine/Orc/DebugUtils.h"
+ #include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h"
+-#include "llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h"
+ #include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h"
+-#include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h"
+ #include "llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.h"
+ #include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"
+ #include "llvm/ExecutionEngine/Orc/IRPartitionLayer.h"
+@@ -1033,14 +1031,10 @@ int runOrcJIT(const char *ProgName) {
+     Builder.getJITTargetMachineBuilder()
+         ->setRelocationModel(Reloc::PIC_)
+         .setCodeModel(CodeModel::Small);
+-    Builder.setObjectLinkingLayerCreator([&P](orc::ExecutionSession &ES,
+-                                              const Triple &TT) {
+-      auto L = std::make_unique<orc::ObjectLinkingLayer>(ES);
+-      if (P != LLJITPlatform::ExecutorNative)
+-        L->addPlugin(std::make_unique<orc::EHFrameRegistrationPlugin>(
+-            ES, ExitOnErr(orc::EPCEHFrameRegistrar::Create(ES))));
+-      return L;
+-    });
+    Builder.setObjectLinkingLayerCreator(
+        [&](orc::ExecutionSession &ES, const Triple &TT) {
+          return std::make_unique<orc::ObjectLinkingLayer>(ES);
+        });
+   }
+ 
+   auto J = ExitOnErr(Builder.create());
@@ -123,8 +123,13 @@ let
                }
              ];
              "llvm/gnu-install-dirs.patch" = [
+                {
+                  after = "20";
+                  path = ../20;
+                }
                {
                  after = "18";
+                  before = "20";
                  path = ../18;
                }
              ];
@@ -494,7 +499,12 @@ let
                  hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI=";
                  stripLen = 1;
                })
-              ];
+              ]
+          ++
+            lib.optional (lib.versions.major metadata.release_version == "20")
+              # Fix OrcJIT
+              # PR: https://github.com/llvm/llvm-project/pull/125431
+              (metadata.getVersionFile "llvm/orcjit.patch");
        pollyPatches =
          [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]
          ++ lib.optional (lib.versionAtLeast metadata.release_version "15")
@@ -507,9 +517,11 @@ let
      llvm = tools.libllvm;

      tblgen = callPackage ./tblgen.nix {
-        patches = builtins.filter
-          # Crude method to drop polly patches if present, they're not needed for tblgen.
-          (p: (!lib.hasInfix "-polly" p)) tools.libllvm.patches;
+        patches =
+          builtins.filter
+            # Crude method to drop polly patches if present, they're not needed for tblgen.
+            (p: (!lib.hasInfix "-polly" p))
+            tools.libllvm.patches;
        clangPatches = [
          # Would take tools.libclang.patches, but this introduces a cycle due
          # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
@@ -532,12 +544,13 @@ let
            # libraries. eg: `clang -munsupported hello.c -lc`
            ./clang/clang-unsupported-option.patch
          ]
-          ++ lib.optional (lib.versions.major metadata.release_version == "13")
-            # Revert of https://reviews.llvm.org/D100879
-            # The malloc alignment assumption is incorrect for jemalloc and causes
-            # mis-compilation in firefox.
-            # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
-            (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch")
+          ++
+            lib.optional (lib.versions.major metadata.release_version == "13")
+              # Revert of https://reviews.llvm.org/D100879
+              # The malloc alignment assumption is incorrect for jemalloc and causes
+              # mis-compilation in firefox.
+              # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
+              (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch")
          ++ lib.optional (lib.versionOlder metadata.release_version "17") (
            if lib.versionAtLeast metadata.release_version "14" then
              fetchpatch {
@@ -666,7 +679,7 @@ let
      lldbPlugins = lib.makeExtensible (
        lldbPlugins:
        let
-          callPackage = newScope ( lldbPlugins // tools // args // metadata );
+          callPackage = newScope (lldbPlugins // tools // args // metadata);
        in
        lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
      );
@@ -1073,7 +1086,12 @@ let
          url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
          hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
          relative = "compiler-rt";
-        });
+        })
+        # Fixes baremetal
+        # PR: https://github.com/llvm/llvm-project/pull/125922
+        ++ lib.optional (lib.versionAtLeast metadata.release_version "20") (
+          metadata.getVersionFile "compiler-rt/libc-free.patch"
+        );
    in
    (
      {
@@ -31,7 +31,7 @@ let
      stdenv.override {
        cc = stdenv.cc.override {
          nixSupport = stdenv.cc.nixSupport // {
-            cc-cflags = lib.remove "-lunwind" stdenv.cc.nixSupport.cc-cflags;
+            cc-cflags = lib.remove "-lunwind" (stdenv.cc.nixSupport.cc-cflags or [ ]);
          };
        };
      }
@@ -58,8 +58,8 @@ stdenv'.mkDerivation (finalAttrs: {
  outputs = [ "out" ] ++ (lib.optional isFullBuild "dev");

  postUnpack = lib.optionalString isFullBuild ''
-    patchShebangs $sourceRoot/../$pname/hdrgen/yaml_to_classes.py
-    chmod +x $sourceRoot/../$pname/hdrgen/yaml_to_classes.py
+    patchShebangs $sourceRoot/../$pname/utils/hdrgen/main.py
+    chmod +x $sourceRoot/../$pname/utils/hdrgen/main.py
  '';

  prePatch = ''
@@ -30,10 +30,11 @@ let
    "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
    "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
    "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
-    "20.0.0-git".gitRelease = {
-      rev = "6383a12e3b4339fa4743bb97da4d51dea6d2e2ea";
-      rev-version = "20.0.0-unstable-2025-01-25";
-      sha256 = "sha256-LMew+lFm+HrR5iwFDnoXA6B2LiU/pVqsy1YrP9xr5GU=";
+    "20.1.0-rc1".officialRelease.sha256 = "sha256-yOczbperlR20+iLoao9g0CR+Ml2mjTCx1cqP/9WOhME=";
+    "21.0.0-git".gitRelease = {
+      rev = "312055d1da169f043e65b35fcd62d6d685700114";
+      rev-version = "21.0.0-unstable-2025-02-01";
+      sha256 = "sha256-V14ypUGn7GxzchmKjoSH2oiHDUQa07b4bQWjjRpQKCo=";
    };
  } // llvmVersions;

@@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lobster";
-  version = "2024.0";
+  version = "2025.0";

  src = fetchFromGitHub {
    owner = "aardappel";
    repo = "lobster";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-EBgb442wI9qU/o6EVCwPnMtPuv1f6Xk2+CZpKWXf3tY=";
+    sha256 = "sha256-yigWrbFQg1nQt7X1Rx7Us5cKfKW4YOmPt0/lyBvspqo=";
  };

  nativeBuildInputs = [ cmake ];
@@ -2,11 +2,12 @@
  lib,
  mkCoqDerivation,
  coq,
+  rocqPackages,
  stdlib,
  version ? null,
 }:

-mkCoqDerivation {
+(mkCoqDerivation {
  pname = "bignums";
  owner = "coq";
  inherit version;
@@ -58,4 +59,22 @@ mkCoqDerivation {
  meta = {
    license = lib.licenses.lgpl2;
  };
-}
+}).overrideAttrs
+  (
+    o:
+    # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0
+    lib.optionalAttrs (coq.version != null && (coq.version == "dev"
+                       || lib.versions.isGe "9.0" coq.version)) {
+      configurePhase = ''
+        echo no configuration
+      '';
+      buildPhase = ''
+        echo building nothing
+      '';
+      installPhase = ''
+        echo installing nothing
+      '';
+      propagatedBuildInputs = o.propagatedBuildInputs
+        ++ [ rocqPackages.bignums ];
+    }
+  )
@@ -1,5 +1,6 @@
 {
  coq,
+  rocqPackages,
  mkCoqDerivation,
  lib,
  version ? null,
@@ -25,22 +26,12 @@

  useDune = true;

-  configurePhase = ''
-    patchShebangs dev/with-rocq-wrap.sh
-  '';
-
-  buildPhase = ''
-    dev/with-rocq-wrap.sh dune build -p rocq-stdlib,coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
-  '';
-
  installPhase = ''
-    dev/with-rocq-wrap.sh dune install --root . rocq-stdlib coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR
-    mkdir $out/lib/coq/
-    mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version}
+    echo installing nothing
  '';

  meta = {
-    description = "Coq Standard Library";
+    description = "Compatibility metapackage for Coq Stdlib library after the Rocq renaming";
    license = lib.licenses.lgpl21Only;
  };

@@ -48,14 +39,15 @@
  (
    o:
    # stdlib is already included in Coq <= 8.20
-    lib.optionalAttrs
-      (coq.version != null && coq.version != "dev" && lib.versions.isLt "8.21" coq.version)
-      {
-        buildPhase = ''
-          echo building nothing
-        '';
-        installPhase = ''
-          touch $out
-        '';
-      }
+    if coq.version != null && coq.version != "dev" && lib.versions.isLt "8.21" coq.version then {
+      configurePhase = ''
+        echo no configuration
+      '';
+      buildPhase = ''
+        echo building nothing
+      '';
+      installPhase = ''
+        touch $out
+      '';
+    } else { propagatedBuildInputs = [ rocqPackages.stdlib ]; }
  )
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "aiohttp-asyncmdnsresolver";
-  version = "0.0.3";
+  version = "0.1.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "aio-libs";
    repo = "aiohttp-asyncmdnsresolver";
    rev = "v${version}";
-    hash = "sha256-YtBPMhRbilLY0VV1qVIPBYT0w91MbsUo2nbr4ODgCZA=";
+    hash = "sha256-z0m8dlzl6mglTOW9BwLbFcRjxcF14yz8+SE8SqjNu+c=";
  };

  build-system = [ setuptools ];
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "aioshelly";
-  version = "12.3.2";
+  version = "12.4.1";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "home-assistant-libs";
    repo = "aioshelly";
    tag = version;
-    hash = "sha256-Xuh1iOQHoFU1pTehPVmwS6bNTelnYMHW8wnkhxTSrnw=";
+    hash = "sha256-OhfLl/IJUSmzVHoYjJszxwN4RZEr5zCfxxh5T0/z2Bg=";
  };

  build-system = [ setuptools ];
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "eheimdigital";
-  version = "1.0.5";
+  version = "1.0.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "autinerd";
    repo = "eheimdigital";
    tag = version;
-    hash = "sha256-fzvQrguwZoaQCoJlXzFCF7WUZpBe0EMQNcyKnmhQ4l8=";
+    hash = "sha256-ocDw7ZwuKSGQT8fPcZEbkKyRH0sCOJusopV0kM11rCw=";
  };

  build-system = [ hatchling ];
@@ -44,7 +44,7 @@ buildPythonPackage rec {

  pythonRemoveDeps = [
    # Not available anymore in nixpkgs
-    "jupyter-contrib-nbextensions"
+    "jupyter_contrib_nbextensions"
  ];

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

 buildPythonPackage rec {
  pname = "extract-msg";
-  version = "0.52.0";
+  version = "0.53.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "TeamMsgExtractor";
    repo = "msg-extractor";
    tag = "v${version}";
-    hash = "sha256-4jvzZkGa/xI5Sl9TBIm/BD3tGl+MZvwir6m/zrvA4tQ=";
+    hash = "sha256-vkWINRUQh/zfKzSJifJMn0EVnBdPODLFdS/jMdGI36I=";
  };

  pythonRelaxDeps = [
@@ -10,8 +10,6 @@

  # dependencies
  pyarrow,
-  pythonOlder,
-  typing-extensions,

  # optional-dependencies
  pandas,
@@ -46,13 +44,9 @@ buildPythonPackage rec {
    rustc
  ];

-  dependencies =
-    [
-      pyarrow
-    ]
-    ++ lib.optionals (pythonOlder "3.9") [
-      typing-extensions
-    ];
+  dependencies = [
+    pyarrow
+  ];

  optional-dependencies = {
    pandas = [
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "google-nest-sdm";
-  version = "7.1.1";
+  version = "7.1.3";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "allenporter";
    repo = "python-google-nest-sdm";
    tag = version;
-    hash = "sha256-hBpAwDRmqRRWW0DiG3aXy+OXZPCXdhPzAP79mXOn1kg=";
+    hash = "sha256-iVdFl90nP2U5KGqFPvS7qHgSUQjlKnbfZTLq42y/Mrc=";
  };

  build-system = [ setuptools ];
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "govee-ble";
-  version = "0.42.0";
+  version = "0.43.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "govee-ble";
    tag = "v${version}";
-    hash = "sha256-R2FHkXurWif9BZTGry9PGZgM30CYIgbKAD8iLxmmJfw=";
+    hash = "sha256-MC5ql5Cd9atpgQCoTIfasioplJ2f1M+RrGR/oI/fdMI=";
  };

  build-system = [ poetry-core ];
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "internetarchive";
-  version = "5.1.0";
+  version = "5.2.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "jjjake";
    repo = "internetarchive";
    tag = "v${version}";
-    hash = "sha256-HwE8oEd5ss8HkpuQuUwdfzENYHn2z/QmzvhRIBvo1qA=";
+    hash = "sha256-xi3cR/j25gRe+muWjk8towzELgDciqLxGvBIpRqJHd0=";
  };

  build-system = [ setuptools ];
@@ -61,12 +61,12 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "internetarchive" ];

-  meta = with lib; {
+  meta = {
    description = "Python and Command-Line Interface to Archive.org";
    homepage = "https://github.com/jjjake/internetarchive";
    changelog = "https://github.com/jjjake/internetarchive/blob/v${version}/HISTORY.rst";
-    license = licenses.agpl3Plus;
-    maintainers = [ ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ pyrox0 ];
    mainProgram = "ia";
  };
 }
@@ -2,6 +2,7 @@
  buildPythonPackage,
  fetchFromGitHub,
  libmysqlclient,
+  packaging,
  lib,
  pythonOlder,
  setuptools,
@@ -29,6 +30,10 @@ buildPythonPackage rec {

  buildInputs = [ libmysqlclient ];

+  dependencies = [
+    packaging # do not rely on pythonImportsCheck when removing, it pulls in build-system dependencies
+  ];
+
  # Requires a running MariaDB instance
  doCheck = false;

@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "neo4j";
-  version = "5.27.0";
+  version = "5.28.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "neo4j";
    repo = "neo4j-python-driver";
    tag = version;
-    hash = "sha256-tocgH2LuZ56Yej0lRWYHUkR6aqviQwJqG5P2g4P1+uk=";
+    hash = "sha256-1hq0XuHb7R/ROkeyEyfGQMH//E632aiNYVSjszM1OEY=";
  };

  postPatch = ''
@@ -3,7 +3,7 @@
  buildPythonPackage,
  deprecation,
  fetchFromGitHub,
-  ghostscript,
+  ghostscript_headless,
  hatch-vcs,
  hatchling,
  hypothesis,
@@ -52,7 +52,7 @@ buildPythonPackage rec {
    ./use-pillow-heif.patch
    (substituteAll {
      src = ./paths.patch;
-      gs = lib.getExe ghostscript;
+      gs = lib.getExe ghostscript_headless;
      jbig2 = lib.getExe jbig2enc;
      pngquant = lib.getExe pngquant;
      tesseract = lib.getExe tesseract;
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pbs-installer";
-  version = "2025.01.06";
+  version = "2025.02.05";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "frostming";
    repo = "pbs-installer";
    tag = version;
-    hash = "sha256-PWKzIRVpiSJK/aS3fwqnXnyT6lpXjtGxdm4ZKinwkBI=";
+    hash = "sha256-lJDniOqJHgMan5fZ8/MvT3xHEXwZuibbnPBn6KiRLaE=";
  };

  build-system = [ pdm-backend ];
@@ -38,7 +38,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Installer for Python Build Standalone";
    homepage = "https://github.com/frostming/pbs-installer";
-    changelog = "https://github.com/frostming/pbs-installer/releases/tag/${version}";
+    changelog = "https://github.com/frostming/pbs-installer/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = [ ];
  };
@@ -4,7 +4,6 @@
  buildPythonPackage,
  cargo,
  cmake,
-  darwin,
  fetchFromGitHub,
  pkg-config,
  pkgs, # zstd hidden by python3Packages.zstd
@@ -41,22 +40,22 @@
 }:

 let
-  version = "1.12.0";
+  version = "1.21.0";

  # Hide symbols to prevent accidental use
  rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys";
  jemalloc = throw "polars: use polarsMemoryAllocator over jemalloc";
 in

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "polars";
  inherit version;

  src = fetchFromGitHub {
    owner = "pola-rs";
    repo = "polars";
-    rev = "py-${version}";
-    hash = "sha256-q//vt8FvVKY9N/BOIoOwxaSB/F/tNX1Zl/9jd0AzSH4=";
+    tag = "py-${version}";
+    hash = "sha256-/MmuaQG8ozl2yAVBXIibbtKjCQbw98azBFSKiP2PE0A=";
  };

  # Do not type-check assertions because some of them use unstable features (`is_none_or`)
@@ -66,12 +65,9 @@ buildPythonPackage {
    done < <( find -iname '*.rs' -print0 )
  '';

-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw=";
-      "polars-parquet-format-2.10.0" = "sha256-iB3KZ72JSp7tJCLn9moukpDEGf9MUos04rIQ9rDGWfI=";
-    };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-CVKT3x8SkpL7VFw6yc4pGwd0EYwufXtBp4Xl2eD88sM=";
  };

  requiredSystemFeatures = [ "big-parallel" ];
@@ -88,16 +84,10 @@ buildPythonPackage {
    rustc
  ];

-  buildInputs =
-    [
-      polarsMemoryAllocator
-      (pkgs.__splicedPackages.zstd or pkgs.zstd)
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.IOKit
-      darwin.apple_sdk.frameworks.Security
-    ];
+  buildInputs = [
+    polarsMemoryAllocator
+    (pkgs.__splicedPackages.zstd or pkgs.zstd)
+  ];

  env = {
    ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -210,6 +200,7 @@ buildPythonPackage {
        ps.altair
        ps.boto3
        ps.deltalake
+        ps.fastexcel
        ps.flask
        ps.flask-cors
        ps.fsspec
@@ -218,6 +209,7 @@ buildPythonPackage {
        ps.jax
        ps.jaxlib
        (ps.kuzu or null)
+        ps.matplotlib
        ps.moto
        ps.nest-asyncio
        ps.numpy
@@ -225,7 +217,7 @@ buildPythonPackage {
        ps.pandas
        ps.pyarrow
        ps.pydantic
-        (ps.pyiceberg or null)
+        ps.pyiceberg
        ps.sqlalchemy
        ps.torch
        ps.xlsx2csv
@@ -264,6 +256,25 @@ buildPythonPackage {

      # Internet access:
      "test_read_web_file"
+      "test_run_python_snippets"
+
+      # AssertionError: Series are different (exact value mismatch)
+      "test_reproducible_hash_with_seeds"
+
+      # AssertionError: assert 'PARTITIONED FORCE SPILLED' in 'OOC sort forced\nOOC sort started\nRUN STREAMING PIPELINE\n[df -> sort -> ordered_sink]\nfinished sinking into OOC so... sort took: 365.662µs\nstarted sort source phase\nsort source phase took: 2.169915ms\nfull ooc sort took: 4.502947ms\n'
+      "test_streaming_sort"
+
+      # AssertionError assert sys.getrefcount(foos[0]) == base_count (3 == 2)
+      # tests/unit/dataframe/test_df.py::test_extension
+      "test_extension"
+
+      # Internet access (https://bucket.s3.amazonaws.com/)
+      "test_scan_credential_provider"
+      "test_scan_credential_provider_serialization"
+
+      # ModuleNotFoundError: ADBC 'adbc_driver_sqlite.dbapi' driver not detected.
+      "test_read_database"
+      "test_read_database_parameterised_uri"

      # Untriaged
      "test_pickle_lazyframe_nested_function_udf"
@@ -274,8 +285,8 @@ buildPythonPackage {
      "tests/benchmark"
      "tests/docs"

-      "tests/unit/io/test_iceberg.py" # Package pyiceberg
-      "tests/unit/io/test_spreadsheet.py" # Package fastexcel
+      # Internet access
+      "tests/unit/io/cloud/test_credential_provider.py"

      # Wrong altair version
      "tests/unit/operations/namespaces/test_plot.py"
@@ -294,6 +305,7 @@ buildPythonPackage {
  meta = {
    description = "Dataframes powered by a multithreaded, vectorized query engine, written in Rust";
    homepage = "https://github.com/pola-rs/polars";
+    changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
      happysalada
@@ -1,41 +1,44 @@
 {
  lib,
  buildPythonPackage,
-  cython_0,
-  email-validator,
  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # dependencies
+  typing-extensions,
+
+  # optional-dependencies
+  python-dotenv,
+  email-validator,
+
+  # tests
+  distutils,
  pytest-mock,
  pytest7CheckHook,
-  python-dotenv,
-  pythonAtLeast,
-  pythonOlder,
-  setuptools,
-  typing-extensions,
-  libxcrypt,
+  writableTmpDirAsHomeHook,
 }:

 buildPythonPackage rec {
  pname = "pydantic";
-  version = "1.10.16";
+  version = "1.10.21";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "pydantic";
    repo = "pydantic";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-dn/ZsxbkyK2sJxpo6IsoMBRjq1STdu+xuqHXoNG+Kzk=";
+    tag = "v${version}";
+    hash = "sha256-0kwqJsay+4xh+jgDStNciRPJmuqm8GzA+6ble4K4HuI=";
  };

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

-  buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
-
-  propagatedBuildInputs = [ typing-extensions ];
+  dependencies = [ typing-extensions ];

  optional-dependencies = {
    dotenv = [ python-dotenv ];
@@ -43,38 +46,21 @@ buildPythonPackage rec {
  };

  nativeCheckInputs = [
+    distutils
    pytest-mock
    pytest7CheckHook
+    writableTmpDirAsHomeHook
  ] ++ lib.flatten (lib.attrValues optional-dependencies);

-  pytestFlagsArray = [
-    # https://github.com/pydantic/pydantic/issues/4817
-    "-W"
-    "ignore::pytest.PytestReturnNotNoneWarning"
-  ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  disabledTests = lib.optionals (pythonAtLeast "3.12") [
-    # depends on distuils
-    "test_cython_function_untouched"
-    # AssertionError on exact types and wording
-    "test_model_subclassing_abstract_base_classes_without_implementation_raises_exception"
-    "test_partial_specification_name"
-    "test_secretfield"
-  ];
-
  enableParallelBuilding = true;

  pythonImportsCheck = [ "pydantic" ];

-  meta = with lib; {
+  meta = {
    description = "Data validation and settings management using Python type hinting";
    homepage = "https://github.com/pydantic/pydantic";
    changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ wd15 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wd15 ];
  };
 }
@@ -5,14 +5,13 @@
  paho-mqtt,
  pandas,
  pycryptodome,
-  pythonOlder,
  requests,
  setuptools,
  xmltodict,
 }:

 buildPythonPackage rec {
-  pname = "pyezviz";
+  pname = "pyezvizapi";
  version = "1.0.0.9";
  pyproject = true;

@@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "pyfireservicerota";
-  version = "0.0.45";
+  version = "0.0.46";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "cyberjunky";
    repo = "python-fireservicerota";
    tag = version;
-    hash = "sha256-lQkn/DlqJMLxQlh1sn+v7d6xHHCC9r8mnUJchyTTUqA=";
+    hash = "sha256-2pCv/9VwGUDS5wFdJCxOevl7vWg+iXInI/xY3jPp7BM=";
  };

  build-system = [ pdm-backend ];
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.11.9";
+  version = "0.11.10";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "reolink_aio";
    tag = version;
-    hash = "sha256-hqecKAk3kpm3b9wtQTJtWA3H6WxCNiKl4auaolzrvtI=";
+    hash = "sha256-qEcu+jdzPSNzgT5aK1nZxT6EAlH1ady5Vyx11PTsTic=";
  };

  build-system = [ setuptools ];
@@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "zha-quirks";
-  version = "0.0.131";
+  version = "0.0.132";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "zha-device-handlers";
    tag = version;
-    hash = "sha256-MSTlSvZhamWX7lNzJjDGxyo9KfshZ7T1ED8axx1Aghs=";
+    hash = "sha256-T5A6XIYdV0SxEj3Rw/zOAE74B1ans2FDyuWD5Hnbd5k=";
  };

  postPatch = ''
@@ -27,7 +27,7 @@

 buildPythonPackage rec {
  pname = "zha";
-  version = "0.0.47";
+  version = "0.0.48";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "zha";
    tag = version;
-    hash = "sha256-BDZqReJWmxodP1w3fdxUHbjY9dL+6hUQZ0YazeiERrM=";
+    hash = "sha256-qPqFmFfvCR6gk4qmZNrkC/DcdOUzyLv7KALv35R6oNw=";
  };

  postPatch = ''
@@ -0,0 +1,32 @@
+{
+  lib,
+  mkRocqDerivation,
+  rocq-core,
+  stdlib,
+  version ? null,
+}:
+
+mkRocqDerivation {
+  pname = "bignums";
+  owner = "coq";
+  inherit version;
+  defaultVersion =
+    with lib.versions;
+    lib.switch rocq-core.rocq-version [
+      {
+        case = range "9.0" "9.0";
+        out = "9.0.0+rocq${rocq-core.rocq-version}";
+      }
+    ] null;
+
+  release."9.0.0+rocq9.0".sha256 = "sha256-ctnwpyNVhryEUA5YEsAImrcJsNMhtBgDSOz+z5Z4R78=";
+  releaseRev = v: "${if lib.versions.isGe "9.0" v then "v" else "V"}${v}";
+
+  mlPlugin = true;
+
+  propagatedBuildInputs = [ stdlib ];
+
+  meta = {
+    license = lib.licenses.lgpl2;
+  };
+}
@@ -0,0 +1,47 @@
+{
+  rocq-core,
+  mkRocqDerivation,
+  lib,
+  version ? null,
+}:
+mkRocqDerivation {
+
+  pname = "stdlib";
+  repo = "stdlib";
+  owner = "coq";
+  opam-name = "rocq-stdlib";
+
+  inherit version;
+  defaultVersion =
+    with lib.versions;
+    lib.switch rocq-core.version [
+      { case = isEq "9.0"; out = "9.0+rc1"; }
+      { case = isLt "8.21"; out = "8.20"; }
+    ] null;
+  releaseRev = v: "V${v}";
+
+  release."9.0+rc1".sha256 = "sha256-raHwniQdpAX1HGlMofM8zVeXcmlUs+VJZZg5VF43k/M=";
+  release."8.20".sha256 = "sha256-AcoS4edUYCfJME1wx8UbuSQRF3jmxhArcZyPIoXcfu0=";
+
+  useDune = true;
+
+  configurePhase = ''
+    patchShebangs dev/with-rocq-wrap.sh
+  '';
+
+  buildPhase = ''
+    dev/with-rocq-wrap.sh dune build -p rocq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+  '';
+
+  installPhase = ''
+    dev/with-rocq-wrap.sh dune install --root . rocq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR
+    mkdir $out/lib/coq/
+    mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${rocq-core.rocq-version}
+  '';
+
+  meta = {
+    description = "The Rocq Proof Assistant -- Standard Library";
+    license = lib.licenses.lgpl21Only;
+  };
+
+}
@@ -8,13 +8,13 @@

 luarocks_bootstrap.overrideAttrs (old: {
  pname = "luarocks-nix";
-  version = "0-unstable-2024-04-29";
+  version = "0-unstable-2024-05-31";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "luarocks-nix";
-    rev = "a473a8f479711682f5b97a72362736d96efd463b";
-    hash = "sha256-hsjv+jlLsoIDM4gB/0mFeoVu1YZ1I9ELDALLTEnlCF0=";
+    rev = "9d0440da358eac11afdbef392e2cf3272a8c7101";
+    hash = "sha256-9SC+YQ06u35LN3mPohG7Lz0eLXPsMGKG3mhS+0zSO7Y=";
  };

  propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ [
@@ -2,7 +2,7 @@
 # Do not edit!

 {
-  version = "2025.2.0";
+  version = "2025.2.1";
  components = {
    "3_day_blinds" =
      ps: with ps; [
@@ -369,7 +369,7 @@ let
  extraBuildInputs = extraPackages python.pkgs;

  # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.2.0";
+  hassVersion = "2025.2.1";

 in
 python.pkgs.buildPythonApplication rec {
@@ -390,13 +390,13 @@ python.pkgs.buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    rev = "refs/tags/${version}";
-    hash = "sha256-TGlfqvmYUPA5wdvZWD89z6lfvDr+K/1kgu6NjkRpNxs=";
+    hash = "sha256-iWOrBIKsN+fi5pzMzekmTBIk2FoM2HOsWujkuZ45lHE=";
  };

  # Secondary source is pypi sdist for translations
  sdist = fetchPypi {
    inherit pname version;
-    hash = "sha256-+dkS6AuqyzvC2NiGCGkDAGxF/kS/LuKkMFXWXjC3I8Y=";
+    hash = "sha256-GToOHfDOWrjiQEcxgX9h2tCYqGUv3mXxVh1/GchiNRU=";
  };

  build-system = with python.pkgs; [
@@ -450,9 +450,6 @@ python.pkgs.buildPythonApplication rec {
    substituteInPlace tests/test_core_config.py --replace-fail '"/usr"' "\"$NIX_BUILD_TOP/media\""

    sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml
-
-    substituteInPlace tests/components/hassio/test_backup.py \
-      --replace-fail setup_integration setup_backup_integration
  '';

  dependencies = with python.pkgs; [
@@ -4,7 +4,7 @@
  lib,
 }:

-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
  pname = "hmr_enabler";
  # composer doesn't support our unstable version format
  # version = "0-unstable-2024-08-24";
@@ -19,7 +19,7 @@ php.buildComposerProject (finalAttrs: {

  composerNoDev = false;

-  vendorHash = "sha256-ZuEEcFT+q49CCooEwdiu2Co345s0ZCC7jeEksi6A99A=";
+  vendorHash = "sha256-H+yxviMYc6AuerhYtcHRluRWdS1mmqcSMlN2Q24G1m8=";

  postInstall = ''
    chmod -R u+w $out/share
@@ -1373,6 +1373,7 @@ mapAliases {
  tdesktop = telegram-desktop; # Added 2023-04-07
  tdom = tclPackages.tdom; # Added 2024-10-02
  teamspeak_client = teamspeak3; # Added 2024-11-07
+  teamspeak5_client = teamspeak6-client; # Added 2025-01-29
  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
  teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
  teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
--- a/Show More
+++ b/Show More