Merge master into staging-next

2025-12-15 00:19:52 +00:00
parent 82b3205c01 97c1edbf2b
commit 8259b6c7fe
84 changed files with 4589 additions and 2261 deletions
@@ -24896,6 +24896,12 @@
    githubId = 2060836;
    name = "Casey Stark";
  };
+  starryreverie = {
+    email = "starryreverie@proton.me";
+    github = "StarryReverie";
+    githubId = 42143810;
+    name = "Justin Chen";
+  };
  starsep = {
    email = "nix@starsep.com";
    github = "starsep";
@@ -26657,6 +26663,12 @@
    githubId = 6740669;
    name = "Tom Smeets";
  };
+  tonybanters = {
+    email = "tony@tonybtw.com";
+    github = "tonybanters";
+    githubId = 27378358;
+    name = "tony";
+  };
  toonn = {
    email = "nixpkgs@toonn.io";
    matrix = "@toonn:matrix.org";
@@ -1822,6 +1822,7 @@
  ./services/x11/window-managers/metacity.nix
  ./services/x11/window-managers/nimdow.nix
  ./services/x11/window-managers/none.nix
+  ./services/x11/window-managers/oxwm.nix
  ./services/x11/window-managers/twm.nix
  ./services/x11/window-managers/windowlab.nix
  ./services/x11/window-managers/wmii.nix
@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.xserver.windowManager.oxwm;
+in
+{
+  options.services.xserver.windowManager.oxwm = {
+    enable = lib.mkEnableOption "oxwm";
+    package = lib.mkPackageOption pkgs "oxwm" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.displayManager.sessionPackages = [ cfg.package ];
+    environment.systemPackages = [ cfg.package ];
+    environment.pathsToLink = [
+      "/share/oxwm"
+      "/share/xsessions"
+    ];
+  };
+}
@@ -11,18 +11,18 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "72c89e91f6636aa53930288fe02466e5e09a50a3c8b6ed5ad2f69b35ec9bacc5",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.tar.gz",
-      "build_number": "252.27397.114"
+      "version": "2025.2.5",
+      "sha256": "91474a3c35a9b3d50f43f0549098317b65aa881f2f80c3345f8dee7587d31f9e",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5.tar.gz",
+      "build_number": "252.28238.22"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "37d0af4ec30b94c71d3507fe35b3b0bdd389903db7e2f1a8ed73353b22718476",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4.tar.gz",
-      "build_number": "252.26830.46"
+      "version": "2025.3",
+      "sha256": "010ad3a676cfe984e7498d1eb4f84686d7a110acbde4f9d288f53967255340e6",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.tar.gz",
+      "build_number": "253.28294.259"
    },
    "dataspell": {
      "update-channel": "DataSpell RELEASE",
@@ -35,34 +35,34 @@
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "8fcf16255ff0bdc2b25132abd6c7a30d577c73bf6106c17a96320b6a1abac4b2",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4.tar.gz",
-      "build_number": "252.27397.101"
+      "version": "2025.2.5",
+      "sha256": "5a84a4dbc5fc1aa03fa1bf142e1eae51e265f6d17ec38c50932b83e629a4366c",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5.tar.gz",
+      "build_number": "252.28238.6"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "fb42978d55271e6fa3165b1d010b3e0bacb8cd5c4f4073712332c62f32d2ebab",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.4.tar.gz",
-      "build_number": "252.27397.100"
+      "version": "2025.2.5",
+      "sha256": "7b748b7f5af267e8bd4d90d44bbeea8cb58b262115d884d2cd567af8d9d753c1",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.5.tar.gz",
+      "build_number": "252.28238.32"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "3c152de654fa948e12e5fba4c04ed0200e472556a8081ddc2d4c22e5831d6020",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4.tar.gz",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "995c334cc3e143f13467abafef07a1ccf7d06275512bb6f4c91123948786ab7c",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5.tar.gz",
+      "build_number": "252.28238.7"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "4d909f989d7fa0a002f5bc669e002e8ab336ee7091f32756a74549cd8c11f432",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4.tar.gz",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "dc92cd3850ba256d2cb1c9d884f9579f613f6fa747f628361458d21f66687393",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5.tar.gz",
+      "build_number": "252.28238.7"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@@ -75,59 +75,59 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "ad2413006344762fb46dc47246e983053b08f763df5c0a2ba0f70ede79a76c3d",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4.tar.gz",
-      "build_number": "252.27397.112",
+      "version": "2025.2.5",
+      "sha256": "4f102bb85add2527e46695f3b866c0e315423e19bc45e0adb0de0fe577a1efe6",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5.tar.gz",
+      "build_number": "252.28238.9",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "5290837893379aeff204d006dd0eeff030df9fb5d9328d619b6c90ddf3f0292e",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4.tar.gz",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "7f49a014f53f0f6f7c46f6710b131f390302287f4046b606331d88081cdb551f",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5.tar.gz",
+      "build_number": "252.28238.29"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "f1613a171ab07ba0e7ccd13cb537af4da8920c89cf4a13c64a3f7ae72e803701",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4.tar.gz",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "b1e47419e5844c38e7a7a9be9e5260c75cea6aa8423f2584dc1727f792d5feb4",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5.tar.gz",
+      "build_number": "252.28238.29"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2025.3",
-      "sha256": "bf7be76634ec70dc33008505a08dcc024d4d7ec2bf0e4ace8a71f219d2f40706",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.tar.gz",
-      "build_number": "253.28294.88"
+      "version": "2025.3.0.3",
+      "sha256": "f09d5e060df110316e8abdedc397e6475e5d46d3f99b422d06de69f6e7025dbc",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3.tar.gz",
+      "build_number": "253.28294.237"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "9249ee0e99e24b3898065c5328f56814fb1a8b53afc192e81e7b70e0982eb116",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4.tar.gz",
-      "build_number": "252.27397.109"
+      "version": "2025.2.5",
+      "sha256": "9d42262fa938e072a83828bd643c6d702b07e4a45c095315500a2a60d7bb805c",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5.tar.gz",
+      "build_number": "252.28238.3"
    },
    "rust-rover": {
      "update-channel": "RustRover RELEASE",
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.2.4.1",
-      "sha256": "a51a62af4801f7f4caf8586dde0354d06f6bc351660b75feff554e756874cb37",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.1.tar.gz",
-      "build_number": "252.27397.133"
+      "version": "2025.2.5",
+      "sha256": "01ec30397ec61ac6dcb66cb037ea69b2be8a7e079020e50513f2e1e102ccfc84",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5.tar.gz",
+      "build_number": "252.28238.28"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "218d0cb6acd1f63c9b2877738af808279796d3d7e13318b54b021c8526d49b86",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4.tar.gz",
-      "build_number": "252.27397.92"
+      "version": "2025.2.5",
+      "sha256": "535167a94350f355e8d4b63624df25c9eca58e5f570df596c7ca8ab630f3c485",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5.tar.gz",
+      "build_number": "252.28238.10"
    },
    "writerside": {
      "update-channel": "Writerside EAP",
@@ -150,18 +150,18 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "b89010db5272eb6490a0084bd3247c9de657ffd0d12a827147f2c77a406f85b5",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.114"
+      "version": "2025.2.5",
+      "sha256": "bff9d778fdfa41dc69019f05b01a9f242caa4406432f63b9d599799790f62655",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.22"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "7df40778500a599d565ba985d1583f3334903fbb731f53add526b19557208d97",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.26830.46"
+      "version": "2025.3",
+      "sha256": "52a2e70f8903ee70ceb7fd45216f5d3ac35718ba066b30cb084c6bcacf9a5098",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3-aarch64.tar.gz",
+      "build_number": "253.28294.259"
    },
    "dataspell": {
      "update-channel": "DataSpell RELEASE",
@@ -174,34 +174,34 @@
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "feecd98be28ce72ebdbc0d7d31d2c0bbc1fa968dc5f0fc093804398839ee4826",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.101"
+      "version": "2025.2.5",
+      "sha256": "62cb3723786e66aec656561cc37f31bf232346be303184e3e73018e85b252430",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.6"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "09e5790b20c5ca952af8c86a6094e83aa250d9eb751d144800ba83701d3512a8",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.100"
+      "version": "2025.2.5",
+      "sha256": "c9bdfe1a106c470ee335d779ab59f61898098d4769dac8c2975113dba6d8dcf5",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.32"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "7d7a7d54eb55b13206ead9c3ab115b05998a0a510c13ebf0b33541270112523c",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "4c57a783f31ee6f2c82d8c43bb5d0334a9afbc8bfb4542e732048c41f61e63a0",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.7"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "f5687e1d0dc416d6f0fb89495d2b4ad4639d4896497db245272d1fe697b1037b",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "6203b9dbc2461abc59604a7fb319d8e06948b2886489ae03499e98f4c1a0a57c",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.7"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@@ -214,59 +214,59 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "60638fee7ed81f75bae931b96d540aa80e8753709f138b60a766a6e29771a3da",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.112",
+      "version": "2025.2.5",
+      "sha256": "9dbf2ef4f69039f82ed1c4f279a22d5e1cb88051bcf5670e7c4d5bf0263295e9",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.9",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "31613bce32e229fc85b991d060e521df13977c6dcf2325df0a0de924c199cd78",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "67b61a3e788b043d93b3cc3e0dd3cea350e6d170402fd94adaf792cfc57e5462",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.29"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "91569e7ba9988af1aa4d9973f52dfa8af8a94f32a53faa8457c7ba17d25f43b3",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "7037672c6913f643ec4979ca5f16791588e001ffd39f830d874587f79e358be2",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.29"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "version": "2025.3",
-      "sha256": "bce1eed1a6fac3cc0850fc2b38ef557e1c51872c4b619a86ce36d002f6cbcbcb",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3-aarch64.tar.gz",
-      "build_number": "253.28294.88"
+      "version": "2025.3.0.3",
+      "sha256": "eb3727a2c4159e185b839b0ee0c2ee7383d4bc5a8ef3c1f41dbd59ae7cb705d6",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3-aarch64.tar.gz",
+      "build_number": "253.28294.237"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "4071efa011638cf96f50962b4a7cdf1a28bbdc58af0ebc4c96ddfcc44de48621",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.109"
+      "version": "2025.2.5",
+      "sha256": "1dd8720dbb32a9ae6ed9856834baf5242aa8296ed179fee3e5b7be432f993155",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.3"
    },
    "rust-rover": {
      "update-channel": "RustRover RELEASE",
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.2.4.1",
-      "sha256": "83d868b92b79907dc42d9e4aacc2a2aae3f9838d392c5a7593487bf4cbb8c641",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.1-aarch64.tar.gz",
-      "build_number": "252.27397.133"
+      "version": "2025.2.5",
+      "sha256": "8e424e01a38faebbfd7fa36cdae51e233551f921a666e36a0a0a6a04e686fa0a",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.28"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.4",
-      "sha256": "1a424cb2a6c82b4fd23e087264a91dfce3a8e78d49c8988f461deafa1aa73d37",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4-aarch64.tar.gz",
-      "build_number": "252.27397.92"
+      "version": "2025.2.5",
+      "sha256": "d4a474c7434878906ed9d3c92572ac61c6fe8eb7dc48653677e2ead1785f4551",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5-aarch64.tar.gz",
+      "build_number": "252.28238.10"
    },
    "writerside": {
      "update-channel": "Writerside EAP",
@@ -289,18 +289,18 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "04383caba9ba670841dd336e546f2027b28286d23ea30298e66f422fbc081272",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.dmg",
-      "build_number": "252.27397.114"
+      "version": "2025.2.5",
+      "sha256": "234b93f26fbb411393dbfd7d1084ff8e8d35b745778d4b9ed1ecba670dafe0fb",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5.dmg",
+      "build_number": "252.28238.22"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "9267cd82c2589f6f2f52f71960a8ba201bd9f02b8c10dede99323b845360de7b",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4.dmg",
-      "build_number": "252.26830.46"
+      "version": "2025.3",
+      "sha256": "4a92e083ddc6edb7ff1639705d6bd3cf8d47d960659a9aa71e19b95fafad8d07",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.dmg",
+      "build_number": "253.28294.259"
    },
    "dataspell": {
      "update-channel": "DataSpell RELEASE",
@@ -313,34 +313,34 @@
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "1d308fc4f4a1649cd51834babe17028ff763347fd461f43d2f9fffeb0ac6d47d",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4.dmg",
-      "build_number": "252.27397.101"
+      "version": "2025.2.5",
+      "sha256": "a0a4314c5f08331a82420580bf3e26df19b52573cda3ecac354d8ac49caf191d",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5.dmg",
+      "build_number": "252.28238.6"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "0a54191caca25c4ef4f82a2fd44bbd90b44a59054034aa586e5c53d6fe7257b6",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.4.dmg",
-      "build_number": "252.27397.100"
+      "version": "2025.2.5",
+      "sha256": "b900b868b748b78c01c5da949e8bcc0df277caa2e3efcc50898641aadaf485f2",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.5.dmg",
+      "build_number": "252.28238.32"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "0a064d890b8152cb2d34a2b712e5850eabd15aa7fdeaaa64c047d32a1f0a07d4",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4.dmg",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "ff48a1e60869342a91db867fa482a49d4cdf38476496911c109f34a7e8d6523d",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5.dmg",
+      "build_number": "252.28238.7"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "045f0d832c9d9d3360dfaf82aece11c125b6ba1c879c86bc19568f3ee77e24e6",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4.dmg",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "c0d6731d60bdcdaaea5c0474c296e39cc336f424da872c6ed022e8f139d779ee",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5.dmg",
+      "build_number": "252.28238.7"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@@ -353,59 +353,59 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "ad55cc42a605da0495cfb965e4d13e0de6ab29f04b50d97457dab724628c96bb",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4.dmg",
-      "build_number": "252.27397.112",
+      "version": "2025.2.5",
+      "sha256": "2a765be05bd2176899297ba0599735c2a13d1065e9d65895a6ead7ed850f0254",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5.dmg",
+      "build_number": "252.28238.9",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "2542b457478d14062aa14217f695b7ac078b447e3d1628eb7c1963e1223aa4e4",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4.dmg",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "08ba97a278031ff1942ddefb18d8acf7582f0bb4a28ccdf5d65721bfb80ca456",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5.dmg",
+      "build_number": "252.28238.29"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "26a7bbaf2fb5d101bfa68ba085913a598c8898594f265044f56fd2c9ac051c06",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4.dmg",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "00eccdeb39bd8eeaed1b98ad99f542fbc3851389f9e7d19355d05dfd979eb669",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5.dmg",
+      "build_number": "252.28238.29"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2025.3",
-      "sha256": "add7e6e67b9f2588979782d86a7ff680a263ef41cd13664ed703975a6498976e",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.dmg",
-      "build_number": "253.28294.88"
+      "version": "2025.3.0.3",
+      "sha256": "e8261d30d549f1809228c84e4b31d2cae337cb7bc35cd6da4e0f801e4d2f52db",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3.dmg",
+      "build_number": "253.28294.237"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "2f418dbf559fcab77f4df7c602b8c6de996e4360bfa69feae7f1f0a9d1ecc1bf",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4.dmg",
-      "build_number": "252.27397.109"
+      "version": "2025.2.5",
+      "sha256": "7dedc215b849194f8814380a4e622e117346fb52fc3f102bfa53332d33c9433b",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5.dmg",
+      "build_number": "252.28238.3"
    },
    "rust-rover": {
      "update-channel": "RustRover RELEASE",
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.2.4.1",
-      "sha256": "ec6faaaf119306c8b102b63492a530d8a1cf62f63c6f082543408c5c94e704bf",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.1.dmg",
-      "build_number": "252.27397.133"
+      "version": "2025.2.5",
+      "sha256": "1f149d98d41b3929e3e920d5465eaa9963312d93f106d8821d0c51721ae2609c",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5.dmg",
+      "build_number": "252.28238.28"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2025.2.4",
-      "sha256": "dadcde8679597d7bb9d11518207b36a0b44a76407b84bbe7ebedba54db7bd8de",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4.dmg",
-      "build_number": "252.27397.92"
+      "version": "2025.2.5",
+      "sha256": "1f3779bf695758e830126a95734360bd640794ec278c250fad9a71969de4ee39",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5.dmg",
+      "build_number": "252.28238.10"
    },
    "writerside": {
      "update-channel": "Writerside EAP",
@@ -428,18 +428,18 @@
    "clion": {
      "update-channel": "CLion RELEASE",
      "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "7bdef6d73e0edfbc5ef02b7e74e5508e5b18a9c21afb5ba82488527d837e2a94",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.114"
+      "version": "2025.2.5",
+      "sha256": "b0496540a133c82c64ac959f1d4542fe331bd63403fd230e23adf4bc957c84af",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.22"
    },
    "datagrip": {
      "update-channel": "DataGrip RELEASE",
      "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "13d41b91c0194078afed78974f5023a793822c46609e6273dfacd831bebecc83",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4-aarch64.dmg",
-      "build_number": "252.26830.46"
+      "version": "2025.3",
+      "sha256": "16a5df01852648a82082fb667bbed6fcb43e15ef9a91e35a0be422dd37d07180",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3-aarch64.dmg",
+      "build_number": "253.28294.259"
    },
    "dataspell": {
      "update-channel": "DataSpell RELEASE",
@@ -452,34 +452,34 @@
    "gateway": {
      "update-channel": "Gateway RELEASE",
      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "22925a4f01d7c0e8a6b1820fb635584aa1ffd1f89652443243e625a379d31854",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.101"
+      "version": "2025.2.5",
+      "sha256": "af0a82a46ecad837ee6c86d97623e58d377eed7d5ee56c7af5765071e0b0c12e",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.6"
    },
    "goland": {
      "update-channel": "GoLand RELEASE",
      "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "d122e1f1109f31373d4a479b99278f569da7cf3b9fea88b1b2077c6d598813bf",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.100"
+      "version": "2025.2.5",
+      "sha256": "91faea3e0aff80e16a27cacaec1c39ef13eac2b3da1b0f0aa1af667be96f4c78",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.32"
    },
    "idea-community": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "c4e1ae63bf8683d12d307d6eca13f9ddb688df932608eb258a1c66ee5d45b6c3",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "52065492d433f0ea9df4debd5f0683154ab4dab5846394cabc8a49903d70e5bc",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.7"
    },
    "idea-ultimate": {
      "update-channel": "IntelliJ IDEA RELEASE",
      "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "2b5504f86c6969ed0564483b6886390cfc1bb1b3ab99e658881d60edf57c481f",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.103"
+      "version": "2025.2.5",
+      "sha256": "6ec8cf520556c75e91a3cae1c54f464dee3609c4d7efef3bb307b129c7d9cb63",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.7"
    },
    "mps": {
      "update-channel": "MPS RELEASE",
@@ -492,59 +492,59 @@
    "phpstorm": {
      "update-channel": "PhpStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "d05c2e3e9106646bdf93731a034dcd82a359c7a91601d6456ed8ea88a75c3546",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.112",
+      "version": "2025.2.5",
+      "sha256": "8320ce229c03277f53a836bc19b796e9241bb00e3e40d4f048290baa27aa9a90",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.9",
      "version-major-minor": "2022.3"
    },
    "pycharm-community": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "0b945c8687bf678baa51315ee4cbbfe3e24736fd029fed2ce527ff1563a1278b",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "040a4ed6bb7563972d844c450f615d0d11385e524fbbfdbfc9fc68d78811e994",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.29"
    },
    "pycharm-professional": {
      "update-channel": "PyCharm RELEASE",
      "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "bd1b97e396ed3e880973266db57ecde02af7f6810fcdb3da3899a88806473527",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.106"
+      "version": "2025.2.5",
+      "sha256": "71da1283259bc59897e5bb43c6c3771a72d026419ed4d79192889ea3885ac0de",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.29"
    },
    "rider": {
      "update-channel": "Rider RELEASE",
      "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2025.3",
-      "sha256": "033f8dad94b9fec826ba9bd87025dfe668ef6d063a5cb49e7d33f7122ec2885e",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3-aarch64.dmg",
-      "build_number": "253.28294.88"
+      "version": "2025.3.0.3",
+      "sha256": "ff03408013ce86ffd437204d635401a4ca673ee15596e3d93cd9c69e63e7e7c3",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.0.3-aarch64.dmg",
+      "build_number": "253.28294.237"
    },
    "ruby-mine": {
      "update-channel": "RubyMine RELEASE",
      "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "6971de2913d969bd1d3edc775cb88f2ad6507c0c0a62177812ab546bd043dea9",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.109"
+      "version": "2025.2.5",
+      "sha256": "8527cb286ea5d9cd612538cb55354dc689b7f7fe5ec0b81a8f1a4a2279e94351",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.3"
    },
    "rust-rover": {
      "update-channel": "RustRover RELEASE",
      "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.2.4.1",
-      "sha256": "0d4fe97c97c4cc66ec2d5a06fccc664557cae181cdf59177c9b24bff29ad5848",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.1-aarch64.dmg",
-      "build_number": "252.27397.133"
+      "version": "2025.2.5",
+      "sha256": "7927f48c24ff1e9b235f3f6bbcd74fb1fad907035146a04c55ef62ccdf90c087",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.28"
    },
    "webstorm": {
      "update-channel": "WebStorm RELEASE",
      "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2025.2.4",
-      "sha256": "9b0cbc4745a6e1ec2e9fdff4b3df5a12897ccd814746d515dfd52ccb2744fc4e",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4-aarch64.dmg",
-      "build_number": "252.27397.92"
+      "version": "2025.2.5",
+      "sha256": "729d519244a4be15add4b0963ebf84fb9c3f3f2f7d1eab3ad925ef79fe359773",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.5-aarch64.dmg",
+      "build_number": "252.28238.10"
    },
    "writerside": {
      "update-channel": "Writerside EAP",
@@ -181,13 +181,13 @@
    "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
  },
  "cloudamqp_cloudamqp": {
-    "hash": "sha256-gYCVZ6CmiUt2X1za6/xjtRbnVRaAIlTt/whhBrP6q6E=",
+    "hash": "sha256-14fYDy0tMjKAnpmawUx2kS7qK6X4+qc1qkxAAz1keX8=",
    "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
    "owner": "cloudamqp",
    "repo": "terraform-provider-cloudamqp",
-    "rev": "v1.39.0",
+    "rev": "v1.40.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-rVrCozbmMR3rHA6oLLha6gdYEaFXD5r04CqY+bSWoZM="
+    "vendorHash": "sha256-LGxG7KEv11ppc6ptOsEY78y+iW0DcQpAhyGcXjhuTR0="
  },
  "cloudflare_cloudflare": {
    "hash": "sha256-+sp9u9Xl5MvAWjy5efA4CgL94yprCcBP8yYEPcVifgQ=",
@@ -218,13 +218,13 @@
    "vendorHash": "sha256-djz3kNV+13Sz9prRPhWaWi50hvYXq3I3cp4neLexeEs="
  },
  "cloudscale-ch_cloudscale": {
-    "hash": "sha256-uqELnAcx72lIIUGEiO7y9lXhiyNgThmCiMtC/EKFpTA=",
+    "hash": "sha256-r+0HrY+5ciNb3+JHV05ez/uPElbD7LcQqlUHWYp865Q=",
    "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale",
    "owner": "cloudscale-ch",
    "repo": "terraform-provider-cloudscale",
-    "rev": "v5.0.0",
+    "rev": "v5.0.1",
    "spdx": "MIT",
-    "vendorHash": "sha256-elNXA2PH6mDolyuLhUsVBDCiL/ydZfi7LAVPjwnbMIw="
+    "vendorHash": "sha256-sF43AWlGz2/lgtjHOl1OyDqF2IXlaqFkXaW8pVpFS/I="
  },
  "constellix_constellix": {
    "deleteVendor": true,
@@ -1309,11 +1309,11 @@
    "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
  },
  "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-ydbfbyxsS8ENWt4fWaSc/Nghy0KZvI5cWRbcWi0Kns8=",
+    "hash": "sha256-BCYwbyaZFA1zVlfDaTdUDiAFH683zfAoXIE4pj1OzOs=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.42",
+    "rev": "v1.82.44",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -1498,12 +1498,12 @@
    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
  },
  "yandex-cloud_yandex": {
-    "hash": "sha256-PJ3ySL05fxj/9pq9tGqvCxrFZtTi6O5DyogS/YWPB9Q=",
+    "hash": "sha256-aa9lnDzlM+bhavGp1QjG9dNNYq8XbHuUOe+O0EO37LA=",
    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
    "owner": "yandex-cloud",
    "repo": "terraform-provider-yandex",
-    "rev": "v0.174.0",
+    "rev": "v0.175.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-D6VDAtu+HqawsL4nXYdNqd12fOOp08BYRqHt50ZthbY="
+    "vendorHash": "sha256-wwZiY8WXGdpOCT+4EcnSQeemDMzKZcMFZQK8SSAUkkA="
  }
 }
