Merge staging-next into staging

ci/OWNERS

@@ -469,9 +469,8 @@ nixos/tests/incus/                      @adamcstephens
 pkgs/by-name/in/incus/                  @adamcstephens
 pkgs/by-name/lx/lxc*                    @adamcstephens
 
-# ExpidusOS, Flutter
+# Flutter
 /pkgs/development/compilers/flutter @RossComputerGuy
-/pkgs/desktops/expidus              @RossComputerGuy
 
 # GNU Tar & Zip
 /pkgs/by-name/gn/gnutar        @RossComputerGuy

doc/release-notes/rl-2605.section.md

@@ -312,7 +312,7 @@ gnuradioMinimal.override {
 
 - `mold` is now wrapped by default.
 
-- `neovim` now disables by default the `python3` and `ruby` providers, unused by most users and reducing closure size from 365MiB to 240MiB. Host provider executables are not exposed anymore along with the neovim wrapper. You can still refer to those using the neovim provider variables (e.g., `python3_host_prog`).
+- The `neovim` package and module now disable by default the `python3` and `ruby` providers, unused by most users and reducing closure size from 365MiB to 240MiB. Host provider executables are not exposed anymore along with the neovim wrapper. You can still refer to those using the neovim provider variables (e.g., `python3_host_prog`).
 
 ### Deprecations {#sec-nixpkgs-release-26.05-lib-deprecations}
 

nixos/modules/programs/neovim.nix

@@ -51,13 +51,13 @@ in
 
     withRuby = lib.mkOption {
       type = lib.types.bool;
-      default = true;
+      default = false;
       description = "Enable Ruby provider.";
     };
 
     withPython3 = lib.mkOption {
       type = lib.types.bool;
-      default = true;
+      default = false;
       description = "Enable Python 3 provider.";
     };
 

nixos/modules/services/security/yubikey-agent.nix

@@ -14,6 +14,7 @@ in
   meta.maintainers = with lib.maintainers; [
     philandstuff
     rawkode
+    kaynetik
   ];
 
   options = {

nixos/modules/system/boot/loader/limine/limine-install.py

@@ -430,7 +430,7 @@ def install_bootloader() -> None:
             partition formatted as FAT.
         '''))
 
-    if config('secureBoot', 'enable') and not config('secureBoot', 'createAndEnrollKeys') and not os.path.exists("/var/lib/sbctl"):
+    if config('secureBoot', 'enable') and not config('secureBoot', 'autoGenerateKeys') and not os.path.exists("/var/lib/sbctl"):
         print("There are no sbctl secure boot keys present. Please generate some.")
         sys.exit(1)
 
@@ -557,18 +557,21 @@ def install_bootloader() -> None:
 
         if config('secureBoot', 'enable'):
             sbctl = os.path.join(str(config('secureBoot', 'sbctl')), 'bin', 'sbctl')
-            if config('secureBoot', 'createAndEnrollKeys'):
-                print("TEST MODE: creating and enrolling keys")
+            if not os.path.exists("/var/lib/sbctl") and config('secureBoot', 'autoGenerateKeys'):
+                print('auto generating keys')
                 try:
                     subprocess.run([sbctl, 'create-keys'])
                 except:
                     print('error: failed to create keys', file=sys.stderr)
                     sys.exit(1)
-                try:
-                    subprocess.run([sbctl, 'enroll-keys', '--yes-this-might-brick-my-machine'])
-                except:
-                    print('error: failed to enroll keys', file=sys.stderr)
-                    sys.exit(1)
+                if config('secureBoot', 'autoEnrollKeys', 'enable'):
+                    try:
+                        command = [sbctl, 'enroll-keys']
+                        command.extend(config('secureBoot', 'autoEnrollKeys', 'extraArgs'))
+                        subprocess.run(command)
+                    except:
+                        print('error: failed to enroll keys', file=sys.stderr)
+                        sys.exit(1)
 
             print('signing limine...')
             try:

nixos/modules/system/boot/loader/limine/limine.nix

@@ -224,16 +224,22 @@ in
         '';
       };
 
-      createAndEnrollKeys = lib.mkEnableOption null // {
-        internal = true;
-        description = ''
-          Creates secure boot signing keys and enrolls them during bootloader installation.
+      autoGenerateKeys = lib.mkEnableOption null // {
+        description = "Generate keys automatically when none exists during bootloader installation";
+      };
 
-          ::: {.note}
-          This is used for automated nixos tests.
-          NOT INTENDED to be used on a real system.
-          :::
-        '';
+      autoEnrollKeys = {
+        enable = lib.mkEnableOption null // {
+          description = "Enroll automatically generated keys";
+        };
+        extraArgs = lib.mkOption {
+          default = [
+            "--microsoft"
+            "--firmware-builtin"
+          ];
+          type = lib.types.listOf lib.types.str;
+          description = "Extra arguments passed to sbctl";
+        };
       };
 
       sbctl = lib.mkPackageOption pkgs "sbctl" { };
@@ -484,5 +490,15 @@ in
         DisableShimForSecureBoot = true;
       };
     })
+    (lib.mkIf (cfg.enable && cfg.secureBoot.enable && cfg.secureBoot.autoEnrollKeys.enable) {
+      assertions = [
+        {
+          assertion = cfg.secureBoot.autoGenerateKeys;
+          message = "autoEnrollKeys doesn't do anything without autoGenerateKeys.";
+        }
+      ];
+
+      boot.loader.limine.secureBoot.autoGenerateKeys = true;
+    })
   ];
 }

nixos/modules/system/boot/luksroot.nix

@@ -635,7 +635,6 @@ in
       type = types.listOf types.str;
       default = [
         "aes"
-        "aes_generic"
         "blowfish"
         "twofish"
         "serpent"

nixos/modules/system/boot/stratisroot.nix

@@ -76,7 +76,6 @@ in
       ]
       ++ [
         "aes"
-        "aes_generic"
         "blowfish"
         "twofish"
         "serpent"

nixos/tests/limine/secure-boot.nix

@@ -24,7 +24,9 @@
       boot.loader.limine.enable = true;
       boot.loader.limine.efiSupport = true;
       boot.loader.limine.secureBoot.enable = true;
-      boot.loader.limine.secureBoot.createAndEnrollKeys = true;
+      boot.loader.limine.secureBoot.autoGenerateKeys = true;
+      boot.loader.limine.secureBoot.autoEnrollKeys.enable = true;
+      boot.loader.limine.secureBoot.autoEnrollKeys.extraArgs = [ "--yes-this-might-brick-my-machine" ];
       boot.loader.timeout = 0;
 
       environment.systemPackages = [ pkgs.mokutil ];

pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pcfx";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pcfx-libretro";
-    rev = "dd04cef9355286488a1d78ff18c4c848a1575540";
-    hash = "sha256-oFBuriCbJWjgPH9RRAM/XUvkW0gKXnvs7lmBpJpWewo=";
+    rev = "035191393485280cad1866ce3aedd626d4fa09d0";
+    hash = "sha256-jchEbKvHSE4D90ezwi//nl8vefQD4gp6YWb0eb6zkeY=";
   };
 
   makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/melonds.nix

@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "melonds";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-03-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "melonds";
-    rev = "7a3c11ff970cd36ca806961fae6db94b30dd5401";
-    hash = "sha256-YGkRdth7qdATcZpJkBd5MGOJFG1AbeJhAnyir+ssZYA=";
+    rev = "e548eba517ccb964ddba31dcf8f0136041f5bb05";
+    hash = "sha256-4bCunBPpBP0RWwL1vUTQxLPtCBnQ0M5pC3GAX1uTL5A=";
   };
 
   extraBuildInputs = [

pkgs/applications/emulators/libretro/cores/nestopia.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nestopia";
-  version = "0-unstable-2026-02-28";
+  version = "0-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nestopia";
-    rev = "c0ae3bcbe78a1a21a20384b96b70774cc165d2c2";
-    hash = "sha256-T4SC2yH/il6fjYd+4cWK4c+VqHMBc0uR3sXzPF6Z4O0=";
+    rev = "b0fd87dd07e3c52903435d302b04e5e97796f127";
+    hash = "sha256-OQcjGCAwXQEiWKYldKgOzMwIJcWTR308v+0OcuzFTo8=";
   };
 
   makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/picodrive.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "picodrive";
-  version = "0-unstable-2025-12-03";
+  version = "0-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "picodrive";
-    rev = "3365b1774bc8680be9899968fe45b224ad2f11c1";
-    hash = "sha256-hn80Dkdf6dMmCFoh9QeySVbF7tu8Vc1NfAl3SV8AZLg=";
+    rev = "f0d4a0118a9733a1f10bce5a4ac772c474f9300d";
+    hash = "sha256-q584bnqIbKoXSCRHUAcqSJAIhholnXfbphvLVcbm57o=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -45,13 +45,13 @@
     "vendorHash": "sha256-btxzZZtvgeih+OUhc5QnF8ac22TxpGibffGNkljjq6c="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-MkFDIGixsjQ6NfzI1X6fiLX4ozi7QA82jGryne/TcBU=",
+    "hash": "sha256-oTQaH0E3e7gBn5BuoDUOGX6plQSQR2Ki6cRzIr31qvs=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.273.0",
+    "rev": "v1.274.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0="
+    "vendorHash": "sha256-Kk0YeStlev8AurZasORMe/42Rd3ZPFoFMat/rMpZFbE="
   },
   "aminueza_minio": {
     "hash": "sha256-aWsMTUNIDwBzI/qsy78uA3ELnzUA+c4jP2jGD7QqrvI=",
@@ -1229,11 +1229,11 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-HPryfdykq6m9L66z4gC8tb1F4tTHLk9H4UN2/lnNpu4=",
+    "hash": "sha256-j9D4rUjnBQqobAu5yXo5fCJSwkVSovmrroowBTuLIVQ=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.45.0",
+    "rev": "v1.47.1",
     "spdx": "MIT",
     "vendorHash": "sha256-Ub0lqMdCu44UX3LkcjErsxfWdL9C6CxhVKPOn1AAdEc="
   },

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix

@@ -7,7 +7,7 @@
 
 mkHyprlandPlugin (finalAttrs: {
   pluginName = "hypr-darkwindow";
-  version = "0.54.2";
+  version = "0.54.3";
 
   src = fetchFromGitHub {
     owner = "micha4w";

pkgs/build-support/dart/build-dart-application/default.nix

@@ -194,16 +194,10 @@ lib.extendMkDerivation {
           # Ensure that we inherit the propagated build inputs from the dependencies.
           builtins.attrValues pubspecLockData.dependencySources;
 
-      preConfigure = args.preConfigure or "" + ''
-        ln -sf "$pubspecLockFilePath" pubspec.lock
-      '';
-
       # When stripping, it seems some ELF information is lost and the dart VM cli
       # runs instead of the expected program. Don't strip if it's an exe output.
       dontStrip = args.dontStrip or (dartOutputType == "exe");
 
-      passAsFile = [ "pubspecLockFile" ];
-
       passthru = {
         pubspecLock = pubspecLockData;
       }

pkgs/by-name/ag/age-plugin-yubikey/package.nix

@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       kranzes
       vtuan10
       adamcstephens
+      kaynetik
     ];
   };
 })

pkgs/by-name/ag/age/package.nix

@@ -80,6 +80,9 @@ buildGoModule (finalAttrs: {
     description = "Modern encryption tool with small explicit keys";
     license = lib.licenses.bsd3;
     mainProgram = "age";
-    maintainers = with lib.maintainers; [ tazjin ];
+    maintainers = with lib.maintainers; [
+      tazjin
+      kaynetik
+    ];
   };
 })

pkgs/by-name/al/all-the-package-names/package.nix

@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2395";
+  version = "2.0.2405";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-gJ4wW9KY8xaNNyhQqzEF42yxJFKEy/zxBEe1L2Jwp8U=";
+    hash = "sha256-dimap7vybYHNGSAWn6K8uMUMymrV8Ek5Vc27bbJo22w=";
   };
 
-  npmDepsHash = "sha256-J+XkwEMigShzqSstJh1N+Q8WB//gMmOdDVYHs1myLBA=";
+  npmDepsHash = "sha256-13u+UoTckxKAmthuaxOCaGSW4BaAgWaz6/4dBcO+3VI=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/am/amazon-cloudwatch-agent/package.nix

@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "amazon-cloudwatch-agent";
-  version = "1.300065.0";
+  version = "1.300066.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-cloudwatch-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iAM8x3NXLQ20QJFB6Og4YKimUB7r+doTVnq/b9Q7alc=";
+    hash = "sha256-cN1wxJKijx5P3JvtH+WX+3SYfar7xmM6XK2JABg+3lo=";
   };
 
-  vendorHash = "sha256-i5Lhz36ZAfZW2Y3s31TcBx1uWuMKmtROBhmHf2GiGyo=";
+  vendorHash = "sha256-W+DEQAX6BP6xwucE0mciQ4wzsIlF1b7d2Y+dyN43Lnw=";
 
   # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
   subPackages = [

pkgs/by-name/at/atuin/package.nix

@@ -70,6 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       sciencentistguy
       _0x4A6F
       rvdp
+      kaynetik
     ];
     mainProgram = "atuin";
   };

pkgs/by-name/ba/bazel-buildtools/package.nix

@@ -41,6 +41,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       elasticdog
+      kaynetik
     ];
     teams = [ lib.teams.bazel ];
   };

pkgs/by-name/ba/bazelisk/package.nix

@@ -32,6 +32,9 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/bazelbuild/bazelisk";
     changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ elasticdog ];
+    maintainers = with lib.maintainers; [
+      elasticdog
+      kaynetik
+    ];
   };
 })

pkgs/by-name/bt/btest/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  sqlite,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "btest";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "manawenuz";
+    repo = "btest-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ltePF8HX46FDbdyq30u19FNVpIwPxhOo8AgNvKRzKHE=";
+  };
+
+  cargoHash = "sha256-8AO7eTzZMzvNWcls3VXP0kPun/D5gsA1ih0FOqZ57R0=";
+
+  postPatch = ''
+    # https://github.com/manawenuz/btest-rs/pull/1
+    substituteInPlace Cargo.toml \
+      --replace-fail "0.6.0" "${finalAttrs.version}"
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  buildInputs = [
+    openssl
+    sqlite
+  ];
+
+  # Tests require network features
+  doCheck = false;
+
+  doInstallCheck = true;
+
+  meta = {
+    description = "Bandwidth Test server and client";
+    homepage = "https://github.com/manawenuz/btest-rs";
+    changelog = "https://github.com/manawenuz/btest-rs/releases/tag/v${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "btest";
+  };
+})

pkgs/by-name/bu/buffybox/package.nix

@@ -1,5 +1,6 @@
 {
   fetchFromGitLab,
+  fetchpatch,
   inih,
   lib,
   libdrm,
@@ -15,18 +16,36 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffybox";
-  version = "3.4.2-unstable-2025-10-25";
-  # 3.4.2 would be preferred but there are 3 commits past 3.4.2 that are really nice to have
+  version = "3.5.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.postmarketos.org";
     owner = "postmarketOS";
     repo = "buffybox";
     fetchSubmodules = true; # to use its vendored lvgl
-    rev = "437ff2cbd7fd35ba6ca2d46624e7fcf8c5f3f954";
-    hash = "sha256-1GRsntNc3byHmZKLG/ZRXvbo96DjmLrA0bVYtMAlKsQ=";
+    tag = finalAttrs.version;
+    hash = "sha256-aOPfKqnUIkJozt+DwVJjbNQEcmpjCmUgJUjTx9LV23M=";
   };
 
+  mesonFlags = [
+    (lib.mesonBool "systemd" true)
+  ];
+
+  patches = [
+    /*
+      There's a close to zero chance that anyone with a 32-bit machine will be using BuffyBox.
+      In the case that it happens, I expect no complaints whatsoever.
+
+      https://gitlab.postmarketos.org/postmarketOS/buffybox/-/merge_requests/87
+    */
+
+    (fetchpatch {
+      name = "fix-32-bit-build";
+      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/merge_requests/87.patch";
+      hash = "sha256-GUk+YrG07hL+0w70qvymPzHGTmUXdfzG4Cy35gg/Asw=";
+    })
+  ];
+
   depsBuildBuild = [
     pkg-config
   ];
@@ -54,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Suite of graphical applications for the terminal";
     homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox";
+    changelog = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/blob/main/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ colinsane ];
     platforms = lib.platforms.linux;

pkgs/by-name/cl/claude-code-bin/manifest.json

@@ -1,46 +1,46 @@
 {
-  "version": "2.1.90",
-  "buildDate": "2026-04-01T22:59:02Z",
+  "version": "2.1.91",
+  "buildDate": "2026-04-02T22:04:30Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "73c1a7570501ca743cd2d7467cb4699103534a2138052a4e6cab53c0e09d79c8",
-      "size": 197828752
+      "checksum": "7433d76d3ec5d223a340e21d7a05f3d481d89999f228113168ad5d64c66fd376",
+      "size": 198092944
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "9934675063ea4360665b7a43f649c92e6ba5cf93257324af7af1a6b490746395",
-      "size": 199326928
+      "checksum": "47409dc476c199711d5c776cf359773f75cb9dc72ce7494a4e4cb100520e8ab4",
+      "size": 199574608
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "15d5089ee7d9981faacf5463eabd427a012814d9fc02113883bb23a4f387ad4a",
-      "size": 230165056
+      "checksum": "dddba100b352ea6d06aa7e036d5afe49749edddd1309a4aa22e47049fafcadf9",
+      "size": 230427200
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "6074e3959989b2958a9abec60adf7b441a0f6f1c7e66401abff0fe54dad04fd6",
-      "size": 229902976
+      "checksum": "01b74e1b02e3330940b3526d2f6e00bf32f7fd9e6b3861be6a61e01cfd7296e6",
+      "size": 230161024
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "2508fa1c9c0575cf6fa26f2561ff7f0fd83be5fb4c6f9ec8281dfd5911d44371",
-      "size": 223218112
+      "checksum": "3dcaacefb510f6aee3573d35fe65f5dccbbbf4b6fdcca9a5a5455c03556a2f8b",
+      "size": 223480256
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "854746d04db11f543ed8d3836b5316366d965e6b6cfa2ac6312e6f7a5c4b5cb1",
-      "size": 224201152
+      "checksum": "b05d9447b7d9a4fa92f936b2275ca87db3bada52d8589bf4e4c49d437366942a",
+      "size": 224459200
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "f6be38fbdcadc373e93f751d1286845f58b032690e32be8f64799380a295a79f",
-      "size": 239622816
+      "checksum": "12f69849f6774749718520f41fb94f6fc30779b55d8f9b0acaaf20c755e6b55d",
+      "size": 239873184
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "019f7210055cd7a884d13c4e6a0b6caf1a82348ee42950b7b5247a4b0484709c",
-      "size": 236335776
+      "checksum": "389de7f1f2b979cb4098f7752ca0099275cedabcfe3908a9886d143ef594972b",
+      "size": 236586144
     }
   }
 }

pkgs/by-name/cl/claude-code/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.1.90",
+  "version": "2.1.91",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.1.90",
+      "version": "2.1.91",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"

pkgs/by-name/cl/claude-code/package.nix

@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.1.90";
+  version = "2.1.91";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-4/hqWrY2fncQ8p0TxwBAI+mNH98ZDhjvFqB9us7GJK0=";
+    hash = "sha256-u7jdM6hTYN05ZLPz630Yj7gI0PeCSArg4O6ItQRAMy4=";
   };
 
-  npmDepsHash = "sha256-kWbbIAoNAQ/BtsICmsabkfnS/1Nta5MQ4iX9+oH7WRw=";
+  npmDepsHash = "sha256-0ppKP+XMgTzVVZtL7GDsOjgvSPUDrUa7SoG048RLaNg=";
 
   strictDeps = true;
 

pkgs/by-name/cr/cryptomator/package.nix

@@ -10,6 +10,7 @@
   maven,
   wrapGAppsHook3,
   nix-update-script,
+  freetype,
 }:
 
 let
@@ -86,6 +87,7 @@ maven.buildMavenPackage rec {
         lib.makeLibraryPath [
           fuse3
           libayatana-appindicator
+          freetype
         ]
       }" \
       --set JAVA_HOME "${jdk.home}"
@@ -119,6 +121,7 @@ maven.buildMavenPackage rec {
     glib
     jdk
     libayatana-appindicator
+    freetype
   ];
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/da/dasel/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dasel";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+TSjwxlh1uvN5Dpe2FeNi/x4QkQ87EcHhoRDcFyHMFw=";
+    hash = "sha256-W/qMrg+B/T19pguKiB4MHZF5OF3LqfH8b+5ke6feZNQ=";
   };
 
   vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE=";

pkgs/by-name/db/dbip-asn-lite/package.nix

@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-asn-lite";
-  version = "2026-03";
+  version = "2026-04";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-cGdiwiJP6JUNZ8rKZK/XvtNglVWhm81ap7VmVdOW6NE=";
+    hash = "sha256-wJA6XqFbVxsWNEJ4AzwiKMOjsayJczVU/L3i98Y1x+I=";
   };
 
   dontUnpack = true;

pkgs/by-name/db/dbip-city-lite/package.nix

@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-city-lite";
-  version = "2026-03";
+  version = "2026-04";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-Vfi3SiGKs8l2mc5AROuIF6afgpOl5HgZWBSKd7orBoI=";
+    hash = "sha256-sIb1DGVNmvV0B3ltTcT4yQkMMMiZt89X0eDIzT0U/r8=";
   };
 
   dontUnpack = true;

pkgs/by-name/db/dbip-country-lite/package.nix

@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2026-03";
+  version = "2026-04";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-YlPwkNIbI6kAnt5zGPhp5P/NnY6l9UTK0LJM2OEkgW4=";
+    hash = "sha256-d+6Bq1l6XZHI+maW20SmpXjfP9O1a4FmhtfL3poEOfs=";
   };
 
   dontUnpack = true;

pkgs/by-name/de/deezer-enhanced/package.nix

@@ -34,11 +34,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "deezer-enhanced";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
-    hash = "sha256-PRq5R0AXCsW+cEuf1EU+o7g6oa8K5jGAphoNC8cSNFw=";
+    hash = "sha256-UN+Jdtx6Zgt1c4Phc2mVmvL2fCw208vltzPPD8zpHBc=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/de/devbox/package.nix

@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "devbox";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "jetify-com";
     repo = "devbox";
     tag = finalAttrs.version;
-    hash = "sha256-bW37yUZSqSYZeGHbWEFom5EjHdFhr/cFAhLX908zKRM=";
+    hash = "sha256-WwNbbrBm3/iWNCdHh0f+ey06BlibCPkCRXgBoyaJffU=";
   };
 
   ldflags = [
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
   # integration tests want file system access
   doCheck = false;
 
-  vendorHash = "sha256-xrN5AGc/f9CaI6WDfEFpJrRbPuBfxsjTGrEG4RbxVtM=";
+  vendorHash = "sha256-zZUE0J6w1QbdMAKOt1xH3ql4G5FbaUgtD4Xpsw/tmIk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/do/dosage-tracker/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosage";
-  version = "2.1.4";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Dosage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fp+BXT/HpoceFogn8oeRVEKGCqOVLTc8lca2epn3D78=";
+    hash = "sha256-opaQx42USA9OHRsPHukhBrdLPN2cD/T9QE9plZrBETo=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/318830

pkgs/by-name/dr/drift/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "drift";
-  version = "0.6.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "phlx0";
     repo = "drift";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CDQEeP/ZEr4rQcNjMMK692+45E8OCzkDp1JNlJVuokc=";
+    hash = "sha256-oSSuh4LNihLoy4qwMx97+oCuapp18d2GV52bq4yXcqE=";
   };
 
   vendorHash = "sha256-FsNa9qp2MnPk1onv/O13mFi+82yP7D4LdILZsNzHs+4=";

pkgs/by-name/el/eliza/package.nix

@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eliza";
-  version = "0-unstable-2026-01-08";
+  version = "0-unstable-2026-03-28";
   src = fetchFromGitHub {
     owner = "anthay";
     repo = "ELIZA";
-    rev = "d03085e78f16e1febdbd878f602d58ef73072c93";
-    hash = "sha256-AGr/nWXp7NINxKg4wudcX0R1ckZSvbDDOLjv2kW0oP8=";
+    rev = "626ce3881a0a6b54c56ce3efa87623e0a1dc8dfb";
+    hash = "sha256-8AEOmMM/gN3khe+c8GQOcOartyOr06T7F6853e9fUto=";
   };
 
   doCheck = true;

pkgs/by-name/ez/eza/package.nix

@@ -75,6 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       cafkafk
       _9glenda
       sigmasquadron
+      kaynetik
     ];
     platforms = with lib.platforms; unix ++ windows;
   };

pkgs/by-name/fm/fmd-server/package.nix

@@ -5,7 +5,7 @@
   fetchPnpmDeps,
   nix-update-script,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   stdenv,
   versionCheckHook,
@@ -26,8 +26,8 @@ buildGoModule (
     };
 
     pnpmDeps = fetchPnpmDeps {
-      inherit (ui) pname;
-      inherit pnpm;
+      inherit (ui) pname src;
+      inherit pnpm_10;
       sourceRoot = "${finalAttrs.src.name}/${ui.pnpmRoot}";
       fetcherVersion = 3;
       hash = "sha256-fgqNaFQ4+uJxXzDJJq+D0+EFaLaYR+WUzi5kGq5ezjs=";
@@ -51,7 +51,7 @@ buildGoModule (
       nativeBuildInputs = [
         nodejs
         pnpmConfigHook
-        pnpm
+        pnpm_10
       ];
 
       buildPhase = ''

pkgs/by-name/fo/fosrl-pangolin/package.nix

@@ -29,16 +29,16 @@ in
 
 buildNpmPackage (finalAttrs: {
   pname = "pangolin";
-  version = "1.15.3";
+  version = "1.16.2";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "pangolin";
     tag = finalAttrs.version;
-    hash = "sha256-UGfwbFbuQ0ljipCjnPxZ/Is2hh1vjZJb97Lo/43sWeg=";
+    hash = "sha256-pWD2VinfkCiSSP6/einXgduKQ8lzWdHlrj2eqUU/x6Y=";
   };
 
-  npmDepsHash = "sha256-kfgwU5QusUNWVcRXlYCS3ES1Av/phCHG8nFBj0yjz2Q=";
+  npmDepsHash = "sha256-CwS26eRAIuxJ2fekRRapDWYAOHXPV0mIX/by4uW2ZOM=";
 
   nativeBuildInputs = [
     esbuild
@@ -49,12 +49,16 @@ buildNpmPackage (finalAttrs: {
   # Based on pkgs.nextjs-ollama-llm-ui.
   postPatch = ''
     substituteInPlace src/app/layout.tsx --replace-fail \
-      "{ Geist, Inter, Manrope, Open_Sans } from \"next/font/google\"" \
+      "{ Inter } from \"next/font/google\"" \
       "localFont from \"next/font/local\""
 
     substituteInPlace src/app/layout.tsx --replace-fail \
-      "const font = Inter({${"\n"}    subsets: [\"latin\"]${"\n"}});" \
-      "const font = localFont({ src: './Inter.ttf' });"
+      "const inter = Inter({${"\n"}    subsets: [\"latin\"]${"\n"}});" \
+      "const inter = localFont({ src: './Inter.ttf' });"
+
+    substituteInPlace server/lib/consts.ts --replace-fail \
+      'export const APP_VERSION = "1.16.0";' \
+      'export const APP_VERSION = "${finalAttrs.version}";'
 
     cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf
   '';
@@ -62,7 +66,7 @@ buildNpmPackage (finalAttrs: {
   preBuild = ''
     npm run set:${db false}
     npm run set:oss
-    npm run db:${db false}:generate
+    npm run db:generate
   '';
 
   buildPhase = ''

pkgs/by-name/gi/github-markdown-toc-go/package.nix

@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "github-markdown-toc-go";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "ekalinin";
     repo = "github-markdown-toc.go";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hCkahhnTAF17ctJTL83wZxZiKGDzIKLwWKTTnwYQ3cs=";
+    hash = "sha256-sHXgtw+6LX7ryT8SWYWbEYu1iZCkeDZDP7houcsORJI=";
   };
 
   vendorHash = "sha256-K5yb7bnW6eS5UESK9wgNEUwGjB63eJk6+B0jFFiFero=";

pkgs/by-name/gi/gitu/package.nix

@@ -11,20 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitu";
-  version = "0.40.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-JNa9foW5z0NrXk5r/Oep20+u7YRhkzMIZQPHlZVifGI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Q1U9a9GZJcpAF6VDqBGZW4eBW/5P6uz+C+/2+/vjqTM=";
   };
 
-  patches = [
-    ./unit-tests-compile.patch
-  ];
-
-  cargoHash = "sha256-mQ5xXYVmadmNx57nnJGICZ2dhll+V3PkYK+hwTTfdVE=";
+  cargoHash = "sha256-RP8n3RZzWA0AYhsRnblmzefRsT6+Qje2ah7eFYk69ow=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/gi/gitu/unit-tests-compile.patch

@@ -1,31 +0,0 @@
-diff --git i/src/git/parse/status/mod.rs w/src/git/parse/status/mod.rs
-index 5595ca1..8929d79 100644
---- i/src/git/parse/status/mod.rs
-+++ w/src/git/parse/status/mod.rs
-@@ -703,10 +703,12 @@ R  old.rs -> new.rs
-             for c2 in &status_chars {
-                 input.push(*c1);
-                 input.push(*c2);
-+                let c1_str = c1.to_string();
-+                let c2_str = c2.to_string();
-                 input.push_str(&format!(
-                     " file_{}_{}.txt\n",
--                    if *c1 == ' ' { "space" } else { &c1.to_string() },
--                    if *c2 == ' ' { "space" } else { &c2.to_string() }
-+                    if *c1 == ' ' { "space" } else { &c1_str },
-+                    if *c2 == ' ' { "space" } else { &c2_str }
-                 ));
-                 count += 1;
-             }
-diff --git i/src/tests/remote.rs w/src/tests/remote.rs
-index 7a81a50..0ac14f5 100644
---- i/src/tests/remote.rs
-+++ w/src/tests/remote.rs
-@@ -1,6 +1,6 @@
- use git2::{Buf, Error, Repository};
- 
--use crate::{git::remote::*, repo_setup_clone, setup_clone, tests::helpers::RepoTestContext};
-+use crate::{git::remote::*, repo_setup_clone, tests::helpers::RepoTestContext};
- 
- use super::*;
- 

pkgs/by-name/gl/glab/package.nix

@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.89.0";
+  version = "1.91.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kc3ievJASceFGwv/c84719FlIKFX90i2H8wG8Yr08io=";
+    hash = "sha256-AXScsFVN8vEdhjM4m4VK41tje9QABp0OGq+8sPM+4oo=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-eKwYddkcFDmiZbGFJGx53FuyMHeeWYnMfX3WbDWb40w=";
+  vendorHash = "sha256-idxt6qrs2CPO4SvZEuZNy12mw7dy1dslfuVn1ufrZ5Y=";
 
   ldflags = [
     "-s"

pkgs/by-name/gw/gws/package.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gws";
-  version = "0.22.1";
+  version = "0.22.5";
 
   src = fetchFromGitHub {
     owner = "googleworkspace";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yDgUvFXBhm7SNi51JeOm4+EOowNmY3dS0vF+AM6BygM=";
+    hash = "sha256-Bj4gPklufU6p2JpvN6j7QViv7ghSn52jemeXPVXkhlk=";
   };
 
-  cargoHash = "sha256-9Ncn0r3Pih962l/4HKZjyWCvyCPQODIPX/oyroA1kL0=";
+  cargoHash = "sha256-8vVTACodxxju4x19bNzDKM5xn6btV1UCh+5GUxS70S8=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/im/img4lib/package.nix

@@ -5,6 +5,7 @@
   pkg-config,
   openssl,
   lzfse,
+  gcc,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "img4lib";
@@ -17,9 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xCWovBJ9cxT17u1uo+aUQnxDoYFQXYy9Qer0mD45aOU=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin gcc;
 
   buildInputs = [
     lzfse
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     # No licensing information available
     # https://github.com/xerub/img4lib/issues/14
     license = lib.licenses.unfree;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ onny ];
     mainProgram = "img4";
   };

pkgs/by-name/in/infrastructure-agent/package.nix

@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "infrastructure-agent";
-  version = "1.72.9";
+  version = "1.73.0";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = finalAttrs.version;
-    hash = "sha256-aWZDg8MbtWp62sqBRVCr+xVowFTVwL0TIWK0Nx2jLa8=";
+    hash = "sha256-NcpfigIpwnesZtD2BQm/NMN3jsdgdH7sAkZ74rbHSZo=";
   };
 
   vendorHash = "sha256-0yDH9l5NyUzIjjUMnf/u2t02uqNGIK2qfakvImFgmdA=";

pkgs/by-name/io/iosevka/package.nix

@@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "34.2.1";
+  version = "34.3.0";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-yj46lNYOzaopu5Mo68jwh+xf/q/bjMmQdprh6e56eeY=";
+    hash = "sha256-Se+GIx+Uea/lMOdTDhbt/H+F0yeyMHclpSp52U+pmtA=";
   };
 
-  npmDepsHash = "sha256-it0YwPcoYCIMddktgywBuYvvx3Psghoii3pu0K3RDlI=";
+  npmDepsHash = "sha256-LSfVuNP2Ck0PUbrjHsCXmoiZfT3x/Mk+CpC9cAj96bE=";
 
   nativeBuildInputs = [
     remarshal

pkgs/by-name/k8/k8sgpt/package.nix

@@ -8,7 +8,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "k8sgpt";
-  version = "0.4.30";
+  version = "0.4.31";
 
   nativeBuildInputs = [
     installShellFiles
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
     owner = "k8sgpt-ai";
     repo = "k8sgpt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8hzJEJ+aZ+nVleStMngRortRLEoW+6FhcYBgin3Z/3Y=";
+    hash = "sha256-+cjCDcRdj6A17eT7IJ/OKgWTXex4zXz9pbmrcc2w2bM=";
   };
 
   vendorHash = "sha256-zljqZWM1jSAC+ZhW1NNp182Ui/40u0VTtfolnPXQKqE=";

pkgs/by-name/k9/k9s/package.nix

@@ -78,6 +78,7 @@ buildGoModule (finalAttrs: {
       qjoly
       devusb
       ryan4yin
+      kaynetik
     ];
   };
 })

pkgs/by-name/ku/kubectl-cnpg/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-cnpg";
-  version = "1.28.1";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9NfjrVF0OtDLaGD5PPFSZcI8V3Vy/yOTm/JwnE3kMZE=";
+    hash = "sha256-D4Z2v0bBctQPVm7lblyQP3qD16GXGLF+5gQ6tCsuu8M=";
   };
 
-  vendorHash = "sha256-QNtKtHTxOgm6EbOSvA2iUE0hjltwTBNkA1mIC3N+AbM=";
+  vendorHash = "sha256-WDVipOz2yx9kvSQnc0Fnn+es0OhLgXye4e6jro0xDZ8=";
 
   subPackages = [ "cmd/kubectl-cnpg" ];
 

pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix

@@ -13,20 +13,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lasuite-docs-collaboration-server";
-  version = "4.8.1";
+  version = "4.8.4";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY=";
+    hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM=";
+    hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,10 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/suitenumerique/docs/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "docs-collaboration-server";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ soyouzpanda ];
+    maintainers = with lib.maintainers; [
+      soyouzpanda
+      ma27
+    ];
     platforms = lib.platforms.all;
   };
 })

pkgs/by-name/la/lasuite-docs-frontend/package.nix

@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   stdenv,
+  fetchpatch,
   fetchYarnDeps,
   nodejs,
   fixup-yarn-lock,
@@ -12,20 +13,30 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lasuite-docs-frontend";
-  version = "4.8.1";
+  version = "4.8.4";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY=";
+    hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
+  patches = [
+    # from https://github.com/suitenumerique/docs/pull/2147,
+    # fixes the frontend when using the MIT build.
+    (fetchpatch {
+      url = "https://github.com/suitenumerique/docs/commit/79e909cf6489428d8f6644d772006f73503b7073.patch";
+      hash = "sha256-Ucw1KtsFrPvtoeeG2fH5L64Jfcog4RV38Qg+EykGcQY=";
+      stripLen = 2;
+    })
+  ];
+
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock";
-    hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM=";
+    hash = "sha256-ElI6WWKPCsO7Viexgp2XtcjXAXzFnG2ZPN5PjOaKO2g=";
   };
 
   nativeBuildInputs = [
@@ -51,7 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/suitenumerique/docs";
     changelog = "https://github.com/suitenumerique/docs/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ soyouzpanda ];
+    maintainers = with lib.maintainers; [
+      soyouzpanda
+      ma27
+    ];
     platforms = lib.platforms.all;
   };
 })

pkgs/by-name/la/lasuite-docs/package.nix

@@ -11,12 +11,12 @@
   yarnConfigHook,
 }:
 let
-  version = "4.8.1";
+  version = "4.8.4";
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "docs";
     tag = "v${version}";
-    hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY=";
+    hash = "sha256-k90JxFxXL3vEGBMkgbQABUCK99utJ88E/v9Zcj/2oBo=";
   };
 
   mail-templates = stdenv.mkDerivation {
@@ -29,7 +29,7 @@ let
 
     offlineCache = fetchYarnDeps {
       yarnLock = "${src}/src/mail/yarn.lock";
-      hash = "sha256-ag9+g48dWl5Ww/78qqgtcKwiyPVlpNiJ7w7+DPaar2U=";
+      hash = "sha256-Fd9HJ7c7fh8YYZrfzRK7BnlnHAXeyeQ9UBabnRlA+w0=";
     };
 
     nativeBuildInputs = [
@@ -88,6 +88,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       django-storages
       django-timezone-field
       django-treebeard
+      django-waffle
       djangorestframework
       drf-spectacular
       drf-spectacular-sidecar
@@ -145,6 +146,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
       mkdir -p $out/${python3.sitePackages}/core/templates
       ln -sv ${mail-templates}/ $out/${python3.sitePackages}/core/templates/mail
+
+      cp -r impress/configuration $out/${python3.sitePackages}/impress/configuration
     '';
 
   passthru.tests = {
@@ -156,7 +159,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/suitenumerique/docs";
     changelog = "https://github.com/suitenumerique/docs/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ soyouzpanda ];
+    maintainers = with lib.maintainers; [
+      soyouzpanda
+      ma27
+    ];
     mainProgram = "docs";
     platforms = lib.platforms.all;
   };

pkgs/by-name/la/lazygit/package.nix

@@ -46,6 +46,7 @@ buildGoModule (finalAttrs: {
       khaneliman
       starsep
       sigmasquadron
+      kaynetik
     ];
     mainProgram = "lazygit";
   };

pkgs/by-name/li/liteparse/package.nix

@@ -10,16 +10,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "liteparse";
-  version = "1.2.0";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "run-llama";
     repo = "liteparse";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6oG/ajH1roGkzRYAtAuJDniKwpBYF92NL1erYwQ4XPc=";
+    hash = "sha256-UHZaKWjzaoYbD2NHwNgvlpPfviD66zPQ6d0UWW/lrmk=";
   };
 
-  npmDepsHash = "sha256-lgqrXGbFuHbwQMXPbhHFdOabfPdVhghmg5v+aE4Og2k=";
+  npmDepsHash = "sha256-Wz46n7BbubC3Cq1CHOHM2q/dVOvOVNQTloHZfkAwzpg=";
   npmBuildScript = "build";
 
   nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/by-name/me/meteor-git/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "meteor-git";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "stefanlogue";
     repo = "meteor";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oqfJDIT+4n9ySwmN5DoTvAcEY9wmI/bhVSYFHudMwl0=";
+    hash = "sha256-jX0peeI7vMk5CWcQCaR5pd3Klcragds0p7S4hsadyEM=";
   };
 
   vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo=";

pkgs/by-name/ns/nsc/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "nsc";
-  version = "2.12.1";
+  version = "2.12.2";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nsc";
     rev = "v${version}";
-    hash = "sha256-PTwdZ33GcqHmqpPu29S4MESjGiHHiIUnVOxufmXJX+U=";
+    hash = "sha256-jgGyCMS1jCCEj1zNEXpXhOc2t0lP1iXs7R3uDTKhhuk=";
   };
 
   ldflags = [
@@ -47,7 +47,7 @@ buildGoModule rec {
   # the test strips table formatting from the command output in a naive way
   # that removes all the table characters, including '-'.
   # The nix build directory looks something like:
-  # /private/tmp/nix-build-nsc-2.12.1.drv-0/nsc_test2000598938/keys
+  # /private/tmp/nix-build-nsc-2.12.2.drv-0/nsc_test2000598938/keys
   # Then the `-` are removed from the path unintentionally and the test fails.
   # This should be fixed upstream to avoid mangling the path when
   # removing the table decorations from the command output.

pkgs/by-name/nv/nvimpager/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvimpager";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "lucc";
     repo = "nvimpager";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA=";
+    sha256 = "sha256-hwUI0DlkXveE+m4BkO8xEF/IARqSVk2E6tw07+UtnbA=";
   };
 
   buildInputs = [

pkgs/by-name/ph/phpstan/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phpstan";
-  version = "2.1.43";
+  version = "2.1.46";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan";
     tag = finalAttrs.version;
-    hash = "sha256-HIRM73A+pXWUV0gdcGPI4vjEKAYntNUAVqg4iEKx9To=";
+    hash = "sha256-VZQhL9w2/eyMQJhnLTU50wVVjS1gGNKLcPkuEkE5ZaA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/po/podman-compose/package.nix

@@ -43,7 +43,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/containers/podman-compose";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.sikmir ];
+    maintainers = with lib.maintainers; [
+      sikmir
+      kaynetik
+    ];
     teams = [ lib.teams.podman ];
     mainProgram = "podman-compose";
   };

pkgs/by-name/po/podman-desktop/package.nix

@@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       booxter
+      kaynetik
     ];
     inherit (electron.meta) platforms;
     mainProgram = "podman-desktop";

pkgs/by-name/pr/prmers/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prmers";
-  version = "4.18.02-alpha";
+  version = "4.19.00-alpha";
 
   src = fetchFromGitHub {
     owner = "cherubrock-seb";
     repo = "PrMers";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0vzJDt/c21m+QvKbgP3LWYGopJAqz6zfD6+JakwYGwA=";
+    hash = "sha256-zG9JLBqIqQjiz8+QNogk/rFeoj1/irmhfbVVe9HTq6A=";
   };
 
   enableParallelBuilding = true;

pkgs/by-name/pr/proton-vpn/linux.nix

@@ -14,14 +14,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "proton-vpn";
-  version = "4.15.0";
+  version = "4.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bKUhrbfOLVjknljwW9UPo3Ros1Ayzb+be5KTUjPnIW0=";
+    hash = "sha256-mWQW/KR2zQxSMkcu5k79H3TNATmFB6J2vgFhgXNpM2s=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/re/render-cli/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "render-cli";
-  version = "2.5.0";
+  version = "2.15.1";
 
   src = fetchFromGitHub {
     owner = "render-oss";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-nOcgDTFngeO7xKB7e9oLtAGD/ZpQqw++CGjvJRu+PUI=";
+    hash = "sha256-a7yYSslRWa4d8TTAw128PukLBamqkpDr2oUUYBRgpCY=";
   };
 
-  vendorHash = "sha256-Kd4qbBwk4U/LIkfwQopMqN5DqKHN5BMCMYWSR+OSKN0=";
+  vendorHash = "sha256-K2RKcz5wAP0ZA5g5aDgSsEXKEEncFtO9qamgG3fW02Y=";
 
   # Tests require network access
   doCheck = false;

pkgs/by-name/re/resterm/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "resterm";
-  version = "0.23.6";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "unkn0wn-root";
     repo = "resterm";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-MVcLyPPnQIn0IZcGOoELRSQkI+BEIXSZfWeeZv6AILI=";
+    sha256 = "sha256-7AgxDA1E20H2WYGFuwCIyBcB/1Zt58AbQwkEkcJdnq0=";
   };
 
   vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";

pkgs/by-name/rg/rgx/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgx";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "brevity1swos";
     repo = "rgx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MmRTZ39Kp2fcx99QlwpYb3KLBO6vUIIseLJFBEXx3c4=";
+    hash = "sha256-04bnNHpIRMyqvRmXDjzGpeEHgwVDSoBtyunlt03nB5Q=";
   };
 
-  cargoHash = "sha256-wDSQ0y1Lbkx3LBmxA6COPSrKag7ihcwoWfTWhWCkcHE=";
+  cargoHash = "sha256-v7dO2TSCKb+E/jLYPw8Q499qFXmSnbv3/WoS+dZhyBM=";
 
   meta = {
     homepage = "https://github.com/brevity1swos/rgx";

pkgs/by-name/ri/ripgrep/package.nix

@@ -70,6 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       globin
       ma27
       zowoq
+      kaynetik
     ];
     mainProgram = "rg";
     platforms = lib.platforms.all;

pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix

@@ -13,15 +13,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rust-analyzer-unwrapped";
-  version = "2026-03-23";
+  version = "2026-03-30";
 
-  cargoHash = "sha256-osoNyx4UEbq0J2fx7WMJBfIRV3mhsO+OSBNrvu060IM=";
+  cargoHash = "sha256-nTllacWD0alq8OVKAPhcuMnAyPW2Uh0JAJkHhB9YcZ4=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = finalAttrs.version;
-    hash = "sha256-aEIdkqB8gtQZtEbogdUb5iyfcZpKIlD3FkG8ANu73/I=";
+    hash = "sha256-Cbpmf0+1pqi/zbpub2vkp5lTPx3QdVtDkkagDwQzHHg=";
   };
 
   cargoBuildFlags = [

pkgs/by-name/ry/ryzen-monitor-ng/package.nix

@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation {
   pname = "ryzen-monitor-ng";
-  version = "2.0.5-unstable-2023-11-05";
+  version = "0-unstable-2026-03-28";
 
   # Upstream has not updated ryzen_smu header version
   # This fork corrects ryzen_smu header version and
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "plasmin";
     repo = "ryzen_monitor_ng";
-    rev = "8b7854791d78de731a45ce7d30dd17983228b7b1";
-    hash = "sha256-xdYNtXCbNy3/y5OAHZEi9KgPtwr1LTtLWAZC5DDCfmE=";
+    rev = "d62a4304b2f1727de3970b81d81875133b5f8a68";
+    hash = "sha256-irX+Y3H16mNVOfh7Hi8jZ0+DbG7un7MvKaMqp+isjoo=";
     # Upstream repo contains pre-compiled binaries and object files
     # that are out of date.
     # These need to be removed before build stage.

pkgs/by-name/sc/scaleway-cli/package.nix

@@ -10,16 +10,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "scaleway-cli";
-  version = "2.53.0";
+  version = "2.54.0";
 
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IxnDmmvWH17xd2djroikwrQq0bLexWeN8VHMPiNEBhU=";
+    hash = "sha256-pmuyCc+hWXiUlqHi1nDS+51SDxUzIqXqs6Td0Bvjh2o=";
   };
 
-  vendorHash = "sha256-/UEE3XSbpwlywF8TMmp90bS537RRZG0yN0oq1sbrcPQ=";
+  vendorHash = "sha256-yB2/tHgbR5eJ6VyF49KI6FLyjeoE4om+Ajewofxzbs0=";
 
   env.CGO_ENABLED = 0;
 

pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2026-03-23";
+  version = "0-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "7c3baed7e78f4b85c12df22089b2b97410edec15";
-    hash = "sha256-HN5oKK0Et6qMlAu0jer+k5YV5YPsZMepia57bll4lf0=";
+    rev = "202d0070d75e51cdf2fc6e9c4d4662d87226d5c6";
+    hash = "sha256-79DvPUHzUw3XAnMQu3pNxZq0+CG9J1u5MiOTyG7pXkk=";
   };
 
   dontBuild = true;

pkgs/by-name/so/solanum/package.nix

@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "solanum";
-  version = "0-unstable-2026-03-22";
+  version = "0-unstable-2026-03-25";
 
   src = fetchFromGitHub {
     owner = "solanum-ircd";
     repo = "solanum";
-    rev = "6ac4d0e24e4b872b9f30adc743cf743e964d75d1";
-    hash = "sha256-5pW3QkSkmLoRrW/WjsDm4zCJLjwG0KVBKWbQe/iIgnM=";
+    rev = "d8d710c7bc052c3e24f76ca7a63da3a6ba6af8ea";
+    hash = "sha256-QnnxRRDou67/PorQ8YzVbQo2E3DF/f+cpR+hVecmyD0=";
   };
 
   postPatch = ''

pkgs/by-name/so/sops/package.nix

@@ -66,6 +66,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       Scrumplex
       mic92
+      kaynetik
     ];
     license = lib.licenses.mpl20;
   };

pkgs/by-name/st/stats/package.nix

@@ -1,29 +1,334 @@
 {
   lib,
-  stdenvNoCC,
-  fetchurl,
-  undmg,
+  swiftPackages,
+  fetchFromGitHub,
+  darwin,
+  leveldb,
+  perl,
+  actool,
+  makeWrapper,
   nix-update-script,
 }:
 
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "stats";
-  version = "2.12.1";
+let
+  inherit (swiftPackages) stdenv swift;
 
-  src = fetchurl {
-    url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-li4pCrwt37Wmmk3VAJT9XTcqPQ4HywQObUVSSgzARsE=";
+  frameworks = [
+    "Kit"
+    "CPU"
+    "GPU"
+    "RAM"
+    "Disk"
+    "Net"
+    "Battery"
+    "Bluetooth"
+    "Sensors"
+    "Clock"
+  ];
+  modules = lib.tail frameworks;
+
+  toPlist = lib.generators.toPlist { escape = true; };
+
+  frameworkPlist =
+    name:
+    toPlist {
+      CFBundleExecutable = name;
+      CFBundleIdentifier = "eu.exelban.Stats.${name}";
+      CFBundleInfoDictionaryVersion = "6.0";
+      CFBundleName = name;
+      CFBundlePackageType = "FMWK";
+      CFBundleVersion = "1";
+    };
+
+  mainInfoPlist =
+    version:
+    toPlist {
+      CFBundleDevelopmentRegion = "en";
+      CFBundleExecutable = "Stats";
+      CFBundleIdentifier = "eu.exelban.Stats";
+      CFBundleInfoDictionaryVersion = "6.0";
+      CFBundleName = "Stats";
+      CFBundlePackageType = "APPL";
+      CFBundleShortVersionString = version;
+      # CFBundleVersion is extracted from upstream's Info.plist at build time
+      Description = "Simple macOS system monitor in your menu bar";
+      LSApplicationCategoryType = "public.app-category.utilities";
+      LSMinimumSystemVersion = "11.0";
+      LSUIElement = true;
+      NSAppTransportSecurity = {
+        NSAllowsArbitraryLoads = true;
+      };
+      NSBluetoothAlwaysUsageDescription = "This permission allows obtaining battery level of Bluetooth devices";
+      NSHumanReadableCopyright = "Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.";
+      NSPrincipalClass = "NSApplication";
+      NSUserNotificationAlertStyle = "alert";
+      TeamId = "RP2S87B72W";
+    };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "stats";
+  version = "2.12.7";
+
+  src = fetchFromGitHub {
+    owner = "exelban";
+    repo = "Stats";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-qx4FI+MnFknIrTOPP+8wyy1wqFMWyaunmags023ay6A=";
   };
 
-  sourceRoot = ".";
+  nativeBuildInputs = [
+    swift
+    perl
+    actool
+    darwin.autoSignDarwinBinariesHook
+    makeWrapper
+  ];
 
-  nativeBuildInputs = [ undmg ];
+  buildInputs = [ leveldb ];
+
+  # Stats uses IOReport private API symbols declared in bridging headers
+  env.NIX_LDFLAGS = "-lIOReport";
+
+  # Swift 5.10 doesn't support trailing commas in argument lists (Swift 6 feature)
+  # Remove them from all Swift source files
+  postPatch = ''
+    find . -name '*.swift' -exec perl -0777 -pi -e '
+      s/,(\s*\))/$1/g;
+      s/\@retroactive //g;
+    ' {} +
+
+    # CWPHYMode.mode11be (WiFi 7) requires macOS 15+ SDK; @unknown default covers it
+    sed -i '/mode11be/d' Modules/Net/readers.swift
+
+  '';
+
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    buildDir="$PWD/build"
+    mkdir -p "$buildDir"
+
+    commonSwiftFlags=(
+      -O
+      -Xcc -IKit/lldb
+      -Xcc -IKit/lldb/include
+      -Xcc -I${leveldb.dev}/include/leveldb
+      -disable-bridging-pch
+      # Stamp binaries with macOS 26 SDK version so the system applies Liquid Glass UI
+      # The Swift compiler in nixpkgs uses SDK 14 headers (which compile fine), but without
+      # this flag the linker records SDK 14 and macOS withholds it (Liquid Glass)
+      -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0
+    )
+
+    buildFramework() {
+      local name="$1"
+      shift
+      local bridgingHeader="$1"
+      shift
+      local extraFlags=("$@")
+
+      echo "Building framework: $name"
+
+      local swiftFiles=()
+      while IFS= read -r -d "" f; do
+        swiftFiles+=("$f")
+      done < <(find "$name" -name '*.swift' -print0 2>/dev/null)
+
+      # For modules in Modules/ subdirectory
+      if [ ''${#swiftFiles[@]} -eq 0 ]; then
+        while IFS= read -r -d "" f; do
+          swiftFiles+=("$f")
+        done < <(find "Modules/$name" -name '*.swift' -print0 2>/dev/null)
+      fi
+
+      local bridgeFlags=()
+      if [ -n "$bridgingHeader" ]; then
+        bridgeFlags=(-import-objc-header "$bridgingHeader")
+      fi
+
+      swiftc \
+        "''${commonSwiftFlags[@]}" \
+        -emit-module \
+        -emit-library \
+        -module-name "$name" \
+        -module-link-name "$name" \
+        -emit-module-path "$buildDir/$name.swiftmodule" \
+        "''${bridgeFlags[@]}" \
+        -I "$buildDir" \
+        -L "$buildDir" \
+        -Xlinker -install_name -Xlinker "@rpath/$name.framework/$name" \
+        "''${extraFlags[@]}" \
+        "''${swiftFiles[@]}" \
+        -o "$buildDir/lib$name.dylib"
+    }
+
+    echo "=== Building Kit ==="
+
+    # Compile lldb.m (Objective-C++ with LevelDB)
+    clang++ -x objective-c++ \
+      -I Kit/lldb/include \
+      -I Kit/lldb \
+      -I ${leveldb.dev}/include/leveldb \
+      -fobjc-arc \
+      -O2 \
+      -c Kit/lldb/lldb.m \
+      -o "$buildDir/lldb.o"
+
+    kitSwiftFiles=()
+    while IFS= read -r -d "" f; do
+      kitSwiftFiles+=("$f")
+    done < <(find Kit -name '*.swift' -print0)
+    # Kit also compiles shared SMC source files (protocol.swift, smc.swift)
+    kitSwiftFiles+=("SMC/Helper/protocol.swift" "SMC/smc.swift")
+
+    swiftc \
+      "''${commonSwiftFlags[@]}" \
+      -emit-module \
+      -emit-library \
+      -module-name Kit \
+      -module-link-name Kit \
+      -emit-module-path "$buildDir/Kit.swiftmodule" \
+      -import-objc-header "Kit/Supporting Files/Kit.h" \
+      -Xcc -IKit/lldb \
+      -Xcc -IKit/lldb/include \
+      -Xcc -I${leveldb.dev}/include/leveldb \
+      -Xlinker -install_name -Xlinker "@rpath/Kit.framework/Kit" \
+      "$buildDir/lldb.o" \
+      -L ${leveldb}/lib -lleveldb \
+      -lstdc++ \
+      "''${kitSwiftFiles[@]}" \
+      -o "$buildDir/libKit.dylib"
+
+    buildFramework CPU "Modules/CPU/bridge.h" \
+      -lKit -framework IOKit
+
+    buildFramework GPU "" \
+      -lKit -framework IOKit -framework Metal
+
+    buildFramework RAM "" \
+      -lKit -framework IOKit
+
+    buildFramework Disk "Modules/Disk/header.h" \
+      -lKit -framework IOKit -framework DiskArbitration
+
+    buildFramework Net "" \
+      -lKit -framework IOKit -framework CoreWLAN -framework SystemConfiguration
+
+    buildFramework Battery "" \
+      -lKit -framework IOKit
+
+    buildFramework Bluetooth "" \
+      -lKit -framework IOKit -framework IOBluetooth -framework CoreBluetooth
+
+    # Build Sensors - needs ObjC file too
+    echo "Building framework: Sensors"
+
+    # Compile reader.m (ObjC)
+    clang -x objective-c \
+      -I "Modules/Sensors" \
+      -fobjc-arc \
+      -O2 \
+      -c Modules/Sensors/reader.m \
+      -o "$buildDir/sensors_reader.o"
+
+    sensorsSwiftFiles=()
+    while IFS= read -r -d "" f; do
+      sensorsSwiftFiles+=("$f")
+    done < <(find Modules/Sensors -name '*.swift' -print0)
+
+    swiftc \
+      "''${commonSwiftFlags[@]}" \
+      -emit-module \
+      -emit-library \
+      -module-name Sensors \
+      -module-link-name Sensors \
+      -emit-module-path "$buildDir/Sensors.swiftmodule" \
+      -import-objc-header "Modules/Sensors/bridge.h" \
+      -I "$buildDir" \
+      -L "$buildDir" \
+      -lKit \
+      -framework IOKit \
+      -Xlinker -install_name -Xlinker "@rpath/Sensors.framework/Sensors" \
+      "$buildDir/sensors_reader.o" \
+      "''${sensorsSwiftFiles[@]}" \
+      -o "$buildDir/libSensors.dylib"
+
+    buildFramework Clock "" \
+      -lKit
+
+    echo "=== Building Stats app ==="
+
+    statsSwiftFiles=()
+    while IFS= read -r -d "" f; do
+      statsSwiftFiles+=("$f")
+    done < <(find Stats -name '*.swift' -print0)
+
+    swiftc \
+      "''${commonSwiftFlags[@]}" \
+      -emit-executable \
+      -module-name Stats \
+      -I "$buildDir" \
+      -L "$buildDir" \
+      ${lib.concatMapStringsSep " " (fw: "-l${fw}") frameworks} \
+      -Xlinker -rpath -Xlinker "@executable_path/../Frameworks" \
+      "''${statsSwiftFiles[@]}" \
+      -o "$buildDir/Stats"
+
+    runHook postBuild
+  '';
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/Applications"
-    cp -r *.app "$out/Applications"
+    app="$out/Applications/Stats.app"
+    mkdir -p "$app/Contents/"{MacOS,Frameworks,Resources}
+
+    cp "$buildDir/Stats" "$app/Contents/MacOS/Stats"
+
+    # Install frameworks with generated Info.plists
+    ${lib.concatMapStrings (fw: ''
+      fwDir="$app/Contents/Frameworks/${fw}.framework"
+      mkdir -p "$fwDir/Resources"
+      cp "$buildDir/lib${fw}.dylib" "$fwDir/${fw}"
+      printf '%s' ${lib.escapeShellArg (frameworkPlist fw)} > "$fwDir/Resources/Info.plist"
+    '') frameworks}
+
+    printf '%s' ${lib.escapeShellArg (mainInfoPlist finalAttrs.version)} > "$app/Contents/Info.plist"
+    # Splice CFBundleVersion from upstream's checked-in Info.plist so it stays
+    # in sync automatically — nix-update-script bumps the tag & hash, and the
+    # new source tree carries the correct build number
+    bundleVersion=$(sed -n '/<key>CFBundleVersion<\/key>/{n;s/.*<string>\(.*\)<\/string>.*/\1/p;}' \
+      "Stats/Supporting Files/Info.plist")
+    sed -i "s|</dict>|<key>CFBundleVersion</key><string>$bundleVersion</string></dict>|" \
+      "$app/Contents/Info.plist"
+
+    # Compile asset catalogs
+    actool \
+      --compile "$app/Contents/Resources" \
+      --platform macosx \
+      --minimum-deployment-target 14.0 \
+      --app-icon AppIcon \
+      "Stats/Supporting Files/Assets.xcassets"
+
+    actool \
+      --compile "$app/Contents/Frameworks/Kit.framework/Resources" \
+      --platform macosx \
+      --minimum-deployment-target 14.0 \
+      "Kit/Supporting Files/Assets.xcassets"
+
+    # Copy localization files
+    find "Stats/Supporting Files" -name '*.lproj' -type d -exec cp -r {} "$app/Contents/Resources/" \;
+
+    # Copy module config plists into each framework's Resources
+    for mod in ${lib.concatStringsSep " " modules}; do
+      if [ -f "Modules/$mod/config.plist" ]; then
+        cp "Modules/$mod/config.plist" "$app/Contents/Frameworks/$mod.framework/Resources/config.plist"
+      fi
+    done
+
+    makeWrapper "$app/Contents/MacOS/Stats" "$out/bin/stats"
 
     runHook postInstall
   '';
@@ -40,6 +345,5 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       emilytrau
     ];
     platforms = lib.platforms.darwin;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

pkgs/by-name/tf/tflint/package.nix

@@ -61,6 +61,9 @@ buildGo125Module (finalAttrs: {
     homepage = "https://github.com/terraform-linters/tflint";
     changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ momeemt ];
+    maintainers = with lib.maintainers; [
+      momeemt
+      kaynetik
+    ];
   };
 })

pkgs/by-name/tf/tfsec/package.nix

@@ -38,6 +38,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab
+      kaynetik
     ];
   };
 })

pkgs/by-name/th/thunderbird-mcp/package-lock.json

@@ -0,0 +1,19 @@
+{
+  "name": "thunderbird-mcp",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "thunderbird-mcp",
+      "version": "0.1.0",
+      "license": "MIT",
+      "bin": {
+        "thunderbird-mcp": "mcp-bridge.cjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    }
+  }
+}

pkgs/by-name/th/thunderbird-mcp/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "thunderbird-mcp";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "TKasperczyk";
+    repo = "thunderbird-mcp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+m54jF39SoViHxDI18ewtVjeVUdRximJ6Ozcv1HVdiU=";
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  preInstall = "mkdir node_modules/";
+  forceEmptyCache = true;
+  dontNpmBuild = true;
+
+  npmDepsHash = "sha256-LbEnmABmAoTCTPNNbocl+n2TtFC3FOFwwTnyATxvM3k=";
+
+  meta = {
+    description = "MCP server for Thunderbird - enables AI assistants to access email, contacts, and calendars";
+    homepage = "https://github.com/TKasperczyk/thunderbird-mcp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "thunderbird-mcp";
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/tm/tmux/package.nix

@@ -113,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ethancedwards8
       fpletz
+      kaynetik
     ];
   };
 })

pkgs/by-name/tu/tuios/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tuios";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "Gaurav-Gosain";
     repo = "tuios";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cisbHTrp2k+henmxJOwcyfPG+SaxL6GWSa8OWGyimck=";
+    hash = "sha256-XPcgUDlIbwp278Kc9B0aXxxIX2XnsJpFzxHDaop9cLs=";
   };
 
-  vendorHash = "sha256-kDZRT/Ua+SaxyZ6RI9ZY2tqBgQBWo755fvQVRupBsUc=";
+  vendorHash = "sha256-98XZe60gcRWyP0ApUV+qCJ0UoAExx7X0FPtFL0Tr0a4=";
 
   ldflags = [
     "-s"

pkgs/by-name/us/usage/package.nix

@@ -12,16 +12,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "usage";
-  version = "3.0.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "usage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KC3fIfFnXn5K1E1CyHLADaEesXFilCrIe9MYOH/fkrI=";
+    hash = "sha256-0yonwl/2BIkGUs0uOBP+Pjo93NvLVK4QQQj/K4C4NNY=";
   };
 
-  cargoHash = "sha256-RNeHa3V4oCvtiR6/ntTegKl62ByWZbFeliFJVgsHYrQ=";
+  cargoHash = "sha256-jxTN+La7Ye2okRZGAY6niIvvRf2E4vFFHd1nny7JJDo=";
+
+  patches = [
+    ./use-bin-exe-env.patch
+  ];
 
   postPatch = ''
     substituteInPlace ./examples/*.sh \

pkgs/by-name/us/usage/use-bin-exe-env.patch

@@ -0,0 +1,17 @@
+diff --git a/cli/tests/shell_completions_integration.rs b/cli/tests/shell_completions_integration.rs
+index 815c44c..51b5dd9 100644
+--- a/cli/tests/shell_completions_integration.rs
++++ b/cli/tests/shell_completions_integration.rs
+@@ -25,6 +25,13 @@ fn run_complete_word(usage_bin: &Path, shell: &str, spec_file: &Path, words: &[&
+ 
+ /// Build the usage binary and return its path
+ fn build_usage_binary() -> PathBuf {
++    if let Some(usage_path) = std::env::var("CARGO_BIN_EXE_usage")
++        .ok()
++        .filter(|s| !s.is_empty())
++    {
++        return PathBuf::from(usage_path);
++    }
++
+     let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+     let workspace_root = manifest_dir.parent().unwrap();

pkgs/by-name/vf/vfox/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vfox";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "version-fox";
     repo = "vfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pPsHR4kO4/b0VDz7y+iMwalJibjAzu6A2QwkBMTys7E=";
+    hash = "sha256-nDwzd+4yq5NshS01z/VUbeF9eO0IDcaNQ41bAjIAHuY=";
   };
 
   vendorHash = "sha256-494nqL6KiUk4VeKlG9YHFpgACgaYC3SR1I1EViD71Jw=";

pkgs/by-name/wa/wastebin/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wastebin";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "matze";
     repo = "wastebin";
     rev = finalAttrs.version;
-    hash = "sha256-cujMs7R6CBSsoQ3p8PyHAJYwWjd8NGYX+qMB4ntrorg=";
+    hash = "sha256-435d/MBLRBvJ5LQ2ohhIOtPmHNjnWQCp1wVS+Wv8t6U=";
   };
 
-  cargoHash = "sha256-wS4WkOjaDTlrIEjeSTmEqzfC1XZgXQUTqpfs7FYr60Y=";
+  cargoHash = "sha256-S9aQsdnpq/3D6nnRG+cCIM5Cljcax4+KxavRj3kxeQo=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/wi/wireguard-tools/package.nix

@@ -90,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       zx2c4
       ma27
+      kaynetik
     ];
     mainProgram = "wg";
     platforms = lib.platforms.unix;

pkgs/by-name/wi/wireguard-ui/package.nix

@@ -75,7 +75,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/ngoduykhanh/wireguard-ui";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    maintainers = with lib.maintainers; [
+      bot-wxt1221
+      kaynetik
+    ];
     mainProgram = "wireguard-ui";
   };
 })

pkgs/by-name/ya/yabai/package.nix

@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "yabai";
-  version = "7.1.17";
+  version = "7.1.18";
 
   src =
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
       # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
       "aarch64-darwin" = fetchzip {
         url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
-        hash = "sha256-LMR5YMNNmDDLOMhRKiFIE3+JaEZiRTyGAO1o0LSDVTQ=";
+        hash = "sha256-DAMSbAO+Azb+3yyJidBHnB9JWALiW/rUItzBStzK6SU=";
       };
       "x86_64-darwin" = fetchFromGitHub {
         owner = "asmvik";
         repo = "yabai";
         rev = "v${finalAttrs.version}";
-        hash = "sha256-XBJUh2l1DurftKZtved0D4LXe+kQ5od9SfIL6J/ymKI=";
+        hash = "sha256-go3CsFxJCHpEJ8EGv9B5pXt/1AifGLM8S5TIXkhKgDc=";
       };
     };
 

pkgs/by-name/ze/zed-editor/package.nix

@@ -111,7 +111,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.230.0";
+  version = "0.230.1";
 
   outputs = [
     "out"
@@ -124,7 +124,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vZCaaTsQedHA+5twcVVpFHqQUD/RArmbHKQtbr33mb4=";
+    hash = "sha256-J+WnR0xGMWS5m8FWQfTwRCZckxt2Y5kQy06TvpYZks4=";
   };
 
   postPatch = ''
@@ -150,7 +150,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-eSEk/6iHwtZF9Qx7dQN3l2/uaC8MR28lFwbBEUWVNs0=";
+  cargoHash = "sha256-EbRLFIKpPnfyGeh7jHVDilez++4elZ1rz2iO3U9XOpQ=";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/zo/zoxide/package.nix

@@ -76,6 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       SuperSandro2000
       matthiasbeyer
       ryan4yin
+      kaynetik
     ];
     mainProgram = "zoxide";
   };

pkgs/desktops/expidus/calculator/default.nix

@@ -1,58 +0,0 @@
-{
-  lib,
-  flutter,
-  fetchFromGitHub,
-}:
-flutter.buildFlutterApplication rec {
-  pname = "expidus-calculator";
-  version = "0.1.1-alpha";
-
-  src = fetchFromGitHub {
-    owner = "ExpidusOS";
-    repo = "calculator";
-    rev = version;
-    hash = "sha256-O3LHp10Fo3PW3zoN7mFSQEKh+AAaR+IqkRtc6nQrIZE=";
-  };
-
-  flutterBuildFlags = [
-    "--dart-define=COMMIT_HASH=a5d8f54404b9994f83beb367a1cd11e04a6420cb"
-  ];
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    libtokyo = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
-    libtokyo_flutter = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
-  };
-
-  postInstall = ''
-    rm $out/bin/calculator
-    ln -s $out/app/$pname/calculator $out/bin/expidus-calculator
-
-    mkdir -p $out/share/applications
-    mv $out/app/$pname/data/com.expidusos.calculator.desktop $out/share/applications
-
-    mkdir -p $out/share/icons
-    mv $out/app/$pname/data/com.expidusos.calculator.png $out/share/icons
-
-    mkdir -p $out/share/metainfo
-    mv $out/app/$pname/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo
-
-    substituteInPlace "$out/share/applications/com.expidusos.calculator.desktop" \
-      --replace "Exec=calculator" "Exec=$out/bin/expidus-calculator" \
-      --replace "Icon=com.expidusos.calculator" "Icon=$out/share/icons/com.expidusos.calculator.png"
-  '';
-
-  meta = {
-    broken = true;
-    description = "ExpidusOS Calculator";
-    homepage = "https://expidusos.com";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ RossComputerGuy ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-    mainProgram = "expidus-calculator";
-  };
-}

pkgs/desktops/expidus/calculator/pubspec.lock.json

@@ -1,790 +0,0 @@
-{
-  "packages": {
-    "args": {
-      "dependency": "transitive",
-      "description": {
-        "name": "args",
-        "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.0"
-    },
-    "bitsdojo_window": {
-      "dependency": "direct main",
-      "description": {
-        "name": "bitsdojo_window",
-        "sha256": "1118bc1cd16e6f358431ca4473af57cc1b287d2ceab46dfab6d59a9463160622",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.5"
-    },
-    "bitsdojo_window_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_linux",
-        "sha256": "d3804a30315fcbb43b28acc86d1180ce0be22c0c738ad2da9e5ade4d8dbd9655",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "bitsdojo_window_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_macos",
-        "sha256": "d2a9886c74516c5b84c1dd65ab8ee5d1c52055b265ebf0e7d664dee28366b521",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "bitsdojo_window_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_platform_interface",
-        "sha256": "65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2"
-    },
-    "bitsdojo_window_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_windows",
-        "sha256": "8766a40aac84a6d7bdcaa716b24997e028fc9a9a1800495fc031721fd5a22ed0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.5"
-    },
-    "boolean_selector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "characters": {
-      "dependency": "transitive",
-      "description": {
-        "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "clock": {
-      "dependency": "transitive",
-      "description": {
-        "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "collection": {
-      "dependency": "transitive",
-      "description": {
-        "name": "collection",
-        "sha256": "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.17.1"
-    },
-    "crypto": {
-      "dependency": "transitive",
-      "description": {
-        "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.3"
-    },
-    "fake_async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "ffi": {
-      "dependency": "transitive",
-      "description": {
-        "name": "ffi",
-        "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.4"
-    },
-    "filesize": {
-      "dependency": "transitive",
-      "description": {
-        "name": "filesize",
-        "sha256": "f53df1f27ff60e466eefcd9df239e02d4722d5e2debee92a87dfd99ac66de2af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "flutter": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_adaptive_scaffold": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_adaptive_scaffold",
-        "sha256": "3e78be8b9c95b1c9832b2f8ec4a845adac205c4bb5e7bd3fb204b07990229167",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.7+1"
-    },
-    "flutter_lints": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_lints",
-        "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "flutter_localizations": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_markdown": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_markdown",
-        "sha256": "d4a1cb250c4e059586af0235f32e02882860a508e189b61f2b31b8810c1e1330",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.17+2"
-    },
-    "flutter_test": {
-      "dependency": "direct dev",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_web_plugins": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "http": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http",
-        "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.13.6"
-    },
-    "http_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "intl": {
-      "dependency": "transitive",
-      "description": {
-        "name": "intl",
-        "sha256": "a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.18.0"
-    },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.7"
-    },
-    "libtokyo": {
-      "dependency": "direct main",
-      "description": {
-        "path": "packages/libtokyo",
-        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "url": "https://github.com/ExpidusOS/libtokyo.git"
-      },
-      "source": "git",
-      "version": "0.1.0"
-    },
-    "libtokyo_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "path": "packages/libtokyo_flutter",
-        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "url": "https://github.com/ExpidusOS/libtokyo.git"
-      },
-      "source": "git",
-      "version": "0.1.0"
-    },
-    "lints": {
-      "dependency": "transitive",
-      "description": {
-        "name": "lints",
-        "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "markdown": {
-      "dependency": "direct main",
-      "description": {
-        "name": "markdown",
-        "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.1.1"
-    },
-    "matcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "matcher",
-        "sha256": "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.12.15"
-    },
-    "material_color_utilities": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_color_utilities",
-        "sha256": "d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
-    "material_theme_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_theme_builder",
-        "sha256": "380ab70835e01f4ee0c37904eebae9e36ed37b5cf8ed40d67412ea3244a2afd6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "math_expressions": {
-      "dependency": "direct main",
-      "description": {
-        "name": "math_expressions",
-        "sha256": "3576593617c3870d75728a751f6ec6e606706d44e363f088ac394b5a28a98064",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.0"
-    },
-    "meta": {
-      "dependency": "transitive",
-      "description": {
-        "name": "meta",
-        "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.1"
-    },
-    "nested": {
-      "dependency": "transitive",
-      "description": {
-        "name": "nested",
-        "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "package_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "package_info_plus",
-        "sha256": "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "package_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "path": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path",
-        "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.8.3"
-    },
-    "path_provider_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "path_provider_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_platform_interface",
-        "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "path_provider_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_windows",
-        "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform",
-        "sha256": "ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "plugin_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plugin_platform_interface",
-        "sha256": "da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.6"
-    },
-    "provider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "provider",
-        "sha256": "cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.5"
-    },
-    "pub_semver": {
-      "dependency": "direct main",
-      "description": {
-        "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "pubspec": {
-      "dependency": "direct main",
-      "description": {
-        "name": "pubspec",
-        "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "quiver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "quiver",
-        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "sentry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sentry",
-        "sha256": "39c23342fc96105da449914f7774139a17a0ca8a4e70d9ad5200171f7e47d6ba",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.9.0"
-    },
-    "sentry_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sentry_flutter",
-        "sha256": "ff68ab31918690da004a42e20204242a3ad9ad57da7e2712da8487060ac9767f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.9.0"
-    },
-    "shared_preferences": {
-      "dependency": "direct main",
-      "description": {
-        "name": "shared_preferences",
-        "sha256": "b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "shared_preferences_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_android",
-        "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "shared_preferences_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_foundation",
-        "sha256": "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.4"
-    },
-    "shared_preferences_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_linux",
-        "sha256": "c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.1"
-    },
-    "shared_preferences_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_platform_interface",
-        "sha256": "d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.1"
-    },
-    "shared_preferences_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_web",
-        "sha256": "d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.1"
-    },
-    "shared_preferences_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_windows",
-        "sha256": "f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.1"
-    },
-    "sky_engine": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.99"
-    },
-    "source_span": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_span",
-        "sha256": "dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.1"
-    },
-    "stack_trace": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stack_trace",
-        "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.0"
-    },
-    "stream_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_channel",
-        "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "string_scanner": {
-      "dependency": "transitive",
-      "description": {
-        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "term_glyph": {
-      "dependency": "transitive",
-      "description": {
-        "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "test_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "test_api",
-        "sha256": "eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.1"
-    },
-    "typed_data": {
-      "dependency": "transitive",
-      "description": {
-        "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.2"
-    },
-    "uri": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uri",
-        "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "url_launcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "url_launcher",
-        "sha256": "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.14"
-    },
-    "url_launcher_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_android",
-        "sha256": "b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.0"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.5"
-    },
-    "url_launcher_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_linux",
-        "sha256": "b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.6"
-    },
-    "url_launcher_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_macos",
-        "sha256": "b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.7"
-    },
-    "url_launcher_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_platform_interface",
-        "sha256": "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.5"
-    },
-    "url_launcher_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_web",
-        "sha256": "ba140138558fcc3eead51a1c42e92a9fb074a1b1149ed3c73e66035b2ccd94f2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.19"
-    },
-    "url_launcher_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_windows",
-        "sha256": "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.8"
-    },
-    "uuid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uuid",
-        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.7"
-    },
-    "vector_math": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "win32": {
-      "dependency": "transitive",
-      "description": {
-        "name": "win32",
-        "sha256": "a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.4"
-    },
-    "xdg_directories": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xdg_directories",
-        "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.3"
-    },
-    "yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    }
-  },
-  "sdks": {
-    "dart": ">=3.0.5 <4.0.0",
-    "flutter": ">=3.10.0"
-  }
-}

pkgs/desktops/expidus/default.nix

@@ -1,10 +0,0 @@
-{ callPackage, flutterPackages }:
-{
-  calculator = callPackage ./calculator {
-    flutter = flutterPackages.v3_35;
-  };
-
-  file-manager = callPackage ./file-manager {
-    flutter = flutterPackages.v3_35;
-  };
-}

pkgs/desktops/expidus/file-manager/default.nix

@@ -1,58 +0,0 @@
-{
-  lib,
-  flutter,
-  fetchFromGitHub,
-}:
-flutter.buildFlutterApplication rec {
-  pname = "expidus-file-manager";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "ExpidusOS";
-    repo = "file-manager";
-    rev = version;
-    hash = "sha256-R6eszy4Dz8tAPRTwZzRiZWIgVMiGv5zlhFB/HcD6gqg=";
-  };
-
-  flutterBuildFlags = [
-    "--dart-define=COMMIT_HASH=b4181b9cff18a07e958c81d8f41840d2d36a6705"
-  ];
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    libtokyo = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
-    libtokyo_flutter = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
-  };
-
-  postInstall = ''
-    rm $out/bin/file_manager
-    ln -s $out/app/$pname/file_manager $out/bin/expidus-file-manager
-
-    mkdir -p $out/share/applications
-    mv $out/app/$pname/data/com.expidusos.file_manager.desktop $out/share/applications
-
-    mkdir -p $out/share/icons
-    mv $out/app/$pname/data/com.expidusos.file_manager.png $out/share/icons
-
-    mkdir -p $out/share/metainfo
-    mv $out/app/$pname/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo
-
-    substituteInPlace "$out/share/applications/com.expidusos.file_manager.desktop" \
-      --replace "Exec=file_manager" "Exec=$out/bin/expidus-file-manager" \
-      --replace "Icon=com.expidusos.file_manager" "Icon=$out/share/icons/com.expidusos.file_manager.png"
-  '';
-
-  meta = {
-    broken = true;
-    description = "ExpidusOS File Manager";
-    homepage = "https://expidusos.com";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ RossComputerGuy ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-    mainProgram = "expidus-file-manager";
-  };
-}

pkgs/desktops/expidus/file-manager/pubspec.lock.json

@@ -1,910 +0,0 @@
-{
-  "packages": {
-    "args": {
-      "dependency": "transitive",
-      "description": {
-        "name": "args",
-        "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.11.0"
-    },
-    "bitsdojo_window": {
-      "dependency": "direct main",
-      "description": {
-        "name": "bitsdojo_window",
-        "sha256": "1118bc1cd16e6f358431ca4473af57cc1b287d2ceab46dfab6d59a9463160622",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.5"
-    },
-    "bitsdojo_window_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_linux",
-        "sha256": "d3804a30315fcbb43b28acc86d1180ce0be22c0c738ad2da9e5ade4d8dbd9655",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "bitsdojo_window_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_macos",
-        "sha256": "d2a9886c74516c5b84c1dd65ab8ee5d1c52055b265ebf0e7d664dee28366b521",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "bitsdojo_window_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_platform_interface",
-        "sha256": "65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2"
-    },
-    "bitsdojo_window_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "bitsdojo_window_windows",
-        "sha256": "8766a40aac84a6d7bdcaa716b24997e028fc9a9a1800495fc031721fd5a22ed0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.5"
-    },
-    "boolean_selector": {
-      "dependency": "transitive",
-      "description": {
-        "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "characters": {
-      "dependency": "transitive",
-      "description": {
-        "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
-    "clock": {
-      "dependency": "transitive",
-      "description": {
-        "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.1"
-    },
-    "collection": {
-      "dependency": "direct main",
-      "description": {
-        "name": "collection",
-        "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.17.2"
-    },
-    "crypto": {
-      "dependency": "transitive",
-      "description": {
-        "name": "crypto",
-        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.3"
-    },
-    "dbus": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dbus",
-        "sha256": "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.8"
-    },
-    "fake_async": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.1"
-    },
-    "ffi": {
-      "dependency": "direct main",
-      "description": {
-        "name": "ffi",
-        "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "file": {
-      "dependency": "transitive",
-      "description": {
-        "name": "file",
-        "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.4"
-    },
-    "filesize": {
-      "dependency": "direct main",
-      "description": {
-        "name": "filesize",
-        "sha256": "f53df1f27ff60e466eefcd9df239e02d4722d5e2debee92a87dfd99ac66de2af",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "flutter": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_adaptive_scaffold": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_adaptive_scaffold",
-        "sha256": "4f448902314bc9b6cf820c85d5bad4de6489c0eff75dcedf5098f3a53ec981ee",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.6"
-    },
-    "flutter_lints": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_lints",
-        "sha256": "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.2"
-    },
-    "flutter_localizations": {
-      "dependency": "direct main",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_markdown": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_markdown",
-        "sha256": "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.17+1"
-    },
-    "flutter_test": {
-      "dependency": "direct dev",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "flutter_web_plugins": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.0"
-    },
-    "http": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http",
-        "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.13.6"
-    },
-    "http_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.2"
-    },
-    "intl": {
-      "dependency": "direct main",
-      "description": {
-        "name": "intl",
-        "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.18.1"
-    },
-    "libtokyo": {
-      "dependency": "direct main",
-      "description": {
-        "path": "packages/libtokyo",
-        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "url": "https://github.com/ExpidusOS/libtokyo.git"
-      },
-      "source": "git",
-      "version": "0.1.0"
-    },
-    "libtokyo_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "path": "packages/libtokyo_flutter",
-        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
-        "url": "https://github.com/ExpidusOS/libtokyo.git"
-      },
-      "source": "git",
-      "version": "0.1.0"
-    },
-    "lints": {
-      "dependency": "transitive",
-      "description": {
-        "name": "lints",
-        "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "markdown": {
-      "dependency": "transitive",
-      "description": {
-        "name": "markdown",
-        "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.1.1"
-    },
-    "matcher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "matcher",
-        "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.12.16"
-    },
-    "material_color_utilities": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_color_utilities",
-        "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.0"
-    },
-    "material_theme_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "material_theme_builder",
-        "sha256": "380ab70835e01f4ee0c37904eebae9e36ed37b5cf8ed40d67412ea3244a2afd6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.4"
-    },
-    "meta": {
-      "dependency": "transitive",
-      "description": {
-        "name": "meta",
-        "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.9.1"
-    },
-    "nested": {
-      "dependency": "transitive",
-      "description": {
-        "name": "nested",
-        "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "open_file_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "open_file_plus",
-        "sha256": "f087e32722ffe4bac71925e7a1a9848a1008fd789e47c6628da3ed7845922227",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.1"
-    },
-    "package_info_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "package_info_plus",
-        "sha256": "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    },
-    "package_info_plus_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
-    "path": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path",
-        "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.8.3"
-    },
-    "path_provider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path_provider",
-        "sha256": "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "path_provider_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_android",
-        "sha256": "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "path_provider_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_foundation",
-        "sha256": "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "path_provider_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_provider_linux",
-        "sha256": "ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "path_provider_platform_interface": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path_provider_platform_interface",
-        "sha256": "bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "path_provider_windows": {
-      "dependency": "direct main",
-      "description": {
-        "name": "path_provider_windows",
-        "sha256": "ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.4.3"
-    },
-    "permission_handler_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_android",
-        "sha256": "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "10.3.3"
-    },
-    "permission_handler_apple": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_apple",
-        "sha256": "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "9.1.4"
-    },
-    "permission_handler_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_platform_interface",
-        "sha256": "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.11.3"
-    },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3"
-    },
-    "petitparser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "petitparser",
-        "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.4.0"
-    },
-    "platform": {
-      "dependency": "transitive",
-      "description": {
-        "name": "platform",
-        "sha256": "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.0"
-    },
-    "plugin_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plugin_platform_interface",
-        "sha256": "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.5"
-    },
-    "provider": {
-      "dependency": "direct main",
-      "description": {
-        "name": "provider",
-        "sha256": "cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.5"
-    },
-    "pub_semver": {
-      "dependency": "direct main",
-      "description": {
-        "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "pubspec": {
-      "dependency": "direct main",
-      "description": {
-        "name": "pubspec",
-        "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "quiver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "quiver",
-        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.1"
-    },
-    "sentry": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sentry",
-        "sha256": "39c23342fc96105da449914f7774139a17a0ca8a4e70d9ad5200171f7e47d6ba",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.9.0"
-    },
-    "sentry_flutter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "sentry_flutter",
-        "sha256": "ff68ab31918690da004a42e20204242a3ad9ad57da7e2712da8487060ac9767f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.9.0"
-    },
-    "shared_preferences": {
-      "dependency": "direct main",
-      "description": {
-        "name": "shared_preferences",
-        "sha256": "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "shared_preferences_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_android",
-        "sha256": "fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "shared_preferences_foundation": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_foundation",
-        "sha256": "f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.2"
-    },
-    "shared_preferences_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_linux",
-        "sha256": "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "shared_preferences_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_platform_interface",
-        "sha256": "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "shared_preferences_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_web",
-        "sha256": "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "shared_preferences_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shared_preferences_windows",
-        "sha256": "f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.3.0"
-    },
-    "sky_engine": {
-      "dependency": "transitive",
-      "description": "flutter",
-      "source": "sdk",
-      "version": "0.0.99"
-    },
-    "source_span": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.10.0"
-    },
-    "stack_trace": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stack_trace",
-        "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.11.0"
-    },
-    "stream_channel": {
-      "dependency": "transitive",
-      "description": {
-        "name": "stream_channel",
-        "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "string_scanner": {
-      "dependency": "transitive",
-      "description": {
-        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
-    "term_glyph": {
-      "dependency": "transitive",
-      "description": {
-        "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.1"
-    },
-    "test_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "test_api",
-        "sha256": "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.6.0"
-    },
-    "typed_data": {
-      "dependency": "transitive",
-      "description": {
-        "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.2"
-    },
-    "udisks": {
-      "dependency": "direct main",
-      "description": {
-        "name": "udisks",
-        "sha256": "847144fb868b9e3602895e89f438f77c2a4fda9e4b02f7d368dc1d2c6a40b475",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.0"
-    },
-    "uri": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uri",
-        "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "url_launcher": {
-      "dependency": "direct main",
-      "description": {
-        "name": "url_launcher",
-        "sha256": "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.12"
-    },
-    "url_launcher_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_android",
-        "sha256": "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.38"
-    },
-    "url_launcher_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_ios",
-        "sha256": "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.1.4"
-    },
-    "url_launcher_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_linux",
-        "sha256": "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.5"
-    },
-    "url_launcher_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_macos",
-        "sha256": "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.6"
-    },
-    "url_launcher_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_platform_interface",
-        "sha256": "bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.3"
-    },
-    "url_launcher_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_web",
-        "sha256": "cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.18"
-    },
-    "url_launcher_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "url_launcher_windows",
-        "sha256": "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.7"
-    },
-    "uuid": {
-      "dependency": "transitive",
-      "description": {
-        "name": "uuid",
-        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.7"
-    },
-    "vector_math": {
-      "dependency": "transitive",
-      "description": {
-        "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.4"
-    },
-    "web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "web",
-        "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.4-beta"
-    },
-    "win32": {
-      "dependency": "direct main",
-      "description": {
-        "name": "win32",
-        "sha256": "a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.4"
-    },
-    "xdg_directories": {
-      "dependency": "direct main",
-      "description": {
-        "name": "xdg_directories",
-        "sha256": "f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.2"
-    },
-    "xml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "xml",
-        "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.3.0"
-    },
-    "yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.1.2"
-    }
-  },
-  "sdks": {
-    "dart": ">=3.1.0-185.0.dev <4.0.0",
-    "flutter": ">=3.10.0"
-  }
-}

pkgs/development/compilers/dart/source/default.nix

@@ -1,7 +1,7 @@
 {
   bintools,
   buildPackages,
-  callPackage,
+  flutter,
   cacert,
   curlMinimal,
   dart-bin,
@@ -22,6 +22,7 @@
   samurai,
   stdenv,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
   writeShellScript,
   writeText,
   zlib,
@@ -30,8 +31,6 @@
 let
   version = "3.11.4";
 
-  tools = callPackage ../../flutter/engine/tools.nix { inherit (stdenv) hostPlatform buildPlatform; };
-
   getArchInfo =
     platform:
     let
@@ -53,78 +52,75 @@ let
     ]
   );
 
-  src =
-    runCommand "dart-source-deps"
-      {
-        pname = "dart-source-deps";
-        inherit version;
+  src = stdenv.mkDerivation (finalAttrs: {
+    pname = "dart-source-deps";
+    inherit version;
 
-        nativeBuildInputs = [
-          cacert
-          curlMinimal
-          gitMinimal
-          pax-utils
-          python3
-          tools.cipd
-        ];
+    nativeBuildInputs = [
+      cacert
+      curlMinimal
+      flutter.scope.cipd
+      gitMinimal
+      pax-utils
+      python3
+      writableTmpDirAsHomeHook
+    ];
 
-        env = {
-          NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-          GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-          SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-          DEPOT_TOOLS_UPDATE = "0";
-          DEPOT_TOOLS_COLLECT_METRICS = "0";
-          PYTHONDONTWRITEBYTECODE = "1";
-          CIPD_HTTP_USER_AGENT = "standard-nix-build";
-        };
+    env = {
+      NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      DEPOT_TOOLS_UPDATE = "0";
+      DEPOT_TOOLS_COLLECT_METRICS = "0";
+      PYTHONDONTWRITEBYTECODE = "1";
+      CIPD_HTTP_USER_AGENT = "standard-nix-build";
+    };
 
-        outputHashAlgo = "sha256";
-        outputHashMode = "recursive";
-        outputHash = "sha256-y2F+wB0M5dq6koxGpCs9BExGU7p8tFOIiRqfdf8ip+8=";
-      }
-      ''
-        mkdir source
-        cd source
-        source ${../../../../build-support/fetchgit/deterministic-git}
-        export -f clean_git
-        export -f make_deterministic_repo
-        cp ${writeText ".gclient" ''
-          solutions = [{
-              'name': 'sdk',
-              'url': 'https://dart.googlesource.com/sdk.git@${version}',
-          }]
-          target_os = ['linux']
-          target_cpu = ['x64', 'arm64', 'riscv64']
-          target_cpu_only = True
-        ''} .gclient
-        export PATH=${python3}/bin:$PATH:${tools.depot_tools}
-        python3 ${tools.depot_tools}/gclient.py sync --no-history --nohooks --noprehooks
-        find sdk -name ".versions" -type d -exec rm -rf {} +
-        rm --recursive --force sdk/buildtools/sysroot
-        rm --recursive --force sdk/buildtools/linux-arm64
-        rm --recursive --force sdk/buildtools/reclient
-        rm --recursive --force sdk/buildtools/*/clang
-        find sdk -type f \( -name "*.snapshot" -o -name "*.dill" -o -name "*.sym" \) -delete
-        rm --recursive --force sdk/tools/sdks/dart-sdk
-        find . -type l ! -exec test -e {} \; -delete
-        find . -name "ChangeLog*" -delete
-        rm --force .gclient .gclient_entries .gclient_previous_sync_commits .last_sync_hashes
-        rm --recursive --force .cipd .cipd_cache
-        find . -name ".git" -type d -prune -exec rm --recursive --force {} +
-        find . -name ".git*" -exec rm --recursive --force {} +
-        find . \( \
-            -name ".build-id" -o \
-            -name ".svn" -o \
-            -name "*~" -o \
-            -name "#*#" \
-        \) -exec rm --recursive --force {} +
-        for elf in $(scanelf --recursive --all --format "%F" sdk | sort); do
-            rm --force "$elf"
-        done
-        find . -name "__pycache__" -type d -exec rm --recursive --force {} +
-        find . -name "*.pyc" -delete
-        cp --recursive sdk $out
-      '';
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "sha256-y2F+wB0M5dq6koxGpCs9BExGU7p8tFOIiRqfdf8ip+8=";
+
+    buildCommand = ''
+      mkdir source
+      cd source
+      cp ${writeText ".gclient" ''
+        solutions = [{
+            'name': 'sdk',
+            'url': 'https://dart.googlesource.com/sdk.git@${finalAttrs.version}',
+        }]
+        target_os = ['linux']
+        target_cpu = ['x64', 'arm64', 'riscv64']
+        target_cpu_only = True
+      ''} .gclient
+      export PATH=${python3}/bin:$PATH:${flutter.scope.depot_tools}
+      python3 ${flutter.scope.depot_tools}/gclient.py sync --no-history --nohooks --noprehooks
+      find sdk -name ".versions" -type d -exec rm -rf {} +
+      rm --recursive --force sdk/buildtools/sysroot
+      rm --recursive --force sdk/buildtools/linux-arm64
+      rm --recursive --force sdk/buildtools/reclient
+      rm --recursive --force sdk/buildtools/*/clang
+      find sdk -type f \( -name "*.snapshot" -o -name "*.dill" -o -name "*.sym" \) -delete
+      rm --recursive --force sdk/tools/sdks/dart-sdk
+      find . -type l ! -exec test -e {} \; -delete
+      find . -name "ChangeLog*" -delete
+      rm --force .gclient .gclient_entries .gclient_previous_sync_commits .last_sync_hashes
+      rm --recursive --force .cipd .cipd_cache
+      find . -name ".git" -type d -prune -exec rm --recursive --force {} +
+      find . -name ".git*" -exec rm --recursive --force {} +
+      find . \( \
+          -name ".build-id" -o \
+          -name ".svn" -o \
+          -name "*~" -o \
+          -name "#*#" \
+      \) -exec rm --recursive --force {} +
+      for elf in $(scanelf --recursive --all --format "%F" sdk | sort); do
+          rm --force "$elf"
+      done
+      find . -name "__pycache__" -type d -exec rm --recursive --force {} +
+      find . -name "*.pyc" -delete
+      cp --recursive sdk $out
+    '';
+  });
 in
 dart-bin.overrideAttrs (oldAttrs: {
   inherit version src;

pkgs/development/compilers/flutter/all-artifacts.nix

@@ -0,0 +1,79 @@
+{ lib, callPackage }:
+
+let
+  oss = [
+    {
+      name = "linux";
+      isLinux = true;
+      isWindows = false;
+      isDarwin = false;
+    }
+    {
+      name = "windows";
+      isLinux = false;
+      isWindows = true;
+      isDarwin = false;
+    }
+    {
+      name = "darwin";
+      isLinux = false;
+      isWindows = false;
+      isDarwin = true;
+    }
+  ];
+
+  archs = [
+    {
+      name = "x86_64";
+      isx86_64 = true;
+      isAarch64 = false;
+      isRiscV64 = false;
+    }
+    {
+      name = "aarch64";
+      isx86_64 = false;
+      isAarch64 = true;
+      isRiscV64 = false;
+    }
+  ];
+
+  hostPlatforms = (
+    map
+      (p: {
+        inherit (p.os) isLinux isWindows isDarwin;
+        inherit (p.cpu) isx86_64 isAarch64 isRiscV64;
+
+        parsed = {
+          kernel = {
+            name = p.os.name;
+          };
+          cpu = {
+            name = p.cpu.name;
+          };
+        };
+      })
+      (
+        lib.cartesianProduct {
+          os = oss;
+          cpu = archs;
+        }
+      )
+  );
+in
+(lib.unique (
+  lib.concatMap (
+    hostPlatform:
+    callPackage ./host-artifacts.nix {
+      inherit hostPlatform;
+      supportedTargetFlutterPlatforms = [
+        "universal"
+        "web"
+        "android"
+        "linux"
+        "macos"
+        "ios"
+        "windows"
+      ];
+    }
+  ) hostPlatforms
+))

pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix

@@ -1,102 +0,0 @@
-# Schema:
-# ${flutterVersion}.${targetPlatform}.${hostPlatform}
-#
-# aarch64-darwin as a host is not yet supported.
-# https://github.com/flutter/flutter/issues/60118
-{
-  lib,
-  runCommand,
-  lndir,
-  cacert,
-  unzip,
-
-  flutterPlatform,
-  systemPlatform,
-  flutter,
-  hash,
-}:
-
-let
-  flutterPlatforms = [
-    "android"
-    "ios"
-    "web"
-    "linux"
-    "windows"
-    "macos"
-    "fuchsia"
-    "universal"
-  ];
-
-  flutter' = flutter.override {
-    # Use a version of Flutter with just enough capabilities to download
-    # artifacts.
-    supportedTargetFlutterPlatforms = [ ];
-
-    # Modify flutter-tool's system platform in order to get the desired platform's hashes.
-    flutter = flutter.unwrapped.override {
-      flutterTools = flutter.unwrapped.tools.override {
-        inherit systemPlatform;
-      };
-    };
-  };
-in
-runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
-  {
-    nativeBuildInputs = [
-      lndir
-      flutter'
-      unzip
-    ];
-
-    NIX_FLUTTER_TOOLS_VM_OPTIONS = "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt";
-    NIX_FLUTTER_OPERATING_SYSTEM =
-      {
-        "x86_64-linux" = "linux";
-        "aarch64-linux" = "linux";
-        "x86_64-darwin" = "macos";
-        "aarch64-darwin" = "macos";
-      }
-      .${systemPlatform};
-
-    outputHash = hash;
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-
-    passthru = {
-      inherit flutterPlatform;
-    };
-  }
-  (
-    ''
-      export FLUTTER_ROOT="$NIX_BUILD_TOP"
-      lndir -silent '${flutter'}' "$FLUTTER_ROOT"
-      rm --recursive --force "$FLUTTER_ROOT/bin/cache"
-      mkdir "$FLUTTER_ROOT/bin/cache"
-      mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
-      lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
-    ''
-    # Could not determine engine revision
-    + lib.optionalString (lib.versionAtLeast flutter'.version "3.32") ''
-      cp '${flutter'}/bin/internal/engine.version' "$FLUTTER_ROOT/bin/cache/engine.stamp"
-    ''
-    + ''
-
-      HOME="$(mktemp -d)" flutter precache ${
-        lib.optionalString (
-          flutter ? engine && flutter.engine.meta.available
-        ) "--local-engine ${flutter.engine.outName}"
-      } \
-        --verbose '--${flutterPlatform}' ${
-          builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))
-        }
-
-      rm --recursive --force "$FLUTTER_ROOT/bin/cache/lockfile"
-      rm --recursive --force "$FLUTTER_ROOT/bin/cache/dart-sdk"
-    ''
-    + ''
-      find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
-
-      cp --recursive bin/cache "$out"
-    ''
-  )