diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-25 00:12:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-25 00:12:10 +0000 |
| commit | 28db109a585f3ddecf6fa3878d36da889651f12b (patch) | |
| tree | 1c9a98c75872ea53008982d65aea3db5f2c07bd8 | |
| parent | c96281b0dd19771613470e822523276191d1d201 (diff) | |
| parent | 67273d0def72ec49e6d4c7225e032a87bbdaaca7 (diff) | |
| download | nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.tar nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.tar.gz nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.tar.bz2 nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.tar.lz nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.tar.xz nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.tar.zst nixlib-28db109a585f3ddecf6fa3878d36da889651f12b.zip | |
Merge master into haskell-updates
491 files changed, 14523 insertions, 1734 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7b0659a9d027..47fea580e82d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -322,9 +322,8 @@ pkgs/applications/version-management/forgejo @bendlas @emilylange /pkgs/development/ocaml-modules @ulrikstrid # ZFS -pkgs/os-specific/linux/zfs @raitobezarius -nixos/lib/make-single-disk-zfs-image.nix @raitobezarius -nixos/lib/make-multi-disk-zfs-image.nix @raitobezarius +pkgs/os-specific/linux/zfs/2_1.nix @raitobezarius +pkgs/os-specific/linux/zfs/generic.nix @raitobezarius nixos/modules/tasks/filesystems/zfs.nix @raitobezarius nixos/tests/zfs.nix @raitobezarius diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ada8c66e3618..0d21175914a3 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -45,7 +45,7 @@ rec { else args'; # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. - rust = assert !(args ? rust && args ? rustc); args.rust or args.rustc or {}; + rust = args.rust or args.rustc or {}; final = { # Prefer to parse `config` as it is strictly more informative. @@ -169,96 +169,6 @@ rec { # TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs. rustc = args.rustc or {}; - rust = rust // { - # Once args.rustc.platform.target-family is deprecated and - # removed, there will no longer be any need to modify any - # values from args.rust.platform, so we can drop all the - # "args ? rust" etc. checks, and merge args.rust.platform in - # /after/. - platform = rust.platform or {} // { - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch - arch = - /**/ if rust ? platform then rust.platform.arch - else if final.isAarch32 then "arm" - else if final.isMips64 then "mips64" # never add "el" suffix - else if final.isPower64 then "powerpc64" # never add "le" suffix - else final.parsed.cpu.name; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os - os = - /**/ if rust ? platform then rust.platform.os or "none" - else if final.isDarwin then "macos" - else final.parsed.kernel.name; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family - target-family = - /**/ if args ? rust.platform.target-family then args.rust.platform.target-family - else if args ? rustc.platform.target-family - then - ( - # Since https://github.com/rust-lang/rust/pull/84072 - # `target-family` is a list instead of single value. - let - f = args.rustc.platform.target-family; - in - if builtins.isList f then f else [ f ] - ) - else lib.optional final.isUnix "unix" - ++ lib.optional final.isWindows "windows"; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor - vendor = let - inherit (final.parsed) vendor; - in rust.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; - }; - - # The name of the rust target, even if it is custom. Adjustments are - # because rust has slightly different naming conventions than we do. - rustcTarget = let - inherit (final.parsed) cpu kernel abi; - cpu_ = rust.platform.arch or { - "armv7a" = "armv7"; - "armv7l" = "armv7"; - "armv6l" = "arm"; - "armv5tel" = "armv5te"; - "riscv64" = "riscv64gc"; - }.${cpu.name} or cpu.name; - vendor_ = final.rust.platform.vendor; - in rust.config - or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; - - # The name of the rust target if it is standard, or the json file - # containing the custom target spec. - rustcTargetSpec = - /**/ if rust ? platform - then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform) - else final.rust.rustcTarget; - - # The name of the rust target if it is standard, or the - # basename of the file containing the custom target spec, - # without the .json extension. - # - # This is the name used by Cargo for target subdirectories. - cargoShortTarget = - lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}"); - - # When used as part of an environment variable name, triples are - # uppercased and have all hyphens replaced by underscores: - # - # https://github.com/rust-lang/cargo/pull/9169 - # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 - cargoEnvVarTarget = - lib.strings.replaceStrings ["-"] ["_"] - (lib.strings.toUpper final.rust.cargoShortTarget); - - # True if the target is no_std - # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 - isNoStdTarget = - builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"]; - }; - linuxArch = if final.isAarch32 then "arm" else if final.isAarch64 then "arm64" @@ -356,7 +266,97 @@ rec { }) // mapAttrs (n: v: v final.parsed) inspect.predicates // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates - // args; + // args // { + rust = rust // { + # Once args.rustc.platform.target-family is deprecated and + # removed, there will no longer be any need to modify any + # values from args.rust.platform, so we can drop all the + # "args ? rust" etc. checks, and merge args.rust.platform in + # /after/. + platform = rust.platform or {} // { + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch + arch = + /**/ if rust ? platform then rust.platform.arch + else if final.isAarch32 then "arm" + else if final.isMips64 then "mips64" # never add "el" suffix + else if final.isPower64 then "powerpc64" # never add "le" suffix + else final.parsed.cpu.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os + os = + /**/ if rust ? platform then rust.platform.os or "none" + else if final.isDarwin then "macos" + else final.parsed.kernel.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family + target-family = + /**/ if args ? rust.platform.target-family then args.rust.platform.target-family + else if args ? rustc.platform.target-family + then + ( + # Since https://github.com/rust-lang/rust/pull/84072 + # `target-family` is a list instead of single value. + let + f = args.rustc.platform.target-family; + in + if builtins.isList f then f else [ f ] + ) + else lib.optional final.isUnix "unix" + ++ lib.optional final.isWindows "windows"; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + vendor = let + inherit (final.parsed) vendor; + in rust.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + }; + + # The name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. + rustcTarget = let + inherit (final.parsed) cpu kernel abi; + cpu_ = rust.platform.arch or { + "armv7a" = "armv7"; + "armv7l" = "armv7"; + "armv6l" = "arm"; + "armv5tel" = "armv5te"; + "riscv64" = "riscv64gc"; + }.${cpu.name} or cpu.name; + vendor_ = final.rust.platform.vendor; + in rust.config + or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + + # The name of the rust target if it is standard, or the json file + # containing the custom target spec. + rustcTargetSpec = rust.rustcTargetSpec or ( + /**/ if rust ? platform + then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform) + else final.rust.rustcTarget); + + # The name of the rust target if it is standard, or the + # basename of the file containing the custom target spec, + # without the .json extension. + # + # This is the name used by Cargo for target subdirectories. + cargoShortTarget = + lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}"); + + # When used as part of an environment variable name, triples are + # uppercased and have all hyphens replaced by underscores: + # + # https://github.com/rust-lang/cargo/pull/9169 + # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 + cargoEnvVarTarget = + lib.strings.replaceStrings ["-"] ["_"] + (lib.strings.toUpper final.rust.cargoShortTarget); + + # True if the target is no_std + # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 + isNoStdTarget = + builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"]; + }; + }; in assert final.useAndroidPrebuilt -> final.isAndroid; assert lib.foldl (pass: { assertion, message }: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6848ff87e8e1..4c46dd00caac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4976,6 +4976,12 @@ githubId = 424946; name = "James Earl Douglas"; }; + EBADBEEF = { + name = "EBADBEEF"; + email = "errno@ebadf.com"; + github = "EBADBEEF"; + githubId = 4167946; + }; ebbertd = { email = "daniel@ebbert.nrw"; github = "ebbertd"; @@ -15489,6 +15495,12 @@ githubId = 69053978; name = "rogarb"; }; + rollf = { + email = "rolf.schroeder@limbus-medtec.com"; + github = "rollf"; + githubId = 58295931; + name = "Rolf Schröder"; + }; roman = { email = "open-source@roman-gonzalez.info"; github = "roman"; @@ -18776,6 +18788,12 @@ githubId = 223408; name = "Varun Madiath"; }; + vancluever = { + email = "chrism@vancluevertech.com"; + github = "vancluever"; + githubId = 10704423; + name = "Chris Marchesi"; + }; vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index f41a9a813ca6..a6a3a946c7ba 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -184,6 +184,8 @@ - `services.knot` now supports `.settings` from RFC42. The previous `.extraConfig` still works the same, but it displays a warning now. +- `services.invoiceplane` now supports .settings from RFC42. The previous .extraConfig still works the same, but it displays a warning now. + - `mu` now does not install `mu4e` files by default. Users should get `mu4e` from Emacs lisp package set `emacs.pkgs.mu4e`. - `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues. @@ -331,6 +333,8 @@ - The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations. +- Meilisearch was updated from 1.3.1 to 1.5.0. The update has breaking changes about backslashes and filtering. See the [release announcement](https://blog.meilisearch.com/v1-4-release/) for more information. + - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. - mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. On systems with an updated `stateVersion` we now also emit warnings if `mdadm.conf` does not contain the minimum required configuration necessary to run the dynamically enabled monitoring daemons. diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index 62a6e1f9aa3a..ef00c6f86cbd 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -8,7 +8,7 @@ imports = [ # Include the default lxd configuration. - "${modulesPath}/modules/virtualisation/lxc-container.nix" + "${modulesPath}/virtualisation/lxc-container.nix" # Include the container-specific autogenerated configuration. ./lxd.nix ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cafde7f9efdf..2e2b94e5a97b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1406,6 +1406,7 @@ ./services/x11/xautolock.nix ./services/x11/xbanish.nix ./services/x11/xfs.nix + ./services/x11/xscreensaver.nix ./services/x11/xserver.nix ./system/activation/activatable-system.nix ./system/activation/activation-script.nix diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix index 4e271a8c134b..710dee349d59 100644 --- a/nixos/modules/programs/git.nix +++ b/nixos/modules/programs/git.nix @@ -58,6 +58,10 @@ in ''; }; + prompt = { + enable = mkEnableOption "automatically sourcing git-prompt.sh. This does not change $PS1; it simply provides relevant utility functions"; + }; + lfs = { enable = mkEnableOption (lib.mdDoc "git-lfs"); @@ -89,6 +93,11 @@ in }; }; }) + (mkIf (cfg.enable && cfg.prompt.enable) { + environment.interactiveShellInit = '' + source ${cfg.package}/share/bash-completion/completions/git-prompt.sh + ''; + }) ]; meta.maintainers = with maintainers; [ figsoda ]; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index a43435f2cdbb..c3893f4b09b2 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -15,6 +15,9 @@ let clamdConfigFile = pkgs.writeText "clamd.conf" (toKeyValue cfg.daemon.settings); freshclamConfigFile = pkgs.writeText "freshclam.conf" (toKeyValue cfg.updater.settings); + fangfrischConfigFile = pkgs.writeText "fangfrisch.conf" '' + ${lib.generators.toINI {} cfg.fangfrisch.settings} + ''; in { imports = [ @@ -66,6 +69,36 @@ in ''; }; }; + fangfrisch = { + enable = mkEnableOption (lib.mdDoc "ClamAV fangfrisch updater"); + + interval = mkOption { + type = types.str; + default = "hourly"; + description = lib.mdDoc '' + How often freshclam is invoked. See systemd.time(7) for more + information about the format. + ''; + }; + + settings = mkOption { + type = lib.types.submodule { + freeformType = with types; attrsOf (attrsOf (oneOf [ str int bool ])); + }; + default = { }; + example = { + securiteinfo = { + enabled = "yes"; + customer_id = "your customer_id"; + }; + }; + description = lib.mdDoc '' + fangfrisch configuration. Refer to <https://rseichter.github.io/fangfrisch/#_configuration>, + for details on supported values. + Note that by default urlhaus and sanesecurity are enabled. + ''; + }; + }; }; }; @@ -98,6 +131,15 @@ in DatabaseMirror = [ "database.clamav.net" ]; }; + services.clamav.fangfrisch.settings = { + DEFAULT.db_url = mkDefault "sqlite:////var/lib/clamav/fangfrisch_db.sqlite"; + DEFAULT.local_directory = mkDefault stateDir; + DEFAULT.log_level = mkDefault "INFO"; + urlhaus.enabled = mkDefault "yes"; + urlhaus.max_size = mkDefault "2MB"; + sanesecurity.enabled = mkDefault "yes"; + }; + environment.etc."clamav/freshclam.conf".source = freshclamConfigFile; environment.etc."clamav/clamd.conf".source = clamdConfigFile; @@ -146,5 +188,53 @@ in PrivateDevices = "yes"; }; }; + + systemd.services.clamav-fangfrisch-init = mkIf cfg.fangfrisch.enable { + wantedBy = [ "multi-user.target" ]; + # if the sqlite file can be found assume the database has already been initialised + script = '' + db_url="${cfg.fangfrisch.settings.DEFAULT.db_url}" + db_path="''${db_url#sqlite:///}" + + if [ ! -f "$db_path" ]; then + ${pkgs.fangfrisch}/bin/fangfrisch --conf ${fangfrischConfigFile} initdb + fi + ''; + serviceConfig = { + Type = "oneshot"; + StateDirectory = "clamav"; + RuntimeDirectory = "clamav"; + User = clamavUser; + Group = clamavGroup; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + }; + }; + + systemd.timers.clamav-fangfrisch = mkIf cfg.fangfrisch.enable { + description = "Timer for ClamAV virus database updater (fangfrisch)"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.fangfrisch.interval; + Unit = "clamav-fangfrisch.service"; + }; + }; + + systemd.services.clamav-fangfrisch = mkIf cfg.fangfrisch.enable { + description = "ClamAV virus database updater (fangfrisch)"; + restartTriggers = [ fangfrischConfigFile ]; + after = [ "network-online.target" "clamav-fangfrisch-init.service" ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.fangfrisch}/bin/fangfrisch --conf ${fangfrischConfigFile} refresh"; + StateDirectory = "clamav"; + RuntimeDirectory = "clamav"; + User = clamavUser; + Group = clamavGroup; + PrivateTmp = "yes"; + PrivateDevices = "yes"; + }; + }; }; } diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index f419b75cf70f..429520470a0d 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -28,7 +28,19 @@ let REMOVE_INDEXPHP=true ''; - extraConfig = hostName: cfg: pkgs.writeText "extraConfig.php" '' + mkPhpValue = v: + if isString v then escapeShellArg v + # NOTE: If any value contains a , (comma) this will not get escaped + else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isInt v then toString v + else if isBool v then boolToString v + else abort "The Invoiceplane config value ${lib.generators.toPretty {} v} can not be encoded." + ; + + extraConfig = hostName: cfg: let + settings = mapAttrsToList (k: v: "${k}=${mkPhpValue v}") cfg.settings; + in pkgs.writeText "extraConfig.php" '' + ${concatStringsSep "\n" settings} ${toString cfg.extraConfig} ''; @@ -182,11 +194,31 @@ let InvoicePlane configuration. Refer to <https://github.com/InvoicePlane/InvoicePlane/blob/master/ipconfig.php.example> for details on supported values. + + **Note**: Please pass structured settings via + `services.invoiceplane.sites.${name}.settings` instead, this option + will get deprecated in the future. ''; }; - cron = { + settings = mkOption { + type = types.attrsOf types.anything; + default = {}; + description = lib.mdDoc '' + Structural InvoicePlane configuration. Refer to + <https://github.com/InvoicePlane/InvoicePlane/blob/master/ipconfig.php.example> + for details and supported values. + ''; + example = literalExpression '' + { + SETUP_COMPLETED = true; + DISABLE_SETUP = true; + IP_URL = "https://invoice.example.com"; + } + ''; + }; + cron = { enable = mkOption { type = types.bool; default = false; @@ -197,12 +229,10 @@ let on how to configure it. ''; }; - key = mkOption { type = types.str; description = lib.mdDoc "Cron key taken from the administration page."; }; - }; }; @@ -239,8 +269,14 @@ in # implementation config = mkIf (eachSite != {}) (mkMerge [{ - assertions = flatten (mapAttrsToList (hostName: cfg: - [{ assertion = cfg.database.createLocally -> cfg.database.user == user; + warnings = flatten (mapAttrsToList (hostName: cfg: [ + (optional (cfg.extraConfig != null) '' + services.invoiceplane.sites."${hostName}".extraConfig will be deprecated in future releases, please use the settings option now. + '') + ]) eachSite); + + assertions = flatten (mapAttrsToList (hostName: cfg: [ + { assertion = cfg.database.createLocally -> cfg.database.user == user; message = ''services.invoiceplane.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned''; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index dcacb40e4681..cc89553fbb75 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -378,7 +378,7 @@ in LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ]; Restart = "on-failure"; RestartPreventExitStatus = 1; - RestartSecs = "5s"; + RestartSec = "5s"; # TODO: attempt to upstream these options NoNewPrivileges = true; diff --git a/nixos/modules/services/x11/xscreensaver.nix b/nixos/modules/services/x11/xscreensaver.nix new file mode 100644 index 000000000000..dc269b892ebc --- /dev/null +++ b/nixos/modules/services/x11/xscreensaver.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.xscreensaver; +in +{ + options.services.xscreensaver = { + enable = lib.mkEnableOption "xscreensaver user service"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.xscreensaver; + defaultText = lib.literalExpression "pkgs.xscreensaver"; + description = "Which xscreensaver package to use."; + }; + }; + + config = lib.mkIf cfg.enable { + # Make xscreensaver-auth setuid root so that it can (try to) prevent the OOM + # killer from unlocking the screen. + security.wrappers.xscreensaver-auth = { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.xscreensaver}/libexec/xscreensaver/xscreensaver-auth"; + }; + + systemd.user.services.xscreensaver = { + enable = true; + description = "XScreenSaver"; + after = [ "graphical-session-pre.target" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + path = [ cfg.package ]; + serviceConfig.ExecStart = "${cfg.package}/bin/xscreensaver -no-splash"; + }; + }; + + meta.maintainers = with lib.maintainers; [ vancluever AndersonTorres ]; +} diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 4b6a5b6c12c1..72bc79f31b68 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -16,6 +16,7 @@ let cfgTrim = config.services.zfs.trim; cfgZED = config.services.zfs.zed; + selectModulePackage = package: config.boot.kernelPackages.${package.kernelModuleAttribute}; inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; @@ -210,11 +211,17 @@ in options = { boot.zfs = { package = mkOption { - readOnly = true; type = types.package; - default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; - defaultText = literalExpression "if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs"; - description = lib.mdDoc "Configured ZFS userland tools package."; + default = if cfgZfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; + defaultText = literalExpression "if zfsUnstable is enabled then pkgs.zfsUnstable else pkgs.zfs"; + description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfsUnstable` if you want to track the latest staging ZFS branch."; + }; + + modulePackage = mkOption { + internal = true; # It is supposed to be selected automatically, but can be overridden by expert users. + default = selectModulePackage cfgZfs.package; + type = types.package; + description = lib.mdDoc "Configured ZFS kernel module package."; }; enabled = mkOption { @@ -534,6 +541,10 @@ in (mkIf cfgZfs.enabled { assertions = [ { + assertion = cfgZfs.modulePackage.version == cfgZfs.package.version; + message = "The kernel module and the userspace tooling versions are not matching, this is an unsupported usecase."; + } + { assertion = cfgZED.enableMail -> cfgZfs.package.enableMail; message = '' To allow ZED to send emails, ZFS needs to be configured to enable @@ -571,18 +582,14 @@ in # https://github.com/NixOS/nixpkgs/issues/106093 kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ]; - extraModulePackages = let - kernelPkg = if config.boot.zfs.enableUnstable then - config.boot.kernelPackages.zfsUnstable - else - config.boot.kernelPackages.zfs; - in [ - (kernelPkg.override { inherit (cfgZfs) removeLinuxDRM; }) + extraModulePackages = [ + (cfgZfs.modulePackage.override { inherit (cfgZfs) removeLinuxDRM; }) ]; }; boot.initrd = mkIf inInitrd { - kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; + # spl has been removed in ≥ 2.2.0. + kernelModules = [ "zfs" ] ++ lib.optional (lib.versionOlder "2.2.0" version) "spl"; extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${cfgZfs.package}/sbin/zfs diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3b0871e36a77..f8894df631ef 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -927,6 +927,7 @@ in { xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {}; xpadneo = handleTest ./xpadneo.nix {}; xrdp = handleTest ./xrdp.nix {}; + xscreensaver = handleTest ./xscreensaver.nix {}; xss-lock = handleTest ./xss-lock.nix {}; xterm = handleTest ./xterm.nix {}; xxh = handleTest ./xxh.nix {}; diff --git a/nixos/tests/lxd/ui.nix b/nixos/tests/lxd/ui.nix index 86cb30d8c2b6..ff651725ba70 100644 --- a/nixos/tests/lxd/ui.nix +++ b/nixos/tests/lxd/ui.nix @@ -11,9 +11,37 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { lxd.ui.enable = true; }; - environment.systemPackages = [ pkgs.curl ]; + environment.systemPackages = + let + seleniumScript = pkgs.writers.writePython3Bin "selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("https://localhost:8443/ui") + + wait = WebDriverWait(driver, 60) + + assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0 + assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0 + + driver.close() + ''; + in + with pkgs; [ curl firefox-unwrapped geckodriver seleniumScript ]; }; + testScript = '' machine.wait_for_unit("sockets.target") machine.wait_for_unit("lxd.service") @@ -31,5 +59,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { # Ensure the endpoint returns an HTML page with 'LXD UI' in the title machine.succeed("curl -kLs https://localhost:8443/ui | grep '<title>LXD UI</title>'") + + # Ensure the application is actually rendered by the Javascript + machine.succeed("PYTHONUNBUFFERED=1 selenium-script") ''; }) diff --git a/nixos/tests/xscreensaver.nix b/nixos/tests/xscreensaver.nix new file mode 100644 index 000000000000..820ddbb0e962 --- /dev/null +++ b/nixos/tests/xscreensaver.nix @@ -0,0 +1,64 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "pass-secret-service"; + meta.maintainers = with lib.maintainers; [ vancluever AndersonTorres ]; + + nodes = { + ok = { nodes, pkgs, ... }: + { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xscreensaver.enable = true; + }; + + empty_wrapperPrefix = { nodes, pkgs, ... }: + { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xscreensaver.enable = true; + nixpkgs.overlays = [ + (self: super: { + xscreensaver = super.xscreensaver.override { + wrapperPrefix = ""; + }; + }) + ]; + }; + + bad_wrapperPrefix = { nodes, pkgs, ... }: + { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xscreensaver.enable = true; + nixpkgs.overlays = [ + (self: super: { + xscreensaver = super.xscreensaver.override { + wrapperPrefix = "/a/bad/path"; + }; + }) + ]; + }; + }; + + testScript = '' + ok.wait_for_x() + ok.wait_for_unit("xscreensaver", "alice") + _, output_ok = ok.systemctl("status xscreensaver", "alice") + assert 'To prevent the kernel from randomly unlocking' not in output_ok + assert 'your screen via the out-of-memory killer' not in output_ok + assert '"xscreensaver-auth" must be setuid root' not in output_ok + + empty_wrapperPrefix.wait_for_x() + empty_wrapperPrefix.wait_for_unit("xscreensaver", "alice") + _, output_empty_wrapperPrefix = empty_wrapperPrefix.systemctl("status xscreensaver", "alice") + assert 'To prevent the kernel from randomly unlocking' in output_empty_wrapperPrefix + assert 'your screen via the out-of-memory killer' in output_empty_wrapperPrefix + assert '"xscreensaver-auth" must be setuid root' in output_empty_wrapperPrefix + + bad_wrapperPrefix.wait_for_x() + bad_wrapperPrefix.wait_for_unit("xscreensaver", "alice") + _, output_bad_wrapperPrefix = bad_wrapperPrefix.systemctl("status xscreensaver", "alice") + assert 'To prevent the kernel from randomly unlocking' in output_bad_wrapperPrefix + assert 'your screen via the out-of-memory killer' in output_bad_wrapperPrefix + assert '"xscreensaver-auth" must be setuid root' in output_bad_wrapperPrefix + ''; +}) diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 3454fbaf78fe..ad4ea254f34d 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -13,6 +13,7 @@ let else pkgs.linuxPackages , enableUnstable ? false , enableSystemdStage1 ? false + , zfsPackage ? if enableUnstable then pkgs.zfs else pkgs.zfsUnstable , extraTest ? "" }: makeTest { @@ -21,7 +22,7 @@ let maintainers = [ adisbladis elvishjerricco ]; }; - nodes.machine = { pkgs, lib, ... }: + nodes.machine = { config, pkgs, lib, ... }: let usersharePath = "/var/lib/samba/usershares"; in { @@ -35,8 +36,8 @@ let boot.loader.efi.canTouchEfiVariables = true; networking.hostId = "deadbeef"; boot.kernelPackages = kernelPackage; + boot.zfs.package = zfsPackage; boot.supportedFilesystems = [ "zfs" ]; - boot.zfs.enableUnstable = enableUnstable; boot.initrd.systemd.enable = enableSystemdStage1; environment.systemPackages = [ pkgs.parted ]; @@ -193,6 +194,11 @@ let in { + # maintainer: @raitobezarius + series_2_1 = makeZfsTest "2.1-series" { + zfsPackage = pkgs.zfs_2_1; + }; + stable = makeZfsTest "stable" { }; unstable = makeZfsTest "unstable" { diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 25ed8a71aa1d..c0cde8aaf9a1 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,16 +1,46 @@ -{ lib, stdenv, fetchurl, pkg-config -, libsndfile, libpulseaudio +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoconf +, automake +, libtool +, libsndfile +, libpulseaudio +, espeak-ng +, sonic +, utf8cpp +, AudioUnit }: -let - version = "5.8.2"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ekho"; - inherit version; + version = "9.0"; + + src = fetchFromGitHub { + owner = "hgneng"; + repo = "ekho"; + rev = "v${version}"; + hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk="; + }; + + preConfigure = '' + ./autogen.sh + ''; + + CXXFLAGS = [ + "-O0" + "-I${lib.getDev utf8cpp}/include/utf8cpp" + ]; + + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + + buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit ]; meta = with lib; { description = "Chinese text-to-speech software"; - homepage = "http://www.eguidedog.net/ekho.php"; + homepage = "http://www.eguidedog.net/ekho.php"; longDescription = '' Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) software. It supports Cantonese (Chinese dialect spoken in Hong Kong and @@ -18,22 +48,8 @@ in stdenv.mkDerivation rec { (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before Yuan Dynasty) and Korean (in trial). ''; - license = licenses.gpl2Plus; - platforms = platforms.linux; - hydraPlatforms = []; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aaronjheng ]; }; - - src = fetchurl { - url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; - }; - - preConfigure = with lib; '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${optionalString stdenv.is64bit "-D_x86_64"}" - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" - ''; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 3d6917b58dfe..f95c3616da8c 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.4.180"; + version = "1.2.5.183"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-Z3vHcfimchshFTRbSsVhAw4DJPetZF59zyAnnbQ3YAM="; - armv7l-linux = "sha256-KUA6UFenEVme0AMuE69dR13RfYSGAd9GEdikh3DS0ko="; - x86_64-linux = "sha256-3RA+piRJ4UE4tPYALaifENJg7+0BZDmSwS36VJiEn8Q="; + aarch64-linux = "sha256-V5615E2jVqk7CcCBbW5A0JEyEi6secC0Rj8KrQpfjns="; + armv7l-linux = "sha256-0nyRffx8/OieVJTvJRtUIvrx5IyqmqEMMEZszPPDXb0="; + x86_64-linux = "sha256-oV2T7l5/3JqXXoyiR3PeYJyHQe4GcDUxsi6cNxLUcng="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index ad67837b3892..7b5bcd12ef43 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.201.0.2"; + version = "1.202.1"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-ke7i0eeZHEsVhtzaS0AeLQOrYE1F+ppCwjR2TWeJQPA="; + hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4="; }; patches = [ ./proc_globdata.patch ]; diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index e2c4746735df..3a1e643c6f7f 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.10.30", - "hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I=" + "rev": "2023.11.23", + "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.08.18", - "hash": "sha256-X/KFQfLAnbcquLSsOk0ve0X5SzoEgEG0q0JY4TuQXpY=" + "rev": "2023.11.16", + "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.10.02", - "hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ=" + "rev": "2023.11.23", + "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 117adcd47a9c..d53ee7056a89 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -93,6 +93,8 @@ in wat-mode = callPackage ./manual-packages/wat-mode { }; + xapian-lite = callPackage ./manual-packages/xapian-lite { }; + yes-no = callPackage ./manual-packages/yes-no { }; youtube-dl = callPackage ./manual-packages/youtube-dl { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix new file mode 100644 index 000000000000..67b5a96ee9c0 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, emacs, fetchFromSourcehut, xapian }: + +stdenv.mkDerivation (finalAttrs: { + pname = "xapian-lite"; + version = "2.0.0"; + + src = fetchFromSourcehut { + owner = "~casouri"; + repo = "xapian-lite"; + rev = "v${finalAttrs.version}"; + hash = "sha256-uFO5yxPHIUJjT3OV2hZKp7KgT3l73W95X2SAz6vhCpI="; + domain = "sr.ht"; + }; + + preBuild = '' + rm emacs-module.h + ''; + + buildInputs = [ xapian emacs ]; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/share/emacs/site-lisp/ xapian-lite${stdenv.targetPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + + meta = { + homepage = "https://git.sr.ht/~casouri/xapian-lite"; + description = "A minimal Emacs dynamic module for Xapian"; + maintainers = [ lib.maintainers.marsam ]; + license = lib.licenses.gpl3Plus; + inherit (emacs.meta) platforms; + }; +}) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 42958d277a4b..010c0c89d538 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-11-17"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "9fb873af43568464f9a1936fc334dfa3d7a59418"; - sha256 = "0w81xzrvjcwp5a6glyk3dcmghvbb4amlhxbbl71lz9k9w0dzcwac"; + rev = "6316dc88db89d97d190f24547adddd13569fb746"; + sha256 = "0ql6hikqn57gkq88fyqvh4lylsvfkk835s53wplwirz30nbsxwhd"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -498,12 +498,12 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2023-08-23"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "5650c76abfb84d6498330dd045657ba630ecdbba"; - sha256 = "09i6fp5kjz2dxhhfznzlrq8gvn204byk4mw23cmxlkc6hnnz4z74"; + rev = "b2c89c2937d527c22deb194d574d2a93246cd869"; + sha256 = "0ib70ks303vy8yjjm8xrn6nyins6766w3fv223a3lbw5qrd1arc0"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "d82a994d66a9c6c700f240498304bd6d68fb33f0"; - sha256 = "0rjndafp4nz0qbaf614q92zkqcsqmr9i2v1c32q8cm1hxkapaf6q"; + rev = "712802e73107883a445b36f4197376eb60691b85"; + sha256 = "1ibsa8n2m9xyzp6air0j2rky69cs1v0pjzd9ni3p7zwh3dnixgh3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "a36c68d2cd551e49883ddb2492c178d915567f58"; - sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba"; + rev = "fd32ed2dc192ec656a0536699336cd2fe3eb543f"; + sha256 = "0n9klkkmqcvh03dy6kyv3d2k1f5aj8bbqwh23z16wsk43cgayl9m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2360,12 +2360,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-11-01"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "309b3c803d1862d5e84c7c9c5749ae04010123b8"; - sha256 = "1l2rvqcc85mxcpf8a5jsv79bgzb4hjl77bq02npjhpcj8gi8drna"; + rev = "2c31989063b145830d5f0bea8ab529d2aef2427b"; + sha256 = "0icjjxgmi1v8jsidvh3lhnn04nkqpgfgr83mg2qa9603f1a34fqw"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2962,12 +2962,12 @@ final: prev: diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-10-11"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "d38c1b5266850f77f75e006bcc26213684e1e141"; - sha256 = "1byqdh3x2yy1rj3gq0hyxpxwzlipvhv07ni9gz4644ssavjhalb6"; + rev = "3dc498c9777fe79156f3d32dddd483b8b3dbd95f"; + sha256 = "1zvgm0icmc4z48vnd6pn7pvl6sg89mm4symr0rwiix8s942nfiyw"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3131,12 +3131,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "ed7bd2581318aebc409f54fa4756023d2e6fb7d6"; - sha256 = "1pbq011s78pq2agjy7gkqkzn9zr5slnik1m5h8mplz9bb28pjb0a"; + rev = "a9e9711fc2165c98b3bf6366c4bf020de4a072b4"; + sha256 = "1clr87r0ipwv2l4vjhw0qh95abag1j0f94n0k74q1ymbdc2jp0qb"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3228,12 +3228,12 @@ final: prev: executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2023-09-07"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "f98049ceabb0ada223dfad2b40bf06df30331e0a"; - sha256 = "0xzjfacbx3agrl481dnb8f4i3h2b36hcbwzdca1m17rd5i51zka3"; + rev = "50d018b1ccf6b21b5a76ab2a5c3cac4685b90174"; + sha256 = "1cgs05sk0r5bs96lybp5qm1wz4flddfxdcz7x55g1xz99xyinz16"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3300,12 +3300,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-11-18"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "8bfa1a88d19d86756ef468ad2e499e0337084317"; - sha256 = "190rf7v70jchjj4vrg7sf8ish99kf9n3jqkb009hd8kv68j65lpd"; + rev = "c97f2819db356c3b3b727a3a31c164acabeb1c81"; + sha256 = "03vim8dqpybf34q16zvsqpzmqvwrkcqkz3wgyrzfiw2qdc075fhd"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3637,12 +3637,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-11-19"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "640d6415baf6b12c20c16fdd177f106c5575d6c1"; - sha256 = "1yrqa1zj6jyf3r6cb6s06mxk6fb4wwdzw08x454f9amw93cah25m"; + rev = "1e3308669ce77c86242d3ba5d75df0027a15391c"; + sha256 = "1jfg21z7j93x2q6iqg30cx8hd9qnx35lp3s0x81fiyhdg8v0gdf7"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3805,12 +3805,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-11-17"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55"; - sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f"; + rev = "5fc573f2d2a49aec74dd6dc977e8b137429d1897"; + sha256 = "0ijwyxw9w4idd1qczd1d8bs8454i83s6vxny39r9vn4ykhxm9v10"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3865,12 +3865,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-11-15"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "e749ff85ffec5a4ef11cb8252a2030be5726cb6c"; - sha256 = "0811lkf5cr9qsp4as3lqq04w545ygmxj1sad66gabvk8lcq7indj"; + rev = "ad5db6a907160e0d78671acf93d0ebfccd2fae30"; + sha256 = "1q934rbz3h3pi938jazl4s116kcyfn5n654fpq72xq6qiaq3y6rl"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3913,12 +3913,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2023-09-26"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b428db4d2a5b7c06e149a020e31b2121fbf57a67"; - sha256 = "13lc0yjmwzwkdj92rlcwqpyic30z5vq3ss73bkzwl4vkqg413zla"; + rev = "16ec236fabb40b2cebfe283b1d701338886462db"; + sha256 = "006r0dl3nj0d642lniss3gbclix32bypykh7c8ml7qfh07mjahs7"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3985,12 +3985,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2023-10-24"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "d13f4d4e75510e3d798f2ff7561d3c8991220375"; - sha256 = "0hrgzfc4hss3ng6jmkn4rsvwkw1pgck98gnqv32hda4w9bni6pzc"; + rev = "7f56d9f9c4860df528031539d321a61f6e081dee"; + sha256 = "14c5ylsnp99viqvgyc67xi3987086kbsrw44yslxkpvf4na8b3a4"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4080,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-11-19"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "88c3ddac1885f3ee0e9b4664296b10d30a04c731"; - sha256 = "159rr16jic7cwc6ai539a8gvzjr2klnmhdyyp0c8nr0jl298y3cj"; + rev = "ea1ab0d19d10d514dc0740b5255405d9ac1a3a3f"; + sha256 = "113x7vx7jga8silcyh0xf4ssnplyq83md2y1izzf1wz58y7s2ln0"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-11-18"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "cf58d40c90a36c2b2ec6629e84bee9617a7a31c6"; - sha256 = "0dxyvf6yrdvl0hhnwzsa9im20r100kr4dsvrfa7djbib1n8qvy65"; + rev = "0a0dd1baf1bb9415e3358207b6ab35747fb5f3ba"; + sha256 = "0fms4z45wx8wwl74k24kf19pcxim1wcf3crbcnl3bx34ivzy6id0"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-11-16"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "2a4975130a39d9317595bb356b2ff5663f7d8a77"; - sha256 = "1r785mgavpc54lr9220n80mp8x90j20snwzicp80ahn407vs10n0"; + rev = "0ed70e2d054fe6c6a055fec330a6c4e79812c37a"; + sha256 = "0d2qg4asy71jhfaxhnkq76l6d1gjp7ckcpqli2wfzhg09b1s384q"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4908,12 +4908,12 @@ final: prev: lf-vim = buildVimPlugin { pname = "lf.vim"; - version = "2023-10-19"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "f2bab8f4a420ec434f1fb4b5fa4ee354f6dd2afd"; - sha256 = "044wgd5wscpss4jc5czwsjc4ycx3kykxijzr8c7kymy5ydalpmgj"; + rev = "2be63cd4553d59008547f0ffe4643a90ec6260b3"; + sha256 = "0j04287khy57p5hykiy5wi87b37k86n6fks648fk0s1jm8frb1j6"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -4992,12 +4992,12 @@ final: prev: lightline-vim = buildVimPlugin { pname = "lightline.vim"; - version = "2023-09-03"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f11645cc6d37871244f2ea0ae972d3f6af9c8f73"; - sha256 = "0gqqbwsvdfigqk2c22i6hmyzqk42qwgqnnpbpivyam4m4f8rpka8"; + rev = "1c6b455c0445b8bc1c4c16ba569a43c6348411cc"; + sha256 = "0dxdcyihw8vcybdwn7rzd011pxi5i008xx3mwjc4rmldbzb530ka"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -5235,8 +5235,8 @@ final: prev: src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "8055851d16831370f5249c30a04f2eafcb0b76d3"; - sha256 = "0dk9r44i9anrjs84s1139vcxmfpw006cqbblis8lhbmwa7m6vhkp"; + rev = "eb7ae6508fc22f4a6d57bd8de7a09f7549086793"; + sha256 = "1jaigsjqjbzvmq1c1p8rf1hcgqk3p0y7s0j03jwnvfs4w4ilb753"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5267,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-19"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "424503af246033f177a11c9959424bbb3640f077"; - sha256 = "1ykncpyd7yf73clxifcjsm1lvsy8mzy84j5z203gpl2zwpcnn1sc"; + rev = "d3dfaea0125315110ea720c337ab88aa451d75e7"; + sha256 = "07bm8gvzx68cdy7jkhva3caqjqazrh5hnhr3yi1qa6g1vlmnb0f7"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5315,12 +5315,12 @@ final: prev: luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-11-13"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1f4ad8bb72bdeb60975e98652636b991a9b7475d"; - sha256 = "174pwxjdnb1gxxrnvz6zplr5r2cwjq79si1ns1ymziq4lrxjnni8"; + rev = "cab667e2674881001a86a7478fff7dc7791c63f5"; + sha256 = "1mlyfj3afb7kqam160hglxq0xfrvjll214dha3zwml1nlbwv4mcr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5424,12 +5424,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-11-17"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "ab640b38ca9fa50d25d2d249b6606b9456b628d5"; - sha256 = "16lc26ypiq29jnmxdqhvlj30q1lbfin89cdahchils8fir6pn3sg"; + rev = "a5476087db0a20c05bd1163e1cd4a29b795e73a7"; + sha256 = "1wqlqadprsh59xmfzw73fkyvn727vp451d21rd5ndmy558d814pv"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5472,12 +5472,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-11-16"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "a74108b417cff78d15074f6f68a8f997e718f404"; - sha256 = "1vfndgk09kvrwj3kviff4c8wsi8gd7pym5wg0r17jflmqr7y2y5m"; + rev = "d61da5decc7768769314c121a3232b6eadc73f2d"; + sha256 = "1jsjshi8hwiyazpchhc5smsp2p9n7g54i7px4crc0gdnm3sxk5q0"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5544,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-19"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "92e2ae609f612f11f7e8e45d13614fcdff9f89b9"; - sha256 = "0fwg6k01njgybj1ca9iy92psi2slq227zlmp74z97fh1m9sn6b8l"; + rev = "baf17e6472b0968661dce5daa372251e934da39f"; + sha256 = "1icagypgcdqsiz1p4m8kan8wdbjgxcz4qa415rplyrx9rxbpp4rl"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5580,12 +5580,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-10-26"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "3b3563c61af31ecbf6522e92626929b8654649d5"; - sha256 = "0hqmxszry28in5c3nf6ixwa5q4ngwmpi75kx8niy8329nrnb7lzb"; + rev = "198d4246042f21331415a3e41836fa12322b8536"; + sha256 = "1g68v86l7im05npp1s5967fz3nwx2xl69n306myggqsqg9admihd"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5628,12 +5628,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2023-11-19"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "413d0eab0d37d770759b4e2aba9205182fa796da"; - sha256 = "0xaxiqdf99901fpwv7h4a03k7qfqdnr9rfmrj1yx6rcai2yiwxyc"; + rev = "b24dbb52d573918a3356efb05870398c7dbeb6dd"; + sha256 = "1wvsd99z53hxal7idbg9kicmn2sqp66ysd2mkjirmnh0gnd2qbz5"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -5676,12 +5676,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-11-03"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b4e8571b79a7d2a2aea70922c35eac3a71578c0e"; - sha256 = "0brpnb1dbw9xsmd2g5ydq5gvmk3xf1q69n3x2i1rd5bcyzcg6f8n"; + rev = "496ad2b8f8a563ca01df2974bff246e90c600513"; + sha256 = "0mdrd572l753iy6q604p7gc76cbbb8ayqpczwyd9qhll9ssz9pi4"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -5988,24 +5988,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-19"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "627b5b543f4df551fcddb99c17a8e260c453400d"; - sha256 = "0b3cv7w6ic9wbfnr11p0f1dnfzpwlnx10lw6wyhlfg8mwx8dvksb"; + rev = "f972d7e6cd21b691199565cfe3e6487e774a4e8f"; + sha256 = "0crhdfs767jprhaz6mq7k9fb97ahy1vqx5n74wii1rvh2cmnwb68"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-11-10"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7"; - sha256 = "1263nvq9a275340hdnkimz70xq615a9rz2s8szncii35z10szjm7"; + rev = "afbc055587e88554b1fd11408cfab859d0cd40d3"; + sha256 = "0p7vvl7nc5caijgksshwibdq704kq3r6rq7w5ih3vnk1i7s5sw1h"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6024,12 +6024,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "987e415247547a372d0356f76444cf402436c727"; - sha256 = "00ppnr40s8lhlvga1m87xgwrdnyzj6as4522jl0n31lx7f90bvpm"; + rev = "3be926866a6fdee86f53c13455c9b106f85ca3dc"; + sha256 = "05wvjzia28wrivvh2a8p145lfiwq46mqamy5s6zay9k5qkn7wmz1"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6096,12 +6096,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-11-18"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "095fad9481f5a678625a99dc06e9991c5d11efc8"; - sha256 = "1wqdhyr4z377y2gjlc4vg0v9wnnxwyxbcj5ahmihj1nfwrj1l7pa"; + rev = "3f531c362d07d52c4956520e3798e9cfb5aeabdf"; + sha256 = "0m112x9v84479f8ynmj0cprgk29s3hxqas6wv6mch39smdshz1bc"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6325,12 +6325,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-11-13"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "f4e58d5278344440f65c5a5177f16711337e44f7"; - sha256 = "1ysg0vh7kw1sqpzdhgy13j9aljwk47jh5ss2y3k54j8a1qrx5c3j"; + rev = "46428d9013023f516a61274a78b0cee87fb7e8bc"; + sha256 = "0k6fqifyxa0m01jrxv9yxv6rzval36j1dps2awbccna0mxjjgjhp"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6505,12 +6505,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-10-16"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "6a6076bd678f825ffbe16ec97807793c3167f1a7"; - sha256 = "1p1gp2p08mh0z7ckr63lw76ac91pssv0k2jczwpkibqmpp4imwnx"; + rev = "eb82712f86319272f4b7b9dbb4ec6df650e6987f"; + sha256 = "1ab734sg19g9q448qkv183rcj72r2gchwpmr0snnlkbmz9x547js"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6601,12 +6601,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-11-17"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "fa9be1679db7bf57d44128a018db43da5488a07f"; - sha256 = "0cqmdkxksridq4qgdfjcvinqq274lqidpblgijv5iqa14zzng0b0"; + rev = "358dd357a753f81412397b8a4cc01a2f41a1b594"; + sha256 = "0pwlhsqkkq9d1i9rgrlf82xqlis48czz2arghjd0xs8vgf5aqypl"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7105,12 +7105,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-11-01"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "503a399e0d0b5d432068ab5ae24b9848891b0d53"; - sha256 = "0qq8sr32k9wv92km71h5clpmhsnck3i0dj40qapabb3iaw8iwhwf"; + rev = "44403b2ef6c6285cfd9a3b4fa9a0d746ddae4b45"; + sha256 = "0d6icxcy9rx7dcdx821apwz1mrdl3vr3s547y9xw1m7idljij1cv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7176,24 +7176,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-11-15"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "b1db01865791b324918a7835984c0f96112df37c"; - sha256 = "1smxkw2pkmcbhypmcmssbnq0cpi2jsq7ihsm9nzp7mpvxz21gd34"; + rev = "a3462e76fc3841c0eddae6c10ce917206eb42e31"; + sha256 = "0wsvlgz36q4a606lh9mlaagbazj67hx2lsqq0yqi67bkw0hwgvgr"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-11-17"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39"; - sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap"; + rev = "3a7c15331a57ba40a56f00f29173700af853fa03"; + sha256 = "13h8s0cpgv2l6y1p54c9a4hncqh64zlrx07zy7k18xhqsz461c69"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7224,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-19"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6516abf5ac7d017480c8c8e08c0d24066bcb8d43"; - sha256 = "1vwjwqb5fsvf6bdj3c2wrja00jm3p4q2xhp7zg1na2nxsclswnqs"; + rev = "553c4e0e667167640c5398573f6f3a488ff8047a"; + sha256 = "0jm03jrsy1yj293hyimakhxcsak45f55zjc1ch1smy0h0qgr23fm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7284,12 +7284,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-11-16"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "a3a75d094cc880dcd1fd9745fea2f0cd84662110"; - sha256 = "0zjlcsmz3381ir4sl2n7r2b91d7x5hp12g03v27y381p9q5kg41y"; + rev = "1a008b324d4f272ed628e5f354f0df61db5cbfbd"; + sha256 = "0nfv1yw50pgi29wfazapyqkkws50nxh862n586dy3ya2g7b00knf"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7572,36 +7572,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-11-19"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "46e1f776f0a714099b9160604fbb62fba2540376"; - sha256 = "1c3i4hzr68izlk3r4lain0v1kqh1l078gc8bf8mj7vgwa67mplj0"; + rev = "fa00b57873008700a83c1387f02ef2c6fc183b53"; + sha256 = "0kvnx36q2dbr6rid9awgrkhj12i7hl4qagv9dsy5brah57sx3ssy"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-19"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d87629647614b779fb2aad8f0042fe2864253ea6"; - sha256 = "04y1hygrpgkfb9y7ncbdrmqbzzvlr3f1xn3dgmyswl1cb602525b"; + rev = "649d137371e9214d30b20565e0574824fa3a3670"; + sha256 = "0i9vjhxg97wbl9mwh914fyv9blbsdmcjhxh3hiji15mmlba73n4d"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-11-18"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "f3ec0d8a1b4e07d7ed2da6b9a9f10864a83c4be4"; - sha256 = "1kbx404z9ziy2ylj9qkmrdkhb4mjhvijnrb29hdbjh1hymhghxzp"; + rev = "bf4d15ee4e96ff5201f16a4ed14443670662eb90"; + sha256 = "0a7mmyrwi2x34fbjxwnzw9qm2imaffx4bmkn0rpa0l4sm6qs9way"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7680,12 +7680,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-11-18"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "ead792ccdace6a9d64a8119909af243ed0105465"; - sha256 = "0s55gcdh6yi0mpszqaj10sm25nk6wichli6zavs7ywg29nfxl3h8"; + rev = "bdd2a3293340465a516b126d10894f6d5cb5213c"; + sha256 = "1pg2myk6k19z33yiqnjah6yb6hxhimv2qx15amhs9h9avyjmnlx0"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7715,12 +7715,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-11-15"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "a6132d058f23d15686f07b8e1ca252e060a0e0ce"; - sha256 = "0ijlsw9x3g2h48wvcagp1h4pvyjrrlc1cn0jni5pqs6fqjlcbypk"; + rev = "ad8d336cdde8f1f925bd4eaf8a00b67885deb25e"; + sha256 = "1cxhncglmd4c41a3l6dk9m5d00vlvd7q6xl1aafwmn4lx878qxxa"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7739,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-19"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4"; - sha256 = "06588a1ksahy51vszi7ri5i40yy2hxbp2zgrd1xnlc2xk0bxzbqh"; + rev = "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c"; + sha256 = "18bxb2zg55ccjzj7q2kyv3bhyxagf3pm89zqhmwy45n0ng9vmn89"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7859,12 +7859,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-11-15"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "af04969c437e0c46a2b3c86d7892458e878ecc40"; - sha256 = "17mi1hs3jmmrxqxhykqf0xj91ssxzzzig7gmdlyak6pgwln2ziyr"; + rev = "05cb8257cb9257144e63f41ccfe5a41ba3d1003c"; + sha256 = "0y2lfdx75d418jdypp1yg3sdmr88csb4z3p1dnxnggx4xk1yghrx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7896,12 +7896,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-10-19"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "b9acd92ded2ba155867ca5af9d618e933d96e3b0"; - sha256 = "03a42mqqhd18skf765n3cf41i31wdc14w7z0vra4ll7d0p6qrdsz"; + rev = "e7c656ac6b6460aaab817cbd0c9d5c043eda4b43"; + sha256 = "1f25ipxzigmq24a6krhs4akgp9hmhyby150kxzy3zn8n3yn0p8c9"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -8004,12 +8004,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-11-09"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "e9c08d58c13372981815d207c78763e5beac32d4"; - sha256 = "1rcq9gl29l5925ny1vqrfynzri84c0hn2nw8rd01210jilpsp2d8"; + rev = "cbb10d4c7514680e90f791d62f1168cb87aad0ce"; + sha256 = "1l6h7yx7sq5g6wv1ggns98scdyqxs317laj543pd1ji9pfqpmnpr"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8439,12 +8439,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-11-18"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "4e9910b1c4cbd49d8ccd001e7a59b700c57cd71b"; - sha256 = "170d89xh104fzcmnd8az65jvdr2bs3lyaqw8icpbav7vfi7d099a"; + rev = "d341a9e4ee4ca2b361e7b1abfae5846508be3173"; + sha256 = "1sd34ynkbvaa3rs4mm84na6dgqr4fjf4iaxyj1a6iqj08gch90bb"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8511,11 +8511,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-19"; + version = "2023-11-23"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "072210357169394dff90d30ccfe0ac92530a9317"; - sha256 = "03ky9w9lvsb48lihx6lnmsj67w39hc79qhajr148zlldby7cw2v6"; + rev = "a2da59bdacb5e3a28873ac7039a16271ac16b224"; + sha256 = "0s9pd19fbmcy13r9bji4cyzf60vcrc3x7gxj9ayav0pxxh161sj7"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8654,12 +8654,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-10-27"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "b8d6c0a8762fd374e0204768a94241135ca3e311"; - sha256 = "038h0cygs58i6llps9lm58zgb806r1gvqf88afz8n56248jhkcmx"; + rev = "c186d3e5bc5f962fd026daf087fec8364101db57"; + sha256 = "19a2i0ki5dm93bbwafq85kwrskk2p9x0fz0139dahw1pmh6nlkyp"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8762,12 +8762,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-19"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "540ff82e5f47f3e39bd583acfbd813f4ac90d4a6"; - sha256 = "096i4rrs2yjrhixwzcwh9ppiq5cjdvn3in6b0m4qh9wk3i0kxrvx"; + rev = "e0853ead50e6327c037a4ab3e3c54fdb140536c2"; + sha256 = "0aqyhrxacxdd3l6xkz5gnyw8x3lsqrrsn2byicyxi7kai46kplmk"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9051,12 +9051,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "149ad2d3c297a11135322d00a2a3cef35911b278"; - sha256 = "1lkcid96ngaw1yyyin639x1icybd97g7016m9n4y2xrmkdbx32h4"; + rev = "18f337ebe1c5b792f19233071bd95ebd529082b2"; + sha256 = "1m4iw0zyd3npm8cw9np8qn92gcn3lnybjqdm2n4v5m2ws2g6zmr7"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9727,12 +9727,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-10-10"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "daf59744f60e34cbb48a40a092e9e735553b6f21"; - sha256 = "0mlfnhyz1daxmrfvvqmwpcqpqkl4nd5dqwz4ac539ffaca2mf6zb"; + rev = "ca5fa5326fc2b2ebd3269176594c4341ad720ac5"; + sha256 = "16pqbn4i23j3ynzii5cszfqwrbz54cd8d99hqkqamvsm36q9m5b7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10065,12 +10065,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-11-18"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "65fcc8fb79ceef644af6861558bb534562ef6c0e"; - sha256 = "12dhchvn9mgs3pndiq6bnjn44ixx3famf5ad3vhhw0h7331p7v9v"; + rev = "f3a6cb7116c3eaa60cc7f6a3648f1dd5b9f6500b"; + sha256 = "0f30di446zisc1hj4cyfs8n4cyxlnxqr9njx84liff1q5p8h9pj6"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10198,12 +10198,12 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-10-02"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "c80844fd52ba76f48fabf83e2b9f9b93273f418d"; - sha256 = "19rbq39m7c1v9yrfmlwmfmxgv5d9bwcjbgjdp3cin409fnl4rv6b"; + rev = "fb0c365534e7ee327b30205beff3f3a708dcba33"; + sha256 = "08mn5xn2mbpy7b976a196958x8kfa2ik349lbmi15si8p6szfizv"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -10342,12 +10342,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-11-16"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "11f50fb66132c0bac929533b64536a8a7c490435"; - sha256 = "10dw4v8z8akgbp745f4ir0jnspxa1lji7adpgqa9fvkw78yws1n1"; + rev = "89675239daee17ea9cdd369d56e9622dc841ef88"; + sha256 = "1h7qygc1c4kk8jnxfd56n949vn473jc12zqnr1z3gf8jf12lw2qk"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10426,12 +10426,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-11-16"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "fe51253418442af7c5e5884e084bdc574b5be5fb"; - sha256 = "12zpkskk81nagai3rip7ak0k7nz5imj07bphkalchf6lrr464bli"; + rev = "79eeee732f7272a476e9df042efc4df473feeda7"; + sha256 = "1a2hmqzn60l5hs0fsklbvxmd3a3hrr40x5d0m8jw1f3hdnlm0355"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10522,12 +10522,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-11-07"; + version = "2023-11-21"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "1d242f09a4e8cd20589a3cf48f0ac3830246f14d"; - sha256 = "126319l699a16b862y33a03zlpzbackbvn6d4brnabbmanisd56n"; + rev = "61c56c7865ac9708cb4615ff0281e94297f82c1f"; + sha256 = "1rq47x48dgsvs0z5hqmb87kba8rkz1w178cbshxjwxzb92v701qc"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -11374,12 +11374,12 @@ final: prev: vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; - version = "2023-08-22"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "03b8f306895137721d9e34ff8d3054cced89661a"; - sha256 = "059z2gmi32vl078nna58w56fkgn66y80jjb30qigr4gxlgn4r1y5"; + rev = "22e551acedcd97425d831ecbc881b2012d919e1f"; + sha256 = "1k30m7yc03i7dcpdz8xisjjm3chnk80cp155jnyahcfkr346ipza"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -11578,12 +11578,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2023-10-27"; + version = "2023-11-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "fecf5a3ecfb1869f34252c7c27351de99f01ab0e"; - sha256 = "18s05nvhfx56hqjg59ypvzrk7jm70c1yazic01i9pjznv5fpcnrg"; + rev = "738cfc2ea6a1510fe23cba9006fef9291be70f7b"; + sha256 = "1j3kga4iy6n8814j33zpxxyk4z7lxwqdnjdd70mhpybiw9ydazny"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -12070,12 +12070,12 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-11-14"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "b1d93789faf8bfe1f3e17eec03b8312c2939fcf2"; - sha256 = "11rykxacg9qlwyf0j4p6w8qqjr5yi1inmghyb4mvd5d0zp61p5w0"; + rev = "3f01a623376957437f9376327637491b74719e38"; + sha256 = "16az2qg9a3r466b9s4agqvxnsx99wpqlw8kn8dxcg94hxrgg35dc"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -12298,12 +12298,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2023-10-02"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1401b576c6ac382529188d3d26cff866139f2f9a"; - sha256 = "1i6k7i3dqzx825vhp1y2i7ca1i0y8bclkj13vnwws6drw3q9gbrg"; + rev = "97327927551d519f8f035f6f12f7bca041fed665"; + sha256 = "1kby6q5qi94i1jbb9vnl8llv55yvafap0w02hfm373rid00yi6fz"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12454,12 +12454,12 @@ final: prev: vim-helm = buildVimPlugin { pname = "vim-helm"; - version = "2022-08-22"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "towolf"; repo = "vim-helm"; - rev = "c2e7b85711d410e1d73e64eb5df7b70b1c4c10eb"; - sha256 = "1khisqaiq0gvjn2p3w42vcwadcbcs2ml5x6mi3gaclp7q0hyc19m"; + rev = "fc2259e1f8836304a0526853ddc3fe27045be39a"; + sha256 = "10al5is3x2a2383023rn8p9q056mgsc6dhyblxj48xb32rsmlf23"; }; meta.homepage = "https://github.com/towolf/vim-helm/"; }; @@ -12898,6 +12898,18 @@ final: prev: meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; + vim-lark-syntax = buildVimPlugin { + pname = "vim-lark-syntax"; + version = "2023-10-10"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "vim-lark-syntax"; + rev = "e59976afd02b4c5ac36818ad0076c04c1584336a"; + sha256 = "00vham3ar63g0jxrr01rbcwzq7381mml0qasgywsvzbfmc7gr5ig"; + }; + meta.homepage = "https://github.com/lark-parser/vim-lark-syntax/"; + }; + vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; version = "2023-08-24"; @@ -13092,12 +13104,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-11-11"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "ee2bb88833766ed184a77d4caa1e43d0821eaeb2"; - sha256 = "1bq745cx1ybzi84zjm6lj3mzy4bz5id5fs07jkvipakdpp44bxsa"; + rev = "dbe8b17c0926ab1155fa54ddddc4d692c19292bd"; + sha256 = "1qydmzc2qqqg8dmgn26fyf4wz10h6glfc67pz3pxi6rsqf5549hj"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -14822,12 +14834,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-11-15"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "6d054a713d601291c01c42197796644cf00ca9f2"; - sha256 = "0lf82ka9x1fkgczqxkbvlqygp6glcn1baq8ix0y60jn3kqccpm4s"; + rev = "d11dc6f9c3e2f062646e3e265f878dcdfbb6a8ca"; + sha256 = "1kr1shaa6kcwhsv1g6cv2m6n6dvbg0w5rk5nn12804g5i5g2svbd"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15567,12 +15579,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-11-15"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a630f0f75d9468d10c9125f2f1b0049e479c2f54"; - sha256 = "0f1p93jmhfp6fvl29v58rgwcvqa5lh1ks44w7gp6yh2w0i78s200"; + rev = "283252ffe38bbd79dfa08366552abada824cbdda"; + sha256 = "029x2j6aj1r5di96kzs9kd5qq85jiqid1j9r9mwydvvfy6bny40c"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15639,12 +15651,12 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-10-01"; + version = "2023-11-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "58dabc027909330970ac549e52bf799a723878c5"; - sha256 = "0xb385781kll7hrhgm7nw7frjx2fwd2gzriwn9gby2s7m6yx8xib"; + rev = "290b815cd5a5ff1fb65a48936633d93e2bf14dbd"; + sha256 = "1hqnczyyg21lsv4j3kvp0w84xm0fxzvdmgakwx2q1wg3x1g4ybcf"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -16024,12 +16036,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-17"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "a8dfb969e76d1a0752d98b5347be9ffb9bca9592"; - sha256 = "07xmcvb06w4khjc2z8h3i1c63fhkk4d76xjzwxs8lhzwfm4w3n86"; + rev = "a2107df4379d66e72a36a89792603151cebec1bf"; + sha256 = "06wgz8v8h1x8sh8l8j94njp8hfrw54axc0mzhgnczz9wn07rl4sc"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16120,12 +16132,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-10-30"; + version = "2023-11-22"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e89e67da3237d965ab10230de30071d1fdcf0b02"; - sha256 = "067w9rsp9srckxb4fyghy73cx50p5xg00l1x2fj4nsahv05bigkr"; + rev = "e61df0bf5978bebedf20c964b194de60b69c7a80"; + sha256 = "0gypz85mhsnjwlwis8slm9y401wvw6pqyk0rmln1xcfqn0f8029d"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3e80713f8871..ca2006cfb8d9 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -248,12 +248,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=5153dbb"; + version = "0.0.0+rev=cf10fc3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "5153dbbc70e4cc2324320c1bdae020d31079c7c0"; - hash = "sha256-0eC2cm/cP9BLfNKsubJd4S4BHF2nJdx/OCNJNC4ur6Q="; + rev = "cf10fc38bc24faf0549d59217ff37c789973dfdc"; + hash = "sha256-Pm8aZnsw2fKRA0Cz0sOdcWh2GX7ty3wy34OfUtxmBds="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -326,12 +326,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=d33ee2c"; + version = "0.0.0+rev=2c6e806"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "d33ee2caab572f7b46cef12e090331b9ed1c02e2"; - hash = "sha256-9fQ0z7DozjGdcQZG36w419mFXIVDeafkG+ciQHgh0EE="; + rev = "2c6e806949197e7898910c78f514a3b7ff679068"; + hash = "sha256-JAShJo+jDv4kzFCPID0C3EokmeiWxMVcJoEsVOzKBEw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -371,12 +371,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=cc26cbf"; + version = "0.0.0+rev=53b4137"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"; - hash = "sha256-r23ycLCR79Ow4eI8rK03B3M1loU8/7K8dDrqBIPSAS0="; + rev = "53b4137bd37e726116ea918139767f982a1584d8"; + hash = "sha256-eHH6PiOR1xlIYFY2OcnvVVQanfAuJMkbsvDy9Wjm80U="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -538,12 +538,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=35ae91b"; + version = "0.0.0+rev=b7969b5"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5"; - hash = "sha256-sA1Sy2yHBACDlicLYX+BLdcy4cnpleaYYVcjPcgHtW0="; + rev = "b7969b5f12c44038379901a6f2094c31afa2ec2f"; + hash = "sha256-wfzfUGulZ3d7En5b/DiTrMcBNi4JHT723nSOS055v6w="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -736,12 +736,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=c9082ed"; + version = "0.0.0+rev=5bb58a6"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "c9082edab87b145e97090b133167cb53626d9f58"; - hash = "sha256-bwuPykagBFfTJ87C5oNcUWmKs9eBBYPZ0UOC/8zbbF8="; + rev = "5bb58a6a5b0941d4e1256c6335e50d9780e74dde"; + hash = "sha256-k2hs8psjVJ2HcNZoVaM4k81uccmacqbl7VxDXXOAQzA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -934,12 +934,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=ac65c93"; + version = "0.0.0+rev=8b10fab"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "ac65c934b3214e96e0f854be009a3bd51549bd14"; - hash = "sha256-rTBal4RBOFBKfb9cydvWH+JtCCMOlnnGMPb2X7LXRjE="; + rev = "8b10faba024b536dc85f76e0c678f573b1776034"; + hash = "sha256-9bl7RhZjQOqBOePB4Lx3FLR79svMSh7ZVe+YlFv27WU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1666,12 +1666,12 @@ }; pod = buildGrammar { language = "pod"; - version = "0.0.0+rev=ea5d557"; + version = "0.0.0+rev=39da859"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-pod"; - rev = "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"; - hash = "sha256-CFPfpFQYlaryMX/k6tBT9k0WbQRz2vdVzh++lIVYe80="; + rev = "39da859947b94abdee43e431368e1ae975c0a424"; + hash = "sha256-sMUlAtl0IaykKlEhOiAkdrLNNJiCS0L7gj7+2WHwO5U="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; }; @@ -1719,6 +1719,17 @@ }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql"; }; + properties = buildGrammar { + language = "properties"; + version = "0.0.0+rev=9725327"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-properties"; + rev = "97253273bdf8b63546c8006e71ba155ecc27069e"; + hash = "sha256-pzAoRPBZRqlchnaYrKixrgjTZZ3nLzoOD5MZCqS7trI="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-properties"; + }; proto = buildGrammar { language = "proto"; version = "0.0.0+rev=e9f6b43"; @@ -2064,12 +2075,12 @@ }; smithy = buildGrammar { language = "smithy"; - version = "0.0.0+rev=cf8c7eb"; + version = "0.0.0+rev=8327eb8"; src = fetchFromGitHub { owner = "indoorvivants"; repo = "tree-sitter-smithy"; - rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0"; - hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w="; + rev = "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"; + hash = "sha256-6z2Psw+cjC11CXoGOJ/lkBPJXKqECCSrhchOiAPmd14="; }; meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; @@ -2132,12 +2143,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=d8fffdf"; + version = "0.0.0+rev=a3ea0e4"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "d8fffdf0902bf55994fd2e8a0a46e221ca988589"; - hash = "sha256-PowCYtL56lLGJaXFEdtPGAXaqYF0/u/mqDCjXHmyps0="; + rev = "a3ea0e4143a617fc2c4ccf29c41e0ba7a1ff6ab9"; + hash = "sha256-VwkehcELs+t+1GjiOiPs1UQT+0E7OZaXaWTyjFWlMto="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2154,12 +2165,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=1651e63"; + version = "0.0.0+rev=9ff3cab"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "1651e637d57c667708add5440d3726f07e97d953"; - hash = "sha256-jshQhWIeMcsUA7g2RGuH3DSfBfRhRx9dMOJVm/92Jkw="; + rev = "9ff3cabeb738f94bfc3c2de4d3857133ad717e3f"; + hash = "sha256-uEm3Egz2/37TxmF24YklfVaxboQsbh5f9+TVcPAdpd0="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2344,12 +2355,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=d99cb5c"; + version = "0.0.0+rev=c5fae9e"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "d99cb5c77bb0e733176d607a0875ac30e17e1e72"; - hash = "sha256-ShZlFHokmy3hhfTeh+/anz7a2bGDwWAdWIdi3X/lchQ="; + rev = "c5fae9e4ad9f483fb6232a8688a2c940be6b496b"; + hash = "sha256-k2NN7vRIDsq/J4J6T9KEAwSht7JBtU9Ul7tUL/TrU58="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2502,12 +2513,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=2f24b03"; + version = "0.0.0+rev=20433e0"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "2f24b0377ddb865eb4285634f6945cb4ee3f395c"; - hash = "sha256-DLtG1RzoDC252O1FItP9vDZyt/MpV4bR7tcMSOLINWA="; + rev = "20433e0d8ff5bb6e7bb28d12948773be2bdd983d"; + hash = "sha256-QdcGwVw8NNgdL1F+cytA6L1uzoAXGEcedTp16fLkS+o="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2602,12 +2613,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=f6423ec"; + version = "0.0.0+rev=d483d21"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "f6423ecace1ef34f57dc77db031504ce21ebfaaf"; - hash = "sha256-uIUIXHxHWedJ5oH1u/88degVAzklzN97AYc5B39nFwE="; + rev = "d483d21ad212bc9641e88deee0db2dad670eaaf3"; + hash = "sha256-EmK4xFO1WlIw3zebshrvBqJeEa/C9d2ACCzeKd4EAyM="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ff93512e5c17..2ecd1bdb171a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1086,6 +1086,7 @@ https://github.com/peitalin/vim-jsx-typescript/,, https://github.com/mroavi/vim-julia-cell/,HEAD, https://github.com/NoahTheDuke/vim-just/,, https://github.com/knubie/vim-kitty-navigator/,, +https://github.com/lark-parser/vim-lark-syntax/,HEAD, https://github.com/farmergreg/vim-lastplace/,, https://github.com/xuhdev/vim-latex-live-preview/,, https://github.com/ludovicchabant/vim-lawrencium/,, diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index cc4d7265ce28..d26aae29b2e3 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -4,6 +4,7 @@ , writeShellScript , fetchFromGitHub , fetchpatch +, nixosTests , freetype , libjpeg @@ -107,14 +108,14 @@ let ]; in stdenv.mkDerivation { pname = "darling"; - version = "unstable-2023-05-02"; + version = "unstable-2023-11-07"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling"; - rev = "557e7e9dece394a3f623825679474457e5b64fd0"; + rev = "34351655a40d2090e70b3033a577b8cdea967633"; fetchSubmodules = true; - hash = "sha256-SOoLaV7wg33qRHPQXkdMvrY++CvoG85kwd6IU6DkYa0="; + hash = "sha256-Jhr7Do15vms8bJ8AczVSkuWrC7gUR5ZvU9/PfCmGGcg="; }; outputs = [ "out" "sdk" ]; @@ -221,6 +222,8 @@ in stdenv.mkDerivation { $out/libexec/darling/usr/libexec/darling/mldr ''; + passthru.tests.nixos = nixosTests.darling; + meta = with lib; { description = "Open-source Darwin/macOS emulation layer for Linux"; homepage = "https://www.darlinghq.org"; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 8bddaa96abd5..84b750f93971 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "552"; + version = "553"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-MaS9WxYlbQ7V/2mrETKS0UyWb5IzCrSwDcp4UlVS3zk="; + hash = "sha256-AQq5ljaxNzh0ZsoUqKgzz5kZKZMav99Jj8fI+e0wv7s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index d76231ee8c16..0d61c8ac37d5 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.14"; + version = "0.22.16"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-cAxdCjaCqEkwjL+OXW7ONkS7OpKfey3bUYmGzJyV+g8="; + sha256 = "sha256-Cx3DCTBsJLk0PZhGhkqLN7U8VeIVrv3Hj1OUYoHBvKA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7b4ec4bd774b..7779480fa08a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-VAnzacz/8LYCVMCjHXqd4B+NUFmiMqdxQqpyap+UMNc="; + hash = "sha256-cKUV+tBZ5ZdXkoLdJPdURKnWP5B5gzCUQQehVQIRgko="; }; patches = [ diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index 59537500878e..5962b49ffc6a 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -4,26 +4,28 @@ , pkg-config , river , wayland -, zig_0_9 +, wayland-protocols +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "rivercarro"; - version = "0.1.4"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~novakane"; repo = "rivercarro"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4="; + hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I="; }; nativeBuildInputs = [ pkg-config river wayland - zig_0_9.hook + wayland-protocols + zig_0_11.hook ]; meta = with lib; { @@ -42,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; - inherit (zig_0_9.meta) platforms; + inherit (zig_0_11.meta) platforms; }; }) diff --git a/pkgs/applications/networking/asn/default.nix b/pkgs/applications/networking/asn/default.nix index e2a62c1f8b10..7b8caee04bc9 100644 --- a/pkgs/applications/networking/asn/default.nix +++ b/pkgs/applications/networking/asn/default.nix @@ -15,16 +15,18 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.74"; + version = "0.75"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; - rev = "v${version}"; - sha256 = "sha256-400I8aWQaPE7qCV/HqyPzuMmKpUyLc+RK7GCVgbt7JQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-XqP0Nx5pfYtM1xXxEDGooONj7nQ9UngJ9/AOZefnPV8="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; installPhase = '' install -Dv asn "$out/bin/asn" @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ curl whois bind mtr jq ipcalc grepcidr nmap aha ]}" ''; - meta = { + meta = with lib; { description = "OSINT command line tool for investigating network data"; longDescription = '' ASN / RPKI validity / BGP stats / IPv4v6 / Prefix / URL / ASPath / Organization / @@ -41,7 +43,8 @@ stdenv.mkDerivation rec { lookup API server / Web traceroute server ''; homepage = "https://github.com/nitefood/asn"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ devhell ]; + changelog = "https://github.com/nitefood/asn/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 745b21eeb807..dcb8923c423c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -66,7 +66,7 @@ let deprecatedNativeMessagingHost = option: pkg: if (cfg.${option} or false) then - lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead" + lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts.packages` instead" [pkg] else []; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 04de25c4988a..c8b315893a52 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -26,14 +26,14 @@ let stripRoot = false; }; - pname = "qutebrowser"; version = "3.0.2"; in python3.pkgs.buildPythonApplication { - inherit pname version; + pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5"; + inherit version; src = fetchurl { - url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; }; diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 00816c0203ee..3926feebfc04 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-kLDriWkzOX4mC4VTpkyEtMTpOSoR0BsCwVeWLCfaY5w="; + hash = "sha256-h6GxU7y6z5wyZjuK7wI6BG0aF2u6hqLsID7ijTNzifc="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 7a45eea58c42..05704c9831dd 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-Qcy+LGvoDJZ+zpIJvC8P0c5pl6GpiDuq7sWdrdMojmg="; + sha256 = "sha256-APv9Z8cxcG283sEvC3/xwNMXStytM2dr/pemTES0Ltk="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-6JM5r/MUETmlMB/8Z82mpUe8bAym9ekb1HL24ik2OlE="; + vendorHash = "sha256-R2810TRxKDPOBfdCSNFJ4425tHQC6R4d5Xltd7jK2V8="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 182a78552667..d069e0a1f446 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -258,6 +258,7 @@ stdenv.mkDerivation rec { the MTProto secure protocol. ''; license = licenses.gpl3Only; + platforms = platforms.all; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 968268adbdd3..baf60784cf61 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,6 +10,7 @@ , qtbase , qtsvg , qttools +, wrapGAppsHook , wrapQtAppsHook , guiSupport ? true @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja + wrapGAppsHook wrapQtAppsHook ]; @@ -74,6 +76,8 @@ stdenv.mkDerivation rec { "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; + dontWrapGApps = true; + postInstall = lib.optionalString stdenv.isDarwin '' APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} @@ -81,6 +85,10 @@ stdenv.mkDerivation rec { makeWrapper $out/{Applications/$APP_NAME.app/Contents/MacOS,bin}/$APP_NAME ''; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org"; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index bf9f59444aae..854fee0b6b65 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -61,7 +61,7 @@ qt5.mkDerivation rec { meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = "http://x2go.org/"; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/applications/networking/remote/x2goserver/default.nix index 6d7923872ec9..44e16e378f55 100644 --- a/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/pkgs/applications/networking/remote/x2goserver/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "http://x2go.org/"; platforms = lib.platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ averelld mkg20001 ]; + maintainers = with maintainers; [ averelld ]; }; } diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index c7f1891e2c54..f92b63a9ba98 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "23.10.0"; + version = "23.11.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "sha256-o58UNc4r+MQbH00727YTV17M7D29BbH8CgUXCORKk7E="; + sha256 = "sha256-f1cXrkVCIc1MqTvlCUBFqzHLhIVueybVxipNZRlF2gE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 3a51d280db56..8e77f2d3cc6c 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -13,7 +13,7 @@ , fetchYarnDeps , yarn , nodejs -, fixup_yarn_lock +, prefetch-yarn-deps , glibcLocales , libiconv , Cocoa @@ -66,7 +66,7 @@ let inherit version; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps nodejs yarn ]; @@ -75,7 +75,7 @@ let runHook preBuild export HOME=$(mktemp -d) - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 77c36d3f81c0..6b513dae9e1e 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.11.1"; + version = "1.12"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-D4Y+n/6R2v3U/BhYQitsHd6ckda1vfAzciFbTM/1J80="; + hash = "sha256-61E/71axlN5H1KpAkWFm7jOETlmmy2qh7R+JrVZlMIQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 412db059eac7..7a5bc71ce85c 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, fixup_yarn_lock +, prefetch-yarn-deps , nodejs , makeWrapper , copyDesktopItems @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - fixup_yarn_lock + prefetch-yarn-deps nodejs makeWrapper copyDesktopItems @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { export HOME="$TMPDIR" yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 8a86f06785b4..80e7d2c2a39f 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -7,14 +7,14 @@ let apptainer = callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.2.4"; + version = "1.2.5"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-VaVOepfjMBf8F56S1Clpn8HPw65MNQMoZsQguKQ4Sg0="; + hash = "sha256-1XuqyNXyYrmIfqp8450z8+qET15hKVfj2v2iN9QPmDk="; }; # Update by running diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index c33856214f33..fe1b789a23cf 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.32.2"; + version = "0.32.3"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CKL4XsOBo8y4k06t5E7k2HBmI4VABW4rxU6Bjl52fhs="; + hash = "sha256-CldVak1BQ4VhRt24hHdog5O3crkQBZBkRWNT7uYUw4Y="; }; - cargoHash = "sha256-7v5813veJPP5NVe2gFZr+iXJmK+aLajSZuhEkgsMxuY="; + cargoHash = "sha256-gWBmzpgZcsO4u8kXSqtr4FIYvshXpxWbECg/tcyl9Ok="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index e149bdd65218..55ab62be1322 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -14,14 +14,14 @@ , wayland-protocols , wlroots_0_16 , xwayland -, zig_0_10 +, zig_0_11 , withManpages ? true , xwaylandSupport ? true }: stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.2.4"; + version = "0.2.5"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; + hash = "sha256-Xd9hg7UGTBlEyw8BDpTQYq/IRC7vUXhMx9j7YcCaQ20="; }; nativeBuildInputs = [ pkg-config wayland xwayland - zig_0_10.hook + zig_0_11.hook ] ++ lib.optional withManpages scdoc; diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 2eb817b9b1f8..83d56def4dcc 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock -, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, grim +, gawk +, jq +, swaylock +, imagemagick +, getopt +, fontconfig +, wmctrl +, makeWrapper +, bash }: let @@ -14,19 +26,22 @@ let fontconfig wmctrl ]; -in stdenv.mkDerivation rec { - pname = "swaylock-fancy-unstable"; - version = "2021-10-11"; + mainProgram = "swaylock-fancy"; +in + +stdenv.mkDerivation { + pname = "swaylock-fancy"; + version = "unstable-2023-11-21"; src = fetchFromGitHub { owner = "Big-B"; repo = "swaylock-fancy"; - rev = "265fbfb438392339bf676b0a9dbe294abe2a699e"; - sha256 = "NjxeJyWYXBb1P8sXKgb2EWjF+cNodTE83r1YwRYoBjM="; + rev = "ff37ae3c6d0f100f81ff64fdb9d422c37de2f4f6"; + hash = "sha256-oS4YCbZOIrMP4QSM5eHWzTn18k3w2OnJ2k+64x/DnuM="; }; postPatch = '' - substituteInPlace swaylock-fancy \ + substituteInPlace ${mainProgram} \ --replace "/usr/share" "$out/share" ''; @@ -37,7 +52,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' - wrapProgram $out/bin/swaylock-fancy \ + wrapProgram $out/bin/${mainProgram} \ --prefix PATH : "${depsPath}" ''; @@ -46,6 +61,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/Big-B/swaylock-fancy"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ frogamic ]; + inherit mainProgram; }; } diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 6a5e82427f7b..4b4d5770a1f8 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -11,6 +11,7 @@ # except in special cases. In most cases, use extraNativeBuildArgs instead , nativeImageBuildArgs ? [ (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") + (lib.optionalString (stdenv.isLinux && stdenv.isAarch64) "-H:PageSize=64K") "-H:Name=${executable}" "-march=compatibility" "--verbose" diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 05e14338a630..934c17eeac12 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.7.6"; + version = "2.7.7"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-hoP1Tv8L9U5R4CWzSL0HdND9Q3eZYW9IUSlWzxXAX2c="; + hash = "sha256-07PztwFPblYbhsBZuJBA0MdCy6vFdlk8bvqg3Xsk3nc="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix new file mode 100644 index 000000000000..6d7353ab9b43 --- /dev/null +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -0,0 +1,52 @@ +{ appimageTools +, fetchurl +, lib +, makeWrapper +, stdenv +}: + +let + pname = "beekeeper-studio"; + version = "4.0.3"; + + plat = { + aarch64-linux = "-arm64"; + x86_64-linux = ""; + }.${stdenv.hostPlatform.system}; + + hash = { + aarch64-linux = "sha256-PdRGZedNMZtGPI6Za2T94yKXvk6JoMoAot/kFKsBqQs="; + x86_64-linux = "sha256-P2HlCb0dai4cJlKcT9LLQ+njViD+oHS3KI2YdR5jR44="; + }.${stdenv.hostPlatform.system}; + + src = fetchurl { + url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}${plat}.AppImage"; + inherit hash; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ + install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows"; + homepage = "https://www.beekeeperstudio.io"; + changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}"; + license = licenses.gpl3Only; + mainProgram = "beekeeper-studio"; + maintainers = with maintainers; [ milogert alexnortung ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/co/cosmic-osd/Cargo.lock b/pkgs/by-name/co/cosmic-osd/Cargo.lock new file mode 100644 index 000000000000..f2b813428e15 --- /dev/null +++ b/pkgs/by-name/co/cosmic-osd/Cargo.lock @@ -0,0 +1,5053 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "atspi", + "futures-lite", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +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.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[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 = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[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-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.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-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", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.1", + "futures-lite", + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.1.0", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.21", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[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.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.21", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[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 = "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", + "foreign-types", + "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 = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[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", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-osd" +version = "0.1.0" +dependencies = [ + "i18n-embed", + "i18n-embed-fl", + "libcosmic", + "once_cell", + "rust-embed", + "serde", + "tokio", + "tokio-stream", + "uzers", + "zbus", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[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 = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.38", +] + +[[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.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[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_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "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-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 = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[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-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[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.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.6", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "smithay-client-toolkit 0.18.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.18.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.18.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.18.0", + "thiserror", + "unicode-segmentation", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[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", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#e0b34e5d289155ee1836af6fb6f74cd5bba9cf1c" +dependencies = [ + "apply", + "ashpd", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "slotmap", + "smithay-client-toolkit 0.17.0", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "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", + "pin-utils", +] + +[[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" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "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_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.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[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 = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +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", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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-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-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[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_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.38", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[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.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.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[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 = "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 = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.17.0" +source = "git+https://github.com/smithay/client-toolkit?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "dlib", + "log", + "memmap2 0.7.1", + "nix 0.26.4", + "pkg-config", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon 0.5.1", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit?rev=2e9bf9f#2e9bf9f31698851ca373e5f1e7ba3e6e804e4db1" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "pkg-config", + "rustix 0.38.21", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon 0.7.0", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.1", + "wayland-client 0.29.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +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.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "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.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.7", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +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.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "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.38", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "uzers" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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 = "wasm-bindgen" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + +[[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" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +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-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_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_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_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_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_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_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_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 = "winnow" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +dependencies = [ + "memchr", +] + +[[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.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +dependencies = [ + "libc", + "memmap2 0.7.1", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix new file mode 100644 index 000000000000..b71333fe0f94 --- /dev/null +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -0,0 +1,45 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, libxkbcommon +, udev +, wayland +}: + +rustPlatform.buildRustPackage rec { + pname = "cosmic-osd"; + version = "unstable-2023-11-15"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "c1d10382dd1132923a4ddc9c86bb89bd9a70cd68"; + hash = "sha256-KCjWTN6hjbmJU6UfCP5NWbLy2K09+eRY5U4cQ5iV3E4="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE="; + "cosmic-config-0.1.0" = "sha256-7pfKQvScoahp+Fhv+QfgyIroCyQO6kjXcnTilBL41K8="; + "smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4="; + "smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxkbcommon wayland udev ]; + + env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-osd"; + description = "OSD for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/Cargo.lock b/pkgs/by-name/co/cosmic-workspaces-epoch/Cargo.lock new file mode 100644 index 000000000000..2cb103f15242 --- /dev/null +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/Cargo.lock @@ -0,0 +1,5072 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel 1.9.0", + "atspi", + "futures-lite 1.13.0", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +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.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[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 = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5ea910c42e5ab19012bab31f53cb4d63d54c3a27730f9a833a88efcf4bb52d" +dependencies = [ + "async-lock 3.1.1", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.0.1", + "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-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", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +dependencies = [ + "async-lock 3.1.1", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.25", + "slab", + "tracing", + "waker-fn", + "windows-sys", +] + +[[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.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b9c7fe787d3b25cc0f804a1a8401790f0c5bc395beb5a64dc77d8de079105" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[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.25", + "windows-sys", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.25", + "signal-hook-registry", + "slab", + "windows-sys", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" +dependencies = [ + "rustix 0.38.25", + "tempfile", + "windows-sys", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite 1.13.0", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[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.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.0", + "async-lock 3.1.1", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.0.1", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.3.0", + "rustix 0.38.25", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.25", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[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 = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[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", + "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 = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "cosmic-protocols", + "smithay-client-toolkit 0.18.0", + "wayland-client 0.31.1", +] + +[[package]] +name = "cosmic-comp-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-comp#3dee249558c7e3f7b4b0fc46e459c996068514f9" +dependencies = [ + "input", + "serde", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cosmic-workspaces" +version = "0.1.0" +dependencies = [ + "anyhow", + "calloop", + "clap", + "cosmic-comp-config", + "cosmic-config", + "env_logger", + "futures-channel", + "gbm", + "libcosmic", + "memmap2 0.9.0", + "tokio", + "wayland-protocols 0.31.0", + "zbus", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[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 = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "ctor" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +dependencies = [ + "quote", + "syn 2.0.39", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[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_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "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-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", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "drm-ffi 0.6.0", + "drm-fourcc", + "nix 0.27.1", +] + +[[package]] +name = "drm" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58eefd79f5173683872c0c82d0f05c2dc3c583d631259f60bb7a323756b7ff2" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "drm-ffi 0.7.0", + "drm-fourcc", + "rustix 0.38.25", +] + +[[package]] +name = "drm-ffi" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d" +dependencies = [ + "drm-sys 0.5.0", + "nix 0.27.1", +] + +[[package]] +name = "drm-ffi" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220dd8c12ebf2b0cbaffa19e00de02f5f090d363fb900f16ea012c077eea1174" +dependencies = [ + "drm-sys 0.6.0", + "rustix 0.38.25", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae" + +[[package]] +name = "drm-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5115283ec60c99da8a9e5dc3c55f27680211e974c948cb6f3b51f0373190503b" +dependencies = [ + "libc", + "linux-raw-sys 0.6.1", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "etagere" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[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-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[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.39", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65dffaf38d96aa22cb748ccd9b1ffe624931e899f54c0225815ef7ac757a409f" +dependencies = [ + "bitflags 1.3.2", + "drm 0.11.0", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend 0.3.2", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" +dependencies = [ + "libc", +] + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "serde", + "smithay-client-toolkit 0.18.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.18.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.18.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.18.0", + "thiserror", + "unicode-segmentation", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[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", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "log", + "udev", +] + +[[package]] +name = "input-sys" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.25", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#57f4abb8a000c0e554c77807100025301599cf3f" +dependencies = [ + "apply", + "ashpd", + "cosmic-client-toolkit", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "ron", + "serde", + "slotmap", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", + "zbus", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] +name = "linux-raw-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4a7ec558fa3b65e4c69b6af8df01fb9ad51ac69262335e1505276bc091935d" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types 0.3.2", + "log", + "objc", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "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.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "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 = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "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_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[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 = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +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", + "pin-project-lite", + "windows-sys", +] + +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.25", + "tracing", + "windows-sys", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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", +] + +[[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-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[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_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[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.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", + "windows-sys", +] + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[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 = "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 = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit?rev=2e9bf9f#2e9bf9f31698851ca373e5f1e7ba3e6e804e4db1" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "pkg-config", + "rustix 0.38.25", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.1", + "wayland-client 0.29.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "softbuffer" +version = "0.3.3" +source = "git+https://github.com/pop-os/softbuffer?tag=v0.3-cosmic#6f0371ccece51d124c6c5d37082189df0dc5f9ba" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "drm 0.10.0", + "fastrand 2.0.1", + "foreign-types 0.5.0", + "js-sys", + "log", + "memmap2 0.9.0", + "objc", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.25", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-sys 0.31.1", + "web-sys", + "windows-sys", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[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.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#70b35712a2e79b6fdfef4cff4392ca94287cd0b1" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.25", + "windows-sys", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +dependencies = [ + "as-raw-xcb-connection", + "ctor", + "libloading 0.8.1", + "tracing", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tracing", + "windows-sys", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "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.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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 = "wasm-bindgen" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.1", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.0", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types 0.3.2", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + +[[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" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 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-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +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-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_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_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_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_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_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_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_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 = "winnow" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.26.4", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix new file mode 100644 index 000000000000..5ec477b821d3 --- /dev/null +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libxkbcommon +, libinput +, libglvnd +, mesa +, udev +, wayland +}: + +rustPlatform.buildRustPackage rec { + pname = "cosmic-workspaces-epoch"; + version = "unstable-2023-11-21"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "f61cdc5759235177521fbb6a39f164b9615adfc0"; + hash = "sha256-ZPkPqROZXRLLhv6fbjfsov5hIt+D0K7VFajKebHVZaw="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE="; + "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; + "smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE="; + "cosmic-comp-config-0.1.0" = "sha256-NKXIKhZLwZ0BZyGVEplAJ75H5YOsLRNeRrzdhczo3FQ="; + "cosmic-config-0.1.0" = "sha256-CxeefjDmEqQkXPhWTomF1yb4GCI9vs3OCvMawBGUgaw="; + "cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; + "softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k="; + "taffy-0.3.11" = "sha256-+gXAFZsS1cWxEisEpP0FMz9q1/UV7L2Ri4ToIP5Bt7s="; + }; + }; + + separateDebugInfo = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libxkbcommon libinput libglvnd mesa udev wayland ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client, which is always dlopen()ed except by the + # obscure winit backend. + RUSTFLAGS = map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-workspaces-epoch"; + description = "Workspaces Epoch for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/by-name/cy/cyanrip/package.nix index 1828858b3cdb..9626224b4f99 100644 --- a/pkgs/applications/audio/cyanrip/default.nix +++ b/pkgs/by-name/cy/cyanrip/package.nix @@ -10,19 +10,30 @@ , libmusicbrainz5 , curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cyanrip"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "cyanreg"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-gH/rWTRYX10Q2Y9oSaMu0bOy3SMbcSNmH3dkXHFAw90"; + repo = "cyanrip"; + rev = "v${finalAttrs.version}"; + hash = "sha256-sWgHf8S4GZDAIvMUf5KvGy2y0JcUbRS53IjArdgokqc="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ ffmpeg-headless libcdio libcdio-paranoia libmusicbrainz5 curl ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + ffmpeg-headless + libcdio + libcdio-paranoia + libmusicbrainz5 + curl + ]; meta = with lib; { homepage = "https://github.com/cyanreg/cyanrip"; @@ -31,4 +42,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.zane ]; }; -} +}) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 96098d190bb3..07e935962da0 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-q72IIKUWZBroDcxMEa1ppTPda9lg/KtEpCNOqlg9ZhU="; + hash = "sha256-wydKLy02S2REgN01Gb4PK1KsczjXsx5hU+hO9o9iZzE="; }; - cargoHash = "sha256-UBayjaQX+bRkciookfQYUrCCewMXlIL3Z1I2ZJIbX6o="; + cargoHash = "sha256-MybbaJQqVHz7yt8rPp8k3aWqQHD7SJkbC7PDjwgmpLo="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/by-name/le/lefthook/package.nix index 62ea51f5e73e..877f69ccbf2c 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.5.2"; + version = "1.5.3"; in buildGoModule rec { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-9lAgKHcUAhg3Z8fMNYu3JrjfSd0HaT7YhvjKlpLMi0E="; + hash = "sha256-pC6kEDOXNcuMfDvXomPZVMWpS/aHR4P4pIhqNkXAGuc="; }; vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/by-name/li/libpkgconf/package.nix index 68f8f525823a..f58bcd4b5edf 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/by-name/li/libpkgconf/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; - hash = "sha256-yr3zxHRSmFT3zM6Fc8WsaK00p+YhA3U1y8OYH2sjg2w="; + hash = "sha256-Jm1YYe5RxSvHECk6HTZiKuFtBI1x7FYDSgLrnPlnd2E="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 6e09e86f2059..df5342311cd1 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -2,16 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; rev = "v${version}"; - hash = "sha256-sXVMVU34gxZKGNye6hoyv07a7N7f6UbivA6thbSOeZA="; + hash = "sha256-uwLVg/bURz2jLAQZgLujDR2Zewu5pcE9bwEBg/DQ4Iw="; }; - cargoHash = "sha256-PsDaXMws/8hEvAZwClQ4okGuryg1iKg0IBr7Xp2QYBE="; + cargoHash = "sha256-tEgXqvSyScO/J/56ykCda3ERrTDQj5jCxlMEDof/fCA="; + + # Skip test that currently doesn't work + checkFlags = [ "--skip=execute::test::shell_code_execution" ]; meta = with lib; { description = "A terminal based slideshow tool"; diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix new file mode 100644 index 000000000000..40592a3d7dc3 --- /dev/null +++ b/pkgs/by-name/sa/satty/package.nix @@ -0,0 +1,67 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook4 +, cairo +, gdk-pixbuf +, glib +, gtk4 +, libadwaita +, pango +, fetchpatch +, copyDesktopItems +}: + +rustPlatform.buildRustPackage rec { + + pname = "satty"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "gabm"; + repo = "Satty"; + rev = "v${version}"; + hash = "sha256-x2ljheG7ZqaeiPersC/e8Er2jvk5TJs65Y3N1GjTiNU="; + }; + + cargoPatches = [ + (fetchpatch { + name = "fix-Cargo.lock"; + url = "https://github.com/gabm/Satty/commit/39be6ddce264552df971e949a6a3175b102530b2.patch"; + hash = "sha256-GUHupZE1A7AmXvZ8WvRzBkQyH7qlMTetBjHuakfIZ7w="; + }) + ]; + + cargoHash = "sha256-0GsbWd/gpKZm7nNXkuJhB02YKUj3XCrSfpRA9KBXydU="; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ]; + + postInstall = '' + install -Dt $out/share/icons/hicolor/scalable/apps/ assets/satty.svg + ''; + + desktopItems = [ "satty.desktop" ]; + + meta = with lib; { + description = "A screenshot annotation tool inspired by Swappy and Flameshot"; + homepage = "https://github.com/gabm/Satty"; + license = licenses.mpl20; + maintainers = with maintainers; [ pinpox ]; + mainProgram = "satty"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index 2f4af30ff304..ba946305425f 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -26,6 +26,9 @@ , systemd , forceInstallAllHacks ? true , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, nixosTests +, substituteAll +, wrapperPrefix ? "/run/wrappers/bin" }: stdenv.mkDerivation (finalAttrs: { @@ -75,6 +78,13 @@ stdenv.mkDerivation (finalAttrs: { popd ''; + patches = [ + (substituteAll { + src = ./xscreensaver-wrapper-prefix.patch; + inherit wrapperPrefix; + }) + ]; + preConfigure = '' # Fix installation paths for GTK resources. sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ @@ -105,6 +115,10 @@ stdenv.mkDerivation (finalAttrs: { cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver" ''; + passthru.tests = { + xscreensaver = nixosTests.xscreensaver; + }; + meta = { homepage = "https://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; diff --git a/pkgs/by-name/xs/xscreensaver/xscreensaver-wrapper-prefix.patch b/pkgs/by-name/xs/xscreensaver/xscreensaver-wrapper-prefix.patch new file mode 100644 index 000000000000..892924b560b7 --- /dev/null +++ b/pkgs/by-name/xs/xscreensaver/xscreensaver-wrapper-prefix.patch @@ -0,0 +1,37 @@ +--- a/driver/xscreensaver.c ++++ b/driver/xscreensaver.c +@@ -253,6 +253,8 @@ + #undef MAX + #define MAX(x,y)((x)>(y)?(x):(y)) + ++/* Define the default wrapper prefix here, for NixOS */ ++#define NIXOS_WRAPPER_PREFIX "@wrapperPrefix@" + + /* Globals used in this file. + */ +@@ -632,12 +634,24 @@ handle_sigchld (Display *dpy, Bool blanked_p) + static void + hack_environment (void) + { ++ static const char *wrapper_path = NIXOS_WRAPPER_PREFIX; + static const char *def_path = DEFAULT_PATH_PREFIX; + const char *opath = getenv("PATH"); + char *npath; + if (! opath) opath = "/bin:/usr/bin"; /* WTF */ +- npath = (char *) malloc(strlen(def_path) + strlen(opath) + 20); ++ /* NOTE: The NixOS patch adds extra margin than what would be expected for a ++ single extra ":" PATH separator to account for UTF-32 encoding. The ++ original 20 bytes would have only accounted for UTF-16 safely (the path ++ concatenation would have needed 28 bytes of margin at minimum for UTF-32). ++ */ ++ npath = (char *) malloc(strlen(wrapper_path) + strlen(def_path) + strlen(opath) + 32); + strcpy (npath, "PATH="); ++ if (wrapper_path && *wrapper_path) ++ { ++ strcat (npath, wrapper_path); ++ strcat (npath, ":"); ++ } ++ + strcat (npath, def_path); + strcat (npath, ":"); + strcat (npath, opath); diff --git a/pkgs/by-name/zx/zxtune/disable_updates.patch b/pkgs/by-name/zx/zxtune/disable_updates.patch new file mode 100644 index 000000000000..f25921d83b12 --- /dev/null +++ b/pkgs/by-name/zx/zxtune/disable_updates.patch @@ -0,0 +1,20 @@ +--- ./apps/zxtune-qt/ui/desktop/mainwindow.cpp.orig 2023-11-03 10:58:54.073651511 -0700 ++++ ./apps/zxtune-qt/ui/desktop/mainwindow.cpp 2023-11-03 10:59:08.900608850 -0700 +@@ -106,14 +106,9 @@ + Require(connect(actionReportBug, &QAction::triggered, this, &DesktopMainWindowImpl::ReportIssue)); + Require(connect(actionAboutQt, &QAction::triggered, this, &DesktopMainWindowImpl::ShowAboutQt)); + Require(connect(actionPreferences, &QAction::triggered, this, &DesktopMainWindowImpl::ShowPreferences)); +- if (Update::CheckOperation* op = Update::CheckOperation::Create(*this)) +- { +- Require(connect(actionCheckUpdates, &QAction::triggered, op, &Update::CheckOperation::Execute)); +- } +- else +- { +- actionCheckUpdates->setEnabled(false); +- } ++ ++ // Nix: disable update checks completely ++ actionCheckUpdates->setEnabled(false); + + Require(connect(Controls, &PlaybackControls::OnPrevious, MultiPlaylist, &Playlist::UI::ContainerView::Prev)); + Require(connect(Controls, &PlaybackControls::OnNext, MultiPlaylist, &Playlist::UI::ContainerView::Next)); diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix new file mode 100644 index 000000000000..959b80952c1e --- /dev/null +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -0,0 +1,148 @@ +{ lib +, stdenv +, fetchFromBitbucket +, nix-update-script +, boost +, zlib +# File backends (for decoding and encoding) +, withMp3 ? true +, lame +, withOgg ? true +, libvorbis +, withFlac ? true +, flac +# Audio backends (for playback) +, withOpenal ? false +, openal +, withSDL ? false +, SDL +, withOss ? false +, withAlsa ? stdenv.hostPlatform.isLinux +, alsa-lib +, withPulse ? stdenv.hostPlatform.isLinux +, libpulseaudio +# GUI audio player +, withQt ? true +, qt5 +, zip +}: +let + dlopenBuildInputs = [] + ++ lib.optional withMp3 lame + ++ lib.optional withOgg libvorbis + ++ lib.optional withFlac flac + ++ lib.optional withOpenal openal + ++ lib.optional withSDL SDL + ++ lib.optional withAlsa alsa-lib + ++ lib.optional withPulse libpulseaudio; + supportWayland = (!stdenv.hostPlatform.isDarwin); + platformName = "linux"; + staticBuildInputs = [ boost zlib ] + ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); +in stdenv.mkDerivation rec { + pname = "zxtune"; + version = "5055"; + + outputs = [ "out" ]; + + src = fetchFromBitbucket { + owner = "zxtune"; + repo = "zxtune"; + rev = "r${version}"; + hash = "sha256-ABXGbzjdsPUuQnwZQOho4s2xRSDGzbZdA6/hCkBb7zE="; + }; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "r([0-9]+)" ]; + }; + + strictDeps = true; + + nativeBuildInputs = lib.optionals withQt [ zip qt5.wrapQtAppsHook ]; + + buildInputs = staticBuildInputs ++ dlopenBuildInputs; + + patches = [ + ./disable_updates.patch + ]; + + # Fix use of old OpenAL header path + postPatch = '' + substituteInPlace src/sound/backends/gates/openal_api.h \ + --replace "#include <OpenAL/" "#include <AL/" + ''; + + buildPhase = let + setOptionalSupport = name: var: + "support_${name}=" + (if (var) then "1" else ""); + makeOptsCommon = [ + ''-j$NIX_BUILD_CORES'' + ''root.version=${src.rev}'' + ''system.zlib=1'' + ''platform=${platformName}'' + ''includes.dirs.${platformName}="${lib.makeSearchPathOutput "dev" "include" buildInputs}"'' + ''libraries.dirs.${platformName}="${lib.makeLibraryPath staticBuildInputs}"'' + ''ld_flags="-Wl,-rpath=\"${lib.makeLibraryPath dlopenBuildInputs}\""'' + (setOptionalSupport "mp3" withMp3) + (setOptionalSupport "ogg" withOgg) + (setOptionalSupport "flac" withFlac) + (setOptionalSupport "openal" withOpenal) + (setOptionalSupport "sdl" withSDL) + (setOptionalSupport "oss" withOss) + (setOptionalSupport "alsa" withAlsa) + (setOptionalSupport "pulseaudio" withPulse) + ]; + makeOptsQt = [ + ''tools.uic=${qt5.qtbase.dev}/bin/uic'' + ''tools.moc=${qt5.qtbase.dev}/bin/moc'' + ''tools.rcc=${qt5.qtbase.dev}/bin/rcc'' + ]; + in '' + runHook preBuild + make ${builtins.toString makeOptsCommon} -C apps/xtractor + make ${builtins.toString makeOptsCommon} -C apps/zxtune123 + '' + lib.optionalString withQt '' + make ${builtins.toString (makeOptsCommon ++ makeOptsQt)} -C apps/zxtune-qt + '' + '' + runHook postBuild + ''; + + # Libs from dlopenBuildInputs are found with dlopen. Do not shrink rpath. Can + # check output of 'out/bin/zxtune123 --list-backends' to verify all plugins + # load ("Status: Available" or "Status: Failed to load dynamic library..."). + dontPatchELF = true; + + installPhase = '' + runHook preInstall + install -Dm755 bin/linux/release/xtractor -t $out/bin + install -Dm755 bin/linux/release/zxtune123 -t $out/bin + '' + lib.optionalString withQt '' + install -Dm755 bin/linux/release/zxtune-qt -t $out/bin + '' + '' + runHook postInstall + ''; + + # Only wrap the gui + dontWrapQtApps = true; + preFixup = lib.optionalString withQt '' + wrapQtApp "$out/bin/zxtune-qt" + ''; + + meta = with lib; { + description = "Crossplatform chiptunes player"; + longDescription = '' + Chiptune music player with truly extensive format support. Supported + formats/chips include AY/YM, ZX Spectrum, PC, Amiga, Atari, Acorn, Philips + SAA1099, MOS6581 (Commodore 64), NES, SNES, GameBoy, Atari, TurboGrafX, + Nintendo DS, Sega Master System, and more. Powered by vgmstream, OpenMPT, + sidplay, and many other libraries. + ''; + homepage = "https://zxtune.bitbucket.io/"; + license = licenses.gpl3; + # zxtune supports mac and windows, but more work will be needed to + # integrate with the custom make system (see platformName above) + platforms = platforms.linux; + maintainers = with maintainers; [ EBADBEEF ]; + mainProgram = if withQt then "zxtune-qt" else "zxtune123"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index e195ebc9b8e3..d200a80a30fb 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -51,7 +51,6 @@ super: lib.trivial.pipe super [ buildInputs = [ vte ]; postFixup = '' wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" - wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/ddterm/app/dependencies-notification.js" ''; })) diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch index 448418d573ca..d5b61dba99aa 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch @@ -1,10 +1,27 @@ +diff --git a/__nix-prepend-search-paths.js b/__nix-prepend-search-paths.js +new file mode 100644 +index 0000000..bf3071b +--- /dev/null ++++ b/__nix-prepend-search-paths.js +@@ -0,0 +1,3 @@ ++import GIRepository from 'gi://GIRepository'; ++GIRepository.Repository.prepend_search_path('@gsound@/lib/girepository-1.0'); ++GIRepository.Repository.prepend_search_path('@libgda@/lib/girepository-1.0'); diff --git a/extension.js b/extension.js -index 26561f2..01209e7 100644 +index a3d6741..6a38850 100644 --- a/extension.js +++ b/extension.js -@@ -1,3 +1,5 @@ -+imports.gi.GIRepository.Repository.prepend_search_path('@gsound@/lib/girepository-1.0') -+imports.gi.GIRepository.Repository.prepend_search_path('@libgda@/lib/girepository-1.0') - - try { - +@@ -1,3 +1,4 @@ ++import './__nix-prepend-search-paths.js'; + import Gio from 'gi://Gio'; + import GLib from 'gi://GLib'; + import Shell from 'gi://Shell'; +diff --git a/prefs.js b/prefs.js +index 5dd94eb..634b2ef 100644 +--- a/prefs.js ++++ b/prefs.js +@@ -1,3 +1,4 @@ ++import './__nix-prepend-search-paths.js'; + import Gdk from 'gi://Gdk'; + import Gtk from 'gi://Gtk'; + import { ExtensionPreferences } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix new file mode 100644 index 000000000000..9e61e133f4cf --- /dev/null +++ b/pkgs/development/compilers/corretto/11.nix @@ -0,0 +1,37 @@ +{ corretto11 +, fetchFromGitHub +, gradle_7 +, jdk11 +, lib +, stdenv +, rsync +, runCommand +, testers +}: + +let + corretto = import ./mk-corretto.nix { + inherit lib stdenv rsync runCommand testers; + jdk = jdk11; + gradle = gradle_7; + version = "11.0.20.9.1"; + src = fetchFromGitHub { + owner = "corretto"; + repo = "corretto-11"; + rev = "b880bdc8397ec3dd6b7cd4b837ce846c9e902783"; + sha256 = "sha256-IomJHQn0ZgqsBZ5BrRqVrEOhTq7wjLiIKMQlz53JxsU="; + }; + }; +in +corretto.overrideAttrs (oldAttrs: { + # jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix) + # because of several compile errors. We need to include this parameter for + # Corretto, too. Since the build is invoked via `gradle` build.gradle has to + # be adapted. + postPatch = oldAttrs.postPatch + '' + for file in $(find installers -name "build.gradle"); do + substituteInPlace $file --replace "command += archSpecificFlags" "command += archSpecificFlags + ['--disable-warnings-as-errors']" + done + ''; + +}) diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix new file mode 100644 index 000000000000..308750356c2a --- /dev/null +++ b/pkgs/development/compilers/corretto/17.nix @@ -0,0 +1,26 @@ +{ corretto17 +, fetchFromGitHub +, gradle_7 +, jdk17 +, lib +, stdenv +, rsync +, runCommand +, testers +}: + +let + corretto = import ./mk-corretto.nix { + inherit lib stdenv rsync runCommand testers; + jdk = jdk17; + gradle = gradle_7; + version = "17.0.8.8.1"; + src = fetchFromGitHub { + owner = "corretto"; + repo = "corretto-17"; + rev = "9a3cc984f76cb5f90598bdb43215bad20e0f7319"; + sha256 = "sha256-/VuB3ocD5VvDqCU7BoTG+fQ0aKvK1TejegRYmswInqQ="; + }; + }; +in +corretto diff --git a/pkgs/development/compilers/corretto/19.nix b/pkgs/development/compilers/corretto/19.nix new file mode 100644 index 000000000000..ea1fcc1aee1b --- /dev/null +++ b/pkgs/development/compilers/corretto/19.nix @@ -0,0 +1,26 @@ +{ corretto19 +, fetchFromGitHub +, gradle_7 +, jdk19 +, lib +, stdenv +, rsync +, runCommand +, testers +}: + +let + corretto = import ./mk-corretto.nix { + inherit lib stdenv rsync runCommand testers; + jdk = jdk19; + gradle = gradle_7; + version = "19.0.2.7.1"; + src = fetchFromGitHub { + owner = "corretto"; + repo = "corretto-19"; + rev = "72f064a1d716272bd17d4e425d4a264b2c2c7d36"; + sha256 = "sha256-mEj/MIbdXU0+fF5RhqjPuSeyclstesGaXB0e48YlKuw="; + }; + }; +in +corretto diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix new file mode 100644 index 000000000000..026316f2fa73 --- /dev/null +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -0,0 +1,115 @@ +{ jdk +, version +, src +, lib +, stdenv +, gradle +, rsync +, runCommand +, testers +}: + +# Each Corretto version is based on a corresponding OpenJDK version. So +# building Corretto is more or less the same as building OpenJDK. Hence, the +# Corretto derivation overrides the corresponding OpenJDK derivation in order +# to have access to all the version-specific fixes for the various OpenJDK +# builds. However, Corretto uses `gradle` as build tool (which in turn will +# invoke `make`). The configure/build phases are adapted as needed. + +let + pname = "corretto"; + # The version scheme is different between OpenJDK & Corretto. + # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 + # "major.minor.security.build.revision" +in +jdk.overrideAttrs (finalAttrs: oldAttrs: { + inherit pname version src; + name = "${pname}-${version}"; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ]; + + dontConfigure = true; + + postPatch = '' + # The rpm/deb task definitions require a Gradle plugin which we don't + # have and so the build fails. We'll simply remove them here because + # they are not needed anyways. + rm -rf installers/linux/universal/{rpm,deb} + + # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. + for file in $(find installers -name "build.gradle"); do + substituteInPlace $file --replace "workingDir '/usr/bin'" "workingDir '.'" + done + ''; + + + buildPhase = + let + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + task = + if stdenv.isDarwin then + ":installers:mac:tar:packageBuildResults" + else ":installers:linux:universal:tar:packageBuildResults"; + in + '' + runHook preBuild + + # Corretto's actual built is triggered via `gradle`. + gradle --console=plain --no-daemon ${task} + + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + + runHook postBuild + ''; + + installPhase = oldAttrs.installPhase + '' + # The installPhase will place everything in $out/lib/openjdk and + # reference through symlinks. We don't rewrite the installPhase but at + # least move the folder to convey that this is not OpenJDK anymore. + mv $out/lib/openjdk $out/lib/corretto + ln -s $out/lib/corretto $out/lib/openjdk + ''; + + passthru = + let + pkg = finalAttrs.finalPackage; + in + oldAttrs.passthru // { + tests = { + version = testers.testVersion { + package = pkg; + }; + vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' + output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) + grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out + ''; + compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' + cat << EOF > Main.java + class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } + } + EOF + ${pkg}/bin/javac Main.java + ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out + ''; + }; + }; + + meta = with lib; { + homepage = "https://aws.amazon.com/corretto"; + license = licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + platforms = jdk.meta.platforms; + mainProgram = "java"; + maintainers = with maintainers; [ rollf ]; + }; +}) diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix index 121365320812..a78b3706f678 100644 --- a/pkgs/development/compilers/hare/default.nix +++ b/pkgs/development/compilers/hare/default.nix @@ -1,7 +1,100 @@ -{ config, lib, pkgs }: +{ lib +, stdenv +, fetchFromSourcehut +, binutils-unwrapped +, harec +, makeWrapper +, qbe +, scdoc +}: -lib.makeScope pkgs.newScope (self: { +let + # We use harec's override of qbe until 1.2 is released, but the `qbe` argument + # is kept to avoid breakage. + qbe = harec.qbeUnstable; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hare"; + version = "unstable-2023-10-23"; - harec = pkgs.callPackage ./harec { }; - hare = pkgs.callPackage ./hare { }; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare"; + rev = "1048620a7a25134db370bf24736efff1ffcb2483"; + hash = "sha256-slQPIhrcM+KAVAvjuRnqNdEAEr4Xa4iQNVEpI7Wl+Ks="; + }; + + nativeBuildInputs = [ + binutils-unwrapped + harec + makeWrapper + qbe + scdoc + ]; + + buildInputs = [ + binutils-unwrapped + harec + qbe + ]; + + # Append the distribution name to the version + env.LOCALVER = "nix"; + + configurePhase = + let + # https://harelang.org/platforms/ + arch = + if stdenv.isx86_64 then "x86_64" + else if stdenv.isAarch64 then "aarch64" + else if stdenv.hostPlatform.isRiscV && stdenv.is64bit then "riscv64" + else "unsupported"; + platform = + if stdenv.isLinux then "linux" + else if stdenv.isFreeBSD then "freebsd" + else "unsupported"; + in + '' + runHook preConfigure + + cp config.example.mk config.mk + makeFlagsArray+=( + PREFIX="${builtins.placeholder "out"}" + HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)" + BINOUT="$(mktemp -d --tmpdir bin.XXXXXXXX)" + PLATFORM="${platform}" + ARCH="${arch}" + ) + + runHook postConfigure + ''; + + doCheck = true; + + postFixup = + let + binPath = lib.makeBinPath [ + binutils-unwrapped + harec + qbe + ]; + in + '' + wrapProgram $out/bin/hare --prefix PATH : ${binPath} + ''; + + setupHook = ./setup-hook.sh; + + strictDeps = true; + enableParallelBuilding = true; + + meta = { + homepage = "https://harelang.org/"; + description = + "A systems programming language designed to be simple, stable, and robust"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "hare"; + inherit (harec.meta) platforms badPlatforms; + }; }) diff --git a/pkgs/development/compilers/hare/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk deleted file mode 100644 index b3b0f535915a..000000000000 --- a/pkgs/development/compilers/hare/hare/config-template.mk +++ /dev/null @@ -1,44 +0,0 @@ -## Template to generate config.mk via substitute-all - -# set PREFIX externally -BINDIR = $(PREFIX)/bin -MANDIR = $(PREFIX)/share/man -SRCDIR = $(PREFIX)/src -STDLIB = $(SRCDIR)/hare/stdlib - -HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party - -## Build configuration - -# Platform to build for -PLATFORM = @platform@ -ARCH = @arch@ - -# External tools and flags -HAREC = harec -HAREFLAGS = @hareflags@ -QBE = qbe -AS = as -LD = ld -AR = ar -SCDOC = scdoc - -# Where to store build artifacts -# set HARECACHE externally - -# Cross-compiler toolchains -# # TODO: fixup this -AARCH64_AS=aarch64-as -AARCH64_AR=aarch64-ar -AARCH64_CC=aarch64-cc -AARCH64_LD=aarch64-ld - -RISCV64_AS=riscv64-as -RISCV64_AR=riscv64-ar -RISCV64_CC=riscv64-cc -RISCV64_LD=riscv64-ld - -X86_64_AS=as -X86_64_AR=ar -X86_64_CC=cc -X86_64_LD=ld diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix deleted file mode 100644 index f95bff23f612..000000000000 --- a/pkgs/development/compilers/hare/hare/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, binutils-unwrapped -, harePackages -, makeWrapper -, qbe -, scdoc -, substituteAll -}: - -let - inherit (harePackages) harec; -in -stdenv.mkDerivation (finalAttrs: { - pname = "hare"; - version = "unstable-2023-04-23"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "hare"; - rev = "464ec7a660b12ab1ef8e4dcc9d00604cec996c6e"; - hash = "sha256-5/ObckDxosqUkFfDVhGA/0kwjFzDUxu420nkfa97vqM="; - }; - - nativeBuildInputs = [ - binutils-unwrapped - harec - makeWrapper - qbe - scdoc - ]; - - buildInputs = [ - binutils-unwrapped - harec - qbe - ]; - - strictDeps = true; - - configurePhase = - let - # https://harelang.org/platforms/ - arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isAarch64 then "aarch64" - else if stdenv.hostPlatform.isRiscV && stdenv.is64bit then "riscv64" - else "unsupported"; - platform = - if stdenv.isLinux then "linux" - else if stdenv.isFreeBSD then "freebsd" - else "unsupported"; - hareflags = ""; - config-file = substituteAll { - src = ./config-template.mk; - inherit arch platform hareflags; - }; - in - '' - runHook preConfigure - - export HARECACHE="$NIX_BUILD_TOP/.harecache" - export BINOUT="$NIX_BUILD_TOP/.bin" - cat ${config-file} > config.mk - - runHook postConfigure - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - doCheck = true; - - postInstall = - let - binPath = lib.makeBinPath [ - binutils-unwrapped - harec - qbe - ]; - in - '' - wrapProgram $out/bin/hare --prefix PATH : ${binPath} - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://harelang.org/"; - description = - "A systems programming language designed to be simple, stable, and robust"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; - inherit (harec.meta) platforms badPlatforms; - }; -}) diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix deleted file mode 100644 index 6b71e0df0252..000000000000 --- a/pkgs/development/compilers/hare/harec/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, qbe -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "harec"; - version = "unstable-2023-04-25"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "harec"; - rev = "068e8da091f9053726251bc221abf40fdea630ff"; - hash = "sha256-PPR0d+6JJRzPURW7AznloBSrtylMJExNCGCxFMl2LsA="; - }; - - nativeBuildInputs = [ - qbe - ]; - - buildInputs = [ - qbe - ]; - - # TODO: report upstream - hardeningDisable = [ "fortify" ]; - - strictDeps = true; - - doCheck = true; - - meta = { - homepage = "http://harelang.org/"; - description = "Bootstrapping Hare compiler written in C for POSIX systems"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; - # The upstream developers do not like proprietary operating systems; see - # https://harelang.org/platforms/ - # UPDATE: https://github.com/hshq/harelang provides a MacOS port - platforms = with lib.platforms; - lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); - badPlatforms = lib.platforms.darwin; - }; -}) diff --git a/pkgs/development/compilers/hare/hare/setup-hook.sh b/pkgs/development/compilers/hare/setup-hook.sh index d2d2c34354d6..d2d2c34354d6 100644 --- a/pkgs/development/compilers/hare/hare/setup-hook.sh +++ b/pkgs/development/compilers/hare/setup-hook.sh diff --git a/pkgs/development/compilers/harec/default.nix b/pkgs/development/compilers/harec/default.nix new file mode 100644 index 000000000000..6ddb5ff1f01c --- /dev/null +++ b/pkgs/development/compilers/harec/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromSourcehut +, qbe +, fetchgit +}: +let + # harec needs the dbgfile and dbgloc features implemented up to this commit. + # This can be dropped once 1.2 is released, for a possible release date see: + # https://lists.sr.ht/~mpu/qbe/%3CZPkmHE9KLohoEohE%40cloudsdale.the-delta.net.eu.org%3E + qbe' = qbe.overrideAttrs (_old: { + version = "1.1-unstable-2023-08-18"; + src = fetchgit { + url = "git://c9x.me/qbe.git"; + rev = "36946a5142c40b733d25ea5ca469f7949ee03439"; + hash = "sha256-bqxWFP3/aw7kRoD6ictbFcjzijktHvh4AgWAXBIODW8="; + }; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "harec"; + version = "unstable-2023-10-22"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "harec"; + rev = "64dea196ce040fbf3417e1b4fb11331688672aca"; + hash = "sha256-2Aeb+OZ/hYUyyxx6aTw+Oxiac+p+SClxtg0h68ZBSHc="; + }; + + nativeBuildInputs = [ + qbe' + ]; + + buildInputs = [ + qbe' + ]; + + strictDeps = true; + enableParallelBuilding = true; + + doCheck = true; + + passthru = { + # We create this attribute so that the `hare` package can access the + # overwritten `qbe`. + qbeUnstable = qbe'; + }; + + meta = { + homepage = "https://harelang.org/"; + description = "Bootstrapping Hare compiler written in C for POSIX systems"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "harec"; + # The upstream developers do not like proprietary operating systems; see + # https://harelang.org/platforms/ + # UPDATE: https://github.com/hshq/harelang provides a MacOS port + platforms = with lib.platforms; + lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 8f775699f482..5ffc5da59413 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -109,9 +109,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a1"; + suffix = "a2"; }; - hash = "sha256-8Cgb8izABBQ2HBT8kZcYPn6y6rtylla2lEIiT7tj7ss="; + hash = "sha256-ttRrRBkMTAJCHraaBC0WsMVUgb3agYxsQW3CRBE6nC0="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/development/interpreters/zuo/default.nix index ef302aacc739..d4ad9811ed5a 100644 --- a/pkgs/development/interpreters/zuo/default.nix +++ b/pkgs/development/interpreters/zuo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2023-11-10"; + version = "unstable-2023-11-23"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "9e2aa26b0574b4ac53c838f6b59fd78f952c3923"; - hash = "sha256-wF+jj4+4uFofW9KhVqRF7EoWViRny2KuSfX/l6UN+yY="; + rev = "4d85edb4f221de8a1748ee38dcc6963d8d2da33a"; + hash = "sha256-pFEXkByZpVnQgXK1DeFSEnalvhCTwOy75WrRojBM78U="; }; doCheck = true; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 9a86643061ce..256d90321939 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.6.2"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-pFtrmrNRSL1lw10LjayOoNFrW/tTPXwmUipwC5v1MZs="; + sha256 = "sha256-mbwi6tJer4JC7ijB6WGDNoC/EM5rqCtejbYRFi9Kwgk="; }; buildInputs = [ diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index e6ed4d2b6799..8a1d24948aa4 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -2,13 +2,13 @@ , cmake }: stdenv.mkDerivation rec { - version = "2.10.0"; + version = "2.12.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM="; + sha256 = "sha256-MsXSUxFH89EqxMe4285xFV1Tsqmv2l5RnEeli48O3XQ="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib openssl libre ]; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index a1fe567af8b1..f54e5c5a5afa 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-05-23"; + version = "unstable-2023-11-03"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "75a3b870cace1171faf57bd55e5a9a2f1564f757"; - hash = "sha256-QhJ09i7IWP6rbxrYuhisVsCr82Ou/JAZMEdkaLhZp1o="; + rev = "f7d1569113110ea8df071d2ea64fd17aaf5b42c9"; + hash = "sha256-W0+QXI0gJ4WwrlRMPAJOChvilZ4zlAf4kXrfgBAkQAE="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; license = licenses.isc; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz mkg20001 ]; mainProgram = "jshn"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index a2b38046c5a8..68a3e3531e19 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -375,6 +375,5 @@ let if stdenv.buildPlatform == stdenv.hostPlatform then bootstrapScope.qttranslations else null; - qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { }; }); in finalScope diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index bef3f7ef62e8..d18678b9f5cd 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -1,6 +1,8 @@ { newScope , lib , stdenv +, generateSplicesForMkScope +, makeScopeWithSplicing' , fetchurl , fetchpatch , fetchpatch2 @@ -12,6 +14,7 @@ , overrideSDK , buildPackages , python3 +, config # options , developerBuild ? false @@ -24,10 +27,11 @@ let mirror = "mirror://qt"; }; - addPackages = self: with self; + addPackages = self: let callPackage = self.newScope ({ - inherit qtModule srcs python3; + inherit (self) qtModule; + inherit srcs python3; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); in @@ -58,7 +62,9 @@ let ]; }; env = callPackage ./qt-env.nix { }; - full = env "qt-full-${qtbase.version}" ([ + full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}" + # `with self` is ok to use here because having these spliced is unnecessary + ( with self;[ qt3d qt5compat qtcharts @@ -96,7 +102,7 @@ let qtwebengine qtwebsockets qtwebview - ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ]); + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) { }; qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; @@ -149,11 +155,11 @@ let GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; - qtModule = qtModule.override { + qtModule = callPackage ({ qtModule }: qtModule.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } else stdenv; - }; + }) { }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; @@ -163,26 +169,32 @@ let inherit (darwin.apple_sdk_11_0.frameworks) WebKit; }; - wrapQtAppsHook = makeSetupHook + wrapQtAppsHook = callPackage ({ makeBinaryWrapper }: makeSetupHook { name = "wrap-qt6-apps-hook"; - propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ]; - } ./hooks/wrap-qt-apps-hook.sh; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh) { }; - qmake = makeSetupHook + qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake6-hook"; - propagatedBuildInputs = [ self.qtbase.dev ]; + propagatedBuildInputs = [ qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; - } ./hooks/qmake-hook.sh; + } ./hooks/qmake-hook.sh) { }; + } // lib.optionalAttrs config.allowAliases { + # Convert to a throw on 03-01-2023 and backport the change. + # Warnings show up in various cli tool outputs, throws do not. + # Remove completely before 24.05 + overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; }; - # TODO(@Artturin): convert to makeScopeWithSplicing' - # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 - baseScope = lib.makeScope newScope addPackages; + baseScope = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt6"; + f = addPackages; + }; bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 37c8a1fa450b..bdfe4aa58552 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-06-05"; + version = "unstable-2023-11-14"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "f787c97b34894a38b15599886cacbca01271684f"; - hash = "sha256-PGPFtNaRXS6ryC+MA/w2CtPQfJa+vG5OXf/NPFMoIzQ="; + rev = "b3e8c4ef07ebb6f0f34a5c1f0dc1539068363619"; + hash = "sha256-H/QrLMhdEC1LnSxHpp/90OdKbfHRqLVWUnzyQlsVO8c="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index bbc4fcebdfc3..43e6cb9d697d 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix index 76689da526d8..546e85fd96c7 100644 --- a/pkgs/development/libraries/ustream-ssl/default.nix +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { description = "ustream SSL wrapper"; homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary"; license = licenses.isc; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz mkg20001 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 61dd0f1084c1..16944c7b38bc 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,4 +1,4 @@ -{ lib, atdgen-codec-runtime, menhir, easy-format, buildDunePackage, re, yojson, nixosTests }: +{ lib, atdgen-codec-runtime, cmdliner, menhir, easy-format, buildDunePackage, re, yojson, nixosTests }: buildDunePackage rec { pname = "atd"; @@ -7,10 +7,9 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; nativeBuildInputs = [ menhir ]; + buildInputs = [ cmdliner ]; propagatedBuildInputs = [ easy-format re yojson ]; - strictDeps = true; - passthru.tests = { smoke-test = nixosTests.atd; }; diff --git a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix index ab1e82df1e99..d2a875080eab 100644 --- a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix +++ b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix @@ -2,13 +2,11 @@ buildDunePackage rec { pname = "atdgen-codec-runtime"; - version = "2.11.0"; - - duneVersion = "3"; + version = "2.15.0"; src = fetchurl { - url = "https://github.com/ahrefs/atd/releases/download/${version}/atdts-${version}.tbz"; - hash = "sha256-TTTuSxNKydPmTmztUapLoxntBIrAo8aWYIJ/G5cok1Y="; + url = "https://github.com/ahrefs/atd/releases/download/${version}/atd-${version}.tbz"; + hash = "sha256-ukJ5vtVNE9zz9nA6SzF0TbgV3yLAUC2ZZdbGdM4IOTM="; }; meta = { diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index fb5880a4f226..120585896600 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -5,21 +5,22 @@ , hatchling , platformdirs , traitlets +, pip , pytestCheckHook }: buildPythonPackage rec { pname = "jupyter-core"; - version = "5.3.1"; + version = "5.5.0"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-kQ7oNEC5L19PTPaX6C2bP5FYuzlsFsS0TABsw6VvoL8="; + hash = "sha256-GufCQUkR4283xMsyrbv5tDfJ8SeL35WBW5Aw2z6Ardc="; }; patches = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pip pytestCheckHook ]; @@ -43,6 +45,11 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; + pytestFlagsArray = [ + # suppress pytest.PytestUnraisableExceptionWarning: Exception ignored in: <socket.socket fd=-1, family=AddressFamily.AF_UNIX, type=SocketKind.SOCK_STREAM, proto=0> + "-W ignore::pytest.PytestUnraisableExceptionWarning" + ]; + disabledTests = [ # creates a temporary script, which isn't aware of PYTHONPATH "test_argv0" @@ -57,7 +64,8 @@ buildPythonPackage rec { meta = with lib; { description = "Base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; + changelog = "https://github.com/jupyter/jupyter_core/blob/${src.rev}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + maintainers = teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch index eb061676c0e2..48b44ad56e70 100644 --- a/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch +++ b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch @@ -1,8 +1,8 @@ -diff --git a/jupyter_core/tests/test_command.py b/jupyter_core/tests/test_command.py -index 4ef38cd..08fba22 100644 ---- a/jupyter_core/tests/test_command.py -+++ b/jupyter_core/tests/test_command.py -@@ -174,7 +174,7 @@ def test_not_on_path(tmpdir): +diff --git a/tests/test_command.py b/tests/test_command.py +index a0833c1..67c2110 100644 +--- a/tests/test_command.py ++++ b/tests/test_command.py +@@ -191,7 +191,7 @@ def test_not_on_path(tmpdir): witness_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS ME")') write_executable(witness, witness_src) @@ -11,7 +11,7 @@ index 4ef38cd..08fba22 100644 if "SYSTEMROOT" in os.environ: # Windows http://bugs.python.org/issue20614 env["SYSTEMROOT"] = os.environ["SYSTEMROOT"] if sys.platform == "win32": -@@ -198,7 +198,7 @@ def test_path_priority(tmpdir): +@@ -216,7 +216,7 @@ def test_path_priority(tmpdir): witness_b_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS B")') write_executable(witness_b, witness_b_src) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index c0b635abf460..cf71b36b3c2b 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -1,5 +1,4 @@ { lib -, backoff , buildPythonPackage , fetchFromGitHub , geojson @@ -7,21 +6,17 @@ , imagesize , nbconvert , nbformat -, ndjson , numpy -, opencv - # , opencv-python +, opencv4 , packaging , pillow , pydantic - # , pygeotile , pyproj -, pytest-cases , pytestCheckHook +, python-dateutil , pythonOlder -, pythonRelaxDepsHook -, rasterio , requests +, setuptools , shapely , tqdm , typeguard @@ -30,8 +25,8 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.52.0"; - format = "setuptools"; + version = "3.56.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -39,7 +34,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-t0Q+6tnUPK2oqjdAwwYeSebgn2EQ1fBivw115L8ndOg="; + hash = "sha256-JRh14XpW/iGeBWrslm7weCP/vyJ7eZICqRgQpE2wjXs="; }; postPatch = '' @@ -48,18 +43,13 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "backoff" + setuptools ]; propagatedBuildInputs = [ - backoff google-api-core - ndjson pydantic + python-dateutil requests tqdm ]; @@ -70,7 +60,7 @@ buildPythonPackage rec { geojson numpy pillow - # opencv-python + opencv4 typeguard imagesize pyproj @@ -83,10 +73,15 @@ buildPythonPackage rec { nativeCheckInputs = [ nbconvert nbformat - pytest-cases pytestCheckHook ] ++ passthru.optional-dependencies.data; + # disable pytest_plugins which requires `pygeotile` + preCheck = '' + substituteInPlace tests/conftest.py \ + --replace "pytest_plugins" "_pytest_plugins" + ''; + disabledTestPaths = [ # Requires network access "tests/integration" @@ -94,11 +89,6 @@ buildPythonPackage rec { "tests/data" ]; - pytestFlagsArray = [ - # see tox.ini - "-k 'not notebooks'" - ]; - pythonImportsCheck = [ "labelbox" ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 68d3de53cb3a..4afb593479d6 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -21,7 +21,6 @@ , importlib-metadata , flaky , ipywidgets -, pyppeteer , pytestCheckHook }: @@ -33,15 +32,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.8.0"; + version = "7.11.0"; + pyproject = true; disabled = pythonOlder "3.8"; - format = "pyproject"; - src = fetchPypi { inherit pname version; - hash = "sha256-9bwVoSR+FN1Bzu8MCjvHACDgFldusFeNpi8cW0+VBHk="; + hash = "sha256-q+3AHPVDF3/94L/Cppcm1aR49q8QozL8G/Kfy08M8AA="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -87,7 +85,6 @@ in buildPythonPackage rec { nativeCheckInputs = [ flaky ipywidgets - pyppeteer pytestCheckHook ]; @@ -105,8 +102,9 @@ in buildPythonPackage rec { meta = { description = "Converting Jupyter Notebooks"; - homepage = "https://jupyter.org/"; + homepage = "https://github.com/jupyter/nbconvert"; + changelog = "https://github.com/jupyter/nbconvert/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 7b1a3c60d628..ae8d6737380e 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.1.1"; + version = "16.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Obv4MJvO7li+KqI2l6KxfxjpbZVD5KFJwjn/u+UtaQQ="; + hash = "sha256-z5CFFfVJYeXaDFVPYaBOfUMzgl+Uvn3LYS5Zn1AHRy0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/prometheus-pandas/default.nix b/pkgs/development/python-modules/prometheus-pandas/default.nix index da6e9c1bccdd..ff7cadd8f58b 100644 --- a/pkgs/development/python-modules/prometheus-pandas/default.nix +++ b/pkgs/development/python-modules/prometheus-pandas/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "prometheus-pandas"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zysdlYPjvhextAfW4vvGN6mSPVUbWLV+AvQ1hGWCAbw="; + hash = "sha256-1eaTmNui3cAisKEhBMEpOv+UndJZwb4GGK2M76xiy7k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index c95f4b6e3ffe..2fbacc6ea980 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-HcEJwgb912NbRt2RTSNccluchWYBBqADi5LcW3mY8I4="; + hash = "sha256-zxIx7+cpYKN811yz+nxjtOagHOMMIs1YU0ZLN9q5T7M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index c4129974154a..1821ed3ef8df 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sqlalchemy-jsonfield"; - version = "1.0.1.post0+2023-04-24"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "penguinolog"; repo = "sqlalchemy_jsonfield"; - rev = "a1efda9755055c1d382257fb4ef78006b713d07e"; - hash = "sha256-6l4LEGpA8dKPw8M4quStd1nWyshMNiwQojBCxKwRRXA="; + rev = "refs/tags/${version}"; + hash = "sha256-4zLXB3UQh6pgQ80KrxkLeC5yiv1R8t2+JmSukmGXr7I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 32e40801c6ea..5e9b2f3269e1 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -20,7 +20,11 @@ buildPythonPackage rec { hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; }; - patches = [ ./use-template-for-taskwarrior-install-path.patch ]; + patches = [ + ./use-template-for-taskwarrior-install-path.patch + # Remove when https://github.com/ralphbean/taskw/pull/151 is merged. + ./support-relative-path-in-taskrc.patch + ]; postPatch = '' substituteInPlace taskw/warrior.py \ --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' diff --git a/pkgs/development/python-modules/taskw/support-relative-path-in-taskrc.patch b/pkgs/development/python-modules/taskw/support-relative-path-in-taskrc.patch new file mode 100644 index 000000000000..25b1b28eff5c --- /dev/null +++ b/pkgs/development/python-modules/taskw/support-relative-path-in-taskrc.patch @@ -0,0 +1,79 @@ +From 958b63ceec02b179482141cfb846ddbcae711a1b Mon Sep 17 00:00:00 2001 +From: Scott Mcdermott <scott@smemsh.net> +Date: Sat, 28 Aug 2021 21:12:38 -0700 +Subject: [PATCH] RcFile: _read: try taskrc directory when trying to load + includes + +Taskwarrior itself tries includes as absolute path, then cwd, then +relative to rcfile, then in various search paths (see +GothenburgBitFactory/libshared -> src/Configuration.cpp -> +Configuration::parse()). + +We won't try to duplicate that whole arrangement here, but at least look +relative to the rcfile in addition to cwd/absolute, like taskwarrior +does. This will allow specification as relative path in most cases. +Otherwise, we'd have to chdir anyways because includes are always tried +as-is by taskw. They would only work if specified as absolute paths or +if in cwd + +We use a TaskRc() class variable to store the rcdir because there could +be an include chain and all the instances will need to know the same +one, but will be processing different paths, so we have to capture the +directory of the first one processed, ie the base rcfile. + +Fixes #150 + +Co-authored-by: Raito Bezarius <masterancpp@gmail.com> +--- + taskw/taskrc.py | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/taskw/taskrc.py b/taskw/taskrc.py +index 1b6f8e5..b72dee6 100644 +--- a/taskw/taskrc.py ++++ b/taskw/taskrc.py +@@ -1,5 +1,6 @@ + import logging + import os ++import os.path + + from taskw.fields import ( + ChoiceField, +@@ -39,6 +40,7 @@ class TaskRc(dict): + + """ + ++ rcdir = None + UDA_TYPE_MAP = { + 'date': DateField, + 'duration': DurationField, +@@ -54,6 +56,8 @@ class TaskRc(dict): + path + ) + ) ++ if not self.rcdir: ++ TaskRc.rcdir = os.path.dirname(os.path.realpath(self.path)) + config = self._read(self.path) + else: + self.path = None +@@ -92,6 +96,17 @@ class TaskRc(dict): + + def _read(self, path): + config = {} ++ if not os.path.exists(path) and TaskRc.rcdir is not None: ++ # include path may be given relative to dir of rcfile ++ oldpath = path ++ path = os.path.join(TaskRc.rcdir, oldpath) ++ if not os.path.exists(path): ++ logger.error( ++ "rcfile does not exist, tried %s and %s", ++ oldpath, path ++ ) ++ raise FileNotFoundError ++ + with open(path, 'r') as config_file: + for raw_line in config_file.readlines(): + line = sanitize(raw_line) +-- +2.42.0 + diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix index 5c4aa1576b46..66ad2d58dbc7 100644 --- a/pkgs/development/python-modules/toml-adapt/default.nix +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "toml-adapt"; - version = "0.2.11"; + version = "0.2.12"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = pname; - rev = version; - hash = "sha256-7gQZCjsCtzvmV5NPZNAW4d34TkKemH9FgeN0Iwydwgc="; + rev = "refs/tags/${version}"; + hash = "sha256-DtxA63lutgjGMH8GYz5r6IFEuuZ9iFGPGup960c4xgE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index 23c742798166..cb0d8060d89b 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-mock"; - version = "5.1.0.2"; + version = "5.1.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3kjTdm5OMDTv2LJtqeCeSQjzHlMTel/i778fur7haZY="; + hash = "sha256-7urCVIAoe7ch+xf82i6XaNcKR23MFKLB0DiVNcVPgYQ="; }; # Module has no tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index c2e0e0551321..03fe60ce33d2 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.10"; + version = "4.6.0.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qn+190NTRQDydN3xGrHJEKrhAgSBhlo2t5nh1n3iqvM="; + hash = "sha256-yM/IRjUYPeyi20pSiWbFVmRF/TcTmD8ANPsPWgngiQ0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a380f9734bfd..5a3ec1f68469 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,12 +21,12 @@ , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl -, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie -, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml +, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml , autoSignDarwinBinariesHook, fetchpatch }@args: @@ -232,6 +232,12 @@ in propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf ]; }; + gdk3 = attrs: { + nativeBuildInputs = [ pkg-config bundler rake ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + propagatedBuildInputs = [ gobject-introspection wrapGAppsHook gdk-pixbuf cairo ]; + }; + gpgme = attrs: { buildInputs = [ gpgme ]; nativeBuildInputs = [ pkg-config ]; @@ -320,6 +326,36 @@ in dontStrip = stdenv.isDarwin; }; + gtk3 = attrs: { + nativeBuildInputs = [ + binutils + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + util-linux + libselinux + libsepol + ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + propagatedBuildInputs = [ + atk + gdk-pixbuf + fribidi + gobject-introspection + gtk3 + cairo + harfbuzz + libdatrie + libthai + pcre + pcre2 + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXtst + libxkbcommon + libepoxy + ]; + dontStrip = stdenv.isDarwin; + }; + gobject-introspection = attrs: { nativeBuildInputs = [ pkg-config pcre2 ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index ebc5d4c0b8e7..86b8618c92d3 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -66,7 +66,7 @@ gem 'glib2' # gem 'gobject-introspection' fails on require gem 'gpgme' # gem 'grpc' fails to build -gem 'gtk2' +gem 'gtk3' gem 'hashie' gem 'highline' gem 'hike' diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 494f98314a7f..654fab55d7ec 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.9"; + version = "3.1.11"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-yUaCLCKOgJyHfhz07tzfcgJLn0k1mSifj4DJZyalRBY="; + hash = "sha256-BpMjpdZ7kmHGJZSHggUN0NYhhAo+ludMZQYOMxeGnl8="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 652e7e32bc50..f123eff4787e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -204,6 +204,8 @@ stdenv.mkDerivation rec { inherit src; inherit sourceRoot; patches = [ + ./upb-clang16.patch + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. @@ -399,6 +401,8 @@ stdenv.mkDerivation rec { # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" + # for CLang 16 compatibility in third_party/{zlib}, external/{upb} dependencies + export NIX_CFLAGS_COMPILE+=" -Wno-implicit-function-declaration -Wno-gnu-offsetof-extensions" # don't use system installed Xcode to run clang, use Nix clang instead sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch b/pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch new file mode 100644 index 000000000000..34bb71747b17 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/upb-clang16.patch @@ -0,0 +1,57 @@ +diff --git a/WORKSPACE b/WORKSPACE +index 2d995f095e..55fddef663 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -1232,7 +1232,7 @@ register_toolchains("//src/main/res:empty_rc_toolchain") + http_archive( + name = "com_github_grpc_grpc", + patch_args = ["-p1"], +- patches = ["//third_party/grpc:grpc_1.33.1.patch"], ++ patches = ["//third_party/grpc:grpc_1.33.1.patch", "//:grpc-upb-clang16.patch"], + sha256 = "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", + strip_prefix = "grpc-1.33.1", + urls = [ +diff --git a/grpc-upb-clang16.patch b/grpc-upb-clang16.patch +new file mode 100644 +index 0000000000..ae6a7ad0e0 +--- /dev/null ++++ b/grpc-upb-clang16.patch +@@ -0,0 +1,13 @@ ++diff -r -u a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl ++--- a/bazel/grpc_deps.bzl +++++ b/bazel/grpc_deps.bzl ++@@ -285,6 +285,8 @@ ++ name = "upb", ++ sha256 = "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c", ++ strip_prefix = "upb-382d5afc60e05470c23e8de19b19fc5ad231e732", +++ patches = ["//:upb-clang16.patch"], +++ patch_args = ["-p1"], ++ urls = [ ++ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", ++ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz", ++ +diff --git a/upb-clang16.patch b/upb-clang16.patch +new file mode 100644 +index 0000000000..b799737fac +--- /dev/null ++++ b/upb-clang16.patch +@@ -0,0 +1,18 @@ ++--- a/BUILD +++++ b/BUILD ++@@ -34,6 +34,7 @@ ++ "-Wextra", ++ # "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang) ++ "-Werror", +++ "-Wno-gnu-offsetof-extensions", ++ "-Wno-long-long", ++ # copybara:strip_end ++ ] ++@@ -42,6 +43,7 @@ ++ # copybara:strip_for_google3_begin ++ "-pedantic", ++ "-Werror=pedantic", +++ "-Wno-gnu-offsetof-extensions", ++ "-Wstrict-prototypes", ++ # copybara:strip_end ++ ] + diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 8382f9d4be35..e662c14fa399 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -166,6 +166,8 @@ stdenv.mkDerivation rec { inherit src; inherit sourceRoot; patches = [ + ./upb-clang16.patch + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. @@ -364,6 +366,8 @@ stdenv.mkDerivation rec { # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" + # for CLang 16 compatibility in external/{absl,upb} dependencies and in execlog + export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions -Wno-implicit-function-declaration" # don't use system installed Xcode to run clang, use Nix clang instead sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch new file mode 100644 index 000000000000..6280082e52a5 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/upb-clang16.patch @@ -0,0 +1,83 @@ +diff --git a/distdir_deps.bzl b/distdir_deps.bzl +index 9068f50537..b3f45e8653 100644 +--- a/distdir_deps.bzl ++++ b/distdir_deps.bzl +@@ -110,6 +110,8 @@ DIST_DEPS = { + "protocolbuffers": { + "archive": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", ++ "patches": ["//:upb-clang16.patch"], ++ "patch_args": ["-p1"], + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", +@@ -131,6 +133,7 @@ DIST_DEPS = { + "patches": [ + "//third_party/grpc:grpc_1.41.0.patch", + "//third_party/grpc:grpc_1.41.0.win_arm64.patch", ++ "//:grpc-upb-clang16.patch", + ], + "used_in": [ + "additional_distfiles", +diff --git a/grpc-upb-clang16.patch b/grpc-upb-clang16.patch +new file mode 100644 +index 0000000000..69194099db +--- /dev/null ++++ b/grpc-upb-clang16.patch +@@ -0,0 +1,13 @@ ++diff -r -u a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl ++--- a/bazel/grpc_deps.bzl +++++ b/bazel/grpc_deps.bzl ++@@ -340,6 +340,8 @@ ++ name = "upb", ++ sha256 = "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", ++ strip_prefix = "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f", +++ patches = ["//:upb-clang16.patch"], +++ patch_args = ["-p1"], ++ urls = [ ++ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", ++ "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", ++ ++diff -r -u a/third_party/upb/bazel/build_defs.bzl b/third_party/upb/bazel/build_defs.bzl ++--- a/third_party/upb/bazel/build_defs.bzl 2021-09-25 04:33:41.000000000 +0200 +++++ b/third_party/upb/bazel/build_defs.bzl 2023-11-22 22:27:39.421459688 +0100 ++@@ -34,6 +34,7 @@ ++ "-Wextra", ++ # "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang) ++ "-Werror", +++ "-Wno-gnu-offsetof-extensions", ++ "-Wno-long-long", ++ # copybara:strip_end ++ ], ++@@ -48,6 +49,7 @@ ++ "-pedantic", ++ "-Werror=pedantic", ++ "-Wall", +++ "-Wno-gnu-offsetof-extensions", ++ "-Wstrict-prototypes", ++ # GCC (at least) emits spurious warnings for this that cannot be fixed ++ # without introducing redundant initialization (with runtime cost): +diff --git a/upb-clang16.patch b/upb-clang16.patch +new file mode 100644 +index 0000000000..f81855181f +--- /dev/null ++++ upb-clang16.patch +@@ -0,0 +1,18 @@ ++--- a/bazel/build_defs.bzl +++++ b/bazel/build_defs.bzl ++@@ -34,6 +34,7 @@ ++ "-Wextra", ++ # "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang) ++ "-Werror", +++ "-Wno-gnu-offsetof-extensions", ++ "-Wno-long-long", ++ # copybara:strip_end ++ ], ++@@ -48,6 +49,7 @@ ++ "-pedantic", ++ "-Werror=pedantic", ++ "-Wall", +++ "-Wno-gnu-offsetof-extensions", ++ "-Wstrict-prototypes", ++ # GCC (at least) emits spurious warnings for this that cannot be fixed ++ # without introducing redundant initialization (with runtime cost): diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9ea57a27f027..a0069cdfda5d 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "conan"; - version = "2.0.5"; + version = "2.0.14"; format = "setuptools"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = "refs/tags/${version}"; - hash = "sha256-+ohUOQ9WBER/X0TDklf/qZCm9LhM1I1QRmED4FnkweM="; + hash = "sha256-zPN6OlEWYc/OvUb7LHF1/mZYrieG8n2bLcZ/IzwlvtE="; }; nativeBuildInputs = with python3.pkgs; [ @@ -45,11 +45,6 @@ python3.pkgs.buildPythonApplication rec { pyopenssl ]; - pythonRelaxDeps = [ - # This can be removed once conan is updated to 2.0.7+ - "PyYAML" - ]; - nativeCheckInputs = [ git pkg-config diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/development/tools/database/beekeeper-studio/default.nix deleted file mode 100644 index 6070b5bc32b6..000000000000 --- a/pkgs/development/tools/database/beekeeper-studio/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, fetchurl, appimageTools, pkgs, makeWrapper }: - -let - pname = "beekeeper-studio"; - version = "3.6.2"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage"; - name = "${pname}-${version}.AppImage"; - hash = "sha512-an4Gqx2mx/rnkLe/LUAz3qRdrqWBcrWcdCiNi8Hz1OKBp1SWN3acU8RppIM0uwlrcBkjnigbbM5DZ2o+svA23A=="; - }; - - appimageContents = appimageTools.extractType2 { - inherit name src; - }; -in -appimageTools.wrapType2 { - inherit name src; - - multiArch = false; # no 32bit needed - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; - - extraInstallCommands = '' - ln -s $out/bin/${name} $out/bin/${pname} - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - ''; - - meta = with lib; { - description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows"; - homepage = "https://www.beekeeperstudio.io"; - changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ milogert alexnortung ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/development/tools/golangci-lint-langserver/default.nix index be7d55639daa..81b367591a66 100644 --- a/pkgs/development/tools/golangci-lint-langserver/default.nix +++ b/pkgs/development/tools/golangci-lint-langserver/default.nix @@ -22,6 +22,7 @@ buildGoModule rec { description = "Language server for golangci-lint"; homepage = "https://github.com/nametake/golangci-lint-langserver"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kirillrdy ]; + mainProgram = "golangci-lint-langserver"; }; } diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d9577377e6d7..a875bacb36af 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.13.3"; + version = "1.14.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-FTPBeq/WbrYDEmS1fR8rzDBHBsjdyMHcm+tCxXtYUPg="; + hash = "sha256-6PSxYM6u727vHf4FP0ju0TAuqj4R4bxQEdyZHvC4qBA="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index ae30de0e6c46..cb506998a8cc 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "minify"; - version = "2.20.5"; + version = "2.20.7"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-+oaK6OdBRxtWW+0zp+pbCcGyphuOLzyv/LfjDqDiTGw="; + hash = "sha256-kfn7oOBmfvghzp156yTTry7Bp+e/CW/RQlG4P6QSRHw="; }; - vendorHash = "sha256-GQqdr0zMQhi6QfLAyFchtWPOGfpo5yODDinKWA/s+qs="; + vendorHash = "sha256-uTzx1Ei6MQZX76pxNaNaREX2ic0Cz4uGT38vX9xmIt8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index a66db24b0e0f..5868c5d9a990 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.9.0"; - sha256 = "sha256-oj2WgQq/BFVCazSdR85TEPMwlbe8BXG5zFEPSBw6RRk="; + version = "20.10.0"; + sha256 = "sha256-MuslbuvYys1VdOZjHlS0K+fsjr4lrUeoymhUA7rRVTU="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index d6e3dc05a802..da98159cde9e 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3; maintainers = [ maintainers.getpsyched ]; platforms = platforms.all; + mainProgram = "atlauncher"; }; }) diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 96b941490b01..c6805cc58343 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -97,5 +97,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ _360ied ]; + mainProgram = "ClassiCube"; }; } diff --git a/pkgs/games/gamepad-tool/default.nix b/pkgs/games/gamepad-tool/default.nix index b73a1d4f3c0d..11da7ab16d52 100644 --- a/pkgs/games/gamepad-tool/default.nix +++ b/pkgs/games/gamepad-tool/default.nix @@ -42,5 +42,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ gador ]; + mainProgram = "gamepad-tool"; }; }) diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 21f071af379b..30620bea710b 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; []; + mainProgram = "ivan"; }; } diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 52990a2d5eab..39faa5d4fb9b 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -130,5 +130,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wyvie pstn cpu ]; platforms = platforms.linux; license = licenses.gpl2Plus; + mainProgram = "mudlet"; }; } diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 7c47166eab56..b02cf7e5dea0 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -37,5 +37,6 @@ to win. ''; maintainers = with lib.maintainers; [ jcumming ]; platforms = with lib.platforms; linux; + mainProgram = "Ri_li"; }; } diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 63deb3b969ce..769553a69422 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ lom ]; # steam only supports that platform platforms = [ "x86_64-linux" ]; + mainProgram = "steam-tui"; }; } diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 3ba39fde9c6c..65b9bfff189e 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; + mainProgram = "stepmania"; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 6e18dbae07b2..b87faf6cea0b 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "Simple shooting game with your cannon is sitting atop a teeter totter"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; + mainProgram = "teetertorture"; }; } diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index ac387a4a8c02..05314e6911b9 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { Wingdows [TM], a virus cleverly designed to resemble a popular operating system. ''; + mainProgram = "xbill"; }; } diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 84db2a1356c6..3b6c7244507c 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "zaz"; }; } diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 8524ea601b47..275aca235209 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "zoom"; }; } diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix index 6d21f219c463..9a771a470339 100644 --- a/pkgs/misc/ananicy-cpp/default.nix +++ b/pkgs/misc/ananicy-cpp/default.nix @@ -65,5 +65,6 @@ clangStdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; + mainProgram = "ananicy-cpp"; }; } diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/misc/ananicy/default.nix index 62daaad2c604..9567f2d4d0f7 100644 --- a/pkgs/misc/ananicy/default.nix +++ b/pkgs/misc/ananicy/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; + mainProgram = "ananicy"; }; } diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 95beb8bcdf3f..00b53851b829 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; + mainProgram = "apulse"; }; } diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/misc/autoadb/default.nix index 25043e9d45d6..8832d314df85 100644 --- a/pkgs/misc/autoadb/default.nix +++ b/pkgs/misc/autoadb/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rom1v/autoadb"; license = licenses.asl20; maintainers = with maintainers; [ shawn8901 ]; + mainProgram = "autoadb"; }; } diff --git a/pkgs/misc/autotiling-rs/default.nix b/pkgs/misc/autotiling-rs/default.nix index 6e0ffebf0323..094694016679 100644 --- a/pkgs/misc/autotiling-rs/default.nix +++ b/pkgs/misc/autotiling-rs/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "autotiling-rs"; }; } diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index a24095759f02..301712a1f1df 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -20,6 +20,7 @@ buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; + mainProgram = "autotiling"; }; } diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix index c82456d8ee53..3fbf5992ade7 100644 --- a/pkgs/misc/doge/default.nix +++ b/pkgs/misc/doge/default.nix @@ -14,5 +14,6 @@ python3Packages.buildPythonPackage rec { description = "wow very terminal doge"; license = licenses.mit; maintainers = with maintainers; [ Gonzih ]; + mainProgram = "doge"; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 66b26753095e..0b4abe265060 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -14,16 +14,16 @@ let pname = "hplip"; - version = "3.23.3"; + version = "3.23.8"; src = fetchurl { url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; - sha256 = "sha256-5CYKmKKx2I0h6CVi3kGaohyVvJ4qzjWDNGqA/SF+B7Y="; + hash = "sha256-98wF9ijAz9dQ5UrkFDHB390p6XaC8YtcW6XLLFtLG0Y="; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; - sha256 = "sha256-AyZBiF1B42dGnJeoJLFSCGNK83c86ZAM2uFciuv2H4A="; + hash = "sha256-frsgye3f0M3HE2trKRlfFvMnDEwe+z74IumCdVPrcSY="; }; hplipState = substituteAll { @@ -283,6 +283,6 @@ python3Packages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel arthsmn ]; }; } diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index ca191319243f..1bed7e8ab2e1 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -78,5 +78,6 @@ buildGoModule rec { changelog = "https://github.com/fastly/cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ereslibre shyim ]; + mainProgram = "fastly"; }; } diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 57baeb7fe828..2c49c5779752 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -57,5 +57,6 @@ buildPythonApplication rec { maintainers = with maintainers; [ sepi ]; platforms = platforms.all; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/frescobaldi.x86_64-darwin + mainProgram = "frescobaldi"; }; } diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 29baa653d3f1..904028feddaa 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ jchw ]; platforms = platforms.linux; + mainProgram = "lightspark"; }; } diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 5663e5dec927..c85f956e1a8b 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.24.2"; + version = "2.24.3"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-eUTmENe08d5Mccz+H73TIB9U+sVFYb3NBIkU+Nu2Ckg="; + sha256 = "sha256-3wBfdu969aTNdKEPjnEVJ4t/p58UAYk3tlwQlJjsRL4="; }; postInstall = '' diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 6ad7c8496ed5..34ad0350771f 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -17,5 +17,6 @@ in stdenv.mkDerivation { license = lib.licenses.mit; platforms = lib.platforms.unix; + mainProgram = "long-shebang"; }; } diff --git a/pkgs/misc/lssecret/default.nix b/pkgs/misc/lssecret/default.nix index f27bb538d19a..2e5169974fc1 100644 --- a/pkgs/misc/lssecret/default.nix +++ b/pkgs/misc/lssecret/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ genericnerdyusername ]; platforms = lib.platforms.unix; + mainProgram = "lssecret"; }; } diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/misc/moonfire-nvr/default.nix index 8c9de0e7da9d..0946161ce52f 100644 --- a/pkgs/misc/moonfire-nvr/default.nix +++ b/pkgs/misc/moonfire-nvr/default.nix @@ -76,5 +76,6 @@ in rustPlatform.buildRustPackage { changelog = "https://github.com/scottlamb/moonfire-nvr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "moonfire-nvr"; }; } diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 7695f3cebefd..0f231bfd2f54 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; platforms = platforms.linux; + mainProgram = "mxt-app"; }; } diff --git a/pkgs/misc/nflz/default.nix b/pkgs/misc/nflz/default.nix index 10a87f85b117..3d455d908073 100644 --- a/pkgs/misc/nflz/default.nix +++ b/pkgs/misc/nflz/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/phip1611/nflz"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ phip1611 ]; + mainProgram = "nflz"; }; } diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix index 361b2627c973..962d48be8f8e 100644 --- a/pkgs/misc/opcua-client-gui/default.nix +++ b/pkgs/misc/opcua-client-gui/default.nix @@ -56,5 +56,6 @@ python3Packages.buildPythonApplication rec { platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ janik ]; + mainProgram = "opcua-client"; }; } diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/misc/plasma-hud/default.nix index 4116751f4fec..c0cf771da849 100644 --- a/pkgs/misc/plasma-hud/default.nix +++ b/pkgs/misc/plasma-hud/default.nix @@ -37,5 +37,6 @@ python3.pkgs.buildPythonApplication rec{ platforms = platforms.unix; description = "Run menubar commands, much like the Unity 7 Heads-Up Display (HUD)"; maintainers = with maintainers; [ pasqui23 ]; + mainProgram = "plasma-hud"; }; } diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index 7ecf61837c59..6ed15f03e6e4 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -27,5 +27,6 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/vinayak-mehta/present"; license = licenses.asl20; maintainers = with maintainers; [ lom ]; + mainProgram = "present"; }; } diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/misc/ptouch-print/default.nix index f9889cfe4bef..da0d3c8c97d3 100644 --- a/pkgs/misc/ptouch-print/default.nix +++ b/pkgs/misc/ptouch-print/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; + mainProgram = "ptouch-print"; }; } diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index 581baf0e9c80..7212da7b867f 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -45,5 +45,6 @@ python3.pkgs.buildPythonApplication rec { # Next release will move to BSD3 license = licenses.gpl3Only; maintainers = with maintainers; [ koslambrou ]; + mainProgram = "pylode"; }; } diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index a7fb03e11ad4..9d03cfc66917 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -75,5 +75,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/Textualize/rich-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ joelkoen ]; + mainProgram = "rich"; }; } diff --git a/pkgs/misc/rivalcfg/default.nix b/pkgs/misc/rivalcfg/default.nix index 737a3839d7a0..f6b45af3af34 100644 --- a/pkgs/misc/rivalcfg/default.nix +++ b/pkgs/misc/rivalcfg/default.nix @@ -36,5 +36,6 @@ python3Packages.buildPythonPackage rec { homepage = "https://github.com/flozz/rivalcfg"; license = licenses.wtfpl; maintainers = with maintainers; [ ornxka ]; + mainProgram = "rivalcfg"; }; } diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix index d9de20bcf447..b70298ded96a 100644 --- a/pkgs/misc/rkdeveloptool-pine64/default.nix +++ b/pkgs/misc/rkdeveloptool-pine64/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { description = "A tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; license = lib.licenses.gpl2; maintainers = [ maintainers.adisbladis ]; + mainProgram = "rkdeveloptool"; }; } diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index a07748fbe263..341232e8cf19 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "A tool from Rockchip to communicate with Rockusb devices"; license = licenses.gpl2; maintainers = [ maintainers.lopsided98 ]; + mainProgram = "rkdeveloptool"; }; } diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index d2f91c42638a..50eb8e61ca32 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { boat''; maintainers = with maintainers; [ kragniz ]; platforms = platforms.all; + mainProgram = "sailsd"; }; } diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 78479199b140..8630cc859917 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ deltaevo msfjarvis ]; + mainProgram = "scrcpy"; }; } diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 64ddfae7b326..63606078abad 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -69,5 +69,6 @@ buildPythonApplication rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor orivej anthonyroussel ]; + mainProgram = "solfege"; }; } diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index 3d6317f71c0d..ac99abb7e5cd 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sassman/t-rec-rs"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ hoverbear matthiasbeyer ]; + mainProgram = "t-rec"; }; } diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 91b7c31eb323..3898c9880c53 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ matthiasbeyer ]; + mainProgram = "tpm2_ptool"; }; } diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 81c09685be8b..a4c9a7d92fb4 100644 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lostutils/uq"; license = licenses.mit; maintainers = with maintainers; [ doronbehar matthiasbeyer ]; + mainProgram = "uq"; }; } diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 3a9488a5951a..fe31ca17f6aa 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.matthew-levan ]; license = licenses.mit; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "urbit"; }; } diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index fcc93c4b5c7b..e3c6a4f2bb10 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ lom builditluc matthiasbeyer ]; + mainProgram = "wiki-tui"; }; } diff --git a/pkgs/misc/zeyple/default.nix b/pkgs/misc/zeyple/default.nix index 18c938453715..fd5f628676ae 100644 --- a/pkgs/misc/zeyple/default.nix +++ b/pkgs/misc/zeyple/default.nix @@ -23,5 +23,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://infertux.com/labs/zeyple/"; maintainers = with maintainers; [ ettom ]; license = licenses.agpl3Plus; + mainProgram = "zeyple"; }; } diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix index 0a91fd585906..3204bd7dcf27 100644 --- a/pkgs/os-specific/linux/below/default.nix +++ b/pkgs/os-specific/linux/below/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "below"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "below"; rev = "v${version}"; - sha256 = "sha256-d5a/M2XEw2E2iydopzedqZ/XfQU7KQyTC5NrPTeeNLg="; + sha256 = "sha256-2mZBpvLPY6yrEAvB1YlFuaXJlmmNuZqhu3xWADNHbx0="; }; - cargoSha256 = "sha256-EoRCmEe9SAySZCm+QhaR4ngik4Arnm4SZjgDM5fSRmk="; + cargoHash = "sha256-cTNxWCd4YH5VuZh0GRfBNtHmLqCQ75uyHqROkv1jbRA="; prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; postInstall = '' diff --git a/pkgs/os-specific/linux/libnl-tiny/default.nix b/pkgs/os-specific/linux/libnl-tiny/default.nix index 2f5d1d0999a0..ec39b560826d 100644 --- a/pkgs/os-specific/linux/libnl-tiny/default.nix +++ b/pkgs/os-specific/linux/libnl-tiny/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary"; license = licenses.isc; maintainers = with maintainers; [ mkg20001 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index e400e5eba7d7..5d75249d616c 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "48.0"; + version = "49.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-/ltuZ9OiwJJ6CuAd6hqJwo+wETOgZ4UcW50BrjudF+k="; + hash = "sha256-4095U7fLIvixUY3K6l0iFJh7oWwwKAX/WcD3ziqdsLg="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix new file mode 100644 index 000000000000..737a52fcc4ff --- /dev/null +++ b/pkgs/os-specific/linux/zfs/2_1.nix @@ -0,0 +1,49 @@ +{ callPackage +, kernel ? null +, stdenv +, linuxKernel +, removeLinuxDRM ? false +, lib +, nixosTests +, fetchpatch +, ... +} @ args: + +let + stdenv' = if kernel == null then stdenv else kernel.stdenv; +in +callPackage ./generic.nix args { + # You have to ensure that in `pkgs/top-level/linux-kernels.nix` + # this attribute is the correct one for this package. + kernelModuleAttribute = "zfs_2_1"; + # check the release notes for compatible kernels + kernelCompatible = + if stdenv'.isx86_64 || removeLinuxDRM + then kernel.kernelOlder "6.6" + else kernel.kernelOlder "6.2"; + + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM + then linuxKernel.packages.linux_6_5 + else linuxKernel.packages.linux_6_1; + + # This is a fixed version to the 2.1.x series, move only + # if the 2.1.x series moves. + version = "2.1.13"; + + extraPatches = [ + (fetchpatch { + # https://github.com/openzfs/zfs/pull/15571 + # Remove when it's backported to 2.1.x. + url = "https://github.com/robn/zfs/commit/617c990a4cf1157b0f8332f35672846ad16ca70a.patch"; + hash = "sha256-j5YSrud7BaWk2npBl31qwFFLYltbut3CUjI1cjZOpag="; + }) + ]; + + hash = "sha256-tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc="; + + tests = [ + nixosTests.zfs.series_2_1 + ]; + + maintainers = [ lib.maintainers.raitobezarius ]; +} diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 8adbb8cab8f9..566af6950d48 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,222 +1,243 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchpatch -, autoreconfHook269, util-linux, nukeReferences, coreutils -, perl, nixosTests -, configFile ? "all" - -# Userspace dependencies -, zlib, libuuid, python3, attr, openssl -, libtirpc -, nfs-utils, samba -, gawk, gnugrep, gnused, systemd -, smartmontools, enableMail ? false -, sysstat, pkg-config -, curl -, pam - -# Kernel dependencies -, kernel ? null -, enablePython ? true -, ... -}: - -{ version -, sha256 -, extraPatches ? [] -, rev ? "zfs-${version}" -, isUnstable ? false -, latestCompatibleLinuxPackages -, kernelCompatible ? null -}: - let - inherit (lib) any optionalString optionals optional makeBinPath; - - smartmon = smartmontools.override { inherit enableMail; }; - - buildKernel = any (n: n == configFile) [ "kernel" "all" ]; - buildUser = any (n: n == configFile) [ "user" "all" ]; - - # XXX: You always want to build kernel modules with the same stdenv as the - # kernel was built with. However, since zfs can also be built for userspace we - # need to correctly pick between the provided/default stdenv, and the one used - # by the kernel. - # If you don't do this your ZFS builds will fail on any non-standard (e.g. - # clang-built) kernels. - stdenv' = if kernel == null then stdenv else kernel.stdenv; -in + genericBuild = + { pkgs, lib, stdenv, fetchFromGitHub, fetchpatch + , autoreconfHook269, util-linux, nukeReferences, coreutils + , perl + , configFile ? "all" + + # Userspace dependencies + , zlib, libuuid, python3, attr, openssl + , libtirpc + , nfs-utils, samba + , gawk, gnugrep, gnused, systemd + , smartmontools, enableMail ? false + , sysstat, pkg-config + , curl + , pam + + # Kernel dependencies + , kernel ? null + , enablePython ? true + , ... + }@outerArgs: + + assert (configFile == "kernel") -> (kernel != null); + { version + , hash + , kernelModuleAttribute + , extraPatches ? [] + , rev ? "zfs-${version}" + , isUnstable ? false + , latestCompatibleLinuxPackages + , kernelCompatible ? null + , maintainers ? (with lib.maintainers; [ amarshall adamcstephens ]) + , tests + }@innerArgs: + + let + inherit (lib) any optionalString optionals optional makeBinPath versionAtLeast; + + smartmon = smartmontools.override { inherit enableMail; }; + + buildKernel = any (n: n == configFile) [ "kernel" "all" ]; + buildUser = any (n: n == configFile) [ "user" "all" ]; + isAtLeast22Series = versionAtLeast version "2.2.0"; + + # XXX: You always want to build kernel modules with the same stdenv as the + # kernel was built with. However, since zfs can also be built for userspace we + # need to correctly pick between the provided/default stdenv, and the one used + # by the kernel. + # If you don't do this your ZFS builds will fail on any non-standard (e.g. + # clang-built) kernels. + stdenv' = if kernel == null then stdenv else kernel.stdenv; + in + + stdenv'.mkDerivation { + name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + pname = "zfs"; + inherit version; + + src = fetchFromGitHub { + owner = "openzfs"; + repo = "zfs"; + inherit rev hash; + }; + + patches = extraPatches; + + postPatch = optionalString buildKernel '' + patchShebangs scripts + # The arrays must remain the same length, so we repeat a flag that is + # already part of the command and therefore has no effect. + substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ + --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"' + '' + optionalString buildUser '' + substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${ + # We don't *need* python support, but we set it like this to minimize closure size: + # If it's disabled by default, no need to enable it, even if we have python enabled + # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure + nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) + }/bin/exportfs" + substituteInPlace ./lib/libshare/smb.h --replace "/usr/bin/net" "${samba}/bin/net" + # Disable dynamic loading of libcurl + substituteInPlace ./config/user-libfetch.m4 --replace "curl-config --built-shared" "true" + substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ + --replace "/etc/default" "$out/etc/default" + substituteInPlace ./contrib/initramfs/Makefile.am \ + --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" + '' + optionalString isAtLeast22Series '' + substituteInPlace ./udev/vdev_id \ + --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" + '' + optionalString (!isAtLeast22Series) '' + substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs" + + find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \; + + substituteInPlace ./cmd/vdev_id/vdev_id \ + --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" + '' + '' + substituteInPlace ./config/zfs-build.m4 \ + --replace "bashcompletiondir=/etc/bash_completion.d" \ + "bashcompletiondir=$out/share/bash-completion/completions" + ''; -stdenv'.mkDerivation { - name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + nativeBuildInputs = [ autoreconfHook269 nukeReferences ] + ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) + ++ optional buildUser pkg-config; + buildInputs = optionals buildUser [ zlib libuuid attr libtirpc pam ] + ++ optional buildUser openssl + ++ optional buildUser curl + ++ optional (buildUser && enablePython) python3; + + # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; + + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; + + configureFlags = [ + "--with-config=${configFile}" + "--with-tirpc=1" + (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter) + ] ++ optionals buildUser [ + "--with-dracutdir=$(out)/lib/dracut" + "--with-udevdir=$(out)/lib/udev" + "--with-systemdunitdir=$(out)/etc/systemd/system" + "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" + "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" + "--with-mounthelperdir=$(out)/bin" + "--libexecdir=$(out)/libexec" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-systemd" + "--enable-pam" + ] ++ optionals buildKernel ([ + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] ++ kernel.makeFlags); + + makeFlags = optionals buildKernel kernel.makeFlags; + + enableParallelBuilding = true; + + installFlags = [ + "sysconfdir=\${out}/etc" + "DEFAULT_INITCONF_DIR=\${out}/default" + "INSTALL_MOD_PATH=\${out}" + ]; + + preConfigure = '' + # The kernel module builds some tests during the configurePhase, this envvar controls their parallelism + export TEST_JOBS=$NIX_BUILD_CORES + if [ -z "$enableParallelBuilding" ]; then + export TEST_JOBS=1 + fi + ''; - src = fetchFromGitHub { - owner = "openzfs"; - repo = "zfs"; - inherit rev sha256; - }; + # Enabling BTF causes zfs to be build with debug symbols. + # Since zfs compress kernel modules on installation, our strip hooks skip stripping them. + # Hence we strip modules prior to compression. + postBuild = optionalString buildKernel '' + find . -name "*.ko" -print0 | xargs -0 -P$NIX_BUILD_CORES ${stdenv.cc.targetPrefix}strip --strip-debug + ''; - patches = extraPatches; - - postPatch = optionalString buildKernel '' - patchShebangs scripts - # The arrays must remain the same length, so we repeat a flag that is - # already part of the command and therefore has no effect. - substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ - --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \ - --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"' - '' + optionalString buildUser '' - substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${ - # We don't *need* python support, but we set it like this to minimize closure size: - # If it's disabled by default, no need to enable it, even if we have python enabled - # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure - nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) - }/bin/exportfs" - substituteInPlace ./lib/libshare/smb.h --replace "/usr/bin/net" "${samba}/bin/net" - # Disable dynamic loading of libcurl - substituteInPlace ./config/user-libfetch.m4 --replace "curl-config --built-shared" "true" - substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ - --replace "/etc/default" "$out/etc/default" - substituteInPlace ./contrib/initramfs/Makefile.am \ - --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" - substituteInPlace ./udev/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ - "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - substituteInPlace ./config/zfs-build.m4 \ - --replace "bashcompletiondir=/etc/bash_completion.d" \ - "bashcompletiondir=$out/share/bash-completion/completions" - ''; - - nativeBuildInputs = [ autoreconfHook269 nukeReferences ] - ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]) - ++ optional buildUser pkg-config; - buildInputs = optionals buildUser [ zlib libuuid attr libtirpc pam ] - ++ optional buildUser openssl - ++ optional buildUser curl - ++ optional (buildUser && enablePython) python3; - - # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_CFLAGS_LINK = "-lgcc_s"; - - hardeningDisable = [ "fortify" "stackprotector" "pic" ]; - - configureFlags = [ - "--with-config=${configFile}" - "--with-tirpc=1" - (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter) - ] ++ optionals buildUser [ - "--with-dracutdir=$(out)/lib/dracut" - "--with-udevdir=$(out)/lib/udev" - "--with-systemdunitdir=$(out)/etc/systemd/system" - "--with-systemdpresetdir=$(out)/etc/systemd/system-preset" - "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator" - "--with-mounthelperdir=$(out)/bin" - "--libexecdir=$(out)/libexec" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--enable-systemd" - "--enable-pam" - ] ++ optionals buildKernel ([ - "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" - "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ] ++ kernel.makeFlags); - - makeFlags = optionals buildKernel kernel.makeFlags; - - enableParallelBuilding = true; - - installFlags = [ - "sysconfdir=\${out}/etc" - "DEFAULT_INITCONF_DIR=\${out}/default" - "INSTALL_MOD_PATH=\${out}" - ]; - - preConfigure = '' - # The kernel module builds some tests during the configurePhase, this envvar controls their parallelism - export TEST_JOBS=$NIX_BUILD_CORES - if [ -z "$enableParallelBuilding" ]; then - export TEST_JOBS=1 - fi - ''; - - # Enabling BTF causes zfs to be build with debug symbols. - # Since zfs compress kernel modules on installation, our strip hooks skip stripping them. - # Hence we strip modules prior to compression. - postBuild = optionalString buildKernel '' - find . -name "*.ko" -print0 | xargs -0 -P$NIX_BUILD_CORES ${stdenv.cc.targetPrefix}strip --strip-debug - ''; - - postInstall = optionalString buildKernel '' - # Add reference that cannot be detected due to compressed kernel module - mkdir -p "$out/nix-support" - echo "${util-linux}" >> "$out/nix-support/extra-refs" - '' + optionalString buildUser '' - # Remove provided services as they are buggy - rm $out/etc/systemd/system/zfs-import-*.service - - for i in $out/etc/systemd/system/*; do - if [ -L $i ]; then - continue - fi - sed -i '/zfs-import-scan.service/d' $i - substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" - done - - # Remove tests because they add a runtime dependency on gcc - rm -rf $out/share/zfs/zfs-tests - - # Add Bash completions. - install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs - (cd $out/share/bash-completion/completions; ln -s zfs zpool) - ''; - - postFixup = let - path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH"; - in '' - for i in $out/libexec/zfs/zpool.d/*; do - sed -i '2i${path}' $i - done - ''; - - outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; - - passthru = { - inherit enableMail latestCompatibleLinuxPackages; - - tests = - if isUnstable then [ - nixosTests.zfs.unstable - ] else [ - nixosTests.zfs.installer - nixosTests.zfs.stable - ]; - }; + postInstall = optionalString buildKernel '' + # Add reference that cannot be detected due to compressed kernel module + mkdir -p "$out/nix-support" + echo "${util-linux}" >> "$out/nix-support/extra-refs" + '' + optionalString buildUser '' + # Remove provided services as they are buggy + rm $out/etc/systemd/system/zfs-import-*.service + + for i in $out/etc/systemd/system/*; do + if [ -L $i ]; then + continue + fi + sed -i '/zfs-import-scan.service/d' $i + substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" + done + + # Remove tests because they add a runtime dependency on gcc + rm -rf $out/share/zfs/zfs-tests + + # Add Bash completions. + install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs + (cd $out/share/bash-completion/completions; ln -s zfs zpool) + ''; - meta = { - description = "ZFS Filesystem Linux Kernel module"; - longDescription = '' - ZFS is a filesystem that combines a logical volume manager with a - Copy-On-Write filesystem with data integrity detection and repair, - snapshotting, cloning, block devices, deduplication, and more. + postFixup = let + path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH"; + in '' + for i in $out/libexec/zfs/zpool.d/*; do + sed -i '2i${path}' $i + done ''; - homepage = "https://github.com/openzfs/zfs"; - changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; - license = lib.licenses.cddl; - - # The case-block for TARGET_CPU has branches for only some CPU families, - # which prevents ZFS from building on any other platform. Since the NixOS - # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS - # does not build is the only way to produce a NixOS installer on such - # platforms. - # https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12 - platforms = - with lib.systems.inspect.patterns; - map (p: p // isLinux) ([ isx86_32 isx86_64 isPower isAarch64 isSparc ] ++ isArmv7); - - maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; - mainProgram = "zfs"; - # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. - # On NixOS set the option boot.zfs.enableUnstable. - broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; - }; -} + outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; + + passthru = { + inherit enableMail latestCompatibleLinuxPackages kernelModuleAttribute; + # The corresponding userspace tools to this instantiation + # of the ZFS package set. + userspaceTools = genericBuild (outerArgs // { + configFile = "user"; + }) innerArgs; + + inherit tests; + }; + + meta = { + description = "ZFS Filesystem Linux" + (if buildUser then " Userspace Tools" else " Kernel Module"); + longDescription = '' + ZFS is a filesystem that combines a logical volume manager with a + Copy-On-Write filesystem with data integrity detection and repair, + snapshotting, cloning, block devices, deduplication, and more. + + ${if buildUser then "This is the userspace tools package." else "This is the kernel module package."} + ''; + homepage = "https://github.com/openzfs/zfs"; + changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; + license = lib.licenses.cddl; + + # The case-block for TARGET_CPU has branches for only some CPU families, + # which prevents ZFS from building on any other platform. Since the NixOS + # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS + # does not build is the only way to produce a NixOS installer on such + # platforms. + # https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12 + platforms = + with lib.systems.inspect.patterns; + map (p: p // isLinux) ([ isx86_32 isx86_64 isPower isAarch64 isSparc ] ++ isArmv7); + + inherit maintainers; + mainProgram = "zfs"; + # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. + # On NixOS set the option boot.zfs.enableUnstable. + broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; + }; + }; +in + genericBuild diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 3e53ba902cbd..ab71d2ecb8e1 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -4,6 +4,7 @@ , linuxKernel , removeLinuxDRM ? false , fetchpatch +, nixosTests , ... } @ args: @@ -11,6 +12,9 @@ let stdenv' = if kernel == null then stdenv else kernel.stdenv; in callPackage ./generic.nix args { + # You have to ensure that in `pkgs/top-level/linux-kernels.nix` + # this attribute is the correct one for this package. + kernelModuleAttribute = "zfs"; # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM @@ -24,5 +28,10 @@ callPackage ./generic.nix args { # this package should point to the latest release. version = "2.2.0"; - sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; + tests = [ + nixosTests.zfs.installer + nixosTests.zfs.stable + ]; + + hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 9c7e14c31bf3..cce2d69efa3b 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -3,6 +3,7 @@ , stdenv , linuxKernel , removeLinuxDRM ? false +, nixosTests , ... } @ args: @@ -10,6 +11,9 @@ let stdenv' = if kernel == null then stdenv else kernel.stdenv; in callPackage ./generic.nix args { + # You have to ensure that in `pkgs/top-level/linux-kernels.nix` + # this attribute is the correct one for this package. + kernelModuleAttribute = "zfsUnstable"; # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.6" @@ -26,7 +30,10 @@ callPackage ./generic.nix args { version = "2.2.1-unstable-2023-10-21"; rev = "95785196f26e92d82cf4445654ba84e4a9671c57"; - sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; + hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; isUnstable = true; + tests = [ + nixosTests.zfs.unstable + ]; } diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index c81ca8f5c121..09412bb2ccf8 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -83,5 +83,6 @@ buildGoModule rec { changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ janik ]; + mainProgram = "alice-lg"; }; } diff --git a/pkgs/servers/allmark/default.nix b/pkgs/servers/allmark/default.nix index 1e5b58dc6b19..be87468b3a95 100644 --- a/pkgs/servers/allmark/default.nix +++ b/pkgs/servers/allmark/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { changelog = "https://github.com/andreaskoch/allmark/-/releases/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ urandom ]; + mainProgram = "allmark"; }; } diff --git a/pkgs/servers/antennas/default.nix b/pkgs/servers/antennas/default.nix index c381cde64879..f9db26ab93e4 100644 --- a/pkgs/servers/antennas/default.nix +++ b/pkgs/servers/antennas/default.nix @@ -33,5 +33,6 @@ buildNpmPackage rec { homepage = "https://github.com/jfarseneau/antennas"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bachp ]; + mainProgram = "antennas"; }; } diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/servers/asouldocs/default.nix index cf0c5f48e007..df6a5e3012fd 100644 --- a/pkgs/servers/asouldocs/default.nix +++ b/pkgs/servers/asouldocs/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://asouldocs.dev/"; license = licenses.mit; maintainers = with maintainers; [ ivar anthonyroussel ]; + mainProgram = "asouldocs"; }; } diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index 500f0882796e..626f5639adc6 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -72,5 +72,6 @@ in buildNpmPackage { license = licenses.gpl3; maintainers = [ maintainers.jvanbruegge ]; platforms = platforms.linux; + mainProgram = "audiobookshelf"; }; } diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix index 4a2ed9bd5729..2eb1b4f6ac78 100644 --- a/pkgs/servers/authelia/default.nix +++ b/pkgs/servers/authelia/default.nix @@ -73,5 +73,6 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk raitobezarius dit7ya ]; + mainProgram = "authelia"; }; } diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 34fba145c9c4..dfb5ea5bf91f 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -154,5 +154,6 @@ with python.pkgs; buildPythonApplication rec { homepage = "https://baserow.io"; license = licenses.mit; maintainers = with maintainers; [ onny ]; + mainProgram = "baserow"; }; } diff --git a/pkgs/servers/binserve/default.nix b/pkgs/servers/binserve/default.nix index 23ebe0c270f8..b8732b51587a 100644 --- a/pkgs/servers/binserve/default.nix +++ b/pkgs/servers/binserve/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ snapdgn ]; platforms = platforms.unix; + mainProgram = "binserve"; }; } diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix index 38a53e89ffe4..f3b816a7a2c3 100644 --- a/pkgs/servers/birdwatcher/default.nix +++ b/pkgs/servers/birdwatcher/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ janik ]; + mainProgram = "birdwatcher"; }; } diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/servers/confluencepot/default.nix index 4b807401a299..d1aa0031f20f 100644 --- a/pkgs/servers/confluencepot/default.nix +++ b/pkgs/servers/confluencepot/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { ''; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ fab ]; + mainProgram = "confluencepot"; }; } diff --git a/pkgs/servers/db-rest/default.nix b/pkgs/servers/db-rest/default.nix index 7fda8f978f1d..8eab440e523b 100644 --- a/pkgs/servers/db-rest/default.nix +++ b/pkgs/servers/db-rest/default.nix @@ -40,5 +40,6 @@ buildNpmPackage rec { homepage = "https://v6.db.transport.rest/"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ marie ]; + mainProgram = "db-rest"; }; } diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix index dc6d72bba342..a215a59d547a 100644 --- a/pkgs/servers/eris-go/default.nix +++ b/pkgs/servers/eris-go/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; broken = stdenv.isDarwin; + mainProgram = "eris-go"; }; } diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/servers/gnss-share/default.nix index 14aa294da503..8b24964ae824 100644 --- a/pkgs/servers/gnss-share/default.nix +++ b/pkgs/servers/gnss-share/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ balsoft ]; + mainProgram = "gnss-share"; }; } diff --git a/pkgs/servers/go-autoconfig/default.nix b/pkgs/servers/go-autoconfig/default.nix index 73a809613c9d..1fe09a03a0dd 100644 --- a/pkgs/servers/go-autoconfig/default.nix +++ b/pkgs/servers/go-autoconfig/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://github.com/L11R/go-autoconfig"; license = licenses.mit; maintainers = with maintainers; [ onny ]; + mainProgram = "go-autoconfig"; }; } diff --git a/pkgs/servers/hiraeth/default.nix b/pkgs/servers/hiraeth/default.nix index c31b8c464152..c69ec6ac34fa 100644 --- a/pkgs/servers/hiraeth/default.nix +++ b/pkgs/servers/hiraeth/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Share files with an expiration date"; license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.lukaswrz ]; + mainProgram = "hiraeth"; }; } diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/servers/imaginary/default.nix index 8ab50dc957a6..4632647ed93e 100644 --- a/pkgs/servers/imaginary/default.nix +++ b/pkgs/servers/imaginary/default.nix @@ -47,5 +47,6 @@ buildGoModule rec { description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing"; license = licenses.mit; maintainers = with maintainers; [ dotlambda urandom ]; + mainProgram = "imaginary"; }; } diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 2168d604c191..98c0b30faa98 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "c5b87e3b5e5cc7f7f5c8baa7732bd6d81d8f910a", - "sha256": "sha256-aYxVgktwUBVfvUxgQUDUmDAKp1sr0+ZJcyGqcmBB4e0=", - "version": "unstable-2023-11-08" + "rev": "9ce9c543992243737516750bf08f5d073e899715", + "sha256": "sha256-yyNtMvHaN3hNxTafhQivN39NzEylrm+FG7S5DNkCtWU=", + "version": "unstable-2023-11-21" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/servers/jellyseerr/default.nix index 7c361f580d89..ca8e93753e69 100644 --- a/pkgs/servers/jellyseerr/default.nix +++ b/pkgs/servers/jellyseerr/default.nix @@ -85,5 +85,6 @@ mkYarnPackage rec { license = licenses.mit; maintainers = with maintainers; [ camillemndn ]; platforms = platforms.linux; + mainProgram = "jellyseerr"; }; } diff --git a/pkgs/servers/jitsi-excalidraw/default.nix b/pkgs/servers/jitsi-excalidraw/default.nix index bb8bb6c2dfa7..4fa9a55e2082 100644 --- a/pkgs/servers/jitsi-excalidraw/default.nix +++ b/pkgs/servers/jitsi-excalidraw/default.nix @@ -36,5 +36,6 @@ buildNpmPackage rec { homepage = "https://github.com/jitsi/excalidraw-backend"; license = licenses.mit; maintainers = with maintainers; [ camillemndn ]; + mainProgram = "jitsi-excalidraw-backend"; }; } diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index fbb8b38d5ee0..f29a9b5f701e 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; platforms = jdk17_headless.meta.platforms; maintainers = with maintainers; [ govanify ]; + mainProgram = "komga"; }; } diff --git a/pkgs/servers/lenpaste/default.nix b/pkgs/servers/lenpaste/default.nix index 50e950e98a03..d9e4aa9b5ed9 100644 --- a/pkgs/servers/lenpaste/default.nix +++ b/pkgs/servers/lenpaste/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://git.lcomrade.su/root/lenpaste"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vector1dev ]; + mainProgram = "lenpaste"; }; } diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix index d7be9a051d31..4ddb9abe9ecd 100644 --- a/pkgs/servers/mautrix-discord/default.nix +++ b/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs="; + hash = "sha256-p2DQD2E9RmP6yZGD88Y15eTz06euhNDaxCnnrWzqaB4="; }; - vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; + vendorHash = "sha256-rbz6bWBl2rmfHuszjKoWZP4/B4F90MUtR5nAIXCU3pg="; ldflags = [ "-s" "-w" ]; @@ -40,5 +40,6 @@ buildGoModule rec { changelog = "https://github.com/mautrix/discord/blob/${src.rev}/CHANGELOG.md"; license = licenses.agpl3Only; maintainers = with maintainers; [ MoritzBoehme ]; + mainProgram = "mautrix-discord"; }; } diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index 41a72eec0595..3c5861f16647 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -68,5 +68,6 @@ license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ arcnmx ]; + mainProgram = "mautrix-googlechat"; }; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 4ce5ce1c1c45..b82475fa07ae 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -78,5 +78,6 @@ python.pkgs.buildPythonPackage rec { license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nyanloutre ma27 nickcao ]; + mainProgram = "mautrix-telegram"; }; } diff --git a/pkgs/servers/mbusd/default.nix b/pkgs/servers/mbusd/default.nix index 7db22dab8e34..51441f6514cd 100644 --- a/pkgs/servers/mbusd/default.nix +++ b/pkgs/servers/mbusd/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; + mainProgram = "mbusd"; }; } diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix index 191db9358329..1e8b53fe96dc 100644 --- a/pkgs/servers/memos/default.nix +++ b/pkgs/servers/memos/default.nix @@ -49,5 +49,6 @@ buildGoModule rec { description = "A lightweight, self-hosted memo hub"; maintainers = with maintainers; [ indexyz ]; license = licenses.mit; + mainProgram = "memos"; }; } diff --git a/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 163b4ba7d800..d829f14bb5c4 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -82,5 +82,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/szabodanika/microbin/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ dit7ya figsoda ]; + mainProgram = "microbin"; }; } diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 88244b78e220..e71a8fa4c577 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGo121Module, fetchFromGitHub, fetchpatch, installShellFiles, nixosTests }: let pname = "miniflux"; @@ -14,6 +14,15 @@ in buildGo121Module { sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII="; }; + patches = [ + (fetchpatch { + # https://github.com/miniflux/v2/pull/2193, remove after 2.0.50 + name = "miniflux-user-agent-regression.patch"; + url = "https://github.com/miniflux/v2/commit/7a03291442a4e35572c73a2fcfe809fa8e03063e.patch"; + hash = "sha256-tJ1l5rqD0x0xtQs+tDwpFHOY+7k6X02bkwVJo6RAdb8="; + }) + ]; + vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU="; nativeBuildInputs = [ installShellFiles ]; @@ -36,5 +45,6 @@ in buildGo121Module { homepage = "https://miniflux.app/"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs benpye ]; + mainProgram = "miniflux"; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 5d572c18e253..bc61b99f0453 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -57,5 +57,6 @@ buildGoModule rec { changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; license = licenses.agpl3Plus; + mainProgram = "minio"; }; } diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index c7b29036a416..3bd72b0e7dad 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; + mainProgram = "mirrorbits"; }; } diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 562a6c83ae3f..4b450a8450f4 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -72,5 +72,6 @@ mkYarnPackage rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jojosch ]; + mainProgram = "mjolnir"; }; } diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 6f357ccb08c8..442eed82478e 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.14"; + version = "4.5.0"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${version}"; - hash = "sha256-EJKMgU3Nzfefq2VXxBrfDDrQZWZvj7HqKnWR9j75fGI="; + hash = "sha256-km0vB/bopysS7eejDFDKaonXzTzBonIqiw1T+C2lKiQ="; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 8d33402d7d34..b9435de2aeba 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -52,5 +52,6 @@ in stdenvNoCC.mkDerivation rec { homepage = "https://github.com/Arksine/moonraker"; license = licenses.gpl3Only; maintainers = with maintainers; [ zhaofengli ]; + mainProgram = "moonraker"; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index df166ad0ff04..11ea7716c630 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -190,6 +190,7 @@ let license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ehmry tobim ]; platforms = platforms.unix; + mainProgram = "mpd"; longDescription = '' Music Player Daemon (MPD) is a flexible, powerful daemon for playing diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 04ea4d10fe8a..44ecc6481ecd 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/alexbers/mtprotoproxy"; platforms = python.meta.platforms; maintainers = with maintainers; [ abbradar ]; + mainProgram = "mtprotoproxy"; }; } diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index b0ccb03a8f9c..7100a5bd271b 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -48,5 +48,6 @@ in myNodePackages.package.override { platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; + mainProgram = "mx-puppet-discord"; }; } diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index bb930ab2756d..3eb3c731aad3 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { license = licenses.agpl3Only; maintainers = with maintainers; [ chekoopa ]; platforms = platforms.linux; + mainProgram = "mycorrhiza"; }; } diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 566e3f0802bd..d43bbc2fdc54 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; homepage = "https://nats.io/"; + mainProgram = "nats-streaming-server"; }; } diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix index dacd315aba34..a6a858637fe3 100644 --- a/pkgs/servers/networkaudiod/default.nix +++ b/pkgs/servers/networkaudiod/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; + mainProgram = "networkaudiod"; }; } diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 78a121a2e155..51be1e026adf 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-5Vd8fD0nB2POtxDFNVtkJfVEe+O8tjnwlwYosDJjIDA="; + hash = "sha256-go41ZIUBj1nj8rDI/c4Pk5cnDbM8Y2+bCZIab4XdhUY="; }; - cargoHash = "sha256-TF4rL7KXsbfYiEOfkKRyr3PCvyocq6tg90OZURZh8f8="; + cargoHash = "sha256-EuYwPQo2TucAaQw63pESkJGAtyuMhk3JT6mBg6E84Xs="; passthru = rec { test_client = rustPlatform.buildRustPackage { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-ES0LBKirOUqXOtA9O2KouA+NWisIMoe8XhmnTC8w1cg="; + cargoHash = "sha256-m4FHCrVGAmGIrgnMMleiTRgYGYh+b7EIH1ORE0tiBkY="; }; tests = { inherit (nixosTests.nextcloud) with-postgresql-and-redis26; diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 7c46ba346143..5f32437970c9 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; license = licenses.lgpl3Plus; + mainProgram = "ganesha.nfsd"; }; } diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 8c0410b87ac3..a666da35f4ca 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.mausch ]; + mainProgram = "nominatim"; }; } diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix index fa6234a34eba..7c70857585cc 100644 --- a/pkgs/servers/nzbhydra2/default.nix +++ b/pkgs/servers/nzbhydra2/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [jamiemagee]; platforms = with platforms; linux; + mainProgram = "nzbhydra2"; }; } diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index b9e457006c6c..152b3a31d85e 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; maintainers = teams.serokell.members; + mainProgram = "oauth2-proxy"; }; } diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index d1a74eb4d136..2fb76c1fc947 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -53,5 +53,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ woky ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "Ombi"; }; } diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index e5c0a8fbaf2b..2740e19dbff2 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -44,6 +44,7 @@ in buildGoModule { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ MayNiklas ]; + mainProgram = "owncast"; }; } diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index e11167000dfc..35148cb0932a 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ astro ]; license = with licenses; [ asl20 mit ]; + mainProgram = "oxigraph_server"; }; } diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index b6ba368d90d4..094194d59a03 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "p910nd"; }; } diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix index 97f0ea01219c..83518b904a50 100644 --- a/pkgs/servers/persistent-evdev/default.nix +++ b/pkgs/servers/persistent-evdev/default.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = [ maintainers.lodi ]; platforms = platforms.linux; + mainProgram = "persistent-evdev.py"; }; } diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 0a2c2d3a4ffc..8ad37a8aa387 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation { inherit (libtensorflow.meta) platforms; license = licenses.agpl3Only; maintainers = with maintainers; [ benesim ]; + mainProgram = "photoprism"; }; } diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 302dbe62b0c6..86e05cfed45a 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -50,6 +50,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://supakeen.com/project/pinnwand/"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + mainProgram = "pinnwand"; }; } diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index fb70c7747e41..747102fd2e82 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { homepage = "https://github.com/pocketbase/pocketbase"; license = licenses.mit; maintainers = with maintainers; [ dit7ya thilobillerbeck ]; + mainProgram = "pocketbase"; }; } diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index fc3141d46447..68a767bb03ab 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -76,5 +76,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; + mainProgram = "polaris"; }; } diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 2f99d6f56232..750ac015c061 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.qyliss.net/pr-tracker"; license = licenses.agpl3Plus; maintainers = with maintainers; [ qyliss sumnerevans ]; + mainProgram = "pr-tracker"; }; } diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index 2bb4f03eb333..e39ae107217e 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -45,5 +45,6 @@ in buildNpmPackage { description = "Simple open source self-hosted file sharing solution"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ hyshka ]; + mainProgram = "psitransfer"; }; } diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 3761453f446b..843ca539daf8 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -48,7 +48,7 @@ mkDerivation rec { description = "An equalizer interface for pulseaudio's equalizer sinks"; homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lovek323 mkg20001 ]; + maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c8f2d8061840..3387ef3c6f11 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { license = licenses.bsl11; maintainers = with maintainers; [ avakhrenev happysalada ]; platforms = platforms.all; + mainProgram = "rpk"; }; } diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 6192a492f2b8..21077aa83d1c 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { homepage = "https://reproxy.io/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "reproxy"; }; } diff --git a/pkgs/servers/resgate/default.nix b/pkgs/servers/resgate/default.nix index 1650dcd81955..92b55c7c03da 100644 --- a/pkgs/servers/resgate/default.nix +++ b/pkgs/servers/resgate/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://resgate.io"; license = licenses.mit; maintainers = with maintainers; [ farcaller ]; + mainProgram = "resgate"; }; } diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/servers/rinetd/default.nix index 07611bba54a5..23f1e89a780f 100644 --- a/pkgs/servers/rinetd/default.nix +++ b/pkgs/servers/rinetd/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/samhocevar/rinetd/blob/${src.rev}/CHANGES.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ janik ]; + mainProgram = "rinetd"; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 18a1e91ea4d6..e1ad55a41d38 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -139,5 +139,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ offline RaghavSood ]; license = licenses.isc; platforms = platforms.linux; + mainProgram = "rippled"; }; } diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 865dbd63f7af..7a4b582ea687 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "RoonBridge"; }; } diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index d46be38781de..767eb9e3631d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -95,5 +95,6 @@ stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ lovesegfault steell ]; platforms = [ "x86_64-linux" ]; + mainProgram = "RoonServer"; }; } diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 3ab45831389b..6864556fd55d 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md"; license = licenses.bsd3; maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "routinator"; }; } diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix index 5bcb9267f484..cc9369f9ea29 100644 --- a/pkgs/servers/rpiplay/default.nix +++ b/pkgs/servers/rpiplay/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "rpiplay"; }; } diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 0dc72f74bb2d..0986abe374ca 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda seqizz ]; + mainProgram = "rustypaste"; }; } diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 07c2ebe13b49..96b183c2fe73 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -83,5 +83,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ fridh jojosch adamcstephens ]; + mainProgram = "sabnzbd"; }; } diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/servers/scaphandre/default.nix index 21b72c031be2..07aee5a715b3 100644 --- a/pkgs/servers/scaphandre/default.nix +++ b/pkgs/servers/scaphandre/default.nix @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "scaphandre"; }; } diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 23cc7c290405..01725751243c 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -71,17 +71,16 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.3+zstd.1.5.2", ] [[package]] name = "actix-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -232,9 +231,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -247,9 +246,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -281,9 +280,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -326,15 +325,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -360,9 +359,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -405,18 +404,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -436,15 +435,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -469,7 +468,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.3.1" +version = "1.5.0" dependencies = [ "anyhow", "bytes", @@ -554,13 +553,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", - "regex-automata", + "regex-automata 0.3.6", "serde", ] @@ -603,7 +601,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -649,10 +647,20 @@ dependencies = [ ] [[package]] +name = "calendrical_calculations" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dfe3bc6a50b4667fafdb6d9cf26731c5418c457e317d8166c972014facf9a5d" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] name = "cargo_toml" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f83bc2e401ed041b7057345ebc488c005efa0341d5541ce7004d30458d0090b" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", "toml", @@ -666,11 +674,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -700,9 +709,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57aa1b4a8dda126c03ebf2f7e31d16cfc8781c2fe80dedd1a33459efc3e07578" +checksum = "ffb924701d850fbf0331302e7f9715c04e494b4b9bebb38ac48bdd30924e1936" dependencies = [ "aho-corasick", "cow-utils", @@ -710,11 +719,15 @@ dependencies = [ "deunicode", "either", "fst", + "icu", + "icu_provider", + "icu_provider_blob", "irg-kvariants", "jieba-rs", "lindera-core", "lindera-dictionary", "lindera-tokenizer", + "litemap 0.6.1", "once_cell", "pinyin", "serde", @@ -722,6 +735,7 @@ dependencies = [ "unicode-normalization", "wana_kana", "whatlang", + "zerovec 0.9.6", ] [[package]] @@ -763,9 +777,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", "clap_derive", @@ -774,27 +788,26 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -804,6 +817,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -877,6 +896,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] name = "cow-utils" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -884,9 +912,9 @@ checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -912,7 +940,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -933,7 +961,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -979,9 +1007,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -1002,9 +1030,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1076,14 +1104,33 @@ dependencies = [ ] [[package]] +name = "deduplicating_array" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a636096586ca093a10ac0175bfb384d024089dca0dae54e3e69bc1c1596358e8" +dependencies = [ + "serde", +] + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] name = "derive_arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -1132,9 +1179,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71c14985c842bf1e520b1ebcd22daff6aeece32f510e11f063cecf9b308c04b" +checksum = "61d55a63aabcb2f7893231e6b8ddf8acc00814d20a64463e52cf9b603ec326ee" dependencies = [ "actix-http", "actix-utils", @@ -1149,9 +1196,9 @@ dependencies = [ [[package]] name = "deserr-internal" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae1c51b191528c9e4e5d6cff671de94f61fcda1c206cc891251e0cf438c941a" +checksum = "8c4d5c86e5d887d880c7a3572a8041bfb3011acc81df86318855ea2cae66f3ef" dependencies = [ "convert_case 0.5.0", "proc-macro2", @@ -1198,8 +1245,19 @@ dependencies = [ ] [[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] name = "dump" -version = "1.3.1" +version = "1.5.0" dependencies = [ "anyhow", "big_s", @@ -1219,19 +1277,25 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" dependencies = [ "serde", ] [[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1336,7 +1400,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1360,9 +1424,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1381,12 +1445,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "faux" @@ -1413,33 +1474,45 @@ dependencies = [ [[package]] name = "file-store" -version = "1.3.1" +version = "1.5.0" dependencies = [ "faux", "tempfile", "thiserror", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "filter-parser" -version = "1.3.1" +version = "1.5.0" dependencies = [ "insta", "nom", "nom_locate", + "unescaper", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5287d527037d0f35c8801880361eb38bb9bce194805350052c2a79538388faeb" +dependencies = [ + "displaydoc", + "smallvec", + "writeable", ] [[package]] @@ -1449,12 +1522,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] name = "flatten-serde-json" -version = "1.3.1" +version = "1.5.0" dependencies = [ "criterion", "serde_json", @@ -1468,9 +1541,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -1537,7 +1610,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1572,7 +1645,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.3.1" +version = "1.5.0" dependencies = [ "arbitrary", "clap", @@ -1610,9 +1683,9 @@ checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -1633,9 +1706,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" @@ -1669,9 +1742,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1771,18 +1844,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1841,9 +1905,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1865,15 +1929,497 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.21.1", + "rustls 0.21.6", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "icu" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30f75f394ebee8d539bef8f6f02ad7b5f41c33de74c9eae1a50337b382a5aab1" +dependencies = [ + "icu_calendar", + "icu_casemap", + "icu_collator", + "icu_collections", + "icu_compactdecimal", + "icu_datetime", + "icu_decimal", + "icu_displaynames", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_plurals", + "icu_properties", + "icu_provider", + "icu_relativetime", + "icu_segmenter", + "icu_timezone", + "icu_transliterate", +] + +[[package]] +name = "icu_calendar" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b520c5675775e3838447c33fc55bf558148c6824ef0d20ff7a9e0df7345a281c" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "serde", + "tinystr", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_calendar_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75d8d1a514ca7e6dc547be930f2fd661d578909c07cf1c1adade81c3f7a78840" + +[[package]] +name = "icu_casemap" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976068d7759293cbd9daa0d1669618bb9094c7ee54e546cd8b877dd4fe59007a" +dependencies = [ + "displaydoc", + "icu_casemap_data", + "icu_collections", + "icu_locid", + "icu_properties", + "icu_provider", + "serde", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_casemap_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1251070c14d5b94cd00f97025e9cedce6a6eeb39485e2a226c58432cc4f72ffd" + +[[package]] +name = "icu_collator" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be493c81154545a00fc5196e814cae0e1470bc696d518b5df877049aa6bcefe1" +dependencies = [ + "displaydoc", + "icu_collator_data", + "icu_collections", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_properties", + "icu_provider", + "serde", + "smallvec", + "utf16_iter", + "utf8_iter", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_collator_data" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dbe9abe5ce570ad4707026f37bc21ef95c36b945c3c4564b9aa4e2e1c043126" + +[[package]] +name = "icu_collections" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" +dependencies = [ + "displaydoc", + "serde", + "yoke", + "zerofrom", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_compactdecimal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a8bb9143e7681fd5f5877c76f7b6365e173545d00d0e12ef23ba1888a996baa" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_compactdecimal_data", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_compactdecimal_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e9b7585f26db531ea5aaedaa68cb66cd2be37fe698b33a289849ff3129545b" + +[[package]] +name = "icu_datetime" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5bf2e6dd961b59ee5935070220915db6cf0ab5137de362964f800c2b7d14fa" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "litemap 0.7.1", + "serde", + "smallvec", + "tinystr", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_datetime_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078b2ed516a2f5054ee7f55b1fe970b92e90ae4cace8a0fe1e5f9fc2e94be609" + +[[package]] +name = "icu_decimal" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1986a0b7df834aaddb911b4593c990950ac5606fc83ce9aad4311be80f51e81a" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "serde", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c064b3828953151f8c610bfff6fec776f958641249ebfd1cf36f073f0654e77" + +[[package]] +name = "icu_displaynames" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c98329d348e918ac7e88e6d6613a46bef09ca8a65db4ddf70d86e6eaac0e2ec3" +dependencies = [ + "icu_displaynames_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "serde", + "tinystr", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_displaynames_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f9f56c427f1e80383667e8fb13c07707f6561839283115617cc67307a5d020" + +[[package]] +name = "icu_list" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1a44bbed77a7e7b555f9d7dd4b43f75ec1402b438a901d20451943d50cbd90" +dependencies = [ + "deduplicating_array", + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "serde", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3237583f0cb7feafabb567c4492fe9ef1d2d4113f6a8798a923273ea5de996d" + +[[package]] +name = "icu_locid" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +dependencies = [ + "displaydoc", + "litemap 0.7.1", + "serde", + "tinystr", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_locid_transform" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "serde", + "tinystr", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_normalizer" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080fc33a720d50a7342b0c58df010fbcfb842d6f78ef81555f8b1ac6bba57d3c" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "serde", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d22f74066c2e6442db2a9aa14950278e86719e811e304e48bae03094b369d" + +[[package]] +name = "icu_plurals" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20556516b8be2b2f5dc3d6b23884b65c5c59ed8be0b44c419e4808c9b0792fce" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "serde", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_plurals_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc552215224997aaaa4e05d95981386d3c52042acebfcc732137d5d9be96a21" + +[[package]] +name = "icu_properties" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "serde", + "tinystr", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_properties_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c8bb3b67a8347e94d580434369e5c7ee89999b9309d04b7cfc88dfaa0f31b59" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "postcard", + "serde", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_provider_blob" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" +dependencies = [ + "icu_provider", + "postcard", + "serde", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_provider_macros" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "icu_relativetime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4e6c1b531ab35f5b0cb552d3fb8dab1cb49f98e68e12bdc2169ca15e805207c" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_relativetime_data", + "serde", + "writeable", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_relativetime_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ec2ca0aff8c6865075c6257bc91d21a77acb6465635306a280af89208bed24" + +[[package]] +name = "icu_segmenter" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" +dependencies = [ + "core_maths", + "displaydoc", + "icu_collections", + "icu_locid", + "icu_provider", + "icu_segmenter_data", + "serde", + "utf8_iter", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_segmenter_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" + +[[package]] +name = "icu_timezone" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e6401cd210ccda98b2e7fc707831b29c6efe319efbbec460f957b6f331f626" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "serde", + "tinystr", + "zerotrie", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_timezone_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7e214a653bac59b768c42f82d252f13af95e8a9cb07b6108b8bc723c561b43" + +[[package]] +name = "icu_transliterate" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4bdf006774b5a5898d97af6c95b148d34cd5c87cbed00610ff873e5b5885e28" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid", + "icu_normalizer", + "icu_properties", + "icu_provider", + "icu_unicodeset_parse", + "litemap 0.7.1", + "serde", + "zerovec 0.10.0", +] + +[[package]] +name = "icu_unicodeset_parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c3c1ab072cb9ec2dfb377ed7be07bf1bdce055b8324ba6392323f588c38c5a" +dependencies = [ + "icu_collections", + "icu_properties", + "icu_provider", + "tinystr", + "zerovec 0.10.0", ] [[package]] @@ -1884,9 +2430,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1894,7 +2440,7 @@ dependencies = [ [[package]] name = "index-scheduler" -version = "1.3.1" +version = "1.5.0" dependencies = [ "anyhow", "big_s", @@ -1912,6 +2458,7 @@ dependencies = [ "meilisearch-types", "nelson", "page_size 0.5.0", + "puffin", "roaring", "serde", "serde_json", @@ -1919,7 +2466,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] @@ -1930,7 +2477,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1941,6 +2487,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -1954,9 +2501,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.29.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console", "lazy_static", @@ -1998,16 +2545,16 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "irg-kvariants" @@ -2022,12 +2569,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "rustix 0.38.2", + "hermit-abi", + "rustix 0.38.7", "windows-sys 0.48.0", ] @@ -2041,20 +2588,29 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jieba-rs" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37228e06c75842d1097432d94d02f37fe3ebfca9791c2e8fef6e9db17ed128c1" +checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lazy_static", "phf", "phf_codegen", @@ -2072,16 +2628,16 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-depth-checker" -version = "1.3.1" +version = "1.5.0" dependencies = [ "criterion", "serde_json", @@ -2158,9 +2714,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -2170,9 +2726,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8" +checksum = "6f567a47e47b5420908424de2c6c5e424e3cafe588d0146bd128c0f3755758a3" dependencies = [ "anyhow", "bincode", @@ -2189,9 +2745,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72b460559bcbe8a9cee85ea4a5056133ed3abf373031191589236e656d65b59" +checksum = "49f3e553d55ebe9881fa5e5de588b0a153456e93564d17dfbef498912caf63a2" dependencies = [ "anyhow", "flate2", @@ -2200,9 +2756,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea" +checksum = "a9a2440cc156a4a911a174ec68203543d1efb10df3a700a59b6bf581e453c726" dependencies = [ "anyhow", "bincode", @@ -2217,9 +2773,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb1facd8da698072fcc7338bd757730db53d59f313f44dd583fa03681dcc0e1" +checksum = "e077a410e61c962cb526f71b7effd62ffc607488a8f61869c937582d2ccb529b" dependencies = [ "anyhow", "flate2", @@ -2228,9 +2784,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c" +checksum = "d9f57491adf7b311a3ee87f5e4a36454df16a2ec73de4ef28b2106fac80bd782" dependencies = [ "anyhow", "bincode", @@ -2248,9 +2804,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6" +checksum = "a3476ec7748aebd2eb23d496ddfce5e7e0a5c031cffcd214451043e02d029f11" dependencies = [ "anyhow", "bincode", @@ -2269,9 +2825,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a" +checksum = "7b1c7576a02d5e4af2bf62de51790a01bc4b8bc0d0b6a6b86a46b157f5cb306d" dependencies = [ "anyhow", "bincode", @@ -2290,9 +2846,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18" +checksum = "b713ecd5b827d7d448c3c5eb3c6d5899ecaf22cd17087599996349a02c76828d" dependencies = [ "bincode", "byteorder", @@ -2307,9 +2863,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8" +checksum = "3e545752f6487be87b572529ad594cb3b48d2ef20821516f598b2d152d23277b" dependencies = [ "anyhow", "bincode", @@ -2327,9 +2883,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81" +checksum = "24a2d4606a5a4da62ac4a3680ee884a75da7f0c892dc967fc9cb983ceba39a8f" dependencies = [ "bincode", "byteorder", @@ -2342,9 +2898,9 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3399b6dcfe1701333451d184ff3c677f433b320153427b146360c9e4bd8cb816" +checksum = "388b1bdf81794b5d5b8057ce0321c58ff4b90d676b637948ccc7863ae2f43d28" dependencies = [ "bincode", "byteorder", @@ -2359,9 +2915,9 @@ dependencies = [ [[package]] name = "lindera-unidic-builder" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55" +checksum = "cdfa3e29a22c047da57fadd960ff674b720de15a1e2fb35b5ed67f3408afb469" dependencies = [ "anyhow", "bincode", @@ -2391,15 +2947,24 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] -name = "linux-raw-sys" -version = "0.4.3" +name = "litemap" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "575d8a551c59104b4df91269921e5eab561aa1b77c618dac0414b5d44a4617de" + +[[package]] +name = "litemap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" +dependencies = [ + "serde", +] [[package]] name = "lmdb-rkv-sys" @@ -2431,9 +2996,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2468,6 +3033,12 @@ dependencies = [ ] [[package]] +name = "lz4_flex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" + +[[package]] name = "manifest-dir-macros" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2476,7 +3047,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2493,7 +3064,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.3.1" +version = "1.5.0" dependencies = [ "insta", "md5", @@ -2502,7 +3073,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.3.1" +version = "1.5.0" dependencies = [ "actix-cors", "actix-http", @@ -2533,10 +3104,10 @@ dependencies = [ "hex", "http", "index-scheduler", - "indexmap 1.9.3", + "indexmap 2.0.0", "insta", "is-terminal", - "itertools", + "itertools 0.11.0", "jsonwebtoken", "lazy_static", "log", @@ -2556,6 +3127,7 @@ dependencies = [ "pin-project-lite", "platform-dirs", "prometheus", + "puffin", "rand", "rayon", "regex", @@ -2582,7 +3154,7 @@ dependencies = [ "tokio-stream", "toml", "urlencoding", - "uuid 1.3.3", + "uuid 1.5.0", "vergen", "walkdir", "yaup", @@ -2591,7 +3163,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.3.1" +version = "1.5.0" dependencies = [ "base64 0.21.2", "enum-iterator", @@ -2605,12 +3177,12 @@ dependencies = [ "sha2", "thiserror", "time", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] name = "meilisearch-types" -version = "1.3.1" +version = "1.5.0" dependencies = [ "actix-web", "anyhow", @@ -2635,7 +3207,21 @@ dependencies = [ "thiserror", "time", "tokio", - "uuid 1.3.3", + "uuid 1.5.0", +] + +[[package]] +name = "meilitool" +version = "1.5.0" +dependencies = [ + "anyhow", + "clap", + "dump", + "file-store", + "meilisearch-auth", + "meilisearch-types", + "time", + "uuid 1.5.0", ] [[package]] @@ -2646,25 +3232,25 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "milli" -version = "1.3.1" +version = "1.5.0" dependencies = [ "big_s", "bimap", @@ -2685,10 +3271,10 @@ dependencies = [ "geoutils", "grenad", "heed", - "indexmap 1.9.3", + "indexmap 2.0.0", "insta", "instant-distance", - "itertools", + "itertools 0.11.0", "json-depth-checker", "levenshtein_automata", "log", @@ -2700,6 +3286,7 @@ dependencies = [ "obkv", "once_cell", "ordered-float", + "puffin", "rand", "rand_pcg", "rayon", @@ -2714,7 +3301,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.3.3", + "uuid 1.5.0", ] [[package]] @@ -2750,15 +3337,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -2768,9 +3346,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebffdb73fe72e917997fad08bdbf31ac50b0fa91cec93e69a0662e4264d454c" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", @@ -2836,9 +3414,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -2846,19 +3424,19 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -2922,15 +3500,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.1", ] [[package]] @@ -2946,9 +3524,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path-matchers" @@ -2988,13 +3566,13 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "permissive-json-pointer" -version = "1.3.1" +version = "1.5.0" dependencies = [ "big_s", "serde_json", @@ -3002,9 +3580,9 @@ dependencies = [ [[package]] name = "pest" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ "thiserror", "ucd-trie", @@ -3012,9 +3590,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -3022,22 +3600,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "pest_meta" -version = "2.6.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", @@ -3046,18 +3624,18 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", "phf_shared", @@ -3065,9 +3643,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", @@ -3075,18 +3653,18 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" [[package]] name = "pin-utils" @@ -3117,9 +3695,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -3130,20 +3708,37 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] +name = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[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" @@ -3192,7 +3787,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix 0.36.14", + "rustix 0.36.16", ] [[package]] @@ -3219,10 +3814,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] +name = "puffin" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "cfg-if", + "instant", + "lz4_flex", + "once_cell", + "parking_lot", + "serde", +] + +[[package]] name = "quote" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3320,26 +3932,41 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.3.6", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -3364,13 +3991,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.1", + "rustls 0.21.6", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", @@ -3403,9 +4030,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71" +checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" dependencies = [ "bytemuck", "byteorder", @@ -3415,9 +4042,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" dependencies = [ "heapless", "num-traits", @@ -3442,9 +4069,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.14" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", "errno", @@ -3456,28 +4083,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" dependencies = [ "bitflags 2.3.3", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -3495,30 +4108,40 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.3", "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" dependencies = [ "ring", "untrusted", @@ -3526,15 +4149,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -3547,9 +4170,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3577,15 +4200,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -3610,20 +4233,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "indexmap 2.0.0", "itoa", @@ -3633,9 +4256,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3676,9 +4299,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -3745,9 +4368,12 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +dependencies = [ + "serde", +] [[package]] name = "smartstring" @@ -3833,9 +4459,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -3864,10 +4490,22 @@ dependencies = [ ] [[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", + "unicode-xid", +] + +[[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3880,9 +4518,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3900,15 +4538,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", + "rustix 0.38.7", + "windows-sys 0.48.0", ] [[package]] @@ -3922,31 +4560,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "time" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -3954,20 +4594,31 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", + "serde", + "zerovec 0.10.0", +] + +[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3994,11 +4645,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -4019,7 +4671,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -4035,11 +4687,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.1", + "rustls 0.21.6", "tokio", ] @@ -4070,9 +4722,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -4082,20 +4734,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -4143,9 +4795,18 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unescaper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" +dependencies = [ + "thiserror", +] [[package]] name = "unicase" @@ -4164,9 +4825,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4204,17 +4865,17 @@ dependencies = [ "base64 0.21.2", "log", "once_cell", - "rustls 0.21.1", - "rustls-webpki", + "rustls 0.21.6", + "rustls-webpki 0.100.2", "url", "webpki-roots 0.23.1", ] [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -4223,9 +4884,15 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf16_iter" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "52df8b7fb78e7910d776fccf2e42ceaf3604d55e8e7eb2dbd183cb1441d8a692" [[package]] name = "utf8-width" @@ -4234,6 +4901,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] +name = "utf8_iter" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" + +[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4250,9 +4923,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", @@ -4303,17 +4976,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "477976a5c56fb7b014795df5a2ce08d2de8bcd4d5980844c5bd3978a7fd1c30b" dependencies = [ "fnv", - "itertools", + "itertools 0.10.5", "lazy_static", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -4325,9 +4997,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4335,24 +5007,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -4362,9 +5034,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4372,28 +5044,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -4401,9 +5073,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted", @@ -4424,7 +5096,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.100.2", ] [[package]] @@ -4483,7 +5155,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -4503,9 +5175,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -4602,9 +5274,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" dependencies = [ "memchr", ] @@ -4619,10 +5291,22 @@ dependencies = [ ] [[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -4653,6 +5337,30 @@ dependencies = [ ] [[package]] +name = "yoke" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", + "synstructure 0.13.0", +] + +[[package]] name = "zerocopy" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4670,7 +5378,74 @@ checksum = "d498dbd1fd7beb83c86709ae1c33ca50942889473473d287d56ce4770a18edfb" dependencies = [ "proc-macro2", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", + "synstructure 0.13.0", +] + +[[package]] +name = "zerotrie" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9685bb4deb98dab812e87c296a9631fc00d7ca4bc5c2c5f304f375bbed711a8a" +dependencies = [ + "displaydoc", + "litemap 0.7.1", + "serde", + "yoke", + "zerofrom", + "zerovec 0.10.0", +] + +[[package]] +name = "zerovec" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "591691014119b87047ead4dcf3e6adfbf73cb7c38ab6980d4f18a32138f35d46" +dependencies = [ + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +dependencies = [ + "serde", + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", ] [[package]] @@ -4690,7 +5465,7 @@ dependencies = [ "pbkdf2", "sha1", "time", - "zstd 0.11.2+zstd.1.5.2", + "zstd", ] [[package]] @@ -4699,16 +5474,7 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe", ] [[package]] @@ -4722,16 +5488,6 @@ dependencies = [ ] [[package]] -name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] name = "zstd-sys" version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 6dc77b86271f..2846ebbf46b1 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -7,7 +7,7 @@ , nix-update-script }: -let version = "1.3.1"; +let version = "1.5.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-jttT4qChoqwTnjjoW0Zc15ZieZN7KD1Us64Tk0eDG3Y="; + hash = "sha256-UP5i89hXmbATbHwN4wu42L6zX2fnd/hF4NEGK5VwmiM="; }; cargoBuildFlags = [ diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 7ca94e4e402c..43d6527d3aa5 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; + mainProgram = "ser2net"; }; } diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 085f0fb8cc9f..1aa4323cda6f 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -60,5 +60,6 @@ buildGoModule rec { ''; license = licenses.agpl3Only; maintainers = with maintainers; [ thenonameguy yayayayaka ]; + mainProgram = "sftpgo"; }; } diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 90db957d3c01..2a7e643b60fd 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "shairplay"; }; } diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index d673a201646d..b14056f5adca 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { description = "HTTP/2 server for development purposes"; license = licenses.asl20; maintainers = with maintainers; [ yrashk ]; + mainProgram = "simplehttp2server"; }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 2ae2efbbb759..6d23a42abb14 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "skydns"; }; } diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index e776805d8e5d..9095335d1b80 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://authzed.com/"; license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "spicedb"; }; } diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 668f5190be40..437ce3fc1dc6 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.11"; + version = "11.47.17"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ZYogc8KjFYbmS7OlL2ufGxdnMAYOYeUFk8AVe7rDer0="; + hash = "sha256-2bMzIlvSShNZMVKzBl5T/T33l0PPcBFH35gJs0qlD4E="; }; nativeBuildInputs = [ bison cmake python3 ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 67f7b520b898..fe6319d44f20 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; + NIX_LDFLAGS = "-L${lib.getLib json_c}/lib" + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + + lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}"; + preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index cefa00d41634..d68ad9ddcace 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -95,5 +95,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dit7ya ]; + mainProgram = "sqlpage"; }; } diff --git a/pkgs/servers/sshportal/default.nix b/pkgs/servers/sshportal/default.nix index 307b945eba1c..58c0b5a2077f 100644 --- a/pkgs/servers/sshportal/default.nix +++ b/pkgs/servers/sshportal/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://manfred.life/sshportal"; license = licenses.asl20; maintainers = with maintainers; [ zaninime ]; + mainProgram = "sshportal"; }; } diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index a8057cac7e7d..4c7b8d46638c 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -37,5 +37,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "static-web-server"; }; } diff --git a/pkgs/servers/stone/default.nix b/pkgs/servers/stone/default.nix index 65ddb92da7a1..a565a609e12b 100644 --- a/pkgs/servers/stone/default.nix +++ b/pkgs/servers/stone/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; + mainProgram = "stone"; }; } diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 99f238c46d05..eb4bcccbbf9d 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { # darwin crashes with: # src/controllers/parsingArgs.go:130:4: undefined: PrintEmbeddedFiles broken = stdenv.isDarwin; + mainProgram = "swego"; }; } diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 399c56376ecf..96b1945df51f 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -62,5 +62,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ pennae ]; platforms = lib.platforms.linux; + mainProgram = "syncserver"; }; } diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index 051ebe964ee2..4886b2f72cd9 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = [ licenses.mit ]; maintainers = with maintainers; [ sohalt ]; platforms = platforms.unix ; + mainProgram = "tarssh"; }; } diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix index 3d52ccc96f83..d8dc668fb69b 100644 --- a/pkgs/servers/telegram-bot-api/default.nix +++ b/pkgs/servers/telegram-bot-api/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = licenses.boost; maintainers = with maintainers; [ Anillc ]; platforms = platforms.all; + mainProgram = "telegram-bot-api"; }; } diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index 605ebdf3a711..5d929dfe348e 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://pingcap.com"; license = licenses.asl20; maintainers = []; + mainProgram = "tidb-server"; }; } diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index dff7f050fbf9..09cd26090e14 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ck3d ]; + mainProgram = "tmate-ssh-server"; }; } diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 41b6ae78a878..7abbdc5c8403 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; + mainProgram = "traefik"; }; } diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 435e872d332f..9741a23f9851 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.thoughtpolice ]; platforms = lib.platforms.all; + mainProgram = "ttyd"; }; } diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 573a857becd7..7c7b3124ceba 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -131,5 +131,6 @@ in stdenv.mkDerivation { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ simonvandel ]; + mainProgram = "tvheadend"; }; } diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 0f50b1e18dd7..9056b4791672 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { license = licenses.free; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; + mainProgram = "u9fs"; }; } diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/servers/ucarp/default.nix index b9a8bbea4804..90cbc562d382 100644 --- a/pkgs/servers/ucarp/default.nix +++ b/pkgs/servers/ucarp/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ isc bsdOriginal bsd2 gpl2Plus ]; maintainers = with maintainers; [ oxzi ]; + mainProgram = "ucarp"; }; } diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 48398a5ba6e1..e862884a457b 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thall snicket2100 ]; + mainProgram = "ums"; }; } diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 140f4ddfa793..5ed52a37f62c 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/davidnewhall/unpackerr"; maintainers = with maintainers; [ nullx76 ]; license = licenses.mit; + mainProgram = "unpackerr"; }; } diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index f71263469744..b67cf7ce0549 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { # macOS build fails: https://github.com/pfpacket/rust-9p/issues/7 platforms = with platforms; linux; + mainProgram = "unpfs"; }; } diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 2c7563fe03c0..beeca756d867 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -168,5 +168,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ abbradar schneefux globin ]; platforms = lib.platforms.unix; + mainProgram = "uwsgi"; }; }) diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index d5d150bd0f2c..63a02f6828c8 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.azuwis ]; platforms = lib.platforms.unix; + mainProgram = "uxplay"; }; }) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 535ef7192d84..cfb22c85dbec 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ leona erictapen ]; platforms = platforms.linux; + mainProgram = "vouch-proxy"; }; } diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 29d8eb1fdfc5..142e83edbfe0 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,25 +5,25 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.3"; + version = "0.45.7.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; - rev = "refs/tags/${version}"; - hash = "sha256-QTkkMFGyEGSakvFCiJ36Xr3IiG9K7GDy2dpNGWjUngs="; + rev = version; + hash = "sha256-axj23LEZgSNpwkVtXQ/2QZVbbV+xTpkf57ajYnqTGFA="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.5.0" "apprise" \ + --replace "apprise~=1.6.0" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ - --replace "dnspython<2.3.0" "dnspython" \ + --replace "dnspython~=2.4" "dnspython" \ --replace "pytest ~=7.2" "" \ --replace "pytest-flask ~=1.2" "" \ - --replace "selenium~=4.1.0" "selenium" \ - --replace "werkzeug~=2.0.0" "werkzeug" + --replace "selenium~=4.14.0" "selenium" \ + --replace "werkzeug~=3.0" "werkzeug" ''; propagatedBuildInputs = with python3.pkgs; [ @@ -75,6 +75,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/dgtlmoon/changedetection.io"; changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mikaelfangel ]; }; } diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/servers/webdav-server-rs/default.nix index 06c8716ba877..695ab41dea62 100644 --- a/pkgs/servers/webdav-server-rs/default.nix +++ b/pkgs/servers/webdav-server-rs/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/miquels/webdav-server-rs"; license = licenses.asl20; maintainers = with maintainers; [ pmy ]; + mainProgram = "webdav-server"; }; } diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index f6380337e864..248c5e882cce 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; maintainers = with maintainers; [ pmy ]; + mainProgram = "webdav"; }; } diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 2cae2887e9fb..11cbfa5adbf2 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { ''; license = with licenses; [ mit ]; maintainers = with maintainers; [ leenaars ]; + mainProgram = "webmetro"; }; } diff --git a/pkgs/servers/wesher/default.nix b/pkgs/servers/wesher/default.nix index 5ab8edd17381..e9b243e325e4 100644 --- a/pkgs/servers/wesher/default.nix +++ b/pkgs/servers/wesher/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { license = licenses.gpl3Only; maintainers = with maintainers; [ tylerjl ]; platforms = platforms.linux; + mainProgram = "wesher"; }; } diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index cc9bc6cfd89e..19ce2c32e220 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ caarlos0 penguwin ]; + mainProgram = "wishlist"; }; } diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 8e1f61dc5dd3..6b99e6c59373 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ izorkin ]; license = licenses.mit; platforms = platforms.all; + mainProgram = "wsdd"; }; } diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index e5238b90814f..f61d5c1a02c5 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -44,5 +44,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Plus; changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS"; maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "xandikos"; }; } diff --git a/pkgs/servers/xteve/default.nix b/pkgs/servers/xteve/default.nix index 47302d6e9d49..75591ddfbc14 100644 --- a/pkgs/servers/xteve/default.nix +++ b/pkgs/servers/xteve/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/xteve-project/xTeVe"; license = licenses.mit; maintainers = with maintainers; [ nrhelmi ]; + mainProgram = "xteve"; }; } diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 1b8ae2e31787..010112dff80b 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -39,5 +39,6 @@ buildNpmPackage rec { ''; maintainers = with maintainers; [ sweber hexa ]; platforms = platforms.linux; + mainProgram = "zigbee2mqtt"; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 6d424d94a46f..bace4b422edf 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.87.0"; + version = "0.87.1"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-anIkIVRsJW2f2hj/Bz9lcw1vFoWhGHAE/XgIvnxbJg8="; + hash = "sha256-lPfP0bnMTb+IQoWdf7oHaj96/l68Ic6OmB/Ur9Q65g8="; }; - cargoHash = "sha256-vwOAYigKItd2T/ze5H26cMfIssoAnt0XFQtfA8exLyM="; + cargoHash = "sha256-2xc0IiPCmhFtVXWEpDpRny27/bJZAh/Ke9+LVsrcWF0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 7e675c250175..99619bd88d2c 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ ]; + mainProgram = "alttab"; }; } diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 61a80bcbcdd6..e1b9a3c1c73a 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; all; + mainProgram = "autocutsel"; }; } diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index f0150e931551..b50f15a1929c 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + mainProgram = "bgs"; }; } diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index f78e43dbcc8e..1b50b2456d0a 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with lib.maintainers; [ dezgeg ]; platforms = platforms.unix; + mainProgram = "ckbcomp"; }; } diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/tools/X11/devour/default.nix index 016ffa6215db..861eaf905f9d 100644 --- a/pkgs/tools/X11/devour/default.nix +++ b/pkgs/tools/X11/devour/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ mazurel ]; platforms = platforms.unix; + mainProgram = "devour"; }; } diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index 5e0ef6002ce0..c194e1543f29 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = with maintainers; [ nickcao ]; + mainProgram = "dex"; }; } diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index fbb7b117d298..11d46bf24cb6 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ zimbatm ]; platforms = platforms.linux; + mainProgram = "dispad"; }; } diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 9723ef69b850..9b2611dde210 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + mainProgram = "ffcast"; }; } diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/tools/X11/find-cursor/default.nix index 44a7c7662152..3b9862a47dea 100644 --- a/pkgs/tools/X11/find-cursor/default.nix +++ b/pkgs/tools/X11/find-cursor/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.yanganto ]; + mainProgram = "find-cursor"; }; } diff --git a/pkgs/tools/X11/gobble/default.nix b/pkgs/tools/X11/gobble/default.nix index 46b1b2c4b482..b61cf78f9921 100644 --- a/pkgs/tools/X11/gobble/default.nix +++ b/pkgs/tools/X11/gobble/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ vuimuich ]; platforms = lib.platforms.linux; + mainProgram = "gobble"; }; } diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 08b037972970..cea5fad51e55 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { description = "Automatically configure monitors/outputs for Xorg via RANDR"; license = with licenses; [ bsd2 ]; platforms = platforms.linux; + mainProgram = "grobi"; }; } diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/tools/X11/icon-slicer/default.nix index 37b309c54b76..514b39496ffa 100644 --- a/pkgs/tools/X11/icon-slicer/default.nix +++ b/pkgs/tools/X11/icon-slicer/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ zaninime ]; platforms = platforms.linux; + mainProgram = "icon-slicer"; }; } diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix index 79fbe65af1f2..bab363583a6c 100644 --- a/pkgs/tools/X11/imwheel/default.nix +++ b/pkgs/tools/X11/imwheel/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.linux; license = licenses.gpl2; + mainProgram = "imwheel"; }; } diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/tools/X11/inputplug/default.nix index e6bf334cf4c0..80d97190a0ce 100644 --- a/pkgs/tools/X11/inputplug/default.nix +++ b/pkgs/tools/X11/inputplug/default.nix @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec { # `daemon(3)` is deprecated on macOS and `pidfile-rs` needs updating broken = stdenv.isDarwin; maintainers = with maintainers; [ jecaro ]; + mainProgram = "inputplug"; }; } diff --git a/pkgs/tools/X11/kdocker/default.nix b/pkgs/tools/X11/kdocker/default.nix index 21a11f8fa31a..e8c08e4c3832 100644 --- a/pkgs/tools/X11/kdocker/default.nix +++ b/pkgs/tools/X11/kdocker/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Only; maintainers = with maintainers; [ hexclover ]; platforms = platforms.linux; + mainProgram = "kdocker"; }; }) diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 4a2a0e8b5904..63732f478cba 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + mainProgram = "keynav"; }; } diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index 8b77ae550300..733022948dbd 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "ksuperkey"; }; } diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index deefddf23cea..6097948a7cd3 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.auntie ]; + mainProgram = "nitrogen"; }; } diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index efd8b60419be..f4f9fd433fde 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.sfrijters ]; platforms = lib.platforms.linux; + mainProgram = "obconf"; }; } diff --git a/pkgs/tools/X11/paperview/default.nix b/pkgs/tools/X11/paperview/default.nix index 790eaed53ab5..30f04702708a 100644 --- a/pkgs/tools/X11/paperview/default.nix +++ b/pkgs/tools/X11/paperview/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ mit ]; maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + mainProgram = "paperview"; }; } diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix index c5f6274d988e..278a181f5c92 100644 --- a/pkgs/tools/X11/pmenu/default.nix +++ b/pkgs/tools/X11/pmenu/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = [ lib.maintainers.azahi ]; platforms = lib.platforms.unix; + mainProgram = "pmenu"; }; }) diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index 8a07b41ac371..0fe85a9ae452 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "http://www.update.uu.se/~zrajm/programs/"; downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; + mainProgram = "ratmen"; }; } diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index d62b38bdf287..b9cdc20f78aa 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { maintainers = [ maintainers.snaar ]; license = licenses.bsd3; platforms = platforms.unix; + mainProgram = "run_scaled"; }; } diff --git a/pkgs/tools/X11/sbs/default.nix b/pkgs/tools/X11/sbs/default.nix index 02a25ba467fb..8f16729cd256 100644 --- a/pkgs/tools/X11/sbs/default.nix +++ b/pkgs/tools/X11/sbs/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ onur-ozkan ]; + mainProgram = "sbs"; }; } diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index bc7b468caaf8..2c7729eab3ad 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.vyp ]; platforms = platforms.unix; + mainProgram = "setroot"; }; } diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/tools/X11/smart-wallpaper/default.nix index f992838935c7..8f41bb7a78af 100644 --- a/pkgs/tools/X11/smart-wallpaper/default.nix +++ b/pkgs/tools/X11/smart-wallpaper/default.nix @@ -34,5 +34,6 @@ stdenvNoCC.mkDerivation { license = licenses.bsd2; maintainers = with maintainers; [ baitinq ]; platforms = platforms.linux; + mainProgram = "smart-wallpaper"; }; } diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index 84f43301bbd7..0d51bf4785ec 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.utdemir ]; + mainProgram = "srandrd"; }; } diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index d22884270dd4..de083a32028d 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; + mainProgram = "sselp"; }; } diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix index f48e59c753eb..d408af8245bc 100644 --- a/pkgs/tools/X11/sx/default.nix +++ b/pkgs/tools/X11/sx/default.nix @@ -35,5 +35,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ figsoda thiagokokada ]; + mainProgram = "sx"; }; } diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index a5fc87aaf6f2..0ca3354433dc 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.mit; # expat version platforms = platforms.unix; maintainers = with maintainers; [ vcunat ]; + mainProgram = "vdpauinfo"; }; } diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index 2bdeff6a5790..eae930de1dd9 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; homepage = "https://github.com/mikemb/wayV"; + mainProgram = "wayv"; }; } diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 19a464aff72a..08a3e9c365f4 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = with lib.platforms; all; maintainers = [ lib.maintainers.Anton-Latukha ]; + mainProgram = "wmctrl"; }; } diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index e9e9e4b4daba..8c48951b2d42 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "x11vnc"; }; } diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index ed4a83fc8de0..8c9648e71d37 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A program to control a remote VNC server"; platforms = platforms.unix; license = licenses.gpl2; + mainProgram = "x2vnc"; }; } diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index 3a766d63ba97..061f1d190318 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dottedmag/x2x"; license = licenses.bsd3; platforms = platforms.linux; + mainProgram = "x2x"; }; } diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index fe6d5cae6ee1..148bbcfe7af4 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; homepage = "https://github.com/blais/xannotate"; + mainProgram = "xannotate"; }; } diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index 9aa7e4f5b023..9a8780324b84 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [lib.maintainers.choochootrain]; platforms = lib.platforms.linux; + mainProgram = "xbanish"; }; } diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index e9d6d42b0689..8a5c07ef96ec 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [benley]; platforms = with lib.platforms; linux; + mainProgram = "xbindkeys-config"; }; patches = [ ./xbindkeys-config-patch1.patch ]; diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/tools/X11/xborders/default.nix index f9e78034c3c0..379f976acf45 100644 --- a/pkgs/tools/X11/xborders/default.nix +++ b/pkgs/tools/X11/xborders/default.nix @@ -53,5 +53,6 @@ python3Packages.buildPythonPackage rec { license = licenses.unlicense; maintainers = with maintainers; [ elnudev ]; platforms = platforms.linux; + mainProgram = "xborders"; }; } diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index 1445c60ccb19..c022371c01d9 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://shallowsky.com/software"; license = lib.licenses.mit; platforms = lib.platforms.linux; + mainProgram = "xbrightness"; }; } diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 09d5cde88fe6..4960aff0f7b0 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = []; platforms = platforms.linux; + mainProgram = "xcalib"; }; } diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index f8d4376017bd..c62e29cedc15 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3 ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + mainProgram = "xcape"; }; } diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 5c154f8a1116..7a251b30a47b 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "A standalone X11 program to create chained key bindings"; license = lib.licenses.gpl3; platforms = lib.platforms.unix; + mainProgram = "xchainkeys"; }; } diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index 6dbd8606485a..d60390952dd7 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.grburst ]; license = licenses.bsd3; platforms = platforms.linux; + mainProgram = "xcwd"; }; } diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 736c05c7c7db..bcb48ac44fac 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; + mainProgram = "xdotool"; }; } diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix index 9f9b50feab90..005bf302cc34 100644 --- a/pkgs/tools/X11/xgeometry-select/default.nix +++ b/pkgs/tools/X11/xgeometry-select/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://bbs.archlinux.org/viewtopic.php?pid=660837"; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; + mainProgram = "xgeometry-select"; }; } diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 25b419ade4e3..d8afb3e4a896 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.flosse ]; platforms = lib.platforms.linux; + mainProgram = "xinput_calibrator"; }; } diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/tools/X11/xkb-switch-i3/default.nix index 6333c1abc740..975eeb986614 100644 --- a/pkgs/tools/X11/xkb-switch-i3/default.nix +++ b/pkgs/tools/X11/xkb-switch-i3/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ewok ]; platforms = platforms.linux; + mainProgram = "xkb-switch"; }; } diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index e2f15d969edd..7db592532234 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.linux; + mainProgram = "xkb-switch"; }; } diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix index 645770f7e015..9c4bc81744fa 100644 --- a/pkgs/tools/X11/xkbset/default.nix +++ b/pkgs/tools/X11/xkbset/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ drets ]; platforms = platforms.linux; license = licenses.bsd3; + mainProgram = "xkbset"; }; } diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/tools/X11/xkbvalidate/default.nix index 92a47aa65638..b39e697f7741 100644 --- a/pkgs/tools/X11/xkbvalidate/default.nix +++ b/pkgs/tools/X11/xkbvalidate/default.nix @@ -7,6 +7,7 @@ runCommandCC "xkbvalidate" { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.aszlig ]; + mainProgram = "xkbvalidate"; }; } '' mkdir -p "$out/bin" diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 593b40a2ade7..499bd4694592 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; platforms = platforms.linux; + mainProgram = "xlayoutdisplay"; }; } diff --git a/pkgs/tools/X11/xlogo/default.nix b/pkgs/tools/X11/xlogo/default.nix index 8c30b34eca75..7b8e9bf52212 100644 --- a/pkgs/tools/X11/xlogo/default.nix +++ b/pkgs/tools/X11/xlogo/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raboof ]; platforms = platforms.unix; license = licenses.mit; + mainProgram = "xlogo"; }; } diff --git a/pkgs/tools/X11/xmcp/default.nix b/pkgs/tools/X11/xmcp/default.nix index 178861d63724..228d502c4b7c 100644 --- a/pkgs/tools/X11/xmcp/default.nix +++ b/pkgs/tools/X11/xmcp/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; platforms = platforms.linux; + mainProgram = "xmcp"; }; } diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index ec6a5b0b8e11..121ec93b2242 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/milaq/XMousePasteBlock"; license = lib.licenses.gpl2; maintainers = [ maintainers.petercommand ]; + mainProgram = "xmousepasteblock"; }; } diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/tools/X11/xnotify/default.nix index e5c6c31e7dbb..cdd7d54b5294 100644 --- a/pkgs/tools/X11/xnotify/default.nix +++ b/pkgs/tools/X11/xnotify/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; + mainProgram = "xnotify"; }; } diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix index 71e50248df97..e6e2fc273020 100644 --- a/pkgs/tools/X11/xob/default.nix +++ b/pkgs/tools/X11/xob/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ florentc ]; + mainProgram = "xob"; }; } diff --git a/pkgs/tools/X11/xplugd/default.nix b/pkgs/tools/X11/xplugd/default.nix index aa07c7f37b1b..f5b81571ef2d 100644 --- a/pkgs/tools/X11/xplugd/default.nix +++ b/pkgs/tools/X11/xplugd/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ akho ]; + mainProgram = "xplugd"; }; } diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 33271090678f..8621e7644365 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres xzfc ]; platforms = platforms.linux; + mainProgram = "xpointerbarrier"; }; }) diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index ec8a2ed459d3..ebe3d2a61992 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; + mainProgram = "xprintidle-ng"; }; } diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index 400306db6efd..4a0d371a7fd6 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; + mainProgram = "xprintidle"; }; } diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/tools/X11/xprompt/default.nix index 191b0316fa80..15f7b337c879 100644 --- a/pkgs/tools/X11/xprompt/default.nix +++ b/pkgs/tools/X11/xprompt/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; + mainProgram = "xprompt"; }; } diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index 8b37a6792424..7eef352aea53 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + mainProgram = "xrectsel"; }; } diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index dd3766160c01..2837d2a83d73 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; license = licenses.gpl2Plus; + mainProgram = "xrestop"; }; } diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index dfd834e67b80..de1ea88266e2 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; + mainProgram = "xtrace"; }; } diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix index 9e2ee94efa4a..790312335ab2 100644 --- a/pkgs/tools/X11/xtruss/default.nix +++ b/pkgs/tools/X11/xtruss/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "xtruss"; }; } diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 32355205d59a..7ed6b355a799 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; + mainProgram = "xvkbd"; }; } diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index 051a3a0d0fe7..df93e10fe194 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ ivar ]; platforms = platforms.linux; + mainProgram = "xwallpaper"; }; } diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 51ba815f1de4..1189fd8f86aa 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2 ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; + mainProgram = "xwinmosaic"; }; } diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index e5bc5743c28d..d36d2c51de5e 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://shantanugoel.com/2008/09/03/shantz-xwinwrap/"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; + mainProgram = "xwinwrap"; }; } diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index 7ba6bbee223d..0e368651000d 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; + mainProgram = "xzoom"; }; } diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 485146a6ae26..eb713b56a050 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.184"; + version = "3.0.186"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-VqHyTwSSBAWbeWjQc1RU5mWTqIA2CJDcL83ElaS++5E="; + sha256 = "sha256-Uz34+Z9JH9clAFwbTn8RXxokv0yMD05lrYGexUQwmjo="; }; - vendorHash = "sha256-JrzN9ycc3obxOX8NYM1cQ9AfKKPXffugCsiAxEHVBr0="; + vendorHash = "sha256-9vrfctA1r0eheCBU0CeTgjs/JVt4CB3o3n5KVeFuaRI="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/lxd/package.json b/pkgs/tools/admin/lxd/package.json deleted file mode 100644 index e30b269605ee..000000000000 --- a/pkgs/tools/admin/lxd/package.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "lxd-ui", - "version": "0.0.1", - "author": "Canonical Webteam", - "license": "LGPL-3.0-only", - "scripts": { - "clean": "rm -rf node_modules yarn-error.log *.log build/ .jekyll-metadata .bundle playwright-report test-results haproxy-local.cfg", - "build-html": "cp build/ui/index.html build/index.html", - "build": "npx vite build && yarn build-html", - "format-js-eslint": "eslint 'src/**/*.{json,jsx,tsx,ts}' 'tests/**/*.ts' --fix", - "format-js-prettier": "prettier 'src/**/*.{json,jsx,tsx,ts}' 'tests/**/*.ts' --write", - "format-js": "yarn format-js-eslint && yarn format-js-prettier", - "lint-scss": "stylelint 'src/**/*.scss'", - "lint-js-eslint": "eslint 'src/**/*.{json,tsx,ts}' 'tests/**/*.ts' .eslintrc.js babel.config.js", - "lint-js-prettier": "prettier 'src/**/*.{json,tsx,ts}' 'tests/**/*.ts' .eslintrc.js babel.config.js --check", - "lint-js": "yarn lint-js-eslint && yarn lint-js-prettier", - "hooks-add": "husky install", - "hooks-remove": "husky uninstall", - "start": "concurrently --kill-others --raw 'vite | grep -v localhost' 'yarn serve'", - "serve": "./entrypoint", - "test-js": "react-scripts test src/ --watchAll=false"}, - "dependencies": { - "@canonical/react-components": "0.47.0", - "@monaco-editor/react": "^4.4.6", - "@tanstack/react-query": "^4.14.5", - "@use-it/event-listener": "^0.1.7", - "axios": "1.3.2", - "cytoscape": "3.23.0", - "cytoscape-popper": "2.0.0", - "formik": "2.2.9", - "js-yaml": "4.1.0", - "lodash.isequal": "4.5.0", - "node-forge": "1.3.1", - "parse-prometheus-text-format": "1.1.1", - "react": "18.2.0", - "react-cytoscapejs": "2.0.0", - "react-dom": "18.2.0", - "react-router-dom": "6.6.1", - "react-scripts": "5.0.1", - "react-useportal": "^1.0.17", - "serve": "14.1.2", - "vanilla-framework": "4.3.0", - "xterm-addon-fit": "0.6.0", - "xterm-for-react": "1.0.4", - "yup": "0.32.11" - }, - "devDependencies": { - "@babel/core": "7.20.7", - "@babel/eslint-parser": "7.19.1", - "@babel/preset-env": "7.20.2", - "@babel/preset-react": "7.18.6", - "@babel/preset-typescript": "7.18.6", - "@playwright/test": "^1.29.1", - "@types/cytoscape-popper": "2.0.0", - "@types/node-forge": "1.3.1", - "@types/react": "18.0.26", - "@types/react-cytoscapejs": "1.2.2", - "@types/react-dom": "18.0.10", - "@types/react-router-dom": "5.3.3", - "@types/websocket": "1.0.5", - "@typescript-eslint/eslint-plugin": "5.48.0", - "@typescript-eslint/parser": "5.48.0", - "@vitejs/plugin-react": "^3.1.0", - "autoprefixer": "10.4.13", - "babel-loader": "9.1.0", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "concurrently": "7.6.0", - "css-loader": "6.7.3", - "eslint": "8.31.0", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-react": "7.31.11", - "husky": "8.0.0", - "lint-staged": "13.1.1", - "monaco-editor": "0.36.1", - "postcss": "8.4.20", - "postcss-cli": "10.1.0", - "prettier": "2.8.1", - "sass": "1.57.1", - "sass-loader": "13.2.0", - "style-loader": "3.3.1", - "stylelint": "15.10.1", - "stylelint-config-prettier": "9.0.4", - "stylelint-config-standard-scss": "6.1.0", - "stylelint-order": "5.0.0", - "stylelint-prettier": "2.0.0", - "stylelint-scss": "4.3.0", - "ts-loader": "9.4.2", - "typescript": "4.9.4", - "vite": "^4.1.0", - "vite-tsconfig-paths": "4.0.5" - }, - "lint-staged": { - "src/**/*.{json,jsx,ts,tsx}": [ - "eslint", - "prettier --check" - ], - "tests/**/*.{json,jsx,ts,tsx}": [ - "eslint", - "prettier --check" - ], - "src/**/*.scss": "stylelint" - } -} diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index b0582ef99969..c248199b4ad7 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -1,35 +1,61 @@ -{ mkYarnPackage +{ lib +, stdenv , fetchFromGitHub , fetchYarnDeps -, lib +, nodejs +, prefetch-yarn-deps +, yarn }: -mkYarnPackage rec { +stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - sha256 = "sha256-DygWNktangFlAqinBm6wWsRLGmX6yjhmRJ2iU0yjcgk="; + hash = "sha256-l9Fp/Vm7NxMCp5QcM8+frFyfahhPG7TyF6NhfU1SEaA="; }; - packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-B1SVCViX1LEFoBLMdFk9qaoayku7Y+zU5c4JEJkLmwE="; + hash = "sha256-R6OeaBC6xBHa229YGyc2LDjjenwvS805PW8ueU/o99I="; }; + nativeBuildInputs = [ + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + yarn --offline build + + runHook postBuild ''; installPhase = '' - cp -rv deps/lxd-ui/build/ui/ $out - ''; + runHook preInstall - doDist = false; + cp -r build/ui/ $out + + runHook postInstall + ''; meta = { description = "Web user interface for LXD."; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 249b4ba1706c..c91457231716 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; platforms = platforms.unix; maintainers = [ maintainers.dotlambda ]; + mainProgram = "abcm2ps"; }; } diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix index 161e9848bea6..8658dfb5a7aa 100644 --- a/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = with platforms; linux; + mainProgram = "accuraterip-checksum"; }; } diff --git a/pkgs/tools/audio/acousticbrainz-client/default.nix b/pkgs/tools/audio/acousticbrainz-client/default.nix index 651605679684..1d4b59ed2c92 100644 --- a/pkgs/tools/audio/acousticbrainz-client/default.nix +++ b/pkgs/tools/audio/acousticbrainz-client/default.nix @@ -37,5 +37,6 @@ python3Packages.buildPythonApplication rec { # essentia-extractor is only available for those platforms platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ ]; + mainProgram = "abzsubmit"; }; } diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index 11dc8541c5b9..a5fff36322e4 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ edbentley ]; + mainProgram = "audiowaveform"; }; } diff --git a/pkgs/tools/audio/bark/default.nix b/pkgs/tools/audio/bark/default.nix index f943b555b010..e866b1a18a3b 100644 --- a/pkgs/tools/audio/bark/default.nix +++ b/pkgs/tools/audio/bark/default.nix @@ -24,6 +24,7 @@ rustPlatform.buildRustPackage { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ samw ]; platforms = lib.platforms.linux; + mainProgram = "bark"; }; } diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 02460f61d93b..85c707bda90c 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -152,5 +152,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; + mainProgram = "botamusique"; }; } diff --git a/pkgs/tools/audio/catnip-gtk4/default.nix b/pkgs/tools/audio/catnip-gtk4/default.nix index 2175edb0c523..da677d71bc03 100644 --- a/pkgs/tools/audio/catnip-gtk4/default.nix +++ b/pkgs/tools/audio/catnip-gtk4/default.nix @@ -39,5 +39,6 @@ buildGoModule { homepage = "https://github.com/diamondburned/catnip-gtk4"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; + mainProgram = "catnip-gtk4"; }; } diff --git a/pkgs/tools/audio/catnip/default.nix b/pkgs/tools/audio/catnip/default.nix index de299738242e..de8a609dfd61 100644 --- a/pkgs/tools/audio/catnip/default.nix +++ b/pkgs/tools/audio/catnip/default.nix @@ -46,5 +46,6 @@ buildGoModule rec { changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "catnip"; }; } diff --git a/pkgs/tools/audio/dsp/default.nix b/pkgs/tools/audio/dsp/default.nix index e17e211d3402..8c218ab70e8e 100644 --- a/pkgs/tools/audio/dsp/default.nix +++ b/pkgs/tools/audio/dsp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.isc; maintainers = with maintainers; [ aaronjheng ]; platforms = platforms.linux; + mainProgram = "dsp"; }; }) diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/tools/audio/essentia-extractor/default.nix index 4fbdd02e4404..de3bf45d10c5 100644 --- a/pkgs/tools/audio/essentia-extractor/default.nix +++ b/pkgs/tools/audio/essentia-extractor/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "streaming_extractor_music"; }; } diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index e15a048b991c..1e552d64cfaa 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bennofs ]; + mainProgram = "gvolicon"; }; } diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix index bed9c415c83b..40005ea9a6e1 100644 --- a/pkgs/tools/audio/headset-charge-indicator/default.nix +++ b/pkgs/tools/audio/headset-charge-indicator/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ zebreus ]; license = licenses.bsd2; + mainProgram = "headset-charge-indicator.py"; }; } diff --git a/pkgs/tools/audio/linuxwave/default.nix b/pkgs/tools/audio/linuxwave/default.nix index 98860675dafc..4d86b31c854e 100644 --- a/pkgs/tools/audio/linuxwave/default.nix +++ b/pkgs/tools/audio/linuxwave/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; inherit (zig_0_10.meta) platforms; + mainProgram = "linuxwave"; }; }) diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/tools/audio/mictray/default.nix index e757bac96682..d93423e66b49 100644 --- a/pkgs/tools/audio/mictray/default.nix +++ b/pkgs/tools/audio/mictray/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.anpryl ]; + mainProgram = "mictray"; }; } diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix index ec55367474f5..8ff97968b000 100644 --- a/pkgs/tools/audio/midimonster/default.nix +++ b/pkgs/tools/audio/midimonster/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [keldu]; + mainProgram = "midimonster"; }; } diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix index dbcc458164de..5819eb281b2f 100644 --- a/pkgs/tools/audio/mp3cat/default.nix +++ b/pkgs/tools/audio/mp3cat/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.omnipotententity ]; platforms = platforms.all; + mainProgram = "mp3cat"; }; } diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 786f5c062daa..17bc6c6e419f 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/JakeStanger/mpd-discord-rpc/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kranzes ]; + mainProgram = "mpd-discord-rpc"; }; } diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index f530ffc5d664..dcf1e467300e 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { homepage = "https://github.com/natsukagami/mpd-mpris"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "mpd-mpris"; }; } diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index 03b632ae7e0e..845056c61414 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ CaitlinDavitt ]; platforms = platforms.unix; + mainProgram = "mpd-notification"; }; } diff --git a/pkgs/tools/audio/mpd-sima/default.nix b/pkgs/tools/audio/mpd-sima/default.nix index 0da82ea0b9aa..b123d2828c4c 100644 --- a/pkgs/tools/audio/mpd-sima/default.nix +++ b/pkgs/tools/audio/mpd-sima/default.nix @@ -34,5 +34,6 @@ buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ apfelkuchen6 ]; + mainProgram = "mpd-sima"; }; } diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index 8b12b6fc16d7..04251854d48d 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.taketwo ]; platforms = platforms.all; + mainProgram = "mpdas"; }; } diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index fd8618d6243d..fd4b60f13e05 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -50,5 +50,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "mpDris2"; }; } diff --git a/pkgs/tools/audio/nanotts/default.nix b/pkgs/tools/audio/nanotts/default.nix index a68f1593b646..41214ffe9206 100644 --- a/pkgs/tools/audio/nanotts/default.nix +++ b/pkgs/tools/audio/nanotts/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { license = lib.licenses.asl20; maintainers = [ lib.maintainers.strikerlulu ]; platforms = lib.platforms.linux; + mainProgram = "nanotts"; }; } diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index c01088466599..20708e82729d 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ exlevan kamilchm ]; platforms = platforms.linux; + mainProgram = "pasystray"; }; } diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix index ff7b55689b8f..e6800d943725 100644 --- a/pkgs/tools/audio/patray/default.nix +++ b/pkgs/tools/audio/patray/default.nix @@ -38,5 +38,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/pohmelie/patray"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; + mainProgram = "patray"; }; } diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index 137fa838c629..0b470aca5f94 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = [ lib.maintainers.canndrew ]; platforms = lib.platforms.linux; + mainProgram = "pico2wave"; }; }) diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index ec55b78c4f8b..1f565b747529 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/rhasspy/piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + mainProgram = "piper"; }; }) diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index da4654a3e5fc..a65cad09b47d 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ campadrenalin romildo ]; + mainProgram = "pnmixer"; }; } diff --git a/pkgs/tools/audio/pw-volume/default.nix b/pkgs/tools/audio/pw-volume/default.nix index 1a7b6c21a502..13e39484b577 100644 --- a/pkgs/tools/audio/pw-volume/default.nix +++ b/pkgs/tools/audio/pw-volume/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ astro figsoda ]; platforms = platforms.linux; + mainProgram = "pw-volume"; }; } diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index 9f3fcf05b5fa..89ed5f983973 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rvolosatovs ]; + mainProgram = "stt"; }; } diff --git a/pkgs/tools/audio/tidal-dl/default.nix b/pkgs/tools/audio/tidal-dl/default.nix index 2e8ba35e8ce4..eb23a4da3ccd 100644 --- a/pkgs/tools/audio/tidal-dl/default.nix +++ b/pkgs/tools/audio/tidal-dl/default.nix @@ -21,5 +21,6 @@ buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.misterio77 ]; platforms = lib.platforms.all; + mainProgram = "tidal-dl"; }; } diff --git a/pkgs/tools/audio/unflac/default.nix b/pkgs/tools/audio/unflac/default.nix index 9fc44469fec9..41068d479706 100644 --- a/pkgs/tools/audio/unflac/default.nix +++ b/pkgs/tools/audio/unflac/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ felipeqq2 ]; + mainProgram = "unflac"; }; } diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 2c2ea77de6e7..3d8661da3cab 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -31,5 +31,6 @@ in pythonPackages.buildPythonApplication rec { license = licenses.gpl3Only; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "v2m.py"; }; } diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index e0a80f90a719..0d33c586ed37 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -53,5 +53,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; + mainProgram = "volctl"; }; } diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 00690d016329..cabd145cc6e0 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; license = licenses.gpl3; + mainProgram = "volumeicon"; }; } diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index dd928ab3e418..452af0a18b40 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -45,5 +45,6 @@ python3.pkgs.buildPythonApplication { changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; + mainProgram = "whisper-ctranslate2"; }; } diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 06bca00fc5b0..41d32cd282a5 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = yabridge.meta.platforms; + mainProgram = "yabridgectl"; }; } diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/tools/filesystems/dupe-krill/default.nix index d825c1b0fb09..ee81db5c8707 100644 --- a/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/pkgs/tools/filesystems/dupe-krill/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kornelski/dupe-krill"; license = with licenses; [ mit ]; maintainers = with maintainers; [ urbas ]; + mainProgram = "dupe-krill"; }; } diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/tools/filesystems/dysk/default.nix index 7ab7d544ab08..2dc4698f8172 100644 --- a/pkgs/tools/filesystems/dysk/default.nix +++ b/pkgs/tools/filesystems/dysk/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Canop/dysk/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda koral ]; + mainProgram = "dysk"; }; } diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index dff1700d73fc..a3f7378c205c 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sersorrel ]; platforms = platforms.linux; + mainProgram = "eiciel"; }; } diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/tools/filesystems/envfs/default.nix index ceb6c0412e30..ab47aeb550de 100644 --- a/pkgs/tools/filesystems/envfs/default.nix +++ b/pkgs/tools/filesystems/envfs/default.nix @@ -1,14 +1,14 @@ { rustPlatform, lib, fetchFromGitHub, nixosTests }: rustPlatform.buildRustPackage rec { pname = "envfs"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; rev = version; - hash = "sha256-ttW1NUCtwnjAoiu7QgLGrlAB2PyY4oXm91LpWhbz8qk="; + hash = "sha256-MfKOfI21sRNEBX+v0Wto1YhzrPu3JI7Q4AU333utGpk="; }; - cargoHash = "sha256-BgXKwKD6w/GraBQEq61D7S7m2Q9TnkXNFJEIgDYo9L4="; + cargoHash = "sha256-vMXmv8p839EPLCwX6So5ebgr5Z68AqdSaLiWqDoBAt4="; passthru.tests = { envfs = nixosTests.envfs; diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index ed9fa6df969b..bb23f58c38c6 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; + mainProgram = "ext4magic"; }; } diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 276f6139b794..0c3062fb11ca 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; + mainProgram = "extundelete"; }; } diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 8f258a79f7de..80f7e5ecd4ae 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ya-mouse/fatresize"; platforms = platforms.linux; license = licenses.gpl3; + mainProgram = "fatresize"; }; } diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index ef7111dd72ff..d1604e49a32e 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "fatsort"; }; } diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 133f446f8a98..8bc7a899cd3b 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -26,5 +26,6 @@ perlPackages.buildPerlPackage { description = "Perl extension for renaming multiple files"; license = licenses.artistic1; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "rename"; }; } diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index dad5d2dd9e6c..86db1f4872a4 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; license = licenses.gpl3Plus; + mainProgram = "fuse-7z-ng"; }; } diff --git a/pkgs/tools/filesystems/fuse-archive/default.nix b/pkgs/tools/filesystems/fuse-archive/default.nix index 031232acbe38..58f48a264498 100644 --- a/pkgs/tools/filesystems/fuse-archive/default.nix +++ b/pkgs/tools/filesystems/fuse-archive/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/google/fuse-archive/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ icyrockcom ]; + mainProgram = "fuse-archive"; }; inherit (fuse.meta) platforms; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index b417c9654292..6afbda9f27cd 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; platforms = platforms.linux; inherit (src.meta) homepage; + mainProgram = "fuse-overlayfs"; }; } diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 7e44e7c15f9c..b731e9c7cc96 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/fuseiso"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "fuseiso"; }; } diff --git a/pkgs/tools/filesystems/fwanalyzer/default.nix b/pkgs/tools/filesystems/fwanalyzer/default.nix index a0b1d2df1435..26fd45fa90ea 100644 --- a/pkgs/tools/filesystems/fwanalyzer/default.nix +++ b/pkgs/tools/filesystems/fwanalyzer/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://github.com/cruise-automation/fwanalyzer"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "fwanalyzer"; }; } diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index fe72905d0fbe..894840d2dd04 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -73,6 +73,7 @@ let maintainers = with lib.maintainers; [ nickcao _0x4A6F teutat3s raitobezarius ]; knownVulnerabilities = (lib.optional eol "Garage version ${version} is EOL"); inherit broken; + mainProgram = "garage"; }; }; in diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index ecd77781d39b..b640c99dc82f 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; + mainProgram = "genext2fs"; }; } diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 0961ad904f3f..ab93f4233d8f 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; + mainProgram = "genimage"; }; } diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 3427ce54a172..6c40c4ad94cd 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.all; + mainProgram = "genromfs"; }; } diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index f49f555983f3..c5e388fc5ffb 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -39,5 +39,6 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.robbinch ]; + mainProgram = "gitfs"; }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index f82e5b7c362a..f3ed4fb6ab98 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; + mainProgram = "go-mtpfs"; }; } diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index 0c250eaeb4f4..30c78ad31993 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -31,6 +31,7 @@ buildGoModule { license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + mainProgram = "goofys"; }; } diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix index eafbe066ac94..a8466d3462e8 100644 --- a/pkgs/tools/filesystems/gpart/default.nix +++ b/pkgs/tools/filesystems/gpart/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "gpart"; }; } diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index d5a19f42f3f0..41afc98e7f94 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vitalif/grive2"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "grive"; }; } diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 31ea85532462..3a36af72462e 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -37,5 +37,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/kimono-koans/httm/releases/tag/${version}"; license = licenses.mpl20; maintainers = with maintainers; [ wyndon ]; + mainProgram = "httm"; }; } diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/tools/filesystems/httpdirfs/default.nix index e027d5dd8df5..6163e1a0158a 100644 --- a/pkgs/tools/filesystems/httpdirfs/default.nix +++ b/pkgs/tools/filesystems/httpdirfs/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ sbruder schnusch ]; platforms = platforms.unix; + mainProgram = "httpdirfs"; }; } diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index 010aeaefabf3..8f2e1f2a6ffb 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; + mainProgram = "ifuse"; }; } diff --git a/pkgs/tools/filesystems/ioztat/default.nix b/pkgs/tools/filesystems/ioztat/default.nix index b28f0a36661b..b5f949ad4f2c 100644 --- a/pkgs/tools/filesystems/ioztat/default.nix +++ b/pkgs/tools/filesystems/ioztat/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = with platforms; linux ++ freebsd; maintainers = with maintainers; [ numinit ]; + mainProgram = "ioztat"; }; } diff --git a/pkgs/tools/filesystems/jefferson/default.nix b/pkgs/tools/filesystems/jefferson/default.nix index 762541f8d27a..948de453ec18 100644 --- a/pkgs/tools/filesystems/jefferson/default.nix +++ b/pkgs/tools/filesystems/jefferson/default.nix @@ -37,5 +37,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/onekey-sec/jefferson"; license = licenses.mit; maintainers = with maintainers; [ tnias vlaci ]; + mainProgram = "jefferson"; }; } diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 2754d223a6ba..6c5dd3d30c70 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.coconnor ]; + mainProgram = "jmtpfs"; }; } diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix index 6712b96f7fdd..200705098409 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.symphorien ]; license = licenses.gpl3Only; platforms = platforms.linux; + mainProgram = "kdiskmark"; }; } diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index debac18310dc..f5235239103d 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mergerfs-tools"; - version = "20190411"; + version = "20230912"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; - rev = "6e41fc5848c7cc4408caea86f3991c8cc2ac85a1"; - sha256 = "0izswg6bya13scvb37l3gkl7mvi8q7l11p4hp4phdlcwh9jvdzcj"; + rev = "80d6c9511da554009415d67e7c0ead1256c1fc41"; + hash = "sha256-9sn2ziIjes2squSGbjjXVch2zDFjQruWB4282p4jWcY="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/trapexit/mergerfs-tools"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 2cc6f69bb0ba..58986c25dbf2 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "Combines a several mount points into the single one"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.makefu ]; + mainProgram = "mhddfs"; }; } diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix index 30312ec7dc7b..2b0e2cdadb37 100644 --- a/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/igrr/mkspiffs"; maintainers = with maintainers; [ haslersn ]; platforms = platforms.linux; + mainProgram = "mkspiffs"; }; } diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix index 74d9b1d370b8..c3fea94f42f5 100644 --- a/pkgs/tools/filesystems/mount-zip/default.nix +++ b/pkgs/tools/filesystems/mount-zip/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3; maintainers = with maintainers; [ arti5an ]; platforms = platforms.linux; + mainProgram = "mount-zip"; }; }) diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 6f872500e6b1..0412a99beee0 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ Luflosi ]; + mainProgram = "mp3fs"; }; } diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 0a6623bfdc4a..d84f9cc9b9b1 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.qknight ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin + mainProgram = "mtpfs"; }; } diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index c363ee561374..59724c0c7c52 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.wmertens ]; platforms = platforms.all; + mainProgram = "rdfind"; }; } diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix index ace05d061665..5d3a6a340dbb 100644 --- a/pkgs/tools/filesystems/rmfuse/default.nix +++ b/pkgs/tools/filesystems/rmfuse/default.nix @@ -45,5 +45,6 @@ python3.pkgs.buildPythonApplication rec { system. ''; maintainers = with lib.maintainers; [ adisbladis ]; + mainProgram = "rmfuse"; }; } diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 1d8ced17aae0..ec4bb1392712 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.luis ]; platforms = platforms.linux; + mainProgram = "rmount"; }; } diff --git a/pkgs/tools/filesystems/rnm/default.nix b/pkgs/tools/filesystems/rnm/default.nix index 69ba0270ecc0..479feabb8ebc 100644 --- a/pkgs/tools/filesystems/rnm/default.nix +++ b/pkgs/tools/filesystems/rnm/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog"; platforms = lib.platforms.all; license = licenses.gpl3Only; + mainProgram = "rnm"; }; } diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix index 0304508d41eb..cc711e57cdb6 100644 --- a/pkgs/tools/filesystems/romdirfs/default.nix +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ ]; + mainProgram = "romdirfs"; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index bfe9f2274756..3585408a2f7d 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "s3backer"; }; } diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix index bafa39272727..76eb667bceaa 100644 --- a/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/pkgs/tools/filesystems/sandboxfs/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bazelbuild/sandboxfs"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ jeremyschlatter ]; + mainProgram = "sandboxfs"; }; } diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 258814b8905b..f8d66683fccb 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.pamplemousse ]; platforms = platforms.linux; + mainProgram = "sasquatch"; }; } diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/tools/filesystems/sdat2img/default.nix index 4176eabad401..93493356eb51 100644 --- a/pkgs/tools/filesystems/sdat2img/default.nix +++ b/pkgs/tools/filesystems/sdat2img/default.nix @@ -22,5 +22,6 @@ python3Packages.buildPythonApplication { license = lib.licenses.mit; maintainers = [ lib.maintainers.xaverdh ]; platforms = lib.platforms.unix; + mainProgram = "sdat2img"; }; } diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 791c01d8eed8..fe148e955cb2 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ bsd2 mit ]; platforms = platforms.unix; + mainProgram = "securefs"; }; } diff --git a/pkgs/tools/filesystems/sftpman/default.nix b/pkgs/tools/filesystems/sftpman/default.nix index 267b2b649c30..579c03992dde 100644 --- a/pkgs/tools/filesystems/sftpman/default.nix +++ b/pkgs/tools/filesystems/sftpman/default.nix @@ -21,5 +21,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ contrun ]; + mainProgram = "sftpman"; }; } diff --git a/pkgs/tools/filesystems/simple-mtpfs/default.nix b/pkgs/tools/filesystems/simple-mtpfs/default.nix index 3cb2aa97007b..994b785c444e 100644 --- a/pkgs/tools/filesystems/simple-mtpfs/default.nix +++ b/pkgs/tools/filesystems/simple-mtpfs/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ laalsaas ]; + mainProgram = "simple-mtpfs"; }; } diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index a1831d44ada4..120b30cbb1d1 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; homepage = "https://sourceforge.net/projects/smbnetfs/"; + mainProgram = "smbnetfs"; }; } diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index d945a4a40094..3afabf8cd643 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.makefu ]; platforms = lib.platforms.unix; + mainProgram = "snapraid"; }; } diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index e927f2daf256..3a1838ef303e 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -44,5 +44,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://stratis-storage.github.io"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + mainProgram = "stratis"; }; } diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index e892d89dc3b3..8aa66de8da3f 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.unix; + mainProgram = "svnfs"; }; } diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 2168bc1aa312..2d5a5f2ef9ff 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { description = "Convert a tar archive to an ext4 image"; maintainers = with maintainers; [ qyliss ]; license = licenses.mit; + mainProgram = "tar2ext4"; }; } diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix index 6abab83b0fd0..e666c893b798 100644 --- a/pkgs/tools/filesystems/u3-tool/default.nix +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ makefu ]; + mainProgram = "u3-tool"; }; } diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 623cef884476..c038042b6871 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/nlitsme/ubidump"; license = licenses.mit; maintainers = with maintainers; [ sgo ]; + mainProgram = "ubidump"; }; } diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 29d8b4c2887b..3f8897c091bc 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; description = "User-space filesystem that allows to mount a webdav share"; platforms = platforms.unix; + mainProgram = "wdfs"; }; } diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/tools/filesystems/wipefreespace/default.nix index f9d586d91d68..bf2ddb391c86 100644 --- a/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/pkgs/tools/filesystems/wipefreespace/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ catap ]; + mainProgram = "wipefreespace"; }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 109781f612a2..94907ee4fd2f 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { * faster syncing with Disk's server; * no need to be constantly connected to work with files. ''; + mainProgram = "yandex-disk"; }; } diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 1447ca36a136..d44e92a33c46 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -29,5 +29,6 @@ in stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.theuni ]; + mainProgram = "zerofree"; }; } diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 320ccde4cc53..00d78af0146f 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ ztzg ]; license = licenses.asl20; + mainProgram = "zkfuse"; }; } diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix index 9af487b59c4e..8fced13e93db 100644 --- a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix +++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/DeterminateSystems/zpool-auto-expand-partitions"; license = licenses.asl20; maintainers = teams.determinatesystems.members; + mainProgram = "zpool_part_disks"; }; } diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix index a9e4dfe8ab74..4f546e544e66 100644 --- a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix +++ b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix @@ -37,5 +37,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/chadmiller/zpool-iostat-viz"; license = licenses.bsd2; maintainers = with maintainers; [ julm ]; + mainProgram = "zpool-iostat-viz"; }; } diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 60c81924805f..176557ca3536 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.11.2"; + version = "2023.11.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7VYGrWoElc/urs+jomJrRt0dzdmJhCenRvb9bHCl6H4="; + hash = "sha256-KIDqIf9aJP5IS+qE0Gy5j3F2DGz/WGbN4Wf9SGzgnzA="; }; postPatch = '' @@ -57,6 +57,7 @@ python.pkgs.buildPythonApplication rec { protobuf pyparsing pyserial + python-magic pyyaml requests tornado diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 8e783fc15509..df10755f14c9 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -60,6 +60,7 @@ buildGoModule rec { # Has a sneaky dependency on perl # Include first args to make sure we're patching the right thing substituteInPlace shell/key-bindings.bash \ + --replace "command -v perl" "command -v ${ourPerl}/bin/perl" \ --replace " perl -n " " ${ourPerl}/bin/perl -n " # fzf-tmux depends on bc substituteInPlace bin/fzf-tmux \ diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix index f6360061a5be..b46b25979a51 100644 --- a/pkgs/tools/misc/tailspin/default.nix +++ b/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tailspin"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; rev = version; - hash = "sha256-WsQpMmFTlAPg+9uEecMKfpys29cQ642IZ8yvsPxmCfo="; + hash = "sha256-ggh0y50yzqWQbjdP/weboEmo4CpfAGZmtt1WWLokpZ8="; }; - cargoHash = "sha256-sttQ8fGRGdq7nDiG3/z/YEg2NA+miTwahGNv3yNnnds="; + cargoHash = "sha256-R67bHDGFxCStKKHTR820r0CjbrqjQ6evtnBMaqCDRYM="; meta = with lib; { description = "A log file highlighter"; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 4a2d96352c1b..dd088b1ec539 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "hysteria"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-3ovJVo3Jqkq067XgDMxW5efCp6Ivfex4LbuUyR0cB8s="; + hash = "sha256-5j24wIZ4LloE9t0sv5p+oiYmexOaORASNN9JylXxrk4="; }; vendorHash = "sha256-ErU1yEtSuMVkoJv9hyaE4OZS5o7GxuleoK0Q9BI2skw="; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index b9a9aa78d6fc..0cd954cca380 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-/gSQiBlcOeQQud8rXPIjY88+jjC0/6S+OTmFqhQxQVM="; + hash = "sha256-r/2P0QeILO0t5GIXD6yrqdUdOpPzNfBIniPhKdlJ+0g="; }; - vendorHash = "sha256-mSK5qQqPd6pTDLIBUa2MK8nNdi1VzNRU+GEaW+lGLpY="; + vendorHash = "sha256-FTr36gndWTrpEKo7KXdZJIR7aM0jrEOTFm1JlxokRaw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index 315d58403825..25aada6e3c44 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 31c004986355..8050909487da 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz mkg20001 ]; }; } diff --git a/pkgs/tools/networking/wg-friendly-peer-names/default.nix b/pkgs/tools/networking/wg-friendly-peer-names/default.nix index eaa8efbcebdb..ebbd898576d3 100644 --- a/pkgs/tools/networking/wg-friendly-peer-names/default.nix +++ b/pkgs/tools/networking/wg-friendly-peer-names/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "wg-friendly-peer-names"; - version = "unstable-2021-11-08"; + version = "unstable-2021-12-10"; src = fetchFromGitHub { owner = "FlyveHest"; repo = "wg-friendly-peer-names"; - rev = "66b9b6b74ec77b9fec69b2a58296635321d4f5f1"; - sha256 = "pH/b5rCHIqLxz/Fnx+Dm0m005qAUWBsczSU9vGEQ2RQ="; + rev = "b0c3e1a95c843dc9c6432895105b839ef9b362fc"; + hash = "sha256-aGxrABmR+aQO35RYo/zI2037clnGOW0Tr16p7M1fQqc="; }; installPhase = '' diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 9418244212ac..541787942a0e 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,28 @@ -{ stdenv, lib -, pkg-config, autoreconfHook, pandoc -, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd, libcap +{ stdenv +, lib +, pkg-config +, autoreconfHook +, pandoc +, fetchurl +, cpio +, zlib +, bzip2 +, file +, elfutils +, libbfd +, libgcrypt +, libarchive +, nspr +, nss +, popt +, db +, xz +, python +, lua +, llvmPackages +, sqlite +, zstd +, libcap }: stdenv.mkDerivation rec { @@ -18,8 +39,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config pandoc ]; buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp - ++ lib.optional stdenv.isLinux libcap; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ++ lib.optional stdenv.isLinux libcap; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] @@ -72,5 +93,8 @@ stdenv.mkDerivation rec { description = "The RPM Package Manager"; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux; + # Support for darwin was removed in https://github.com/NixOS/nixpkgs/pull/196350. + # This can be re-enables for apple_sdk.version >= 13.0. + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 89d1850c4430..25b866285e95 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.6.1"; + version = "9.8.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-aFQStXwoko2YA77d+H76AScNCNqC56CyJe5cz74SYdg="; + hash = "sha256-XxjFmFU6G7pTJCkWUYadFTEAQh5HZigfvUNoNNw1DOM="; }; proxyVendor = true; - vendorHash = "sha256-fOSFOUrcxw/77vgPziigkSea93xR2k0Tr/cMGtX+3tc="; + vendorHash = "sha256-Ykb1dmvdOgOBqgsCJbLGwUbbMfsao0is95g8a2chVME="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock index f381f2979312..31879866de58 100644 --- a/pkgs/tools/text/difftastic/Cargo.lock +++ b/pkgs/tools/text/difftastic/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -28,7 +28,7 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5c2ca00549910ec251e3bd15f87aeeb206c9456b9a77b43ff6c97c54042a472" dependencies = [ - "bstr", + "bstr 0.2.17", "doc-comment", "predicates", "predicates-core", @@ -42,7 +42,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -60,6 +60,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "bstr" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -67,7 +73,17 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", +] + +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "serde", ] [[package]] @@ -104,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", "indexmap", "lazy_static", @@ -190,11 +206,11 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags", + "bitflags 2.4.1", "crossterm_winapi", "libc", "mio", @@ -206,9 +222,9 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi", ] @@ -237,7 +253,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.52.0" +version = "0.53.0" dependencies = [ "assert_cmd", "bumpalo", @@ -248,12 +264,15 @@ dependencies = [ "glob", "hashbrown 0.12.3", "humansize", + "ignore", + "is-terminal", "itertools 0.11.0", "lazy_static", "libc", "libmimalloc-sys", "line-numbers", "log", + "memchr", "mimalloc", "owo-colors", "predicates", @@ -272,7 +291,6 @@ dependencies = [ "typed-arena", "unicode-width", "version_check", - "walkdir", "wu-diff", ] @@ -290,18 +308,28 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", ] [[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "fixedbitset" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -340,6 +368,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr 1.6.0", + "fnv", + "log", + "regex", +] + +[[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -370,6 +411,12 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] name = "humansize" version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -380,11 +427,26 @@ dependencies = [ [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "ignore" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ - "quick-error", + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", ] [[package]] @@ -398,6 +460,29 @@ dependencies = [ ] [[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.3", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.3", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] name = "itertools" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -429,9 +514,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" @@ -450,9 +535,15 @@ dependencies = [ [[package]] name = "line-numbers" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793a75315eb63b8699158825bdea85d63eeb850e7543cb834abef3c7b5b53780" +checksum = "7b25f5068853805faa3c19f44d0c401446e4eb3f47cc808fa331eec30f0ba35c" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" @@ -512,7 +603,7 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -546,7 +637,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -597,7 +688,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -654,9 +745,9 @@ dependencies = [ [[package]] name = "pretty_env_logger" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ "env_logger", "log", @@ -672,12 +763,6 @@ dependencies = [ ] [[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] name = "quote" version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -720,17 +805,18 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.3.7", "regex-syntax", ] @@ -741,10 +827,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] +name = "regex-automata" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -753,6 +850,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[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", + "windows-sys 0.48.0", +] + +[[package]] name = "rustversion" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -812,9 +923,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -931,6 +1042,16 @@ dependencies = [ ] [[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] name = "tree-sitter" version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1045,13 +1166,37 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[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]] @@ -1061,42 +1206,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[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_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[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_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[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_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[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_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] name = "wu-diff" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 98c3db975edc..94fd1fe96077 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -17,13 +17,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-ve5oUvclHGgw56UEIuEQ0tSdzad94MfL6qzc2hoB0dw="; + hash = "sha256-fLn+Ibe6i6pI6yDCWkDAUMl2wOVSFXBCqidT6iNCSGM="; }; cargoLock = { @@ -33,6 +33,11 @@ rustPlatform.buildRustPackage rec { }; }; + # skip flaky tests + checkFlags = [ + "--skip=options::tests::test_detect_display_width" + ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. env = lib.optionalAttrs stdenv.cc.isClang { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index a8acf6f1aa42..ff034c853a7a 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-GYqIunSApnBfct+olre0eGy8KuOtbaiPvW0tQIcBRLQ="; + hash = "sha256-rA6qgjzlR7a7bf5v2q1vMx1QXcKgnK5wK1Ix9CfbPro="; }; buildInputs = [ diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix index 95cfaea90e43..c06efa3617f0 100644 --- a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix +++ b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qyliss ]; license = licenses.mit; platforms = platforms.unix; + mainProgram = "alpine-make-vm-image"; }; } diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index fa74aa26cec3..16b43012e260 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ Scriptkiddi ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "ecs-cli"; }; } diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 3619d2f25a14..a1a0cfde0fe7 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -69,5 +69,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ megheaiulian ]; platforms = platforms.linux; + mainProgram = "distrobuilder"; }; } diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index 894622d74eb0..71ba276f4bd4 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.erikarvstedt ]; + mainProgram = "extra-container"; }; } diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index a2c37dfb679e..18d5a83a591d 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/vmware/govmomi/tree/master/govc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nicknovitski ]; + mainProgram = "govc"; }; } diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index 174fe292f459..c10b6887aeec 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://jumppad.dev"; license = licenses.mpl20; maintainers = with maintainers; [ cpcloud ]; + mainProgram = "jumppad"; }; } diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index a9e49cc75c34..67027dc4bd28 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -49,5 +49,6 @@ buildGoModule rec { homepage = "https://kubevirt.io/"; license = licenses.asl20; maintainers = with maintainers; [ haslersn ]; + mainProgram = "virtctl"; }; } diff --git a/pkgs/tools/virtualization/lxd-image-server/default.nix b/pkgs/tools/virtualization/lxd-image-server/default.nix index aeb6ac336932..43f46a8a72fc 100644 --- a/pkgs/tools/virtualization/lxd-image-server/default.nix +++ b/pkgs/tools/virtualization/lxd-image-server/default.nix @@ -46,5 +46,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; + mainProgram = "lxd-image-server"; }; } diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index e8f27e00d851..85576b4f6640 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "CLI tool for Marathon"; license = licenses.mit; maintainers = with maintainers; [ manveru ]; + mainProgram = "marathonctl"; }; } diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index ccc79d36c8f6..7372d51a62fa 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "https://github.com/mininet/mininet"; maintainers = with maintainers; [ teto ]; + mainProgram = "mnexec"; }; } diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/tools/virtualization/nixos-shell/default.nix index 59225a5162e3..6f7340835523 100644 --- a/pkgs/tools/virtualization/nixos-shell/default.nix +++ b/pkgs/tools/virtualization/nixos-shell/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; + mainProgram = "nixos-shell"; }; } diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/tools/virtualization/onmetal-image/default.nix index 7e324fc03cc3..2b535dfb6d93 100644 --- a/pkgs/tools/virtualization/onmetal-image/default.nix +++ b/pkgs/tools/virtualization/onmetal-image/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://github.com/onmetal/onmetal-image"; license = licenses.asl20; maintainers = with maintainers; [ ]; + mainProgram = "onmetal-image"; }; } diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index 5cc8fb01b41b..9bdf4429ff16 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -145,5 +145,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ numinit wolfangaukang ]; platforms = builtins.attrNames ovftoolSystems; + mainProgram = "ovftool"; }; } diff --git a/pkgs/tools/virtualization/reg/default.nix b/pkgs/tools/virtualization/reg/default.nix index 84aecc3ff671..545b208035b3 100644 --- a/pkgs/tools/virtualization/reg/default.nix +++ b/pkgs/tools/virtualization/reg/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { homepage = "https://github.com/genuinetools/reg"; license = licenses.mit; maintainers = with maintainers; [ ereslibre ]; + mainProgram = "reg"; }; } diff --git a/pkgs/tools/virtualization/supermin/default.nix b/pkgs/tools/virtualization/supermin/default.nix index b970b66a8f64..b7600f6bb898 100644 --- a/pkgs/tools/virtualization/supermin/default.nix +++ b/pkgs/tools/virtualization/supermin/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ qyliss ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "supermin"; }; }) diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 4fbccf813f2f..e13376211a89 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -53,6 +53,7 @@ python3Packages.buildPythonApplication rec { license = licenses.asl20; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; + mainProgram = "udocker"; }; } diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix index 9486995538ce..9d954d9ed03d 100644 --- a/pkgs/tools/virtualization/uefi-run/default.nix +++ b/pkgs/tools/virtualization/uefi-run/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Richard-W/uefi-run"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "uefi-run"; }; } diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/tools/virtualization/vpsfree-client/default.nix index 749f6820320b..cffdc267e53c 100644 --- a/pkgs/tools/virtualization/vpsfree-client/default.nix +++ b/pkgs/tools/virtualization/vpsfree-client/default.nix @@ -13,5 +13,6 @@ bundlerApp { maintainers = with maintainers; [ aither64 zimbatm ]; license = licenses.gpl3; platforms = platforms.unix; + mainProgram = "vpsfreectl"; }; } diff --git a/pkgs/tools/virtualization/xva-img/default.nix b/pkgs/tools/virtualization/xva-img/default.nix index e4f75c8ad3ca..bb5c9d5a5992 100644 --- a/pkgs/tools/virtualization/xva-img/default.nix +++ b/pkgs/tools/virtualization/xva-img/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Tool for converting Xen images to raw and back"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + mainProgram = "xva-img"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e67c8ece527c..d0da3c05db7d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -357,7 +357,6 @@ mapAliases ({ ### H ### - inherit (harePackages) hare harec; # Added 2022-08-10 haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11769b120333..e3b70de5f064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2533,8 +2533,6 @@ with pkgs; buildGoModule = buildGo120Module; }; - lefthook = callPackage ../applications/version-management/lefthook { }; - legit = callPackage ../applications/version-management/legit { }; legit-web = callPackage ../applications/version-management/legit-web { }; @@ -9128,7 +9126,8 @@ with pkgs; llvmPackages = llvmPackages_14; }; - harePackages = recurseIntoAttrs (callPackage ../development/compilers/hare { }); + harePackages = recurseIntoAttrs (callPackage ./hare-packages.nix { }); + inherit (harePackages) hare harec; ham = pkgs.perlPackages.ham; @@ -15568,8 +15567,6 @@ with pkgs; openjdk = openjdk17_headless; }; - beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { }; - bfc = callPackage ../development/compilers/bfc { }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -15751,6 +15748,10 @@ with pkgs; copper = callPackage ../development/compilers/copper { }; + corretto11 = javaPackages.compiler.corretto11; + corretto17 = javaPackages.compiler.corretto17; + corretto19 = javaPackages.compiler.corretto19; + cotton = callPackage ../development/tools/cotton { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -16933,13 +16934,10 @@ with pkgs; # https://github.com/NixOS/nixpkgs/issues/89426 rustc-wasm32 = (rustc.override { stdenv = stdenv.override { - targetPlatform = stdenv.targetPlatform // { - parsed = { - cpu.name = "wasm32"; - vendor.name = "unknown"; - kernel.name = "unknown"; - abi.name = "unknown"; - }; + targetPlatform = lib.systems.elaborate { + # lib.systems.elaborate won't recognize "unknown" as the last component. + config = "wasm32-unknown-wasi"; + rust.config = "wasm32-unknown-unknown"; }; }; }).overrideAttrs (old: { @@ -19774,12 +19772,12 @@ with pkgs; pmccabe = callPackage ../development/tools/misc/pmccabe { }; - pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf { }; + pkgconf-unwrapped = libpkgconf; + pkgconf = callPackage ../build-support/pkg-config-wrapper { pkg-config = pkgconf-unwrapped; baseBinName = "pkgconf"; }; - libpkgconf = pkgconf-unwrapped; pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { }; pkg-config = callPackage ../build-support/pkg-config-wrapper { @@ -24664,7 +24662,7 @@ with pkgs; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { - inherit lib pkgs qt6; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); @@ -28985,6 +28983,9 @@ with pkgs; zenmonitor = callPackage ../os-specific/linux/zenmonitor { }; + zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { + configFile = "user"; + }; zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { configFile = "user"; }; @@ -30859,8 +30860,6 @@ with pkgs; cyan = callPackage ../applications/graphics/cyan { }; - cyanrip = callPackage ../applications/audio/cyanrip { }; - centerim = callPackage ../applications/networking/instant-messengers/centerim { }; chatty = callPackage ../applications/networking/instant-messengers/chatty { }; @@ -31311,7 +31310,9 @@ with pkgs; oed = callPackage ../applications/editors/oed { }; - ekho = callPackage ../applications/audio/ekho { }; + ekho = callPackage ../applications/audio/ekho { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + }; electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; @@ -35044,7 +35045,11 @@ with pkgs; }; qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { - inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + inherit (__splicedPackages.qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + }; + + qutebrowser-qt5 = callPackage ../applications/networking/browsers/qutebrowser { + inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland; }; qxw = callPackage ../applications/editors/qxw { }; diff --git a/pkgs/top-level/hare-packages.nix b/pkgs/top-level/hare-packages.nix new file mode 100644 index 000000000000..c40cce493090 --- /dev/null +++ b/pkgs/top-level/hare-packages.nix @@ -0,0 +1,10 @@ +{ lib, newScope }: + +lib.makeScope newScope (self: +let + inherit (self) callPackage; +in +{ + harec = callPackage ../development/compilers/harec { }; + hare = callPackage ../development/compilers/hare { }; +}) diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index a4bafcc71dd1..ad13447fcbac 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -94,6 +94,10 @@ in { ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix; + corretto11 = callPackage ../development/compilers/corretto/11.nix { }; + corretto17 = callPackage ../development/compilers/corretto/17.nix { }; + corretto19 = callPackage ../development/compilers/corretto/19.nix { }; + openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 12ad5a678f21..7218a8ed8dda 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -546,6 +546,10 @@ in { zenpower = callPackage ../os-specific/linux/zenpower { }; + zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { + configFile = "kernel"; + inherit pkgs kernel; + }; zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { configFile = "kernel"; inherit pkgs kernel; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index a9e25eb54a8e..b1fb263e0bb8 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -266,8 +266,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP yuview = callPackage ../applications/video/yuview { }; }) // lib.optionalAttrs pkgs.config.allowAliases { - # remove after 23.11 branch-off and backport removal to 23.11 - # 23.11 will have a warning for this in `makeScope` itself + # Convert to a throw on 01-01-2023. + # Warnings show up in various cli tool outputs, throws do not. + # Remove completely before 24.05 overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; })); } diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 8490d2a20186..1cd1b731c469 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -5,17 +5,27 @@ # this file. { lib -, pkgs -, qt6 +, __splicedPackages +, makeScopeWithSplicing' +, generateSplicesForMkScope , stdenv +, pkgsHostTarget }: -(lib.makeScope pkgs.newScope ( self: - let - callPackage = self.callPackage; + pkgs = __splicedPackages; + # qt6 set should not be pre-spliced to prevent spliced packages being a part of an unspliced set + # 'pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.qt6Packages.qtbase' should not have a `__spliced` but if qt6 is pre-spliced then it will have one. + # pkgsHostTarget == pkgs + qt6 = pkgsHostTarget.qt6; in -(qt6 // { + +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt6Packages"; + f = (self: let + inherit (self) callPackage; + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; + in (noExtraAttrs qt6) // { inherit stdenv; # LIBRARIES @@ -45,4 +55,11 @@ in qt6Support = true; suffix = "qt6"; }; -}))) + + } // lib.optionalAttrs pkgs.config.allowAliases { + # Convert to a throw on 01-01-2023. + # Warnings show up in various cli tool outputs, throws do not. + # Remove completely before 24.05 + overrideScope' = lib.warn "qt6Packages now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + }); +} diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 247cbfc21e6c..58b673e50dbc 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -1168,6 +1168,17 @@ }; version = "2.0.4"; }; + gdk3 = { + dependencies = ["cairo-gobject" "gdk_pixbuf2" "pango"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dpqlsfv44bxzixh386qwz28wfynhwkp9qz97b6zjx4wjh4fg4gj"; + type = "gem"; + }; + version = "4.2.0"; + }; gdk_pixbuf2 = { dependencies = ["gio2"]; groups = ["default"]; @@ -1297,15 +1308,16 @@ }; version = "2.0.23"; }; - gtk2 = { + gtk3 = { + dependencies = ["atk" "gdk3"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09n8gz5h0d0wwrifr8c8z0b4vrd64xdi4lws8p6gpz0j0pxm5fzh"; + sha256 = "15jk1q82g6jfswmz4b20kg2nxq4yc8wpidn9si9j7n0haxph3vxy"; type = "gem"; }; - version = "3.2.6"; + version = "4.2.0"; }; haml = { dependencies = ["temple" "thor" "tilt"]; |