@@ -9,10 +9,10 @@
 }:
 let
  pname = "beeper";
-  version = "4.2.269";
+  version = "4.2.330";
  src = fetchurl {
    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-2IASocz5dgO3KXSvm4i8wyFClEF/4oRtOJZAsfg0mJA=";
+    hash = "sha256-7Jf/dKShD7UBiv2CHj+cYaojqlpfshG1D09beX79g4o=";
  };
  appimageContents = appimageTools.extract {
    inherit pname version src;
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
  pname = "bitwarden-desktop";
-  version = "2025.11.2";
+  version = "2025.12.0";

  src = fetchFromGitHub {
    owner = "bitwarden";
    repo = "clients";
    rev = "desktop-v${version}";
-    hash = "sha256-0djpeXHHqA8tVcQsE/yCDZVnoEuYwUpln2Hhj2chGNc=";
+    hash = "sha256-i+hLslZ2i94r04vaOzx9e55AR8aXa9sSK8el+Dcp05A=";
  };

  patches = [
@@ -87,7 +87,7 @@ buildNpmPackage' rec {
    "--ignore-scripts"
  ];
  npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-l5Lcm1ggF7qFqNuSYRoRPf1Gbt/gH3g6dYu30YTXgsI=";
+  npmDepsHash = "sha256-OT9Ll+F4e/yOJVpay/zwfEHcBqRvSFOM2mtlrJ8E6fs=";

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit
@@ -97,7 +97,7 @@ buildNpmPackage' rec {
      cargoRoot
      patches
      ;
-    hash = "sha256-WhiKqN+FCR/c9BuwhQT0EoidGUkP2ueSlsnupUflVlM=";
+    hash = "sha256-rA9zY9TAF6DnsTT3MzU18VeQDm6m25gjZ0rcmnbZb8E=";
  };
  cargoRoot = "apps/desktop/desktop_native";

