Merge master into staging-next

2025-12-11 06:07:17 +00:00
parent 74edd868c7 1583d891cb
commit 0d799748bd
58 changed files with 776 additions and 3476 deletions
@@ -23,6 +23,8 @@
  retained for packages that have not completed migration. `asio_1_10` has been removed as no packages depend on it anymore.
  `asio` also no longer propagates `boost` as it is used independent from `boost` in most cases.

+- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
+
 - `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3.

 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
@@ -17401,6 +17401,11 @@
    github = "mlvzk";
    githubId = 44906333;
  };
+  mlyxshi = {
+    name = "mlyxshi";
+    github = "mlyxshi";
+    githubId = 16594754;
+  };
  mmahut = {
    email = "marek.mahut@gmail.com";
    github = "mmahut";
@@ -121,6 +121,7 @@ mini.test,,,,,,
 moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn
 mpack,,,,,,
 neorg,,,,,,GaetanLepage
+neorg-interim-ls,,,,,,
 neotest,,,,,,mrcjkb
 nlua,,,,,,teto
 nui.nvim,,,,,,mrcjkb
@@ -81,7 +81,7 @@ In addition to numerous new and upgraded packages, this release has the followin

 - [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](#opt-services.ergochat.enable).

- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative spreadsheet. Available as [services.ethercalc](#opt-services.ethercalc.enable).
+- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative spreadsheet. Available as {option}`services.ethercalc`.

 - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).

@@ -35,6 +35,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 }
 ```

+- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
+
 ## Other Notable Changes {#sec-release-26.05-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -1602,7 +1602,6 @@
  ./services/web-apps/eintopf.nix
  ./services/web-apps/engelsystem.nix
  ./services/web-apps/ente.nix
-  ./services/web-apps/ethercalc.nix
  ./services/web-apps/fediwall.nix
  ./services/web-apps/fider.nix
  ./services/web-apps/filebrowser.nix
@@ -168,6 +168,9 @@ in

      To wrap a resolver with DNSCrypt you can instead use dnsdist. See options `services.dnsdist.dnscrypt.*`
    '')
