From b3c825d1eff82e1f9789d8ac620659f873956cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9za=20B=C3=BAza?= Date: Mon, 16 Jan 2023 14:36:15 +0100 Subject: [PATCH 001/179] nixos/jackett: add Systemd sandboxing configuration Apply security sandboxing via Systemd service configuration: - All unnecessary privileges are dropped. - The only writable directories are /tmp and the home of the jackett user. - Only can execute installed applications from the Nix store. - Network access is not restricted as the setup can vary across users. So it should be configured in the firewall. --- nixos/modules/services/misc/jackett.nix | 49 +++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index b0edf0d18da4..897ca5a1d9ec 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -60,6 +60,55 @@ in Group = cfg.group; ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; Restart = "on-failure"; + + # Sandboxing + CapabilityBoundingSet = [ + "CAP_NET_BIND_SERVICE" + ]; + ExecPaths = [ + "${builtins.storeDir}" + ]; + LockPersonality = true; + NoExecPaths = [ + "/" + ]; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = [ + "${config.users.users.${cfg.user}.home}" + ]; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@clock" + "~@cpu-emulation" + "~@debug" + "~@obsolete" + "~@reboot" + "~@module" + "~@mount" + "~@swap" + ]; + UMask = "0077"; }; }; From 036752a6dc365faa61efa77b09a19b98c1d99c6f Mon Sep 17 00:00:00 2001 From: Nuno Alves Date: Sat, 12 Aug 2023 10:23:16 +0100 Subject: [PATCH 002/179] moodle: add missing plugin types --- pkgs/servers/web-apps/moodle/default.nix | 77 ++++++++++++++++++++---- 1 file changed, 65 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 0ab0d0f7db29..77a3d7165763 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -9,6 +9,69 @@ let (p: if (lib.toInt p) < 10 then (lib.concatStrings ["0" p]) else p) versionParts); + # Reference: https://docs.moodle.org/dev/Plugin_types + pluginDirs = { + mod = "mod"; + antivirus = "lib/antivirus"; + assignsubmission = "mod/assign/submission"; + assignfeedback = "mod/assign/feedback"; + booktool = "mod/book/tool"; + customfield = "customfield/field"; + datafield = "mod/data/field"; + datapreset = "mod/data/preset"; + ltisource = "mod/lti/source"; + fileconverter = "files/converter"; + ltiservice = "mod/lti/service"; + mlbackend = "lib/mlbackend"; + forumreport = "mod/forum/report"; + quiz = "mod/quiz/report"; + quizaccess = "mod/quiz/accessrule"; + scormreport = "mod/scorm/report"; + workshopform = "mod/workshop/form"; + workshopallocation = "mod/workshop/allocation"; + workshopeval = "mod/workshop/eval"; + block = "blocks"; + qtype = "question/type"; + qbehaviour = "question/behaviour"; + qformat = "question/format"; + filter = "filter"; + editor = "lib/editor"; + atto = "lib/editor/atto/plugins"; + tinymce = "lib/editor/tinymce/plugins"; + enrol = "enrol"; + auth = "auth"; + tool = "admin/tool"; + logstore = "admin/tool/log/store"; + availability = "availability/condition"; + calendartype = "calendar/type"; + message = "message/output"; + format = "course/format"; + dataformat = "dataformat"; + profilefield = "user/profile/field"; + report = "report"; + # coursereport = "course/report"; # Moved to /report + gradeexport = "grade/export"; + gradeimport = "grade/import"; + gradereport = "grade/report"; + gradingform = "grade/grading/form"; + mnetservice = "mnet/service"; + webservice = "webservice"; + repository = "repository"; + portfolio = "portfolio"; + search = "search/engine"; + media = "media/player"; + plagiarism = "plagiarism"; + cachestore = "cache/stores"; + cachelock = "cache/locks"; + theme = "theme"; + local = "local"; + # assignment = "mod/assignment/type"; # Deprecated + # report = "admin/report"; # Moved to /report + contenttype = "contentbank/contenttype"; + h5plib = "h5p/h5plib"; + qbank = "question/bank"; + }; + in stdenv.mkDerivation rec { pname = "moodle"; inherit version; @@ -33,18 +96,8 @@ in stdenv.mkDerivation rec { ${lib.concatStringsSep "\n" (map (p: let - dir = if p.pluginType == "mod" then - "mod" - else if p.pluginType == "theme" then - "theme" - else if p.pluginType == "block" then - "blocks" - else if p.pluginType == "question" then - "question/type" - else if p.pluginType == "course" then - "course/format" - else if p.pluginType == "report" then - "admin/report" + dir = if (lib.hasAttr p.pluginType pluginDirs) then + pluginDirs.${p.pluginType} else throw "unknown moodle plugin type"; # we have to copy it, because the plugins have refrences to .. inside From b9b5678eacde92724f411a5836a21ea5c204e6e5 Mon Sep 17 00:00:00 2001 From: Negate This Date: Fri, 15 Dec 2023 21:22:14 -0500 Subject: [PATCH 003/179] maintainers: add negatethis --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d20aa7db61ad..f2fdfeed8c4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12924,6 +12924,12 @@ githubId = 3747396; name = "Nathan Isom"; }; + negatethis = { + email = "negatethis@envs.net"; + github = "negatethis"; + githubId = 26014535; + name = "Negate This"; + }; neilmayhew = { email = "nix@neil.mayhew.name"; github = "neilmayhew"; From 01bc4d1e857fa5a9954792564d6c939c7709dbdf Mon Sep 17 00:00:00 2001 From: Negate This Date: Mon, 18 Dec 2023 18:16:12 -0500 Subject: [PATCH 004/179] rescrobbled: init at 0.7.1 --- pkgs/by-name/re/rescrobbled/package.nix | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/re/rescrobbled/package.nix diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix new file mode 100644 index 000000000000..d9d41f806ae2 --- /dev/null +++ b/pkgs/by-name/re/rescrobbled/package.nix @@ -0,0 +1,46 @@ +{ lib +, bash +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, dbus +}: + +rustPlatform.buildRustPackage rec { + + pname = "rescrobbled"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "InputUsername"; + repo = "rescrobbled"; + rev = "v${version}"; + hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4="; + }; + + cargoHash = "sha256-ZJbyYFvGTuXt1aqhGOATcDRrkTk7SorWXkN81sUoDdo="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl dbus ]; + + postPatch = '' + # Required for tests + substituteInPlace src/filter.rs --replace '#!/usr/bin/bash' '#!${bash}/bin/bash' + ''; + + postInstall = '' + substituteInPlace rescrobbled.service --replace '%h/.cargo/bin/rescrobbled' "$out/bin/rescrobbled" + install -Dm644 rescrobbled.service -t "$out/share/systemd/user" + ''; + + meta = with lib; { + description = "MPRIS music scrobbler daemon"; + homepage = "https://github.com/InputUsername/rescrobbled"; + license = licenses.gpl3Plus; + mainProgram = "rescrobbled"; + platforms = platforms.unix; + maintainers = with maintainers; [ negatethis ]; + }; +} From d304cba853264c2037cc3122bd36a99506cb2f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AutoMath=C3=AFs?= Date: Sun, 18 Aug 2024 11:31:10 +0200 Subject: [PATCH 005/179] maintainers: add automathis --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 04f5f6785c42..9da1550a4153 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2004,6 +2004,12 @@ githubId = 354741; name = "Austin Butler"; }; + automathis = { + name = "AutoMathïs"; + email = "automathis@protonmail.com"; + github = "MathisFederico"; + githubId = 60117466; + }; autophagy = { email = "mail@autophagy.io"; github = "autophagy"; From b8393db284317016fe547fd713f7f5639af9e3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AutoMath=C3=AFs?= Date: Sun, 18 Aug 2024 11:39:56 +0200 Subject: [PATCH 006/179] python3Packages.hebg: init at 0.2.4 Co-authored-by: OTABI Tomoya --- .../python-modules/hebg/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/hebg/default.nix diff --git a/pkgs/development/python-modules/hebg/default.nix b/pkgs/development/python-modules/hebg/default.nix new file mode 100644 index 000000000000..5bf209fe7a7b --- /dev/null +++ b/pkgs/development/python-modules/hebg/default.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + + # Runtime dependencies + networkx, + matplotlib, + numpy, + tqdm, + scipy, + + # Build, dev and test dependencies + setuptools-scm, + pytestCheckHook, + pytest-check, + pytest-mock, +}: + +buildPythonPackage rec { + pname = "hebg"; + version = "0.2.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-11bz+FbnaEVLiXT1eujMw8lvABlzVOeROOsdVgsyfjQ="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + networkx + matplotlib + numpy + tqdm + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-check + pytest-mock + ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { MPLBACKEND = "Agg"; }; + pythonImportsCheck = [ "hebg" ]; + + meta = { + description = "Hierachical Explainable Behaviors using Graphs"; + homepage = "https://github.com/IRLL/HEB_graphs"; + changelog = "https://github.com/IRLL/HEB_graphs/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ automathis ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b0200329f87..ec74c2ceb306 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5537,6 +5537,8 @@ self: super: with self; { heatzypy = callPackage ../development/python-modules/heatzypy { }; + hebg = callPackage ../development/python-modules/hebg { }; + help2man = callPackage ../development/python-modules/help2man { }; helpdev = callPackage ../development/python-modules/helpdev { }; From 2399ceb9c828dab7eeb501e30d02952fa73ba84b Mon Sep 17 00:00:00 2001 From: Viktor Pocedulic Date: Sun, 23 Jun 2024 17:37:21 +0200 Subject: [PATCH 007/179] maintainers: add kvik --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 493e2848ddf0..b787c0ed0602 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11296,6 +11296,12 @@ githubId = 11614750; name = "Alexander Sharov"; }; + kvik = { + email = "viktor@a-b.xyz"; + github = "okvik"; + githubId = 58425080; + name = "Viktor Pocedulić"; + }; kwaa = { name = "藍+85CD"; email = "kwa@kwaa.dev"; From fc2d3db3d52ca2e601eaa8a9115e015919a2c540 Mon Sep 17 00:00:00 2001 From: Viktor Pocedulic Date: Sun, 23 Jun 2024 13:09:31 +0200 Subject: [PATCH 008/179] python3Packages.cyclonedds-python: init at 0.10.5 --- .../cyclonedds-python/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/cyclonedds-python/default.nix diff --git a/pkgs/development/python-modules/cyclonedds-python/default.nix b/pkgs/development/python-modules/cyclonedds-python/default.nix new file mode 100644 index 000000000000..e23214d57dfe --- /dev/null +++ b/pkgs/development/python-modules/cyclonedds-python/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + cyclonedds, + setuptools, + rich-click, + + pytestCheckHook, + pytest-mock, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "cyclonedds-python"; + version = "0.10.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "eclipse-cyclonedds"; + repo = "cyclonedds-python"; + rev = "refs/tags/${version}"; + hash = "sha256-MN3Z5gqsD+cr5Awmsia9+uCHL/a2KQP2uMS13rVc1Hw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "pytest-cov" "" + ''; + + build-system = [ setuptools ]; + + buildInputs = [ cyclonedds ]; + + dependencies = [ rich-click ]; + + env.CYCLONEDDS_HOME = "${cyclonedds.out}"; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + pytest-cov-stub + ]; + + meta = { + description = "Python binding for Eclipse Cyclone DDS"; + homepage = "https://github.com/eclipse-cyclonedds/cyclonedds-python"; + changelog = "https://github.com/eclipse-cyclonedds/cyclonedds-python/releases/tag/${version}"; + license = lib.licenses.epl20; + maintainers = with lib.maintainers; [ kvik ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c04ff4a3740..a36ab65d7b2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2755,6 +2755,8 @@ self: super: with self; { cycler = callPackage ../development/python-modules/cycler { }; + cyclonedds-python = callPackage ../development/python-modules/cyclonedds-python { }; + cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { }; cyclopts = callPackage ../development/python-modules/cyclopts { }; From 15119b82443c3e4f4ad310fc0b351481a4e6247b Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sun, 15 Sep 2024 09:39:07 +0200 Subject: [PATCH 009/179] nixos/mullvad-vpn: remove unneeded hacks iproute2 rt_tables are no longer used upstream and loose Reverse-Path seems to no longer be needed, according to my local test --- .../modules/services/networking/mullvad-vpn.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix index 0a339cefd3f0..4c0abb9b8942 100644 --- a/nixos/modules/services/networking/mullvad-vpn.nix +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -10,7 +10,6 @@ with lib; default = false; description = '' This option enables Mullvad VPN daemon. - This sets {option}`networking.firewall.checkReversePath` to "loose", which might be undesirable for security. ''; }; @@ -36,12 +35,6 @@ with lib; environment.systemPackages = [ cfg.package ]; - # mullvad-daemon writes to /etc/iproute2/rt_tables - networking.iproute2.enable = true; - - # See https://github.com/NixOS/nixpkgs/issues/113589 - networking.firewall.checkReversePath = "loose"; - # See https://github.com/NixOS/nixpkgs/issues/176603 security.wrappers.mullvad-exclude = mkIf cfg.enableExcludeWrapper { setuid = true; @@ -59,13 +52,9 @@ with lib; "NetworkManager.service" "systemd-resolved.service" ]; - path = [ - pkgs.iproute2 - # Needed for ping - "/run/wrappers" - # See https://github.com/NixOS/nixpkgs/issues/262681 - ] ++ (lib.optional config.networking.resolvconf.enable - config.networking.resolvconf.package); + # See https://github.com/NixOS/nixpkgs/issues/262681 + path = lib.optional config.networking.resolvconf.enable + config.networking.resolvconf.package; startLimitBurst = 5; startLimitIntervalSec = 20; serviceConfig = { From 1cb6d223867d1da42267bd6e748714a0c984ebc5 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Fri, 18 Oct 2024 16:38:30 +0200 Subject: [PATCH 010/179] nixos/bind: harden systemd service --- nixos/modules/services/networking/bind.nix | 55 ++++++++++++++++++---- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 6079062db6c3..1192645c2472 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -249,29 +249,68 @@ in }; users.groups.${bindUser} = {}; + systemd.tmpfiles.settings."bind" = lib.mkIf (cfg.directory != "/run/named") { + ${cfg.directory} = { + d = { + user = bindUser; + group = bindUser; + age = "-"; + }; + }; + }; systemd.services.bind = { description = "BIND Domain Name Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -m 0755 -p /etc/bind if ! [ -f "/etc/bind/rndc.key" ]; then ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null fi - - ${pkgs.coreutils}/bin/mkdir -p /run/named - chown ${bindUser} /run/named - - ${pkgs.coreutils}/bin/mkdir -p ${cfg.directory} - chown ${bindUser} ${cfg.directory} ''; serviceConfig = { Type = "forking"; # Set type to forking, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900788 - ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}"; + ExecStart = "${bindPkg.out}/sbin/named ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}"; ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; + User = bindUser; + RuntimeDirectory = "named"; + RuntimeDirectoryPreserve = "yes"; + ConfigurationDirectory = "bind"; + ReadWritePaths = [ + (lib.mapAttrsToList (name: config: "-${config.file}") cfg.zones) + cfg.directory + ]; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "full"; + ReadOnlyPaths = "/sys"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6 AF_NETLINK" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RestrictNamespaces = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = "~@mount @debug @clock @reboot acct modify_ldt add_key adjtimex clock_adjtime delete_module fanotify_init finit_module get_mempolicy init_module io_destroy io_getevents iopl ioperm io_setup io_submit io_cancel kcmp kexec_load keyctl lookup_dcookie migrate_pages move_pages open_by_handle_at perf_event_open process_vm_readv process_vm_writev ptrace remap_file_pages request_key set_mempolicy swapoff swapon uselib vmsplice"; }; unitConfig.Documentation = "man:named(8)"; From 4855723c87be027e9ed9a3e6e6503d04f48f4b8a Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Fri, 18 Oct 2024 19:36:10 +0200 Subject: [PATCH 011/179] nixos/bind: Make ProtectSystem strict, add missing SystemCallFilters ReadWritePaths now gets the directory of zone files --- nixos/modules/services/networking/bind.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 1192645c2472..50f267bc1f02 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -279,7 +279,7 @@ in RuntimeDirectoryPreserve = "yes"; ConfigurationDirectory = "bind"; ReadWritePaths = [ - (lib.mapAttrsToList (name: config: "-${config.file}") cfg.zones) + (lib.mapAttrsToList (name: config: if (lib.hasPrefix "/" config.file) then ("-${dirOf config.file}") else "") cfg.zones) cfg.directory ]; CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; @@ -287,7 +287,7 @@ in # Security NoNewPrivileges = true; # Sandboxing - ProtectSystem = "full"; + ProtectSystem = "strict"; ReadOnlyPaths = "/sys"; ProtectHome = true; PrivateTmp = true; @@ -310,7 +310,7 @@ in RestrictNamespaces = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = "~@mount @debug @clock @reboot acct modify_ldt add_key adjtimex clock_adjtime delete_module fanotify_init finit_module get_mempolicy init_module io_destroy io_getevents iopl ioperm io_setup io_submit io_cancel kcmp kexec_load keyctl lookup_dcookie migrate_pages move_pages open_by_handle_at perf_event_open process_vm_readv process_vm_writev ptrace remap_file_pages request_key set_mempolicy swapoff swapon uselib vmsplice"; + SystemCallFilter = "~@mount @debug @clock @reboot @resources @privileged @obsolete acct modify_ldt add_key adjtimex clock_adjtime delete_module fanotify_init finit_module get_mempolicy init_module io_destroy io_getevents iopl ioperm io_setup io_submit io_cancel kcmp kexec_load keyctl lookup_dcookie migrate_pages move_pages open_by_handle_at perf_event_open process_vm_readv process_vm_writev ptrace remap_file_pages request_key set_mempolicy swapoff swapon uselib vmsplice"; }; unitConfig.Documentation = "man:named(8)"; From 63cd2b8e03e72332916a78b248f181c42213ae95 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Fri, 18 Oct 2024 22:23:28 +0200 Subject: [PATCH 012/179] nixos/bind: rndc-confgen should not chown file --- nixos/modules/services/networking/bind.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 50f267bc1f02..fdea3176c1a7 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -265,7 +265,7 @@ in preStart = '' if ! [ -f "/etc/bind/rndc.key" ]; then - ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null + ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -a -A hmac-sha256 2>/dev/null fi ''; From 6f9c572a0eaef2fe7e4bb73c6e11692d9f9b2a4b Mon Sep 17 00:00:00 2001 From: Matthieu Barthel Date: Sat, 26 Oct 2024 19:50:53 +0200 Subject: [PATCH 013/179] nixos/gitlab: Fix registry port fix #350428 --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ecbc087f739f..8560e27b8ae3 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1242,6 +1242,7 @@ in { enable = true; enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly package = cfg.registry.package; + port = cfg.registry.port; extraConfig = { auth.token = { realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth"; From 83717a8dfed470ab1fa9ab6db9dcfbf91f81a495 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 9 Aug 2024 13:29:31 +0200 Subject: [PATCH 014/179] visp: init at 3.6.0 Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/vi/visp/package.nix | 104 +++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 pkgs/by-name/vi/visp/package.nix diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix new file mode 100644 index 000000000000..f25562d4ba2a --- /dev/null +++ b/pkgs/by-name/vi/visp/package.nix @@ -0,0 +1,104 @@ +{ + cmake, + coin3d, + darwin, + doxygen, + eigen, + fetchFromGitHub, + fetchpatch, + lapack, + lib, + libdc1394, + libdmtx, + libglvnd, + libjpeg, # this is libjpeg-turbo + libpng, + librealsense, + libxml2, + libX11, + nlohmann_json, + #ogre, + openblas, + opencv, + pkg-config, + python3Packages, + stdenv, + texliveSmall, + v4l-utils, + xorg, + zbar, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "visp"; + version = "3.6.0"; + + src = fetchFromGitHub { + owner = "lagadic"; + repo = "visp"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-m5Tmr+cZab7eSjmbXb8HpJpFHb0UYFTyimY+CkfBIAo="; + }; + + patches = [ + # fix for absolute install paths + # this was merged upstream, and can be removed on next release + (fetchpatch { + url = "https://github.com/lagadic/visp/pull/1416/commits/fdda5620389badee998fe1926ddd3b46f7a6bcd8.patch"; + hash = "sha256-W3vvBdQdp59WAMjuucNoWI0eCyPHjWerl7VCNcPVvzI="; + }) + + # fix for opencv new Universal Intrinsic API + # this was merged upstream, and can be removed on next release + (fetchpatch { + url = "https://github.com/lagadic/visp/pull/1310/commits/9ed0300507e13dddd83fd62a799f5039025ea44e.patch"; + hash = "sha256-xrJ7B/8mEfi9dM/ToMr6vCAwX/FMw+GA/W0zFYgT32s="; + }) + ]; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + texliveSmall + ]; + + buildInputs = + [ + eigen + lapack + libdc1394 + libdmtx + libglvnd + libjpeg + libpng + librealsense + libX11 + libxml2 + nlohmann_json + #ogre + openblas + opencv + python3Packages.numpy + xorg.libpthreadstubs + zbar + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + coin3d + v4l-utils + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ]; + + doCheck = true; + + meta = { + description = "Open Source Visual Servoing Platform"; + homepage = "https://visp.inria.fr"; + changelog = "https://github.com/lagadic/visp/blob/v${finalAttrs.version}/ChangeLog.txt"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; + }; +}) From 973542f89a32734a6a48126ed35bf29a0321ec4d Mon Sep 17 00:00:00 2001 From: usertam Date: Wed, 30 Oct 2024 17:05:54 +0800 Subject: [PATCH 015/179] firecracker: 1.9.0 -> 1.9.1, build from source --- maintainers/maintainer-list.nix | 6 + pkgs/by-name/fi/firecracker/Cargo.lock | 1768 +++++++++++++++++++++++ pkgs/by-name/fi/firecracker/package.nix | 103 +- 3 files changed, 1831 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/fi/firecracker/Cargo.lock diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b9d764cd96b..84566dca8302 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22536,6 +22536,12 @@ githubId = 17836748; name = "Mason Mackaman"; }; + usertam = { + email = "nix@usertam.dev"; + github = "usertam"; + githubId = 22500027; + name = "Samuel Tam"; + }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; diff --git a/pkgs/by-name/fi/firecracker/Cargo.lock b/pkgs/by-name/fi/firecracker/Cargo.lock new file mode 100644 index 000000000000..27488b493909 --- /dev/null +++ b/pkgs/by-name/fi/firecracker/Cargo.lock @@ -0,0 +1,1768 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "acpi_tables" +version = "0.1.0" +dependencies = [ + "displaydoc", + "thiserror", + "vm-memory", + "zerocopy", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "aws-lc-fips-sys" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d41a5d02120c5eca009507574fa0d4885fa370cbda6b561d91ba463c3025a7" +dependencies = [ + "bindgen 0.69.4", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "aws-lc-rs" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +dependencies = [ + "aws-lc-fips-sys", + "aws-lc-sys", + "mirai-annotations", + "paste", + "untrusted", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" +dependencies = [ + "bindgen 0.69.4", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cargo_toml" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap-num" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e063d263364859dc54fb064cedb7c122740cd4733644b14b176c097f51e8ab7" +dependencies = [ + "num-traits", +] + +[[package]] +name = "clap_builder" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clippy-tracing" +version = "0.1.0" +dependencies = [ + "clap", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", + "uuid", + "walkdir", +] + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "cpu-template-helper" +version = "1.9.1" +dependencies = [ + "clap", + "displaydoc", + "libc", + "log-instrument", + "serde", + "serde_json", + "thiserror", + "vmm", + "vmm-sys-util", +] + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc64" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2707e3afba5e19b75d582d88bc79237418f2a2a2d673d01cf9b03633b46e98f3" + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "device_tree" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18f717c5c7c2e3483feb64cccebd077245ad6d19007c2db0fd341d38595353c" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-manager" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90b16fe5161a1160c9c7cece9f7504f2412ef5e2c0643d1e322eccf37692a42b" +dependencies = [ + "libc", + "vmm-sys-util", +] + +[[package]] +name = "firecracker" +version = "1.9.1" +dependencies = [ + "bincode", + "cargo_toml", + "displaydoc", + "event-manager", + "libc", + "log-instrument", + "micro_http", + "regex", + "seccompiler", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "timerfd", + "userfaultfd", + "utils", + "vmm", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jailer" +version = "1.9.1" +dependencies = [ + "libc", + "log-instrument", + "nix 0.29.0", + "regex", + "thiserror", + "utils", +] + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "kvm-bindings" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efe3f1a4437bffe000e6297a593b98184213cd27486776c335f95ab53d48e3a" +dependencies = [ + "serde", + "vmm-sys-util", + "zerocopy", +] + +[[package]] +name = "kvm-ioctls" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c2176b91f68903b54ac8c6185bada7d607ca6110998976ff15c032f88a7d39" +dependencies = [ + "bitflags 2.6.0", + "kvm-bindings", + "libc", + "vmm-sys-util", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "linux-loader" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83" +dependencies = [ + "vm-memory", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "serde", +] + +[[package]] +name = "log-instrument" +version = "0.3.0" +dependencies = [ + "env_logger", + "log", + "log-instrument-macros", +] + +[[package]] +name = "log-instrument-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix", +] + +[[package]] +name = "micro_http" +version = "0.1.0" +source = "git+https://github.com/firecracker-microvm/micro-http#8182cd5523b63ceb52ad9d0e7eb6fb95683e6d1b" +dependencies = [ + "libc", + "vmm-sys-util", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "once_cell" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +dependencies = [ + "bitflags 2.6.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "unarray", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rebase-snap" +version = "1.9.1" +dependencies = [ + "displaydoc", + "libc", + "log-instrument", + "thiserror", + "utils", +] + +[[package]] +name = "regex" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "seccompiler" +version = "1.9.1" +dependencies = [ + "bincode", + "displaydoc", + "libc", + "log-instrument", + "serde", + "serde_json", + "thiserror", + "utils", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.210" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "snapshot-editor" +version = "1.9.1" +dependencies = [ + "clap", + "clap-num", + "displaydoc", + "libc", + "log-instrument", + "semver", + "thiserror", + "utils", + "vmm", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "timerfd" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e482e368cf7efa2c8b570f476e5b9fd9fd5e9b9219fc567832b05f13511091" +dependencies = [ + "rustix", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "userfaultfd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d8b176d4d3e420685e964f87c25df5fdd5b26d7eb0d0e7c892d771f5b81035" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", + "nix 0.27.1", + "thiserror", + "userfaultfd-sys", +] + +[[package]] +name = "userfaultfd-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75595d2a62b7db16bd47f5a1ce14e1fe05ccbe27d6c96721a958e0a027cad41" +dependencies = [ + "bindgen 0.68.1", + "cc", + "cfg-if", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utils" +version = "0.1.0" +dependencies = [ + "derive_more", + "displaydoc", + "libc", + "log-instrument", + "serde", + "serde_json", + "thiserror", + "vm-memory", + "vmm-sys-util", +] + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vhost" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc" +dependencies = [ + "bitflags 2.6.0", + "libc", + "vm-memory", + "vmm-sys-util", +] + +[[package]] +name = "vm-allocator" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4ce718bd4e8d74b1747363e27f715a6b1bd6971597cb21425dadbf4e712241" +dependencies = [ + "libc", + "thiserror", +] + +[[package]] +name = "vm-fdt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e21282841a059bb62627ce8441c491f09603622cd5a21c43bfedc85a2952f23" + +[[package]] +name = "vm-memory" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3aba5064cc5f6f7740cddc8dae34d2d9a311cac69b60d942af7f3ab8fc49f4" +dependencies = [ + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "vm-superio" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3428ee25acbfc75ed14600f2043876e0889cbd57c39dd441191417377cdceda0" + +[[package]] +name = "vmm" +version = "0.1.0" +dependencies = [ + "acpi_tables", + "aes-gcm", + "aws-lc-rs", + "base64", + "bincode", + "bitflags 2.6.0", + "crc64", + "criterion", + "derive_more", + "device_tree", + "displaydoc", + "event-manager", + "itertools 0.13.0", + "kvm-bindings", + "kvm-ioctls", + "lazy_static", + "libc", + "linux-loader", + "log", + "log-instrument", + "memfd", + "micro_http", + "proptest", + "seccompiler", + "semver", + "serde", + "serde_json", + "slab", + "smallvec", + "thiserror", + "timerfd", + "userfaultfd", + "utils", + "vhost", + "vm-allocator", + "vm-fdt", + "vm-memory", + "vm-superio", + "zerocopy", +] + +[[package]] +name = "vmm-sys-util" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" +dependencies = [ + "bitflags 1.3.2", + "libc", + "serde", + "serde_derive", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index ffd22a70bf03..c16710e54712 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -1,59 +1,72 @@ { - fetchurl, lib, stdenv, + fetchFromGitHub, + makeRustPlatform, + rustc, + cargo, + llvmPackages, + cmake, + gcc, + + # gcc compile error at deps: aws-lc-sys, function 'memcpy' inlined from 'OPENSSL_memcpy' + # error: '__builtin_memcpy' specified bound exceeds maximum object size + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91397 + useRustPlatform ? makeRustPlatform { + inherit rustc cargo; + inherit (llvmPackages) stdenv; + }, }: -let - version = "1.9.0"; - # nixpkgs-update: no auto update - - suffix = - { - x86_64-linux = "x86_64"; - aarch64-linux = "aarch64"; - } - ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; - - dlbin = - hash: - fetchurl { - url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; - hash = - hash."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - -in -stdenv.mkDerivation { +useRustPlatform.buildRustPackage rec { pname = "firecracker"; - inherit version; + version = "1.9.1"; - sourceRoot = "."; - src = dlbin { - x86_64-linux = "sha256-lcE3QMfKGm37QOD1HNCp7v7h8iPNLDU4dV0Dw6m6Ujc="; - aarch64-linux = "sha256-xVZOdt7CuOgJLFLw+KTF9FzzF5HpWpMC9DYKdx33j2k="; + src = fetchFromGitHub { + owner = "firecracker-microvm"; + repo = "firecracker"; + rev = "v${version}"; + hash = "sha256-NgT06Xfb6j+d5EcqFjQeaiY08uJJjmrddzdwSoqpKbQ="; }; - dontConfigure = true; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "micro_http-0.1.0" = "sha256-bso39jUUyhlNutUxHw8uHtKWQIHmoikfQ5O3RIePboo="; + }; + }; - buildPhase = '' - mv release-v${version}-${suffix}/firecracker-v${version}-${suffix} firecracker - mv release-v${version}-${suffix}/jailer-v${version}-${suffix} jailer - chmod +x firecracker jailer - ''; + nativeBuildInputs = [ + cmake + gcc + useRustPlatform.bindgenHook + ]; - doCheck = true; - checkPhase = '' - ./firecracker --version - ./jailer --version - ''; + cargoBuildFlags = [ "--workspace" ]; + + checkFlags = [ + # requires /sys/devices/virtual/dmi + "--skip=fingerprint::dump::tests::test_read_valid_sysfs_file" + # requires /dev/kvm + "--skip=template::dump::tests::test_dump" + "--skip=tests::test_fingerprint_dump_command" + "--skip=tests::test_template_dump_command" + "--skip=tests::test_template_verify_command" + "--skip=utils::tests::test_build_microvm" + # requires seccomp == 0 + "--skip=tests::test_filter_apply" + ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin - install -D firecracker $out/bin/firecracker - install -D jailer $out/bin/jailer + releaseDir="build/cargo_target/${stdenv.hostPlatform.rust.rustcTarget}/release" + for bin in $(find $releaseDir -maxdepth 1 -type f -executable); do + install -Dm555 -t $out/bin $bin + done + + runHook postInstall ''; meta = with lib; { @@ -62,11 +75,9 @@ stdenv.mkDerivation { changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}"; mainProgram = "firecracker"; license = licenses.asl20; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; + platforms = lib.platforms.linux; maintainers = with maintainers; [ + usertam thoughtpolice qjoly techknowlogick From dea9a6227b151069606e725aec653b18a0f64626 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Wed, 27 Nov 2024 14:30:46 +0300 Subject: [PATCH 016/179] pulumi-bin: 3.138.0 -> 3.142.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 322 +++++++++++++-------------- 1 file changed, 161 insertions(+), 161 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 828deed8ea7d..a50f5c6a5253 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,40 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.138.0"; + version = "3.142.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-linux-x64.tar.gz"; - sha256 = "1n3fzpm4anr0cim3dc4f1hg1gld4ka46rj9yydgy0pi8cgi5w900"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.142.0-linux-x64.tar.gz"; + sha256 = "1ari93p63cpfrpr5i5dd8j2h4zg4x5lnalllmfak3hvlz7wiv8ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-linux-amd64.tar.gz"; - sha256 = "15vi8xlbyabh18krag5q6xqawr71miirbja9cpln6iyhw48wx954"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.28.0-linux-amd64.tar.gz"; + sha256 = "0yq2ckc39mm71h7afjdrp3srw1ipjyg3ffzaw2jj039w16isjdld"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-linux-amd64.tar.gz"; - sha256 = "0l5fy9gcmzb11q6sp7yqssfan2i804l2ck2rhfihb07kmdrgn4sh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.0-linux-amd64.tar.gz"; + sha256 = "0wmpd0l7jsxml47d87nsq00sagrlkalph9cmllv1nd6136irwxih"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-linux-amd64.tar.gz"; - sha256 = "0zwkjckwlgq9iczf4ypxy7h33mn8bkbskqw3m4jvn5jhjqc5m5sd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.67.0-linux-amd64.tar.gz"; + sha256 = "05kj1yvw023mrvmnvx1bpywvvdm9br3k0nn269ziq2aqn7k92h3n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-linux-amd64.tar.gz"; - sha256 = "1r11ms8b7ckgzl0kw6n9bpgw7mcj9fn3c18h08hwhlw5ypixsxvn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.4.1-linux-amd64.tar.gz"; + sha256 = "0s75l9chzwgcpijh966h2q5a1zdg6pwx3qlbkmqjp3ryvf3wsfp0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-linux-amd64.tar.gz"; sha256 = "1xck3a9q5ayki3gs57z85hqwhr86apji91v843mxrrv5bxjir0v1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-linux-amd64.tar.gz"; - sha256 = "10grspac80kvn8wx4is72yfpgfv2aywcd60irs0jqnigb4pncm9q"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-linux-amd64.tar.gz"; - sha256 = "0jifqlik321s67n77dr92ba9pmpj895z29b2klwi7iidgb3grn81"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.61.0-linux-amd64.tar.gz"; + sha256 = "1cbbbf3dph2kxkgyhhpbj263qqpl232v0ya6qb9bki418g7ljzyg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-linux-amd64.tar.gz"; @@ -45,20 +41,24 @@ sha256 = "18v0fn2lcqbvqydz7lj6k1ybdkfrnjwycg7m41x4nymqy66b86rz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-linux-amd64.tar.gz"; - sha256 = "09lfkvc7hr8k09hv53qgizkrxpr7q9l4nwm6778pfbz5hmgarga8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.11.0-linux-amd64.tar.gz"; + sha256 = "105bvf0f63zb1896p566g9yb49406a809373qfj19fk6xm535i5v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.43.1-linux-amd64.tar.gz"; + sha256 = "15d04iyw00rwrc284b7va4qb1jmghgylh63n0hzwf1h5y0ybwd0x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-linux-amd64.tar.gz"; sha256 = "053bw7fy26w89mmr850jwwi81kx94d1i2vmymdwh28fjvkldq32j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-linux-amd64.tar.gz"; - sha256 = "0aazshisk8ap83zvj2jgjhxv6841zyf8v582f5gag4bag2fifywf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.36.1-linux-amd64.tar.gz"; + sha256 = "0gk78pf1gwmhpw5mcrsjac9f380nnniv31xlm5k32m81b8hm9v8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-linux-amd64.tar.gz"; - sha256 = "1vi1gh191w51w57ykivcfy2glnkc4mxk3azrp2bhrhc4qvz5x8nm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.35.1-linux-amd64.tar.gz"; + sha256 = "1zn75i9vj4mfm0ivvw20sylvn6w64sdrplkwpfg5na5fvjfj8yi0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-linux-amd64.tar.gz"; @@ -69,36 +69,36 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-linux-amd64.tar.gz"; - sha256 = "164mg37hjqc4jaiii4c0zlvrnflk4xk013wli1mvxpr2651iijqf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-linux-amd64.tar.gz"; + sha256 = "1jzzhwl3ln64fjjh6s4ln2dgn5lzmyis9c4vhckcx0h5hqwasij5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-linux-amd64.tar.gz"; - sha256 = "0yvlhng7sih84gnzw8gpz9x2rcxvxs9y00x551xw6n35ljxb9izl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.10.0-linux-amd64.tar.gz"; + sha256 = "0i80ph35gjkz9d3dl5n1z3x0yhgdpq2lr9digx0n0xlgx9ba0aj0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-linux-amd64.tar.gz"; - sha256 = "0vrrbvr2n2f2jlmqb81snhf0xacz4r1ym7cqs5gnkx9swb427qgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.4.0-linux-amd64.tar.gz"; + sha256 = "1h1dc4z3vdqxllliqpkxdzwqgzg20h5bss0di7pijxl1jj5m1abg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-linux-amd64.tar.gz"; - sha256 = "040yp3fjdnaxmqrkby519mjl858k4r9waf6czg0rf8bikbq648ij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.6.0-linux-amd64.tar.gz"; + sha256 = "1mbwx05r4jp6v06s2372ahxfanir09w5szyspj4s9i92l0dikf8f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-linux-amd64.tar.gz"; - sha256 = "1ippk47y3018rvl05bwhcjwhd942fmiam1w0s2ys3l3jky2n1pvs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.21.1-linux-amd64.tar.gz"; + sha256 = "01yhg9x4zdgfk1hhwn2l5cyaqp41k48mqdqrsyv64cn5wxwpbcn4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-linux-amd64.tar.gz"; sha256 = "0l1n44p3kc0j3my60h4iaz5qqynwynwr6asvls71y5dshbs6nh6q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-linux-amd64.tar.gz"; - sha256 = "19vxhsms1q3591wyd3hlzffkkrg2bjqmxz5iyf35pgxb7yr22qhv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-linux-amd64.tar.gz"; + sha256 = "004avpda37r482f6pdixdnxj8apx1l7pdmdv2y3ppidpnphlwz1n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-linux-amd64.tar.gz"; @@ -121,12 +121,12 @@ sha256 = "0v1khy2xjjv0abxqjam5diiiwli0dhbjkpf85li6l4ay7g19c9m0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-linux-amd64.tar.gz"; - sha256 = "088bfkpsq0zyazpzyxmji9brxyirxw12adc3pl9f5nc044p5c5zx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.61.1-linux-amd64.tar.gz"; + sha256 = "0v240zzyz28wpawsr0hznpiwzn71l39h6i9yyn9w69085k2rvrxf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-linux-amd64.tar.gz"; - sha256 = "07kfn511wl3n2q4w1rzfyk1vrpgmf14m0bqci0zq0pdpblsknb39"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.101.0-linux-amd64.tar.gz"; + sha256 = "09krqy9vgfvnfyzzyg17057j7xqx6zrxqwrrzcv4z40i0rf1f98a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "0k39k15k1rzcrw1k30683b8zhfp41r90zi6mlzivbbnszdjgnbml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-linux-amd64.tar.gz"; - sha256 = "0dijwdpr3ldqqarmrd8hnvgf1ifrk5krfh1a76mv8fcg16gqz2xn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-linux-amd64.tar.gz"; + sha256 = "18fnfj9d5n029jncl3lpghdp8nbkm51hh2aglbdgnb1x84i6v7a5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-linux-amd64.tar.gz"; @@ -163,36 +163,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-darwin-x64.tar.gz"; - sha256 = "1zk5hs48dcn95z2ij1xg0lkyi8rka6xza1zj9aj2mhgyjx20xgkg"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.142.0-darwin-x64.tar.gz"; + sha256 = "0y2kl59gsfb4lwlc76k53k25a8w2p2i6ldg7g38f50z4qlm366h7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-darwin-amd64.tar.gz"; - sha256 = "067jp4s0cb9mih1a7dqwspj6lx2ylalnld0kcjf3b0cqka1fbvgf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.28.0-darwin-amd64.tar.gz"; + sha256 = "0k58bjljshk9bmya9lsacm7433p0a7cb7knaa7qlqhv8mqn1xag0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-darwin-amd64.tar.gz"; - sha256 = "1ld0qnckwm6fkrr531vs5ay7krhpznhgk1193g231l0b0hb9lm3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.0-darwin-amd64.tar.gz"; + sha256 = "1jv6pjicafbs2qyhir9byfhhhb73ics839awz4bf4p2fi3gmh5cd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-darwin-amd64.tar.gz"; - sha256 = "0rz2hyqbdfbsh1lfslmnd4vvnh3pm5s5ij093vaif02k0f84ckvj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.67.0-darwin-amd64.tar.gz"; + sha256 = "1a36g79539y4jkf5r51fwnzasn82fq93ccdag8fpb5xf2h4w3izw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-darwin-amd64.tar.gz"; - sha256 = "1bp73yp7s7r9kgr1al4bi5z283slqplxzr086jb5mdnl1nhxrqz9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.4.1-darwin-amd64.tar.gz"; + sha256 = "0x1i8lxj5826ynzchsr1bl592sj2495k69kv58gy5bjipnwd1dpc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-darwin-amd64.tar.gz"; sha256 = "1v65z6zifyx4lhzw34qbm5nsgkj0ca903gxiv6l2d2im411l65wn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-darwin-amd64.tar.gz"; - sha256 = "1vivk1j7rniv4kip4mkdd0849hxlkmclwp8kf2f3jv3nh2g344xz"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-darwin-amd64.tar.gz"; - sha256 = "1py5sbh2lgh9qd4jzvygqgykhwr0r9y705qzflpy1jfdvidmxyir"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.61.0-darwin-amd64.tar.gz"; + sha256 = "1k1jvw70ff2di16n7hr3wxn1yyr477jw8ccazqiryf7vqld4dqyn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-darwin-amd64.tar.gz"; @@ -203,20 +199,24 @@ sha256 = "0kimrzah7zkvg3by7icmfpw7x3c06wnii6pqh94sfc2dbrv2vwgh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-darwin-amd64.tar.gz"; - sha256 = "0yvaw55yqjgjwlys9x6k6p0i5sgjgx005lpdf3q7s2hj1afng4f7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.11.0-darwin-amd64.tar.gz"; + sha256 = "1nkvy5m78wq3m8lci9ibaghvp9ycchi30s7fv5g5isycfhid966y"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.43.1-darwin-amd64.tar.gz"; + sha256 = "0r0crj0kvzcr2qqg4jns43cmdywy836q4kz0gbgn04n6ws77p9s6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-darwin-amd64.tar.gz"; sha256 = "1fayqzcyda8q0fr96gqbi2y6r9ykx8agb57wnqffhl06ay6kgji4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-darwin-amd64.tar.gz"; - sha256 = "02130bdma9zhmc3jizgmdfnly5bddajxv5qcl0kxp7xs7r37vl3p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.36.1-darwin-amd64.tar.gz"; + sha256 = "1n4qccvh45n6l7v8jsw6pyk898ba997q1r0bw2v722rdcmdixq21"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-darwin-amd64.tar.gz"; - sha256 = "143s973jb47ig91nnpqqivld5c51949dmqiw20hsj49as07v2sx3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.35.1-darwin-amd64.tar.gz"; + sha256 = "02vw55fmh7vjazym2b5annvzjws74carasb361c2ac7hgfcdsfzk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-darwin-amd64.tar.gz"; @@ -227,36 +227,36 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-darwin-amd64.tar.gz"; - sha256 = "0ndvsfd2dhrg18kvia8kj5xxr2cxsfxq9xnj30z6nx29jmxy5404"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-darwin-amd64.tar.gz"; + sha256 = "1i7pcidm0f0izzk9iwsqfsl6wxicdb0iy60s87zglpkic5r9r1f2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-darwin-amd64.tar.gz"; - sha256 = "1m8wzlqszs0nxxpxm9vk1sc0sp80grkv4xs72ypr7z415manny0y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.10.0-darwin-amd64.tar.gz"; + sha256 = "0271dpjfq7mqlsfb921n286hqxy0gckq93yxj3j764dq75qypiqc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-darwin-amd64.tar.gz"; - sha256 = "0pyjavhsblvfigaz80j5lh1dmlj3g42r4v6b92bjw45392dfh9v7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.4.0-darwin-amd64.tar.gz"; + sha256 = "0y2p2c2n4ss231xi1si6b68pwz321niw84a6c9dqs2p56xblmb86"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-darwin-amd64.tar.gz"; - sha256 = "0z7nay0808bb5apm3l72cpy47mzhr5zfh4h10wmm9sh0aqis39vq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.6.0-darwin-amd64.tar.gz"; + sha256 = "0s3szzwnk9p2gbcipy5x4wmp1cmakhgslgg12kpcvf61ij3vz6qi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-darwin-amd64.tar.gz"; - sha256 = "0l1cndf2bcdc2492dm76sfad1m6xcbhqh4vkxahckflpy296pqmn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.21.1-darwin-amd64.tar.gz"; + sha256 = "0xsc5v66wq5zi1gwak7zli7sbixhsxwxcd60z70x71wk9hr2c490"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-darwin-amd64.tar.gz"; sha256 = "0drbapilf6rafxjhrlzczzmgxs0ra1xirafx9qi8v7ghcsp8z98m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-darwin-amd64.tar.gz"; - sha256 = "1xbcyy309rb6lf9xdq0nh9k0a8318kc8bc2wc45lvgnhqriqxj9x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-darwin-amd64.tar.gz"; + sha256 = "1fny5ls9rwjaplfs983pfcxw3s7jkflqh43f83222m8s3vff4rbx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-darwin-amd64.tar.gz"; @@ -279,12 +279,12 @@ sha256 = "0lyb9bxsmv5zxryjnil4wh490xngwn1hq8aka2sazr02jsrql098"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-darwin-amd64.tar.gz"; - sha256 = "0haii3k9b99qxd0apw9smks1zamq5y69vfiyzn7ylvcj42xnc2aq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.61.1-darwin-amd64.tar.gz"; + sha256 = "12gcg4xp49wlqx1af6yvz6f2r4iv0640r2cfxmp5fy9lj1x22pyi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-darwin-amd64.tar.gz"; - sha256 = "01b1xp2i4sjp7mfxdwdvjdn86plc0q8ys771y7psjr7zhg16hcki"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.101.0-darwin-amd64.tar.gz"; + sha256 = "19inj7i3qnws6l6dwxh0bm5m2fg2rwh40xrgq3iimr7p6pn2brx1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "1llbp6mda1ibd557d84mg9ck891y1jxdx11i33vav3ndnf2xnw8g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-darwin-amd64.tar.gz"; - sha256 = "1qxks12cca3h054ykr0v9wr4lx2a4bh3qwps5b7nwwxslq0zq93c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-darwin-amd64.tar.gz"; + sha256 = "1b4zz500np3sqqp1i0v2prpf2irz9y2cky2fyx78zrzyspvhyqy3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-darwin-amd64.tar.gz"; @@ -321,36 +321,32 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-linux-arm64.tar.gz"; - sha256 = "0v2nf32b4rpxrqvv2m9l3i37fpdlf7ac9dip2wv66jg31fw0clch"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.142.0-linux-arm64.tar.gz"; + sha256 = "101bfb3nh721kfmndd0fmn1vyfny4br5aas3yaxsks0lgda9bbgc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-linux-arm64.tar.gz"; - sha256 = "0ya6x26yvg0jgnk3rvkkv8pipb2xqk54la7icsjn128689zn24hh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.28.0-linux-arm64.tar.gz"; + sha256 = "1bxq448gs91j41z1jwln956z1lpvqlyr8j8bn5lmz93793w5vsrr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-linux-arm64.tar.gz"; - sha256 = "1h465gwiwrc7b7nq5s7x98gdhnrz08ng5ymzjsc0qam46dasgpwl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.0-linux-arm64.tar.gz"; + sha256 = "15brrv3fz8984npbqm7i4515mganlhdbbb4pr1506sh0va0156gj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-linux-arm64.tar.gz"; - sha256 = "0kz5m7f75xna9vmimssw0kv0fijy89m2qjw3j642l7c027kgp2rk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.67.0-linux-arm64.tar.gz"; + sha256 = "16jyjcs97sijy3vsd6svxhmybkh9s235jazg7c3l5g38zns7m1bs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-linux-arm64.tar.gz"; - sha256 = "11jlilbm61jsgphm33pcg1mk3xfilx18dvyahvnxpg08vmlm0rzj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.4.1-linux-arm64.tar.gz"; + sha256 = "1kzxfp6r7y0p76z7ls77rmck0r081jk4dadddrjvki634ba1fh2p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-linux-arm64.tar.gz"; sha256 = "05cxa3xpdypkj64m9hv7c0yrgv20vn25dsbrn8j5wrn4fbfxpgay"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-linux-arm64.tar.gz"; - sha256 = "1zgkacw0j2y1ri2i4vvb34kd6abkjkdid135hqncdgi1bvwhjy9i"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-linux-arm64.tar.gz"; - sha256 = "1l83vpxcgi3jpbj5qc8yaxpf1yaiqhqcijhmhcqwinfwrzhnk67w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.61.0-linux-arm64.tar.gz"; + sha256 = "18yq0plnlcd8j0yk05rwq2k6vlmd2cabawda95s5341q8az8l6f8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-linux-arm64.tar.gz"; @@ -361,20 +357,24 @@ sha256 = "0vmnqjwlp649m8vv7cnch6rs4a5snd8c7ccn6vvi53n6j59w496g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-linux-arm64.tar.gz"; - sha256 = "0v1cngb503pjcxrs71g170nsy86bp6b71nxdazphy0vnlczbdizx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.11.0-linux-arm64.tar.gz"; + sha256 = "0903lbl2rp6hxlscrgx2jzfvvy71czscnzwk5kbdgzya69lzchcp"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.43.1-linux-arm64.tar.gz"; + sha256 = "1z31iv8mmvs7v5dvqyivwsxipvkh4jkzxa8gjvcg762b08csvwdi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-linux-arm64.tar.gz"; sha256 = "0g41nc7c5szg8a7hyqf0apji6pm9v5zk389y3ajdz8116a4p83v2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-linux-arm64.tar.gz"; - sha256 = "0f2c1lp0pyc9wvnqqg633822m466vwiqfgf4swv46kad4gbsqyq9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.36.1-linux-arm64.tar.gz"; + sha256 = "16iz1hq04c0dj75pyqzwaavx141q1ww5vnf1pv6v0gpb1irjk992"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-linux-arm64.tar.gz"; - sha256 = "0glsidkn34qxc763mvv1amhfx7bd9v2p1ic9if88sbj82apx70wb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.35.1-linux-arm64.tar.gz"; + sha256 = "1543dqvgpz83d2qfqg5a1a1ripi6ppsysgmha4cd77ikjf2hpjj4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-linux-arm64.tar.gz"; @@ -385,36 +385,36 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-linux-arm64.tar.gz"; - sha256 = "1p4nk58ac3hs98zgdfpn8gj7fdfzmkfr2hhbw2qrsk0c2j1p7i5c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-linux-arm64.tar.gz"; + sha256 = "0qwkdav9gjqqzxwkbb8lcaw15f9swzj4g4hfgf0gixm16bahghwq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-linux-arm64.tar.gz"; - sha256 = "1gbc8lscbm7vh1cq79lpjm2wj0dp8k0r1qdq41r9a23315cbc10h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.10.0-linux-arm64.tar.gz"; + sha256 = "157rz4q7965rhyq7jdgkmy2431689xyffmsqcv1i2jr665r8qli7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-linux-arm64.tar.gz"; - sha256 = "0mv5hbi1lwp9z8bl1ygq7rkzcqxn0m12n6rfb0bkav8r64r0gp07"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.4.0-linux-arm64.tar.gz"; + sha256 = "078dz7vslfwkjfiirxwbysb9jzkk1mhgm6nmx4w9w1r5ywn2fh6c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-linux-arm64.tar.gz"; - sha256 = "12ds15ksk7acx2cs004vabz0hmydrql43nbg26yadzr4vzl1ih7y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.6.0-linux-arm64.tar.gz"; + sha256 = "0cz8vhm5l7glm778f46yhhg15ayvxnxld53zr05bhd5k3fhhn778"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-linux-arm64.tar.gz"; - sha256 = "02iqynwshdz4jnwna2y3nnba6lpiwckd1r56wdlf0ar3nhjimlv8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.21.1-linux-arm64.tar.gz"; + sha256 = "1kxkirach4c8jsqm46zqizqp5998i4d5m6paqj8anc0893jcslq4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-linux-arm64.tar.gz"; sha256 = "0cmzvh8mlx1zaglhqv84zfnb21b2k59d44msqn05g5qjyjqqai3g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-linux-arm64.tar.gz"; - sha256 = "1vs4agfvkq29pl8gkqw99959l6hc4mr6fflc62r185c51s0b0kll"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-linux-arm64.tar.gz"; + sha256 = "1m40li98mpldqzx90fraisnm9l0w3m1f5rkigyg40fxkarg7z6gg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-linux-arm64.tar.gz"; @@ -437,12 +437,12 @@ sha256 = "1gi918if5waxpn1y83knfd3b9v2wlswbxsq8hd2vynfq669l9cbg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-linux-arm64.tar.gz"; - sha256 = "0lgr2a1rvdn2qnzb889s039f5cw77syrhgnprc6c2z59r60spv3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.61.1-linux-arm64.tar.gz"; + sha256 = "0g6wy7pn65j0fmh8qs5yr8x32ypl065r1029mwf07v1mp6h7d2yg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-linux-arm64.tar.gz"; - sha256 = "1w1f570hkq2r7m0wxazc3jy7r5p0aj5kyp52y1qc2l0asd07yfp3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.101.0-linux-arm64.tar.gz"; + sha256 = "07l6hba10g3piffsg87zibhp397g05ns56yfdjlpcsi35l6zxskj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "0scga9q0vjc4xcl7yirxmv1ghzykrziacninmv6fl7zsf41f5rvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-linux-arm64.tar.gz"; - sha256 = "1brj3f8975hmgisalzs6byfxxklmj0hw446459zglv24f25ygwic"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-linux-arm64.tar.gz"; + sha256 = "1ki9fhd3sgbrza2i4a7nyscx17iqml51bjj7fmbxb7bdpcpxw1n3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-linux-arm64.tar.gz"; @@ -479,36 +479,32 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.138.0-darwin-arm64.tar.gz"; - sha256 = "1nlhg2f5abis1vfm0qv65hffmmw94nq2yjfhzisyr7ljwjzly7i6"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.142.0-darwin-arm64.tar.gz"; + sha256 = "0i4nsz0cx5rvh6g6p0db6jcmc6w0c2rqhfka62vkr9780h153rjy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.27.0-darwin-arm64.tar.gz"; - sha256 = "0xbmbssvyj2wbqmyyaksvd50cqy3xkic4d3pf0mngskh0n8cni58"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.28.0-darwin-arm64.tar.gz"; + sha256 = "0433cjga5sl4kchnmgahb3nrl5zmrrd9829fqi6b7sn4a83i6bln"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.5.0-darwin-arm64.tar.gz"; - sha256 = "0p5brsbvvjf3kw9wz829b6fxzprbiwzh0w7sx342zsj6xpia3d7b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.0-darwin-arm64.tar.gz"; + sha256 = "102sz02xjga2g21vrx2cmp8pm4rph66vix37hyp19d8r5l57b8n7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.65.0-darwin-arm64.tar.gz"; - sha256 = "12ydys1i139n5p86x7cfxx1y41128dcn00hfw7l762sc7v1hzn6a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.67.0-darwin-arm64.tar.gz"; + sha256 = "041j9jw2pbqzd99ynysjhhjrs8kyvwsxpqkv709kifcc74z439x7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.3.4-darwin-arm64.tar.gz"; - sha256 = "1v1k1sj1a08g19dj68zs6jrsdwvxzwvbffsvd2isimbwp8dslgf0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.4.1-darwin-arm64.tar.gz"; + sha256 = "1vd7fgvv85hcx5dfsbdmq8850sswaa3515jwagmz91apcwl66qn0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.8.3-darwin-arm64.tar.gz"; sha256 = "11xqpvvziw51wi41rrhwsc8x8lwl185dajlmrbmwd1z5xkp9q9sm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.58.0-darwin-arm64.tar.gz"; - sha256 = "0qvjwafs1fidjhnq5qnl7fi3hhc3rmbwgxyav48632dyfqvb9g63"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.8.0-darwin-arm64.tar.gz"; - sha256 = "0cv3haz33qfc5dfi9wh5i1cd097xj22i23kwys74vawh4jv72mfz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.61.0-darwin-arm64.tar.gz"; + sha256 = "1rfaqnqgpnd104ims5gxwwh59a58m43n8hcxyivc9w68gcsi5n4q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.0.1-darwin-arm64.tar.gz"; @@ -519,20 +515,24 @@ sha256 = "0a2frvzi2rv9jhsnmmyn81sc6gvf8kfr2hb84kppkk3v1277614y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.42.0-darwin-arm64.tar.gz"; - sha256 = "0azm53lv2g66ddcni14zykqwml50zynxmi16p282xwiwiksaxqpl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.11.0-darwin-arm64.tar.gz"; + sha256 = "1lyrzihzwagl7v8xjhd6h3cl24l8rzpavywm1hfmp4j0h5ihkyyh"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.43.1-darwin-arm64.tar.gz"; + sha256 = "06l4cxmk50smi3kn3zc06ps89z707wq3nwfhc06d5g3cmfgpgg5i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.2-darwin-arm64.tar.gz"; sha256 = "1mx299c36v4q419bjpvhmvkm0bfbia7d0v9ilpyzcxqy68y2irzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.34.1-darwin-arm64.tar.gz"; - sha256 = "1sffzffwp914977wpbs85r0a34fq3ww2b51pq7x0fbkp6gh86c2f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.36.1-darwin-arm64.tar.gz"; + sha256 = "16rxcw8lwksrbwa3xrlfqdg309y2vw6cx7xgni8p3zdb28fvw4cx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.34.0-darwin-arm64.tar.gz"; - sha256 = "0h011iq2rfzbwhknk6id6j6dbyif191yqd3z09ai7r5b37g8dxh2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.35.1-darwin-arm64.tar.gz"; + sha256 = "0a1r0jjjrg6vknqq32cx3xkh9m677kxhkqvxf0r6v8cxkihjx34v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.7-darwin-arm64.tar.gz"; @@ -543,36 +543,36 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.12.2-darwin-arm64.tar.gz"; - sha256 = "1mqym6db5rz8s2p4zlzlmrrsjsid0dfwl3lwqwyakqnrqf8hmky8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.13.0-darwin-arm64.tar.gz"; + sha256 = "0ix0dia9n2ygcvy96syv4z8knkfrlqkvghrhkkqdg2d9hfczpbwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.8.0-darwin-arm64.tar.gz"; - sha256 = "12p9jbyvs3cf0s8xidm58s4296sp50ai942xhm7gam3gs7licgv2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.10.0-darwin-arm64.tar.gz"; + sha256 = "0x6r3hn2plzbawvclxlp6vmlqb2laax64x1mk4gwyimblwi98wjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.2-darwin-arm64.tar.gz"; - sha256 = "06lnmwikkb2jzwbazqi9ca9mpyyxh2m85k3sy0cvfh8inyxy30yr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.4.0-darwin-arm64.tar.gz"; + sha256 = "0gjr5z85p1sqr860mmc7hvk9273m3yqk0vyycy1c8vr7019ddpgi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.5.0-darwin-arm64.tar.gz"; - sha256 = "1rkm44mcd5icw3f96fnkw2lyq772lx2n2yg56yf5a2a7l4ssmiy5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.6.0-darwin-arm64.tar.gz"; + sha256 = "0ldc2s6yj15m8gv4vn0niz4bbz10b66ygz4rgz7sigfw1rsc75r5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.5-darwin-arm64.tar.gz"; - sha256 = "0lzhv6x2fqdrwlvi6s2ryab40c8nvy83xwza7iwksagdx6jpp3nj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.21.1-darwin-arm64.tar.gz"; + sha256 = "081dkcdjvkvzx8gn3vwhf94xcgml11fn83hylgc8rqh1b0r4x16f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.3-darwin-arm64.tar.gz"; sha256 = "0hbs1v63z9mj4yxbbpd8m84hzraz5fqqqmkmx65bjf5kp355pmpn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.29.0-darwin-arm64.tar.gz"; - sha256 = "02y0645k5zdx7ww9g1nsb6a79k9hzz79vb1dbfpjy2bn0mjaqxd3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.30.1-darwin-arm64.tar.gz"; + sha256 = "03s4if1xxns3fr6qn976glmah9593nys5j6albhbzxyjfclkbkms"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.6-darwin-arm64.tar.gz"; @@ -595,12 +595,12 @@ sha256 = "0cpg87gs14p55lb7575jspsb5vym0mdskhw998vmh9sdxbj94aci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.60.0-darwin-arm64.tar.gz"; - sha256 = "0z83d07daabjcizsj83zapc74ifi177n1fm98qw95mid9njficm1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.61.1-darwin-arm64.tar.gz"; + sha256 = "137ql0nkaqq1r2qq3i3lkzx48ibxa6aj02s4chsw0sqmcwk41zp7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.98.0-darwin-arm64.tar.gz"; - sha256 = "122052mcg8jwjmirbn1d8mg5f9imi32anwhzgrck4020g31m2zm7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.101.0-darwin-arm64.tar.gz"; + sha256 = "1940bif50iyd7yzcdmqm93yz5frbnv0ivk3ad0k6caqrrr8ja5bc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.7-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "019kvnzazk7aw5fcxf1219pgdn4kb0rp5xs42zi80bfvvc16ilin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.2-darwin-arm64.tar.gz"; - sha256 = "0j1b57p8hzs7l04h3im3sbkh2wc3x5av1vv37p9nypkaq0h0rwn9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.4.0-darwin-arm64.tar.gz"; + sha256 = "0g6agqki3a5liacadswfjc5wbh4d9sv17wng7vbk1bwsmv5r0wl7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.4-darwin-arm64.tar.gz"; From f043602b93f891234e299b212294933a75746558 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Thu, 31 Oct 2024 21:24:11 +0700 Subject: [PATCH 017/179] littlegptracker: 0-unstable-2020-11-26 -> 1.4.2 This commit makes a switch to djdiskmachine's fork[1]. [1]: https://github.com/djdiskmachine/littlegptracker --- .../0001-Remove-coherency-checks.patch | 52 -------- .../audio/littlegptracker/default.nix | 125 +++++++++--------- 2 files changed, 64 insertions(+), 113 deletions(-) delete mode 100644 pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch diff --git a/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch b/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch deleted file mode 100644 index 3cabd2a2c56c..000000000000 --- a/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2e1e9b3ffce9d1069fca0b27b8011f85c7547c3b Mon Sep 17 00:00:00 2001 -From: Francesco Gazzetta -Date: Wed, 19 Aug 2020 15:06:19 +0200 -Subject: [PATCH 1/2] Remove coherency checks >:) - -As far as I can see, they are just to make sure that the types can fit -in the word length, but this check was written when 64 bits weren't a -possibility and didn't take that into account, -so although the types do fit, the checks fail. -Indeed, the program seems to work well on 64 bits. -More info here: -https://github.com/Mdashdotdashn/LittleGPTracker/issues/4 ---- - sources/Externals/Soundfont/DATATYPE.H | 22 ---------------------- - 1 file changed, 22 deletions(-) - -diff --git a/sources/Externals/Soundfont/DATATYPE.H b/sources/Externals/Soundfont/DATATYPE.H -index 762a724..f6b031f 100644 ---- a/sources/Externals/Soundfont/DATATYPE.H -+++ b/sources/Externals/Soundfont/DATATYPE.H -@@ -123,28 +123,6 @@ typedef short SHORT; /* 16 bit signed value was: INT */ - ********************************************************************/ - typedef unsigned short EMUSTAT; - --/******************************************************************** --* Compare values with SoundFont Enabler limits. Fail compile --* if discrepency. If compile fails due to one of these errors, then --* the SoundFont enabler will not work with your system or the state of your --* development environment. --********************************************************************/ --#if (SCHAR_MAX != CHAR_MAXVAL) || (UCHAR_MAX != BYTE_MAXVAL) -- #error : char is out of range! --#endif -- --#if (SHRT_MAX != SHRT_MAXVAL) -- #error : short is out of range! --#endif -- --#if (LONG_MAX != LONG_MAXVAL) -- #error : long is out of range! --#endif -- --#if (ULONG_MAX != DWORD_MAXVAL) -- #error : unsigned long is out of range! --#endif -- - #ifdef __BYTE_COHERENT - - /******************************************************************** --- -2.25.4 - diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 754bf7865f77..6340678de13c 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -1,75 +1,78 @@ -{ lib, stdenv -, fetchFromGitHub -, unstableGitUpdater -, SDL -, jack2 -, Foundation +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + python3, + jack2, + Foundation, + alsa-lib, + pkg-config, }: - -stdenv.mkDerivation { +let + python = python3.withPackages (ps: with ps; [ pillow ]); + platform = if stdenv.hostPlatform.isDarwin then "OSX" else "X64"; +in +stdenv.mkDerivation (finalAttrs: { pname = "littlegptracker"; - version = "0-unstable-2020-11-26"; + version = "1.4.2"; src = fetchFromGitHub { - owner = "Mdashdotdashn"; + owner = "djdiskmachine"; repo = "littlegptracker"; - rev = "4aca8cd765e1ad586da62decd019e66cb64b45b8"; - sha256 = "0f2ip8z5wxk8fvlw47mczsbcrzh4nh1hgw1fwf5gjrqnzm8v111x"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE="; }; - buildInputs = [ - SDL - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation - ++ lib.optional stdenv.hostPlatform.isLinux jack2; + nativeBuildInputs = [ + pkg-config + python + ]; + buildInputs = + [ SDL2 ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation + ++ lib.optional stdenv.hostPlatform.isLinux jack2; - patches = [ - # Remove outdated (pre-64bit) checks that would fail on modern platforms - # (see description in patch file) - ./0001-Remove-coherency-checks.patch + preBuild = '' + cd projects + ''; + + makeFlags = [ + "CXX=${stdenv.cc.targetPrefix}c++" + "PLATFORM=${platform}" ]; - preBuild = "cd projects"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; - makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "PLATFORM=DEB" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PLATFORM=OSX" ]; - - env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++ - lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"); - - NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-framework Foundation"; - - installPhase = let extension = if stdenv.hostPlatform.isDarwin then "app" else "deb-exe"; - in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; - - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/Mdashdotdashn/littlegptracker.git"; - }; - - meta = with lib; { - description = "Music tracker similar to lsdj optimised to run on portable game consoles"; - longDescription = '' - LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised - to run on portable game consoles. It is currently running on Game Park's - GP2x & Caanoo, PSP, Dingoo, Windows, Mac OSX (intel/ppc) & Linux (Debian). - - It implements the user interface of littlesounddj, a very famous tracker - for the Gameboy platform that has been tried and tested by many users over - the years, leading to a little complex but yet extremely efficent way of - working. - - Piggy currently supports 8 monophonic 16Bit/44.1Khz stereo sample playback - channels. Additionally, the program can drive MIDI instruments (with the - gp32 and gp2x a custom MIDI interface is required). + installPhase = + let + extension = if stdenv.hostPlatform.isDarwin then "app" else "x64"; + in + '' + runHook preInstall + install -Dm555 lgpt.${extension} $out/lib/lgpt/lgpt + install -Dm444 resources/${platform}/{config,mapping}.xml $out/lib/lgpt/ + mkdir -p $out/bin + ln -s $out/lib/lgpt/lgpt $out/bin/ + runHook postInstall ''; - homepage = "https://www.littlegptracker.com/"; - downloadPage = "https://www.littlegptracker.com/download.php"; - license = licenses.bsd3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 - broken = stdenv.hostPlatform.isDarwin; + + meta = { + description = "Music tracker optimised to run on portable game consoles"; + longDescription = '' + Little Piggy Tracker (f.k.a 'LittleGPTracker') is a music tracker optimised to run on portable game consoles. + It is currently running on Windows, MacOS (intel/arm) & Linux, PSP, Miyoo Mini, and a collection of other retro gaming handhelds. + It implements the user interface of littlesounddj and precedes M8 tracker, two popular trackers greatly loved in the tracker community. + ''; + homepage = "https://github.com/djdiskmachine/LittleGPTracker"; + downloadPage = "https://github.com/djdiskmachine/LittleGPTracker/releases"; mainProgram = "lgpt"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + + # https://github.com/NixOS/nixpkgs/pull/352617#issuecomment-2495663097 + broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 53a859c1123def71e1c5aeadae501e458e486aaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 23:44:06 +0000 Subject: [PATCH 018/179] mpvScripts.mpvacious: 0.36 -> 0.37 --- pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 1f5d948362db..d017f404a1b1 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -10,13 +10,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.36"; + version = "0.37"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-j8K9coa8kyA7AgRQaBXJJmeTpNtfDKkOGnAP9Up7biA="; + sha256 = "sha256-sT74uDGtEUSDMJqSTJ6bI9XvdpRnQDNvKebWMx0CRcE="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; From b2f59cd8e0dd47472714fab587197d14c192978e Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 29 Mar 2024 15:27:11 +0100 Subject: [PATCH 019/179] dafny: add basic test for auto-updates --- pkgs/by-name/da/dafny/package.nix | 56 ++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 2e3b0c1e911e..19248ed1eda6 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -1,12 +1,41 @@ -{ lib -, buildDotnetModule -, fetchFromGitHub -, writeScript -, jdk11 -, z3 -, dotnetCorePackages +{ + lib, + buildDotnetModule, + fetchFromGitHub, + runCommand, + dafny, + writeScript, + jdk11, + z3, + dotnetCorePackages, }: +let + examples = fetchFromGitHub { + owner = "gaberch"; + repo = "Various-Algorithms-Verified-With-Dafny"; + rev = "50e451bbcd15e52e27d5bbbf66b0b4c4abbff41c"; + hash = "sha256-Ng5wve/4gQr/2hsFWUFFcTL3K2xH7dP9w8IrmvWMKyg="; + }; + + tests = { + verify = runCommand "dafny-test" { } '' + mkdir $out + cp ${examples}/SlowMax.dfy $out + ${dafny}/bin/dafny verify --allow-warnings $out/SlowMax.dfy + ''; + + # Broken, cannot compile generated .cs files for now + #run = runCommand "dafny-test" { } '' + # mkdir $out + # cp ${examples}/SlowMax.dfy $out + # ${dafny}/bin/dafny run --allow-warnings $out/SlowMax.dfy + # ''; + + # TODO: Ensure then tests that dafny can generate to and compile other + # languages (Java, Cpp, etc.) + }; +in buildDotnetModule rec { pname = "Dafny"; version = "4.8.0"; @@ -24,12 +53,11 @@ buildDotnetModule rec { runtimeJarVersion = "4.6.0"; in '' - cp ${ - writeScript "fake-gradlew-for-dafny" '' - mkdir -p build/libs/ - javac $(find -name "*.java" | grep "^./src/main") -d classes - jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny - ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew + cp ${writeScript "fake-gradlew-for-dafny" '' + mkdir -p build/libs/ + javac $(find -name "*.java" | grep "^./src/main") -d classes + jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny + ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew # Needed to fix # "error NETSDK1129: The 'Publish' target is not supported without @@ -62,6 +90,8 @@ buildDotnetModule rec { ln -s "$out/bin/Dafny" "$out/bin/dafny" || true ''; + passthru.tests = tests; + meta = with lib; { description = "Programming language with built-in specification constructs"; homepage = "https://research.microsoft.com/dafny"; From fcdc5ba4805bfe46d9489310467c62419ab6bc1c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 7 Dec 2024 19:45:59 +0800 Subject: [PATCH 020/179] python312Packages.pallets-sphinx-themes: 2.1.3 -> 2.3.0 --- .../pallets-sphinx-themes/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index bba0de1f208f..08c68587a0e0 100644 --- a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix @@ -4,33 +4,38 @@ fetchFromGitHub, sphinx, packaging, + flit-core, + sphinx-notfound-page, }: buildPythonPackage rec { pname = "pallets-sphinx-themes"; - version = "2.1.3"; - format = "setuptools"; + version = "2.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "pallets"; repo = "pallets-sphinx-themes"; - rev = "refs/tags/${version}"; - sha256 = "sha256-uXSejJLVmYpzRCP92JQKHosnlx7dgZlFf5XzbxOfvII="; + tag = version; + hash = "sha256-+etmWzjCiYbM8cHSnJr0tHs3DpvozNYShQ6x60UADS4="; }; - propagatedBuildInputs = [ + build-system = [ + flit-core + ]; + + dependencies = [ packaging sphinx + sphinx-notfound-page ]; pythonImportsCheck = [ "pallets_sphinx_themes" ]; - doCheck = false; - - meta = with lib; { + meta = { homepage = "https://github.com/pallets/pallets-sphinx-themes"; description = "Sphinx theme for Pallets projects"; - license = licenses.bsd3; - maintainers = with maintainers; [ kaction ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ kaction ]; }; } From abf1b2d976231d59131ab3213a0059589c292937 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:42:09 +0800 Subject: [PATCH 021/179] jamulus: format --- pkgs/applications/audio/jamulus/default.nix | 33 ++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 8ad35f34f7ea..d5b54f04bf2e 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -1,26 +1,31 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, pkg-config -, qtscript -, qmake -, qtbase -, qtmultimedia -, qtdeclarative -, libjack2 +{ + mkDerivation, + lib, + fetchFromGitHub, + pkg-config, + qtscript, + qmake, + qtbase, + qtmultimedia, + qtdeclarative, + libjack2, }: - mkDerivation rec { pname = "jamulus"; version = "3.10.0"; + src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; - rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-uqBre1Hcdmmifm/gii3MlP9LiAovQVsAaPZTmVm1nnM="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ + pkg-config + qmake + ]; + buildInputs = [ qtscript qtbase @@ -38,6 +43,6 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "jamulus"; - maintainers = [ lib.maintainers.seb314 ]; + maintainers = with lib.maintainers; [ seb314 ]; }; } From 2c87ea374c3818ddd1945a1da671a004f2881b4c Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:00:45 +0800 Subject: [PATCH 022/179] tonelib-metal: format --- pkgs/by-name/to/tonelib-metal/package.nix | 46 ++++++++++++----------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix index f337e59c2274..6ada9248e7df 100644 --- a/pkgs/by-name/to/tonelib-metal/package.nix +++ b/pkgs/by-name/to/tonelib-metal/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, mesa -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + alsa-lib, + freetype, + libglvnd, + mesa, + curl, + libXcursor, + libXinerama, + libXrandr, + libXrender, + libjack2, }: stdenv.mkDerivation rec { @@ -24,7 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; buildInputs = [ (lib.getLib stdenv.cc.cc) @@ -48,14 +52,14 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ - ''; + ''; - meta = with lib; { + meta = { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; homepage = "https://tonelib.net/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; mainProgram = "ToneLib-Metal"; }; From 75c8475e45600ff31d86b222696e5f78ed1f2c02 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:17:11 +0800 Subject: [PATCH 023/179] tonelib-metal: 1.2.6 -> 1.3.0 --- pkgs/by-name/to/tonelib-metal/package.nix | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/to/tonelib-metal/package.nix b/pkgs/by-name/to/tonelib-metal/package.nix index 6ada9248e7df..1286400c8bfe 100644 --- a/pkgs/by-name/to/tonelib-metal/package.nix +++ b/pkgs/by-name/to/tonelib-metal/package.nix @@ -15,14 +15,13 @@ libXrender, libjack2, }: - stdenv.mkDerivation rec { pname = "tonelib-metal"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-Metal-amd64.deb"; - sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU="; + url = "https://tonelib.vip/download/24-10-24/ToneLib-Metal-amd64.deb"; + hash = "sha256-H19ZUOFI7prQJPo9NWWAHSOwpZ4RIbpRJHfQVjDp/VA="; }; nativeBuildInputs = [ @@ -30,14 +29,6 @@ stdenv.mkDerivation rec { dpkg ]; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - alsa-lib - freetype - libglvnd - mesa - ] ++ runtimeDependencies; - runtimeDependencies = map lib.getLib [ curl libXcursor @@ -47,16 +38,27 @@ stdenv.mkDerivation rec { libjack2 ]; - unpackCmd = "dpkg -x $curSrc source"; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + alsa-lib + freetype + libglvnd + mesa + ] ++ runtimeDependencies; installPhase = '' - mv usr $out - substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ + runHook preInstall + + cp -r usr $out + substituteInPlace $out/share/applications/ToneLib-Metal.desktop \ + --replace-fail "/usr/" "$out/" + + runHook postInstall ''; meta = { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; - homepage = "https://tonelib.net/"; + homepage = "https://tonelib.net"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ dan4ik605743 ]; From cf49d14dfa41465e3cebbe60b850896aaa856995 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:20:08 +0800 Subject: [PATCH 024/179] tonelib-noisereducer: format --- .../to/tonelib-noisereducer/package.nix | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix index df86ff86aabb..65796e129dd3 100644 --- a/pkgs/by-name/to/tonelib-noisereducer/package.nix +++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, mesa -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + alsa-lib, + freetype, + libglvnd, + mesa, + curl, + libXcursor, + libXinerama, + libXrandr, + libXrender, + libjack2, }: stdenv.mkDerivation rec { @@ -24,7 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-27JuFVmamIUUKRrpjlsE0E6x+5X9RutNGPiDf5dxitI="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; buildInputs = [ (lib.getLib stdenv.cc.cc) @@ -47,14 +51,14 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out - ''; + ''; - meta = with lib; { + meta = { description = "ToneLib NoiseReducer – two-unit noise reduction rack effect plugin"; homepage = "https://tonelib.net/tl-noisereducer.html"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ orivej ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ orivej ]; platforms = [ "x86_64-linux" ]; mainProgram = "ToneLib-NoiseReducer"; }; From 40d0e04cd06280364e74473c8ebd60c10e827985 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:26:07 +0800 Subject: [PATCH 025/179] tonelib-noisereducer: 1.2.0 -> 2.0 --- .../to/tonelib-noisereducer/package.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/to/tonelib-noisereducer/package.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix index 65796e129dd3..24a12545767f 100644 --- a/pkgs/by-name/to/tonelib-noisereducer/package.nix +++ b/pkgs/by-name/to/tonelib-noisereducer/package.nix @@ -15,14 +15,13 @@ libXrender, libjack2, }: - stdenv.mkDerivation rec { pname = "tonelib-noisereducer"; - version = "1.2.0"; + version = "2.0"; src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-NoiseReducer-amd64.deb"; - sha256 = "sha256-27JuFVmamIUUKRrpjlsE0E6x+5X9RutNGPiDf5dxitI="; + url = "https://tonelib.vip/download/24-12-01/ToneLib-NoiseReducer-amd64.deb"; + hash = "sha256-R+JXoc6waKGPMaghlJ8BkLumDcjC7Oq0jx8tFjAKegE="; }; nativeBuildInputs = [ @@ -30,14 +29,6 @@ stdenv.mkDerivation rec { dpkg ]; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - alsa-lib - freetype - libglvnd - mesa - ] ++ runtimeDependencies; - runtimeDependencies = map lib.getLib [ curl libXcursor @@ -47,10 +38,20 @@ stdenv.mkDerivation rec { libjack2 ]; - unpackCmd = "dpkg -x $curSrc source"; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + alsa-lib + freetype + libglvnd + mesa + ] ++ runtimeDependencies; installPhase = '' - mv usr $out + runHook preInstall + + cp -r usr $out + + runHook postInstall ''; meta = { From edde220e33472926173ab77fc402452e1e1bf8b0 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:44:00 +0800 Subject: [PATCH 026/179] jamulus: refactor --- pkgs/applications/audio/jamulus/default.nix | 18 +++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index d5b54f04bf2e..1fd14bf67191 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,11 +3,7 @@ lib, fetchFromGitHub, pkg-config, - qtscript, - qmake, - qtbase, - qtmultimedia, - qtdeclarative, + libsForQt5, libjack2, }: mkDerivation rec { @@ -23,14 +19,14 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake ]; buildInputs = [ - qtscript - qtbase - qtmultimedia - qtdeclarative + libsForQt5.qtscript + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtdeclarative libjack2 ]; @@ -39,7 +35,7 @@ mkDerivation rec { meta = { description = "Enables musicians to perform real-time jam sessions over the internet"; longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; - homepage = "https://github.com/corrados/jamulus/wiki"; + homepage = "https://github.com/corrados/jamulus"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "jamulus"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a8cd0f6f70..5fbfba2edbf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3807,7 +3807,7 @@ with pkgs; iaito = libsForQt5.callPackage ../tools/security/iaito { }; - jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; + jamulus = callPackage ../applications/audio/jamulus { }; icemon = libsForQt5.callPackage ../applications/networking/icemon { }; From a164ceb7f37b42476879795aef86bc3d1afbf5b4 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:35:12 +0000 Subject: [PATCH 027/179] jamulus: 3.10.0 -> 3.11.0 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 1fd14bf67191..9dc1807fec5a 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -8,13 +8,13 @@ }: mkDerivation rec { pname = "jamulus"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uqBre1Hcdmmifm/gii3MlP9LiAovQVsAaPZTmVm1nnM="; + hash = "sha256-YxXSSVm3n96YzE51cXpWf4z2nQBSguvcEp/kU0a6iBA="; }; nativeBuildInputs = [ From cdfe22455a0eb0cc4833726585834b14b144e1e3 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:51:10 +0800 Subject: [PATCH 028/179] jamulus: move to by-name --- .../jamulus/default.nix => by-name/ja/jamulus/package.nix} | 5 +++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/jamulus/default.nix => by-name/ja/jamulus/package.nix} (93%) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/by-name/ja/jamulus/package.nix similarity index 93% rename from pkgs/applications/audio/jamulus/default.nix rename to pkgs/by-name/ja/jamulus/package.nix index 9dc1807fec5a..32166e15f465 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/by-name/ja/jamulus/package.nix @@ -1,12 +1,12 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, pkg-config, libsForQt5, libjack2, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "jamulus"; version = "3.11.0"; @@ -20,6 +20,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config libsForQt5.qmake + libsForQt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fbfba2edbf5..05d45fee21ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3807,8 +3807,6 @@ with pkgs; iaito = libsForQt5.callPackage ../tools/security/iaito { }; - jamulus = callPackage ../applications/audio/jamulus { }; - icemon = libsForQt5.callPackage ../applications/networking/icemon { }; icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak; From 0488b87eb9e565738a1ab0c82a62fd192383f040 Mon Sep 17 00:00:00 2001 From: kmatas <33095685+kmatasfp@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:35:54 -0800 Subject: [PATCH 029/179] maintainers: add kmatasfp --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7fc737a9cd4..dad7a958e7d0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11916,6 +11916,12 @@ githubId = 12898828; keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF DD8B 8609 A7B5 19E5 E342"; } ]; }; + kmatasfp = { + email = "el-development@protonmail.com"; + name = "Kaur Matas"; + github = "kmatasfp"; + githubId = 33095685; + }; kmcopper = { email = "kmcopper@danwin1210.me"; name = "Kyle Copperfield"; From 6817299f3834d825d99277c0536613a9a8107e3b Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 25 Nov 2024 18:01:42 +0800 Subject: [PATCH 030/179] nixos/clash-verge: enable serviceModule by default --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/programs/clash-verge.nix | 27 +++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 5c5b2470e2d3..04fe2032da46 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -135,6 +135,8 @@ - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0). `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable. +- `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start. + ## Other Notable Changes {#sec-release-25.05-notable-changes} diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix index a2912cb1d8e0..7210fe7ec464 100644 --- a/nixos/modules/programs/clash-verge.nix +++ b/nixos/modules/programs/clash-verge.nix @@ -6,6 +6,11 @@ }: { + imports = [ + (lib.mkRemovedOptionModule [ "programs" "clash-verge" "tunMode" ] '' + The tunMode will work with service mode which is enabled by default. + '') + ]; options.programs.clash-verge = { enable = lib.mkEnableOption "Clash Verge"; package = lib.mkOption { @@ -15,10 +20,10 @@ clash-verge-rev and clash-nyanpasu, both are forks of the original clash-verge project. ''; - example = "pkgs.clash-verge-rev"; + default = pkgs.clash-verge-rev; + defaultText = lib.literalExpression "pkgs.clash-verge-rev"; }; autoStart = lib.mkEnableOption "Clash Verge auto launch"; - tunMode = lib.mkEnableOption "Clash Verge TUN mode"; }; config = @@ -37,13 +42,19 @@ )) ]; - security.wrappers.clash-verge = lib.mkIf cfg.tunMode { - owner = "root"; - group = "root"; - capabilities = "cap_net_bind_service,cap_net_admin=+ep"; - source = "${lib.getExe cfg.package}"; + systemd.services.clash-verge = { + enable = true; + description = "Clash Verge Service Mode"; + serviceConfig = { + ExecStart = "${cfg.package}/bin/clash-verge-service"; + Restart = "on-failure"; + }; + wantedBy = [ "multi-user.target" ]; }; }; - meta.maintainers = with lib.maintainers; [ zendo ]; + meta.maintainers = with lib.maintainers; [ + bot-wxt1221 + Guanran928 + ]; } From 6382ac757b42e16c9a1a593ecf9b94b2f48ffc4d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 14 Dec 2024 13:20:04 +0800 Subject: [PATCH 031/179] linuxwave: 0.1.5 -> 0.2.0 --- pkgs/by-name/li/linuxwave/deps.nix | 13 +++++++++++++ pkgs/by-name/li/linuxwave/package.nix | 21 ++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/li/linuxwave/deps.nix diff --git a/pkgs/by-name/li/linuxwave/deps.nix b/pkgs/by-name/li/linuxwave/deps.nix new file mode 100644 index 000000000000..685833205981 --- /dev/null +++ b/pkgs/by-name/li/linuxwave/deps.nix @@ -0,0 +1,13 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "122062d301a203d003547b414237229b09a7980095061697349f8bef41be9c30266b"; + path = fetchzip { + url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.9.1.tar.gz"; + hash = "sha256-pscDsE1jJK1Nktq7rv/ScvsDqvvklFvtiGqOFf2eWvY="; + }; + } +] diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix index 0ac17761b0fa..e9ec5ad93687 100644 --- a/pkgs/by-name/li/linuxwave/package.nix +++ b/pkgs/by-name/li/linuxwave/package.nix @@ -3,26 +3,37 @@ stdenv, fetchFromGitHub, installShellFiles, - zig_0_10, + zig_0_13, + apple-sdk_11, + callPackage, }: +let + zig = zig_0_13; +in stdenv.mkDerivation (finalAttrs: { pname = "linuxwave"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = "linuxwave"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-5c8h9bAe3Qv7PJ3PPcwMJYKPlWsmnqshe6vLIgtdDiQ="; + hash = "sha256-mPBtffqd0+B7J8FxolzOarCyJIZBWkWPBbqZlhX0VSY="; }; + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + nativeBuildInputs = [ installShellFiles - zig_0_10.hook + zig.hook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + postInstall = '' installManPage man/linuxwave.1 ''; @@ -33,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; - inherit (zig_0_10.meta) platforms; + inherit (zig.meta) platforms; mainProgram = "linuxwave"; }; }) From 690c39991994c8f9074cd0edd83bbcb46c24b2ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 00:40:56 +0000 Subject: [PATCH 032/179] ipopt: 3.14.16 -> 3.14.17 --- pkgs/by-name/ip/ipopt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix index c020598544a5..b4715462bc82 100644 --- a/pkgs/by-name/ip/ipopt/package.nix +++ b/pkgs/by-name/ip/ipopt/package.nix @@ -19,13 +19,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.16"; + version = "3.14.17"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-ZuiZZMq7NzOm6CCJgMBgEWs8PEfM3pVr2yOWbS42l8U="; + sha256 = "sha256-0IRHryADQArhhtfbQjCy+EDvVRi/ywc51IwiQOfWlR4="; }; CXXDEFS = [ From 2eee557cb4b2b3a2b03bcbb8434d1c6c33ae24a4 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 15 Dec 2024 18:48:29 +0800 Subject: [PATCH 033/179] python312Packages.pycatch22: fix build --- .../python-modules/pycatch22/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pycatch22/default.nix b/pkgs/development/python-modules/pycatch22/default.nix index 69b218ec66b0..70b91224b54e 100644 --- a/pkgs/development/python-modules/pycatch22/default.nix +++ b/pkgs/development/python-modules/pycatch22/default.nix @@ -5,6 +5,8 @@ setuptools, pandas, pythonOlder, + numpy, + pytestCheckHook, }: buildPythonPackage rec { @@ -17,31 +19,25 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DynamicsAndNeuralSystems"; repo = "pycatch22"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NvZrjOdC6rV4hwCuGcc2Br/VDhLwZcYpfnNvQpqU134="; }; nativeBuildInputs = [ setuptools ]; - nativeCheckInputs = [ pandas ]; - - # This packages does not have real tests - # But we can run this file as smoketest - checkPhase = '' - runHook preCheck - - python tests/testing.py - - runHook postCheck - ''; + nativeCheckInputs = [ + pandas + numpy + pytestCheckHook + ]; pythonImportsCheck = [ "pycatch22" ]; - meta = with lib; { + meta = { description = "Python implementation of catch22"; homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22"; changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mbalatsko ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ mbalatsko ]; }; } From 05ea5502b5b7410eb5d802eef2a052cf08054b0f Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 17 Dec 2024 09:11:11 +0800 Subject: [PATCH 034/179] navicat-premium: 17.1.6 -> 17.1.7 --- pkgs/by-name/na/navicat-premium/package.nix | 28 +++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index cf0b8d125dc1..470866aa9e52 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -2,14 +2,25 @@ fetchurl, appimageTools, lib, + stdenv, }: let pname = "navicat-premium"; - version = "17.1.6"; - src = fetchurl { - url = "https://web.archive.org/web/20241127151816/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; - hash = "sha256-pH5hjHRuN29yBvsBrskCcwgXRUZ95iwEse2O3IiIvGo="; - }; + version = "17.1.7"; + + src = + { + x86_64-linux = fetchurl { + url = "https://web.archive.org/web/20241217004300/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; + hash = "sha256-5dzZh06Ld8t4tgE3tWGPAaBuKcT9iSxi8KpSdO4Un64="; + }; + aarch64-linux = fetchurl { + url = "https://web.archive.org/web/20241217005701/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; + hash = "sha256-4NvjdNTo/WUlZIRAzA2D39NupqMjlCvjHSWk06spqRc="; + }; + } + .${stdenv.hostPlatform.system}; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -25,12 +36,15 @@ appimageTools.wrapType2 { meta = { homepage = "https://www.navicat.com/products/navicat-premium"; - changelog = "https://www.navicat.com/en/products/navicat-premium-release-note"; + changelog = "https://www.navicat.com/products/navicat-premium-release-note"; description = "Database development tool that allows you to simultaneously connect to many databases"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ aucub ]; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; mainProgram = "navicat-premium"; }; } From 38c70b3fcab817f59d30abeef6506ff193a6847e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 17 Dec 2024 21:33:08 +0800 Subject: [PATCH 035/179] python312Packages.debianbts: fix build --- .../python-modules/debianbts/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix index 3131f9077d10..d864e7097d15 100644 --- a/pkgs/development/python-modules/debianbts/default.nix +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -5,40 +5,45 @@ pysimplesoap, pythonOlder, setuptools, + distutils, }: buildPythonPackage rec { pname = "python-debianbts"; - version = "4.0.2"; + version = "4.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-JbPb0lZND96XLZNU97wMuT9iGNXVN2KTsZC2St6FfuU="; + inherit version; + pname = "python_debianbts"; + hash = "sha256-9EOxjOJBGzcxA3hHFeZwffA09I2te+OHppF7FuFU15M="; }; postPatch = '' sed -i "/--cov/d" pyproject.toml ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pysimplesoap ]; + dependencies = [ + pysimplesoap + distutils + ]; # Most tests require network access doCheck = false; pythonImportsCheck = [ "debianbts" ]; - meta = with lib; { + meta = { description = "Python interface to Debian's Bug Tracking System"; mainProgram = "debianbts"; homepage = "https://github.com/venthur/python-debianbts"; downloadPage = "https://pypi.org/project/python-debianbts/"; changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ nicoo ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nicoo ]; }; } From 11ab4cb660ad88d842aa91b276205bfba2d4747f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 17 Dec 2024 23:20:49 +0100 Subject: [PATCH 036/179] mjolnir: 1.8.3 -> 1.9.1 https://github.com/matrix-org/mjolnir/releases/tag/v1.9.0 https://github.com/matrix-org/mjolnir/releases/tag/v1.9.1 --- .../mjolnir/001-disable-nsfwprotection.patch | 155 ++++++++++-------- pkgs/by-name/mj/mjolnir/package.json | 8 +- pkgs/by-name/mj/mjolnir/package.nix | 6 +- 3 files changed, 98 insertions(+), 71 deletions(-) diff --git a/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch b/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch index ceeaa90f6351..2566f65b1d1b 100644 --- a/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch +++ b/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch @@ -1,9 +1,9 @@ diff --git a/src/protections/NsfwProtection.ts b/src/protections/NsfwProtection.ts deleted file mode 100644 -index 8b6f8fd..0000000 +index a6f45b2..0000000 --- a/src/protections/NsfwProtection.ts +++ /dev/null -@@ -1,99 +0,0 @@ +@@ -1,115 +0,0 @@ -/* -Copyright 2024 The Matrix.org Foundation C.I.C. - @@ -22,10 +22,9 @@ index 8b6f8fd..0000000 - -import { Protection } from "./IProtection"; -import { Mjolnir } from "../Mjolnir"; --import * as nsfw from 'nsfwjs'; --import {LogLevel} from "@vector-im/matrix-bot-sdk"; --import { node } from '@tensorflow/tfjs-node'; -- +-import * as nsfw from "nsfwjs"; +-import { LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; +-import { node } from "@tensorflow/tfjs-node"; - -export class NsfwProtection extends Protection { - settings = {}; @@ -41,37 +40,50 @@ index 8b6f8fd..0000000 - } - - public get name(): string { -- return 'NsfwProtection'; +- return "NsfwProtection"; - } - - public get description(): string { -- return "Scans all images sent into a protected room to determine if the image is " + -- "NSFW. If it is, the image will automatically be redacted."; +- return ( +- "Scans all images sent into a protected room to determine if the image is " + +- "NSFW. If it is, the image will automatically be redacted." +- ); - } - - public async handleEvent(mjolnir: Mjolnir, roomId: string, event: any): Promise { -- if (event['type'] === 'm.room.message') { -- let content = JSON.stringify(event['content']); +- if (event["type"] === "m.room.message") { +- let content = JSON.stringify(event["content"]); - if (!content.toLowerCase().includes("mxc")) { - return; -- } +- } - // try and grab a human-readable alias for more helpful management room output -- const maybeAlias = await mjolnir.client.getPublishedAlias(roomId) -- const room = maybeAlias ? maybeAlias : roomId +- const maybeAlias = await mjolnir.client.getPublishedAlias(roomId); +- const room = maybeAlias ? maybeAlias : roomId; - - const mxcs = content.match(/(mxc?:\/\/[^\s'"]+)/gim); - if (!mxcs) { - //something's gone wrong with the regex -- await mjolnir.managementRoomOutput.logMessage(LogLevel.ERROR, "NSFWProtection", `Unable to find any mxcs in ${event["event_id"]} in ${room}`); +- await mjolnir.managementRoomOutput.logMessage( +- LogLevel.ERROR, +- "NSFWProtection", +- `Unable to find any mxcs in ${event["event_id"]} in ${room}`, +- ); - return; - } - - // @ts-ignore - see null check immediately above - for (const mxc of mxcs) { - const image = await mjolnir.client.downloadContent(mxc); -- const decodedImage = await node.decodeImage(image.data, 3); -- const predictions = await this.model.classify(decodedImage); - +- let decodedImage; +- try { +- decodedImage = await node.decodeImage(image.data, 3); +- } catch (e) { +- LogService.error("NsfwProtection", `There was an error processing an image: ${e}`); +- continue; +- } +- +- const predictions = await this.model.classify(decodedImage); - - for (const prediction of predictions) { - if (["Hentai", "Porn"].includes(prediction["className"])) { @@ -79,22 +91,26 @@ index 8b6f8fd..0000000 - try { - await mjolnir.client.redactEvent(roomId, event["event_id"]); - } catch (err) { -- await mjolnir.managementRoomOutput.logMessage(LogLevel.ERROR, "NSFWProtection", `There was an error redacting ${event["event_id"]} in ${room}: ${err}`); +- await mjolnir.managementRoomOutput.logMessage( +- LogLevel.ERROR, +- "NSFWProtection", +- `There was an error redacting ${event["event_id"]} in ${room}: ${err}`, +- ); - } -- let eventId = event["event_id"] -- let body = `Redacted an image in ${room} ${eventId}` +- let eventId = event["event_id"]; +- let body = `Redacted an image in ${room} ${eventId}`; - let formatted_body = `
- Redacted an image in ${room} --
${eventId}
${room}
--                                                  
` +-
${eventId}
${room}
+- `; - const msg = { - msgtype: "m.notice", - body: body, - format: "org.matrix.custom.html", -- formatted_body: formatted_body +- formatted_body: formatted_body, - }; - await mjolnir.client.sendMessage(mjolnir.managementRoomId, msg); -- break +- break; - } - } - } @@ -103,16 +119,15 @@ index 8b6f8fd..0000000 - } - } -} -\ No newline at end of file diff --git a/src/protections/ProtectionManager.ts b/src/protections/ProtectionManager.ts -index 9b84318..67f10dc 100644 +index 485f05e..6ffb0d1 100644 --- a/src/protections/ProtectionManager.ts +++ b/src/protections/ProtectionManager.ts @@ -31,7 +31,6 @@ import { htmlEscape } from "../utils"; import { ERROR_KIND_FATAL, ERROR_KIND_PERMISSION } from "../ErrorCache"; import { RoomUpdateError } from "../models/RoomUpdateError"; import { LocalAbuseReports } from "./LocalAbuseReports"; --import {NsfwProtection} from "./NsfwProtection"; +-import { NsfwProtection } from "./NsfwProtection"; import { MentionSpam } from "./MentionSpam"; const PROTECTIONS: Protection[] = [ @@ -121,10 +136,10 @@ index 9b84318..67f10dc 100644 new JoinWaveShortCircuit(), new LocalAbuseReports(), - new NsfwProtection(), - new MentionSpam() + new MentionSpam(), ]; -@@ -104,9 +102,6 @@ export class ProtectionManager { +@@ -106,9 +104,6 @@ export class ProtectionManager { protection.settings[key].setValue(value); } if (protection.enabled) { @@ -136,49 +151,54 @@ index 9b84318..67f10dc 100644 } diff --git a/test/integration/nsfwProtectionTest.ts b/test/integration/nsfwProtectionTest.ts deleted file mode 100644 -index c86fd38..0000000 +index ed215e0..0000000 --- a/test/integration/nsfwProtectionTest.ts +++ /dev/null -@@ -1,78 +0,0 @@ --import {newTestUser} from "./clientHelper"; +@@ -1,89 +0,0 @@ +-import { newTestUser } from "./clientHelper"; - --import {MatrixClient} from "@vector-im/matrix-bot-sdk"; --import {getFirstReaction} from "./commands/commandUtils"; --import {strict as assert} from "assert"; --import { readFileSync } from 'fs'; +-import { MatrixClient } from "@vector-im/matrix-bot-sdk"; +-import { getFirstReaction } from "./commands/commandUtils"; +-import { strict as assert } from "assert"; +-import { readFileSync } from "fs"; - -describe("Test: NSFW protection", function () { - let client: MatrixClient; - let room: string; - this.beforeEach(async function () { -- client = await newTestUser(this.config.homeserverUrl, {name: {contains: "nsfw-protection"}}); +- client = await newTestUser(this.config.homeserverUrl, { name: { contains: "nsfw-protection" } }); - await client.start(); - const mjolnirId = await this.mjolnir.client.getUserId(); - room = await client.createRoom({ invite: [mjolnirId] }); - await client.joinRoom(room); - await client.joinRoom(this.config.managementRoom); - await client.setUserPowerLevel(mjolnirId, room, 100); -- }) +- }); - this.afterEach(async function () { - await client.stop(); -- }) +- }); - - function delay(ms: number) { -- return new Promise(resolve => setTimeout(resolve, ms)); +- return new Promise((resolve) => setTimeout(resolve, ms)); - } - -- -- it("Nsfw protection doesn't redact sfw images", async function() { +- it("Nsfw protection doesn't redact sfw images", async function () { - this.timeout(20000); - -- await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir rooms add ${room}` }); -- await getFirstReaction(client, this.mjolnir.managementRoomId, '✅', async () => { -- return await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir enable NsfwProtection` }); +- await client.sendMessage(this.mjolnir.managementRoomId, { +- msgtype: "m.text", +- body: `!mjolnir rooms add ${room}`, +- }); +- await getFirstReaction(client, this.mjolnir.managementRoomId, "✅", async () => { +- return await client.sendMessage(this.mjolnir.managementRoomId, { +- msgtype: "m.text", +- body: `!mjolnir enable NsfwProtection`, +- }); - }); - -- const data = readFileSync('test_tree.jpg'); -- const mxc = await client.uploadContent(data, 'image/png'); -- let content = {"msgtype": "m.image", "body": "test.jpeg", "url": mxc}; +- const data = readFileSync("test_tree.jpg"); +- const mxc = await client.uploadContent(data, "image/png"); +- let content = { msgtype: "m.image", body: "test.jpeg", url: mxc }; - let imageMessage = await client.sendMessage(room, content); - - await delay(500); @@ -186,36 +206,41 @@ index c86fd38..0000000 - assert.equal(Object.keys(processedImage.content).length, 3, "This event should not have been redacted"); - }); - -- it("Nsfw protection redacts nsfw images", async function() { +- it("Nsfw protection redacts nsfw images", async function () { - this.timeout(20000); - // dial the sensitivity on the protection way up so that all images are flagged as NSFW - this.mjolnir.config.nsfwSensitivity = 0.0; - -- await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir rooms add ${room}` }); -- await getFirstReaction(client, this.mjolnir.managementRoomId, '✅', async () => { -- return await client.sendMessage(this.mjolnir.managementRoomId, { msgtype: 'm.text', body: `!mjolnir enable NsfwProtection` }); +- await client.sendMessage(this.mjolnir.managementRoomId, { +- msgtype: "m.text", +- body: `!mjolnir rooms add ${room}`, +- }); +- await getFirstReaction(client, this.mjolnir.managementRoomId, "✅", async () => { +- return await client.sendMessage(this.mjolnir.managementRoomId, { +- msgtype: "m.text", +- body: `!mjolnir enable NsfwProtection`, +- }); - }); - -- const data = readFileSync('test_tree.jpg'); -- const mxc = await client.uploadContent(data, 'image/png'); -- let content = {"msgtype": "m.image", "body": "test.jpeg", "url": mxc}; +- const data = readFileSync("test_tree.jpg"); +- const mxc = await client.uploadContent(data, "image/png"); +- let content = { msgtype: "m.image", body: "test.jpeg", url: mxc }; - let imageMessage = await client.sendMessage(room, content); - -- let formatted_body = `` +- let formatted_body = ``; - let htmlContent = { -- msgtype: "m.image", -- body: formatted_body, -- format: "org.matrix.custom.html", -- formatted_body: formatted_body -- }; -- let htmlMessage = await client.sendMessage(room, htmlContent) +- msgtype: "m.image", +- body: formatted_body, +- format: "org.matrix.custom.html", +- formatted_body: formatted_body, +- }; +- let htmlMessage = await client.sendMessage(room, htmlContent); - - await delay(500); - let processedImage = await client.getEvent(room, imageMessage); - assert.equal(Object.keys(processedImage.content).length, 0, "This event should have been redacted"); - -- let processedHtml = await client.getEvent(room, htmlMessage) -- assert.equal(Object.keys(processedHtml.content).length, 0, "This html image event should have been redacted") +- let processedHtml = await client.getEvent(room, htmlMessage); +- assert.equal(Object.keys(processedHtml.content).length, 0, "This html image event should have been redacted"); - }); -}); -\ No newline at end of file diff --git a/pkgs/by-name/mj/mjolnir/package.json b/pkgs/by-name/mj/mjolnir/package.json index fa276e8569a2..d0ffe772a827 100644 --- a/pkgs/by-name/mj/mjolnir/package.json +++ b/pkgs/by-name/mj/mjolnir/package.json @@ -1,6 +1,6 @@ { "name": "mjolnir", - "version": "1.8.3", + "version": "1.9.1", "description": "A moderation tool for Matrix", "main": "lib/index.js", "repository": "git@github.com:matrix-org/mjolnir.git", @@ -10,7 +10,7 @@ "scripts": { "build": "tsc", "postbuild": "rm -rf lib/test/ && cp -r lib/src/* lib/ && rm -rf lib/src/", - "lint": "tslint --project ./tsconfig.json -t stylish", + "lint": "tslint --project ./tsconfig.json -t stylish && npx prettier . --check", "start:dev": "yarn build && node --async-stack-traces lib/index.js", "test": "ts-mocha --project ./tsconfig.json test/commands/**/*.ts", "test:integration": "NODE_ENV=harness ts-mocha --async-stack-traces --require test/integration/fixtures.ts --timeout 300000 --project ./tsconfig.json \"test/integration/**/*Test.ts\"", @@ -58,6 +58,7 @@ "humanize-duration-ts": "^2.1.1", "js-yaml": "^4.1.0", "jsdom": "^16.6.0", + "lru-cache": "^11.0.1", "matrix-appservice-bridge": "10.3.1", "nsfwjs": "^4.1.0", "parse-duration": "^1.0.2", @@ -69,5 +70,6 @@ }, "engines": { "node": ">=20.0.0" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/pkgs/by-name/mj/mjolnir/package.nix b/pkgs/by-name/mj/mjolnir/package.nix index 098ed9bf9b3a..215675d0f5cb 100644 --- a/pkgs/by-name/mj/mjolnir/package.nix +++ b/pkgs/by-name/mj/mjolnir/package.nix @@ -11,13 +11,13 @@ mkYarnPackage rec { pname = "mjolnir"; - version = "1.8.3"; + version = "1.9.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "refs/tags/v${version}"; - hash = "sha256-yD7QGsS2Em8Z95po9pGRUDmHgHe4z0j0Jnvy3IG7xKY="; + hash = "sha256-LK2CgMLDJHfr1+ejHYeJNw2ekCnUA8GHufZ6vbifzGQ="; }; patches = [ @@ -29,7 +29,7 @@ mkYarnPackage rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-05DqddK8+136Qq/JGeiITZkVJ8Dw9K9HfACKW86989U="; + hash = "sha256-1V7ooONt9j+4hk/3w6Dsv/SdWwa1xsLk97EwhuPegNo="; }; packageResolutions = { From 8373763e1cf4e67a0769021b749cd4344354b6a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 06:19:05 +0000 Subject: [PATCH 037/179] firebase-tools: 13.28.0 -> 13.29.1 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 700e3b9f6134..c76310cec6d3 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -8,19 +8,19 @@ }: let - version = "13.28.0"; + version = "13.29.1"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-bOuOBzEEfVi+0lGqKgZQVmxKUBWoWWdaQ1jlCR1xBcM="; + hash = "sha256-j6luT+L/vN9qaGjjeMW+8QGuzjJxzbn0sMGDjhqoeZA="; }; in buildNpmPackage { pname = "firebase-tools"; inherit version src; - npmDepsHash = "sha256-3wc1DPZ+yYlBtUTWpa4XFaetS7caNqX5JFSXkmzHyqg="; + npmDepsHash = "sha256-3+XeXK3VGIs4Foi9iW9Kho/Y0JsTQZ7p+582MPgdH1A="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From fa5d09824b718fd8c749ca2feeae886ed2a49a18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 06:37:39 +0000 Subject: [PATCH 038/179] opentelemetry-collector-builder: 0.115.0 -> 0.116.0 --- pkgs/tools/misc/opentelemetry-collector/builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index 53b9cf658a38..fc7500cb6e67 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.115.0"; + version = "0.116.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-wl0ThYbDTVLuN9FkrsHF1prydrPMIaiK/9s2Ipeqfik="; + hash = "sha256-1wFLeRbiNytPEe262TEhBrAOLUkbsdLzKYngN2S3O4E="; }; sourceRoot = "${src.name}/cmd/builder"; From a70782ddb4a9b7366a2becea10d796ebde22d875 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:37:19 -0300 Subject: [PATCH 039/179] element-desktop: 1.11.87 -> 1.11.89 https://github.com/element-hq/element-desktop/releases/tag/v1.11.88 https://github.com/element-hq/element-desktop/releases/tag/v1.11.89 --- .../networking/instant-messengers/element/pin.nix | 10 +++++----- .../el/element-web-unwrapped/element-web-pin.nix | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 2f12882e5ef0..7c765a5350d9 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.87"; + "version" = "1.11.89"; "hashes" = { - "desktopSrcHash" = "sha256-rIxuXMHQVJrbfWibpiIBmTkXKHrBqnTMiBYIP8VOIH4="; - "desktopYarnHash" = "05qs1an3mbqsfn1nmgwagp564lqvyrbkyj58z5h2cbczqbavnxxz"; - "webSrcHash" = "sha256-FcXYwYCx//fqWuUKRqTTntlT7jVBD1Heayg4T7ACHmc="; - "webYarnHash" = "0anamnfm5g4nj7wp18byi49x38aia490qfard2d34myzjgiby8v3"; + "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; + "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; + "webSrcHash" = "sha256-ErhxNbe3uM97cmiOLtDeQwJT8RMWD2NKQ+q/VPU9+js="; + "webYarnHash" = "1wma1d2z5b1lhlh0vbnp30255gn4hvjpczsprg3s4y30716gsm44"; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix new file mode 100644 index 000000000000..6bd45a77319d --- /dev/null +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -0,0 +1,7 @@ +{ + "version" = "1.11.89"; + "hashes" = { + "webSrcHash" = "sha256-K9i5MxTJaX359qsnpfXZBZiNHbhCEy25plUPVUtbGQs="; + "webYarnHash" = "164smvrq9937x0pql20zdqab5w35fcidbywkzlyc5g4w7iwkd9kx"; + }; +} From 773b01fb272f78516d8f92104ccb6a3f0b0cde60 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 18 Dec 2024 15:59:52 -0300 Subject: [PATCH 040/179] element-{web,desktop}: move to pkgs/by-name, element-desktop-wayland: drop --- .../element-desktop/element-desktop-pin.nix} | 2 -- .../el/element-desktop}/keytar/default.nix | 0 .../el/element-desktop}/keytar/pin.json | 0 .../el/element-desktop}/keytar/update.sh | 0 .../el/element-desktop/package.nix} | 11 +++++------ .../el/element-desktop}/seshat/default.nix | 0 .../el/element-desktop}/seshat/pin.json | 0 .../el/element-desktop}/seshat/update.sh | 0 .../el/element-desktop}/update.sh | 18 ++++++++++++++---- .../el/element-web-unwrapped/package.nix} | 3 ++- .../el/element-web/package.nix} | 0 pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 14 -------------- 13 files changed, 22 insertions(+), 28 deletions(-) rename pkgs/{applications/networking/instant-messengers/element/pin.nix => by-name/el/element-desktop/element-desktop-pin.nix} (57%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/keytar/default.nix (100%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/keytar/pin.json (100%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/keytar/update.sh (100%) rename pkgs/{applications/networking/instant-messengers/element/element-desktop.nix => by-name/el/element-desktop/package.nix} (94%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/seshat/default.nix (100%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/seshat/pin.json (100%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/seshat/update.sh (100%) rename pkgs/{applications/networking/instant-messengers/element => by-name/el/element-desktop}/update.sh (83%) rename pkgs/{applications/networking/instant-messengers/element/element-web.nix => by-name/el/element-web-unwrapped/package.nix} (98%) rename pkgs/{applications/networking/instant-messengers/element/element-web-wrapper.nix => by-name/el/element-web/package.nix} (100%) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix similarity index 57% rename from pkgs/applications/networking/instant-messengers/element/pin.nix rename to pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 7c765a5350d9..ed64279ccb16 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -3,7 +3,5 @@ "hashes" = { "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; - "webSrcHash" = "sha256-ErhxNbe3uM97cmiOLtDeQwJT8RMWD2NKQ+q/VPU9+js="; - "webYarnHash" = "1wma1d2z5b1lhlh0vbnp30255gn4hvjpczsprg3s4y30716gsm44"; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/keytar/default.nix rename to pkgs/by-name/el/element-desktop/keytar/default.nix diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/pkgs/by-name/el/element-desktop/keytar/pin.json similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/keytar/pin.json rename to pkgs/by-name/el/element-desktop/keytar/pin.json diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/by-name/el/element-desktop/keytar/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/keytar/update.sh rename to pkgs/by-name/el/element-desktop/keytar/update.sh diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/by-name/el/element-desktop/package.nix similarity index 94% rename from pkgs/applications/networking/instant-messengers/element/element-desktop.nix rename to pkgs/by-name/el/element-desktop/package.nix index 3bccfdec1d68..1afb094d7e5a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -13,9 +13,7 @@ element-web, sqlcipher, callPackage, - Security, - AppKit, - CoreServices, + darwin, desktopToDarwinBundle, useKeytar ? true, # command line arguments which are always set @@ -23,11 +21,11 @@ }: let - pinData = import ./pin.nix; + pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - keytar = callPackage ./keytar { inherit Security AppKit; }; - seshat = callPackage ./seshat { inherit CoreServices; }; + keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; + seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; }; electron = electron_33; in stdenv.mkDerivation ( @@ -146,6 +144,7 @@ stdenv.mkDerivation ( ''; passthru = { + # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop updateScript = ./update.sh; # TL;DR: keytar is optional while seshat isn't. diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/seshat/default.nix rename to pkgs/by-name/el/element-desktop/seshat/default.nix diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/pkgs/by-name/el/element-desktop/seshat/pin.json similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/seshat/pin.json rename to pkgs/by-name/el/element-desktop/seshat/pin.json diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/update.sh b/pkgs/by-name/el/element-desktop/seshat/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/seshat/update.sh rename to pkgs/by-name/el/element-desktop/seshat/update.sh diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/by-name/el/element-desktop/update.sh similarity index 83% rename from pkgs/applications/networking/instant-messengers/element/update.sh rename to pkgs/by-name/el/element-desktop/update.sh index 2a4ec5fcdec2..20251b2644a4 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/by-name/el/element-desktop/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." @@ -22,6 +22,8 @@ version="${version#v}" web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) +cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 + web_tmpdir=$(mktemp -d) trap 'rm -rf "$web_tmpdir"' EXIT @@ -42,14 +44,22 @@ wget -q "$desktop_src/yarn.lock" desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd -cat > pin.nix << EOF +cat > ../element-web-unwrapped/element-web-pin.nix << EOF { "version" = "$version"; "hashes" = { - "desktopSrcHash" = "$desktop_src_hash"; - "desktopYarnHash" = "$desktop_yarn_hash"; "webSrcHash" = "$web_src_hash"; "webYarnHash" = "$web_yarn_hash"; }; } EOF + +cat > element-desktop-pin.nix << EOF +{ + "version" = "$version"; + "hashes" = { + "desktopSrcHash" = "$desktop_src_hash"; + "desktopYarnHash" = "$desktop_yarn_hash"; + }; +} +EOF diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix similarity index 98% rename from pkgs/applications/networking/instant-messengers/element/element-web.nix rename to pkgs/by-name/el/element-web-unwrapped/package.nix index 1bfea7162dde..9a7ced0e8d51 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -10,7 +10,7 @@ }: let - pinData = import ./pin.nix; + pinData = import ./element-web-pin.nix; inherit (pinData.hashes) webSrcHash webYarnHash; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org @@ -83,3 +83,4 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { platforms = lib.platforms.all; }; }) + diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix b/pkgs/by-name/el/element-web/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix rename to pkgs/by-name/el/element-web/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 74e47c2d0be7..2cb6b7113f8f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -321,7 +321,7 @@ mapAliases { edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 elasticsearch7Plugins = elasticsearchPlugins; - # Electron + element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17 elixir_ls = elixir-ls; # Added 2023-03-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d203cce4a970..f9cbdba067b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,20 +2290,6 @@ with pkgs; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; - element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { - inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - }; - element-desktop-wayland = writeScriptBin "element-desktop" '' - #!/bin/sh - NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" - ''; - - element-web-unwrapped = callPackage ../applications/networking/instant-messengers/element/element-web.nix { }; - - element-web = callPackage ../applications/networking/instant-messengers/element/element-web-wrapper.nix { - conf = config.element-web.conf or { }; - }; - elm-github-install = callPackage ../tools/package-management/elm-github-install { }; espanso-wayland = espanso.override { From 8c4fbc5de0fb7d5fd847e845303abfe469055cd2 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:03:47 -0300 Subject: [PATCH 041/179] element-web: format with `nixfmt-rfc-style` --- .../el/element-web-unwrapped/package.nix | 135 ++++++++++-------- 1 file changed, 72 insertions(+), 63 deletions(-) diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index 9a7ced0e8d51..b03d2a2c79a8 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchYarnDeps -, jq -, yarn -, fixup-yarn-lock -, nodejs -, jitsi-meet +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + jq, + yarn, + fixup-yarn-lock, + nodejs, + jitsi-meet, }: let @@ -16,71 +17,79 @@ let disable_guests = true; # disable automatic guest account registration at matrix.org }; in -stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { - pname = "element-web"; +stdenv.mkDerivation ( + finalAttrs: + builtins.removeAttrs pinData [ "hashes" ] + // { + pname = "element-web"; - src = fetchFromGitHub { - owner = "element-hq"; - repo = "element-web"; - rev = "v${finalAttrs.version}"; - hash = webSrcHash; - }; + src = fetchFromGitHub { + owner = "element-hq"; + repo = "element-web"; + rev = "v${finalAttrs.version}"; + hash = webSrcHash; + }; - offlineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - sha256 = webYarnHash; - }; + offlineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + sha256 = webYarnHash; + }; - nativeBuildInputs = [ yarn fixup-yarn-lock jq nodejs ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + jq + nodejs + ]; - buildPhase = '' - runHook preBuild + buildPhase = '' + runHook preBuild - export VERSION=${finalAttrs.version} - yarn --offline build:res - yarn --offline build:module_system - yarn --offline build:bundle + export VERSION=${finalAttrs.version} + yarn --offline build:res + yarn --offline build:module_system + yarn --offline build:bundle - runHook postBuild - ''; + runHook postBuild + ''; - configurePhase = '' - runHook preConfigure + configurePhase = '' + runHook preConfigure - export HOME=$PWD/tmp - # with the update of openssl3, some key ciphers are not supported anymore - # this flag will allow those codecs again as a workaround - # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/element-hq/element-web/issues/21043 - export NODE_OPTIONS=--openssl-legacy-provider - mkdir -p $HOME + export HOME=$PWD/tmp + # with the update of openssl3, some key ciphers are not supported anymore + # this flag will allow those codecs again as a workaround + # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 + # and https://github.com/element-hq/element-web/issues/21043 + export NODE_OPTIONS=--openssl-legacy-provider + mkdir -p $HOME - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $offlineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules + fixup-yarn-lock yarn.lock + yarn config --offline set yarn-offline-mirror $offlineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules - runHook postConfigure - ''; + runHook postConfigure + ''; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - cp -R webapp $out - tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js - echo "${finalAttrs.version}" > "$out/version" - jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" + cp -R webapp $out + tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js + echo "${finalAttrs.version}" > "$out/version" + jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" - runHook postInstall - ''; - - meta = { - description = "Glossy Matrix collaboration client for the web"; - homepage = "https://element.io/"; - changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; - maintainers = lib.teams.matrix.members; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; -}) + runHook postInstall + ''; + meta = { + description = "Glossy Matrix collaboration client for the web"; + homepage = "https://element.io/"; + changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; + } +) From 64b85b80e49d965f4fdd8a90cd4a88c4ff4a8438 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:02:55 -0300 Subject: [PATCH 042/179] element-web: add back conf override option --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9cbdba067b0..cfc43e7f0993 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,6 +2290,10 @@ with pkgs; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; + element-web = callPackage ../by-name/el/element-web/package.nix { + conf = config.element-web.conf or { }; + }; + elm-github-install = callPackage ../tools/package-management/elm-github-install { }; espanso-wayland = espanso.override { From 03942a424b511c044d1b0c51e7f0aca7ec7122b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 19:47:08 +0000 Subject: [PATCH 043/179] docker-compose: 2.31.0 -> 2.32.1 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 5ec0a653155d..ca48c99ea9f6 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.31.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-l+xSd7eIpEy6A1mtx3WrcPQl7071IdJkbHKXbe4uFdA="; + hash = "sha256-b+HaFXi3Z2vOU2saEvg22uLHbJLdM4dGEZeI6lvI/dk="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-nBexI2hr+lKPe4HCYiNVtmc0Rl5Hhj/+TwSftYWVdQw="; + vendorHash = "sha256-AOLAyyg8ZFPjreK/PEY+TJy4puxqMCg5kjEyBfEfmPk="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 7461d3d025a53323a5e925a9c134a2ac34fe9f30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 20:11:01 +0000 Subject: [PATCH 044/179] stevenblack-blocklist: 3.14.139 -> 3.15.0 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 6b8a10dd59aa..8c236f81e94b 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.14.139"; + version = "3.15.0"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-rPK7Y7Upwdus0fCK4OZLpgx9MwRt6mWP8YjNmHA9vJ8="; + hash = "sha256-CMafExAcNPDOjFd518MHK1rWYhapP6eBIXKk6YAjJqc="; }; outputs = [ From 4de56433fcec35044b1bbc36a04d2de444c864e0 Mon Sep 17 00:00:00 2001 From: Arne Keller Date: Wed, 18 Dec 2024 21:46:17 +0100 Subject: [PATCH 045/179] python312Packages.pygit2: fix build with GCC 14 --- pkgs/development/python-modules/pygit2/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index f9310c711e5f..a9f0ad9ae17a 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -6,6 +6,7 @@ cached-property, cffi, fetchPypi, + fetchpatch, isPyPy, libgit2, pycparser, @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI="; }; + patches = [ + # fix for GCC 14 + (fetchpatch { + url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch"; + hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI="; + }) + ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; From 29aa091dbee4cb0b19a690d6b02464fdc49f4e24 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 21 Sep 2024 15:51:02 +0200 Subject: [PATCH 046/179] nixos/borgbackup: fix extraArgs shell expansion Signed-off-by: Sefa Eyeoglu --- .../manual/release-notes/rl-2505.section.md | 6 ++++ nixos/modules/services/backup/borgbackup.nix | 32 ++++++++++++------- nixos/tests/borgbackup.nix | 11 ++++++- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f60911ebe685..7570b9acb7ad 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -144,6 +144,12 @@ ``` This changed follows a deprecation period of one year started in NixOS 24.05 (see [PR #283818](https://github.com/NixOS/nixpkgs/pull/283818)). +- The values of `services.borgbackup.jobs.*.extraArgs` and other `extra*Args` options are now represented as Bash arrays. If these arguments were modified using `services.borgbackup.jobs.*.preHook`, they will need to be adjusted to append to these arrays, i.e. + ```diff + -extraCreateArgs="$extraCreateArgs --exclude /some/path" + +extraCreateArgs+=("--exclude" "/some/path") + ``` + - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream. - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 36f2274d5eaa..e01c8d03c6aa 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -20,8 +20,19 @@ let lib.concatStringsSep " " (lib.mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); + mkExtraArgs = cfg: + # Create BASH arrays of extra args + lib.concatLines + (lib.mapAttrsToList (name: values: '' + ${name}=(${values}) + '') + { inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs extraCompactArgs; }); + mkBackupScript = name: cfg: pkgs.writeShellScript "${name}-script" ('' set -e + + ${mkExtraArgs cfg} + on_exit() { exitStatus=$? @@ -46,35 +57,35 @@ let ${cfg.preHook} '' + lib.optionalString cfg.doInit '' # Run borg init if the repo doesn't exist yet - if ! borgWrapper list $extraArgs > /dev/null; then - borgWrapper init $extraArgs \ + if ! borgWrapper list "''${extraArgs[@]}" > /dev/null; then + borgWrapper init "''${extraArgs[@]}" \ --encryption ${cfg.encryption.mode} \ - $extraInitArgs + "''${extraInitArgs[@]}" ${cfg.postInit} fi '' + '' ( set -o pipefail ${lib.optionalString (cfg.dumpCommand != null) ''${lib.escapeShellArg cfg.dumpCommand} | \''} - borgWrapper create $extraArgs \ + borgWrapper create "''${extraArgs[@]}" \ --compression ${cfg.compression} \ --exclude-from ${mkExcludeFile cfg} \ --patterns-from ${mkPatternsFile cfg} \ - $extraCreateArgs \ + "''${extraCreateArgs[@]}" \ "::$archiveName$archiveSuffix" \ ${if cfg.paths == null then "-" else lib.escapeShellArgs cfg.paths} ) '' + lib.optionalString cfg.appendFailedSuffix '' - borgWrapper rename $extraArgs \ + borgWrapper rename "''${extraArgs[@]}" \ "::$archiveName$archiveSuffix" "$archiveName" '' + '' ${cfg.postCreate} '' + lib.optionalString (cfg.prune.keep != { }) '' - borgWrapper prune $extraArgs \ + borgWrapper prune "''${extraArgs[@]}" \ ${mkKeepArgs cfg} \ ${lib.optionalString (cfg.prune.prefix != null) "--glob-archives ${lib.escapeShellArg "${cfg.prune.prefix}*"}"} \ - $extraPruneArgs - borgWrapper compact $extraArgs $extraCompactArgs + "''${extraPruneArgs[@]}" + borgWrapper compact "''${extraArgs[@]}" "''${extraCompactArgs[@]}" ${cfg.postPrune} ''); @@ -120,7 +131,6 @@ let }; environment = { BORG_REPO = cfg.repo; - inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs extraCompactArgs; } // (mkPassEnv cfg) // cfg.environment; }; @@ -581,7 +591,7 @@ in { default = ""; example = '' # To add excluded paths at runtime - extraCreateArgs="$extraCreateArgs --exclude /some/path" + extraCreateArgs+=("--exclude" "/some/path") ''; }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index af7c12009c36..8105f592cf07 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -3,6 +3,8 @@ import ./make-test-python.nix ({ pkgs, ... }: let passphrase = "supersecret"; dataDir = "/ran:dom/data"; + subDir = "not_anything_here"; + excludedSubDirFile = "not_this_file_either"; excludeFile = "not_this_file"; keepFile = "important_file"; keepFileData = "important_data"; @@ -69,6 +71,7 @@ in { yearly = 5; }; exclude = [ "*/${excludeFile}" ]; + extraCreateArgs = [ "--exclude-caches" "--exclude-if-present" ".dont backup" ]; postHook = "echo post"; startAt = [ ]; # Do not run automatically }; @@ -166,8 +169,10 @@ in { ) client.succeed("chmod 0600 /root/id_ed25519.appendOnly") - client.succeed("mkdir -p ${dataDir}") + client.succeed("mkdir -p ${dataDir}/${subDir}") client.succeed("touch ${dataDir}/${excludeFile}") + client.succeed("touch '${dataDir}/${subDir}/.dont backup'") + client.succeed("touch ${dataDir}/${subDir}/${excludedSubDirFile}") client.succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}") with subtest("local"): @@ -180,6 +185,10 @@ in { client.fail( "{} list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'".format(borg) ) + # Make sure excludedSubDirFile has been excluded + client.fail( + "{} list '${localRepo}::${archiveName}' | grep -qF '${subDir}/${excludedSubDirFile}".format(borg) + ) # Make sure keepFile has the correct content client.succeed("{} extract '${localRepo}::${archiveName}'".format(borg)) assert "${keepFileData}" in client.succeed("cat ${dataDir}/${keepFile}") From 8592569c8064805c3b5668dc97f33808e1da9f10 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 15 Nov 2024 20:10:47 +0100 Subject: [PATCH 047/179] nixos/borgbackup: add Scrumplex as maintainer Signed-off-by: Sefa Eyeoglu --- nixos/modules/services/backup/borgbackup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index e01c8d03c6aa..a9a4564ad86b 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -246,7 +246,7 @@ let }; in { - meta.maintainers = with lib.maintainers; [ dotlambda ]; + meta.maintainers = with lib.maintainers; [ dotlambda Scrumplex ]; meta.doc = ./borgbackup.md; ###### interface From fea51825c478df673055a74b74ed84e786fcf0ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 04:43:54 +0000 Subject: [PATCH 048/179] chiaki-ng: 1.9.2 -> 1.9.3 --- pkgs/games/chiaki-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index be04bf3ec080..28520c26d4fe 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "chiaki-ng"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "streetpea"; repo = "chiaki-ng"; rev = "v${version}"; - hash = "sha256-UZIdRMHd5HJg/PNVL4pZM1VbW9dLqpHVTTuY0h5PHSY="; + hash = "sha256-0oclfGxlLlZMmpiYvsMV3ftn7Vir94G+5Xv0/B7YfPg="; fetchSubmodules = true; }; From 5576a3a45ad4beb5545e1ca94eb0b4e72b673549 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 07:09:04 +0000 Subject: [PATCH 049/179] opencommit: 3.2.1 -> 3.2.5 --- pkgs/by-name/op/opencommit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix index ae89601f8ce3..7708a3b1d644 100644 --- a/pkgs/by-name/op/opencommit/package.nix +++ b/pkgs/by-name/op/opencommit/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "opencommit"; - version = "3.2.1"; + version = "3.2.5"; src = fetchFromGitHub { owner = "di-sukharev"; repo = "opencommit"; rev = "v${version}"; - hash = "sha256-+uKb7qhQJEbuatPsewSGgVd5J6WtsrNO+hE59/KZIJI="; + hash = "sha256-6bC3irUyIppu7QVT3jGwMe+r/5WuHA0pLLH/gYORDOM="; }; - npmDepsHash = "sha256-6tzV4iP7YzlbqOTgYf9XoTmIFPSBug0wYDelc6wcbCA="; + npmDepsHash = "sha256-exjK00MuzBsjlW34seaaAj8s0bPrzi7zBdJqQ0SuIWM="; passthru.updateScript = nix-update-script { }; From f45ee9917f0a7d2d6e8029658208fb7e43f10876 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 21 Dec 2023 20:45:56 +1000 Subject: [PATCH 050/179] goat-cli: init at 1.1.0 --- pkgs/by-name/go/goat-cli/mock-fix.patch | 12 +++++++ pkgs/by-name/go/goat-cli/package.nix | 43 +++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/by-name/go/goat-cli/mock-fix.patch create mode 100644 pkgs/by-name/go/goat-cli/package.nix diff --git a/pkgs/by-name/go/goat-cli/mock-fix.patch b/pkgs/by-name/go/goat-cli/mock-fix.patch new file mode 100644 index 000000000000..4033e714c7db --- /dev/null +++ b/pkgs/by-name/go/goat-cli/mock-fix.patch @@ -0,0 +1,12 @@ +diff --git a/pkg/goatfile/unmarshal_test.go b/pkg/goatfile/unmarshal_test.go +index 089e89f..5b4191b 100644 +--- a/pkg/goatfile/unmarshal_test.go ++++ b/pkg/goatfile/unmarshal_test.go +@@ -8,7 +8,6 @@ import ( + + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" +- "github.com/studio-b12/goat/mocks" + "github.com/studio-b12/goat/pkg/set" + ) + diff --git a/pkgs/by-name/go/goat-cli/package.nix b/pkgs/by-name/go/goat-cli/package.nix new file mode 100644 index 000000000000..3c64d184b4f2 --- /dev/null +++ b/pkgs/by-name/go/goat-cli/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + fetchpatch, +}: + +buildGoModule rec { + pname = "goat-cli"; + version = "1.1.0"; + + src = fetchFromGitHub { + repo = "goat"; + owner = "studio-b12"; + rev = "v${version}"; + hash = "sha256-H7ea3XOBfQ7bIX5SbxPd+fcSlMurSWXGXe+/LsqSc0A="; + }; + + vendorHash = "sha256-DtEXgGYSkWO876so6LEOkhVwDt/zrflDZdY4O2lz1mw="; + + ldflags = [ + "-s" + "-w" + "-X github.com/studio-b12/goat/internal/version.Version=${version}" + "-X github.com/studio-b12/goat/internal/version.CommitHash=${src.rev}" + ]; + + patches = [ + ./mock-fix.patch + ]; + + # Checks currently fail because of an issue with github.com/studio-b12/goat/mocks + doCheck = false; + + meta = { + description = "Integration testing tool for HTTP APIs using a simple script language"; + homepage = "https://studio-b12.github.io/goat/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ kashw2 ]; + mainProgram = "goat"; + }; + +} From 67d1c98c12dde5df544595a4850748f11b7dc43a Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 21 Dec 2023 21:16:45 +1000 Subject: [PATCH 051/179] restman: init at 0.3 --- pkgs/by-name/re/restman/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/re/restman/package.nix diff --git a/pkgs/by-name/re/restman/package.nix b/pkgs/by-name/re/restman/package.nix new file mode 100644 index 000000000000..e36aa81cf31c --- /dev/null +++ b/pkgs/by-name/re/restman/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + restman, +}: + +buildGoModule rec { + pname = "restman"; + version = "0.3.0"; + + src = fetchFromGitHub { + repo = "restman"; + owner = "jackMort"; + rev = "v${version}"; + hash = "sha256-KN3iahDdPSHPnGEacsmaVMRNI3mV9qrH3HyJOTtB2hA="; + }; + + vendorHash = "sha256-hXd7E6yowuY3+ZpGyCzlcqwFqFrQzXBWYRMjsrxBlwI="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + doInstallCheck = true; + + passthru.tests = { + version = testers.testVersion { + package = restman; + version = "restman version ${version}"; + command = "restman --version"; + }; + }; + + meta = { + description = "CLI for streamlined RESTful API testing and management"; + homepage = "https://github.com/jackMort/Restman"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kashw2 ]; + mainProgram = "restman"; + }; +} From 86612e3e952587788f9f480d65b50e49eebf8bc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 09:03:09 +0000 Subject: [PATCH 052/179] xpipe: 13.4.3 -> 13.4.4 --- pkgs/by-name/xp/xpipe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 040946ca2c6d..7afc78eda700 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-dnTivsRK5cEDiY8lOWc6XA8T7IJ9EDhPD36i9+G/jsM="; + x86_64-linux = "sha256-6h6Rtmo9XV9fk6G+ff5A1apwmJ7L5s+pTJDS759OOgk="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "13.4.3"; + version = "13.4.4"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; From d1b63e603c1b2aa288770c3a9085d1fe9df726bb Mon Sep 17 00:00:00 2001 From: Ryota Kameoka Date: Thu, 19 Dec 2024 19:13:02 +0900 Subject: [PATCH 053/179] gh-gei: 1.9.0 -> 1.11.0 --- pkgs/by-name/gh/gh-gei/deps.json | 64 +++++++++++++++--------------- pkgs/by-name/gh/gh-gei/package.nix | 6 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/gh/gh-gei/deps.json b/pkgs/by-name/gh/gh-gei/deps.json index fcef88bbd13e..a009cc4c2606 100644 --- a/pkgs/by-name/gh/gh-gei/deps.json +++ b/pkgs/by-name/gh/gh-gei/deps.json @@ -2,161 +2,161 @@ { "pname": "AWSSDK.Core", "version": "3.7.300.11", - "sha256": "1460yndb9gfy4qx36g4lxaqxzb3p19kfqp7czi28i1p7z7nh38vi" + "hash": "sha256-caMB7fnnhohE/Oxc7GYKd6zfseqUPDM6Jt69tJr1wJA=" }, { "pname": "AWSSDK.S3", "version": "3.7.304", - "sha256": "0hjls7477rm3g7bvd8m7ch37lmllnsv71x1lhjjn8g2nk7d3lk0q" + "hash": "sha256-GEw62plWPGSlhDT0cLa2lFZ6BmSnorbXeaPmc8jRVEI=" }, { "pname": "Azure.Core", "version": "1.36.0", - "sha256": "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn" + "hash": "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI=" }, { "pname": "Azure.Storage.Blobs", "version": "12.19.1", - "sha256": "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k" + "hash": "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U=" }, { "pname": "Azure.Storage.Common", "version": "12.18.1", - "sha256": "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k" + "hash": "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "1.1.1", - "sha256": "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw" + "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "6.0.0", - "sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3" + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.3.4", - "sha256": "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58" + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.Common", "version": "4.7.0", - "sha256": "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w" + "hash": "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", "version": "4.7.0", - "sha256": "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh" + "hash": "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M=" }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "7.0.0", - "sha256": "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p" + "hash": "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "7.0.0", - "sha256": "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7" + "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA=" }, { "pname": "Microsoft.Extensions.Http", "version": "7.0.0", - "sha256": "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw" + "hash": "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q=" }, { "pname": "Microsoft.Extensions.Logging", "version": "7.0.0", - "sha256": "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf" + "hash": "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "7.0.0", - "sha256": "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs" + "hash": "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74=" }, { "pname": "Microsoft.Extensions.Options", "version": "7.0.0", - "sha256": "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6" + "hash": "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "7.0.0", - "sha256": "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80" + "hash": "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", - "sha256": "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7" + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "Polly", "version": "7.2.4", - "sha256": "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1" + "hash": "sha256-wQvK3XmQlplyI/duVkhM+iRhikGBLwrQ8cpcFJSIcFM=" }, { "pname": "System.Collections.Immutable", "version": "7.0.0", - "sha256": "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm" + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" }, { "pname": "System.CommandLine", "version": "2.0.0-beta4.22272.1", - "sha256": "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd" + "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" }, { "pname": "System.CommandLine.NamingConventionBinder", "version": "2.0.0-beta4.22272.1", - "sha256": "07hcz8jcqla4fs7cd2r0lanqsa13nl9l37spby9bc5p2apkyrz0m" + "hash": "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", - "sha256": "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy" + "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" }, { "pname": "System.IO.Hashing", "version": "6.0.0", - "sha256": "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41" + "hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE=" }, { "pname": "System.Linq.Async", "version": "6.0.1", - "sha256": "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq" + "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" }, { "pname": "System.Memory.Data", "version": "1.0.2", - "sha256": "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay" + "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" }, { "pname": "System.Reflection.Metadata", "version": "7.0.0", - "sha256": "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v" + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, { "pname": "System.Text.Encodings.Web", "version": "4.7.2", - "sha256": "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9" + "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" }, { "pname": "System.Text.Json", "version": "4.7.2", - "sha256": "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4" + "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" } ] diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 0f3fa3aefe4f..a3b954862c1a 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -6,16 +6,16 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "github"; repo = pname; rev = "v${version}"; - hash = "sha256-6lEEeAYrMB9wwATsORuaS21wLOB+gq/od88FobSse50="; + hash = "sha256-hUURXPKhiI3n1BrW8IzVVmPuJyO4AxM8D5uluaJXk+4="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "src/gei/gei.csproj"; nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. From fdc86d67de321be06d9c96c5dced29369281bfd5 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 19 Dec 2024 19:08:53 +0800 Subject: [PATCH 054/179] v2rayn: 7.3.2 -> 7.4.1 --- pkgs/by-name/v2/v2rayn/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index a5d5596a6746..e0a13d03aedd 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -15,16 +15,17 @@ makeDesktopItem, copyDesktopItems, bash, + xorg, }: buildDotnetModule rec { pname = "v2rayn"; - version = "7.3.2"; + version = "7.4.1"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-mWfWpleUVbq6Z31oh6QoG0j9eT3d7yF6z7e4lRe6+cM="; + hash = "sha256-mtmuEwZy72LPYFf7hzE8TYiSh2kK6xe2CRdkOSbg2h4="; }; projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"; @@ -32,14 +33,8 @@ buildDotnetModule rec { nugetDeps = ./deps.json; postPatch = '' - substituteInPlace v2rayN/AmazTool/UpgradeApp.cs \ - --replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");' - substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \ - --replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");' substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \ --replace-fail "/bin/bash" "${bash}/bin/bash" - substituteInPlace v2rayN/ServiceLib/ServiceLib.csproj \ - --replace-fail "0.16.20" "0.16.14" ''; dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ]; @@ -66,6 +61,16 @@ buildDotnetModule rec { (lib.getLib stdenv.cc.cc) ]; + runtimeDeps = [ + xorg.libX11 + xorg.libXrandr + xorg.libXi + xorg.libICE + xorg.libSM + xorg.libXcursor + xorg.libXext + ]; + postBuild = let selectSystem = From cee4fb1d82b382b7f62edf07dae5879e104047fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 12:44:38 +0000 Subject: [PATCH 055/179] osv-scanner: 1.9.1 -> 1.9.2 --- pkgs/by-name/os/osv-scanner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index 10803f166fda..bc2bf475698e 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-s288EHtF/YRkPVwe7b1+q/1ky8tQdHvzb8GaOPpRqTw="; + hash = "sha256-Db5AgFvyrUOlW+1rcw8jPUzTBwQcFelLk5Rqk9HsbCo="; }; - vendorHash = "sha256-DNUkUmxzej/NDwJ3lgPek/6C3/ytjlHmFIb1IvKvAQs="; + vendorHash = "sha256-4e+aEOo/hu2lC0c1sT8XJXdjrlcsqmPjpgvvdakHnmc="; subPackages = [ "cmd/osv-scanner" From b2e62b9f5f6bd0ffcf992f4c2ef06867e3e08d36 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 19 Dec 2024 13:54:20 +0100 Subject: [PATCH 056/179] mautrix-whatsapp: 0.11.1 -> 0.11.2 https://github.com/mautrix/whatsapp/releases/tag/v0.11.2 --- pkgs/by-name/ma/mautrix-whatsapp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index b65664d89dd3..f0b4ec1f0654 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -13,19 +13,19 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-yl/vDshjbJqGj6Kwhl6VnosbyrDCwt/0f3kHaxjYJmU="; + hash = "sha256-3S4aNoxK99iExhTJQP/JNq0GajCUjbdq4cUgCBudyXI="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-Uv4xoyBmmC3pCiJv5bhof73y30e52mdqfUZ5GORjMUM="; + vendorHash = "sha256-9iX+pzken+/7+nqYa71rcc1olCdpmu3UfR09ag3KSKs="; doCheck = false; From dd44a7a1ab6b1f9f9ea47446830abfc671cfdcb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 13:18:28 +0000 Subject: [PATCH 057/179] mieru: 3.7.0 -> 3.9.0 --- pkgs/by-name/mi/mieru/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 8f23dbfabb25..ce770989c8e6 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mieru"; - version = "3.7.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-VFQWiihwd0YiLpgTxKUjVd+IkGivsa4jI/jb5ckjFt8="; + hash = "sha256-59TWABRIH3FEOyLvZ+jn7b3jhI0comjU4Mrl4Ggx2eA="; }; - vendorHash = "sha256-woQoqYjdv2TZo66IwNkSHzIHFlu9JH8q/RXGyLlnTTc="; + vendorHash = "sha256-hSTKhn39xKZx1N9x66EH/ql4oP4qn0eysGTbUk9mRAk="; proxyVendor = true; ldflags = [ From a8b6ce9e7332a3c890be52eb5ef386c40bae1b6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 13:31:27 +0000 Subject: [PATCH 058/179] wasm-tools: 1.221.2 -> 1.222.0 --- pkgs/by-name/wa/wasm-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index a9980c2e6cfe..3b520c2d3f6c 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,19 +6,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.221.2"; + version = "1.222.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-agntGQkwXNMJSm7AgjhYDeWyCxCh/0edNxJgvbeUyfU="; + hash = "sha256-mSDbdmepLUiwqEjNfrG89lnt14IJa6hDwnnRea/Asl8="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-il9Zdj50XBMCxiOyQwyToOtaP34hcklOwlDuVGEmyVY="; + cargoHash = "sha256-SqqOPFR+MkZTZ2eD/X9dcLGzxDQ0BOD1B67rhzCQ/PI="; cargoBuildFlags = [ "--package" "wasm-tools" From aa2ffd2468e0211e531ff1da6310e62dedd705b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 14:31:28 +0000 Subject: [PATCH 059/179] intentrace: 0.2.6 -> 0.4.1 --- pkgs/by-name/in/intentrace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index fb600e8bf41b..8297f930b66a 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.2.6"; + version = "0.4.1"; in rustPlatform.buildRustPackage { inherit version; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; rev = "refs/tags/v${version}"; - hash = "sha256-e47hauVg5Ncp0C5y6RkfKfxMHbBvpKrVoUq3aJxTf2E="; + hash = "sha256-9BlCDtWnBDJuo6ovDi347jAQSOG8LizJAyQ/xN+HJ0w="; }; - cargoHash = "sha256-MAbOEJdMkt6efTGdmimMpYAx39JnQlnOlbIHIGICgp8="; + cargoHash = "sha256-eJlAQpkI+RgfpDJGP9evWH28nU891PF4jeRpf2Os4Ts="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; From 603f344acc9164a2486a127d9aeb4cf95c9a7ba8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 19 Dec 2024 11:31:24 +0100 Subject: [PATCH 060/179] softmaker-office-nx: init at 1222 --- .../applications/office/softmaker/generic.nix | 2 +- .../office/softmaker/softmaker-office-nx.nix | 32 +++++++++++++++++++ ...tmaker_office.nix => softmaker-office.nix} | 0 pkgs/top-level/all-packages.nix | 17 ++++++++-- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/office/softmaker/softmaker-office-nx.nix rename pkgs/applications/office/softmaker/{softmaker_office.nix => softmaker-office.nix} (100%) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index a3fee9a114de..b92a994bd701 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { inherit pname src; - version = "${edition}.${version}"; + version = if edition != "" then "${edition}.${version}" else version; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/applications/office/softmaker/softmaker-office-nx.nix b/pkgs/applications/office/softmaker/softmaker-office-nx.nix new file mode 100644 index 000000000000..f6b152df6883 --- /dev/null +++ b/pkgs/applications/office/softmaker/softmaker-office-nx.nix @@ -0,0 +1,32 @@ +{ + callPackage, + fetchurl, + + # This is a bit unusual, but makes version and hash easily + # overridable. This is useful when the upstream archive was replaced + # and nixpkgs is not in sync yet. + officeVersion ? { + version = "1222"; + edition = ""; + hash = "sha256-8ya9RYpd9G5SITYOpvhxjQE8ieV8TuAApkjNwCf9nHs="; + }, + + ... +}@args: + +callPackage ./generic.nix ( + args + // rec { + inherit (officeVersion) version edition; + + pname = "softmaker-office-nx"; + suiteName = "SoftMaker Office NX"; + + src = fetchurl { + inherit (officeVersion) hash; + url = "https://www.softmaker.net/down/softmaker-office-nx-${version}-amd64.tgz"; + }; + + archive = "officenx.tar.lzma"; + } +) diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker-office.nix similarity index 100% rename from pkgs/applications/office/softmaker/softmaker_office.nix rename to pkgs/applications/office/softmaker/softmaker-office.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80c4c74d6161..fbcb1b34709e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13945,7 +13945,12 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; + inherit + ({ + freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; + }) + freeoffice + ; inherit (xorg) xlsfonts; @@ -14958,7 +14963,15 @@ with pkgs; smtube = libsForQt5.callPackage ../applications/video/smtube { }; - softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; + inherit + ({ + softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { }; + softmaker-office-nx = callPackage ../applications/office/softmaker/softmaker-office-nx.nix { }; + }) + softmaker-office + softmaker-office-nx + ; + synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { inherit (darwin.apple_sdk.frameworks) CoreServices Security; From 1d5dcb8bed58e95529fcf97b3b0987e82f1b720a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:12:24 -0300 Subject: [PATCH 061/179] element-desktop: remove darwin frameworks, already part of stdenv --- pkgs/by-name/el/element-desktop/keytar/default.nix | 9 +-------- pkgs/by-name/el/element-desktop/package.nix | 5 ++--- pkgs/by-name/el/element-desktop/seshat/default.nix | 4 +--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix index 993bbcd2068f..4b9411b8f75f 100644 --- a/pkgs/by-name/el/element-desktop/keytar/default.nix +++ b/pkgs/by-name/el/element-desktop/keytar/default.nix @@ -8,8 +8,6 @@ pkg-config, libsecret, xcbuild, - Security, - AppKit, fetchNpmDeps, npmHooks, }: @@ -36,12 +34,7 @@ stdenv.mkDerivation rec { npmHooks.npmConfigHook ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - AppKit - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 1afb094d7e5a..f0f92cccb0df 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -13,7 +13,6 @@ element-web, sqlcipher, callPackage, - darwin, desktopToDarwinBundle, useKeytar ? true, # command line arguments which are always set @@ -24,8 +23,8 @@ let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; - seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; }; + keytar = callPackage ./keytar { }; + seshat = callPackage ./seshat { }; electron = electron_33; in stdenv.mkDerivation ( diff --git a/pkgs/by-name/el/element-desktop/seshat/default.nix b/pkgs/by-name/el/element-desktop/seshat/default.nix index 800650ce5b66..5e3bb3f0aa07 100644 --- a/pkgs/by-name/el/element-desktop/seshat/default.nix +++ b/pkgs/by-name/el/element-desktop/seshat/default.nix @@ -3,13 +3,11 @@ stdenv, rustPlatform, fetchFromGitHub, - rust, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, - CoreServices, fetchYarnDeps, removeReferencesTo, }: @@ -37,7 +35,7 @@ rustPlatform.buildRustPackage rec { yarn fixup-yarn-lock ]; - buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; + buildInputs = [ sqlcipher ]; npm_config_nodedir = nodejs; From 31b25d3f37e8fc32a598df8eb7523c21e2c8083d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 19 Dec 2024 21:46:27 +0100 Subject: [PATCH 062/179] solanum: unstable-2022-07-12 -> 0-unstable-2024-07-24 --- pkgs/servers/irc/solanum/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index da41c55c7e7e..ed21b5ab0991 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -10,18 +10,19 @@ pkg-config, sqlite, util-linux, + unstableGitUpdater, nixosTests, }: stdenv.mkDerivation rec { pname = "solanum"; - version = "unstable-2022-07-12"; + version = "0-unstable-2024-07-24"; src = fetchFromGitHub { owner = "solanum-ircd"; - repo = pname; - rev = "860187d02895fc953de3475da07a7a06b9380254"; - hash = "sha256-g8hXmxTfcPDmQ/cu4AI/iJfrhPLaQJEAeMdDhNDsVXs="; + repo = "solanum"; + rev = "4e89f6603d63b2f8dfdec7a83161fb0343236349"; + hash = "sha256-kUgB0Q+U6jx8Xyh1DSv8D7+Q9tC2wK3aaNt4At5chFQ="; }; patches = [ @@ -68,7 +69,10 @@ stdenv.mkDerivation rec { # make[4]: *** [Makefile:634: solanum] Error 1 enableParallelInstalling = false; - passthru.tests = { inherit (nixosTests) solanum; }; + passthru = { + tests = { inherit (nixosTests) solanum; }; + updateScript = unstableGitUpdater { }; + }; meta = with lib; { description = "IRCd for unified networks"; From effaa4b3b8f0e5cce17aaa2afef7dadefc08c99a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 00:33:50 +0000 Subject: [PATCH 063/179] uiua-unstable: 0.14.0-rc.2 -> 0.14.0-rc.3 --- pkgs/by-name/ui/uiua/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index edde8a47862c..b6afc2cbdf65 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.14.0-rc.2"; + version = "0.14.0-rc.3"; rev = version; - hash = "sha256-8jYoZpzepgqeM3EsyJguoU6LVPE3kywbE20Nz/8/fTQ="; - cargoHash = "sha256-5narrhVxM2Yl6hZIfFijxST3jfy5q0ox3Y7v+2VggUE="; + hash = "sha256-znHHohWMoVttubvYx5h3b7pQcQVYhn3nZLFoHrJsits="; + cargoHash = "sha256-d+N5ij5zbQRZwkLtwLAM7BY82G/tNsdkUb6/7wnD51g="; updateScript = ./update-unstable.sh; } From c382a27bf484e9e56d94e234b90e7646dce5be16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 01:05:29 +0000 Subject: [PATCH 064/179] fscan: 1.8.4 -> 2.0.0-build1 --- pkgs/by-name/fs/fscan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fs/fscan/package.nix b/pkgs/by-name/fs/fscan/package.nix index 58c348bd765e..20449b048641 100644 --- a/pkgs/by-name/fs/fscan/package.nix +++ b/pkgs/by-name/fs/fscan/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "fscan"; - version = "1.8.4"; + version = "2.0.0-build1"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; rev = version; - hash = "sha256-5uFSvEkTBy0veMdeeg9BmSqu+qSqCwuozK0J3kerAdE="; + hash = "sha256-ZJVdjdON7qgjxWU8/eOsmct0g/xr77fEH3PfV4JUOdw="; }; - vendorHash = "sha256-FFYqvGEFe7sUEb4G3ApQOuYoiDXeA54P7spmKfRiEF0="; + vendorHash = "sha256-WDq08flKiMCN4SS9xHH3B0nCX6us6huX8SF9BPuNzoo="; meta = with lib; { description = "Intranet comprehensive scanning tool"; From 94fe0f5305b3737804acd05fbc2400cf008c9552 Mon Sep 17 00:00:00 2001 From: Naser Aleisa Date: Fri, 20 Dec 2024 08:19:44 +0300 Subject: [PATCH 065/179] rofi-screenshot: 2023-07-02 -> 2024-09-27 --- pkgs/by-name/ro/rofi-screenshot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/rofi-screenshot/package.nix b/pkgs/by-name/ro/rofi-screenshot/package.nix index be23fefbc12e..b37ebb5895be 100644 --- a/pkgs/by-name/ro/rofi-screenshot/package.nix +++ b/pkgs/by-name/ro/rofi-screenshot/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rofi-screenshot"; - version = "2023-07-02"; + version = "2024-09-27"; src = fetchFromGitHub { owner = "ceuk"; repo = pname; - rev = "365cfa51c6c7deb072d98d7bfd68cf4038bf2737"; - hash = "sha256-M1cab+2pOjZ2dElMg0Y0ZrIxRE0VwymVwcElgzFrmVs="; + rev = "09a07d9c2ff2efbf75b1753bb412f4f8f086708f"; + hash = "sha256-3UpYdXAX3LD1ZAQ429JkzWWooiBpuf/uPf0CRh5EXd8="; }; nativeBuildInputs = [ makeWrapper ]; From c5b1a6c167129998a93c3a069a97735210fbb54f Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 20 Dec 2024 14:53:42 +0900 Subject: [PATCH 066/179] pnpm: 9.15.0 -> 9.15.1 Signed-off-by: misilelab --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index e6225bcd8296..64113a058430 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -12,8 +12,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.15.0"; - hash = "sha256-Caj+MaNP2nBjVGgGGfQAL0zO9trf+TJA0k72yDHw/Sg="; + version = "9.15.1"; + hash = "sha256-nlNOcK/vBjdPYSa0S9pXYJRxNc4WowrvEBDpZft+Pj4="; }; }; From b583f03b4d08beda7c5d084feee537bff0749589 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 19 Dec 2024 12:43:20 +0100 Subject: [PATCH 067/179] rerun: 0.20.2 -> 0.21.0 Diff: https://github.com/rerun-io/rerun/compare/0.20.2...0.21.0 Changelog: https://github.com/rerun-io/rerun/blob/0.21.0/CHANGELOG.md --- pkgs/by-name/re/rerun/package.nix | 74 +++++++++++-------- pkgs/by-name/re/rerun/tests.patch | 16 ---- .../python-modules/rerun-sdk/default.nix | 41 +++++----- 3 files changed, 63 insertions(+), 68 deletions(-) delete mode 100644 pkgs/by-name/re/rerun/tests.patch diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 68f84fb95f45..6104fa868e8a 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -1,36 +1,51 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, - pkg-config, - stdenv, + + # nativeBuildInputs binaryen, - rustfmt, lld, - darwin, + pkg-config, + protobuf, + rustfmt, + + # buildInputs freetype, glib, gtk3, libxkbcommon, openssl, - protobuf, vulkan-loader, wayland, + apple-sdk_11, + + versionCheckHook, + + # passthru + nix-update-script, python3Packages, }: rustPlatform.buildRustPackage rec { pname = "rerun"; - version = "0.20.2"; + version = "0.21.0"; + src = fetchFromGitHub { owner = "rerun-io"; repo = "rerun"; - rev = "refs/tags/${version}"; - hash = "sha256-AoI+BKDqHRsBrZAAwrE17xCduIP9wI7WPSSpn7SMz/M="; + tag = version; + hash = "sha256-U+Q8u1XKBD9c49eXAgc5vASKytgyAEYyYv8XNfftlZU="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-LB8P9ceHN4zq+8qv1h0nDKW9FVTEbSrX/Zbv2WB29ck="; + # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work + postPatch = '' + substituteInPlace rerun_py/build.rs \ + --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' + ''; + + cargoHash = "sha256-d68dNAAGY+a0DpL82S/qntu2XOsoVqHpfU2L9NcoJQc="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; @@ -57,18 +72,12 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Metal - darwin.apple_sdk.frameworks.QuartzCore - darwin.apple_sdk.frameworks.Security - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]; + # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole" + # ld: symbol(s) not found for architecture x86_64 + apple-sdk_11 + ]; addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( lib.optionals stdenv.hostPlatform.isLinux [ @@ -97,21 +106,28 @@ rustPlatform.buildRustPackage rec { postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; - # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work - patches = [ ./tests.patch ]; - passthru.tests = { - inherit (python3Packages) rerun-sdk; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (python3Packages) rerun-sdk; + }; }; - meta = with lib; { + meta = { description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate. Built in Rust using egui"; homepage = "https://github.com/rerun-io/rerun"; - changelog = "https://github.com/rerun-io/rerun/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ + changelog = "https://github.com/rerun-io/rerun/blob/${src.tag}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ SomeoneSerge robwalt ]; diff --git a/pkgs/by-name/re/rerun/tests.patch b/pkgs/by-name/re/rerun/tests.patch deleted file mode 100644 index 69a5ad5399b7..000000000000 --- a/pkgs/by-name/re/rerun/tests.patch +++ /dev/null @@ -1,16 +0,0 @@ - rerun_py/build.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rerun_py/build.rs b/rerun_py/build.rs -index 3d292c55b..28e54f06b 100644 ---- a/rerun_py/build.rs -+++ b/rerun_py/build.rs -@@ -17,7 +17,7 @@ fn main() { - #[cfg(not(target_os = "windows"))] - let rerun_bin = std::env::current_dir() - .expect("std::env::current_dir() failed") -- .join("rerun_sdk/rerun_cli/rerun"); -+ .join("rerun_sdk/rerun"); - - if !rerun_bin.exists() { - eprintln!("ERROR: Expected to find `rerun` at `{rerun_bin:?}`."); diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index ff2e98adc578..c42d58374018 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -1,21 +1,25 @@ { - buildPythonPackage, lib, - rustPlatform, stdenv, + buildPythonPackage, + rerun, + python, + + # nativeBuildInputs + rustPlatform, + + # dependencies attrs, - darwin, numpy, + opencv4, pillow, pyarrow, - rerun, - torch, - typing-extensions, - pytestCheckHook, - python, - libiconv, semver, - opencv4, + typing-extensions, + + # tests + pytestCheckHook, + torch, }: buildPythonPackage { @@ -26,7 +30,7 @@ buildPythonPackage { src version cargoDeps - patches + postPatch ; nativeBuildInputs = [ @@ -35,23 +39,14 @@ buildPythonPackage { rerun ]; - buildInputs = - [ - libiconv # No-op on Linux, necessary on Darwin. - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreServices - ]; - - propagatedBuildInputs = [ + dependencies = [ attrs numpy + opencv4 pillow pyarrow - typing-extensions semver - opencv4 + typing-extensions ]; buildAndTestSubdir = "rerun_py"; From 913935d3577d0572034d0c6abf63942ac0982797 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 19 Dec 2024 18:45:47 +0100 Subject: [PATCH 068/179] csdr: fix build with GCC 14 for ARM --- pkgs/by-name/cs/csdr/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix index 9170ea63cd0b..76d137b49e1f 100644 --- a/pkgs/by-name/cs/csdr/package.nix +++ b/pkgs/by-name/cs/csdr/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdVzeTTIvDQIXRdcz/vpQu/fUgtE8nx1kIEfoiwxrUg="; }; + postPatch = '' + # function is not defined in any headers but used in libcsdr.c + echo "int errhead();" >> src/predefined.h + ''; + nativeBuildInputs = [ cmake pkg-config From 5df9852ab27d45979c15ce36485e873b78b7b87b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:31:26 +0000 Subject: [PATCH 069/179] tt-rss: 0-unstable-2024-11-04 -> 0-unstable-2024-12-20 --- pkgs/servers/tt-rss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index b1b0c1d68527..058d8019b4d6 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "0-unstable-2024-11-04"; + version = "0-unstable-2024-12-20"; src = fetchgit { url = "https://git.tt-rss.org/fox/tt-rss.git"; - rev = "42ebdb027ec249fb8e693c41d7ee80ecdc68d6ec"; - hash = "sha256-QN7CwUufQSFlFde0NebO/kOYtEZCyL0ut+CNEpJMIMA="; + rev = "7b727156780236cb639c52e45d07cc80c1f2b0d3"; + hash = "sha256-b3z1cfM0El6yW7sCq8FSoN0sNa07HA4zLSUrEFX8ICM="; }; installPhase = '' From f2a92b40588fe2e1f046631c3e28ecfa573f150c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 13:09:02 +0000 Subject: [PATCH 070/179] foliate: 3.2.0 -> 3.2.1 --- pkgs/by-name/fo/foliate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/foliate/package.nix b/pkgs/by-name/fo/foliate/package.nix index ec32c78ff9ef..6dd3db577152 100644 --- a/pkgs/by-name/fo/foliate/package.nix +++ b/pkgs/by-name/fo/foliate/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "johnfactotum"; repo = "foliate"; rev = "refs/tags/${version}"; - hash = "sha256-y4c/nlFk0hlr773/O2yvW7VzUx0NZWpcDtk8b9wlL2s="; + hash = "sha256-NU4lM+J5Tpd9Fl+eVbBy7WnCQ6LJ7oeWVkBxp6euTHU="; fetchSubmodules = true; }; From 44cdb6bca76de00a0fc9c84b73e85a75cf6fac75 Mon Sep 17 00:00:00 2001 From: Maj Fontana Date: Fri, 20 Dec 2024 14:15:30 +0100 Subject: [PATCH 071/179] welle-io: enable FLAC support --- pkgs/applications/radio/welle-io/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 5a4ce6a9bca1..6f3e82e93022 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -17,6 +17,8 @@ fftwSinglePrec, lame, mpg123, + withFlac ? true, + flac, }: stdenv.mkDerivation rec { @@ -48,12 +50,12 @@ stdenv.mkDerivation rec { qt5compat rtl-sdr soapysdr-with-plugins - ]; + ] ++ lib.optional withFlac flac; cmakeFlags = [ "-DRTLSDR=true" "-DSOAPYSDR=true" - ]; + ] ++ lib.optional withFlac "-DFLAC=true"; meta = { description = "DAB/DAB+ Software Radio"; From 8d33e453a11c20ea0a6b3362b47cafc80279e6bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 13:28:47 +0000 Subject: [PATCH 072/179] inputplumber: 0.39.2 -> 0.40.0 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index dbaacd37d51d..4738aa6a4d91 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.39.2"; + version = "0.40.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; rev = "refs/tags/v${version}"; - hash = "sha256-Glq7iJ1AHy99AGXYg5P3wAd3kAMJnt5P2vZzyn7qBY4="; + hash = "sha256-qo22x+eTqUUJ8Qnjv91QgBTy2SHFYv8JxPaGSnpIN9M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pcbW/Od5f+hFCrVpH2yioq+qCmlZ1m3TbUc6rBkYCEs="; + cargoHash = "sha256-atGFfl20FrEDVAO422fGsP6+ONLcH5XXOAWD/aWUup4="; nativeBuildInputs = [ pkg-config From 05cf769b6d2b7ead196cc31923689a0b6767d1d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 13:41:30 +0000 Subject: [PATCH 073/179] gatus: 5.13.1 -> 5.14.0 --- pkgs/by-name/ga/gatus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index 155a3cb6d01f..b069e8f46638 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.13.1"; + version = "5.14.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-OY8f4FGlWeE5Jg4ESnVGo/oiTBVavBSXdGKB+uceC7U="; + hash = "sha256-WYD456l1XdyqhBzsMvruvn24DYspCYt9m7rzqd3dSK4="; }; - vendorHash = "sha256-FAlf+tGI3ssugHf8PsNc2Fb+rH8MqgS3BWXaee+khZw="; + vendorHash = "sha256-UeKQwqDHj1DFjlnGAl8asW7OpmClGi9aB/IbMzR9WvU="; subPackages = [ "." ]; From 2dce263bb13ce5cc32ac5638ab75a6ee0e01a3d3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 1 Dec 2024 17:16:47 +0800 Subject: [PATCH 074/179] beszel: 0.6.2 -> 0.9.0 --- pkgs/by-name/be/beszel/0001-fix-build.patch | 405 -------------------- pkgs/by-name/be/beszel/package.nix | 18 +- 2 files changed, 6 insertions(+), 417 deletions(-) delete mode 100644 pkgs/by-name/be/beszel/0001-fix-build.patch diff --git a/pkgs/by-name/be/beszel/0001-fix-build.patch b/pkgs/by-name/be/beszel/0001-fix-build.patch deleted file mode 100644 index ae120cac4fa1..000000000000 --- a/pkgs/by-name/be/beszel/0001-fix-build.patch +++ /dev/null @@ -1,405 +0,0 @@ -From 402b2d72ad3bcc4a8cdb0115220888154bdb3c39 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Tue, 29 Oct 2024 19:32:07 +0800 -Subject: [PATCH] fix build - ---- - package-lock.json | 368 ++++++++++++++++++++++++++++++++++ - 1 file changed, 368 insertions(+) - -diff --git a/package-lock.json b/package-lock.json -index 8e4532e..d3b3605 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -679,6 +679,262 @@ - "node": ">=6.9.0" - } - }, -+ "node_modules/@esbuild/aix-ppc64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", -+ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", -+ "cpu": [ -+ "ppc64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "aix" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/android-arm": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", -+ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", -+ "cpu": [ -+ "arm" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/android-arm64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", -+ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", -+ "cpu": [ -+ "arm64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/android-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", -+ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/darwin-arm64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", -+ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", -+ "cpu": [ -+ "arm64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/darwin-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", -+ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/freebsd-arm64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", -+ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", -+ "cpu": [ -+ "arm64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "freebsd" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/freebsd-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", -+ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "freebsd" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-arm": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", -+ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", -+ "cpu": [ -+ "arm" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-arm64": { -+ "version": "0.24.0", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", -+ "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", -+ "cpu": [ -+ "arm64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=18" -+ } -+ }, -+ "node_modules/@esbuild/linux-ia32": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", -+ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", -+ "cpu": [ -+ "ia32" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-loong64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", -+ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", -+ "cpu": [ -+ "loong64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-mips64el": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", -+ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", -+ "cpu": [ -+ "mips64el" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-ppc64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", -+ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", -+ "cpu": [ -+ "ppc64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-riscv64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", -+ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", -+ "cpu": [ -+ "riscv64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/linux-s390x": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", -+ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", -+ "cpu": [ -+ "s390x" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, - "node_modules/@esbuild/linux-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", -@@ -695,6 +951,102 @@ - "node": ">=12" - } - }, -+ "node_modules/@esbuild/netbsd-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", -+ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "netbsd" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/openbsd-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", -+ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "openbsd" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/sunos-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", -+ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "sunos" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/win32-arm64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", -+ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", -+ "cpu": [ -+ "arm64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/win32-ia32": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", -+ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", -+ "cpu": [ -+ "ia32" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "node_modules/@esbuild/win32-x64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", -+ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", -+ "cpu": [ -+ "x64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, - "node_modules/@floating-ui/core": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.4.tgz", -@@ -3545,6 +3897,22 @@ - "@esbuild/win32-x64": "0.21.5" - } - }, -+ "node_modules/esbuild/node_modules/@esbuild/linux-arm64": { -+ "version": "0.21.5", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", -+ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", -+ "cpu": [ -+ "arm64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", --- -2.46.1 - diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 6a8aa389dabd..8746cda0e594 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "beszel"; - version = "0.6.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; rev = "refs/tags/v${version}"; - hash = "sha256-x9HU+sDjxRthC4ROJaKbuKHPHgxFSpyn/dywyGWE/v8="; + hash = "sha256-VB3ICoJrBIwP27jZJASQin4xzQ04089VqwFp7hfqZaQ="; }; webui = buildNpmPackage { @@ -28,17 +28,11 @@ buildGoModule rec { npmFlags = [ "--legacy-peer-deps" ]; - patches = [ - # add missing @esbuild for multi platform - # https://github.com/henrygd/beszel/pull/235 - # add missing @esbuild for multi platform - # https://github.com/henrygd/beszel/pull/235 - ./0001-fix-build.patch - ]; - buildPhase = '' runHook preBuild + npx lingui extract --overwrite + npx lingui compile node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build runHook postBuild @@ -55,12 +49,12 @@ buildGoModule rec { sourceRoot = "${src.name}/beszel/site"; - npmDepsHash = "sha256-t7Qcuvqbt0sPHAu3vcZaU8/Ij2yY5/g1TguozlKu0mU="; + npmDepsHash = "sha256-ObLulUnCCcKetDW6XKdC8u0NuKBLVUl37jebCGloGoE="; }; sourceRoot = "${src.name}/beszel"; - vendorHash = "sha256-/FePQkqoeuH63mV81v1NxpFw9osMUCcZ1bP+0yN1Qlo="; + vendorHash = "sha256-yvHsmA4FtENIxKNMS8Bm9bC4dbE64XCX5KP9JYkTtKc="; preBuild = '' mkdir -p site/dist From 3f379a8e87ad6c91dee53457fb9e81f6b5cc8e35 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:22:13 +0200 Subject: [PATCH 075/179] yazi-unwrapped: 0.4.1 -> 0.4.2 Changelog: https://github.com/sxyazi/yazi/releases/tag/v0.4.2 Diff: https://github.com/sxyazi/yazi/compare/v0.4.1...v0.4.2 --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 4e88fbf2f240..a092cbb76017 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "sxyazi"; repo = "yazi"; rev = "v${version}"; - hash = "sha256-YKP+9EfLiXbVivKWWL+arx+2Ek+XydS2VjGy3DncD8s="; + hash = "sha256-2fBajVFpmgNHb90NbK59yUeaYLWR7rhQxpce9Tq1uQU="; }; - cargoHash = "sha256-vH2ihp/X6W1OQfYwMT2vpn8c1PKaX9Uf1Tp2HvQl+o8="; + cargoHash = "sha256-54KD20C1oFK2KlH6aCwvjT4tf4p15FJV5y6pJUoQXG0="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; - env.VERGEN_BUILD_DATE = "2024-12-11"; + env.VERGEN_BUILD_DATE = "2024-12-20"; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; From dedd02ffd7ff09b5cf73c84380714e71f2311369 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 14:25:48 +0000 Subject: [PATCH 076/179] terraform-providers.harbor: 3.10.15 -> 3.10.17 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e6baa0f8df0..7feb4b2c9153 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -543,13 +543,13 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-JdCBeUYB6rkSNhfTTIoRV8Bz4FnlHJFJxEZZbqyzAyc=", + "hash": "sha256-NDOFrW7VeunxAJPkcJ4DFrjrt0fL5B5+gT9H19L1Cos=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.15", + "rev": "v3.10.17", "spdx": "MIT", - "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" + "vendorHash": "sha256-YkTXwx3RjIbzJnagfcYgb5IRnF0sHEDBDzdHf+GS8xI=" }, "hcloud": { "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=", From 12ff4db9f42495435cf4cd7272aec3a41ecd4e52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 15:05:25 +0000 Subject: [PATCH 077/179] rymdport: 3.6.0 -> 3.7.0 --- pkgs/applications/networking/rymdport/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index dd1548158f2d..4959e776d8e7 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-PMCetU+E0Kl50K7sJB6UiHVouWPtfW8ALXFacxCvAhE="; + hash = "sha256-o+FmAG+Zcuud2CKtMLQkdLkXyJ41kaXn3qp/O6rUXJA="; }; - vendorHash = "sha256-RsmwTRVjhEgKAT9aekSfkRuai2165KG7q5aFjAiLSPU="; + vendorHash = "sha256-daOYPZri/ikshTUh3Lk2qHTbeD9mNUUue35aG/b4c88="; nativeBuildInputs = [ pkg-config From 0a08293a2756f7ab3a3290a18ca9754965962454 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 15:26:40 +0000 Subject: [PATCH 078/179] vcmi: 1.5.7 -> 1.6.0 --- pkgs/games/vcmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index cf5524b180ed..daab6f152dd9 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.5.7"; + version = "1.6.0"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-Op5cnp/gO3PPv/QyrashFDBCyqwlO6wkv5Ni5jpRWd8="; + hash = "sha256-Av6gVCLvRuOh2A6emZQbbMHDNQnEyvN4UMZjqzvNRw8="; }; nativeBuildInputs = [ From 6c736be0a1b37863623bd3166cb5e10d6c442880 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 15:26:47 +0000 Subject: [PATCH 079/179] wireguard-vanity-keygen: 0.1.0 -> 0.1.1 --- pkgs/by-name/wi/wireguard-vanity-keygen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix index c596fb9eeb4a..f1b9e3336996 100644 --- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix +++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "wireguard-vanity-keygen"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "axllent"; repo = "wireguard-vanity-keygen"; rev = version; - hash = "sha256-L+YssChpGNQs2MLGXul1sxVmROOWfT0aaZMepGuKmEQ="; + hash = "sha256-LibNWnjm52iPwrPKAA5v3krADvHcewKuLe9k5HhJgzg="; }; - vendorHash = "sha256-kAPw5M9o99NijCC9BzYhIpzHK/8fSAJxvckaj8iRby0="; + vendorHash = "sha256-sHVdR1zuewT9B4UlPrEWU5V9MjgkwPBh/hkSsn2PQKw="; ldflags = [ "-s" From 534c3e67c1f875b48a172b26b24997c22c009017 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:43:10 +0200 Subject: [PATCH 080/179] voicevox-core: init at 0.15.4 --- pkgs/by-name/vo/voicevox-core/package.nix | 74 +++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/vo/voicevox-core/package.nix diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix new file mode 100644 index 000000000000..0283b9cbfb4c --- /dev/null +++ b/pkgs/by-name/vo/voicevox-core/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, +}: + +let + platformInfoTable = { + "x86_64-linux" = { + id = "linux-x64"; + hash = "sha256-/PD5e0bWgnIsIrvyOypoJw30VkgbOFWV1NJpPS2G0WM="; + }; + "aarch64-linux" = { + id = "linux-arm64"; + hash = "sha256-zfiorXZyIISZPXPwmcdYeHceDmQXkUhsvTkNZScg648="; + }; + "x86_64-darwin" = { + id = "osx-x64"; + hash = "sha256-cdNdV1fVPkz6B7vtKZiPsLQGqnIiDtYa9KTcwSkjdJg="; + }; + "aarch64-darwin" = { + id = "osx-arm64"; + hash = "sha256-Z1dq2t/HBQulbPF23ZCihOrcZHMpTXEQ6yXKORZaFPk="; + }; + }; + + platformInfo = + platformInfoTable.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation (finalAttrs: { + pname = "voicevox-core"; + version = "0.15.4"; + + # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models + src = fetchzip { + url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${platformInfo.id}-cpu-${finalAttrs.version}.zip"; + inherit (platformInfo) hash; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + installPhase = '' + runHook preInstall + + install -Dm755 libonnxruntime.* libvoicevox_core.* -t $out/lib + install -Dm644 model/* -t $out/lib/model + install -Dm644 *.h -t $out/include + install -Dm644 README.txt -t $out/share/doc/voicevox-core + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}"; + description = "Core library for the VOICEVOX speech synthesis software"; + homepage = "https://github.com/VOICEVOX/voicevox_core"; + license = with lib.licenses; [ + mit + ({ + name = "VOICEVOX Core Library Terms of Use"; + url = "https://github.com/VOICEVOX/voicevox_resource/blob/main/core/README.md"; + free = false; + redistributable = true; + }) + ]; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.attrNames platformInfoTable; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) From 281176b9bf0b987ca96602e747f1cd72986c1a84 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:43:26 +0200 Subject: [PATCH 081/179] voicevox-engine: init at 0.20.0 --- .../vo/voicevox-engine/make-installable.patch | 21 +++ .../mecab-remove-deprecated.patch | 92 +++++++++++++ pkgs/by-name/vo/voicevox-engine/package.nix | 126 ++++++++++++++++++ .../vo/voicevox-engine/pyopenjtalk.nix | 75 +++++++++++ 4 files changed, 314 insertions(+) create mode 100644 pkgs/by-name/vo/voicevox-engine/make-installable.patch create mode 100644 pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch create mode 100644 pkgs/by-name/vo/voicevox-engine/package.nix create mode 100644 pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix diff --git a/pkgs/by-name/vo/voicevox-engine/make-installable.patch b/pkgs/by-name/vo/voicevox-engine/make-installable.patch new file mode 100644 index 000000000000..6cc3b04ad05b --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/make-installable.patch @@ -0,0 +1,21 @@ +diff --git a/pyproject.toml b/pyproject.toml +index fa23446..6a7705c 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -40,7 +40,15 @@ use_parentheses = true + datas = "datas" # PyInstaller's argument + + [tool.poetry] +-package-mode = false ++name = "voicevox-engine" ++version = "@version@" ++authors = [] ++description = "" ++packages = [ { include = "voicevox_engine" } ] ++include = [ "resources/**/*", "run.py", "engine_manifest.json", "presets.yaml"] ++ ++[tool.poetry.scripts] ++voicevox-engine = "run:main" + + [tool.poetry.dependencies] + python = "~3.11" diff --git a/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch b/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch new file mode 100644 index 000000000000..b9ac0e1c1079 --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/mecab-remove-deprecated.patch @@ -0,0 +1,92 @@ +diff --git a/lib/open_jtalk/src/mecab/src/char_property.h b/lib/open_jtalk/src/mecab/src/char_property.h +index 35f4b05..9c904ba 100644 +--- a/lib/open_jtalk/src/mecab/src/char_property.h ++++ b/lib/open_jtalk/src/mecab/src/char_property.h +@@ -37,7 +37,7 @@ class CharProperty { + inline const char *seekToOtherType(const char *begin, const char *end, + CharInfo c, CharInfo *fail, + size_t *mblen, size_t *clen) const { +- register const char *p = begin; ++ const char *p = begin; + *clen = 0; + while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) { + p += *mblen; +diff --git a/lib/open_jtalk/src/mecab/src/darts.h b/lib/open_jtalk/src/mecab/src/darts.h +index 91b2eae..d6736cf 100644 +--- a/lib/open_jtalk/src/mecab/src/darts.h ++++ b/lib/open_jtalk/src/mecab/src/darts.h +@@ -404,10 +404,10 @@ class DoubleArrayImpl { + T result; + set_result(result, -1, 0); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b +(node_u_type_)(key[i]) + 1; + if (static_cast(b) == array_[p].check) + b = array_[p].base; +@@ -431,12 +431,12 @@ class DoubleArrayImpl { + size_t node_pos = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register size_t num = 0; +- register array_type_ n; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ size_t num = 0; ++ array_type_ n; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b; // + 0; + n = array_[p].base; + if ((array_u_type_) b == array_[p].check && n < 0) { +@@ -469,8 +469,8 @@ class DoubleArrayImpl { + size_t len = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + + for (; key_pos < len; ++key_pos) { + p = b +(node_u_type_)(key[key_pos]) + 1; +diff --git a/lib/open_jtalk/src/mecab/src/dictionary.cpp b/lib/open_jtalk/src/mecab/src/dictionary.cpp +index 5717d4d..3ab6e1f 100644 +--- a/lib/open_jtalk/src/mecab/src/dictionary.cpp ++++ b/lib/open_jtalk/src/mecab/src/dictionary.cpp +@@ -66,7 +66,7 @@ int progress_bar_darts(size_t current, size_t total) { + } + + template +-struct pair_1st_cmp: public std::binary_function { ++struct pair_1st_cmp { + bool operator()(const std::pair &x1, + const std::pair &x2) { + return x1.first < x2.first; +diff --git a/lib/open_jtalk/src/mecab/src/viterbi.cpp b/lib/open_jtalk/src/mecab/src/viterbi.cpp +index 6277fe9..5ccefb7 100644 +--- a/lib/open_jtalk/src/mecab/src/viterbi.cpp ++++ b/lib/open_jtalk/src/mecab/src/viterbi.cpp +@@ -318,11 +318,11 @@ template bool connect(size_t pos, Node *rnode, + const Connector *connector, + Allocator *allocator) { + for (;rnode; rnode = rnode->bnext) { +- register long best_cost = 2147483647; ++ long best_cost = 2147483647; + Node* best_node = 0; + for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) { +- register int lcost = connector->cost(lnode, rnode); // local cost +- register long cost = lnode->cost + lcost; ++ int lcost = connector->cost(lnode, rnode); // local cost ++ long cost = lnode->cost + lcost; + + if (cost < best_cost) { + best_node = lnode; diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix new file mode 100644 index 000000000000..bc9a67617e9f --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -0,0 +1,126 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + replaceVars, + voicevox-core, +}: + +python3Packages.buildPythonApplication rec { + pname = "voicevox-engine"; + version = "0.20.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox_engine"; + rev = "refs/tags/${version}"; + hash = "sha256-Gib5R7oleg+XXyu2V65EqrflQ1oiAR7a09a0MFhSITc="; + }; + + patches = [ + # the upstream package only uses poetry for dependency management, not for package definition + # this patch makes the package installable via poetry-core + (replaceVars ./make-installable.patch { + inherit version; + }) + ]; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = + [ + passthru.pyopenjtalk + ] + ++ (with python3Packages; [ + numpy + fastapi + jinja2 + python-multipart + uvicorn + soundfile + pyyaml + pyworld + semver + platformdirs + soxr + pydantic + starlette + ]); + + pythonRemoveDeps = [ + # upstream wants fastapi-slim, but we provide fastapi instead + "fastapi-slim" + ]; + + pythonRelaxDeps = true; + + preConfigure = '' + # copy demo metadata to temporary directory + mv resources/character_info test_character_info + + # populate the `character_info` directory with the actual model metadata instead of the demo metadata + cp -r --no-preserve=all ${passthru.resources}/character_info resources/character_info + + # the `character_info` directory copied from `resources` doesn't exactly have the expected format, + # so we transform them to be acceptable by `voicevox-engine` + pushd resources/character_info + for dir in *; do + # remove unused large files + rm $dir/*/*.png_large + + # rename directory from "$name_$uuid" to "$uuid" + mv $dir ''${dir#*"_"} + done + popd + ''; + + makeWrapperArgs = [ + ''--add-flags "--voicelib_dir=${voicevox-core}/lib"'' + ]; + + preCheck = '' + # some tests assume $HOME actually exists + export HOME=$(mktemp -d) + + # since the actual metadata files have been installed to `$out` by this point, + # we can move the demo metadata back to its place for the tests to succeed + rm -r resources/character_info + mv test_character_info resources/character_info + ''; + + disabledTests = [ + # this test checks the behaviour of openapi + # one of the functions returns a slightly different output due to openapi version differences + "test_OpenAPIの形が変わっていないことを確認" + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + syrupy + httpx + ]; + + passthru = { + resources = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox_resource"; + rev = "refs/tags/${version}"; + hash = "sha256-m888DF9qgGbK30RSwNnAoT9D0tRJk6cD5QY72FRkatM="; + }; + + pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { }; + }; + + meta = { + changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${version}"; + description = "Engine for the VOICEVOX speech synthesis software"; + homepage = "https://github.com/VOICEVOX/voicevox_engine"; + license = lib.licenses.lgpl3Only; + mainProgram = "voicevox-engine"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix b/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix new file mode 100644 index 000000000000..01ef7ec6ee84 --- /dev/null +++ b/pkgs/by-name/vo/voicevox-engine/pyopenjtalk.nix @@ -0,0 +1,75 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + fetchzip, + setuptools, + cython_0, + cmake, + numpy, + oldest-supported-numpy, + six, + tqdm, +}: + +let + dic-dirname = "open_jtalk_dic_utf_8-1.11"; + dic-src = fetchzip { + url = "https://github.com/r9y9/open_jtalk/releases/download/v1.11.1/${dic-dirname}.tar.gz"; + hash = "sha256-+6cHKujNEzmJbpN9Uan6kZKsPdwxRRzT3ZazDnCNi3s="; + }; +in +buildPythonPackage { + pname = "pyopenjtalk"; + version = "0-unstable-2023-09-08"; + pyproject = true; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "pyopenjtalk"; + rev = "b35fc89fe42948a28e33aed886ea145a51113f88"; + hash = "sha256-DbZkCMdirI6wSRUQSJrkojyjGmViqGeQPO0kSKiw2gE="; + fetchSubmodules = true; + }; + + patches = [ + # this patch fixes the darwin build + # open_jtalk uses mecab, which uses the register keyword and std::binary_function, which are not allowed in c++17 + # this patch removes them + ./mecab-remove-deprecated.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools Date: Sun, 1 Sep 2024 11:38:13 +0200 Subject: [PATCH 082/179] voicevox: init at 0.20.0 --- pkgs/by-name/vo/voicevox/hardcode-paths.patch | 75 +++++++++++ pkgs/by-name/vo/voicevox/package.nix | 116 ++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 pkgs/by-name/vo/voicevox/hardcode-paths.patch create mode 100644 pkgs/by-name/vo/voicevox/package.nix diff --git a/pkgs/by-name/vo/voicevox/hardcode-paths.patch b/pkgs/by-name/vo/voicevox/hardcode-paths.patch new file mode 100644 index 000000000000..844a3e5884c4 --- /dev/null +++ b/pkgs/by-name/vo/voicevox/hardcode-paths.patch @@ -0,0 +1,75 @@ +diff --git a/.env.production b/.env.production +index 5b0dcb0..5848ccd 100644 +--- a/.env.production ++++ b/.env.production +@@ -4,7 +4,7 @@ VITE_DEFAULT_ENGINE_INFOS=`[ + "uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d", + "name": "VOICEVOX Engine", + "executionEnabled": true, +- "executionFilePath": "vv-engine/run.exe", ++ "executionFilePath": "@voicevox_engine_path@", + "executionArgs": [], + "host": "http://127.0.0.1:50021" + } +diff --git a/electron-builder.config.js b/electron-builder.config.js +index 462e6f2..10a9bff 100644 +--- a/electron-builder.config.js ++++ b/electron-builder.config.js +@@ -35,19 +35,6 @@ const isMac = process.platform === "darwin"; + // cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A + const extraFilePrefix = isMac ? "MacOS/" : ""; + +-const sevenZipFile = fs +- .readdirSync(path.resolve(__dirname, "build", "vendored", "7z")) +- .find( +- // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz +- (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName), +- ); +- +-if (!sevenZipFile) { +- throw new Error( +- "7z binary file not found. Run `node ./build/download7z.js` first.", +- ); +-} +- + /** @type {import("electron-builder").Configuration} */ + const builderOptions = { + beforeBuild: async () => { +@@ -88,14 +75,6 @@ const builderOptions = { + from: "build/README.txt", + to: extraFilePrefix + "README.txt", + }, +- { +- from: VOICEVOX_ENGINE_DIR, +- to: path.join(extraFilePrefix, "vv-engine"), +- }, +- { +- from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile), +- to: extraFilePrefix + sevenZipFile, +- }, + ], + // electron-builder installer + productName: "VOICEVOX", +diff --git a/src/backend/electron/manager/vvppManager.ts b/src/backend/electron/manager/vvppManager.ts +index 6aa17b6..b8b52b7 100644 +--- a/src/backend/electron/manager/vvppManager.ts ++++ b/src/backend/electron/manager/vvppManager.ts +@@ -196,16 +196,8 @@ export class VvppManager { + + const args = ["x", "-o" + outputDir, archiveFile, "-t" + format]; + +- let sevenZipPath = import.meta.env.VITE_7Z_BIN_NAME; +- if (!sevenZipPath) { +- throw new Error("7z path is not defined"); +- } +- if (import.meta.env.PROD) { +- sevenZipPath = path.join( +- path.dirname(app.getPath("exe")), +- sevenZipPath, +- ); +- } ++ const sevenZipPath = `@sevenzip_path@`; ++ + log.log( + "Spawning 7z:", + sevenZipPath, diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix new file mode 100644 index 000000000000..e4935091c87b --- /dev/null +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -0,0 +1,116 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + replaceVars, + makeDesktopItem, + copyDesktopItems, + makeWrapper, + electron, + _7zz, + voicevox-engine, +}: + +buildNpmPackage rec { + pname = "voicevox"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "VOICEVOX"; + repo = "voicevox"; + rev = "refs/tags/${version}"; + hash = "sha256-05WTecNc1xxe7SGDPZbLtRELNghFkMTqI4pkX4PsVWI="; + }; + + patches = [ + (replaceVars ./hardcode-paths.patch { + sevenzip_path = lib.getExe _7zz; + voicevox_engine_path = lib.getExe voicevox-engine; + }) + ]; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "999.999.999" "${version}" \ + --replace-fail "postinstall" "_postinstall" + ''; + + npmDepsHash = "sha256-g3avCj3S96qYPAyGXn4yvrZ4gteJld+g4eV4aRtv/3g="; + + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems + ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # disable code signing on Darwin + env.CSC_IDENTITY_AUTO_DISCOVERY = "false"; + + buildPhase = '' + runHook preBuild + + # build command taken from the definition of the `electron:build` npm script + VITE_TARGET=electron npm exec vite build + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + npm exec electron-builder -- \ + --dir \ + --config electron-builder.config.js \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 public/icon.png $out/share/icons/hicolor/256x256/apps/voicevox.png + + mkdir -p $out/share/voicevox + cp -r dist_electron/*-unpacked/{locales,resources{,.pak}} $out/share/voicevox + + makeWrapper ${lib.getExe electron} $out/bin/voicevox \ + --add-flags $out/share/voicevox/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''} + + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r dist_electron/mac*/VOICEVOX.app $out/Applications + makeWrapper $out/Applications/VOICEVOX.app/Contents/MacOS/VOICEVOX $out/bin/voicevox + ''} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "voicevox"; + exec = "voicevox"; + icon = "voicevox"; + desktopName = "VOICEVOX"; + categories = [ "AudioVideo" ]; + mimeTypes = [ "application/x-voicevox" ]; + }) + ]; + + meta = { + changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${version}"; + description = "Editor for the VOICEVOX speech synthesis software"; + homepage = "https://github.com/VOICEVOX/voicevox"; + license = lib.licenses.lgpl3Only; + mainProgram = "voicevox"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = electron.meta.platforms; + }; +} From ae0bec4dcd4c475d7e7000674dd0aee3c89c131a Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Fri, 20 Dec 2024 18:17:30 +0100 Subject: [PATCH 083/179] speedtest-go: 1.7.9 -> 1.7.10 --- pkgs/by-name/sp/speedtest-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/speedtest-go/package.nix b/pkgs/by-name/sp/speedtest-go/package.nix index 316752d3b1fe..72b39e7e8456 100644 --- a/pkgs/by-name/sp/speedtest-go/package.nix +++ b/pkgs/by-name/sp/speedtest-go/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "speedtest-go"; - version = "1.7.9"; + version = "1.7.10"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SFdUl06lCf+ObPZanEwvD2rSzPM0ia2J/XSuel5XGqg="; + hash = "sha256-w0gIyeoQP+MfA9Q2CD7+laABmSrJ9u836E+UIhJeWdk="; }; - vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; + vendorHash = "sha256-2z241HQOckNFvQWkxfjVVmmdFW4XevQBLj8huxYAheg="; excludedPackages = [ "example" ]; From a597f4ffe151a7514f103fab2313b7c6fc220956 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 20 Dec 2024 18:26:11 +0100 Subject: [PATCH 084/179] glab: 1.50.0 -> 1.51.0 --- pkgs/by-name/gl/glab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 767dcfa4a162..9f29550ee58b 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -8,16 +8,16 @@ buildGo123Module rec { pname = "glab"; - version = "1.50.0"; + version = "1.51.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WQO+9Fmlzj21UPJ9cdFc6JC8mbkzOWxz077JR+11BXA="; + hash = "sha256-EWcoEm6DbRT0PP2qYhdwDHCkbeAG6vDVATPhX9pPfiw="; }; - vendorHash = "sha256-nwHY0221nacHk4M+RKA8BEJLCoJJdIKwP0ZPjhYxc7Q="; + vendorHash = "sha256-f6qAFeB9kshtQ2AW6OnEGSnhJYlJ2gAGRDplVmQSVNA="; ldflags = [ "-s" From d6dbab2caca1e24921677d5314789d07d10f9532 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 17:29:36 +0000 Subject: [PATCH 085/179] meteor-git: 0.24.2 -> 0.25.0 --- pkgs/by-name/me/meteor-git/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix index 5146e0759cfe..94371fa8b855 100644 --- a/pkgs/by-name/me/meteor-git/package.nix +++ b/pkgs/by-name/me/meteor-git/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "meteor-git"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "stefanlogue"; repo = "meteor"; rev = "v${version}"; - hash = "sha256-VuP7W20Mtml6K41PxQ8fPBeXLNvnvlMT8+rL5RIYi+A="; + hash = "sha256-2VeCbxHQNV2gNsRs7JVdSRmKI1pYZzW+amybrSRcjGY="; }; vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo="; From 3a11a08dbc085d0df315cb3e7ce4487761f26676 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:00:47 +0000 Subject: [PATCH 086/179] soft-serve: 0.8.0 -> 0.8.1 --- pkgs/by-name/so/soft-serve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index 4f39d0714380..b84ba34fa081 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-BXawviNMkb7y0svsOD+ItmnoWwVSDDdMpdjWNIDPCes="; + hash = "sha256-rbwDFAnRS+Q7f0uTOsw2Fm43NeLiAGePGAl8h4DbUNI="; }; - vendorHash = "sha256-sAnUDZt62cBJYxXxIQVGhXeBn/9gDw1bFgJ28fgYWag="; + vendorHash = "sha256-lqSNKexd5bXlBBp3tLKE+pneA+ZOMKubnItJfKRkbso="; doCheck = false; From 58c1d02328a71c2eacf851eb1bd91e9dca1502cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:09:47 +0000 Subject: [PATCH 087/179] sd-local: 1.0.56 -> 1.0.57 --- pkgs/by-name/sd/sd-local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sd-local/package.nix b/pkgs/by-name/sd/sd-local/package.nix index bf8e34fbb382..374efe41885a 100644 --- a/pkgs/by-name/sd/sd-local/package.nix +++ b/pkgs/by-name/sd/sd-local/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.56"; + version = "1.0.57"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qgfckqF33fXphAsdxd5r6/rebNEURPfazw/AQgB5jiI="; + sha256 = "sha256-CBEdE15lAMMawTsfc45ptHsC2AbqFP6v4/nnktytwvc="; }; vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw="; From 29a3cc58b710bb0dabf244c8afda4c852d7725a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:33:32 +0000 Subject: [PATCH 088/179] pkgsite: 0-unstable-2024-12-09 -> 0-unstable-2024-12-16 --- pkgs/by-name/pk/pkgsite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index abf125c13cd5..33ed7eae9e5d 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pkgsite"; - version = "0-unstable-2024-12-09"; + version = "0-unstable-2024-12-16"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "73fd41ea89d263e617d2539ba9e73a4f46becfa5"; - hash = "sha256-dxtfQKzUOqAY3DIJwUNPcNcXSe5+nvfk4QtJsw/Vchc="; + rev = "06c6edf28e6c1a9f5567f7141512681ba5b75f60"; + hash = "sha256-zsb4NxTxyH354fHtVo8xtFxzOw7XeEnxupfQlh4fAHo="; }; vendorHash = "sha256-Ijcj1Nq4WjXcUqmoDkpO9I4rl/4/TMXFMQVAlEK11R8="; From cee4574451bb015a5c4e5b3dcd3a1ab0d65a71f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:39:09 +0000 Subject: [PATCH 089/179] kanboard: 1.2.42 -> 1.2.43 --- pkgs/by-name/ka/kanboard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix index 82534fd5c902..63c917d4c559 100644 --- a/pkgs/by-name/ka/kanboard/package.nix +++ b/pkgs/by-name/ka/kanboard/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kanboard"; - version = "1.2.42"; + version = "1.2.43"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; + hash = "sha256-/PFE5h4elHFNbbIssoGMDkhGkEIec2uEMz+vU+DN5D0="; }; dontBuild = true; From 8b36eecab2ee7660e28b308ad39ba602f40c6719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:41:55 +0000 Subject: [PATCH 090/179] tinty: 0.23.0 -> 0.24.0 --- pkgs/by-name/ti/tinty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index 549bab43f688..2586f34e2341 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "0.23.0"; + version = "0.24.0"; in rustPlatform.buildRustPackage { pname = "tinty"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "tinted-theming"; repo = "tinty"; tag = "v${version}"; - hash = "sha256-5KrXvE+RLkypqKg01Os09XGxrqv0fCMkeSD//E5WrZc="; + hash = "sha256-Yvwls9bh8YN8/jKC889soCSotLSBU9hJWz95szOdJ2k="; }; - cargoHash = "sha256-qTHlSP9WN39KgU7Q/4/iS1H2XOikXiCAiZ/NSAFS9mM="; + cargoHash = "sha256-jSKhKcBcURjizUZlqZmL5UT19gvNzHinD4rMQ3jMgVw="; # Pretty much all tests require internet access doCheck = false; From 8308e4fa982e9744df3c61528969f1400937b5bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 18:52:36 +0000 Subject: [PATCH 091/179] python312Packages.simsimd: 6.2.1 -> 6.2.2 --- pkgs/development/python-modules/simsimd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix index 8b7f250620ca..3d0da59b1850 100644 --- a/pkgs/development/python-modules/simsimd/default.nix +++ b/pkgs/development/python-modules/simsimd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "simsimd"; - version = "6.2.1"; + version = "6.2.2"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "simsimd"; tag = "v${version}"; - hash = "sha256-Poe0NtDPhQ08V8/bMsZrTFDEIKTi5wTII7UBnJn0msw="; + hash = "sha256-hQEOZRLvNZ3dYfNgG7iXZ7qm/uEgFxk5c9ArCmGlXRg="; }; build-system = [ From bb6e2bfc3826e578adb4a363da5709e1e0dbda85 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Fri, 20 Dec 2024 20:23:16 +0100 Subject: [PATCH 092/179] qownnotes: 24.12.1 -> 24.12.4 Signed-off-by: Patrizio Bekerle --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c122eb6590b7..d164175b4fb5 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -20,14 +20,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.12.1"; + version = "24.12.4"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-OiaZmd50kOTJSJesBYFdjjKzNUc/m7XrU5S27z0mtAI="; + hash = "sha256-1DHBi++7GlSxnA8fAWC4rHej9wi8jDvI2pQduqZhNZQ="; }; nativeBuildInputs = [ From 120d181dbe1cddcb27332a65fa57cf51c35a4a24 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 20 Dec 2024 15:35:39 +0100 Subject: [PATCH 093/179] librewolf-bin: add dwrege as maintainer --- pkgs/by-name/li/librewolf-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix index d6b0960df7c6..ef7e888bbf7d 100644 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ b/pkgs/by-name/li/librewolf-bin/package.nix @@ -27,7 +27,7 @@ appimageTools.wrapType2 { description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)"; homepage = "https://librewolf.net"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ dwrege ]; platforms = [ "x86_64-linux" ]; mainProgram = "librewolf"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From abe985ccc9bd68e150f8c174e30af977023da14f Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 20 Dec 2024 15:36:00 +0100 Subject: [PATCH 094/179] librewolf-bin: 131.0.2-1 -> 133.0.3-1 --- pkgs/by-name/li/librewolf-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix index ef7e888bbf7d..e31c15b6fb28 100644 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ b/pkgs/by-name/li/librewolf-bin/package.nix @@ -6,11 +6,11 @@ let pname = "librewolf-bin"; - upstreamVersion = "131.0.2-1"; + upstreamVersion = "133.0.3-1"; version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; src = fetchurl { url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; - hash = "sha256-Sj3WkY3t8UHsh2v3xPaDb0IGp66YQIw9MKmmFFQCGvk="; + hash = "sha256-mQR1hvMcAiNI8Xhwqfy6oysJ29Dbu12RPZg8xN4zPyw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in From 4a2d41a4797ec3ad077554e203cfd5ebc98e7f59 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 20 Dec 2024 19:48:15 +0000 Subject: [PATCH 095/179] code-cursor: 0.43.6 -> 0.44.5 --- pkgs/by-name/co/code-cursor/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index ff8543b7fd60..339f8ac909ef 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -8,11 +8,11 @@ }: let pname = "cursor"; - version = "0.43.6"; + version = "0.44.5"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.6-build-241206z7j6me2e2-x86_64.AppImage"; - hash = "sha256-adEyDExGvxwpvAT0qYiCfvkpINP9BJ6a+LSwQHQ/H/U="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.44.5-build-241220s3ux0e1tv-x86_64.AppImage"; + hash = "sha256-5IbIsOyJdIzDpxOd+CLe8UdxaocJFJckiZvNSuGXtys="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in @@ -62,6 +62,7 @@ stdenvNoCC.mkDerivation { meta = { description = "AI-powered code editor built on vscode"; homepage = "https://cursor.com"; + changelog = "https://cursor.com/changelog"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ sarahec ]; From 93884e946986776c2e3e7fa76fe9d9dd76123fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Partheym=C3=BCller?= Date: Fri, 20 Dec 2024 21:11:07 +0100 Subject: [PATCH 096/179] virtualboxKvm: 20240828 -> 20241220 --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index c5dc4f09fd2c..e734319a7a19 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -76,8 +76,8 @@ let virtualboxVersion = "7.1.4"; virtualboxSha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e"; - kvmPatchVersion = "20240828"; - kvmPatchHash = "sha256-g0esJbB1IGyLGZMLFJIY8ZYdHWuiM5IZtLMHZvCY6bs="; + kvmPatchVersion = "20241220"; + kvmPatchHash = "sha256-SYyD79iN6Sp/Mxat+ml3fee9X1vFUFyrwHPnQNboc1c="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. From 85c505e26d521d15dac076fdc2e5226fa563f707 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 20:16:37 +0000 Subject: [PATCH 097/179] git-repo: 2.49.3 -> 2.50.1 --- pkgs/by-name/gi/git-repo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 620d5e562ee9..551363bbf231 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.49.3"; + version = "2.50.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-DZtwQQg8jyanRx5JKYLTsn4v7IBJBIl9yQemVOioCPY="; + hash = "sha256-HJdXdFaC8yFef2gMJpSfZ2TDxEZkZLWZcum41dfG/DQ="; }; # Fix 'NameError: name 'ssl' is not defined' From 33286b8dca4b924701d7baf98fd64cacc1c9e476 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Dec 2024 21:25:36 +0100 Subject: [PATCH 098/179] dolibarr: 20.0.0 -> 20.0.2 Diff: https://github.com/Dolibarr/dolibarr/compare/20.0.0...20.0.2 Changelog: https://github.com/Dolibarr/dolibarr/releases/tag/20.0.2 --- pkgs/by-name/do/dolibarr/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix index 81660a85cf2f..0f29c24d99cb 100644 --- a/pkgs/by-name/do/dolibarr/package.nix +++ b/pkgs/by-name/do/dolibarr/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "20.0.0"; + version = "20.0.2"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; - rev = version; - hash = "sha256-nxytzUEpEo1qeIlpbPQ4mETl5DAAP+d1bqUcYxEW26E="; + tag = version; + hash = "sha256-5OEZpBxTYXhO27ea/GBmJI9uDLRDgMNc9ehQ7mvvSrY="; }; dontBuild = true; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { find . -type f -name "*.php" -print0 | xargs -0 sed -i 's|/etc/dolibarr|${stateDir}|g' substituteInPlace htdocs/filefunc.inc.php \ - --replace '//$conffile = ' '$conffile = ' \ - --replace '//$conffiletoshow = ' '$conffiletoshow = ' + --replace-fail '//$conffile = ' '$conffile = ' \ + --replace-fail '//$conffiletoshow = ' '$conffiletoshow = ' substituteInPlace htdocs/install/inc.php \ - --replace '//$conffile = ' '$conffile = ' \ - --replace '//$conffiletoshow = ' '$conffiletoshow = ' + --replace-fail '//$conffile = ' '$conffile = ' \ + --replace-fail '//$conffiletoshow = ' '$conffiletoshow = ' ''; installPhase = '' @@ -38,10 +38,11 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) dolibarr; }; - meta = with lib; { + meta = { description = "Enterprise resource planning (ERP) and customer relationship manager (CRM) server"; + changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}"; homepage = "https://dolibarr.org/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } From 822fbb592e16d845818f45e3b5b6bce404983dd7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Dec 2024 21:27:52 +0100 Subject: [PATCH 099/179] dolibarr: add GaetanLepage as maintainer --- pkgs/by-name/do/dolibarr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix index 0f29c24d99cb..c37380bf178f 100644 --- a/pkgs/by-name/do/dolibarr/package.nix +++ b/pkgs/by-name/do/dolibarr/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}"; homepage = "https://dolibarr.org/"; license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From b0c9262a26c0e889c131f9b332a63a2458051c1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 22:24:30 +0000 Subject: [PATCH 100/179] zoom-us: 6.2.11.5069 -> 6.3.0.5527 --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index dc381e350947..344f3819b5b0 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -50,23 +50,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.2.11.43613"; - versions.x86_64-darwin = "6.2.11.43613"; - versions.x86_64-linux = "6.2.11.5069"; + versions.aarch64-darwin = "6.3.0.44805"; + versions.x86_64-darwin = "6.3.0.44805"; + versions.x86_64-linux = "6.3.0.5527"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-3W0ohT62vn6vdzGq4YVcaM1kEe9oRxWOavGP/+1fhZc="; + hash = "sha256-S4uBJw0FPcPv1O2zcTbEaEONrNLkRCkWYazpR5chYbE="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-NnnY31fj0Bl1DLEghajf1bH2/bCewzzWZGP4bvIvvyk="; + hash = "sha256-PKIxhy+bnBpMn0oUL1cAfhOT+osXPDBIRoY1HLgO26s="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw="; + hash = "sha256-5Tk8lU6D0cgyr5pe1oVZFCURQ1YznBpWPPM9nogOT6Q="; }; }; From 0b361ce34d8d5a718c603e82ad81a3d9a090f3a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 22:31:03 +0000 Subject: [PATCH 101/179] fmtoy: 0-unstable-2024-11-13 -> 0-unstable-2024-12-15 --- pkgs/by-name/fm/fmtoy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fm/fmtoy/package.nix b/pkgs/by-name/fm/fmtoy/package.nix index e501052abaef..31a64eca4a0a 100644 --- a/pkgs/by-name/fm/fmtoy/package.nix +++ b/pkgs/by-name/fm/fmtoy/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fmtoy"; - version = "0-unstable-2024-11-13"; + version = "0-unstable-2024-12-15"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "6bf6a72bf35afd2fb3bdf17a97553d122751e391"; + rev = "6858fc8ad3171df2c9b90cb1e62719af9fc4f7c2"; fetchSubmodules = true; - hash = "sha256-aAZUCI711d0FqKYcEIiEClH3hMcUzMzXF3XflpTTrjM="; + hash = "sha256-OiPKtFPlTxdMNSTLJXcXZkqjzUiGQKXSF2udHePBpho="; }; postPatch = '' From e7c57451534ac78952a14c37675ae5e0ebe547d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sat, 21 Dec 2024 00:06:50 +0100 Subject: [PATCH 102/179] wasmtime: 27.0.0 -> 28.0.0 Changelog: https://github.com/bytecodealliance/wasmtime/releases/tag/v28.0.0 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 71e2cd0dfa25..37fe4bc0781d 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "27.0.0"; + version = "28.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Xqj680MZ8LpBChEU0ia+GGjSceRM55tF5uWJLMuBuQ0="; + hash = "sha256-A5Fr8w2zwo3/BdPFbymwZUH37qhN2fWiIX8Q55icnwA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-qpPXP815kpIIFOiQQDUUgI5blRV1ly2it/XC09UnmVU="; + cargoHash = "sha256-SDu2ae9UHsMdfbxfW/C2JjXXsoKQOlSMAmSQAXlvfA4="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From 6d766c1636b65a03bb238b4748a086cc241231a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 00:40:12 +0000 Subject: [PATCH 103/179] cpm-cmake: 0.40.2 -> 0.40.3 --- pkgs/by-name/cp/cpm-cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index dbf54de2a448..3ff17c3ae404 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.40.2"; + version = "0.40.3"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-KIRVztkE72juIgXquZlC6AYo78QKHBD7iCvCa+ri66k="; + hash = "sha256-3V4XLfhDy6TIOcfSJjkvTRCxo/e5/Kt/+xxAXlZo0XM="; }; postPatch = '' From 41f7c189aa39ff0383c4317a79b93e48881a04d5 Mon Sep 17 00:00:00 2001 From: kmatas <33095685+kmatasfp@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:10:27 -0800 Subject: [PATCH 104/179] golem: 1.0.27 -> 1.1.0 code review improvements --- pkgs/by-name/go/golem/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index e2759207f853..a04ebeddbe60 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -20,13 +20,13 @@ }: rustPlatform.buildRustPackage rec { pname = "golem"; - version = "1.0.27"; + version = "1.1.0"; src = fetchFromGitHub { owner = "golemcloud"; repo = "golem"; tag = "v${version}"; - hash = "sha256-H8Dykn079107gZTV2w/T/gyIVxJtV8NuhuCM2+46yyI="; + hash = "sha256-6AUUgXWlDaoI16p/Hrl115XMGYUIDD5YWHX6JfDk9SI="; }; # Taker from https://github.com/golemcloud/golem/blob/v1.0.26/Makefile.toml#L399 @@ -53,13 +53,13 @@ rustPlatform.buildRustPackage rec { # Required for golem-wasm-rpc's build.rs to find the required protobuf files # https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7 - GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.0.1"; + GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.1.0"; # Required for golem-examples's build.rs to find the required Wasm Interface Type (WIT) files # https://github.com/golemcloud/golem-examples/blob/v1.0.6/build.rs#L9 - GOLEM_WIT_ROOT = "../golem-wit-1.0.3"; + GOLEM_WIT_ROOT = "../golem-wit-1.1.0"; useFetchCargoVendor = true; - cargoHash = "sha256-GrZhWcm7id8pRrwHRDt5k1tcVnoePO8eCWCHzkhCsZk="; + cargoHash = "sha256-zf/L7aNsfQXCdGpzvBZxgoatAGB92bvIuj59jANrXIc="; # Tests are failing in the sandbox because of some redis integration tests doCheck = false; @@ -78,9 +78,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Open source durable computing platform that makes it easy to build and deploy highly reliable distributed systems"; - changelog = "https://github.com/golemcloud/golem/releases/tag/v${version}"; + changelog = "https://github.com/golemcloud/golem/releases/tag/${src.tag}"; homepage = "https://www.golem.cloud/"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kmatasfp ]; mainProgram = "golem-cli"; }; } From 1033078b1ab928731f06d078557be56167d9d93c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:03:03 +0000 Subject: [PATCH 105/179] faas-cli: 0.16.37 -> 0.16.38 --- pkgs/by-name/fa/faas-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index 1341e7011c26..83adaeb0d99c 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.37"; + version = "0.16.38"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-DGtIoX0cvhnHYD+xBV6lW703onupLpF/QYH75rt23Q4="; + sha256 = "sha256-X+lPky5oR+ngQ4nRePU0FzMBjJQinhSadoVsXeXzr+Q="; }; vendorHash = null; From 2a12f77edb135684b3f6c7930f4426d1ae57dace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:06:46 +0000 Subject: [PATCH 106/179] nova: 3.11 -> 3.11.1 --- pkgs/by-name/no/nova/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix index c7226f29e2d6..fb9694414e80 100644 --- a/pkgs/by-name/no/nova/package.nix +++ b/pkgs/by-name/no/nova/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nova"; - version = "3.11"; + version = "3.11.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-gkEUc2mhm1r69XzAnglLhdyYI4jQ24oEk/NRMgeyw60="; + hash = "sha256-E35GeGFWlo5HEaWZ257iJorrR6F2jtyBbXJLrYldC8E="; }; - vendorHash = "sha256-v3ld3bHpVWNJgQ6K5iS7q8QV4ft4RE42wKi+f4++yqY="; + vendorHash = "sha256-tWUE3OUpacxRpShbJQtFbHhjEDt4ULL1wc4vfX4DJ2c="; ldflags = [ "-X main.version=${version}" From b8f2d672d2de2112ed9eb6e0d8a26ac00a24b613 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:18:46 +0000 Subject: [PATCH 107/179] gepetto-viewer: 5.2.0 -> 6.0.0 --- pkgs/by-name/ge/gepetto-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index 0270c84daca2..e9d494187ebd 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -20,13 +20,13 @@ let gepetto-viewer = stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer"; rev = "v${finalAttrs.version}"; - hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM="; + hash = "sha256-nbA+JNogtlktkByUD2Urx3kJpe/8jgIjO59XXOAPpNs="; }; cmakeFlags = [ From 860e3b71c0c4f9402e61ca4c3dc5f14f10012c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:33:34 +0000 Subject: [PATCH 108/179] nextcloud-talk-desktop: 1.0.0 -> 1.0.1 --- pkgs/by-name/ne/nextcloud-talk-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index b3a7d3997b19..49a050af4113 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextcloud-talk-desktop"; - version = "1.0.0"; + version = "1.0.1"; # Building from source would require building also building Server and Talk components # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites src = fetchzip { url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip"; - hash = "sha256-XQa4Fa9eEaFlYrWa00S9aMWKJOPPFGSo4NAlRqE23jM="; + hash = "sha256-ZSNeuKZ+oi6tHO61RshtJ6ndtxvUJbY4gyhDwKpHXZI="; stripRoot = false; }; From 43eed30b66bee7523f5b907a72127d41a1afde50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:34:12 +0000 Subject: [PATCH 109/179] gh-dash: 4.7.3 -> 4.8.0 --- pkgs/by-name/gh/gh-dash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 2e90cb565731..1a267b1ad1bc 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.7.3"; + version = "4.8.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-QDqGsVgY3Je1VgQVobDhNkVjrCyvMNEdghXc0ny+yyo="; + hash = "sha256-0LiuEhp1caTdROBvkqEpI80y3s5zW3jIUTEKtY2OD0o="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; From 5d40d05b10072d949a42674d12b67518d830bb95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 02:01:50 +0000 Subject: [PATCH 110/179] process-compose: 1.40.1 -> 1.46.0 --- pkgs/by-name/pr/process-compose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index f75ac0b261de..e88658dcb0bb 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule rec { pname = "process-compose"; - version = "1.40.1"; + version = "1.46.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-/A/5tdALlb1ultEPTj6+EztjGc7PT9O7VyWey/EyLbQ="; + hash = "sha256-E7ovd/dNSMxVld7CS4ZjxZxUVDXLuoQR7W4ZZ1cPMP0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -45,7 +45,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-ekNISmU9TVi+YA2f3uJVyMsv8xkT8DmDUBw1ASqIfcY="; + vendorHash = "sha256-pztub6PsHhF56ks4UFG9u/mGrvKFUZi+7EudpP9DVYE="; doCheck = false; From df4ac83df16ac7298ed9137374d9cbf1c26fcdec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 03:14:40 +0000 Subject: [PATCH 111/179] raider: 3.0.1 -> 3.0.2 --- pkgs/by-name/ra/raider/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix index a99a8efefe07..81bff79d3c09 100644 --- a/pkgs/by-name/ra/raider/package.nix +++ b/pkgs/by-name/ra/raider/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "raider"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "ADBeveridge"; repo = "raider"; rev = "v${version}"; - hash = "sha256-LkGSEUoruWfEq/ttM3LkA/UjHc3ZrlvGF44HsJLntAo="; + hash = "sha256-fOv4Y5kBbZazFNkPrLS3D7LMLLvT/kIYmsCezsl/fxQ="; }; nativeBuildInputs = From ecade5a7311939299fc2a9539cb4b11d482ce752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 02:55:40 +0000 Subject: [PATCH 112/179] gh: 2.63.2 -> 2.64.0 --- pkgs/by-name/gh/gh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index f99e8f777d3f..e744dbb923f1 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.63.2"; + version = "2.64.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-MxgwnRTIJFpYhZZhyc59ZAzgi6ud7mHpdSIImMlkwtg="; + hash = "sha256-5OdUA0rwBUjfoUZfXzFBmt/GFuvH3pm8JV2iLhaJQek="; }; - vendorHash = "sha256-UCEtvEpfoyJs5lpoAfMehg5cFQ3XlESRT8XFIwvyYas="; + vendorHash = "sha256-lMhSJSQHCY/bDeFM2L2Dfo4ApkjTkg8R0PwOpGr+Gi0="; nativeBuildInputs = [ installShellFiles ]; From 4d2013ad4660d0991da7f429c354c796a7274790 Mon Sep 17 00:00:00 2001 From: Mitchell Skaggs Date: Fri, 20 Dec 2024 17:00:29 -0600 Subject: [PATCH 113/179] maintainers: add magneticflux- --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38aa90b275d6..183e93f7490d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13585,6 +13585,13 @@ githubId = 1809783; name = "Marco Maggesi"; }; + magneticflux- = { + email = "skaggsm333@gmail.com"; + github = "magneticflux-"; + githubId = 9124288; + name = "Mitchell Skaggs"; + keys = [ { fingerprint = "CA2A 3324 43A7 BD99 8FCE DFC4 4EB0 FECB 84AE 8967"; } ]; + }; magnetophon = { email = "bart@magnetophon.nl"; github = "magnetophon"; From c358956633a3c91262a2e5b3bb123e47164ec1fa Mon Sep 17 00:00:00 2001 From: Mitchell Skaggs Date: Wed, 19 Jun 2024 10:28:15 -0500 Subject: [PATCH 114/179] textidote: init at 0.8.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> Co-authored-by: Anderson Torres Co-authored-by: Arne Keller --- pkgs/by-name/te/textidote/package.nix | 124 ++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 pkgs/by-name/te/textidote/package.nix diff --git a/pkgs/by-name/te/textidote/package.nix b/pkgs/by-name/te/textidote/package.nix new file mode 100644 index 000000000000..3a1e6ca9e4c9 --- /dev/null +++ b/pkgs/by-name/te/textidote/package.nix @@ -0,0 +1,124 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ant, + jdk11, + makeWrapper, + stripJavaArchivesHook, + testers, +}: + +let + pname = "textidote"; + version = "0.8.3"; + # We can't compile with > Java 11 yet because that's the last version that supports targeting Java 6 + jdk = jdk11; + + # Manually create a fixed-output derivation to populate the dependencies for the rest of the build + # The Ant buildscript downloads dependencies and stores them alongside the source code in a non-standard way + # https://github.com/sylvainhalle/AntRun + populated-src = stdenv.mkDerivation { + pname = "textidote-populated-src"; + inherit version; + + src = fetchFromGitHub { + owner = "sylvainhalle"; + repo = "textidote"; + rev = "refs/tags/v${version}"; + hash = "sha256-QMSoxk5jDn6qsdxffXJ/S4eTIzLjJdAEbdaK8MZIavI="; + }; + + nativeBuildInputs = [ + ant + jdk + ]; + + # Only run dependency-downloading tasks here to pre-download the dependencies for later + buildPhase = '' + runHook preBuild + + ant download-deps junit jacoco + + runHook postBuild + ''; + + # Copy the entire directory to the output including sources and resolved dependencies + installPhase = '' + runHook preInstall + + cp -a . $out + + runHook postInstall + ''; + + dontFixup = true; + outputHashMode = "recursive"; + outputHash = "sha256-LrFClt8zN/ma42+Yoqwoy03TCuC3JfAeb02vehkljBo="; + }; +in +stdenv.mkDerivation (finalAttrs: { + inherit pname version; + + src = populated-src; + + nativeBuildInputs = [ + ant + makeWrapper + stripJavaArchivesHook + ]; + + buildInputs = [ + jdk + ]; + + # `javac` encoding only defaults to UTF-8 after Java 18 + env.ANT_OPTS = "-Dfile.encoding=utf8"; + + buildPhase = '' + runHook preBuild + + ant jar + + runHook postBuild + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + ant test + + runHook postCheck + ''; + + # Recreates the wrapper from the `.deb` + # The `.deb` seems to be manually created for every release; there's no script in the repo + installPhase = '' + runHook preInstall + + install -Dm644 textidote.jar $out/share/textidote/textidote.jar + + makeWrapper ${lib.getExe jdk} $out/bin/textidote \ + --add-flags "-jar $out/share/textidote/textidote.jar --name textidote" + + runHook postInstall + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "TeXtidote v${finalAttrs.version}"; + }; + }; + + meta = { + homepage = "https://sylvainhalle.github.io/textidote/"; + downloadPage = "https://github.com/sylvainhalle/textidote/releases"; + description = "Correction tool for LaTeX documents"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ magneticflux- ]; + mainProgram = "textidote"; + inherit (jdk.meta) platforms; + }; +}) From ff298f2016230c76724e52e4c9e534f637d5f0fc Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:19:19 +0000 Subject: [PATCH 115/179] sing-box: 1.10.3 -> 1.10.4 --- pkgs/by-name/si/sing-box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index a8b8247d28ae..9424008b8065 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-Xornyh9FT4ZqR0QjYMlgPhWEDFGb1DEPCngGpuix4A0="; + hash = "sha256-UnWkvE9vUkKSgfqQYm0a3w6Hbmc21DvNqYoxjqKrrt8="; }; - vendorHash = "sha256-3YRtwYkyvtMtMUN1O6yb1JQnSXdsb8KnQ9WsnGtvGnk="; + vendorHash = "sha256-dr0yQ8x/JwuVgHxeXKXBiz1n3OWam0iqFxIFfCKOGt8="; tags = [ "with_quic" From e35acddfb6f43efda1e7396d56847ee13fba85fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 03:41:36 +0000 Subject: [PATCH 116/179] supabase-cli: 2.1.2 -> 2.1.3 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 4a64d764b0b9..ae158afb75c1 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-lSmB+UC/dJzrK5C9o+11Hq/ZzbJrzofqaqc0JSy9pxE="; + hash = "sha256-z29xiaKd/xyZU9s+QyMrb5+g4zsqJ1QpRYJooCTxFqw="; }; - vendorHash = "sha256-WygbrpE+FIWBs2Q34EAFlOm458vqnuIy+seZb+4Wf+I="; + vendorHash = "sha256-sn8W10HhBLl4MqfnjUZKx6/wlKDBzMNi2EOc+OPtrFo="; ldflags = [ "-s" From f35b9d1e5484ef0fc850517f7ec7d35adb6c3b75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 04:28:44 +0000 Subject: [PATCH 117/179] reindeer: 2024.12.09.00 -> 2024.12.16.00 --- pkgs/by-name/re/reindeer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index afdb1213436f..822855445785 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.12.09.00"; + version = "2024.12.16.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-G58W1biDHx/m73wC0gRQEcE4EhZMS6zGt8UHh0rQm7g="; + hash = "sha256-yM+iVX+5caiSW6K45EbkHgHEhceIvauCIYwlLTYpzbQ="; }; - cargoHash = "sha256-lOvvkgJ4+jX0Modvwp9JiYM5XHbq4xY83oC3C98vmaA="; + cargoHash = "sha256-TWu2p6d/jec7zZpFP8Gly4RdgkL18yU2VWsFHVZLDJY="; nativeBuildInputs = [ pkg-config ]; From 0ff97fc16f62fa65868665b88b977dfd5372e94d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 04:30:24 +0000 Subject: [PATCH 118/179] circt: 1.98.0 -> 1.99.1 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 042b90c6f51f..712113bdaa3a 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.98.0"; + version = "1.99.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-wkaspxwWJ7xJVQ+VZ9Z85zbzOcLAb3v55EJQjd+jiw8="; + hash = "sha256-pnC8BLf2encv7UR10q6rTTpAZ6T0fETwumwTSu+Q8Ro="; fetchSubmodules = true; }; From 7f5bc3efdeb2d2cbf40172ddb9dac7d60bf9d328 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 05:40:24 +0000 Subject: [PATCH 119/179] python312Packages.python-docs-theme: 2024.10 -> 2024.12 --- .../python-modules/python-docs-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 5e1dcc66c635..baa986db0e2b 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.10"; + version = "2024.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; - rev = "refs/tags/${version}"; - hash = "sha256-JwuIV+hkBIst8EtC3Xmu/KYTV+SZvD4rb9wHimKLL94="; + tag = version; + hash = "sha256-LZFcKmFnALZ5ZV8XbRfT74Wv5r7he/y58mCu4uydgw8="; }; build-system = [ flit-core ]; From 57c0e8a65c3c22ad79e477362eb9d5798b1c78b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 05:50:17 +0000 Subject: [PATCH 120/179] pur: 7.3.2 -> 7.3.3 --- pkgs/by-name/pu/pur/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pur/package.nix b/pkgs/by-name/pu/pur/package.nix index d482cf0bc7a6..bd14c61b7df8 100644 --- a/pkgs/by-name/pu/pur/package.nix +++ b/pkgs/by-name/pu/pur/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pur"; - version = "7.3.2"; + version = "7.3.3"; pyproject = true; src = fetchFromGitHub { owner = "alanhamlett"; repo = "pip-update-requirements"; - rev = "refs/tags/${version}"; - hash = "sha256-XLI9U9ej3+tS0zzmCDGwZ0pAb3mKnrqBtm90f5N6rMw="; + tag = version; + hash = "sha256-zSEzYYpDmu3fennTZNvQjAoMekzxoMDUEqvSjN6hNUk="; }; build-system = with python3.pkgs; [ From a3afc68de5982425ff555839945fd3d8be84582a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 06:00:14 +0000 Subject: [PATCH 121/179] xmake: 2.9.6 -> 2.9.7 --- pkgs/development/tools/build-managers/xmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 537509a83b31..cc741ffbf65e 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.6"; + version = "2.9.7"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-R/bvywD5DJigLDlflztNVb3TqP5FJnbc5XtVwFV1loY="; + hash = "sha256-JI5JalpzTInhZ/kx4mIMDqQQnnypE9wQInNRKaX/6dM="; }; buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; From 7e465fb4fcdca73ca9e7e58b8e9bf8e8e788489f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 21 Dec 2024 06:10:42 +0000 Subject: [PATCH 122/179] miniflux: 2.2.3 -> 2.2.4 Changes: https://github.com/miniflux/v2/releases/tag/2.2.4 --- pkgs/by-name/mi/miniflux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index b27ec71b520a..454ddf31be20 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-B/joQJ64/NPiZo1JEAhcrHLQ67m1oVTbmBk3drZ8lC4="; + hash = "sha256-h5bOZPaYu5DlN4trwf+iMafzfcyXemNdssTYpM6NCZY="; }; - vendorHash = "sha256-hzgfuwewJDIz/iaBU3lyB2/mAxYGTWsKkaqAiCkPQQ0="; + vendorHash = "sha256-UR1nxza+rZtiSpY5hwAdCU4yiLm8weOCkrZHTqXQEpQ="; nativeBuildInputs = [ installShellFiles ]; From 99fa438dbffa52dec61baa960e5143b102b342ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 21 Dec 2024 07:40:33 +0100 Subject: [PATCH 123/179] maintainers/team-list: remove ncfavier from haskell --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4d7eca3e48cb..92699be51581 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -478,7 +478,6 @@ with lib.maintainers; members = [ cdepillabout maralorn - ncfavier sternenseemann ]; githubTeams = [ "haskell" ]; From 1d279ae07dffc4c477e9cfe2c28cb5d1e066ff9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 07:05:29 +0000 Subject: [PATCH 124/179] opencomposite: 0-unstable-2024-11-11 -> 0-unstable-2024-12-20 --- pkgs/by-name/op/opencomposite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 22c4883da058..1ba7112c922b 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-11-11"; + version = "0-unstable-2024-12-20"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "34311dabf430d6051d7e97f6081842a5394d2a67"; + rev = "b9069698f2ed420a5f1ae783c02b88fbde775fc2"; fetchSubmodules = true; - hash = "sha256-sjgnai7RJemIXuviXhW6+L/zioz7UePaOUh3mVteGww="; + hash = "sha256-ow10yTvZyB5fLTwgxspjS/atxK1QTGcLJtkWpQgYaeQ="; }; nativeBuildInputs = [ cmake ]; From 6a590ecb44a59ffc2e3f807ba90876f7c2720ce4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 10:23:39 +0300 Subject: [PATCH 125/179] kdePackages.drkonqi: fix overzealous replacement I went full find and replace. Never go full find and replace. --- pkgs/kde/plasma/drkonqi/gdb-path.patch | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/kde/plasma/drkonqi/gdb-path.patch b/pkgs/kde/plasma/drkonqi/gdb-path.patch index c4bf303e7ee7..620a0c9ce9d1 100644 --- a/pkgs/kde/plasma/drkonqi/gdb-path.patch +++ b/pkgs/kde/plasma/drkonqi/gdb-path.patch @@ -1,8 +1,8 @@ diff --git a/src/debugger.cpp b/src/debugger.cpp -index 946bdd12..afb69e35 100644 +index 946bdd12..5c24b371 100644 --- a/src/debugger.cpp +++ b/src/debugger.cpp -@@ -36,15 +36,15 @@ QList Debugger::availableInternalDebuggers(const QString &backend) +@@ -36,12 +36,12 @@ QList Debugger::availableInternalDebuggers(const QString &backend) result.push_back(std::make_shared( Data{.displayName = i18nc("@label the debugger called GDB", "GDB"), .codeName = u"gdb"_s, @@ -17,12 +17,8 @@ index 946bdd12..afb69e35 100644 + u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s, .backtraceBatchCommands = u"thread\nthread apply all bt"_s, .preambleCommands = expandCommand( -- u"gdb"_s, -+ u"@gdb@"_s, - u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s), - .execInputFile = {}}})); - -@@ -63,15 +63,15 @@ QList Debugger::availableInternalDebuggers(const QString &backend) + u"gdb"_s, +@@ -63,12 +63,12 @@ QList Debugger::availableInternalDebuggers(const QString &backend) Data{ .displayName = i18nc("@label the debugger called GDB", "GDB"), .codeName = u"gdb"_s, @@ -37,8 +33,4 @@ index 946bdd12..afb69e35 100644 + u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s, .backtraceBatchCommands = u"thread\nthread apply all bt"_s, .preambleCommands = expandCommand( -- u"gdb"_s, -+ u"@gdb@"_s, - u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s), - .execInputFile = {}}})); - } + u"gdb"_s, From d0e76edfcabe3ae0409e94ec5b741501d89e5177 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 07:39:03 +0000 Subject: [PATCH 126/179] python312Packages.aiovodafone: 0.7.1 -> 0.8.1 --- pkgs/development/python-modules/aiovodafone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index c7665fc0ba6c..96367e7e109b 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.7.1"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chemelli74"; repo = "aiovodafone"; - rev = "refs/tags/v${version}"; - hash = "sha256-BVuDnIp9K+f4jZPPfCABMD+fpPXDQE6/RWTZ8k7ftMI="; + tag = "v${version}"; + hash = "sha256-JRZEMu5Lv0JQkTM1w3g3yzdaG/FM8xwT1MuEBHAic1Y="; }; postPatch = '' From c6f03b62ff842cfdb2d04d569d8d2718654e2003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 07:49:45 +0000 Subject: [PATCH 127/179] s7: 11.2-unstable-2024-12-10 -> 11.2-unstable-2024-12-19 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 59823d1d2073..022c0ce15ab1 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.2-unstable-2024-12-10"; + version = "11.2-unstable-2024-12-19"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "9228fbb69835a8b414cba028d56ee7ddf4479e14"; - hash = "sha256-qvkkRc3UivsAAu9b48K+6dpl91MDnTsU/zyN4hfKUCo="; + rev = "a5515d455f5aca49d5275a5a35ac88935f3ad401"; + hash = "sha256-Ik3edzpO9hIhJBZHyzL/CsTVKGbDdGVfE9pNrBeSjp8="; }; buildInputs = [ From 722aee8855ce5095e29a0e48963abac28353fb50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 07:55:03 +0000 Subject: [PATCH 128/179] python312Packages.pytorch-metric-learning: 2.7.0 -> 2.8.1 --- .../python-modules/pytorch-metric-learning/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index dd6ce14adf10..af57233b9cf2 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.7.0"; + version = "2.8.1"; pyproject = true; disabled = isPy27; @@ -35,8 +35,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KevinMusgrave"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-mxAl4GMyAWtvocc68Ac3z1+W13k9OOK7aQFfB7X0f9c="; + tag = "v${version}"; + hash = "sha256-WO/gv8rKkxY3pR627WrEPVyvZnvUZIKMzOierIW8bJA="; }; build-system = [ From e443609d45438a601d7a28fd14d472ca5301538f Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 11 Dec 2024 09:58:07 +0300 Subject: [PATCH 129/179] opener: init at 0.1.5 opener: update meta opener: update src and add passthru script opener: add env.VERSION opener: update --- pkgs/by-name/op/opener/package.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/op/opener/package.nix diff --git a/pkgs/by-name/op/opener/package.nix b/pkgs/by-name/op/opener/package.nix new file mode 100644 index 000000000000..bc51a1e6062f --- /dev/null +++ b/pkgs/by-name/op/opener/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, + nix-update-script, +}: + +buildGoModule rec { + pname = "opener"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "superbrothers"; + repo = "opener"; + tag = "v${version}"; + hash = "sha256-pp2jn4J6gYyZky5rVBaai9sVVqvPgM+fGryseM58WEI="; + }; + + vendorHash = "sha256-xwMRWEwrG12QevVVTMC9OTdjIBoxR1AHkoa6OErPpF4="; + + postPatch = '' + substituteInPlace opener.go \ + --replace-fail \ + 'var version string' \ + 'var version string = "${version}"' + ''; + + __darwinAllowLocalNetworking = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Open URL in your local web browser from the SSH-connected remote environment"; + homepage = "https://github.com/superbrothers/opener"; + changelog = "https://github.com/superbrothers/opener/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "opener"; + }; +} From 17a3028c12b5368f20f2487f81bc923d76f83575 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Dec 2024 09:11:06 +0100 Subject: [PATCH 130/179] typstyle: 0.12.12 -> 0.12.13 Diff: https://github.com/Enter-tainer/typstyle/compare/None...v0.12.13 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.12.13/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index c7f9368ff297..6cc812c52020 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.12"; + version = "0.12.13"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${version}"; - hash = "sha256-oQnZm+BkccHN3xXSe1yBus3m4JKyCBKM9kkJz+QryR0="; + hash = "sha256-mEpMKXN07qjQ+qQSSTKVKss0c/x4bm0K5WcwLTjdejs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pbsB9mQafgI6PudjeCzOSpk3+iZkkdp/V1zgH8pP7us="; + cargoHash = "sha256-1NZmLH845oXb/IVQzwSv9hqoUGR5ZuGtsk4SCn/s2kk="; # Disabling tests requiring network access checkFlags = [ From b658d41a22b8b9be5bd8f20616c9e3345bc67100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Dec 2024 09:26:07 +0100 Subject: [PATCH 131/179] hdf4: 4.2.15 -> 4.2.16-2 The patches wouldn't apply anymore, but hopefully they're not needed. This fixes build on {x86_64,aarch64}-linux and doesn't break aarch64-darwin. --- pkgs/by-name/hd/hdf4/darwin-aarch64.patch | 11 --------- pkgs/by-name/hd/hdf4/package.nix | 29 ++--------------------- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/by-name/hd/hdf4/darwin-aarch64.patch diff --git a/pkgs/by-name/hd/hdf4/darwin-aarch64.patch b/pkgs/by-name/hd/hdf4/darwin-aarch64.patch deleted file mode 100644 index cff81e581176..000000000000 --- a/pkgs/by-name/hd/hdf4/darwin-aarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200 -+++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200 -@@ -1343,7 +1343,7 @@ - #endif /* IA64 */ - - /* Linux AArch64 */ --#if defined __aarch64__ -+#if defined __aarch64__ && !defined __APPLE__ - - #ifdef GOT_MACHINE - If you get an error on this line more than one machine type has been defined. diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix index ca839a6bea34..e764e5ac2dd5 100644 --- a/pkgs/by-name/hd/hdf4/package.nix +++ b/pkgs/by-name/hd/hdf4/package.nix @@ -20,38 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hdf"; - version = "4.2.15"; + version = "4.2.16-2"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2"; - hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI="; + hash = "sha256-xcMjS1ASJYrvLkQy9kmzHCGyYBWvuhhXrYNkDD8raSw="; }; - patches = [ - # Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch"; - hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU="; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch"; - hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY="; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch"; - hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo="; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch"; - hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q="; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch"; - hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ="; - }) - ./darwin-aarch64.patch - ]; - nativeBuildInputs = [ cmake From 63d59f32e7ead6c020a18acab1e8f33a7940c21b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 21 Dec 2024 10:30:10 +0200 Subject: [PATCH 132/179] warp-terminal: 0.2024.12.10.15.55.stable_04 -> 0.2024.12.18.08.02.stable_03 (#366843) --- pkgs/by-name/wa/warp-terminal/package.nix | 2 ++ pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 41d4a1cbe2e6..7aebef84c432 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -6,6 +6,7 @@ autoPatchelfHook, undmg, zstd, + alsa-lib, curl, fontconfig, libglvnd, @@ -48,6 +49,7 @@ let ]; buildInputs = [ + alsa-lib # libasound.so.2 curl fontconfig (lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 11b48e1fd5a4..bc2650a06601 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-NK9/YhnEWdoxF8fkGJvYVFCsNh0XPSheXbw89wNkaio=", - "version": "0.2024.12.10.15.55.stable_04" + "hash": "sha256-CrRt7fLoZ9LR3fD7xXBzlRFf4CAjQjokU5UaHNJnVNA=", + "version": "0.2024.12.18.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-wAzPAaigjaHl5JhuS92rkHXLZRAQtq7p8IB67sqPDlY=", - "version": "0.2024.12.10.15.55.stable_04" + "hash": "sha256-0A9EPkDp77tpfrRuXV2rVPaXMYbY7erbKBd6IT9CTFQ=", + "version": "0.2024.12.18.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-GbirEK2Jhfunj9ORWp5uW/QHUzSnJRQRh1ezApr1p00=", - "version": "0.2024.12.10.15.55.stable_04" + "hash": "sha256-IlqpK8IbtSMKGNspKj2Rq2Jzlyc7RYcfRaoYY9Akhdk=", + "version": "0.2024.12.18.08.02.stable_03" } } From 800a9900d7f8f59b85e8b2472b44519ad6f41ed8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 09:40:56 +0000 Subject: [PATCH 133/179] crates-tui: 0.1.23 -> 0.1.24 --- pkgs/by-name/cr/crates-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index 5cc3461dcee1..a5552487394d 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.1.23"; + version = "0.1.24"; in rustPlatform.buildRustPackage { pname = "crates-tui"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "ratatui"; repo = "crates-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-d5paevf7bFpC+dZ5fZ5n1F5yFtTWfqrGN4dTkwU0oLQ="; + hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU="; }; - cargoHash = "sha256-1E77Rz2MjR8NbLFO2oD7JWb5okLmV+/L5DBmHdPrwDg="; + cargoHash = "sha256-d79NgOGdxkg6zRpnBlievmPEVWIkY8gYLWdTMpGSPqo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 71f46a72c95fbebb747310a2f68d4da0cad0d752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 09:47:55 +0000 Subject: [PATCH 134/179] python312Packages.pyvicare: 2.38.0 -> 2.39.1 --- pkgs/development/python-modules/pyvicare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index c292d4f03ae8..bf4e1b4e99ff 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.38.0"; + version = "2.39.1"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; - rev = "refs/tags/${version}"; - hash = "sha256-LxQaqT4NwJxyyZ3XB14DPM8ASqem3Yb7J7HLswZ8bE4="; + tag = version; + hash = "sha256-gD6eLhng8oUmXPHOwYZoyLRpMQBgH0xbopaVJ6qJQsg="; }; postPatch = '' From 303123ab22c12398faafd27ae91b048a4cd42a98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 09:58:07 +0000 Subject: [PATCH 135/179] python312Packages.yfinance: 0.2.50 -> 0.2.51 --- pkgs/development/python-modules/yfinance/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 4f3fa14e8559..227f46ab1d26 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.50"; + version = "0.2.51"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ranaroussi"; repo = "yfinance"; - rev = "refs/tags/${version}"; - hash = "sha256-qB9VbdiInbLEAy698BzU35k8ckwmaEXv8lByRsp/GfA="; + tag = version; + hash = "sha256-H4DrbatteETvxtDjz2kYGTMvGFbmmgbb5wMKWSUkOGc="; }; build-system = [ setuptools ]; From a415f886525a9dd653a300008d5709f4538ddb83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 10:01:40 +0000 Subject: [PATCH 136/179] exo: 0-unstable-2024-12-07 -> 0-unstable-2024-12-15 --- pkgs/by-name/ex/exo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 8426933c6156..1f07ea3bb4ed 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -7,14 +7,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-12-07"; + version = "0-unstable-2024-12-15"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "db9de97fa6ecef51d1b7eec6758b55c402da786e"; - hash = "sha256-1tChxxP8saeBjLsOpL8GYCNyhlXkN2Mg2LruyB3K3/g="; + rev = "cfedcec3a651f27085e1913f4bd42a699fa82076"; + hash = "sha256-OPGWmIfIVW/1lJg+4iXRvzN6bY8+LzWx8SOgBUXjPQ0="; }; build-system = with python3Packages; [ setuptools ]; From 3c8d6a24ed71a65646d59c73f267bf4d7cc125a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 10:32:11 +0000 Subject: [PATCH 137/179] shaka-packager: 3.4.0 -> 3.4.1 --- pkgs/by-name/sh/shaka-packager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix index efed3e8563c0..05e17556ed3f 100644 --- a/pkgs/by-name/sh/shaka-packager/package.nix +++ b/pkgs/by-name/sh/shaka-packager/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shaka-packager"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "shaka-project"; repo = "shaka-packager"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-4ZxBE1jpFR93OigAd7xOpUHXSZ5o9keNBJXuS2pNjpo="; + hash = "sha256-xXKgL8sUP+meFXV9S/i7dao7BIkIx+e/ujjpew7xGL0="; }; patches = [ From 115df1c2cf0f7ada4bbf0311fc452975df69b113 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 2 Dec 2024 05:50:02 +0100 Subject: [PATCH 138/179] glab: use nix-update-script --- pkgs/by-name/gl/glab/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 9f29550ee58b..365067dd98a9 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -4,6 +4,7 @@ fetchFromGitLab, installShellFiles, stdenv, + nix-update-script, }: buildGo123Module rec { @@ -43,6 +44,8 @@ buildGo123Module rec { --zsh <($out/bin/glab completion -s zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "GitLab CLI tool bringing GitLab to your command line"; license = lib.licenses.mit; From 236542f60858112e03f10a078051733cff8494ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 11:10:46 +0000 Subject: [PATCH 139/179] cargo-flamegraph: 0.6.5 -> 0.6.7 --- pkgs/development/tools/rust/cargo-flamegraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index e440b9074504..05d2642b0fc1 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "sha256-VrC3c3a1G8mn9U6txeynsaWOL4HQQk2IOiQqS52iPGo="; + sha256 = "sha256-OpneGyulSreUKhmnLfsJ2sEbkDPCcrDjkRu9ccKZcJc="; }; - cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; + cargoHash = "sha256-gdTqObOWboNlhU+tI/z5KYSOdmgRg36v73iLuKfwVkA="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From d47a3d497bb06dafc85e40276ce8be1110ad68a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 12:02:01 +0000 Subject: [PATCH 140/179] nu_scripts: 0-unstable-2024-12-08 -> 0-unstable-2024-12-18 --- pkgs/by-name/nu/nu_scripts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 5f0f3b9a4699..6c4225badcb0 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-12-08"; + version = "0-unstable-2024-12-18"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "b5385a2af002b4a69fc061f1c45afb60f0bbd269"; - hash = "sha256-0i5dnYb2kQuL+F2/316pPun0Jtuwb2EDDpSJpyqctPM="; + rev = "be6411ef4a8775d1db61b6c04cf9225b0322c899"; + hash = "sha256-yFmijPQ6enQDep020ZFVNrRa/Ze0+cmMSkOlmNlPCOA="; }; installPhase = '' From 97fef6811e532e93f909c77145212103434c8b43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 12:05:24 +0000 Subject: [PATCH 141/179] python312Packages.b2sdk: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/b2sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 7ae608bd72fb..5fe558fe732c 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Backblaze"; repo = "b2-sdk-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-nYsbcRRNh6WEelur/GvzE800Yg0h51FDhxJwBryVs4w="; + tag = "v${version}"; + hash = "sha256-QY2/uWCnIlOHo5wTLxu2Pvh2oNPWRcyDL5TpnZHob7I="; }; build-system = [ pdm-backend ]; From 535dd6c4561a00231a8ce5e1406a4c86f6803f26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 12:39:19 +0000 Subject: [PATCH 142/179] hcl2json: 0.6.4 -> 0.6.5 --- pkgs/by-name/hc/hcl2json/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hc/hcl2json/package.nix b/pkgs/by-name/hc/hcl2json/package.nix index fc7860f354c2..6b4b79bdc465 100644 --- a/pkgs/by-name/hc/hcl2json/package.nix +++ b/pkgs/by-name/hc/hcl2json/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "tmccombs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aYsE4Tmi2h+XiLZH0faoB17UA7xHht8bec5Kud+NLIk="; + sha256 = "sha256-LU74vm36NuA1ApJWtEf/ub3los6yVR8yiQTfM0Wnvyo="; }; - vendorHash = "sha256-Rjpru0SfGm9hdMQwvk8yM/E65YFB0NicaJ7a56/uwLE="; + vendorHash = "sha256-nm+KvpcOUTR9Nm0eQtqCWxMiFTvL5xKLhsPaJlsVpkQ="; subPackages = [ "." ]; From 198f792808a99235fe2b44b9ebd2964fcc480f8a Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 21 Dec 2024 12:42:32 +0000 Subject: [PATCH 143/179] sublime4: 4186 -> 4189 --- pkgs/applications/editors/sublime/4/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index cbda2ce4ede6..37e2a423feea 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,9 +5,9 @@ let in { sublime4 = common { - buildVersion = "4186"; - x64sha256 = "Rw/N2uSsMb6uMvMt9lEzBFSAvAePFTwfX09ARDX1mSs="; - aarch64sha256 = "6RKaSIDj0zOqjYAGb77q3+sKqmp+VFqcgODyU06ajrc="; + buildVersion = "4189"; + x64sha256 = "0vEG2FfLK+93UtpYV9iWl187iN79Tozm38Vh6lbzW7A="; + aarch64sha256 = "ZyLnbvpyxvJfyfu663ED0Yn5M37As+jy6TREZMgSHgI="; } { }; sublime4-dev = common { From b12d5b79cb27834add6d149160bac373a1dcab50 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 21 Dec 2024 12:42:54 +0000 Subject: [PATCH 144/179] sublime4-dev: 4187 -> 4188 --- pkgs/applications/editors/sublime/4/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 37e2a423feea..88f4518044e2 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } { }; sublime4-dev = common { - buildVersion = "4187"; + buildVersion = "4188"; dev = true; - x64sha256 = "4Xcpnvplj3ik3kWtwJ6ZT//nRgMCw/ceN7bVuEDApDA="; - aarch64sha256 = "EreN+SjVnm1Kt+Oz72AQ86AKdgm9n72lv/JQvefb8YU="; + x64sha256 = "b7JyJ9cPxb/Yjy9fvcz/m6OLETxMd8rwkmrEyMGAjjc="; + aarch64sha256 = "oGL0UtQge21oH6p6BNsRkxqgvdi9PkT/uwZTYygu+ng="; } { }; } From 541f47ca64d86667d4a8d2e4fd65291d93e26691 Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Sat, 21 Dec 2024 12:50:21 +0000 Subject: [PATCH 145/179] sing-box: 1.10.4 -> 1.10.5 --- pkgs/by-name/si/sing-box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 9424008b8065..15018f3fb97c 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-UnWkvE9vUkKSgfqQYm0a3w6Hbmc21DvNqYoxjqKrrt8="; + hash = "sha256-gVbOJsGY8s2fVugd7Tha1dAhS9rxZbN6m3FVza0WUdc="; }; - vendorHash = "sha256-dr0yQ8x/JwuVgHxeXKXBiz1n3OWam0iqFxIFfCKOGt8="; + vendorHash = "sha256-b0SPUVGL1ESeseWn27xQ2YFFIxJeBAfukZG6lynAIik="; tags = [ "with_quic" From 1af1272d05ff10f9222545e144e453ee9faf0ad9 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 21 Dec 2024 13:56:15 +0100 Subject: [PATCH 146/179] mrkd: drop mrkd is unmainated since 2021 and depends on a vulnerable dependency. --- pkgs/by-name/mr/mrkd/package.nix | 55 -------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/by-name/mr/mrkd/package.nix diff --git a/pkgs/by-name/mr/mrkd/package.nix b/pkgs/by-name/mr/mrkd/package.nix deleted file mode 100644 index 8193766f02f1..000000000000 --- a/pkgs/by-name/mr/mrkd/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - python3, - fetchPypi, -}: - -let - python = python3.override { - self = python; - packageOverrides = self: super: { - # https://github.com/refi64/mrkd/pull/6 - mistune = super.mistune.overridePythonAttrs (old: rec { - version = "0.8.4"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-WaNCnbU8ULXGvMigf4hIywDX3IvbQxpKtBkg0gHUdW4="; - }; - meta = old.meta // { - knownVulnerabilities = [ - "CVE-2022-34749" - ]; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "mrkd"; - version = "0.2.0"; - - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "456f8c1be99da268554b29c6b5383532e58119def5a65d85270bc6a0ecc26aaf"; - }; - - propagatedBuildInputs = with python.pkgs; [ - jinja2 - mistune - pygments - setuptools - ]; - - pythonImportsCheck = [ "mrkd" ]; - - meta = with lib; { - description = "Write man pages using Markdown, and convert them to Roff or HTML"; - homepage = "https://github.com/refi64/mrkd"; - license = licenses.bsd2; - mainProgram = "mrkd"; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4671edcddff1..ba070c77b424 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -843,6 +843,7 @@ mapAliases { mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 + mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02 From a9dbb26f48d0075ffb3b4aa776c7e9728c42ff55 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 21 Dec 2024 14:05:30 +0100 Subject: [PATCH 147/179] workflows/eval: evaluate all systems to completion on failure Failing fast hides system-specific evaluation failures, because all of the currently 4 jobs appear as failed. --- .github/workflows/eval.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 97130b8be323..34f4d07d47cf 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -81,6 +81,7 @@ jobs: runs-on: ubuntu-latest needs: [ attrs, get-merge-commit ] strategy: + fail-fast: false matrix: system: ${{ fromJSON(needs.attrs.outputs.systems) }} steps: From 059d94c566e2d10a2ce2646dceccc383cb5f01ab Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 23 Nov 2024 15:59:27 +0800 Subject: [PATCH 148/179] clash-verge-rev: 1.7.7 -> 2.0.2 --- .../cl/clash-verge-rev/Cargo-tauri.lock | 7579 ----------------- pkgs/by-name/cl/clash-verge-rev/package.nix | 46 +- pkgs/by-name/cl/clash-verge-rev/service.nix | 3 - pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 35 +- pkgs/by-name/cl/clash-verge-rev/webui.nix | 3 +- pkgs/top-level/all-packages.nix | 4 + 6 files changed, 42 insertions(+), 7628 deletions(-) delete mode 100644 pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock diff --git a/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock b/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock deleted file mode 100644 index 062fb642793d..000000000000 --- a/pkgs/by-name/cl/clash-verge-rev/Cargo-tauri.lock +++ /dev/null @@ -1,7579 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.15", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arboard" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" -dependencies = [ - "clipboard-win", - "core-graphics 0.23.2", - "image 0.25.1", - "log 0.4.22", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "windows-sys 0.48.0", - "wl-clipboard-rs", - "x11rb", -] - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-broadcast" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" -dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock 3.4.0", - "blocking", - "futures-lite 2.3.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log 0.4.22", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock 3.4.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.3.0", - "parking", - "polling 3.7.2", - "rustix 0.38.34", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" -dependencies = [ - "async-io 1.13.0", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" -dependencies = [ - "async-channel 2.3.1", - "async-io 2.3.3", - "async-lock 3.4.0", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.0", - "futures-lite 2.3.0", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "async-signal" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" -dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.34", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "auto-launch" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" -dependencies = [ - "dirs 4.0.0", - "thiserror", - "winreg 0.10.1", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2", -] - -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel 2.3.1", - "async-task", - "futures-io", - "futures-lite 2.3.0", - "piper", -] - -[[package]] -name = "boa_ast" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6fb81ca0f301f33aff7401e2ffab37dc9e0e4a1cf0ccf6b34f4d9e60aa0682" -dependencies = [ - "bitflags 2.6.0", - "boa_interner", - "boa_macros", - "indexmap 2.2.6", - "num-bigint", - "rustc-hash", -] - -[[package]] -name = "boa_engine" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600e4e4a65b26efcef08a7b1cf2899d3845a32e82e067ee3b75eaf7e413ff31c" -dependencies = [ - "arrayvec", - "bitflags 2.6.0", - "boa_ast", - "boa_gc", - "boa_interner", - "boa_macros", - "boa_parser", - "boa_profiler", - "bytemuck", - "cfg-if", - "dashmap", - "fast-float", - "hashbrown 0.14.5", - "icu_normalizer", - "indexmap 2.2.6", - "intrusive-collections", - "itertools", - "num-bigint", - "num-integer", - "num-traits", - "num_enum 0.7.2", - "once_cell", - "paste", - "pollster", - "portable-atomic", - "rand 0.8.5", - "regress", - "rustc-hash", - "ryu-js", - "serde", - "serde_json", - "sptr", - "static_assertions", - "tap", - "thin-vec", - "thiserror", - "time", -] - -[[package]] -name = "boa_gc" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c055ef3cd87ea7db014779195bc90c6adfc35de4902e3b2fe587adecbd384578" -dependencies = [ - "boa_macros", - "boa_profiler", - "hashbrown 0.14.5", - "thin-vec", -] - -[[package]] -name = "boa_interner" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cacc9caf022d92195c827a3e5bf83f96089d4bfaff834b359ac7b6be46e9187" -dependencies = [ - "boa_gc", - "boa_macros", - "hashbrown 0.14.5", - "indexmap 2.2.6", - "once_cell", - "phf 0.11.2", - "rustc-hash", - "static_assertions", -] - -[[package]] -name = "boa_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be9c93793b60dac381af475b98634d4b451e28336e72218cad9a20176218dbc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "boa_parser" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8592556849f0619ed142ce2b3a19086769314a8d657f93a5765d06dbce4818" -dependencies = [ - "bitflags 2.6.0", - "boa_ast", - "boa_interner", - "boa_macros", - "boa_profiler", - "fast-float", - "icu_properties", - "num-bigint", - "num-traits", - "regress", - "rustc-hash", -] - -[[package]] -name = "boa_profiler" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d8372f2d5cbac600a260de87877141b42da1e18d2c7a08ccb493a49cbd55c0" - -[[package]] -name = "brotli" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" -dependencies = [ - "serde", -] - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "cargo_toml" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "cc" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "clash-verge" -version = "1.7.7" -dependencies = [ - "anyhow", - "auto-launch", - "boa_engine", - "chrono", - "deelevate", - "delay_timer", - "dirs 5.0.1", - "dunce", - "log 0.4.22", - "log4rs", - "nanoid", - "network-interface", - "once_cell", - "open 5.2.0", - "parking_lot", - "percent-encoding", - "port_scanner", - "reqwest 0.12.5", - "runas", - "serde", - "serde_json", - "serde_yaml", - "sysinfo", - "sysproxy", - "tauri", - "tauri-build", - "tokio", - "users", - "warp", - "window-shadows", - "winreg 0.52.0", -] - -[[package]] -name = "clipboard-win" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" -dependencies = [ - "error-code", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.23.2", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concat-idents" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" -dependencies = [ - "quote", - "syn 2.0.68", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cron_clock" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8699d8ed16e3db689f8ae04d8dc3c6666a4ba7e724e5a157884b7cc385d16b" -dependencies = [ - "chrono", - "nom 7.1.3", - "once_cell", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.68", -] - -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.68", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.68", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "deelevate" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7397f8c48906dd9b5afc75001368c979418e5dff5575998a831eb2319b424e" -dependencies = [ - "lazy_static 1.5.0", - "pathsearch", - "rand 0.8.5", - "shared_library", - "termwiz", - "winapi", -] - -[[package]] -name = "delay_timer" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20eba879b7ee5f1d255d5666e16646fe384f899f71a4c0b4b0644e2e074964fe" -dependencies = [ - "anyhow", - "async-trait", - "autocfg", - "concat-idents", - "cron_clock", - "dashmap", - "event-listener 5.3.0", - "futures", - "log 0.4.22", - "lru", - "once_cell", - "rs-snowflake", - "rustc_version 0.2.3", - "smol", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive-new" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 2.0.68", -] - -[[package]] -name = "destructure_traitobject" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.4", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "embed-resource" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" -dependencies = [ - "cc", - "memchr", - "rustc_version 0.4.0", - "toml 0.8.14", - "vswhom", - "winreg 0.52.0", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" - -[[package]] -name = "enumflags2" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite", -] - -[[package]] -name = "fast-float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.1", - "rustc_version 0.4.0", -] - -[[package]] -name = "filedescriptor" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" -dependencies = [ - "libc", - "thiserror", - "winapi", -] - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.2.2", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log 0.4.22", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", - "winapi", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick 1.1.3", - "bstr", - "log 0.4.22", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" -dependencies = [ - "anyhow", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "handlebars" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb04af2006ea09d985fef82b81e0eb25337e51b691c76403332378a53d521edc" -dependencies = [ - "lazy_static 0.2.11", - "log 0.3.9", - "pest 0.3.3", - "quick-error", - "regex 0.2.11", - "serde", - "serde_json", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http 0.2.12", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.12", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log 0.4.22", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.11", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.0", - "httparse", - "itoa 1.0.11", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.4.0", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.29", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.4.0", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.4.0", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ico" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" -dependencies = [ - "byteorder", - "png", -] - -[[package]] -name = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - -[[package]] -name = "icu_collections" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" - -[[package]] -name = "icu_normalizer" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accb85c5b2e76f8dade22978b3795ae1e550198c6cfc7e915144e17cd6e2ab56" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3744fecc0df9ce19999cdaf1f9f3a48c253431ce1d67ef499128fe9d0b607ab" - -[[package]] -name = "icu_properties" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db9e559598096627aeca8cdfb98138a70eb4078025f8d1d5f2416a361241f756" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70a8b51ee5dd4ff8f20ee9b1dd1bc07afc110886a3747b1fec04cc6e5a15815" - -[[package]] -name = "icu_provider" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log 0.4.22", - "memchr", - "regex-automata 0.4.7", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", -] - -[[package]] -name = "image" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" -dependencies = [ - "bytemuck", - "byteorder", - "num-traits", - "png", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "infer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" -dependencies = [ - "cfb", -] - -[[package]] -name = "infer" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" -dependencies = [ - "cfb", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "interfaces" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec8f50a973916cac3da5057c986db05cd3346f38c78e9bc24f64cc9f6a3978f" -dependencies = [ - "bitflags 1.3.2", - "cc", - "handlebars", - "lazy_static 1.5.0", - "libc", - "nix 0.23.2", - "serde", - "serde_derive", -] - -[[package]] -name = "intrusive-collections" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b694dc9f70c3bda874626d2aed13b780f137aab435f4e9814121955cf706122e" -dependencies = [ - "memoffset 0.9.1", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "iptools" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c416c05ba2a10240e022887617af3128fccdbf69713214da0fc81a5690d00df7" -dependencies = [ - "ahash", - "once_cell", - "regex 1.10.5", -] - -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "javascriptcore-rs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" -dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log 0.4.22", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever", - "indexmap 1.9.3", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libappindicator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log 0.4.22", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading 0.7.4", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.22", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -dependencies = [ - "serde", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" - -[[package]] -name = "log4rs" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" -dependencies = [ - "anyhow", - "arc-swap", - "chrono", - "derivative", - "fnv", - "humantime", - "libc", - "log 0.4.22", - "log-mdc", - "once_cell", - "parking_lot", - "rand 0.8.5", - "serde", - "serde-value", - "serde_json", - "serde_yaml", - "thiserror", - "thread-id", - "typemap-ors", - "winapi", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "lru" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mac-notification-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log 0.4.22", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmem" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 0.2.12", - "httparse", - "log 0.4.22", - "memchr", - "mime", - "spin", - "version_check", -] - -[[package]] -name = "nanoid" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log 0.4.22", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys", - "num_enum 0.5.11", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "network-interface" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433419f898328beca4f2c6c73a1b52540658d92b0a99f0269330457e0fd998d5" -dependencies = [ - "cc", - "libc", - "serde", - "thiserror", - "winapi", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", - "memoffset 0.9.1", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nom" -version = "5.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "notify-rust" -version = "4.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" -dependencies = [ - "log 0.4.22", - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" -dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", - "objc2-core-data", - "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc2-encode" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.6.0", - "block2", - "libc", - "objc2", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.6.0", - "block2", - "objc2", - "objc2-foundation", - "objc2-metal", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "open" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] - -[[package]] -name = "open" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_pipe" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags 1.3.2", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.2", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pathsearch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da983bc5e582ab17179c190b4b66c7d76c5943a69c6d34df2a2b6bf8a2977b05" -dependencies = [ - "anyhow", - "libc", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" - -[[package]] -name = "pest" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.2.6", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" -dependencies = [ - "atomic-waker", - "fastrand 2.1.0", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" -dependencies = [ - "base64 0.22.1", - "indexmap 2.2.6", - "quick-xml 0.32.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log 0.4.22", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "pollster" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" - -[[package]] -name = "port_scanner" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325a6d2ac5dee293c3b2612d4993b98aec1dff096b0a2dae70ed7d95784a05da" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" -dependencies = [ - "libc", - "once_cell", - "socket2 0.5.7", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local 0.3.6", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" -dependencies = [ - "aho-corasick 1.1.3", - "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick 1.1.3", - "memchr", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "regress" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" -dependencies = [ - "hashbrown 0.14.5", - "memchr", -] - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log 0.4.22", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", - "hyper 1.4.0", - "hyper-rustls", - "hyper-tls 0.6.0", - "hyper-util", - "ipnet", - "js-sys", - "log 0.4.22", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pemfile 2.1.2", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.52.0", -] - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static 1.5.0", - "log 0.4.22", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.15", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rs-snowflake" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60ef3b82994702bbe4e134d98aadca4b49ed04440148985678d415c68127666" - -[[package]] -name = "runas" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" -dependencies = [ - "libc", - "security-framework-sys", - "which", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.23", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys 0.4.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" -dependencies = [ - "base64 0.22.1", - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" - -[[package]] -name = "rustls-webpki" -version = "0.102.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "ryu-js" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log 0.4.22", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest 2.7.11", -] - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "serde_json" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" -dependencies = [ - "indexmap 2.2.6", - "itoa 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.11", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.2.6", - "itoa 1.0.11", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static 1.5.0", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static 1.5.0", - "libc", -] - -[[package]] -name = "signal-hook" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smol" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" -dependencies = [ - "async-channel 1.9.0", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-net", - "async-process 1.8.1", - "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "soup2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" -dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags 1.3.2", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "sysinfo" -version = "0.30.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "windows 0.52.0", -] - -[[package]] -name = "sysproxy" -version = "0.3.0" -source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#bd912f90ae7f20b75c9278795551c13a7ea4c271" -dependencies = [ - "interfaces", - "iptools", - "log 0.4.22", - "thiserror", - "windows 0.52.0", - "winreg 0.52.0", - "xdg", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.11", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr 0.15.8", - "heck 0.5.0", - "pkg-config", - "toml 0.8.14", - "version-compare 0.2.0", -] - -[[package]] -name = "tao" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "cc", - "cocoa 0.24.1", - "core-foundation", - "core-graphics 0.22.3", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image 0.24.9", - "instant", - "jni", - "lazy_static 1.5.0", - "libappindicator", - "libc", - "log 0.4.22", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "serde", - "tao-macros", - "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement 0.39.0", - "x11-dl", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tauri" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" -dependencies = [ - "anyhow", - "base64 0.21.7", - "bytes", - "cocoa 0.24.1", - "dirs-next", - "dunce", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "getrandom 0.2.15", - "glib", - "glob", - "gtk", - "heck 0.5.0", - "http 0.2.12", - "ico 0.2.0", - "ignore", - "indexmap 1.9.3", - "infer 0.9.0", - "minisign-verify", - "nix 0.26.4", - "notify-rust", - "objc", - "once_cell", - "open 3.2.0", - "os_pipe", - "percent-encoding", - "png", - "rand 0.8.5", - "raw-window-handle", - "regex 1.10.5", - "reqwest 0.11.27", - "rfd", - "semver 1.0.23", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "shared_child", - "state", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "time", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "zip", -] - -[[package]] -name = "tauri-build" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "heck 0.5.0", - "json-patch", - "semver 1.0.23", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "1.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" -dependencies = [ - "base64 0.21.7", - "brotli", - "ico 0.3.0", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "regex 1.10.5", - "semver 1.0.23", - "serde", - "serde_json", - "sha2 0.10.8", - "tauri-utils", - "thiserror", - "time", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 1.0.109", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-runtime" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" -dependencies = [ - "gtk", - "http 0.2.12", - "http-range", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "uuid", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.14.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" -dependencies = [ - "arboard", - "cocoa 0.24.1", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" -dependencies = [ - "brotli", - "ctor", - "dunce", - "glob", - "heck 0.5.0", - "html5ever", - "infer 0.13.0", - "json-patch", - "kuchikiki", - "log 0.4.22", - "memchr", - "phf 0.11.2", - "proc-macro2", - "quote", - "semver 1.0.23", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows-version", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" -dependencies = [ - "quick-xml 0.31.0", - "windows 0.56.0", - "windows-version", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "terminfo" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" -dependencies = [ - "dirs 4.0.0", - "fnv", - "nom 5.1.3", - "phf 0.11.2", - "phf_codegen 0.11.2", -] - -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - -[[package]] -name = "termwiz" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ef6892cc0348a9b3b8c377addba91e0f6365863d92354bf27559dca81ee8c5" -dependencies = [ - "anyhow", - "base64 0.13.1", - "bitflags 1.3.2", - "cfg-if", - "filedescriptor", - "hex", - "lazy_static 1.5.0", - "libc", - "log 0.4.22", - "memmem", - "num-derive", - "num-traits", - "ordered-float", - "regex 1.10.5", - "semver 0.11.0", - "sha2 0.9.9", - "signal-hook", - "terminfo", - "termios", - "thiserror", - "ucd-trie", - "unicode-segmentation", - "vtparse", - "winapi", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] -name = "thin-vec" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "thread-id" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static 1.5.0", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa 1.0.11", - "js-sys", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log 0.4.22", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.14", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.13", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log 0.4.22", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log 0.4.22", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex 1.10.5", - "sharded-slab", - "smallvec", - "thread_local 1.1.8", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tree_magic_mini" -version = "3.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" -dependencies = [ - "fnv", - "home", - "memchr", - "nom 7.1.3", - "once_cell", - "petgraph", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log 0.4.22", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typemap-ors" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" -dependencies = [ - "unsafe-any-ors", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "ucd-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unsafe-any-ors" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" -dependencies = [ - "destructure_traitobject", -] - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log 0.4.22", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" -dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "vtparse" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "warp" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http 0.2.12", - "hyper 0.14.29", - "log 0.4.22", - "mime", - "mime_guess", - "multer", - "percent-encoding", - "pin-project", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-tungstenite", - "tokio-util", - "tower-service", - "tracing", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log 0.4.22", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.68", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.34", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" -dependencies = [ - "bitflags 2.6.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" -dependencies = [ - "proc-macro2", - "quick-xml 0.34.0", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" -dependencies = [ - "dlib", - "log 0.4.22", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "webpki-roots" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement 0.39.0", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex 1.10.5", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.34", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window-shadows" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08" -dependencies = [ - "cocoa 0.25.0", - "objc", - "raw-window-handle", - "windows-sys 0.48.0", -] - -[[package]] -name = "windows" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" -dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement 0.39.0", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" -dependencies = [ - "windows-core 0.56.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" -dependencies = [ - "windows-implement 0.56.0", - "windows-interface", - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.109", - "windows-tokens", -] - -[[package]] -name = "windows-implement" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-interface" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[package]] -name = "windows-version" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wl-clipboard-rs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" -dependencies = [ - "derive-new", - "libc", - "log 0.4.22", - "nix 0.28.0", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "wry" -version = "0.24.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" -dependencies = [ - "base64 0.13.1", - "block", - "cocoa 0.24.1", - "core-graphics 0.22.3", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever", - "http 0.2.12", - "kuchikiki", - "libc", - "log 0.4.22", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2 0.10.8", - "soup2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement 0.39.0", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "gethostname", - "rustix 0.38.34", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", -] - -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "xdg-home" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "zbus" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs 2.1.2", - "async-io 2.3.3", - "async-lock 3.4.0", - "async-process 2.2.3", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.3.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.68", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", -] - -[[package]] -name = "zvariant" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.68", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.68", -] diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 86cb3cfe303c..bfa128cf7728 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -10,40 +10,27 @@ v2ray-domain-list-community, copyDesktopItems, makeDesktopItem, + libsoup, }: let pname = "clash-verge-rev"; - version = "1.7.7"; + version = "2.0.2"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; - rev = "v${version}"; - hash = "sha256-5sd0CkUCV52wrBPo0IRIa1uqf2QNkjXuZhE33cZW3SY="; + rev = "refs/tags/v${version}"; + hash = "sha256-QLvJO1JFHPFOsVxNi6SCu2QuJQ9hCsO1+WKOjZL944w="; }; src-service = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-service"; - rev = "e74e419f004275cbf35a427337d3f8c771408f07"; # no meaningful tags in this repo. The only way is updating manully every time. - hash = "sha256-HyRTOqPj4SnV9gktqRegxOYz9c8mQHOX+IrdZlHhYpo="; + rev = "8b676086f2770e213cffea08ef31b54b886f8f11"; # no meaningful tags in this repo. The only way is updating manully every time. + hash = "sha256-vF26Bp52y2kNHwwtBjy3Of75qJpTriqvul29KmudHww="; }; - meta-unwrapped = { - description = "Clash GUI based on tauri"; - homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - Guanran928 - bot-wxt1221 - ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - }; - - service-cargo-hash = "sha256-NBeHR6JvdCp06Ug/UEtLY2tu3iCmlsCU0x8umRbJXLU="; + service-cargo-hash = "sha256-pMOCifffUyBkcXC8inZFZeZVHeaOt0LAu2jZUGQ7QdM="; service = callPackage ./service.nix { inherit @@ -51,8 +38,8 @@ let src-service service-cargo-hash pname + meta ; - meta = meta-unwrapped; }; webui = callPackage ./webui.nix { @@ -60,22 +47,24 @@ let version src pname + meta + npm-hash ; - meta = meta-unwrapped; - }; - sysproxy-hash = "sha256-TEC51s/viqXUoEH9rJev8LdC2uHqefInNcarxeogePk="; + npm-hash = "sha256-zsgZhLC+XUzlCUKKGAJV5MlSpWsoLmAgMwKkmAkAX9Q="; + vendor-hash = "sha256-fk3OdJ1CKNHkeUjquJtJgM7PDyPpQ7tssDnFZHMbQHI="; unwrapped = callPackage ./unwrapped.nix { inherit pname version src - sysproxy-hash + vendor-hash webui + meta + libsoup ; - meta = meta-unwrapped; }; meta = { @@ -87,10 +76,7 @@ let Guanran928 bot-wxt1221 ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; + platforms = lib.platforms.linux; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 3c8575f5b1e1..841ab702fbee 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -5,7 +5,6 @@ pkg-config, openssl, pname, - webkitgtk_4_0, service-cargo-hash, meta, }: @@ -18,12 +17,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config - rustPlatform.cargoSetupHook ]; buildInputs = [ openssl - webkitgtk_4_0 ]; env = { diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 966efa763d19..644a5f2871a9 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -3,13 +3,15 @@ version, src, libayatana-appindicator, - sysproxy-hash, + vendor-hash, + glib, webui, pkg-config, + libsoup, rustPlatform, makeDesktopItem, meta, - webkitgtk_4_0, + webkitgtk_4_1, openssl, }: rustPlatform.buildRustPackage { @@ -17,24 +19,26 @@ rustPlatform.buildRustPackage { pname = "${pname}-unwrapped"; sourceRoot = "${src.name}/src-tauri"; - cargoLock = { - lockFile = ./Cargo-tauri.lock; - outputHashes = { - "sysproxy-0.3.0" = sysproxy-hash; - }; - }; + useFetchCargoVendor = true; + cargoHash = vendor-hash; env = { OPENSSL_NO_VENDOR = 1; }; postPatch = '' - substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ - --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - substituteInPlace ./tauri.conf.json \ - --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \ - --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""' - sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json + ls $cargoDepsCopy + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + + substituteInPlace $cargoDepsCopy/sysproxy-*/src/linux.rs \ + --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' + + substituteInPlace ./tauri.conf.json \ + --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""' + sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json + sed -i -e '/sidecar/d' -e '/resources/d' tauri.linux.conf.json ''; nativeBuildInputs = [ @@ -44,7 +48,8 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk_4_0 + libsoup + webkitgtk_4_1 ]; postInstall = '' diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix index 792fbc5be8b8..7cd35cd6c368 100644 --- a/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -6,13 +6,14 @@ nodejs, stdenv, meta, + npm-hash, }: stdenv.mkDerivation { inherit version src meta; pname = "${pname}-webui"; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-ZKDhBdVyLIPf7CQaYUvj9dJd3lA3zsqroSjTyvOmunQ="; + hash = npm-hash; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c184a3976d6..eb0f6d6122bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18822,4 +18822,8 @@ with pkgs; libpostalWithData = callPackage ../by-name/li/libpostal/package.nix { withData = true; }; + + clash-verge-rev = callPackage ../by-name/cl/clash-verge-rev/package.nix { + libsoup = libsoup_3; + }; } From cdddc34d58b8c17e86daa583adcdfa35456189ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 13:43:43 +0000 Subject: [PATCH 149/179] dysk: 2.9.1 -> 2.10.0 --- pkgs/by-name/dy/dysk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index f8d7abf7511c..fe97fc2aac4d 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-PGl2pUeLPznut/ETJdaQlin9thDBPvqBE30cgXwV+KM="; + hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA="; }; - cargoHash = "sha256-ppOAQ6Y9GJNLwGbbg1qfQ7ArVKiYxt26oEEWMOjbu0w="; + cargoHash = "sha256-QE7gHHKNKqyMmqovzGR3zKgE7SEzGFkc2mYkBG6V6j0="; nativeBuildInputs = [ installShellFiles From 0302423dadfa529e51498ba3c8dca4d4e9dd60f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Dec 2024 15:01:24 +0100 Subject: [PATCH 150/179] plasma5Packages.qtmultimedia: drop already applied patch https://hydra.nixos.org/build/282160960/nixlog/2/tail --- pkgs/development/libraries/qt-5/5.15/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 81cdd036cc60..022e2d970a86 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -72,14 +72,6 @@ let hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; }) ]; - qtmultimedia = lib.optionals stdenv.hostPlatform.isDarwin [ - # build patch for qtmultimedia with xcode 15 - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; - stripLen = 1; - hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs="; - }) - ]; qtpim = [ ## Upstream patches after the Qt6 transition that apply without problems & fix bugs From 8f744ef29c8b84e0fcdbcb9eec693e54ac1b5ffc Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 21 Dec 2024 15:07:55 +0100 Subject: [PATCH 151/179] kanidm: 1.4.4 -> 1.4.5 --- pkgs/by-name/ka/kanidm/1_4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix index f0820e203a74..73d7a7a2f7f9 100644 --- a/pkgs/by-name/ka/kanidm/1_4.nix +++ b/pkgs/by-name/ka/kanidm/1_4.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.4.4"; - hash = "sha256-AXgq9ohnSeQvq1IIhxMhe+FhX6/hyvRsJCI4VaiN/MQ="; - cargoHash = "sha256-/PsQ9yqyhSub1Qg2A3wOsgucq4rM0CU4uA8tEOJhtAU="; + version = "1.4.5"; + hash = "sha256-0nn/ZyjkLXWXBZasNhbeEynEN52cmZQAcgg3hLmRpdo="; + cargoHash = "sha256-sLz1EdczSj0/ACLUpWex3i8ZUhNeyU/RVwuAqccLIz8="; } From e5faa4fb5178c8e8c0db0168a6144b2076d602c7 Mon Sep 17 00:00:00 2001 From: Yohann Boniface Date: Sat, 21 Dec 2024 15:47:46 +0100 Subject: [PATCH 152/179] imapdedup: init at 1.1 (#355169) imapdedup: init ad 1.1 --- pkgs/by-name/im/imapdedup/package.nix | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/im/imapdedup/package.nix diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix new file mode 100644 index 000000000000..03dc0fdc78d4 --- /dev/null +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -0,0 +1,31 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: +python3Packages.buildPythonApplication rec { + pname = "imapdedup"; + version = "1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "quentinsf"; + repo = "IMAPdedup"; + rev = "refs/tags/${version}"; + hash = "sha256-s49nnMjX1beZKTrlcjzp0nESIVRb/LZDycpnzz8fG+o="; + }; + + build-system = with python3Packages; [ hatchling ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "imapdedup" ]; + + meta = { + description = "Duplicate email message remover"; + homepage = "https://github.com/quentinsf/IMAPdedup"; + maintainers = with lib.maintainers; [ sigmanificient ]; + license = with lib.licenses; [ gpl2Only ]; + mainProgram = "imapdedup"; + }; +} From 302f9d9b6f07da614c840fd1f22f156edc7825a1 Mon Sep 17 00:00:00 2001 From: kraanzu Date: Sat, 21 Dec 2024 16:10:29 +0530 Subject: [PATCH 153/179] dooit-extras: add package Update pkgs/by-name/do/dooit-extras/package.nix Co-authored-by: Austin Horstman Update pkgs/by-name/do/dooit-extras/package.nix Co-authored-by: Austin Horstman Update pkgs/by-name/do/dooit-extras/package.nix Co-authored-by: Austin Horstman Update pkgs/by-name/do/dooit-extras/package.nix Co-authored-by: Austin Horstman Update pkgs/by-name/do/dooit-extras/package.nix Co-authored-by: Austin Horstman --- pkgs/by-name/do/dooit-extras/package.nix | 41 ++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/do/dooit-extras/package.nix diff --git a/pkgs/by-name/do/dooit-extras/package.nix b/pkgs/by-name/do/dooit-extras/package.nix new file mode 100644 index 000000000000..ec68b74ba121 --- /dev/null +++ b/pkgs/by-name/do/dooit-extras/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + python311, + dooit, + nix-update-script, +}: +let + python3 = python311; +in +python3.pkgs.buildPythonPackage rec { + pname = "dooit-extras"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dooit-org"; + repo = "dooit-extras"; + tag = "v${version}"; + hash = "sha256-ZBzzH8k4oC3ovLF9+9rzzFZaDDoOvcbX5NCh1WBedK4="; + }; + + build-system = with python3.pkgs; [ poetry-core ]; + buildInputs = [ dooit ]; + + # No tests available + doCheck = false; + + passthru.updateScript = nix-update-script { + }; + + meta = with lib; { + description = "Extra Utilities for Dooit"; + homepage = "https://github.com/dooit-org/dooit-extras"; + changelog = "https://github.com/dooit-org/dooit-extras/blob/${src.tag}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ + kraanzu + ]; + }; +} From 1f57576570725394c1f22eec4ec863338b426202 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 21 Dec 2024 17:21:14 +0100 Subject: [PATCH 154/179] php83: 8.3.14 -> 8.3.15 ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.15 --- pkgs/development/interpreters/php/8.3.nix | 4 ++-- pkgs/top-level/php-packages.nix | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index abae36f9a5ed..aa87f534dc70 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.14"; - hash = "sha256-9W+mac5MAUUqKSH0ADTXedjCuX0HSUk61HgYE7kiHPg="; + version = "8.3.15"; + hash = "sha256-sWdaT/cwtYEbjmp2h0iMQug14Vapl3aqPm8Ber2jvpg="; } ); in diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 87724fc2bd75..5dc84c34b3e0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -712,15 +712,6 @@ lib.makeScope pkgs.newScope ( # Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided doCheck = !stdenv.hostPlatform.isDarwin && lib.versionOlder php.version "8.4"; internalDeps = [ php.extensions.session ]; - patches = - lib.optionals (lib.versionAtLeast php.version "8.3" && lib.versionOlder php.version "8.4") - [ - # https://github.com/php/php-src/pull/16733 (fix soap test) - (fetchpatch { - url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch"; - hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM="; - }) - ]; } { name = "sockets"; From 3210b3874caf8a41d4d036163f51c1a7d2e4ad88 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 21 Dec 2024 16:30:05 +0000 Subject: [PATCH 155/179] factorio, factorio-experimental: 2.0.23 -> 2.0.28 --- pkgs/by-name/fa/factorio/versions.json | 73 +++++++++++++------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index a39fbc165c7f..a276ded9f049 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,38 +3,37 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.23.tar.xz" + "factorio_linux_2.0.28.tar.xz" ], - "name": "factorio_alpha_x64-2.0.23.tar.xz", + "name": "factorio_alpha_x64-2.0.28.tar.xz", "needsAuth": true, - "sha256": "3a3f27a5364d33896c8b35d352d0d2d6086b4ba98627eda71b26e57127309bfb", + "sha256": "d3acf17e4ca56e3332e920a015d5ca53aea73088460c8b2f67e04b04e7b912bb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.23/alpha/linux64", - "version": "2.0.23" + "url": "https://factorio.com/get-download/2.0.28/alpha/linux64", + "version": "2.0.28" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.23.tar.xz" + "factorio_linux_2.0.28.tar.xz" ], - "name": "factorio_alpha_x64-2.0.23.tar.xz", + "name": "factorio_alpha_x64-2.0.28.tar.xz", "needsAuth": true, - "sha256": "3a3f27a5364d33896c8b35d352d0d2d6086b4ba98627eda71b26e57127309bfb", + "sha256": "d3acf17e4ca56e3332e920a015d5ca53aea73088460c8b2f67e04b04e7b912bb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.23/alpha/linux64", - "version": "2.0.23" + "url": "https://factorio.com/get-download/2.0.28/alpha/linux64", + "version": "2.0.28" } }, "demo": { "experimental": { "candidateHashFilenames": [ - "factorio_demo_x64_1.1.110.tar.xz" + "factorio_demo_x64_2.0.27.tar.xz" ], - "name": "factorio_demo_x64-1.1.110.tar.xz", + "name": "factorio_demo_x64-2.0.27.tar.xz", "needsAuth": false, - "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.110/demo/linux64", - "version": "1.1.110" + "url": "https://factorio.com/get-download/2.0.27/demo/linux64", + "version": "2.0.27" }, "stable": { "candidateHashFilenames": [ @@ -51,51 +50,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.23.tar.xz" + "factorio-space-age_linux_2.0.28.tar.xz" ], - "name": "factorio_expansion_x64-2.0.23.tar.xz", + "name": "factorio_expansion_x64-2.0.28.tar.xz", "needsAuth": true, - "sha256": "8c6bb2c3afd198b8d5e1042f2babcb2db2d55645d1e84d9cfbba77cd83ae9e6a", + "sha256": "e3eee33c439abaffa305dd5c86edea97fbaa2a2b34c368cae3595c1d5d22739e", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.23/expansion/linux64", - "version": "2.0.23" + "url": "https://factorio.com/get-download/2.0.28/expansion/linux64", + "version": "2.0.28" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.23.tar.xz" + "factorio-space-age_linux_2.0.28.tar.xz" ], - "name": "factorio_expansion_x64-2.0.23.tar.xz", + "name": "factorio_expansion_x64-2.0.28.tar.xz", "needsAuth": true, - "sha256": "8c6bb2c3afd198b8d5e1042f2babcb2db2d55645d1e84d9cfbba77cd83ae9e6a", + "sha256": "e3eee33c439abaffa305dd5c86edea97fbaa2a2b34c368cae3595c1d5d22739e", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.23/expansion/linux64", - "version": "2.0.23" + "url": "https://factorio.com/get-download/2.0.28/expansion/linux64", + "version": "2.0.28" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.23.tar.xz", - "factorio_headless_x64_2.0.23.tar.xz" + "factorio-headless_linux_2.0.28.tar.xz", + "factorio_headless_x64_2.0.28.tar.xz" ], - "name": "factorio_headless_x64-2.0.23.tar.xz", + "name": "factorio_headless_x64-2.0.28.tar.xz", "needsAuth": false, - "sha256": "e819fc9ad6df061bf9d4bffc91988dd18d0e3982c8b1c22c0525d78bda3ef216", + "sha256": "ea9937b6adc7a18e17a4e1e64992ec389407497b36e68280bb14fcdd4c884dd3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.23/headless/linux64", - "version": "2.0.23" + "url": "https://factorio.com/get-download/2.0.28/headless/linux64", + "version": "2.0.28" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.23.tar.xz", - "factorio_headless_x64_2.0.23.tar.xz" + "factorio-headless_linux_2.0.28.tar.xz", + "factorio_headless_x64_2.0.28.tar.xz" ], - "name": "factorio_headless_x64-2.0.23.tar.xz", + "name": "factorio_headless_x64-2.0.28.tar.xz", "needsAuth": false, - "sha256": "e819fc9ad6df061bf9d4bffc91988dd18d0e3982c8b1c22c0525d78bda3ef216", + "sha256": "ea9937b6adc7a18e17a4e1e64992ec389407497b36e68280bb14fcdd4c884dd3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.23/headless/linux64", - "version": "2.0.23" + "url": "https://factorio.com/get-download/2.0.28/headless/linux64", + "version": "2.0.28" } } } From 4bd2716b3a6eeb3e0cecd5ee6e742ee262dd179c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 21 Dec 2024 07:59:11 -0800 Subject: [PATCH 156/179] python313Packages.dnspython: don't run tests that connect to internet --- pkgs/development/python-modules/dnspython/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index fa2a2565e916..a41087b49d6e 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, aioquic, buildPythonPackage, @@ -55,6 +56,11 @@ buildPythonPackage rec { checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC; + # don't run live tests + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NO_INTERNET = 1; + }; + disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" From 0a23c29e2de1c7d47d42ee0cb8539f7279c8a841 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:23:48 +0300 Subject: [PATCH 157/179] bolt-launcher: mesa -> libgbm, fix invocation --- pkgs/by-name/bo/bolt-launcher/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 5b4ce314e5e1..6b3a1d35b2b7 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -10,7 +10,7 @@ libcef, luajit, xorg, - mesa, + libgbm, glib, nss, nspr, @@ -56,7 +56,7 @@ let xorg.libXext xorg.libXfixes xorg.libXrandr - mesa + libgbm gtk3 pango cairo @@ -106,7 +106,7 @@ let ]; buildInputs = [ - mesa + libgbm xorg.libX11 xorg.libxcb libarchive @@ -198,7 +198,7 @@ buildFHSEnv { ln -s ${bolt}/share/icons/hicolor/256x256/apps/*.png $out/share/icons/hicolor/256x256/apps/ ''; - runScript = "${bolt.pname}"; + runScript = "${bolt.name}"; meta = { homepage = "https://github.com/Adamcake/Bolt"; @@ -209,6 +209,6 @@ buildFHSEnv { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ nezia ]; platforms = lib.platforms.linux; - mainProgram = "${bolt.pname}"; + mainProgram = "${bolt.name}"; }; } From d645fcf634ce2905157bd6f030473c7e24f2cf70 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:37:05 +0300 Subject: [PATCH 158/179] cogl: libgbm -> mesa --- pkgs/development/libraries/cogl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index fce2b2c48317..4a72584ada3e 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -14,7 +14,7 @@ gobject-introspection, wayland, gnome, - libgbm, + mesa, automake, autoconf, gstreamerSupport ? true, @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - libgbm + mesa # actually uses eglmesaext libGL xorg.libXrandr xorg.libXfixes From 5c452021b931f38a3f6c5a89a87a128f360c028e Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:42:37 +0300 Subject: [PATCH 159/179] cogl: disable gstreamer by default Is broken with latest gstreamer, upstream is dead, this at least gets something building --- pkgs/development/libraries/cogl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 4a72584ada3e..469a33c8d713 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -17,7 +17,7 @@ mesa, automake, autoconf, - gstreamerSupport ? true, + gstreamerSupport ? false, gst_all_1, harfbuzz, OpenGL, From d6e57f3d18b58623838313825fc6d1acd85d5f5d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:16:03 +0300 Subject: [PATCH 160/179] kmscube: mesa -> libgbm --- pkgs/by-name/km/kmscube/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/km/kmscube/package.nix b/pkgs/by-name/km/kmscube/package.nix index f9810eba24d0..a6c42798a00e 100644 --- a/pkgs/by-name/km/kmscube/package.nix +++ b/pkgs/by-name/km/kmscube/package.nix @@ -7,7 +7,7 @@ libdrm, libX11, libGL, - mesa, + libgbm, pkg-config, gst_all_1, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { libdrm libX11 libGL - mesa + libgbm ] ++ (with gst_all_1; [ gstreamer From de3a7908581ee3e0b73fe97f28fd28d854e9d5f6 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:24:25 +0300 Subject: [PATCH 161/179] mangayomi: mesa -> libgbm Currently doesn't build but this shouldn't make it worse, at least. --- pkgs/by-name/ma/mangayomi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index fd0b8770e378..d88a2169d943 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -27,7 +27,7 @@ libpulseaudio, libcaca, libdrm, - mesa, + libgbm, libXScrnSaver, nv-codec-headers-11, libXpresent, @@ -125,7 +125,7 @@ flutter324.buildFlutterApplication { libpulseaudio libcaca libdrm - mesa + libgbm libXScrnSaver libXpresent nv-codec-headers-11 From ad27e26258e6de54b26f804e3c8730c000cd7051 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:35:34 +0300 Subject: [PATCH 162/179] mutter: add comment on why mesa and not libgbm --- pkgs/by-name/mu/mutter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 55bd8a1cae53..8e49bb22ca38 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext libxcvt - mesa + mesa # actually uses eglmesaext meson ninja xvfb-run From 52b3c7292e7f7b54048157558f8022dee8532f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 21 Dec 2024 19:50:30 +0100 Subject: [PATCH 163/179] cinny-unwrapped: pin Node 20 --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 515638274145..35166edf8de6 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -10,6 +10,7 @@ pango, stdenv, olm, + nodejs_20, }: buildNpmPackage rec { @@ -23,6 +24,10 @@ buildNpmPackage rec { hash = "sha256-BoUQURCfEu5kocMm8T25cVl8hgZGxcxrMzQZOl2fAbY="; }; + # canvas, a transitive dependency of cinny, fails to build with Node 22 + # https://github.com/Automattic/node-canvas/issues/2448 + nodejs = nodejs_20; + npmDepsHash = "sha256-fDoia6evCmXZgeIKL0coRo3yunX1dfud31ROgmop2Sc="; # Fix error: no member named 'aligned_alloc' in the global namespace From 35fd0409bf0171c4ea1bb48e3696e177dda6070b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:49:57 +0300 Subject: [PATCH 164/179] mutter: propagate mesa Headers depend on eglmesaext --- pkgs/by-name/mu/mutter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 8e49bb22ca38..6ae910725240 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -100,13 +100,13 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ # required for pkg-config to detect mutter-mtk graphene + mesa # actually uses eglmesaext ]; nativeBuildInputs = [ desktop-file-utils gettext libxcvt - mesa # actually uses eglmesaext meson ninja xvfb-run From 656cab83ce77eb5a391bd80ea3bd8cc735079ae1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:35:21 +0300 Subject: [PATCH 165/179] mutter43: libgbm -> mesa --- pkgs/by-name/mu/mutter43/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mutter43/package.nix b/pkgs/by-name/mu/mutter43/package.nix index 0f3345e92f70..8ddc991230dc 100644 --- a/pkgs/by-name/mu/mutter43/package.nix +++ b/pkgs/by-name/mu/mutter43/package.nix @@ -32,7 +32,7 @@ libgudev, libwacom, xwayland, - libgbm, + mesa, meson, gnome-settings-daemon, xorgserver, @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils gettext libxcvt - libgbm + mesa # actually uses eglmesaext meson ninja xvfb-run From 8b65c67d9b97c5d69107f490c0ca113cefe1ce40 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:50:12 +0300 Subject: [PATCH 166/179] mutter43: propagate mesa Headers depend on eglmesaext --- pkgs/by-name/mu/mutter43/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mutter43/package.nix b/pkgs/by-name/mu/mutter43/package.nix index 8ddc991230dc..81c526b956c0 100644 --- a/pkgs/by-name/mu/mutter43/package.nix +++ b/pkgs/by-name/mu/mutter43/package.nix @@ -105,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: { libXtst libcap_ng graphene + mesa # actually uses eglmesaext ]; nativeBuildInputs = [ desktop-file-utils gettext libxcvt - mesa # actually uses eglmesaext meson ninja xvfb-run From b736758fd012bf2e805a02cd097792094795e41f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:24:49 +0300 Subject: [PATCH 167/179] nextcloud-talk-desktop: mesa -> libgbm --- pkgs/by-name/ne/nextcloud-talk-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index 49a050af4113..975ccc796d8a 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -9,7 +9,7 @@ libxkbcommon, alsa-lib, at-spi2-core, - mesa, + libgbm, pango, libdrm, vivaldi-ffmpeg-codecs, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon gtk3 vivaldi-ffmpeg-codecs - mesa + libgbm libGL libglvnd ] From 301818815450cee696fb829017662a4a7dd771c2 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:26:50 +0300 Subject: [PATCH 168/179] ninjas2: drop unused mesa dependency --- pkgs/by-name/ni/ninjas2/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index e8eed77e4faa..11cb31f589fa 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -6,7 +6,6 @@ libGL, pkg-config, xorg, - mesa, libsndfile, libsamplerate, }: @@ -32,7 +31,6 @@ stdenv.mkDerivation rec { libjack2 xorg.libX11 libGL - mesa libsndfile libsamplerate ]; From 65019c34b931a207d2970ea8128caa6aabc13d30 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:28:54 +0300 Subject: [PATCH 169/179] nordpass: mesa -> libgbm --- pkgs/by-name/no/nordpass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nordpass/package.nix b/pkgs/by-name/no/nordpass/package.nix index 3cc9f4ae920a..fd372d7c6bd3 100644 --- a/pkgs/by-name/no/nordpass/package.nix +++ b/pkgs/by-name/no/nordpass/package.nix @@ -27,7 +27,7 @@ at-spi2-atk, at-spi2-core, libdrm, - mesa, + libgbm, libxkbcommon, harfbuzz, libsecret, @@ -64,7 +64,7 @@ let libpng libsecret libxkbcommon - mesa + libgbm nspr nss_latest pango From 8055341662a0bb403c44e85718d03834a846fc06 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:30:30 +0300 Subject: [PATCH 170/179] oneanime: mesa -> libgbm More flutter --- pkgs/by-name/on/oneanime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index 5abde1124c9e..575ef8020dd0 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -11,7 +11,7 @@ libepoxy, libpulseaudio, libdrm, - mesa, + libgbm, libva, libva1, libvdpau, @@ -88,7 +88,7 @@ flutter324.buildFlutterApplication rec { libepoxy libpulseaudio libdrm - mesa + libgbm ]; postPatch = '' From fa4dd02f7b7079b53d34d02364b12a0e39a63f4b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:50:23 +0300 Subject: [PATCH 171/179] pantheon.elementary-greeter: remove unused mesa dependency --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index f4d7451835f0..1dc0bac2b3dd 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -15,7 +15,6 @@ , libgee , libhandy , gnome-settings-daemon -, mesa , mutter , elementary-icon-theme , wingpanel-with-indicators @@ -67,7 +66,6 @@ stdenv.mkDerivation rec { libgee libhandy lightdm - mesa # for libEGL mutter ]; From 6b6ce7ea08364dbbbdb9f1f103e47468880caec2 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:50:32 +0300 Subject: [PATCH 172/179] pantheon.gala: remove unused mesa dependency --- pkgs/desktops/pantheon/desktop/gala/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 3864fa39ed49..6233e3f16790 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -17,7 +17,6 @@ , bamf , libcanberra-gtk3 , gnome-desktop -, mesa , mutter , gnome-settings-daemon , wrapGAppsHook3 @@ -77,7 +76,6 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee - mesa # for libEGL mutter systemd ]; From 2a00681ff90e4a502959639766eccdb2990d8bf3 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:50:42 +0300 Subject: [PATCH 173/179] pantheon.wingpanel: remove unused mesa dependency --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index e6fb2a57e7d2..27e4667c2b2f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -14,7 +14,6 @@ , granite , gettext , mutter -, mesa , json-glib , elementary-gtk-theme , elementary-icon-theme @@ -59,7 +58,6 @@ stdenv.mkDerivation rec { json-glib libgee mutter - mesa # for libEGL ]; preFixup = '' From d7cb2a19d8a69cda99780544ecf8b500c9503c6d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:29:50 +0300 Subject: [PATCH 174/179] pilipalax: mesa -> libgbm Another broken Flutter app. --- pkgs/by-name/pi/pilipalax/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix index f03726301f2a..3b0b43d2ee75 100644 --- a/pkgs/by-name/pi/pilipalax/package.nix +++ b/pkgs/by-name/pi/pilipalax/package.nix @@ -26,7 +26,7 @@ libpulseaudio, libcaca, libdrm, - mesa, + libgbm, libXScrnSaver, nv-codec-headers-11, libXpresent, @@ -91,7 +91,7 @@ flutter324.buildFlutterApplication rec { libpulseaudio libcaca libdrm - mesa + libgbm libXScrnSaver libXpresent nv-codec-headers-11 From 6a8959354387b219f0c9d91b39367d4f02e33671 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:54:12 +0300 Subject: [PATCH 175/179] python312Packages.kivy: drop unused mesa dependency Not technically unused, but used as a software fallback in weird browser cases. --- pkgs/development/python-modules/kivy/default.nix | 2 -- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index 26a1bba38bce..273de9cca3da 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -7,7 +7,6 @@ cython_0, docutils, kivy-garden, - mesa, mtdev, SDL2, SDL2_image, @@ -50,7 +49,6 @@ buildPythonPackage rec { SDL2_mixer ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - mesa mtdev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 21bafc9ec4c2..5862b63e1140 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6971,7 +6971,6 @@ self: super: with self; { kitchen = callPackage ../development/python-modules/kitchen { }; kivy = callPackage ../development/python-modules/kivy { - inherit (pkgs) mesa; inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate ApplicationServices AVFoundation; }; From 96aec0ee9d414f3df0005a69395f70d7c68440fc Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:31:47 +0300 Subject: [PATCH 176/179] waybox: mesa -> libgbm --- pkgs/by-name/wa/waybox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix index 4908afd37caa..0bae81241e33 100644 --- a/pkgs/by-name/wa/waybox/package.nix +++ b/pkgs/by-name/wa/waybox/package.nix @@ -8,7 +8,7 @@ libxml2, libevdev, libinput, - mesa, + libgbm, meson, ninja, pixman, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libevdev libinput - mesa # for libEGL + libgbm pixman udev wayland From 002c2a741b2d4d9f6100773d82c2808733127532 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 21:42:24 +0300 Subject: [PATCH 177/179] zepp-simulator: mesa -> libgbm --- pkgs/by-name/ze/zepp-simulator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix index ee8dc262c87b..f8d4503660f9 100644 --- a/pkgs/by-name/ze/zepp-simulator/package.nix +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -35,7 +35,7 @@ dtc, capstone_4, libjpeg8, - mesa, + libgbm, curlWithGnuTls, }: @@ -102,7 +102,7 @@ stdenv.mkDerivation { libjpeg8 dtc capstone_4 - mesa + libgbm curlWithGnuTls ]; From 9ec0f27a2656e42a9b54f27ad931803d1b952e6b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 22:01:13 +0300 Subject: [PATCH 178/179] cwiid: suppress warning to fix build Upstream has been dead for 15 years and Kodi uses this for some reason. --- pkgs/by-name/cw/cwiid/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cw/cwiid/package.nix b/pkgs/by-name/cw/cwiid/package.nix index 98e5fc9c1a84..c9b842e6a493 100644 --- a/pkgs/by-name/cw/cwiid/package.nix +++ b/pkgs/by-name/cw/cwiid/package.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { flex ]; + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; NIX_LDFLAGS = "-lbluetooth"; postInstall = '' From da1f80d10a338585d16c649dc8804a19a62a1753 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 22:04:05 +0300 Subject: [PATCH 179/179] kodi: fix comment on why Mesa is used --- pkgs/applications/video/kodi/unwrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index cfd8251408e9..8e65a6a11037 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -126,7 +126,7 @@ in stdenv.mkDerivation (finalAttrs: { bluez giflib glib harfbuzz lcms2 libpthreadstubs ffmpeg flatbuffers fstrcmp rapidjson lirc - mesa # for libEGL + mesa # uses eglext_angle.h, which is not provided by glvnd ] ++ lib.optionals x11Support [ libX11 xorgproto libXt libXmu libXext.dev libXdmcp