@@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.85.111";
+  version = "1.85.116";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-qBxlZ4xgjRb2zWrbwd+HKJXWoJxk4OICQtvutoNME00=";
+      hash = "sha256-ZqlIWj3bn0cfpDgQE7d1ipRvVIyvH2R54sXei3DhD3k=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-+Lz9Bv2Llc2twk0QzHmozxhsJzdlTKAakY/j2NaF7a0=";
+      hash = "sha256-mMUtXJO7fAKWl79kLAsrujbwMT3Hc2ys7RV8BU2HSh4=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-39/nuKXnsslcVhy4i/YN4XEor5csMk2Ej1hsygChjXo=";
+      hash = "sha256-RJzyxK5PV/wGXKJzG/f6MXzNwIQaIC2gMFDZLxE1QoA=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-us6FnZZ980SnGW+1fNSajRgAUxhBQA2dcM+iKb8TWaE=";
+      hash = "sha256-acn5t+hE3ZpgAr9fFV/J3hXzyQcVlyDVRxMU7exvunE=";
    };
  };

@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-binstall";
-  version = "1.16.3";
+  version = "1.16.4";

  src = fetchFromGitHub {
    owner = "cargo-bins";
    repo = "cargo-binstall";
    tag = "v${version}";
-    hash = "sha256-FZWBpt8QtHgPLrgck/2Yhq6hYwwP7ZLjCyA01+Jqk8M=";
+    hash = "sha256-HF6SMGhtacSVt+YbrH7r0RIpGye6tWTbbSFuc4qNhCY=";
  };

-  cargoHash = "sha256-ntW5oenx80BL51qWgqkXuLebJsBCRsyl/sevh0Hi/K0=";
+  cargoHash = "sha256-P8nA0PRf+kYxTZy5ZHkLUTf/E7SMQ3T6t/nWLNnRNLo=";

  nativeBuildInputs = [
    pkg-config
@@ -1,74 +1,20 @@
+From f65f27f0051f5dfa7a57d3ac0bb276828261ed73 Mon Sep 17 00:00:00 2001
+From: Michael Daniels <mdaniels5757@gmail.com>
+Date: Thu, 27 Nov 2025 22:10:13 -0500
+Subject: [PATCH] bump nightfall from 0.3.12-rc4 to 878f07edd5d2c
+
+---
+ Cargo.lock          | 27 +++++++++++++--------------
+ dim-core/Cargo.toml |  2 +-
+ dim-web/Cargo.toml  |  2 +-
+ dim/Cargo.toml      |  2 +-
+ 4 files changed, 16 insertions(+), 17 deletions(-)
+
 diff --git a/Cargo.lock b/Cargo.lock
-index adb78aa..5634132 100644
+index 51898150..6cb1d29f 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1,6 +1,6 @@
- # This file is automatically @generated by Cargo.
- # It is not intended for manual editing.
-version = 3
-+version = 4
- 
- [[package]]
- name = "addr2line"
-@@ -58,7 +58,7 @@ version = "0.7.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
- dependencies = [
- "getrandom",
-+ "getrandom 0.2.11",
-  "once_cell",
-  "version_check",
- ]
-@@ -979,7 +979,7 @@ dependencies = [
-  "tracing-appender",
-  "tracing-subscriber",
-  "url",
- "uuid 1.5.0",
-+ "uuid 1.16.0",
-  "xmlwriter",
-  "xtra",
-  "zip",
-@@ -1079,7 +1079,7 @@ dependencies = [
-  "tracing",
-  "tracing-appender",
-  "tracing-subscriber",
- "uuid 1.5.0",
-+ "uuid 1.16.0",
- ]
- 
- [[package]]
-@@ -1411,6 +1411,18 @@ dependencies = [
-  "wasi 0.11.0+wasi-snapshot-preview1",
- ]
- 
-+[[package]]
-+name = "getrandom"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
-+dependencies = [
-+ "cfg-if",
-+ "libc",
-+ "r-efi",
-+ "wasi 0.14.2+wasi-0.2.4",
-+]
-+
- [[package]]
- name = "ghash"
- version = "0.4.4"
-@@ -1874,9 +1886,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
- 
- [[package]]
- name = "libc"
-version = "0.2.150"
-+version = "0.2.172"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
- 
- [[package]]
- name = "libsqlite3-sys"
-@@ -2049,14 +2061,14 @@ dependencies = [
+@@ -2268,14 +2268,14 @@ dependencies = [
 [[package]]
 name = "nightfall"
 version = "0.3.12-rc4"
@@ -85,16 +31,16 @@ index adb78aa..5634132 100644
  "ntapi",
  "once_cell",
  "psutil",
-@@ -2067,7 +2079,7 @@ dependencies = [
+@@ -2286,7 +2286,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
 - "uuid 0.8.2",
-+ "uuid 1.16.0",
+ "uuid 1.18.1",
  "winapi",
  "xtra",
  "xtra_proc",
-@@ -2075,27 +2087,26 @@ dependencies = [
+@@ -2294,36 +2294,35 @@ dependencies = [
 
 [[package]]
 name = "nix"
@@ -108,27 +54,38 @@ index adb78aa..5634132 100644
  "cc",
  "cfg-if",
  "libc",
-+ "memoffset 0.6.5",
+ "memoffset",
 ]
 
 [[package]]
 name = "nix"
 -version = "0.23.2"
-+version = "0.27.1"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
-+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags 1.3.2",
+  "bitflags 1.3.2",
 - "cc",
-+ "bitflags 2.4.1",
  "cfg-if",
  "libc",
- "memoffset 0.6.5",
+- "memoffset",
 ]
 
 [[package]]
-@@ -2140,9 +2151,9 @@ dependencies = [
+ name = "nix"
+-version = "0.24.3"
+version = "0.27.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+ dependencies = [
+- "bitflags 1.3.2",
+ "bitflags 2.9.4",
+  "cfg-if",
+  "libc",
+ ]
+@@ -2370,9 +2369,9 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
@@ -140,104 +97,11 @@ index adb78aa..5634132 100644
 dependencies = [
  "winapi",
 ]
-@@ -2481,6 +2492,12 @@ dependencies = [
-  "proc-macro2",
- ]
- 
-+[[package]]
-+name = "r-efi"
-+version = "5.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
-+
- [[package]]
- name = "rand"
- version = "0.8.5"
-@@ -2508,7 +2525,7 @@ version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
- dependencies = [
- "getrandom",
-+ "getrandom 0.2.11",
- ]
- 
- [[package]]
-@@ -2689,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
- dependencies = [
-  "cc",
- "getrandom",
-+ "getrandom 0.2.11",
-  "libc",
-  "spin 0.9.8",
-  "untrusted 0.9.0",
-@@ -3505,7 +3522,7 @@ dependencies = [
-  "tower-layer",
-  "tower-service",
-  "tracing",
- "uuid 1.5.0",
-+ "uuid 1.16.0",
- ]
- 
- [[package]]
-@@ -3742,16 +3759,16 @@ version = "0.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
- dependencies = [
- "getrandom",
-+ "getrandom 0.2.11",
- ]
- 
- [[package]]
- name = "uuid"
-version = "1.5.0"
-+version = "1.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
-+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
- dependencies = [
- "getrandom",
-+ "getrandom 0.3.3",
- ]
- 
- [[package]]
-@@ -3803,6 +3820,15 @@ version = "0.11.0+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
- 
-+[[package]]
-+name = "wasi"
-+version = "0.14.2+wasi-0.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-+dependencies = [
-+ "wit-bindgen-rt",
-+]
-+
- [[package]]
- name = "wasm-bindgen"
- version = "0.2.88"
-@@ -4092,6 +4118,15 @@ dependencies = [
-  "windows-sys 0.48.0",
- ]
- 
-+[[package]]
-+name = "wit-bindgen-rt"
-+version = "0.39.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-+dependencies = [
-+ "bitflags 2.4.1",
-+]
-+
- [[package]]
- name = "xmlwriter"
- version = "0.1.0"
 diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml
-index b311b7c..ffc5d85 100644
+index cf30e509..fd460ff2 100644
 --- a/dim-core/Cargo.toml
 +++ b/dim-core/Cargo.toml
-@@ -11,7 +11,7 @@ vaapi = ["nightfall/vaapi"]
+@@ -14,7 +14,7 @@ embed_ui = []
 
 [dependencies]
 # git dependencies
@@ -246,20 +110,11 @@ index b311b7c..ffc5d85 100644
     "cuda",
     "ssa_transmux",
 ] }
-@@ -72,7 +72,7 @@ tracing-subscriber = { version = "^0.3.10", features = [
-     "json",
- ] }
- url = "2.2.2"
-uuid = { version = "1.2.2", features = ["v4"] }
-+uuid = { version = "1.6.1", features = ["v4"] }
- xmlwriter = "0.1.0"
- xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
- 
 diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml
-index 2da5764..4c7574c 100644
+index 1dbb23ce..f3d84933 100644
 --- a/dim-web/Cargo.toml
 +++ b/dim-web/Cargo.toml
-@@ -14,7 +14,7 @@ dim-utils = { path = "../dim-utils" }
+@@ -13,7 +13,7 @@ dim-utils = { path = "../dim-utils" }
 dim-events = { path = "../dim-events" }
 dim-core = { path = "../dim-core" }
 
@@ -269,7 +124,7 @@ index 2da5764..4c7574c 100644
     "ssa_transmux",
 ] }
 diff --git a/dim/Cargo.toml b/dim/Cargo.toml