+    (mkRemovedOptionModule [ "services" "ethercalc" ] ''
+      The ethercalc module has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs.
+    '')
    (mkRemovedOptionModule [
      "services"
      "exhibitor"
@@ -205,6 +205,7 @@ in
            RestrictAddressFamilies = [
              "AF_INET"
              "AF_INET6"
+              "AF_NETLINK"
              "AF_UNIX"
            ];
            RestrictNamespaces = true;
@@ -1,63 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.services.ethercalc;
-in
-{
-  options = {
-    services.ethercalc = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          ethercalc, an online collaborative spreadsheet server.
-
-          Persistent state will be maintained under
-          {file}`/var/lib/ethercalc`. Upstream supports using a
-          redis server for storage and recommends the redis backend for
-          intensive use; however, the Nix module doesn't currently support
-          redis.
-
-          Note that while ethercalc is a good and robust project with an active
-          issue tracker, there haven't been new commits since the end of 2020.
-        '';
-      };
-
-      package = mkPackageOption pkgs "ethercalc" { };
-
-      host = mkOption {
-        type = types.str;
-        default = "0.0.0.0";
-        description = "Address to listen on (use 0.0.0.0 to allow access from any address).";
-      };
-
-      port = mkOption {
-        type = types.port;
-        default = 8000;
-        description = "Port to bind to.";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.ethercalc = {
-      description = "Ethercalc service";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      serviceConfig = {
-        DynamicUser = true;
-        ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}";
-        Restart = "always";
-        StateDirectory = "ethercalc";
-        WorkingDirectory = "/var/lib/ethercalc";
-      };
-    };
-  };
-}
@@ -255,9 +255,9 @@ in

      package = mkPackageOption pkgs "mediawiki" { };

-      # https://www.mediawiki.org/wiki/Compatibility
+      # https://www.mediawiki.org/wiki/Compatibility#PHP
      phpPackage = mkPackageOption pkgs "php" {
-        default = "php82";
+        default = "php83";
      };

      finalPackage = mkOption {
@@ -26,6 +26,7 @@ let
    "middleclass"
    "mini-test"
    "neorg"
+    "neorg-interim-ls"
    "neotest"
    "nui-nvim"
    "nvim-cmp"
@@ -58,7 +58,7 @@ assert withQt -> qt6 != null;

 stdenv.mkDerivation rec {
  pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.6.0";
+  version = "4.6.2";

  outputs = [
    "out"
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
    repo = "wireshark";
    owner = "wireshark";
    rev = "v${version}";
-    hash = "sha256-XkHcVN3xCYwnS69nJ4/AT76Iaggt1GXA6JWi+IG15IM=";
+    hash = "sha256-fojQ0D7v6xSDltpL3Y6iIzLj6pRZU/0U0ww+sVaWDZ8=";
  };

  patches = [
@@ -238,26 +238,29 @@ let
    help = srcsAttributes.help { inherit fetchurl fetchgit; };
  };

+  kdeDependencies = [
+    qt6.qtbase.out # has a dev output but you cannot find the headers there
+    qt6.qtmultimedia.out
+    kdePackages.kconfig
+    kdePackages.kcoreaddons
+    kdePackages.ki18n
+    kdePackages.kio
+    kdePackages.kwindowsystem
+  ];
+  mkKdeDeps =
+    pkgs: func:
+    symlinkJoin {
+      name = "libreoffice-kde-dependencies-${version}";
+      paths = flatten (
+        map (e: [
+          (func e)
+        ]) pkgs
+      );
+    };
  # See `postPatch` for details
-  kdeDeps = symlinkJoin {
-    name = "libreoffice-kde-dependencies-${version}";
-    paths = flatten (
-      map
-        (e: [
-          (getDev e)
-          (getLib e)
-        ])
-        [
-          qt6.qtbase
-          qt6.qtmultimedia
-          kdePackages.kconfig
-          kdePackages.kcoreaddons
-          kdePackages.ki18n
-          kdePackages.kio
-          kdePackages.kwindowsystem
-        ]
-    );
-  };
+  kdeDepsIncludes = mkKdeDeps kdeDependencies getDev;
+  kdeDepsLibs = mkKdeDeps kdeDependencies getLib;
+
  tarballPath = "external/tarballs";

 in
@@ -519,10 +522,10 @@ stdenv.mkDerivation (finalAttrs: {
    # The 2nd option is not very Nix'y, but I'll take robust over nice any day.
    # Additionally, it's much easier to fix if LO breaks on the next upgrade (just
    # add the missing dependencies to it).
-    export QT6INC=${kdeDeps}/include
-    export QT6LIB=${kdeDeps}/lib
-    export KF6INC="${kdeDeps}/include ${kdeDeps}/include/KF6"
-    export KF6LIB=${kdeDeps}/lib
+    export QT6INC=${kdeDepsIncludes}/include
+    export QT6LIB=${kdeDepsLibs}/lib
+    export KF6INC="${kdeDepsIncludes}/include ${kdeDepsIncludes}/include/KF6"
+    export KF6LIB=${kdeDepsLibs}/lib
  '';

  configureFlags = [
@@ -25,13 +25,13 @@

 buildNimPackage rec {
  pname = "auto-editor";
-  version = "29.3.1";
+  version = "29.4.0";

  src = fetchFromGitHub {
    owner = "WyattBlue";
    repo = "auto-editor";
    tag = version;
-    hash = "sha256-Nne6niGnhaEQNvvFURmF0N9oyuG1ZvJ4NzxddJdSQtY=";
+    hash = "sha256-DzgR/GyVIUq6Dfes6OnTdYO/vyGBPcKSeD2IikF7sIM=";
  };

  lockFile = ./lock.json;
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage {
  pname = "cosmic-ext-applet-sysinfo";
-  version = "0-unstable-2025-07-05";
+  version = "0-unstable-2025-09-22";

  src = fetchFromGitHub {
    owner = "cosmic-utils";
    repo = "cosmic-ext-applet-sysinfo";
-    rev = "8559ba6604bfa7bdaaa53f8ea9a01ce6e6174194";
-    hash = "sha256-KF6j7OWz75BQtaa3z93Lq/msZpMt9ZYeKP4ThJKimDo=";
+    rev = "ed75123192c7f45f435797bfecae9eb615298728";
+    hash = "sha256-eAhOVp1suZpGCKpvKWA0xqvVf+FOsj7dqtlnYO/FHUI=";
  };

-  cargoHash = "sha256-oUw7oBOT1I/eBQuKuTQ4UWuksYWSyS6kd4fRGHC4ELY=";
+  cargoHash = "sha256-ehytOcMIocyHBnrPg1A73FUo3s1aOuYpI5FvrqjGpi4=";

  nativeBuildInputs = [
    libcosmicAppHook
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage {
  pname = "cosmic-ext-applet-weather";
-  version = "0-unstable-2025-08-23";
+  version = "0-unstable-2025-12-03";

  src = fetchFromGitHub {
    owner = "cosmic-utils";
    repo = "cosmic-ext-applet-weather";
-    rev = "f613c9dd156e84290765c34ca98ff8ede3b530fa";
-    hash = "sha256-VHCgMw4nWTKAbanEnMS/xCUzEW3NeWGmVkBqU2bJP/c=";
+    rev = "289d866abaaeaf51e9b7074b7731bcd6e5ea4b55";
+    hash = "sha256-LeUzDjUiDt3lQiQQvDB9RlSC1F4IyXTE4lc17eQd+Sw=";
  };

-  cargoHash = "sha256-CS4P1DHzTmkZdANw6UQsB0kjKTeaf3cAQ/2EiPHSg7g=";
+  cargoHash = "sha256-1lIWzCqpIxk+FWA/84yN/x10Se2xRTZ7KEqAWVgfFgU=";

  nativeBuildInputs = [
    libcosmicAppHook
@@ -1,7 +1,9 @@
 {
+  stdenv,
  lib,
  buildGoModule,
  fetchFromGitHub,
+  installShellFiles,
 }:

 buildGoModule rec {
@@ -17,8 +19,33 @@ buildGoModule rec {

  vendorHash = "sha256-CBw5FFGQgvdYoOUZ6E1F/mxqzNKOwh2IZbsh0dAsLEE=";

-  # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
-  doCheck = false;
+  nativeBuildInputs = [ installShellFiles ];
+
+  # required for TestHTTPHandlerReadWrite and other tests
+  __darwinAllowLocalNetworking = true;
+
+  checkFlags =
+    let
+      skippedTests = [
+        "TestMountIndex" # FUSE does not work in sandbox
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # sendfile is not permitted in Darwin sandbox
+        "TestS3StoreGetChunk/fail"
+        "TestS3StoreGetChunk/recover"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd desync \
+      --bash <($out/bin/desync completion bash) \
+      --fish <($out/bin/desync completion fish) \
+      --zsh <($out/bin/desync completion zsh)
+
+    mkdir -p $out/share/man/man1
+    $out/bin/desync manpage --section 1 $out/share/man/man1
+  '';

  meta = {
    description = "Content-addressed binary distribution system";
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "efibooteditor";
-  version = "1.5.4";
+  version = "1.5.5";

  src = fetchFromGitHub {
    owner = "Neverous";
    repo = "efibooteditor";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tufB90EhO/jdCnQfeuibcJu5C7RfCjIxBYp+8uR0Zv0=";
+    hash = "sha256-OtNZA2K6Kr4IHnTw0i+evHJmBx9oAGKuU90XtUfXKy0=";
  };

  buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isLinux efivar;
@@ -8,15 +8,15 @@

 stdenv.mkDerivation {
  pname = "epson-inkjet-printer-escpr2";
-  version = "1.2.36";
+  version = "1.2.37";

  src = fetchurl {
    # To find the most recent version go to
    # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
    # and retrieve the download link for source package for arm CPU for the tar.gz (the x86 link targets to rpm source files)

-    url = "https://download-center.epson.com/f/module/bb48b7e6-662f-4152-a86f-c1a78fc74b1f/epson-inkjet-printer-escpr2-1.2.36-1.tar.gz";
-    hash = "sha256-0R4dFhT1XhjXMOeRxCbTIT1K83bkwiAhpu/W10DSlxM=";
+    url = "https://download-center.epson.com/f/module/1316b6b0-77cd-438c-95e1-c71e760a7579/epson-inkjet-printer-escpr2-1.2.37-1.tar.gz";
+    hash = "sha256-jSh2HVb490CYJ/C+Eh1T5TmnBF7hmBmsGHuVbiWTHQ0=";
  };

  buildInputs = [ cups ];
@@ -1,40 +1,63 @@
 {
  lib,
+  git,
  python3Packages,
  fetchFromGitHub,
  installShellFiles,
+  writableTmpDirAsHomeHook,
 }:

 python3Packages.buildPythonApplication rec {
-  version = "0.16.6.1";
-  format = "setuptools";
  pname = "gita";
+  version = "0.16.8.2";
+  pyproject = true;

  src = fetchFromGitHub {
-    sha256 = "sha256-kPyk13yd4rc63Nh73opuHsCTj4DgYAVfro8To96tteA=";
-    rev = "v${version}";
    repo = "gita";
    owner = "nosarthur";
+    tag = "v${version}";
+    hash = "sha256-JzfGj17YCYXmpGV2jSsGLsG1oqO5ynj7r3u/mkSBRBg=";
  };

-  dependencies = with python3Packages; [
-    pyyaml
-    setuptools
-  ];
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.argcomplete ];

  nativeBuildInputs = [ installShellFiles ];

-  # 3 of the tests are failing
-  doCheck = false;
+  nativeCheckInputs = [
+    git
+    python3Packages.pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  enabledTestPaths = [
+    "${src}/tests"
+  ];
+
+  disabledTests = [
+    # This test fails as it tries to write to the Nix store.
+    "test_set_first_time"
+  ];
+
+  # The test suite assumes that it is ran from a directory called "gita" that is
+  # a git repository.
+  preCheck = ''
+    mkdir $TMPDIR/gita
+    git init $TMPDIR/gita
+    cd $TMPDIR/gita
+  '';

  postInstall = ''
-    installShellCompletion --bash --name gita ${src}/.gita-completion.bash
-    installShellCompletion --zsh --name gita ${src}/.gita-completion.zsh
+    installShellCompletion --bash --name gita auto-completion/bash/.gita-completion.bash
+    installShellCompletion --fish --name gita auto-completion/fish/gita.fish
+    installShellCompletion --zsh --name gita auto-completion/zsh/.gita-completion.zsh
  '';

  meta = {
    description = "Command-line tool to manage multiple git repos";
    homepage = "https://github.com/nosarthur/gita";
+    changelog = "https://github.com/nosarthur/gita/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ seqizz ];
    mainProgram = "gita";
@@ -1,26 +1,39 @@
 {
  lib,
  fetchFromGitHub,
-  flutter329,
+  flutter332,
  corrosion,
  rustPlatform,
  cargo,
  rustc,
+  jdk,
  udev,
+  zlib,
  copyDesktopItems,
  makeDesktopItem,
+  runCommand,
 }:

-flutter329.buildFlutterApplication rec {
+let
+  zlib-root = runCommand "zlib-root" { } ''
+    mkdir $out
+    ln -s ${zlib.dev}/include $out/include
+    ln -s ${zlib}/lib $out/lib
+  '';
+
  pname = "intiface-central";
-  version = "2.6.7";
+
+  version = "2.6.8-unstable-2025-09-14";

  src = fetchFromGitHub {
    owner = "intiface";
    repo = "intiface-central";
-    tag = "v${version}";
-    hash = "sha256-ePk0I6Uf2/eaBKSZumv/kF9MJOB+MWQ4/FnQ19lE3ZQ=";
+    rev = "17877c623ad7e47fccfbb0acd6d191d672dc5053";
+    hash = "sha256-sXvV3T/3Po2doDWXxiiJhAbQidwPPTS5300tEbgP83g=";
  };
+in
+flutter332.buildFlutterApplication {
+  inherit pname version src;

  patches = [
    ./corrosion.patch
@@ -29,10 +42,9 @@ flutter329.buildFlutterApplication rec {
  pubspecLock = lib.importJSON ./pubspec.lock.json;

  cargoDeps = rustPlatform.fetchCargoVendor {
-    name = "${pname}-${version}-cargo-deps";
-    inherit src;
+    inherit pname version src;
    sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
-    hash = "sha256-EC0pdTG+BsVFbxixCeOIXCsMHi4pF3tug+YNVzaMn/A=";
+    hash = "sha256-S+TonMTj3xb9oVo17hfjbl448pEvR+3sTTI8ePFjYXk=";
  };

  cargoRoot = "intiface-engine-flutter-bridge";
@@ -49,7 +61,12 @@ flutter329.buildFlutterApplication rec {
    copyDesktopItems
  ];

-  buildInputs = [ udev ];
+  buildInputs = [
+    jdk
+    udev
+  ];
+
+  env.ZLIB_ROOT = zlib-root;

  # without this, only the splash screen will be shown and the logs will contain the
  # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'`
@@ -44,11 +44,11 @@
      "dependency": "transitive",
      "description": {
        "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
    },
    "bloc": {
      "dependency": "direct main",
@@ -354,11 +354,11 @@
      "dependency": "transitive",
      "description": {
        "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
    },
    "ffi": {
      "dependency": "direct main",
@@ -648,6 +648,16 @@
      "source": "hosted",
      "version": "1.0.5"
    },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "d2c361082d554d4593c3012e26f6b188f902acd291330f13d6427641a92b3da1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.14.2"
+    },
    "js": {
      "dependency": "transitive",
      "description": {
@@ -682,11 +692,11 @@
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
    },
    "leak_tracker_flutter_testing": {
      "dependency": "transitive",
@@ -1132,21 +1142,21 @@
      "dependency": "direct main",
      "description": {
        "name": "sentry",
-        "sha256": "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb",
+        "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.14.2"
+      "version": "9.6.0"
    },
    "sentry_flutter": {
      "dependency": "direct main",
      "description": {
        "name": "sentry_flutter",
-        "sha256": "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8",
+        "sha256": "37deb4ef8837d10b5c1f527ec18591f8d2d2da9c34f19b3d97ccbbe7f84077c0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.14.2"
+      "version": "9.6.0"
    },
    "settings_ui": {
      "dependency": "direct main",
@@ -1518,11 +1528,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
    },
    "watcher": {
      "dependency": "transitive",
@@ -1538,21 +1548,21 @@
      "dependency": "transitive",
      "description": {
        "name": "web",
-        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.5.1"
+      "version": "1.1.1"
    },
    "web_socket_channel": {
      "dependency": "direct main",
      "description": {
        "name": "web_socket_channel",
-        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
+        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.5"
+      "version": "2.4.0"
    },
    "win32": {
      "dependency": "transitive",
@@ -1,14 +1,14 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update

 set -eou pipefail

-ROOT="$(dirname "$(readlink -f "$0")")"
+PACKAGE_DIR=$(realpath "$(dirname "$0")")

-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/intiface/intiface-central/releases/latest | jq --raw-output .tag_name)
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/intiface/intiface-central/releases/latest | jq --raw-output .tag_name)
 latestVersion=$(echo "$latestTag" | sed 's/^v//')

-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; intiface-central.version or (lib.getVersion intiface-central)" | tr -d '"')
+currentVersion=$(nix eval --raw --file . intiface-central.version)

 if [[ "$currentVersion" == "$latestVersion" ]]; then
    echo "package is up-to-date: $currentVersion"
@@ -17,4 +17,4 @@ fi

 nix-update intiface-central --version $latestVersion

-curl https://raw.githubusercontent.com/intiface/intiface-central/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+curl --fail --silent https://raw.githubusercontent.com/intiface/intiface-central/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "komari-agent";
+  version = "1.1.40";
+
+  src = fetchFromGitHub {
+    owner = "komari-monitor";
+    repo = "komari-agent";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-aWCsaiYkpj0D9hr7V3pxSk14pMD2E117vwemt9Ckqv0=";
+  };
+
+  vendorHash = "sha256-5RL/dDR/Or9GRCPVQmUYKTV82q7xuN2Mqc4/86WmbqY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/komari-monitor/komari-agent/update.CurrentVersion=${finalAttrs.version}"
+  ];
+
+  # tests require network access
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/komari-monitor/komari-agent";
+    description = "Lightweight server probe for simple, efficient monitoring";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      mlyxshi
+    ];
+    mainProgram = "komari-agent";
+  };
+})
@@ -11,10 +11,10 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "ltspice";
-  version = "24.1.10";
+  version = "26.0.0";
  src = fetchurl {
-    url = "https://web.archive.org/web/20251117140534if_/https://ltspice.analog.com/software/LTspice64.msi";
-    hash = "sha256-2t/6idUniSRHLdJQ+5OuvcRNGRIs2PR0iiezpZ0ovY8=";
+    url = "https://web.archive.org/web/20251210201306/https://ltspice.analog.com/software/LTspice64.msi";
+    hash = "sha256-fw4z9BlkMUR/z7u+wMx6S267jn8y+HzVgDkQ9rJTQ70=";
  };
  dontUnpack = true;
  dontConfigure = true;
@@ -4,12 +4,13 @@
  "flutter_discord_rpc_fork": "sha256-jMvtKEBIxwZDc49pxC/YY4TuqFQNtlj4khp9+MUZNX0=",
  "flutter_qjs": "sha256-VCw6U0DTGGdC0ZV5c5l34NhBF+Bw/la9of0BZYcTlYo=",
  "flutter_web_auth_2": "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=",
-  "media_kit": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_libs_android_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_libs_ios_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_libs_linux": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_libs_macos_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_libs_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_libs_windows_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4=",
-  "media_kit_video": "sha256-Wc+rfxFaHiqNhsDFN7gYneM+97O1fg2b4q4hjhnRlI4="
+  "m_extension_server": "sha256-Ay5u0BGMzS5o9QSRLT8N5DGOTCanQNaCwtDDXqIVZYE=",
+  "media_kit": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_libs_android_video": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_libs_ios_video": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_libs_linux": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_libs_macos_video": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_libs_video": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_libs_windows_video": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo=",
+  "media_kit_video": "sha256-rJeZ/40TfiOTdjpWJNlDUZySmD7v1KLSgq+O8ZsFtjo="
 }
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  flutter335,
+  flutter338,
  rustPlatform,
  fetchFromGitHub,
  copyDesktopItems,
@@ -14,13 +14,13 @@

 let
  pname = "mangayomi";
-  version = "0.6.70";
+  version = "0.6.85";

  src = fetchFromGitHub {
    owner = "kodjodevf";
    repo = "mangayomi";
    tag = "v${version}";
-    hash = "sha256-XWa5jEIQWmApbXNu8AgKt6Af9S1ZrsyaFET07FVn7Rc=";
+    hash = "sha256-Zy4B0nl9R/LmXj/DUI4v98GbSUu8YWGOO0GCXpRHtBA=";
  };

  metaCommon = {
@@ -44,7 +44,7 @@ let
    meta = metaCommon;
  };
 in
-flutter335.buildFlutterApplication {
+flutter338.buildFlutterApplication {
  inherit pname version src;

  pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -54,11 +54,11 @@
      "dependency": "direct main",
      "description": {
        "name": "app_links",
-        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
+        "sha256": "3462d9defc61565fde4944858b59bec5be2b9d5b05f20aed190adb3ad08a7abc",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.4.1"
+      "version": "7.0.0"
    },
    "app_links_linux": {
      "dependency": "transitive",
@@ -234,11 +234,11 @@
      "dependency": "transitive",
      "description": {
        "name": "built_value",
-        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
+        "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.12.0"
+      "version": "8.12.1"
    },
    "characters": {
      "dependency": "transitive",
@@ -354,11 +354,11 @@
      "dependency": "transitive",
      "description": {
        "name": "cross_file",
-        "sha256": "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239",
+        "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.3.5"
+      "version": "0.3.5+1"
    },
    "crypto": {
      "dependency": "direct main",
@@ -465,11 +465,11 @@
      "dependency": "direct main",
      "description": {
        "name": "device_info_plus",
-        "sha256": "dd0e8e02186b2196c7848c9d394a5fd6e5b57a43a546082c5820b1ec72317e33",
+        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "12.2.0"
+      "version": "12.3.0"
    },
    "device_info_plus_platform_interface": {
      "dependency": "transitive",
@@ -596,11 +596,11 @@
      "dependency": "direct main",
      "description": {
        "name": "file_picker",
-        "sha256": "f8f4ea435f791ab1f817b4e338ed958cb3d04ba43d6736ffc39958d950754967",
+        "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.3.6"
+      "version": "10.3.7"
    },
    "fixnum": {
      "dependency": "transitive",
@@ -616,21 +616,21 @@
      "dependency": "direct main",
      "description": {
        "name": "flex_color_scheme",
-        "sha256": "6e713c27a2ebe63393a44d4bf9cdd2ac81e112724a4c69905fc41cbf231af11d",
+        "sha256": "ab854146f201d2d62cc251fd525ef023b84182c4a0bfe4ae4c18ffc505b412d3",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.3.1"
+      "version": "8.4.0"
    },
    "flex_seed_scheme": {
      "dependency": "transitive",
      "description": {
        "name": "flex_seed_scheme",
-        "sha256": "828291a5a4d4283590541519d8b57821946660ac61d2e07d955f81cfcab22e5d",
+        "sha256": "a3183753bbcfc3af106224bff3ab3e1844b73f58062136b7499919f49f3667e7",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.1"
    },
    "flutter": {
      "dependency": "direct main",
@@ -769,11 +769,11 @@
      "dependency": "transitive",
      "description": {
        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687",
+        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.32"
+      "version": "2.0.33"
    },
    "flutter_qjs": {
      "dependency": "direct main",
@@ -893,11 +893,11 @@
      "dependency": "direct main",
      "description": {
        "name": "go_router",
-        "sha256": "f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3",
+        "sha256": "c92d18e1fe994cb06d48aa786c46b142a5633067e8297cff6b5a3ac742620104",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "14.8.1"
+      "version": "17.0.0"
    },
    "google_fonts": {
      "dependency": "direct main",
@@ -1073,31 +1073,31 @@
      "dependency": "direct main",
      "description": {
        "name": "isar_community",
-        "sha256": "28f59e54636c45ba0bb1b3b7f2656f1c50325f740cea6efcd101900be3fba546",
+        "sha256": "d92315e1862448f236489c2b2b1f9a7ad5ba2405f42d87216234be4fb2e1dd2d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.3.0-dev.3"
+      "version": "3.3.0"
    },
    "isar_community_flutter_libs": {
      "dependency": "direct main",
      "description": {
        "name": "isar_community_flutter_libs",
-        "sha256": "c2934fe755bb3181cb67602fd5df0d080b3d3eb52799f98623aa4fc5acbea010",
+        "sha256": "3c072d8d77e820196fa23839b88481c50d903c73b3c0db6e647b29509d04fe3b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.3.0-dev.3"
+      "version": "3.3.0"
    },
    "isar_community_generator": {
      "dependency": "direct dev",
      "description": {
        "name": "isar_community_generator",
-        "sha256": "1d760de09ffbc837ad65476f14b6ad17381f0fb485e01bf77d76d825ef734bec",
+        "sha256": "6ca1487b7551850f7896443aa8079a12b23cdf71a99dafb1f567c83d6e031042",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.3.0-dev.3"
+      "version": "3.3.0"
    },
    "isolate_contactor": {
      "dependency": "transitive",
@@ -1219,6 +1219,17 @@
      "source": "hosted",
      "version": "1.3.0"
    },
+    "m_extension_server": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "master",
+        "resolved-ref": "dd07e87603cc2d6cb3fc42c37def4396741c4944",
+        "url": "https://github.com/kodjodevf/m_extension_server.git"
+      },
+      "source": "git",
+      "version": "0.0.1"
+    },
    "marquee": {
      "dependency": "direct main",
      "description": {
@@ -1254,30 +1265,30 @@
      "description": {
        "path": "media_kit",
        "ref": "HEAD",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
-      "version": "1.2.0"
+      "version": "1.2.2"
    },
    "media_kit_libs_android_video": {
      "dependency": "transitive",
      "description": {
        "path": "libs/android/media_kit_libs_android_video",
-        "ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
-      "version": "1.3.7"
+      "version": "1.3.8"
    },
    "media_kit_libs_ios_video": {
      "dependency": "transitive",
      "description": {
        "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
      "version": "1.1.4"
@@ -1286,9 +1297,9 @@
      "dependency": "transitive",
      "description": {
        "path": "libs/linux/media_kit_libs_linux",
-        "ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
      "version": "1.2.1"
@@ -1297,9 +1308,9 @@
      "dependency": "transitive",
      "description": {
        "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
      "version": "1.1.4"
@@ -1309,19 +1320,19 @@
      "description": {
        "path": "libs/universal/media_kit_libs_video",
        "ref": "HEAD",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
-      "version": "1.0.6"
+      "version": "1.0.7"
    },
    "media_kit_libs_windows_video": {
      "dependency": "transitive",
      "description": {
        "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
      "version": "1.0.11"
@@ -1331,21 +1342,21 @@
      "description": {
        "path": "media_kit_video",
        "ref": "HEAD",
-        "resolved-ref": "62b08e33590cba8fba4797eaaa1e95b514adb437",
-        "url": "https://github.com/Schnitzel5/media-kit.git"
+        "resolved-ref": "f5796d287b642548e7e703bbc592f01dd7b1befe",
+        "url": "https://github.com/kodjodevf/media-kit.git"
      },
      "source": "git",
-      "version": "1.3.0"
+      "version": "2.0.0"
    },
    "meta": {
      "dependency": "transitive",
      "description": {
        "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.17.0"
    },
    "mime": {
      "dependency": "transitive",
@@ -1411,11 +1422,11 @@
      "dependency": "direct main",
      "description": {
        "name": "package_info_plus",
-        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.3.1"
+      "version": "9.0.0"
    },
    "package_info_plus_platform_interface": {
      "dependency": "transitive",
@@ -1451,21 +1462,21 @@
      "dependency": "transitive",
      "description": {
        "name": "path_provider_android",
-        "sha256": "e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16",
+        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.20"
+      "version": "2.2.22"
    },
    "path_provider_foundation": {
      "dependency": "transitive",
      "description": {
        "name": "path_provider_foundation",
-        "sha256": "efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738",
+        "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.3"
+      "version": "2.5.1"
    },
    "path_provider_linux": {
      "dependency": "transitive",
@@ -2116,31 +2127,31 @@
      "dependency": "transitive",
      "description": {
        "name": "test",
-        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
+        "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.26.2"
+      "version": "1.26.3"
    },
    "test_api": {
      "dependency": "transitive",
      "description": {
        "name": "test_api",
-        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.6"
+      "version": "0.7.7"
    },
    "test_core": {
      "dependency": "transitive",
      "description": {
        "name": "test_core",
-        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
+        "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.6.11"
+      "version": "0.6.12"
    },
    "time": {
      "dependency": "transitive",
@@ -2206,41 +2217,41 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_android",
-        "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9",
+        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.24"
+      "version": "6.3.28"
    },
    "url_launcher_ios": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_ios",
-        "sha256": "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9",
+        "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.5"
+      "version": "6.3.6"
    },
    "url_launcher_linux": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_linux",
-        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
+        "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
    },
    "url_launcher_macos": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_macos",
-        "sha256": "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9",
+        "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.2.4"
+      "version": "3.2.5"
    },
    "url_launcher_platform_interface": {
      "dependency": "transitive",
@@ -2266,11 +2277,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_windows",
-        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
+        "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.4"
+      "version": "3.1.5"
    },
    "uuid": {
      "dependency": "transitive",
@@ -2316,11 +2327,11 @@
      "dependency": "transitive",
      "description": {
        "name": "wakelock_plus",
-        "sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b",
+        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.3"
+      "version": "1.4.0"
    },
    "wakelock_plus_platform_interface": {
      "dependency": "transitive",
@@ -2494,7 +2505,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.9.2 <4.0.0",
-    "flutter": ">=3.35.0"
+    "dart": ">=3.10.1 <4.0.0",
+    "flutter": ">=3.38.1"
  }
 }
@@ -58,17 +58,17 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/020-megasync-sdk-fix-cmake-dependencies-detection.patch?h=megasync&id=ff59780039697591e7e3a966db058b23bee0451c";
+      url = "https://github.com/archlinux/aur/raw/ff59780039697591e7e3a966db058b23bee0451c/020-megasync-sdk-fix-cmake-dependencies-detection.patch";
      hash = "sha256-hQY6tMwiV3B6M6WiFdOESdhahAtuWjdoj2eI2mst/K8=";
      extraPrefix = "src/MEGASync/mega/";
      stripLen = true;
    })
    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync&id=ff59780039697591e7e3a966db058b23bee0451c";
+      url = "https://github.com/archlinux/aur/raw/ff59780039697591e7e3a966db058b23bee0451c/030-megasync-app-fix-cmake-dependencies-detection.patch";
      hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U=";
    })
    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/040-megasync-app-add-missing-link-to-zlib.patch?h=megasync&id=c1f647871f5aad7e421971165b07e51b3e7900e9";
+      url = "https://github.com/archlinux/aur/raw/c1f647871f5aad7e421971165b07e51b3e7900e9/040-megasync-app-add-missing-link-to-zlib.patch";
      hash = "sha256-HMsS5TlzkQZbfANSIrvH8Cp6mTxLJ04idcWUWeD2A0U=";
    })
    ./megasync-fix-cmake-install-bindir.patch
@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "nelm";
-  version = "1.17.2";
+  version = "1.19.0";

  src = fetchFromGitHub {
    owner = "werf";
    repo = "nelm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dF/sgQ7ihOYrIGS1yw9qLtafKg4g5HrFkM9L4RMwuN4=";
+    hash = "sha256-d/WhWBNkfeWeWBN7GIL0owkgzOXLfurHMFAa5C+WjrM=";
  };

-  vendorHash = "sha256-6cv4ArX+KekO2s/4oSZ1NTEiHHVu+TDMJsYvusyc4+I=";
+  vendorHash = "sha256-2sBZLmx2c9FfoJrMR1PxbwHzta9MBF9K0vGr3PVcmF4=";

  subPackages = [ "cmd/nelm" ];

@@ -1,896 +0,0 @@
-{
-  "name": "shopify",
-  "version": "3.86.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "shopify",
-      "version": "3.86.1",
-      "dependencies": {
-        "@shopify/cli": "3.86.1"
-      },
-      "bin": {
-        "shopify": "node_modules/@shopify/cli/bin/run.js"
-      }
-    },
-    "node_modules/@ast-grep/napi": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi/-/napi-0.33.0.tgz",
-      "integrity": "sha512-6heRMmomhSD0dkummRQ+R4xWXXmc41OaDPoPI49mKJXPyvwJPdPZUcQjXdIitOVL4uJV+qM2ZBucDPENDBSixw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "@ast-grep/napi-darwin-arm64": "0.33.0",
-        "@ast-grep/napi-darwin-x64": "0.33.0",
-        "@ast-grep/napi-linux-arm64-gnu": "0.33.0",
-        "@ast-grep/napi-linux-arm64-musl": "0.33.0",
-        "@ast-grep/napi-linux-x64-gnu": "0.33.0",
-        "@ast-grep/napi-linux-x64-musl": "0.33.0",
-        "@ast-grep/napi-win32-arm64-msvc": "0.33.0",
-        "@ast-grep/napi-win32-ia32-msvc": "0.33.0",
-        "@ast-grep/napi-win32-x64-msvc": "0.33.0"
-      }
-    },
-    "node_modules/@ast-grep/napi-darwin-arm64": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-arm64/-/napi-darwin-arm64-0.33.0.tgz",
-      "integrity": "sha512-FsBQiBNGbqeU6z2sjFgnV6MXuBa0wYUb4PViMnqsKLeWiO7kRii5crmXLCtdTD2hufXTG6Rll8X46AkYOAwGGQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-darwin-x64": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-x64/-/napi-darwin-x64-0.33.0.tgz",
-      "integrity": "sha512-rWo1wG7fc7K20z9ExIeN6U4QqjHhoQSpBDDnmxKTR0nIwPfyMq338sS4sWZomutxprcZDtWrekxH1lXjNvfuiA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-linux-arm64-gnu": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-arm64-gnu/-/napi-linux-arm64-gnu-0.33.0.tgz",
-      "integrity": "sha512-3ZnA2k57kxfvLg4s9+6rHaCx1FbWt0EF8fumJMf5nwevu7GbVOOhCkzAetZe80FBgZuIOSR4IS2QMj9ZHI0UdQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-linux-arm64-musl": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-arm64-musl/-/napi-linux-arm64-musl-0.33.0.tgz",
-      "integrity": "sha512-oUGZgCaVCijFgvC+X52ttgoWUqgrIsSVJZgn+1VBY3n4mpzcoYAghFomSUbRTBUL2ebvZweA33Klqks4okY61w==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-linux-x64-gnu": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-x64-gnu/-/napi-linux-x64-gnu-0.33.0.tgz",
-      "integrity": "sha512-QTAkfxQSsOGRza0hnkeAgJDQqR00iDerRNq42dOGIzgF+Kse491By3UmBEMG4oCbv17yYcBBlknQkzKSKtigjw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-linux-x64-musl": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-x64-musl/-/napi-linux-x64-musl-0.33.0.tgz",
-      "integrity": "sha512-PW6bZO7MyQsBNZv0idI/Ah6ak66T8LqZ21wBGjtQp9NDGViOtkLeu+eJJGaZjMqUdidKHKgmMKXksZHl2m8ulQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-win32-arm64-msvc": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-arm64-msvc/-/napi-win32-arm64-msvc-0.33.0.tgz",
-      "integrity": "sha512-ijmFQcFc32JOIQlSfnhDJpb3qFb2RhrRqfeY0EHHN1xRSGwZHfsHTSS66nKR2sREmxTIMgxXOtylKicbyyMVKA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-win32-ia32-msvc": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-ia32-msvc/-/napi-win32-ia32-msvc-0.33.0.tgz",
-      "integrity": "sha512-NNIb2VK3Z2BwKp0QJSw8gkhwOUp85SgTsxJ38p+wIUAA/KzAKCJOmyOaZ301qGHt4gL+jTHgTIvJJX+9eT/REg==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@ast-grep/napi-win32-x64-msvc": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-x64-msvc/-/napi-win32-x64-msvc-0.33.0.tgz",
-      "integrity": "sha512-gW7viQQjdPA1HoCkpCqoonC81TOwcpP828w/XqZFE/L6uhD8SF2usul8KNBQOiX3O7/fqYEOnbtWMCrwZIqG1Q==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
-      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
-      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
-      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
-      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
-      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
-      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
-      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
-      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
-      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
-      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
-      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
-      "cpu": [
-        "loong64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
-      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
-      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
-      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
-      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
-      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
-      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
-      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
-      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
-      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
-      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
-      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
-      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@shopify/cli": {
-      "version": "3.86.1",
-      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.86.1.tgz",
-      "integrity": "sha512-d49b7Tx7xkgih2bwbLC1BXhgiEs4HGVoOBn8bKihtKILqbZ/V/6VFQB82BV8s00JPWaWy8pEOvX+0sMg2UIFSw==",
-      "license": "MIT",
-      "os": [
-        "darwin",
-        "linux",
-        "win32"
-      ],
-      "dependencies": {
-        "@ast-grep/napi": "0.33.0",
-        "esbuild": "0.25.10",
-        "global-agent": "3.0.0"
-      },
-      "bin": {
-        "shopify": "bin/run.js"
-      },
-      "engines": {
-        "node": ">=20.10.0"
-      }
-    },
-    "node_modules/boolean": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "license": "MIT"
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "license": "MIT"
-    },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "license": "MIT"
-    },
-    "node_modules/esbuild": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
-      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.10",
-        "@esbuild/android-arm": "0.25.10",
-        "@esbuild/android-arm64": "0.25.10",
-        "@esbuild/android-x64": "0.25.10",
-        "@esbuild/darwin-arm64": "0.25.10",
-        "@esbuild/darwin-x64": "0.25.10",
-        "@esbuild/freebsd-arm64": "0.25.10",
-        "@esbuild/freebsd-x64": "0.25.10",
-        "@esbuild/linux-arm": "0.25.10",
-        "@esbuild/linux-arm64": "0.25.10",
-        "@esbuild/linux-ia32": "0.25.10",
-        "@esbuild/linux-loong64": "0.25.10",
-        "@esbuild/linux-mips64el": "0.25.10",
-        "@esbuild/linux-ppc64": "0.25.10",
-        "@esbuild/linux-riscv64": "0.25.10",
-        "@esbuild/linux-s390x": "0.25.10",
-        "@esbuild/linux-x64": "0.25.10",
-        "@esbuild/netbsd-arm64": "0.25.10",
-        "@esbuild/netbsd-x64": "0.25.10",
-        "@esbuild/openbsd-arm64": "0.25.10",
-        "@esbuild/openbsd-x64": "0.25.10",
-        "@esbuild/openharmony-arm64": "0.25.10",
-        "@esbuild/sunos-x64": "0.25.10",
-        "@esbuild/win32-arm64": "0.25.10",
-        "@esbuild/win32-ia32": "0.25.10",
-        "@esbuild/win32-x64": "0.25.10"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/global-agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
-      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "boolean": "^3.0.1",
-        "es6-error": "^4.1.1",
-        "matcher": "^3.0.0",
-        "roarr": "^2.15.3",
-        "semver": "^7.3.2",
-        "serialize-error": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=10.0"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "license": "ISC"
-    },
-    "node_modules/matcher": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/roarr": {
-      "version": "2.15.4",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
-      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "boolean": "^3.0.1",
-        "detect-node": "^2.0.4",
-        "globalthis": "^1.0.1",
-        "json-stringify-safe": "^5.0.1",
-        "semver-compare": "^1.0.0",
-        "sprintf-js": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "license": "MIT"
-    },
-    "node_modules/serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/type-fest": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
-}
@@ -1,11 +0,0 @@
-{
-  "name": "shopify",
-  "version": "3.86.1",
-  "private": true,
-  "bin": {
-    "shopify": "node_modules/@shopify/cli/bin/run.js"
-  },
-  "dependencies": {
-    "@shopify/cli": "3.86.1"
-  }
-}
@@ -1,39 +1,85 @@
 {
-  buildNpmPackage,
  lib,
-  testers,
-  shopify-cli,
+  stdenv,
+  fetchFromGitHub,
+  pnpm,
+  faketty,
+  nodejs,
+  versionCheckHook,
+  makeBinaryWrapper,
+  nix-update-script,
 }:
-let
-  version = "3.86.1";
-in
-buildNpmPackage {
+stdenv.mkDerivation (finalAttrs: {
  pname = "shopify";
-  version = version;
+  version = "3.86.1";

-  src = ./manifests;
-
-  npmDepsHash = "sha256-GAE4zfSqk7oM2ecojPC4REFGRdRwvqCnA9L2L7LMIfQ=";
-  dontNpmBuild = true;
-
-  passthru = {
-    updateScript = ./update.sh;
-    tests.version = testers.testVersion {
-      package = shopify-cli;
-      command = "shopify version";
-    };
+  src = fetchFromGitHub {
+    owner = "shopify";
+    repo = "cli";
+    tag = finalAttrs.version;
+    hash = "sha256-wEddzW5/+qdtNTxdUs7YEA5vk6/KjrVOgWvIeo0o2ww=";
  };

+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 2;
+    hash = "sha256-JhyZpkrp78FECH6UKYYuhWF2w/mYW1BQG5FIsWh5GRE=";
+  };
+
+  nativeBuildInputs = [
+    faketty
+    nodejs
+    pnpm.configHook
+    makeBinaryWrapper
+  ];
+
+  # workaround for https://github.com/nrwl/nx/issues/22445
+  buildPhase = ''
+    runHook preBuild
+
+    faketty pnpm run bundle-for-release --disableRemoteCache=true --nxBail=true --outputStyle=static
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/@shopify/cli/{dist,bin}
+    mkdir -p $out/bin
+    pushd packages/cli
+    rm -rf dist/*.map
+    mv dist/* $out/lib/node_modules/@shopify/cli/dist
+    mv bin/run.js $out/lib/node_modules/@shopify/cli/bin/run.js
+    mv package.json oclif.manifest.json $out/lib/node_modules/@shopify/cli
+    popd
+    # Install runtime dependencies
+    rm -rf node_modules
+    pnpm config set nodeLinker hoisted
+    pnpm install --offline --prod --force --ignore-scripts --frozen-lockfile
+    mv node_modules $out/lib/node_modules/@shopify/cli/node_modules
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/shopify \
+      --add-flags "$out/lib/node_modules/@shopify/cli/bin/run.js"
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
  meta = {
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.unix;
    mainProgram = "shopify";
    description = "CLI which helps you build against the Shopify platform faster";
    homepage = "https://github.com/Shopify/cli";
-    changelog = "https://github.com/Shopify/cli/releases/tag/${version}";
+    changelog = "https://github.com/Shopify/cli/releases/tag/${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
      fd
      onny
    ];
  };
-}
+})
@@ -1,37 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl nix-update prefetch-npm-deps nodejs jq gnused ruby bundix
-
-set -eu -o pipefail
-
-# Make a temporary directory and make sure it's removed when the script exits
-tmp=$(mktemp -d)
-trap "rm -rf $tmp" EXIT
-
-package_dir="$(dirname "${BASH_SOURCE[0]}")"
-pushd "$package_dir"
-
-curl -sfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/Shopify/cli/releases/latest > $tmp/latest.json
-version=$(cat $tmp/latest.json | jq -r '.tag_name')
-
-if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
-    echo "Already up to date!"
-    exit 0
-fi
-
-pushd manifests
-
-# Update the package.json
-sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json
-
-# Update the package-lock.json
-rm -f package-lock.json
-npm i --package-lock-only
-npm_hash=$(prefetch-npm-deps package-lock.json)
-
-popd
-
-sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$npm_hash\";|" package.nix
-
-popd
-
-nix-update shopify-cli --version $version
@@ -7,11 +7,11 @@

 let
  pname = "simplex-chat-desktop";
-  version = "6.4.7";
+  version = "6.4.8";

  src = fetchurl {
    url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-zCkbQS99FNZS9Q6MgQuINcgWn+/JdfrLraEKWAGqguY=";
+    hash = "sha256-2XyA4UZ9EMzFnFNFFek1ka2MURBFFKyMolGMYZPD5Zw=";
  };

  appimageContents = appimageTools.extract {
@@ -2,26 +2,32 @@
  lib,
  stdenv,
  fetchurl,
+  cmake,
  pkg-config,
+  qt6,
  libjack2,
  alsa-lib,
  liblo,
  lv2,
-  libsForQt5,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "synthv1";
-  version = "0.9.23";
+  version = "1.3.2";

  src = fetchurl {
    url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz";
-    hash = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
+    hash = "sha256-tCxgJdl5PMNvnhPZOsNhlS3LqBksmXBojfnSLZUZKMY=";
  };

+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail  '"''${CONFIG_PREFIX}/''${CMAKE_INSTALL_LIBDIR}"' '"''${CMAKE_INSTALL_LIBDIR}"'
+  '';
+
  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qttools
+    qt6.qtbase
+    qt6.qttools
    libjack2
    alsa-lib
    liblo
@@ -29,8 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  nativeBuildInputs = [
+    cmake
    pkg-config
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
  ];

  meta = {
@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  fetchFromGitHub,
  rustPlatform,
  gtk3,
@@ -36,12 +37,14 @@ rustPlatform.buildRustPackage rec {
    gtk3
    hidapi
    libusb1
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    udev
  ];

  cargoHash = "sha256-0UmEWQz+8fKx8Z1slVuVZeiWN9JKjEKINgXzZ6a4jkE=";

-  postInstall = ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
    install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications
    cp -r data/icons $out/share
  '';
@@ -52,6 +55,6 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/pop-os/keyboard-configurator";
    license = with lib.licenses; [ gpl3Only ];
    maintainers = with lib.maintainers; [ mirrexagon ];
-    platforms = lib.platforms.linux;
+    platforms = with lib.platforms; linux ++ darwin;
  };
 }
@@ -13,8 +13,8 @@ buildRubyGem rec {
  inherit ruby;
  name = "${gemName}-${version}";
  gemName = "tmuxinator";
-  version = "3.3.5";
-  source.sha256 = "sha256-lkP0gCjMCcc8MpOA7aLrQut7jkpaZt9v9GWqh4C/JyE=";
+  version = "3.3.7";
+  source.sha256 = "sha256-z0E/zS6o8MXW4Gi6KqtusRtPpUBa5XhGMAsNJGZxL7I=";

  erubi = buildRubyGem rec {
    inherit ruby;
@@ -102,7 +102,7 @@ let
    ++ lib.optionals mediaSupport [ ffmpeg_7 ]
  );

-  version = "15.0.2";
+  version = "15.0.3";

  sources = {
    x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
      ];
-      hash = "sha256-GtO7u9KhZgIbdTJqMTQ2ZabA6PKrwW0ogxYJvmkVfV8=";
+      hash = "sha256-MVbxV8U1WKT3loM174Zk0QG33qftzr/Ay3w/hbFAF2U=";
    };

    i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
      ];
-      hash = "sha256-SHJQvNqC4Ulyg81rcp6sTG0Wwv9fHqWYQPpPBsPgwss=";
+      hash = "sha256-3IEmpO1ZanAVXiUINhA44hX06J1/9vEJ8T8hQjfnAHY=";
    };
  };

@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  fetchpatch2,
  autoreconfHook,
  pkg-config,
  wrapGAppsHook3,
@@ -20,6 +21,13 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-8mBSMIhQxAaxWtuNhqzTli7xCvIrQnuxpc/07slvguk=";
  };

+  patches = [
+    (fetchpatch2 {
+      url = "https://git.launchpad.net/~neil.mayhew/xpad/+git/xpad-1/patch/?id=637c7b51f1b09a28553a926f594f626d363c526a";
+      hash = "sha256-ipebPkCpgj+5vvFS7QciZgH0CTZS12FdeVILfDReVsY=";
+    })
+  ];
+
  nativeBuildInputs = [
    autoreconfHook
    pkg-config
@@ -43,13 +43,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "xremap${variant.suffix or ""}";
-  version = "0.14.5";
+  version = "0.14.6";

  src = fetchFromGitHub {
    owner = "xremap";
    repo = "xremap";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-iqsLy6ZuU47s2eZ/Zo2A9svg1Q+UfpCCfSg1luRYdGg=";
+    hash = "sha256-QkrZltxJf5GhWczhBj3K8G6LRqlYEbZjhMtEbY8bdsk=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  buildNoDefaultFeatures = true;
  buildFeatures = variant.features;

-  cargoHash = "sha256-a7K+W4nPLSoGWBf1R7b3WZKrXn7hbOxaGnS1Vsg7Iak=";
+  cargoHash = "sha256-raCS8fN9hQMCiSH8Hp9dkyS2BLVaveUMRoM4czBlfEk=";

  passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;

@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  installShellFiles,
+  unstableGitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "z64decompress";
+  version = "1.0.3-unstable-2023-12-21";
+
+  src = fetchFromGitHub {
+    owner = "z64tools";
+    repo = "z64decompress";
+    rev = "e2b3707271994a2a1b3afc6c3997a7cf6b479765";
+    hash = "sha256-PHiOeEB9njJPsl6ScdoDVwJXGqOdIIJCZRbIXSieBIY=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin z64decompress
+    install -Dm644 -t $out/share/licenses/z64decompress LICENSE
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+  };
+
+  meta = {
+    description = "Zelda 64 rom decompressor";
+    homepage = "https://github.com/z64tools/z64decompress";
+    license = with lib.licenses; [
+      gpl3Only
+
+      # Reverse engineering
+      unfree
+    ];
+    maintainers = with lib.maintainers; [ qubitnano ];
+    mainProgram = "z64decompress";
+    platforms = lib.platforms.linux;
+    hydraPlatforms = [ ];
+  };
+})
@@ -0,0 +1,165 @@
+{
+  lib,
+  mm64baserom ? null,
+  requireFile,
+  fetchFromGitHub,
+  llvmPackages_19,
+  cmake,
+  copyDesktopItems,
+  installShellFiles,
+  makeWrapper,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
+  SDL2,
+  gtk3,
+  vulkan-loader,
+  makeDesktopItem,
+  z64decompress,
+  n64recomp,
+  directx-shader-compiler,
+  forceX11 ? false,
+}:
+
+let
+
+  baseRom =
+    if mm64baserom != null then
+      mm64baserom
+    else
+      requireFile {
+        name = "mm.us.rev1.rom.z64";
+        message = ''
+          zelda64recomp currently only supports the US version of Majora's Mask.
+          Please dump your copy and rename it to mm.us.rev1.rom.z64
+          and add it to the nix store using
+          nix-store --add-fixed sha256 mm.us.rev1.rom.z64
+          See https://dumping.guide/carts/nintendo/n64 for more details.
+        '';
+        hash = "sha256-77E2WzrjYmBFFMD5oaLRH13IaIulvmYKN96/XjvkPys=";
+      };
+
+in
+
+llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
+  pname = "zelda64recomp";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "Zelda64Recomp";
+    repo = "Zelda64Recomp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lsGnxgQqQ8wFc/qSVRFYxF0COir+eeH/flf4ePo98WA=";
+    fetchSubmodules = true;
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    copyDesktopItems
+    installShellFiles
+    llvmPackages_19.lld
+    makeWrapper
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    SDL2
+    gtk3
+    vulkan-loader
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Zelda64Recompiled";
+      icon = "zelda64recomp";
+      exec = "Zelda64Recompiled";
+      comment = "Static recompilation of Majora's Mask";
+      genericName = "Static recompilation of Majora's Mask";
+      desktopName = "Zelda 64: Recompiled";
+      categories = [ "Game" ];
+    })
+  ];
+
+  preConfigure = ''
+    ln -s ${baseRom} ./mm.us.rev1.rom.z64
+    ${lib.getExe z64decompress} mm.us.rev1.rom.z64 mm.us.rev1.rom_uncompressed.z64
+    cp ${n64recomp}/bin/* .
+
+    ./N64Recomp us.rev1.toml
+    ./RSPRecomp aspMain.us.rev1.toml
+    ./RSPRecomp njpgdspMain.us.rev1.toml
+
+    substituteInPlace lib/rt64/CMakeLists.txt \
+      --replace-fail "\''${PROJECT_SOURCE_DIR}/src/contrib/dxc/lib/x64" "${directx-shader-compiler}/lib/" \
+      --replace-fail "\''${PROJECT_SOURCE_DIR}/src/contrib/dxc/bin/x64/dxc-linux" "${directx-shader-compiler}/bin/dxc" \
+      --replace-fail "\''${PROJECT_SOURCE_DIR}/src/contrib/dxc/inc" "${directx-shader-compiler.src}/include/dxc"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "\''${PROJECT_SOURCE_DIR}/lib/rt64/src/contrib/dxc/lib/x64" "${directx-shader-compiler}/lib/" \
+      --replace-fail "\''${PROJECT_SOURCE_DIR}/lib/rt64/src/contrib/dxc/bin/x64/dxc-linux" "${directx-shader-compiler}/bin/dxc"
+  '';
+
+  # This is required or else nothing will build
+  hardeningDisable = [
+    "format"
+    "pic"
+    "stackprotector"
+    "zerocallusedregs"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin Zelda64Recompiled
+    install -Dm644 -t $out/share ../recompcontrollerdb.txt
+    install -Dm644 ../icons/512.png $out/share/icons/hicolor/scalable/apps/zelda64recomp.png
+    cp -r ../assets $out/share/
+    ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt
+    ln -s $out/share/assets $out/bin/assets
+
+    install -Dm644 -t $out/share/licenses/zelda64recomp ../COPYING
+    install -Dm644 -t $out/share/licenses/zelda64recomp/N64ModernRuntime ../lib/N64ModernRuntime/COPYING
+    install -Dm644 -t $out/share/licenses/zelda64recomp/RmlUi ../lib/RmlUi/LICENSE.txt
+    install -Dm644 -t $out/share/licenses/zelda64recomp/lunasvg ../lib/lunasvg/LICENSE
+    install -Dm644 -t $out/share/licenses/zelda64recomp/rt64 ../lib/rt64/LICENSE
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
+     )
+  '';
+
+  # This is needed as Zelda64Recompiled will segfault when not run from the same
+  # directory as the binary. It also used to exit when run without X11. Recent rt64
+  # updates enabled wayland support, but leave the option to disable this on the
+  # application level if desired.
+  postFixup = ''
+    wrapProgram $out/bin/Zelda64Recompiled --chdir "$out/bin/" \
+        ${lib.optionalString forceX11 ''--set SDL_VIDEODRIVER x11''}
+  '';
+
+  meta = {
+    description = "Static recompilation of Majora's Mask (and soon Ocarina of Time) for PC (Windows/Linux)";
+    homepage = "https://github.com/Zelda64Recomp/Zelda64Recomp";
+    license = with lib.licenses; [
+      # Zelda64Recomp, N64ModernRuntime
+      gpl3Only
+
+      # RT64, RmlUi, lunasvg, sse2neon
+      mit
+
+      # reverse engineering
+      unfree
+    ];
+    maintainers = with lib.maintainers; [ qubitnano ];
+    mainProgram = "Zelda64Recompiled";
+    platforms = [ "x86_64-linux" ];
+  };
+})
@@ -1,6 +1,6 @@
 genericBuilder:

 genericBuilder {
-  version = "28.2";
-  hash = "sha256-59IUTZrjDqmz3qVQOS3Ni35fD6TzosPnRSMsuR6vF4k=";
+  version = "28.3";
+  hash = "sha256-Kn6JYy7EIiBT2pTfh8S9uHCsLS9EZlv3NBFxbYmHXJA=";
 }
@@ -5,8 +5,8 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

 import ./generic.nix {
-  version = "3.119";
-  hash = "sha256-Lz2zWWjcneJ5X4sfOvPzEewMAKyDU7PluhWPV5E3By4=";
+  version = "3.119.1";
+  hash = "sha256-GxLTqHcVWGiFezcwdctXJ8k9wqizVJPHyLBPZzphLro=";
  filename = "latest.nix";
  versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }
@@ -3964,6 +3964,38 @@ final: prev: {
    }
  ) { };

+  neorg-interim-ls = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+      luaOlder,
+      neorg,
+    }:
+    buildLuarocksPackage {
+      pname = "neorg-interim-ls";
+      version = "2.1.1-1";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/neorg-interim-ls-2.1.1-1.rockspec";
+          sha256 = "0kx8ql89yadlhnw2jl7ck950vrzs0ihjm079mg0vlnklriw4zw5v";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/benlubas/neorg-interim-ls/archive/v2.1.1.zip";
+        sha256 = "1vszvmsy27n68ivi6bmk1hifi00dg33mc9iz66nv2gfmwcfwbsfz";
+      };
+
+      disabled = luaOlder "5.1";
+      propagatedBuildInputs = [ neorg ];
+
+      meta = {
+        homepage = "https://github.com/benlubas/neorg-interim-ls";
+        description = "Temporarily providing a limited set of LSP features to neorg";
+        license.fullName = "MIT";
+      };
+    }
+  ) { };
+
  neotest = callPackage (
    {
      buildLuarocksPackage,
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "django-pgtrigger";
-  version = "4.15.4";
+  version = "4.17.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "AmbitionEng";
    repo = "django-pgtrigger";
    tag = version;
-    hash = "sha256-3v/YWcWZAiEH9EtxC901kEqja0TTzbNSTkjoH+cEUN4=";
+    hash = "sha256-LBuqaFFHP18LPI26CcYMVO7rJsDrCBtuVKhwoTr6ACA=";
  };

  build-system = [ poetry-core ];
@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "pywikibot";
-  version = "10.7.2";
+  version = "10.7.3";
  format = "setuptools";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-bFU3SWk06nA9OkPFfN5Zn+qTZFuqG/QiFKrlgkNknbg=";
+    hash = "sha256-ujkPgXqq5h4vISeUXHKWnMR2Mtt0a26Qjz20qdufT/4=";
  };

  propagatedBuildInputs = [
@@ -77,5 +77,6 @@ stdenv'.mkDerivation (finalAttrs: {
    changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
    maintainers = [ ];
    platforms = lib.platforms.all;
+    mainProgram = "shiboken6";
  };
 })
@@ -16,11 +16,26 @@
  bashNonInteractive,
  nftablesCompat ? true,
  gitUpdater,
+
+  # For tests
+  vmTools,
+  python3,
+  util-linux,
+  nftables,
+  strace,
+  iana-etc,
+  shadow,
+  iproute2,
+  iputils,
 }:

-stdenv.mkDerivation rec {
+let
  version = "1.8.11";
  pname = "iptables";
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname version;

  __structuredAttrs = true;

@@ -86,6 +101,67 @@ stdenv.mkDerivation rec {
      url = "https://git.netfilter.org/iptables";
      rev-prefix = "v";
    };
+
+    # Tests are run in a VM because they require access to the kernel (to modify rule chains)
+    tests.withCheck = vmTools.runInLinuxVM (
+      finalAttrs.finalPackage.overrideAttrs (_: {
+        memSize = 4096;
+        nativeCheckInputs = [
+          python3
+          util-linux
+          nftables
+          strace
+          iana-etc
+          shadow
+          iproute2
+          iputils
+        ];
+
+        doCheck = true;
+
+        preCheck = ''
+          # Tests require /etc/{ethertypes,protocols,services}
+          cp etc/ethertypes /etc/ethertypes
+          ln -s ${iana-etc}/protocols /etc/protocols
+          ln -s ${iana-etc}/services /etc/services
+
+          # Some tests specifically require a root group with GID 0
+          groupadd -g 0 root
+
+          # Set up for "unprivileged" test (it tries to runuser -u nobody)
+          groupadd -g 1000 nogroup
+          useradd nobody -u 1000 -g nogroup -d /var/empty
+          mkdir -p /etc/pam.d
+          echo 'auth sufficient pam_permit.so' >> /etc/pam.d/runuser
+          echo 'account required pam_permit.so' >> /etc/pam.d/runuser
+          echo 'password required pam_permit.so' >> /etc/pam.d/runuser
+          echo 'session required pam_permit.so' >> /etc/pam.d/runuser
+
+          # /etc/protocols has an entry for 141/wesp now, which makes three tests fail. Fix the expected output
+          # TODO(balsoft): see if this should be upstreamed
+          sed -i -e 's/protocol 141/protocol wesp/' -e 's/l4proto 141/l4proto wesp/' -e 's/!= 141/!= wesp/' extensions/generic.txlate
+          # Not sure what causes these failures. Just disable the tests for now.
+          # FIXME(balsoft): see if this is fixed in a future release
+          sed -i -e '/^monitorcheck \w*tables -X [^ ]*$/d' iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0
+
+          ${lib.optionalString (stdenv.system == "aarch64-linux") ''
+            # All SECMARK-related tests fail on aarch64 for some reason
+            rm extensions/*SECMARK.t
+          ''}
+
+          patchShebangs xlate-test.py iptables-test.py iptables/tests
+        '';
+
+        # Save some resources by not installing anything
+        outputs = [ "out" ];
+        postCheck = ''
+          touch "$out"
+        '';
+
+        dontInstall = true;
+        dontFixup = true;
+      })
+    );
  };

  meta = {
@@ -97,4 +173,4 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl2Plus;
    downloadPage = "https://www.netfilter.org/projects/iptables/files/";
  };
-}
+})
@@ -10,20 +10,20 @@ callPackage ./generic.nix args {
  kernelModuleAttribute = "zfs_unstable";

  kernelMinSupportedMajorMinor = "4.18";
-  kernelMaxSupportedMajorMinor = "6.17";
+  kernelMaxSupportedMajorMinor = "6.18";

  # this package should point to a version / git revision compatible with the latest kernel release
  # IMPORTANT: Always use a tagged release candidate or commits from the
  # zfs-<version>-staging branch, because this is tested by the OpenZFS
  # maintainers.
-  version = "2.4.0-rc4";
+  version = "2.4.0-rc5";
  # rev = "";

  tests = {
    inherit (nixosTests.zfs) unstable;
  };

-  hash = "sha256-PEKIGE6pB+Vs034wDa20s3aMmIIWmOD8yWizseO3fq0=";
+  hash = "sha256-HLxqzZjAFnaKqzy1CA3RecTdqpheR2pmFCTqMIcm+wk=";

  extraLongDescription = ''
    This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
@@ -1,35 +0,0 @@
-{
-  stdenv,
-  pkgs,
-  lib,
-  nodejs_20,
-}:
-
-let
-  nodejs = nodejs_20;
-
-  nodePackages = import ./node-packages.nix {
-    inherit pkgs nodejs;
-    inherit (stdenv.hostPlatform) system;
-  };
-
-  ethercalc = lib.head (lib.attrValues nodePackages);
-
-  combined = ethercalc.override {
-    meta = {
-      description = "Online collaborative spreadsheet";
-      license = with lib.licenses; [
-        cpal10
-        artistic2
-        mit
-        asl20
-        cc0
-        mpl20
-      ];
-      homepage = "https://github.com/audreyt/ethercalc";
-      maintainers = with lib.maintainers; [ iblech ];
-      platforms = lib.platforms.unix;
-    };
-  };
-in
-combined
@@ -1,16 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-
-# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`.
-# Else `nix-shell` will not find this script.
-
-set -euo pipefail
-
-cd -- "$(dirname -- "$BASH_SOURCE[0]")"
-
-node2nix \
-     --nodejs-14 \
-     --input node-packages.json \
-     --output node-packages-generated.nix \
-     --composition node-packages.nix \
-     --node-env ../../../development/node-packages/node-env.nix
@@ -1,3 +0,0 @@
-[
-  { "whitebophir": "git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" }
-]
@@ -1,33 +0,0 @@
-# This file has been generated by node2nix 1.11.1. Do not edit!
-
-{
-  pkgs ? import <nixpkgs> {
-    inherit system;
-  },
-  system ? builtins.currentSystem,
-  nodejs ? pkgs."nodejs_20",
-}:
-
-let
-  nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs)
-      stdenv
-      lib
-      runCommand
-      writeTextFile
-      writeShellScript
-      ;
-    inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages-generated.nix {
-  inherit (pkgs)
-    fetchurl
-    nix-gitignore
-    stdenv
-    lib
-    fetchgit
-    ;
-  inherit nodeEnv;
-}
@@ -557,6 +557,7 @@ mapAliases {
  eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
  eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
  erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
+  ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28
  ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
  eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
  f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18
@@ -2613,8 +2613,6 @@ with pkgs;

  emborg = python3Packages.callPackage ../development/python-modules/emborg { };

-  ethercalc = callPackage ../servers/web-apps/ethercalc { };
-
  evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { };

  executor = with python3Packages; toPythonApplication executor;