-index b7c8106..38518ba 100644
+index d0fa7917..ab719bce 100644
 --- a/dim/Cargo.toml
 +++ b/dim/Cargo.toml
@@ -15,7 +15,7 @@ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
@@ -281,3 +136,6 @@ index b7c8106..38518ba 100644
     "cuda",
     "ssa_transmux",
 ] }
+-- 
+2.50.1
+
@@ -2591,9 +2591,9 @@
      }
    },
    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
      "license": "MIT",
      "dependencies": {
        "argparse": "^1.0.7",
@@ -6495,16 +6495,16 @@
      }
    },
    "node_modules/compression": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
-      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
      "license": "MIT",
      "dependencies": {
        "bytes": "3.1.2",
        "compressible": "~2.0.18",
        "debug": "2.6.9",
        "negotiator": "~0.6.4",
-        "on-headers": "~1.0.2",
+        "on-headers": "~1.1.0",
        "safe-buffer": "5.2.1",
        "vary": "~1.1.2"
      },
@@ -9021,14 +9021,15 @@
      }
    },
    "node_modules/form-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
-      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
      "license": "MIT",
      "dependencies": {
        "asynckit": "^0.4.0",
        "combined-stream": "^1.0.8",
        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
        "mime-types": "^2.1.35"
      },
      "engines": {
@@ -11642,9 +11643,9 @@
      "license": "MIT"
    },
    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
      "license": "MIT",
      "dependencies": {
        "argparse": "^2.0.1"
@@ -12594,9 +12595,9 @@
      "optional": true
    },
    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.2.tgz",
+      "integrity": "sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==",
      "license": "(BSD-3-Clause OR GPL-2.0)",
      "engines": {
        "node": ">= 6.13.0"
@@ -12838,9 +12839,9 @@
      }
    },
    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
@@ -17062,9 +17063,9 @@
      }
    },
    "node_modules/sucrase/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
      "license": "ISC",
      "dependencies": {
        "foreground-child": "^3.1.0",
@@ -17286,9 +17287,9 @@
      }
    },
    "node_modules/svgo/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
      "license": "MIT",
      "dependencies": {
        "argparse": "^1.0.7",
@@ -16,13 +16,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "dim";
-  version = "0-unstable-2023-12-29";
+  version = "0-unstable-2025-09-21";

  src = fetchFromGitHub {
    owner = "Dusk-Labs";
    repo = "dim";
-    rev = "3ccb4ab05fc1d7dbd4ebbba9ff2de0ecc9139b27";
-    hash = "sha256-1mgbrDnIkIdWy78uj4EjjgwBQxw/rIS1LCFNscXXPbk=";
+    rev = "d9a4bd0b7e985398ee4f494bf6da8884ab84b8ef";
+    hash = "sha256-WktDQF2YqF/3TFnpUvz7lge8+w/W56aFjUG0v58ash4=";
  };

  frontend = buildNpmPackage {
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      ln -s ${./package-lock.json} package-lock.json
    '';

-    npmDepsHash = "sha256-yYTRoxKnTF9y3RA4fuDlVYxv9d37Fc905TYVc/gPIRw=";
+    npmDepsHash = "sha256-fVcx5K4r5P/pokmW31IobHSYsshB7PJOHsk6BP5dA1Q=";

    installPhase = ''
      runHook preInstall
@@ -46,19 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
  };

  cargoPatches = [
-    # Upstream uses a 'ffpath' function to look for config directory and
-    # (ffmpeg) binaries in the same directory as the binary. Patch it to use
-    # the working dir and PATH instead.
-    ./relative-paths.diff
-
    # Bump the first‐party nightfall dependency to the latest Git
    # revision for FFmpeg >= 6 support.
    ./bump-nightfall.patch

-    # Bump the time dependency to fix build failure with rust 1.80+
-    # https://github.com/Dusk-Labs/dim/pull/614
-    ./bump-time.patch
-
    # Upstream has some unused imports that prevent things from compiling...
    # Remove for next release.
    (fetchpatch {
@@ -68,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    })
  ];

-  cargoHash = "sha256-T0v7pajg3UfRnVOx3ie6rOf+vJSW2l7yoCsJrtxIwcg=";
+  cargoHash = "sha256-NY7iw4Xq8jEBQIeJ8rqiMmIs3Z6YwfePGulpuIP5DJ0=";

  postPatch = ''
    substituteInPlace dim-core/src/lib.rs \
@@ -83,6 +74,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ln -ns $frontend ui/build
  '';

+  preBuild = ''
+    export CARGO_TARGET_DIR=$(pwd)/target
+  '';
+
  nativeBuildInputs = [
    makeWrapper
    pkg-config
@@ -1,7 +1,7 @@
-diff --git a/dim-core/src/routes/settings.rs b/dim-core/src/routes/settings.rs
+diff --git a/dim-web/src/routes/settings.rs b/dim-web/src/routes/settings.rs
 index f577eaf6..67da9448 100644
--- a/dim-core/src/routes/settings.rs
-+++ b/dim-core/src/routes/settings.rs
+--- a/dim-web/src/routes/settings.rs
+++ b/dim-web/src/routes/settings.rs
@@ -1,5 +1,3 @@
 -use crate::utils::ffpath;
 -
@@ -8,17 +8,17 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "drupal";
-  version = "11.2.7";
+  version = "11.2.10";

  src = fetchFromGitLab {
    domain = "git.drupalcode.org";
    owner = "project";
    repo = "drupal";
    tag = finalAttrs.version;
-    hash = "sha256-mLpdLMacj3ueY8e8YtBA+0D2HOIE2A25Gt3+1E5NqoA=";
+    hash = "sha256-qGJmlVC+4fzLjySD95Kq4rDTzohwbmb9mN7YJo/eoK8=";
  };

-  vendorHash = "sha256-s9pUsCJF8PJmiZRqLNEDulGu5fElaN8HVYk+3VtP6CY=";
+  vendorHash = "sha256-UluxvOoks8U11HVM5ufm7ESMWwZE1oaaLfOy4czoTWY=";
  composerNoPlugins = false;

  passthru = {
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "gemini-cli-bin";
-  version = "0.19.4";
+  version = "0.20.2";

  src = fetchurl {
    url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
-    hash = "sha256-qOP+zt7iwBnNUkvCPmHO4DoYs8kJh1hvGeu0IbEA/E0=";
+    hash = "sha256-0fGchmQUxZ+DTtBQi3UaCZnP1q5dTOei6bWPx4lXV7o=";
  };

  dontUnpack = true;
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "ghstack";
-  version = "0.12.0";
+  version = "0.13.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "ezyang";
    repo = "ghstack";
    tag = version;
-    hash = "sha256-pLKwDezkwGrqYgP4WnIl5nAam6bMNO6BK+xbxhp7Aq8=";
+    hash = "sha256-cRdwX5BVdpGjLPR0tpFYo62HYu/lmUzJE+vyxI9A4O8=";
  };

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

 python3Packages.buildPythonApplication rec {
  pname = "github-backup";
-  version = "0.55.0";
+  version = "0.57.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "josegonzalez";
    repo = "python-github-backup";
    tag = version;
-    hash = "sha256-28u21SO6G1lrMq6Ihl+tRSit5Jh9w2mwjK+3r3YfH5M=";
+    hash = "sha256-ISJBa+fyj+ko8dW4x1yIo7tlWT8Jlylbo4lzq23whOg=";
  };

  build-system = with python3Packages; [
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gpxsee";
-  version = "15.5";
+  version = "15.6";

  src = fetchFromGitHub {
    owner = "tumic0";
    repo = "GPXSee";
    tag = finalAttrs.version;
-    hash = "sha256-6mi0Dq9XCbg/AC+TNB+7kEuwzf9rnjzmfSKQ2I/3Qx4=";
+    hash = "sha256-3g9NIk6l6ilvrJAg3OvQrlVAuX+hjm1Snw6Qs/fpy00=";
  };

  buildInputs = [
@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  cmake,
  pkg-config,
@@ -12,7 +12,7 @@
  tomlplusplus,
  nix-update-script,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprcursor";
  version = "0.1.13";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  nix-update-script,
  cmake,
@@ -17,7 +17,7 @@
  pixman,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprgraphics";
  version = "0.4.0";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  pkg-config,
  cmake,
@@ -16,7 +16,7 @@
  nix-update-script,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hypridle";
  version = "0.1.7";

@@ -1,11 +1,11 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  meson,
  ninja,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprland-protocols";
  version = "0.7.0";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  cmake,
  ninja,
@@ -8,7 +8,7 @@
  pkg-config,
  hyprlang,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprland-qt-support";
  version = "0.1.0";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  fetchpatch,
  cmake,
@@ -13,7 +13,7 @@
 let
  inherit (lib.strings) makeBinPath;
 in
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprland-qtutils";
  version = "0.1.5";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  stdenvAdapters,
  fetchFromGitHub,
  pkg-config,
@@ -42,7 +42,7 @@
  xwayland,
  debug ? false,
  enableXWayland ? true,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd,
  wrapRuntimeDeps ? true,
  # deprecated flags
  nvidiaPatches ? false,
@@ -75,11 +75,11 @@ let
  # which would be controlled by the `debug` flag
  # Condition on darwin to avoid breaking eval for darwin in CI,
  # even though darwin is not supported anyway.
-  adapters = lib.optionals (!stdenv.targetPlatform.isDarwin) [
+  adapters = lib.optionals (!gcc15Stdenv.targetPlatform.isDarwin) [
    stdenvAdapters.useMoldLinker
  ];

-  customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters;
+  customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters;
 in
 assert assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
 assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
@@ -1,13 +1,13 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  cmake,
  pkg-config,
  hyprutils,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprlang";
  version = "0.6.7";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  cmake,
  pkg-config,
@@ -26,7 +26,7 @@
  nix-update-script,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprlock";
  version = "0.9.2";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  cmake,
  cairo,
@@ -31,7 +31,7 @@
  hyprgraphics,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprpaper";
  version = "0.7.6";

@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.bsd3;
    teams = [ lib.teams.hyprland ];
    inherit (wayland.meta) platforms;
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = gcc15Stdenv.hostPlatform.isDarwin;
    mainProgram = "hyprpaper";
  };
 })
@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  nix-update-script,
  pkg-config,
@@ -18,7 +18,7 @@
  libXdmcp,
  debug ? false,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprpicker" + lib.optionalString debug "-debug";
  version = "0.4.5";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  cmake,
  pkg-config,
  fetchFromGitHub,
@@ -10,7 +10,7 @@
  polkit,
  qt6,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprpolkitagent";
  version = "0.1.3";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  cmake,
  fetchFromGitHub,
  pkg-config,
@@ -13,7 +13,7 @@
  wayland-scanner,
  nix-update-script,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprsunset";
  version = "0.3.3";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  fetchpatch,
  cmake,
@@ -13,7 +13,7 @@
 let
  inherit (lib.strings) makeBinPath;
 in
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprsysteminfo";
  version = "0.1.3";

@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  cmake,
  pkg-config,
  pixman,
@@ -8,7 +8,7 @@
  nix-update-script,
 }:

-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprutils";
  version = "0.11.0";

@@ -1,13 +1,13 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  cmake,
  pkg-config,
  pugixml,
  nix-update-script,
 }:
-stdenv.mkDerivation (finalAttrs: {
+gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprwayland-scanner";
  version = "0.4.5";

@@ -1,35 +1,94 @@
 {
-  fetchurl,
  lib,
  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  gradle,
+  jdk17,
  jre,
  makeWrapper,
  coreutils,
+  gitMinimal,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "jmeter";
  version = "5.6.3";
-  src = fetchurl {
-    url = "mirror://apache/jmeter/binaries/apache-${pname}-${version}.tgz";
-    sha256 = "sha256-9o78F/4GD2mMSKar4lmakzknSGvaKSTb4Ux0iVMY3d4=";
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "jmeter";
+    rev = "rel/v${finalAttrs.version}";
+    hash = "sha256-mYjQs32SDoUB6SLXvEVOyxU68b8QRv39XxE3fvn4oNM=";
  };

-  nativeBuildInputs = [
-    makeWrapper
-    jre
+  patches = [
+    # Fix for read-only installations (e.g., Nix store)
+    # Ensures directories are writable when generating reports from read-only sources
+    # Upstream: https://github.com/apache/jmeter/pull/6358
+    (fetchpatch {
+      url = "https://github.com/apache/jmeter/commit/f4f1ef144ab5678bddb010ed1f05c67a76f547a5.patch";
+      hash = "sha256-ICG2z+nyJT0WDiYmU/Dx3VtkG83ymU7HwYjEuJMjaiY=";
+      excludes = [ "xdocs/changes.xml" ];
+    })
  ];

+  nativeBuildInputs = [
+    gradle
+    # JMeter's Gradle build-logic uses toolchains that explicitly request Java 17
+    jdk17
+    makeWrapper
+    gitMinimal
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # Required for mitm-cache on Darwin
+  __darwinAllowLocalNetworking = true;
+
+  gradleFlags = [
+    # Point Gradle toolchain to the JDK we provide
+    "-Dorg.gradle.java.home=${jdk17}"
+    # Skip javadoc which tries to fetch external URLs
+    "-x"
+    "javadocAggregate"
+    # Skip checksum verification for dependencies
+    # we handle those ourself in `./deps.json`
+    "-PchecksumIgnore"
+  ];
+
+  # Build the distribution
+  gradleBuildTask = ":src:dist:assemble";
+
  installPhase = ''
-    mkdir $out
+    runHook preInstall

-    rm bin/*.bat bin/*.cmd
+    # Extract the built distribution
+    # Note: Built distributions have -SNAPSHOT suffix
+    mkdir -p $out
+    tar -xzf src/dist/build/distributions/apache-jmeter-${finalAttrs.version}-SNAPSHOT.tgz \
+      --strip-components=1 -C $out

-    cp -R * $out/
+    # Remove Windows-specific files
+    rm -f $out/bin/*.bat $out/bin/*.cmd

-    substituteInPlace $out/bin/create-rmi-keystore.sh --replace \
-      "keytool -genkey" \
-      "${jre}/lib/openjdk/jre/bin/keytool -genkey"
+    # Fix create-rmi-keystore.sh to use the correct keytool path
+    substituteInPlace $out/bin/create-rmi-keystore.sh \
+      --replace-fail "keytool -genkey" "${jre}/lib/openjdk/jre/bin/keytool -genkey"
+
+    # Fix mirror-server.sh classpath: discover actual jar names at build time
+    # The script has hardcoded jar versions that don't match the built jars
+    substituteInPlace $out/bin/mirror-server.sh \
+      --replace-fail "oro-2.0.8.jar" "$(basename $out/lib/oro-*.jar)" \
+      --replace-fail "slf4j-api-1.7.25.jar" "$(basename $out/lib/slf4j-api-*.jar)" \
+      --replace-fail "jcl-over-slf4j-1.7.25.jar" "$(basename $out/lib/jcl-over-slf4j-*.jar)" \
+      --replace-fail "log4j-slf4j-impl-2.11.0.jar" "$(basename $out/lib/log4j-slf4j-impl-*.jar)" \
+      --replace-fail "log4j-api-2.11.1.jar" "$(basename $out/lib/log4j-api-*.jar)" \
+      --replace-fail "log4j-core-2.11.1.jar" "$(basename $out/lib/log4j-core-*.jar)" \
+      --replace-fail "log4j-1.2-api-2.11.1.jar" "$(basename $out/lib/log4j-1.2-api-*.jar)"

    # Prefix some scripts with jmeter to avoid clobbering the namespace
    for i in heapdump.sh mirror-server mirror-server.sh shutdown.sh stoptest.sh create-rmi-keystore.sh; do
@@ -40,18 +99,57 @@ stdenv.mkDerivation rec {

    wrapProgram $out/bin/jmeter --set JAVA_HOME "${jre}"
    wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}"
-  '';

-  doInstallCheck = false; # NoClassDefFoundError: org/apache/logging/log4j/Level for tests
+    runHook postInstall
+  '';

  nativeCheckInputs = [ coreutils ];

  installCheckPhase = ''
-    $out/bin/jmeter --version 2>&1 | grep -q "${version}"
+    runHook preInstallCheck
+
+    set -x
+
+    # Test basic functionality
+    $out/bin/jmeter --version 2>&1 | grep -q "${finalAttrs.version}"
+
+    # Test helper scripts
    $out/bin/jmeter-heapdump.sh > /dev/null
    $out/bin/jmeter-shutdown.sh > /dev/null
    $out/bin/jmeter-stoptest.sh > /dev/null
    timeout --kill=1s 1s $out/bin/jmeter-mirror-server.sh || test "$?" = "124"
+
+    # Test HTML report generation (regression test for Nix store read-only issue)
+    echo "Testing HTML report generation..."
+
+    # Create minimal test results file (using actual JMeter CSV format)
+    TMPDIR=$(mktemp -d)
+    cat > $TMPDIR/test-results.jtl << 'EOF'
+    timeStamp,elapsed,label,responseCode,responseMessage,threadName,dataType,success,failureMessage,bytes,sentBytes,grpThreads,allThreads,URL,Latency,IdleTime,Connect
+    1699123200000,100,HTTP Request,200,OK,Thread Group 1-1,text,true,,805,113,1,1,https://example.com/,95,0,25
+    1699123201000,150,HTTP Request,200,OK,Thread Group 1-1,text,true,,805,113,1,1,https://example.com/,140,0,30
+    1699123202000,200,HTTP Request,500,Internal Server Error,Thread Group 1-1,text,false,Server Error,512,113,1,1,https://example.com/,180,0,40
+    EOF
+
+    # Generate HTML report
+    echo "Generating HTML report..."
+    $out/bin/jmeter -g $TMPDIR/test-results.jtl -o $TMPDIR/test-report 2>/dev/null
+
+    # Verify the report was generated successfully
+    echo "Verifying report generation..."
+    test -f $TMPDIR/test-report/index.html
+    test -f $TMPDIR/test-report/statistics.json
+    test -d $TMPDIR/test-report/sbadmin2-1.0.7
+
+    # Verify the HTML contains expected content
+    grep -q "Apache JMeter Dashboard" $TMPDIR/test-report/index.html
+
+    # Verify statistics contain the test data
+    grep -q "HTTP Request" $TMPDIR/test-report/statistics.json
+
+    echo "HTML report generation test passed!"
+
+    runHook postInstallCheck
  '';

  meta = {
@@ -62,9 +160,15 @@ stdenv.mkDerivation rec {
      measure performance. It was originally designed for testing Web
      Applications but has since expanded to other test functions.
    '';
+    homepage = "https://jmeter.apache.org/";
+    changelog = "https://github.com/apache/jmeter/releases/tag/rel%2Fv${finalAttrs.version}";
    license = lib.licenses.asl20;
    maintainers = [ ];
-    priority = 1;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
    platforms = lib.platforms.unix;
+    mainProgram = "jmeter";
  };
-}
+})
@@ -8,18 +8,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "kakoune-lsp";
-  version = "19.0.0";
+  version = "19.0.1";

  src = fetchFromGitHub {
    owner = "kakoune-lsp";
    repo = "kakoune-lsp";
    rev = "v${version}";
-    hash = "sha256-N1J8HBhOLZmR51y1Z85rl0oxA1UrjBfbPb5hiZ1Q0aY=";
+    hash = "sha256-MDGDc2xhQNfbczq/JT/hDd3ZPLRd9DVXdTg0VLQLNHk=";
  };

  patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];

-  cargoHash = "sha256-AaqA+MvpmvPUOLI0usuf9rxr7TcoMSO9mOsg3OCHljw=";
+  cargoHash = "sha256-5ESICzwLcXheqNz/E3EBX7K2RFVFPAAuoqyZsJpVijI=";

  meta = {
    description = "Kakoune Language Server Protocol Client";
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "lux-cli";

-  version = "0.22.0";
+  version = "0.22.2";

  src = fetchFromGitHub {
    owner = "lumen-oss";
    repo = "lux";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ThzpRKNosPtXCd2l97rQo7pKqgsVzbhON2E/tGsYhN4=";
+    hash = "sha256-Pae3oifx3G0mouSJL6W/XHGlozmHn6Aj9a8aqTshmVc=";
  };

  buildAndTestSubdir = "lux-cli";

-  cargoHash = "sha256-EpOLDIhaQT+ao8di4L1Mh+2JI6uIfekJStccHzvpC8M=";
+  cargoHash = "sha256-XObaVcTbE3pXZurFDt/7jHZUg0TZulV0QwWktqvjAyk=";

  nativeInstallCheckInputs = [
    versionCheckHook
@@ -8,22 +8,22 @@

  makeWrapper,

-  electron_36,
+  electron_37,
  commandLineArgs ? "",
 }:

 let
-  electron = electron_36;
+  electron = electron_37;
 in
 buildNpmPackage rec {
  pname = "lx-music-desktop";
-  version = "2.11.0";
+  version = "2.12.0";

  src = fetchFromGitHub {
    owner = "lyswhut";
    repo = "lx-music-desktop";
    tag = "v${version}";
-    hash = "sha256-NMj8rb5PAejT1HCE5nxi2+SS9lFUVdLEqN0id23QjVc=";
+    hash = "sha256-g4QVpymzoRKIq70aRLXGFmUmIpSiXIZThrp8fumBKTQ=";
  };

  patches = [
@@ -38,7 +38,7 @@ buildNpmPackage rec {
    makeWrapper
  ];

-  npmDepsHash = "sha256-cA9NdHe3lEg8twMLWoeomWgobidZ34TKwdC5rDezZ5g=";
+  npmDepsHash = "sha256-t6I8ch36Yh6N+qZy4/yr/gSyJ3qdyMWss5LbsagEFMQ=";

  makeCacheWritable = true;

@@ -94,6 +94,6 @@ buildNpmPackage rec {
    platforms = electron.meta.platforms;
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
    mainProgram = "lx-music-desktop";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ starryreverie ];
  };
 }
@@ -28,28 +28,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "musescore";
-  version = "4.6.3";
+  version = "4.6.4";

  src = fetchFromGitHub {
    owner = "musescore";
    repo = "MuseScore";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WLzt/Ox6GrfWD0/l8/Ksc2ptg5LZSOXXnlsSnenfZtI=";
+    hash = "sha256-fBkokokyCJcwYRgdrtWQEqW1rcdlmVQu1OrMJeKA8Sc=";
  };

-  patches = [
-    # https://github.com/musescore/MuseScore/pull/30422
-    (fetchpatch {
-      url = "https://github.com/musescore/MuseScore/commit/bda5eac091bca1db15fbe9546b2d71b7e8a126c8.patch";
-      hash = "sha256-MTSFxmwBWaOXipeUqIFKP4Oek087oqW2MQvltV9vAgA=";
-    })
-    # https://github.com/musescore/MuseScore/pull/30691
-    (fetchpatch {
-      url = "https://github.com/musescore/MuseScore/commit/840f8b7ded19cdc5d2dc78d32e396494aaf8c4c0.patch";
-      hash = "sha256-MfHLFQbgvgNTd5G3mxCMlS7bF8LrNWMLZUQ+A21l/RM=";
-    })
-  ];
-
  cmakeFlags = [
    "-DMUSE_APP_BUILD_MODE=release"
    # Disable the build and usage of the `/bin/crashpad_handler` utility - it's
@@ -172,6 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      vandenoever
      doronbehar
+      sarunint
    ];
    mainProgram = "mscore";
    platforms = lib.platforms.unix;
@@ -0,0 +1,58 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libX11,
+  libXft,
+  libXrender,
+  freetype,
+  fontconfig,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "oxwm";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "tonybanters";
+    repo = "oxwm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zVYYRGe5ZIR1AJgKZi9s403NKM7hKAqhEbNWYSkgpT0=";
+  };
+
+  cargoHash = "sha256-Rs8eGR8WY7qOPM0rfu6lTNDl6TVMR+rrIc6Ub+M7vfs=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libX11
+    libXft
+    libXrender
+    freetype
+    fontconfig
+  ];
+
+  # tests require a running X server
+  doCheck = false;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  postInstall = ''
+    install -Dm644 resources/oxwm.desktop -t $out/share/xsessions
+    install -Dm644 resources/oxwm.1 -t $out/share/man/man1
+    install -Dm644 templates/oxwm.lua -t $out/share/oxwm
+  '';
+
+  passthru.providedSessions = [ "oxwm" ];
+
+  meta = {
+    description = "Dynamic window manager written in Rust, inspired by dwm";
+    homepage = "https://github.com/tonybanters/oxwm";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tonybanters ];
+    platforms = lib.platforms.linux;
+    mainProgram = "oxwm";
+  };
+})
@@ -0,0 +1,60 @@
+{
+  curl,
+  fetchFromGitHub,
+  gmp,
+  lib,
+  ocl-icd,
+  opencl-headers,
+  stdenv,
+  versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "prmers";
+  version = "4.15.35-alpha";
+
+  src = fetchFromGitHub {
+    owner = "cherubrock-seb";
+    repo = "PrMers";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LAbWyz1FT9Zza4gewgKeMvQt8rwkfBhHRWBGpN+DIXE=";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    curl
+    gmp
+    ocl-icd
+    opencl-headers
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    make install PREFIX=$out KERNEL_PATH=$out/bin/kernels
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = "-v";
+
+  meta = {
+    description = "GPU-accelerated Mersenne primality testing";
+    longDescription = ''
+      PrMers is a high-performance GPU application for Lucas–Lehmer (LL), PRP, and P-1 testing of Mersenne numbers.
+         It uses OpenCL and integer NTT/IBDWT kernels and is built for long, reliable runs with checkpointing and PrimeNet submission.
+    '';
+    homepage = "https://github.com/cherubrock-seb/PrMers";
+    downloadPage = "https://github.com/cherubrock-seb/PrMers/releases/tag/v${finalAttrs.version}";
+    maintainers = with lib.maintainers; [ dstremur ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "prmers";
+  };
+})
@@ -48,7 +48,7 @@ buildGoModule (finalAttrs: {

  meta = {
    changelog = "https://github.com/superq/chrony_exporter/releases/tag/v${finalAttrs.version}";
-    homepage = "https://github.com/superq/chrony";
+    homepage = "https://github.com/SuperQ/chrony_exporter";
    description = "Prometheus exporter for the chrony NTP service";
    license = lib.licenses.asl20;
    mainProgram = "chrony_exporter";
@@ -14,14 +14,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "ramalama";
-  version = "0.14.0";
+  version = "0.15.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "containers";
    repo = "ramalama";
    tag = "v${version}";
-    hash = "sha256-4RoZX8CzMGNGsh8TawPYYMi2ZZXDIGfD/p94SS+326Y=";
+    hash = "sha256-0R7y1PpAxXzSlhfOFHf3cWPzZ544fYVUL0w7jOFSuAU=";
  };

  build-system = with python3Packages; [
@@ -18,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ticcutils";
-  version = "0.36";
+  version = "0.37";

  src = fetchFromGitHub {
    owner = "LanguageMachines";
    repo = "ticcutils";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-iehbLpVdcJ9PPI4iwUweZjsD+r1dNFoOr38W53JpGdU=";
+    hash = "sha256-jpwiRVpzALBUf4DxpRblEPLgXXOh2luHnTQg8nuQAwo=";
  };

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

 buildGoModule rec {
  pname = "trufflehog";
-  version = "3.92.1";
+  version = "3.92.3";

  src = fetchFromGitHub {
    owner = "trufflesecurity";
    repo = "trufflehog";
    tag = "v${version}";
-    hash = "sha256-eKhmSUqT6t4l1SOBMI65wEj5hXsi3Bkxys2nd8cGb4I=";
+    hash = "sha256-vSJncJzHxiZqDG0BQrLUjU7mFvZ6PnoE2FkITRvKmes=";
  };

  vendorHash = "sha256-Qz0tKqqT3PlZFCiYxLBmHeICIx2ogOUW7rfXHadcVPg=";
@@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ucto";
-  version = "0.35";
+  version = "0.36";

  src = fetchFromGitHub {
    owner = "LanguageMachines";
    repo = "ucto";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-DaLoq+FBNZG4J+h9fRh9HHl2TKVXUTrt9RAzwmv6lIc=";
+    hash = "sha256-sq1AslcpoG5gY40DiSMtphp7gXGYRuX1QrQYVGuM/+4=";
  };

  nativeBuildInputs = [
@@ -1,22 +1,22 @@
 {
  lib,
-  buildGo124Module,
+  buildGoModule,
  fetchFromGitHub,
 }:

-buildGo124Module rec {
+buildGoModule rec {
  pname = "vuls";
-  version = "0.36.2";
+  version = "0.37.0";

  src = fetchFromGitHub {
    owner = "future-architect";
    repo = "vuls";
    tag = "v${version}";
-    hash = "sha256-z6hNC8VDsz5gzzA6VP9PFAJAE7dzrZnxHD/TlBu/uxI=";
+    hash = "sha256-BkFFFo0+5f2OmxlleUaqsoX8gesytXGHuSwLTnTJnV0=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-JO3W8VUQiypQ8AGXTtCIHTNu6PO0kJCPp7LDu+xDqOk=";
+  vendorHash = "sha256-fyuY0GbdZpBw7nbPIZqLakRwOCHQLaEeuihtkIGOzzU=";

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

 buildGoModule rec {
  pname = "yatas";
-  version = "1.5.1";
+  version = "1.6.1";

  src = fetchFromGitHub {
    owner = "padok-team";
    repo = "YATAS";
    tag = "v${version}";
-    hash = "sha256-gw4aZ7SLUz5WLUb1z4zDtI6Ca0tEWhE5wobp5NRvjkg=";
+    hash = "sha256-fkMrQqHtlZWoJZgSu1KeZ+p1pWXFUYYIUOkvd/DHx8k=";
  };

-  vendorHash = "sha256-zp5EVJe5Q6o6C0CZ8u+oEFEOy0NU5SgVN+cSc6A/jZ4=";
+  vendorHash = "sha256-NJO/eankcoM9FsYz7jop1tY0ueeNyVG2TEip5F46haI=";

  meta = {
    description = "Tool to audit AWS infrastructure for misconfiguration or potential security issues";
@@ -87,6 +87,8 @@ clangStdenv.mkDerivation (finalAttrs: {
      if clangStdenv.hostPlatform.isAarch64 then "neon64" else "sse2;avx;avx2"
    ))
    (lib.cmakeBool "ZL_JUCE_COPY_PLUGIN" false)
+    # set the version for in the settings screen.
+    (lib.cmakeFeature "FOOBAR_VERSION" "${finalAttrs.version}")
  ];

  installPhase = ''
@@ -87,6 +87,8 @@ clangStdenv.mkDerivation (finalAttrs: {
      if clangStdenv.hostPlatform.isAarch64 then "neon64" else "sse2;avx;avx2"
    ))
    (lib.cmakeBool "ZL_JUCE_COPY_PLUGIN" false)
+    # set the version for in the settings screen.
+    (lib.cmakeFeature "FOOBAR_VERSION" "${finalAttrs.version}")
  ];

  installPhase = ''
@@ -287,6 +287,11 @@ mapAliases {
  prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14
  prettier-plugin-toml = throw "prettier-plugin-toml was removed because it provides no executable"; # added 2025-03-23
  inherit (pkgs) prisma; # added 2024-08-31
+  pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-07
+  pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-07
+  purescript-language-server = throw "'purescript-language-server' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12
+  purescript-psa = throw "'purescript-psa' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12
+  purs-tidy = throw "'purs-tidy' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12
  purty = throw "'purty' has been remved because it was unmaintained upstream"; # Added 2025-11-14
  inherit (pkgs) pxder; # added 2023-09-26
  inherit (pkgs) quicktype; # added 2023-09-09
@@ -8,9 +8,4 @@
  aws-cdk = "cdk";
  grunt-cli = "grunt";
  gulp-cli = "gulp";
-  pulp = "pulp";
-  purescript-language-server = "purescript-language-server";
-  purescript-psa = "psa";
-  purs-tidy = "purs-tidy";
-  pscid = "pscid";
 }
@@ -21,11 +21,6 @@
 , "node2nix"
 , "postcss"
 , "prebuild-install"
-, "pscid"
-, "pulp"
-, "purescript-language-server"
-, "purescript-psa"
-, "purs-tidy"
 , "sass"
 , "semver"
 , "vega-cli"
@@ -76,20 +76,6 @@ final: prev: {
      '';
  };

-  pulp = prev.pulp.override {
-    # tries to install purescript
-    npmFlags = toString [ "--ignore-scripts" ];
-
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    postInstall = ''
-      wrapProgram "$out/bin/pulp" --suffix PATH : ${
-        lib.makeBinPath [
-          pkgs.purescript
-        ]
-      }
-    '';
-  };
-
  rush = prev."@microsoft/rush".override {
    name = "rush";
  };
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-credentials-api";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-jDQAONkE8CGNchSo9AiMMZEr/PJ5ryy8fZvkiXqX3S8=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "alibabacloud_credentials_api" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Aliyun Credentials API Library for Python";
+    homepage = "https://pypi.org/project/alibabacloud-credentials-api/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -0,0 +1,43 @@
+{
+  lib,
+  aiofiles,
+  alibabacloud-credentials-api,
+  alibabacloud-tea,
+  apscheduler,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-credentials";
+  version = "1.0.4";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "alibabacloud_credentials";
+    inherit version;
+    hash = "sha256-K3GrMHRSZ6vVJNZPvgY/fgJknaKrbarx7sBXM7f5yPE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiofiles
+    alibabacloud-credentials-api
+    alibabacloud-tea
+    apscheduler
+  ];
+
+  pythonImportsCheck = [ "alibabacloud_credentials" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Aliyun Credentials Library for Python";
+    homepage = "https://pypi.org/project/alibabacloud-credentials/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-endpoint-util";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "alibabacloud_endpoint_util";
+    inherit version;
+    hash = "sha256-pZPrjd2BaNXcIhbNMxEbFE+RifzW6cog5I81inObv5A=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "alibabacloud_endpoint_util" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Endpoint-util module of alibabaCloud Python SDK";
+    homepage = "https://pypi.org/project/alibabacloud-endpoint-util/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -0,0 +1,35 @@
+{
+  lib,
+  alibabacloud-credentials,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-gateway-spi";
+  version = "0.0.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "alibabacloud_gateway_spi";
+    inherit version;
+    hash = "sha256-ENHFOj/F+HkV+9a0mFuYM4p3bptEoCY/VmQ8UEgiO4s=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ alibabacloud-credentials ];
+
+  pythonImportsCheck = [ "alibabacloud_gateway_spi" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Aliyun Gateway SPI Library for Python";
+    homepage = "https://pypi.org/project/alibabacloud-gateway-spi/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -0,0 +1,39 @@
+{
+  lib,
+  alibabacloud-tea-util,
+  buildPythonPackage,
+  cryptography,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-openapi-util";
+  version = "0.2.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "alibabacloud_openapi_util";
+    inherit version;
+    hash = "sha256-67w5BvVUy0v49RPkPooz6Laj1KDvE2F6DhTD3ajvUqg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    alibabacloud-tea-util
+    cryptography
+  ];
+
+  pythonImportsCheck = [ "alibabacloud_openapi_util" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Aliyun Tea OpenApi Library for Python";
+    homepage = "https://pypi.org/project/alibabacloud-openapi-util/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -0,0 +1,35 @@
+{
+  lib,
+  alibabacloud-tea,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-tea-util";
+  version = "0.3.14";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "alibabacloud_tea_util";
+    inherit version;
+    hash = "sha256-cI58n2RkGjyeDlZjZdLyNnX418Kj4pcdlALO7eBAjNs=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ alibabacloud-tea ];
+
+  pythonImportsCheck = [ "alibabacloud_tea_util" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Aliyun Tea Util Library for Python";
+    homepage = "https://pypi.org/project/alibabacloud-tea-util/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -0,0 +1,38 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchPypi,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "alibabacloud-tea";
+  version = "0.4.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-7IBT0KqNQ+vh3rYy1cVAQzmznsmhigcH1Xdlg4QYUEo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    requests
+  ];
+
+  pythonImportsCheck = [ "Tea" ];
+
+  # Module has only tests in the untagged upstream repo
+  doCheck = false;
+
+  meta = {
+    description = "Aliyun Tea Library for Python";
+    homepage = "https://pypi.org/project/alibabacloud-tea/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "blinkpy";
-  version = "0.25.1";
+  version = "0.25.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "fronzbot";
    repo = "blinkpy";
    tag = "v${version}";
-    hash = "sha256-K8VnpoKFE2O4FuLliV2CrMQwFkCHbBmu2bFut6Ncmqw=";
+    hash = "sha256-pjOs9OLBXzhoQm2p0Kicw5BdobZIIEY7/RHX/2bj3qY=";
  };

  postPatch = ''
@@ -358,13 +358,13 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.42.8";
+  version = "1.42.9";
  pyproject = true;

  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-ZWOGY3x+eBnuCF6xrjwy+BHMg/VXvF4PWvlvQBOwPEA=";
+    hash = "sha256-sTK+gmDrVgELR0mWWM9sSF+Z6gGQlp59Gtt0xQXIPmg=";
  };

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

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.42.8";
+  version = "1.42.9";
  pyproject = true;

  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-llbEPc/a35K3qH15l82UGg7WyxETdO2Hns3QfJqzAd0=";
+    hash = "sha256-kv3SodkRNVFm2j4w6bubGAP34srsDZE/X606kgNSzm0=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "iamdata";
-  version = "0.1.202512131";
+  version = "0.1.202512141";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${version}";
-    hash = "sha256-aHdEzPCXhg4DhvHPyph82NAMHm4wJvxQcgyc8d0Spq8=";
+    hash = "sha256-NUtxqvCrsnBxoFOHBbqT8HZBBICsEuq17XGhz7XI3yo=";
  };

  __darwinAllowLocalNetworking = true;
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "jupyter-docprovider";
-  version = "2.1.2";
+  version = "2.2.0";
  pyproject = true;

  src = fetchPypi {
    pname = "jupyter_docprovider";
    inherit version;
-    hash = "sha256-lHnCmOeqpEl/JSrMwet9s5gXjdDty7N+/VWKh7Zh44w=";
+    hash = "sha256-UZwPhBJsb7qWIOUYm+9t8GfX14nRJt69czAapLiN/Qw=";
  };

  postPatch = ''
@@ -15,13 +15,13 @@

 buildPythonPackage rec {
  pname = "jupyter-server-ydoc";
-  version = "2.1.2";
+  version = "2.2.0";
  pyproject = true;

  src = fetchPypi {
    pname = "jupyter_server_ydoc";
    inherit version;
-    hash = "sha256-rQOkjRB4HU8KB/M9VifIlPqkChpKPA2KjaJ8sUHIi4c=";
+    hash = "sha256-vGw+N3XG9F/hDEgx8gauuA30NI6xHxt6bBwyCqDqw0A=";
  };

  build-system = [ hatchling ];
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "llama-index-llms-openai";
-  version = "0.6.10";
+  version = "0.6.11";
  pyproject = true;

  src = fetchPypi {
    pname = "llama_index_llms_openai";
    inherit version;
-    hash = "sha256-vOJiHLZQ2P7WntonErgE5us0VZ/K66ksVKO1s7PGkWE=";
+    hash = "sha256-7hk3FpHGzQD4V6Xa7a4DEBoBv01e+0cxudJYO2bDZEE=";
  };

  pythonRemoveDeps = [
@@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "msmart-ng";
-  version = "2025.9.2";
+  version = "2025.12.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mill1000";
    repo = "midea-msmart";
    tag = version;
-    hash = "sha256-+A3Mk/S5FZLe3y5J3olZ+kBlIlkLXlX92IdrvudFriE=";
+    hash = "sha256-zRTs6nRgI5ixbHzDXfAjJ2JW/9y+b7vzAyUGk120xj4=";
  };

  build-system = [
@@ -338,8 +338,8 @@ in
      "sha256-imDBFBMNm8LdlHf9m21aS39DGfF0dbpd7DsZ8fMzIyM=";

  mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.42.3"
-      "sha256-2vuxJVOvflBQHkVtBYc+JwvIAA/nJZuZhFuhMtrgDR0=";
+    buildMypyBoto3Package "connect" "1.42.9"
+      "sha256-rw52qFKriqJ5yswHBenlQxzw8kMBahV5tlBu5ksf/UA=";

  mypy-boto3-connect-contact-lens =
    buildMypyBoto3Package "connect-contact-lens" "1.42.3"
@@ -382,8 +382,8 @@ in
      "sha256-MExczpvtitz7h8p+wS8mKCToOQiiQwcOl3jzbKHbVzI=";

  mypy-boto3-datasync =
-    buildMypyBoto3Package "datasync" "1.42.3"
-      "sha256-ApctgKap9Tq0pEV59aqZRap+OwnmSPiXomUmFeZYPso=";
+    buildMypyBoto3Package "datasync" "1.42.9"
+      "sha256-/OU5QUhkJ5WtoNfmgWye49vjbQlKE3vDJMlONyrH4WA=";

  mypy-boto3-dax =
    buildMypyBoto3Package "dax" "1.42.3"
@@ -1429,8 +1429,8 @@ in
      "sha256-YfqjqAgZDNBUqqhwXG/GXF+rkAaYa1NTkKW02zt7yjE=";

  mypy-boto3-workspaces-web =
-    buildMypyBoto3Package "workspaces-web" "1.42.3"
-      "sha256-BLSJb/oJ4OIZIUpcKws+bR8cqgmh/MT8mgigBiBW/r4=";
+    buildMypyBoto3Package "workspaces-web" "1.42.9"
+      "sha256-KXL+eGTuoFmyIcXCdLUOu9Ht8hcoHEMBPMmv3fCH93E=";

  mypy-boto3-xray =
    buildMypyBoto3Package "xray" "1.42.3"
@@ -10,23 +10,20 @@
  pytest-asyncio,
  pytest-cov-stub,
  pytestCheckHook,
-  pythonOlder,
  syrupy,
  yarl,
 }:

 buildPythonPackage rec {
  pname = "python-overseerr";
-  version = "0.7.1";
+  version = "0.8.0";
  pyproject = true;

-  disabled = pythonOlder "3.11";
-
  src = fetchFromGitHub {
    owner = "joostlek";
    repo = "python-overseerr";
    tag = "v${version}";
-    hash = "sha256-J0n3uMZaSWcnf3c1d4wdg+OgB9wPE2i/835M6Z3fMPw=";
+    hash = "sha256-izgUTgRG63FUjb8mH1W4yXFRvwPWIWPKsSiY9awq9SM=";
  };

  build-system = [ poetry-core ];
@@ -51,7 +48,7 @@ buildPythonPackage rec {
  meta = {
    description = "Client for Overseerr";
    homepage = "https://github.com/joostlek/python-overseerr";
-    changelog = "https://github.com/joostlek/python-overseerr/releases/tag/v${version}";
+    changelog = "https://github.com/joostlek/python-overseerr/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
@@ -6,22 +6,19 @@
  lxml,
  oletools,
  pytestCheckHook,
-  pythonOlder,
  setuptools,
 }:

 buildPythonPackage rec {
  pname = "rtfde";
-  version = "0.1.2.1";
+  version = "0.1.2.2";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "seamustuohy";
    repo = "RTFDE";
    tag = version;
-    hash = "sha256-dtPWgtOYpGaNRmIE7WNGJd/GWB2hQXsFJDDSHIcIjY4=";
+    hash = "sha256-1yjxp6N07I9kwFRtgsLo9UPSG4FU+ic1tNm6U/xWk74=";
  };

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

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.1.11";
+  version = "3.1.12";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    tag = version;
-    hash = "sha256-BkBHyTQAZzcJBmMh88QSH3DahUWLa0Mc0k9vLVzIQEg=";
+    hash = "sha256-rLAsDXmQ4gmGJctfcOhp+0u6dd6f+u6dTuAGH28QJs8=";
  };

  build-system = [ setuptools ];
@@ -10,18 +10,19 @@
  fetchFromGitHub,
  protobuf,
  setuptools,
+  typing-extensions,
 }:

 buildPythonPackage rec {
  pname = "tesla-fleet-api";
-  version = "1.2.5";
+  version = "1.2.7";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Teslemetry";
    repo = "python-tesla-fleet-api";
    tag = "v${version}";
-    hash = "sha256-7Diq7xT8tPO4fXp7qsFXWtWExqm2vctoOtPvlCuWOKg=";
+    hash = "sha256-wZS/o795v5luHdSKBDnEgPeX8HQdN190UQspXJV/dQE=";
  };

  build-system = [ setuptools ];
@@ -34,6 +35,7 @@ buildPythonPackage rec {
    bleak-retry-connector
    cryptography
    protobuf
+    typing-extensions
  ];

  # Module has no tests
@@ -3,38 +3,35 @@
  buildPythonPackage,
  fetchFromGitHub,
  garth,
+  importlib-resources,
  lxml,
+  poetry-core,
  python-dotenv,
-  pythonOlder,
  requests,
-  setuptools,
 }:

 buildPythonPackage rec {
  pname = "withings-sync";
-  version = "4.2.7";
+  version = "5.3.0";
  pyproject = true;

-  disabled = pythonOlder "3.10";
-
  src = fetchFromGitHub {
    owner = "jaroslawhartman";
    repo = "withings-sync";
    tag = "v${version}";
-    hash = "sha256-ySl2nRR8t7c3NhjgjSzLQ+hcJuh+kx5aoaVPJF56HR0=";
+    hash = "sha256-Q9zOXQIdl4jpCK6a5Xp4kZK67MqudX0thDAkRmdL3AQ=";
  };

  postPatch = ''
-    substituteInPlace setup.py \
+    substituteInPlace pyproject.toml \
      --replace-fail "1.0.0.dev1" "${version}"
  '';

-  pythonRelaxDeps = true;
-
-  build-system = [ setuptools ];
+  build-system = [ poetry-core ];

  dependencies = [
    garth
+    importlib-resources
    lxml
    python-dotenv
    requests
@@ -45,7 +42,7 @@ buildPythonPackage rec {
  meta = {
    description = "Synchronisation of Withings weight";
    homepage = "https://github.com/jaroslawhartman/withings-sync";
-    changelog = "https://github.com/jaroslawhartman/withings-sync/releases/tag/v${version}";
+    changelog = "https://github.com/jaroslawhartman/withings-sync/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
    mainProgram = "withings-sync";
@@ -23,9 +23,9 @@ let
    };
    # ./update-zen.py lqx
    lqx = {
-      version = "6.17.11"; # lqx
+      version = "6.17.12"; # lqx
      suffix = "lqx1"; # lqx
-      sha256 = "1dllgir1afk7va698sdv07sjisbb4x5p95y871m4y72zw3i71sa2"; # lqx
+      sha256 = "105i7arj540pvmb30h4j5pdlw6lqq7kwnkqafd60c54s6510kdm3"; # lqx
      isLqx = true;
    };
  };
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
  owner = "mill1000";
  domain = "midea_ac";
-  version = "2025.9.1";
+  version = "2015.12.0";

  src = fetchFromGitHub {
    owner = "mill1000";
    repo = "midea-ac-py";
    tag = version;
-    hash = "sha256-fmVX+b7x4+172+mcJ8+LFhljQEQrhLFXwXn6eI1f36Y=";
+    hash = "sha256-PXCL3vaCdIOHuv2eUSLxVwVBZNzfynzcKRfQqm1PGvw=";
  };

  dependencies = [ msmart-ng ];
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
  owner = "AN3Orik";
  domain = "systemair";
-  version = "1.0.17";
+  version = "1.0.18";

  src = fetchFromGitHub {
    inherit owner;
    repo = "systemair";
    tag = "v${version}";
-    hash = "sha256-R5Q6BbvcAqFNldOqfG1TDoM1gbsYrS3OClHlAdfQG6o=";
+    hash = "sha256-fhzL+pez92T77ZJ2aE/0ugGd9Dlg2uGa417pJWwTYw0=";
  };

  postPatch = ''
@@ -1341,6 +1341,9 @@ mapAliases {
  protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
  protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
  proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27
+  pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-12
+  pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-12
+  purescript-psa = throw "'purescript-psa' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12
  purple-discord = throw "'purple-discord' has been renamed to/replaced by 'pidginPackages.purple-discord'"; # Converted to throw 2025-10-27
  purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17
  purple-googlechat = throw "'purple-googlechat' has been renamed to/replaced by 'pidginPackages.purple-googlechat'"; # Converted to throw 2025-10-27
@@ -1974,70 +1974,6 @@ with pkgs;
    stdenv = gcc15Stdenv;
  };

-  hyprcursor = callPackage ../by-name/hy/hyprcursor/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprgraphics = callPackage ../by-name/hy/hyprgraphics/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hypridle = callPackage ../by-name/hy/hypridle/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprland = callPackage ../by-name/hy/hyprland/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprland-protocols = callPackage ../by-name/hy/hyprland-protocols/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprland-qt-support = callPackage ../by-name/hy/hyprland-qt-support/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprland-qtutils = callPackage ../by-name/hy/hyprland-qtutils/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprlang = callPackage ../by-name/hy/hyprlang/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprlock = callPackage ../by-name/hy/hyprlock/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprpaper = callPackage ../by-name/hy/hyprpaper/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprpicker = callPackage ../by-name/hy/hyprpicker/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprsunset = callPackage ../by-name/hy/hyprsunset/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprsysteminfo = callPackage ../by-name/hy/hyprsysteminfo/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprutils = callPackage ../by-name/hy/hyprutils/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
-  hyprwayland-scanner = callPackage ../by-name/hy/hyprwayland-scanner/package.nix {
-    stdenv = gcc15Stdenv;
-  };
-
  hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };

  hyprlandPlugins = recurseIntoAttrs (
@@ -4800,14 +4736,8 @@ with pkgs;

  purescript = callPackage ../development/compilers/purescript/purescript { };

-  purescript-psa = nodePackages.purescript-psa;
-
  purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix;

-  pulp = nodePackages.pulp;
-
-  pscid = nodePackages.pscid;
-
  coreboot-toolchain = recurseIntoAttrs (
    callPackage ../development/tools/misc/coreboot-toolchain { }
  );
@@ -606,6 +606,24 @@ self: super: with self; {

  algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };

+  alibabacloud-credentials = callPackage ../development/python-modules/alibabacloud-credentials { };
+
+  alibabacloud-credentials-api =
+    callPackage ../development/python-modules/alibabacloud-credentials-api
+      { };
+
+  alibabacloud-endpoint-util =
+    callPackage ../development/python-modules/alibabacloud-endpoint-util
+      { };
+
+  alibabacloud-gateway-spi = callPackage ../development/python-modules/alibabacloud-gateway-spi { };
+
+  alibabacloud-openapi-util = callPackage ../development/python-modules/alibabacloud-openapi-util { };
+
+  alibabacloud-tea = callPackage ../development/python-modules/alibabacloud-tea { };
+
+  alibabacloud-tea-util = callPackage ../development/python-modules/alibabacloud-tea-util { };
+
  aligator = callPackage ../development/python-modules/aligator { inherit (pkgs) aligator; };

  alive-progress = callPackage ../development/python-modules/alive-progress { };