diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 76b71695f139..f51ca37ecf9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9085,6 +9085,12 @@ githubId = 54999; name = "Ariel Nunez"; }; + interdependence = { + email = "git@williamvandervalk.com"; + github = "interdependence"; + githubId = 45567423; + name = "William Vandervalk"; + }; Intuinewin = { email = "antoinelabarussias@gmail.com"; github = "Intuinewin"; @@ -13901,7 +13907,7 @@ name = "Maciej Kazulak"; }; mkez = { - email = "matias.zwinger+nix@protonmail.com"; + email = "matias+nix@zwinger.fi"; github = "mk3z"; githubId = 52108954; name = "Matias Zwinger"; @@ -16908,6 +16914,12 @@ githubId = 406946; name = "Valentin Lorentz"; }; + projectinitiative = { + name = "ProjectInitiative"; + github = "ProjectInitiative"; + githubId = 6314611; + keys = [ { fingerprint = "EEC7 53FC EAAA FD9E 4DC0 9BB5 CAEB 4185 C226 D76B"; } ]; + }; prominentretail = { email = "me@jakepark.me"; github = "ProminentRetail"; diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index a5a5fbfd7223..e107e00fb71d 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -16,7 +16,7 @@ import utils LEAF_TEMPLATE = jinja2.Template(''' -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "{{ pname }}"; } @@ -25,7 +25,7 @@ mkKdeDerivation { ROOT_TEMPLATE = jinja2.Template(''' {callPackage}: { {%- for p in packages %} - {{ p }} = callPackage ./{{ p }} {}; + {{ p }} = callPackage ./{{ p }} { }; {%- endfor %} } '''.strip()); diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6659fddf4cee..6600679ad168 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -46,6 +46,9 @@ If you experience any issues, please report them. The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`. +- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html) + was added through the `boot.initrd.systemd.dmVerity` option. + - The [Xen Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable). - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems. ::: {.warning} @@ -460,6 +463,8 @@ - The `openlens` package got removed, suggested replacment `lens-desktop` +- The `services.dnsmasq.extraConfig` option has been removed, as it had been deprecated for over 2 years. This option has been replaced by `services.dnsmasq.settings`. + - The NixOS installation media no longer support the ReiserFS or JFS file systems by default. - Minimal installer ISOs are no longer built on the small channel. diff --git a/nixos/modules/image/assert_uki_repart_match.py b/nixos/modules/image/assert_uki_repart_match.py new file mode 100644 index 000000000000..e0f266cf15bf --- /dev/null +++ b/nixos/modules/image/assert_uki_repart_match.py @@ -0,0 +1,78 @@ +import json +import sys + +store_verity_type = "@NIX_STORE_VERITY@" # replaced at import by Nix + + +def extract_uki_cmdline_params(ukify_json: dict) -> dict[str, str]: + """ + Return a dict of the parameters in the .cmdline section of the UKI + Exits early if "usrhash" is not included. + """ + cmdline = ukify_json.get(".cmdline", {}).get("text") + if cmdline is None: + print("Failed to get cmdline from ukify output") + + params = {} + for param in cmdline.split(): + key, val = param.partition("=")[::2] + params[key] = val + + if "usrhash" not in params: + print( + f"UKI cmdline does not contain a usrhash:\n{cmdline}" + ) + exit(1) + + return params + + +def hashes_match(partition: dict[str, str], expected: str) -> bool: + """ + Checks if the value of the "roothash" key in the passed partition object matches `expected`. + """ + if partition.get("roothash") != expected: + pretty_part = json.dumps(partition, indent=2) + print( + f"hash mismatch, expected to find roothash {expected} in:\n{pretty_part}" + ) + return False + else: + return True + + +def check_partitions( + partitions: list[dict], uki_params: dict[str, str] +) -> bool: + """ + Checks if the usrhash from `uki_params` has a matching roothash + for the corresponding partition in `partitions`. + """ + for part in partitions: + if part.get("type") == store_verity_type: + expected = uki_params["usrhash"] + return hashes_match(part, expected) + + return False + + +def main() -> None: + ukify_json = json.load(sys.stdin) + repart_json_output = sys.argv[1] + + with open(repart_json_output, "r") as r: + repart_json = json.load(r) + + uki_params = extract_uki_cmdline_params(ukify_json) + + if check_partitions(repart_json, uki_params): + print("UKI and repart verity hashes match") + else: + print("Compatibility check for UKI and image failed!") + print(f"UKI cmdline parameters:\n{uki_params}") + print(f"repart config: {repart_json_output}") + exit(1) + + +if __name__ == "__main__": + main() diff --git a/nixos/modules/image/repart-verity-store.nix b/nixos/modules/image/repart-verity-store.nix new file mode 100644 index 000000000000..3f341ca421f2 --- /dev/null +++ b/nixos/modules/image/repart-verity-store.nix @@ -0,0 +1,209 @@ +# opinionated module that can be used to build nixos images with +# a dm-verity protected nix store +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.image.repart.verityStore; + + verityMatchKey = "store"; + + # TODO: make these and other arch mappings available from systemd-lib for example + partitionTypes = { + usr = + { + "x86_64" = "usr-x86-64"; + "arm64" = "usr-arm64"; + } + ."${pkgs.stdenv.hostPlatform.linuxArch}"; + + usr-verity = + { + "x86_64" = "usr-x86-64-verity"; + "arm64" = "usr-arm64-verity"; + } + ."${pkgs.stdenv.hostPlatform.linuxArch}"; + }; + + verityHashCheck = + pkgs.buildPackages.writers.writePython3Bin "assert_uki_repart_match.py" + { + flakeIgnore = [ "E501" ]; # ignores PEP8's line length limit of 79 (black defaults to 88 characters) + } + ( + builtins.replaceStrings [ "@NIX_STORE_VERITY@" ] [ + partitionTypes.usr-verity + ] (builtins.readFile ./assert_uki_repart_match.py) + ); +in +{ + options.image.repart.verityStore = { + enable = lib.mkEnableOption "building images with a dm-verity protected nix store"; + + ukiPath = lib.mkOption { + type = lib.types.str; + default = "/EFI/Linux/${config.system.boot.loader.ukiFile}"; + defaultText = "/EFI/Linux/\${config.system.boot.loader.ukiFile}"; + description = '' + Specify the location on the ESP where the UKI is placed. + ''; + }; + + partitionIds = { + esp = lib.mkOption { + type = lib.types.str; + default = "00-esp"; + description = '' + Specify the attribute name of the ESP. + ''; + }; + store-verity = lib.mkOption { + type = lib.types.str; + default = "10-store-verity"; + description = '' + Specify the attribute name of the store's dm-verity hash partition. + ''; + }; + store = lib.mkOption { + type = lib.types.str; + default = "20-store"; + description = '' + Specify the attribute name of the store partition. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + boot.initrd.systemd.dmVerity.enable = true; + + image.repart.partitions = { + # dm-verity hash partition + ${cfg.partitionIds.store-verity}.repartConfig = { + Type = partitionTypes.usr-verity; + Verity = "hash"; + VerityMatchKey = lib.mkDefault verityMatchKey; + Label = lib.mkDefault "store-verity"; + }; + # dm-verity data partition that contains the nix store + ${cfg.partitionIds.store} = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = partitionTypes.usr; + Verity = "data"; + Format = lib.mkDefault "erofs"; + VerityMatchKey = lib.mkDefault verityMatchKey; + Label = lib.mkDefault "store"; + }; + }; + + }; + + system.build = { + + # intermediate system image without ESP + intermediateImage = + (config.system.build.image.override { + # always disable compression for the intermediate image + compression.enable = false; + }).overrideAttrs + ( + _: previousAttrs: { + # make it easier to identify the intermediate image in build logs + pname = "${previousAttrs.pname}-intermediate"; + + # do not prepare the ESP, this is done in the final image + systemdRepartFlags = previousAttrs.systemdRepartFlags ++ [ "--defer-partitions=esp" ]; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + } + ); + + # UKI with embedded usrhash from intermediateImage + uki = + let + inherit (config.system.boot.loader) ukiFile; + cmdline = "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"; + in + # override the default UKI + lib.mkOverride 99 ( + pkgs.runCommand ukiFile + { + nativeBuildInputs = [ + pkgs.jq + pkgs.systemdUkify + ]; + } + '' + mkdir -p $out + + # Extract the usrhash from the output of the systemd-repart invocation for the intermediate image. + usrhash=$(jq -r \ + '.[] | select(.type=="${partitionTypes.usr-verity}") | .roothash' \ + ${config.system.build.intermediateImage}/repart-output.json + ) + + # Build UKI with the embedded usrhash. + ukify build \ + --config=${config.boot.uki.configFile} \ + --cmdline="${cmdline} usrhash=$usrhash" \ + --output="$out/${ukiFile}" + '' + ); + + # final system image that is created from the intermediate image by injecting the UKI from above + finalImage = + (config.system.build.image.override { + # continue building with existing intermediate image + createEmpty = false; + }).overrideAttrs + ( + finalAttrs: previousAttrs: + let + copyUki = "CopyFiles=${config.system.build.uki}/${config.system.boot.loader.ukiFile}:${cfg.ukiPath}"; + in + { + nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [ + pkgs.systemdUkify + verityHashCheck + ]; + + postPatch = '' + # add entry to inject UKI into ESP + echo '${copyUki}' >> $finalRepartDefinitions/${cfg.partitionIds.esp}.conf + ''; + + preBuild = '' + # check that we build the final image with the same intermediate image for + # which the injected UKI was built by comparing the UKI cmdline with the repart output + # of the intermediate image + # + # This is necessary to notice incompatible substitutions of + # non-reproducible store paths, for example when working with distributed + # builds, or when offline-signing the UKI. + ukify --json=short inspect ${config.system.build.uki}/${config.system.boot.loader.ukiFile} \ + | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json" + + # copy the uncompressed intermediate image, so that systemd-repart picks it up + cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw . + chmod +w ${config.image.repart.imageFileBasename}.raw + ''; + + # the image will be self-contained so we can drop references + # to the closure that was used to build it + unsafeDiscardReferences.out = true; + } + ); + }; + }; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; +} diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index e471f9485cd0..b2f03d96ad35 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -69,6 +69,10 @@ let }) opts; in { + imports = [ + ./repart-verity-store.nix + ]; + options.image.repart = { name = lib.mkOption { diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix deleted file mode 100644 index 8d72905cdcb4..000000000000 --- a/nixos/modules/installer/tools/get-version-suffix +++ /dev/null @@ -1,23 +0,0 @@ -getVersion() { - local dir="$1" - rev= - gitDir="$dir/.git" - if [ -e "$gitDir" ]; then - if [ -z "$(type -P git)" ]; then - echo "warning: Git not found; cannot figure out revision of $dir" >&2 - return - fi - cd "$dir" - rev=$(git --git-dir="$gitDir" rev-parse --short HEAD) - if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then - rev+=M - fi - fi -} - -if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then - getVersion $nixpkgs - if [ -n "$rev" ]; then - echo ".git.$rev" - fi -fi diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 7f16b97440c1..3c5816858a46 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -17,26 +17,9 @@ let ''; }); - nixos-build-vms = makeProg { - name = "nixos-build-vms"; - src = ./nixos-build-vms/nixos-build-vms.sh; - inherit (pkgs) runtimeShell; - manPage = ./manpages/nixos-build-vms.8; - }; - - nixos-install = makeProg { - name = "nixos-install"; - src = ./nixos-install.sh; - inherit (pkgs) runtimeShell; - nix = config.nix.package.out; - path = makeBinPath [ - pkgs.jq - nixos-enter - pkgs.util-linuxMinimal - ]; - manPage = ./manpages/nixos-install.8; - }; + inherit (pkgs) nixos-build-vms; + nixos-install = pkgs.nixos-install.override { nix = config.nix.package; }; nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; }; nixos-generate-config = makeProg { @@ -69,16 +52,7 @@ let manPage = ./manpages/nixos-version.8; }; - nixos-enter = makeProg { - name = "nixos-enter"; - src = ./nixos-enter.sh; - inherit (pkgs) runtimeShell; - path = makeBinPath [ - pkgs.util-linuxMinimal - ]; - manPage = ./manpages/nixos-enter.8; - }; - + inherit (pkgs) nixos-enter; in { diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 44903a15c5ca..4048fd685737 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -386,7 +386,10 @@ in `nixpkgs.config` options should be passed when creating the instance instead. Current value: - ${lib.generators.toPretty { multiline = true; } opt.config} + ${lib.generators.toPretty { multiline = true; } cfg.config} + + Defined in: + ${lib.concatMapStringsSep "\n" (file: " - ${file}") opt.config.files} ''; } ]; diff --git a/nixos/modules/misc/nixpkgs/test.nix b/nixos/modules/misc/nixpkgs/test.nix index be9a88a07788..e70b7a12e8dd 100644 --- a/nixos/modules/misc/nixpkgs/test.nix +++ b/nixos/modules/misc/nixpkgs/test.nix @@ -16,6 +16,11 @@ let nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.buildPlatform = "aarch64-linux"; }; + externalPkgsWithConfig = { + _file = "ext-pkgs-config.nix"; + nixpkgs.pkgs = pkgs; + nixpkgs.config.allowUnfree = true; + }; ambiguous = { _file = "ambiguous.nix"; nixpkgs.hostPlatform = "aarch64-linux"; @@ -108,6 +113,20 @@ lib.recurseIntoAttrs { For a future proof system configuration, we recommend to remove the legacy definitions. '']; + assert builtins.trace (lib.head (getErrors externalPkgsWithConfig)) + getErrors externalPkgsWithConfig == + ['' + Your system configures nixpkgs with an externally created instance. + `nixpkgs.config` options should be passed when creating the instance instead. + + Current value: + { + allowUnfree = true; + } + + Defined in: + - ext-pkgs-config.nix + '']; assert getErrors { nixpkgs.localSystem = pkgs.stdenv.hostPlatform; nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9de27a31067b..97ea85cfb89a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1625,6 +1625,7 @@ ./system/boot/stage-2.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix + ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix ./system/boot/systemd/journald.nix diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c4bad59a6fb6..a8a8973f25ba 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -515,10 +515,12 @@ in '' set -eou pipefail compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf) - if [[ $compression == zstd ]]; then + if [[ $compression == "" ]]; then + compression="bzip2" + elif [[ $compression == zstd ]]; then compression="zstd --rm" fi - find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet ''; startAt = "Sun 01:45"; serviceConfig.Slice = "system-hydra.slice"; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 20986f8d93ef..633e37ad25e9 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -20,13 +20,7 @@ let listsAsDuplicateKeys = true; }; - # Because formats.generate is outputting a file, we use of conf-file. Once - # `extraConfig` is deprecated we can just use - # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings` - dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings} - ${cfg.extraConfig} - ''; + dnsmasqConf = settingsFormat.generate "dnsmasq.conf" cfg.settings; in @@ -34,6 +28,7 @@ in imports = [ (lib.mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ]) + (lib.mkRemovedOptionModule [ "services" "dnsmasq" "extraConfig" ] "This option has been replaced by `services.dnsmasq.settings`") ]; ###### interface @@ -104,17 +99,6 @@ in ''; }; - extraConfig = lib.mkOption { - type = lib.types.lines; - default = ""; - description = '' - Extra configuration directives that should be added to - `dnsmasq.conf`. - - This option is deprecated, please use {option}`settings` instead. - ''; - }; - }; }; @@ -124,8 +108,6 @@ in config = lib.mkIf cfg.enable { - warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config"; - services.dnsmasq.settings = { dhcp-leasefile = lib.mkDefault "${stateDir}/dnsmasq.leases"; conf-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf"); diff --git a/nixos/modules/services/networking/nixops-dns.nix b/nixos/modules/services/networking/nixops-dns.nix index 5e33d872ea45..5d009d6d3084 100644 --- a/nixos/modules/services/networking/nixops-dns.nix +++ b/nixos/modules/services/networking/nixops-dns.nix @@ -68,10 +68,10 @@ in servers = [ "/${cfg.domain}/127.0.0.1#5300" ]; - extraConfig = '' - bind-interfaces - listen-address=127.0.0.1 - ''; + settings = { + bind-interfaces = true; + listen-address = "127.0.0.1"; + }; }; }; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index ea771c358814..38b5e2c52d89 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -75,13 +75,16 @@ let mkPhpValue = v: let isHasAttr = s: isAttrs v && hasAttr s v; + # "you're escaped" -> "'you\'re escaped'" + # https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single + toPhpString = s: "'${escape [ "'" "\\" ] s}'"; in - if isString v then escapeShellArg v + if isString v then toPhpString 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 isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then boolToString v - else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" + else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))" else if isHasAttr "_raw" then v._raw else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded." ; diff --git a/nixos/modules/system/boot/systemd/dm-verity.nix b/nixos/modules/system/boot/systemd/dm-verity.nix new file mode 100644 index 000000000000..d80077755801 --- /dev/null +++ b/nixos/modules/system/boot/systemd/dm-verity.nix @@ -0,0 +1,61 @@ +{ config, lib, ... }: + +let + cfg = config.boot.initrd.systemd.dmVerity; +in +{ + options = { + boot.initrd.systemd.dmVerity = { + enable = lib.mkEnableOption "dm-verity" // { + description = '' + Mount verity-protected block devices in the initrd. + + Enabling this option allows to use `systemd-veritysetup` and + `systemd-veritysetup-generator` in the initrd. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.boot.initrd.systemd.enable; + message = '' + 'boot.initrd.systemd.dmVerity.enable' requires 'boot.initrd.systemd.enable' to be enabled. + ''; + } + ]; + + boot.initrd = { + availableKernelModules = [ + "dm_mod" + "dm_verity" + ]; + + # dm-verity needs additional udev rules from LVM to work. + services.lvm.enable = true; + + # The additional targets and store paths allow users to integrate verity-protected devices + # through the systemd tooling. + systemd = { + additionalUpstreamUnits = [ + "veritysetup-pre.target" + "veritysetup.target" + "remote-veritysetup.target" + ]; + + storePaths = [ + "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup" + "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-veritysetup-generator" + ]; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ + msanft + nikstur + willibutz + ]; +} diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index f4c904ff670c..777e3b28f200 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -112,12 +112,11 @@ let environment = lib.mkMerge [ { + INCUS_EDK2_PATH = ovmf; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; } - (lib.mkIf (lib.versionOlder cfg.package.version "6.3.0") { INCUS_OVMF_PATH = ovmf; }) - (lib.mkIf (lib.versionAtLeast cfg.package.version "6.3.0") { INCUS_EDK2_PATH = ovmf; }) (lib.mkIf (cfg.ui.enable) { "INCUS_UI" = cfg.ui.package; }) ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 27d5b79c95c4..0aff8978cb62 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -128,6 +128,7 @@ in { apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; appliance-repart-image = runTest ./appliance-repart-image.nix; + appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix; apparmor = handleTest ./apparmor.nix {}; archi = handleTest ./archi.nix {}; aria2 = handleTest ./aria2.nix {}; diff --git a/nixos/tests/appliance-repart-image-verity-store.nix b/nixos/tests/appliance-repart-image-verity-store.nix new file mode 100644 index 000000000000..3834d0a468ab --- /dev/null +++ b/nixos/tests/appliance-repart-image-verity-store.nix @@ -0,0 +1,130 @@ +# similar to the appliance-repart-image test but with a dm-verity +# protected nix store and tmpfs as rootfs +{ lib, ... }: + +{ + name = "appliance-repart-image-verity-store"; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; + + nodes.machine = + { + config, + lib, + pkgs, + ... + }: + let + inherit (config.image.repart.verityStore) partitionIds; + in + { + imports = [ ../modules/image/repart.nix ]; + + virtualisation.fileSystems = lib.mkVMOverride { + "/" = { + fsType = "tmpfs"; + options = [ "mode=0755" ]; + }; + + "/usr" = { + device = "/dev/mapper/usr"; + # explicitly mount it read-only otherwise systemd-remount-fs will fail + options = [ "ro" ]; + fsType = config.image.repart.partitions.${partitionIds.store}.repartConfig.Format; + }; + + # bind-mount the store + "/nix/store" = { + device = "/usr/nix/store"; + options = [ "bind" ]; + }; + }; + + image.repart = { + verityStore = { + enable = true; + # by default the module works with systemd-boot, for simplicity this test directly boots the UKI + ukiPath = "/EFI/BOOT/BOOT${lib.toUpper config.nixpkgs.hostPlatform.efiArch}.EFI"; + }; + + name = "appliance-verity-store-image"; + + partitions = { + ${partitionIds.esp} = { + # the UKI is injected into this partition by the verityStore module + repartConfig = { + Type = "esp"; + Format = "vfat"; + SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; + }; + }; + ${partitionIds.store-verity}.repartConfig = { + Minimize = "best"; + }; + ${partitionIds.store}.repartConfig = { + Minimize = "best"; + }; + }; + }; + + virtualisation = { + directBoot.enable = false; + mountHostNixStore = false; + useEFIBoot = true; + }; + + boot = { + loader.grub.enable = false; + initrd.systemd.enable = true; + }; + + system.image = { + id = "nixos-appliance"; + version = "1"; + }; + + # don't create /usr/bin/env + # this would require some extra work on read-only /usr + # and it is not a strict necessity + system.activationScripts.usrbinenv = lib.mkForce ""; + }; + + testScript = + { nodes, ... }: # python + '' + import os + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.finalImage}/${nodes.machine.image.repart.imageFile}", + "-F", + "raw", + tmp_disk_image.name, + ]) + + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + machine.wait_for_unit("default.target") + + with subtest("Running with volatile root"): + machine.succeed("findmnt --kernel --type tmpfs /") + + with subtest("/nix/store is backed by dm-verity protected fs"): + verity_info = machine.succeed("dmsetup info --target verity usr") + assert "ACTIVE" in verity_info,f"unexpected verity info: {verity_info}" + + backing_device = machine.succeed("df --output=source /nix/store | tail -n1").strip() + assert "/dev/mapper/usr" == backing_device,"unexpected backing device: {backing_device}" + ''; +} diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 3cf99fe7fc2f..c72b1c390e8c 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -62,6 +62,9 @@ let tests = { konsole.pkg = p: p.plasma5Packages.konsole; lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app; + # after recent Mesa change, borked software rendering config under x86_64 icewm? + # BGR colour display on x86_64, RGB on aarch64 + lomiri-terminal-app.colourTest = false; lxterminal.pkg = p: p.lxterminal; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 592af9a094f1..a2cd48030298 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -11,7 +11,7 @@ rec { }; nodes = lib.foldl (a: version: let - package = pkgs."wordpress${version}"; + package = pkgs."wordpress_${version}"; in a // { "wp${version}_httpd" = _: { services.httpd.adminAddr = "webmaster@site.local"; @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_3" "6_4" + "6_5" "6_6" ]; testScript = '' diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 287304855f13..ff049b69d7bc 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.08"; + version = "24.08.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-u4dkVcdduTBuRE615mPx66U8OFZSeMdL2fNJNoHbVxc="; + hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4="; }; # when building on darwin we need cctools to provide the correct libtool diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix deleted file mode 100644 index 046aac459b53..000000000000 --- a/pkgs/applications/editors/elvis/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, ncurses }: - -stdenv.mkDerivation rec { - pname = "elvis"; - version = "2.2_0"; - - src = fetchurl { - url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz"; - sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; - }; - - buildInputs = [ ncurses ]; - - patches = [ - (fetchpatch { - url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; - sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; - }) - ]; - - postPatch = '' - substituteInPlace configure \ - --replace '-lcurses' '-lncurses' - ''; - - preConfigure = '' - mkdir -p $out/share/man/man1 - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc - cp elvis ref elvtags elvfmt $out/bin - cp -R data/* $out/share/elvis - cp doc/* $out/share/elvis/doc - - mkdir -p $out/share/man/man1 - for a in doc/*.man; do - cp $a $out/share/man/man1/`basename $a .man`.1 - done - ''; - - configureFlags = [ "--ioctl=termios" ]; - - meta = { - homepage = "http://elvis.the-little-red-haired-girl.org/"; - description = "Vi clone for Unix and other operating systems"; - license = lib.licenses.free; - }; -} diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 667cc1ac5e41..5f061d2be205 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,10 +11,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "90c6ad146b55909ff4e09cf7290c51db2d3f94985e972133c81ad30c4654c74e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1.tar.gz", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "1658fb15d41dfb804ab0ea3ed4781d4ae0f41d25cc9df17c3f536a565423aa5b", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -27,10 +27,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "7854a303ad5f3bb9300f515baaed34e4362c59c631b117ea49eaa81f75ef485d", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1.tar.gz", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "9b3dd8185f805d8d968f5a515dbe74d3672e0cd1b2cb052cf81382bd63ddb3b8", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -43,26 +43,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.2.1.1", - "sha256": "9305eb0c8985cf02a43c45002d7676323a84f5a4a544a0458468a49347e6ed57", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1.tar.gz", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "63314c4b3114e754b35f765a535dc92d7f66f6b3a767bd77aebd65b844add92c", + "url": "https://download.jetbrains.com/go/goland-2024.2.2.tar.gz", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "781cc03526d5811061c6ffd211942698b3d18ed2f055a04f384956686a7aa0a6", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "b996f6418cd4beb8d77f5f283c0a37108e33b3c822a7d398dfa15b73967595b2", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2.tar.gz", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "aa817431cfad5b814d356211e4826358c647a8a550938829aef9fb9eec61366d", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "4a8b6cee89e1baf9e252803c2e32e39ce923452d31807adfdedd836df7f96ef4", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2.tar.gz", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -84,18 +84,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "232ddc3c15b138264534820a40049ea4b0108647ba2972294616bc2a3f22234b", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "4f30b1f877a5909dcd181e95305ec43d17c36743583d7dcf0180e700d44a3407", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2.tar.gz", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "01802b2e4892a81c197cc1be08e036ea2c1dd84307a71337531b6cb2213e248a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "06b2da14816eff2d3c090f6177ee300e5149ff537f2f0f5ff12b3f762aa191cf", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2.tar.gz", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -108,34 +108,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "246640c171b9e89c135360ae52b6720f1d18e591f9c16023b14b6597131833be", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1.tar.gz", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "649031bb8d51576a9bf082db466025e59871c7f87c001eefea520db3a875ba67", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2.tar.gz", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.2", - "sha256": "53c076815e257e917a5a3dba53a5990e079a83b69195d57a2c0c72fb61ae76e8", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.tar.gz", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "0ddc51d8585a4a64fc882043b8367caaabc86c688cf6e0880002de0892905f47", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1.tar.gz", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.2.1", - "sha256": "a598c2686a6c8e4d6b19e1a0a54c78c2c77a772c35ef041244fece64940d8b93", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.tar.gz", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "c7bb12ff65a27dc76b81293e0e61b846b2ce9328bfeb8d75fe50ccf564e81078", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2.tar.gz", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", - "version": "2024.1 EAP", - "sha256": "7da1531fc7f1f3995957729b412bf43e5757b0029ffcdf858270e64ae30ee462", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.tar.gz", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "89d1f4bda404bb81c315600f6b673f89e2798066f68b661a904c9e30db45b4e8", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.tar.gz", + "build_number": "242.21870.138" } }, "aarch64-linux": { @@ -150,10 +150,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "2570ecc174498cd137d0df877ddc174a8dab51297851170a8438338361b1674c", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "35e089b8d8bf5f32c80022f394fe525b8aa37540d26c27e861db0df9e34716a4", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -166,10 +166,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "2d6e0ed778d9697f80ed38c2cb2976df179e5b24144dc42558fd3ca3ba7e54c9", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "e529c27d3c5eeabec02c7ff2e3c0a682d60b962923054cb9dca2e46bf1ec9104", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -182,26 +182,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.2.1.1", - "sha256": "92382b20b570621811bff7e92fe9ab4adae26e4656e60912810bbe1b073f8bb1", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1-aarch64.tar.gz", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "e8057ccf02fa369daa40e2ee7053cd8eb39f2bfd9405e7efdb0b5712b8c80cc4", + "url": "https://download.jetbrains.com/go/goland-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "de1b3e5af326131a4131dde5cfa219a98c7d1e9397083e99a1613b935b351247", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "53bc06be660138e2192d94383badd3cee743576970afe3b87402c453fa71ac35", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "12757b81db19b31311f356921961e3cbd34d1aec98d03865402a0053c6129228", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "3e5c44a444ec397298d6eeb8a7b6401c630999b636aecbaee1134f3f05aed06a", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -223,18 +223,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "1f4ba170363bfce4d434d2b39aa0ef645c2841ece58b0225243dc9136a37e378", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "4d5d7b9e075c92b12c570a16c933f10455c666bc2f9b05dfdcd5b1a0df6b8f61", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "76dd1747a5072d736129311c596ed6d5f4a628ebbbce136a5810b9ecee091953", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "288ae2742286c6235c6db4c6b1e17df629b1135428b07ee4de152877427657fb", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -247,34 +247,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "c45cead59007fc00b68e450724618534d4c8f649d72da8c1afadcc0aa6014ad0", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "6ca2c822bdcad8e039d59f1a0e376e4bba6b8d6a5c1caf73068c25c439bf420d", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.2", - "sha256": "6af71fbb8f8e1eb7ab2ddab7ecaf6ecca89eedf37d24ebbf1607c158328b7c96", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2-aarch64.tar.gz", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "a83845ff6a2ca43d0d7a2d386f6a5b1359a021bd05055334bcef804afc1a0ea8", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1-aarch64.tar.gz", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.2.1", - "sha256": "7ad8a2a81f1d0cf3f4cc17eb988189133f9d3f250fe62aa31bff2d8a10e29ce1", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1-aarch64.tar.gz", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "6a515ada0410bf94ffed892863b0156acb41c170f78041a12bdd891cad9ea782", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", - "version": "2024.1 EAP", - "sha256": "2f8d90582f19eee4c1b83d9c61846baa7ec3f4e75dde10ba069712e9677b2a60", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.tar.gz", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "28a7504a29ba573632e300fbe845d3b2fe3f2c689a853abf83e32ae161e476da", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.tar.gz", + "build_number": "242.21870.138" } }, "x86_64-darwin": { @@ -289,10 +289,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.2.1", - "sha256": "b5eeedf09b62bba538e630e19f93d339639ec2a646da32b027d4bd66b7d54b7d", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1.dmg", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "35e1a0348353bc8c741c2dea429d0554c7d2a201e9c69b3bfc11c67accab2c52", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -305,10 +305,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.2.1", - "sha256": "fe47cf2258d935316f5c47fb68dbe68ea612a5b14668d4755c1580d3a32bda5c", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1.dmg", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "2afdedae414e62077580c88c76093ea608b49aa3e4c9c9f1ec8aef7d467a7285", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -321,26 +321,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.2.1.1", - "sha256": "44c84b628665b4778ae4981419b796f0eed3942d43a99b2f7692706452aef493", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1.dmg", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "d788731f83254780e612234265976cbdcbf7bb334aa2bd7c610795d7fb843948", + "url": "https://download.jetbrains.com/go/goland-2024.2.2.dmg", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.2.1", - "sha256": "3b6884d12979977530b642a473d4337e724340e0a8448b218e98d733fc35a166", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "993676b837c7c08069120210d64d1bf32f260b40698014f4a4d1bffa763dd830", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2.dmg", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.2.1", - "sha256": "f6c1b20855bd49764c7b039407ae8bb8b029a59cd7f280cccdea19309538910f", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "f2528d8f6f983cbfe16e51221a71009ac3a46e8971259bfeb67471253c0d93f0", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2.dmg", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -362,18 +362,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.2.1", - "sha256": "bfc1f6d282ef67b62385f48cc119743de15e2776ec8cbe0cfe938a51b89e54b4", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "a547dc4beddf883c834eef9fe6594c0a3afe55b58ac3901cd8c3b2fa75663392", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2.dmg", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.2.1", - "sha256": "d20348dfa6393719fc193c6f1fae96be3e52cd795f65eda021501267027e6c1d", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "7389b18bdc27939d5802f79c3acf72e06ac5ca99caed3232fad88191e54fa3db", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2.dmg", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -386,34 +386,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.2.1", - "sha256": "3bc2e6e43fae8f799c4a5d42a4c33d9ae13039b40e7c28bd010a77c5cb8e421f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1.dmg", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "91cd4a4d0f262096992a2e021249d49851fbdc3537c8e5daa323b0ff4c1eb3b3", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2.dmg", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.2", - "sha256": "80f995b53bf59dce729b8a6b13dff105c205b5f32b7e266135450975ac96ee7c", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.dmg", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "3bf77bbf2aa459d939567fa34291e30ae91ac9759eb40a229d3bc3ea326b7c5b", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1.dmg", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.2.1", - "sha256": "b2fd1750c80d3568906f9f4ab098584be836092bafb97eee3c79acc9a36d626f", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.dmg", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "0ed0beb4e4b29f6fcd265b6f9cafa193908b66cd5b38cc1c5d1231ef0894c253", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2.dmg", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", - "version": "2024.1 EAP", - "sha256": "fad7fbf6fec147556b53b75adb02f22df038822f4cb0662dd4748dcc1ffd0969", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.dmg", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "bcf989440a220fff70600d38333bc99feef0453779e60caae0d05d1168cfffb0", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.dmg", + "build_number": "242.21870.138" } }, "aarch64-darwin": { @@ -428,10 +428,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "40564665e759ef179dbf542abe8af57bb15f16c8d05d9c18c700ae81755e6516", - "url": "https://download.jetbrains.com/cpp/CLion-2024.2.1-aarch64.dmg", - "build_number": "242.21829.173" + "version": "2024.2.2", + "sha256": "428d557d4b5eb7687c7c8142b61591ef4fe7825891d91616019292280696180e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -444,10 +444,10 @@ "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "d64d0a1c53f06aecc16f24c3203c662576ad89dc5939e5bc94417a2991b23c63", - "url": "https://download.jetbrains.com/python/dataspell-2024.2.1-aarch64.dmg", - "build_number": "242.21829.112" + "version": "2024.2.2", + "sha256": "3d153a2813dd5b1527a0e5c429a390cdcb7d921774c369818283a6706bb47375", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -460,26 +460,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.2.1.1", - "sha256": "0ba62dbed71550a9c1e1535f6a1d6dbfe826d0bf1f7da84e40d9dee9b8e358b8", - "url": "https://download.jetbrains.com/go/goland-2024.2.1.1-aarch64.dmg", - "build_number": "242.21829.220" + "version": "2024.2.2", + "sha256": "a1adfa54a4055fbd833e6b161c848c64ff1ae13b72356eb8febd1c22ea6a5c45", + "url": "https://download.jetbrains.com/go/goland-2024.2.2-aarch64.dmg", + "build_number": "242.22855.85" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "b898426542106785d79fc1412191895f2096118b61633258b381426f5dbcec11", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1-aarch64.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "cb71c104ac76d0cba1e44cac61f1d463bb9d62fe139477966407e21bc30d8ea0", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.2-aarch64.dmg", + "build_number": "242.22855.74" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "2546d5b396aaa2d80626175327b2d6f6f1d4494ececbd115b236b40bbb4aec45", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1-aarch64.dmg", - "build_number": "242.21829.142" + "version": "2024.2.2", + "sha256": "27b777df1b2ba531d68ef30ebaaf11460a8ab055da8afcfb4886fce3d04d0227", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.2-aarch64.dmg", + "build_number": "242.22855.74" }, "mps": { "update-channel": "MPS RELEASE", @@ -501,18 +501,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "479cfd05514df177bca56cf3406a944ef6bbdbdffb78adddec024e7209a7452f", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1-aarch64.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "b8b65a88ea58106c60e69aed12b675dfc99db62069fa632ad0a63baa33580e7a", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.2-aarch64.dmg", + "build_number": "242.22855.92" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "0f50296747f198383154747da4dae6f2a6cd6cc51dba077ee5dbceac062e197b", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1-aarch64.dmg", - "build_number": "242.21829.153" + "version": "2024.2.2", + "sha256": "8ac248d41defa9aef0726d42130b66e237758a3f8e4030f2e3b48904b6e903c8", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.2-aarch64.dmg", + "build_number": "242.22855.92" }, "rider": { "update-channel": "Rider RELEASE", @@ -525,34 +525,34 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "feca00900fc89e03c92a12d2643e927daa47eb026db2bf635b058c5e292a45a4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.1-aarch64.dmg", - "build_number": "242.21829.150" + "version": "2024.2.2", + "sha256": "38aabad86bb7357592fdc378e0ee1ff96651dffef09b3f9b29ccf42d183b04ec", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.2-aarch64.dmg", + "build_number": "242.22855.77" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.2", - "sha256": "1f8e9a3d53eed9a7b292db588d1f75822c363172117c6e69a30fd369907c2bf9", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2-aarch64.dmg", - "build_number": "242.21829.198" + "version": "2024.2.1", + "sha256": "9d3cac1b51163deda1367fee69d9449aa7c2ff3ca8634bb0590fb33f8c9878d6", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.1-aarch64.dmg", + "build_number": "242.21829.233" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.2.1", - "sha256": "744e7c654c3c0bafbea85b2fc48a581cd2ad44e2384f481e3183eb835262150a", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1-aarch64.dmg", - "build_number": "242.21829.149" + "version": "2024.2.2", + "sha256": "3aeebdd0832092fbadd0706eb9576cc3df13c1fee2af97971a7f35d28c88b8d7", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.2-aarch64.dmg", + "build_number": "242.22855.79" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", - "version": "2024.1 EAP", - "sha256": "dc1d01915ff31d14828b668b71cfc92529d389af122adca06d785f7cc3a9d784", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.dmg", - "build_number": "241.18775.101" + "version": "2024.2 EAP", + "sha256": "cb815cfe2fa9fd69675a31cb870ccf5037ac429a954cb950141074668f250014", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.dmg", + "build_number": "242.21870.138" } } } diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index a65ae16ddd81..1a42322b95dd 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.21829.154": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.21829.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.21829.210": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/631/595102/python-242.21829.142.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/631/605042/python-242.22855.74.zip" }, "name": "python" }, @@ -46,7 +46,7 @@ "idea-ultimate" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/1347/595821/scala-intellij-bin-2024.2.25.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/1347/595821/scala-intellij-bin-2024.2.25.zip" }, "name": "scala" }, @@ -68,16 +68,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.21829.154": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.21829.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.21829.210": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -99,16 +99,16 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": null, - "242.21829.149": null, - "242.21829.150": null, - "242.21829.153": null, "242.21829.154": null, "242.21829.162": null, - "242.21829.173": null, - "242.21829.198": null, "242.21829.210": null, - "242.21829.220": null + "242.21829.233": null, + "242.22855.74": null, + "242.22855.75": null, + "242.22855.77": null, + "242.22855.79": null, + "242.22855.85": null, + "242.22855.92": null }, "name": "kotlin" }, @@ -130,16 +130,16 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", "242.21829.154": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", "242.21829.162": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", "242.21829.210": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip" }, "name": "ini" }, @@ -161,16 +161,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.21829.154": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.21829.162": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.21829.210": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -180,8 +180,8 @@ "phpstorm" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip" + "242.21829.154": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -191,8 +191,8 @@ "phpstorm" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip" + "242.21829.154": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip" }, "name": "php-annotations" }, @@ -209,14 +209,14 @@ "webstorm" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", "242.21829.162": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", "242.21829.210": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip" }, "name": "python-community-edition" }, @@ -238,16 +238,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.21829.154": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.21829.162": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.21829.210": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" }, "name": "asciidoc" }, @@ -268,15 +268,15 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": null, - "242.21829.149": null, - "242.21829.150": null, - "242.21829.153": null, "242.21829.154": null, "242.21829.162": null, - "242.21829.173": null, "242.21829.210": null, - "242.21829.220": null + "242.22855.74": null, + "242.22855.75": null, + "242.22855.77": null, + "242.22855.79": null, + "242.22855.85": null, + "242.22855.92": null }, "name": "-deprecated-rust" }, @@ -297,15 +297,15 @@ ], "builds": { "241.18034.1093": null, - "242.21829.142": null, - "242.21829.149": null, - "242.21829.150": null, - "242.21829.153": null, "242.21829.154": null, "242.21829.162": null, - "242.21829.173": null, "242.21829.210": null, - "242.21829.220": null + "242.22855.74": null, + "242.22855.75": null, + "242.22855.77": null, + "242.22855.79": null, + "242.22855.85": null, + "242.22855.92": null }, "name": "-deprecated-rust-beta" }, @@ -319,10 +319,10 @@ "ruby-mine" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip" }, "name": "ide-features-trainer" }, @@ -344,16 +344,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.21829.154": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.21829.162": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.21829.210": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" }, "name": "nixidea" }, @@ -363,8 +363,8 @@ "idea-ultimate" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip" + "242.22855.74": "https://plugins.jetbrains.com/files/9568/602850/go-plugin-242.22855.36.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/9568/602850/go-plugin-242.22855.36.zip" }, "name": "go" }, @@ -386,16 +386,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.21829.154": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.21829.162": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.21829.210": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" }, "name": "csv-editor" }, @@ -416,17 +416,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/11349/599319/aws-toolkit-jetbrains-standalone-3.27-241.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.162": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.210": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip", + "242.21829.154": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.21829.210": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.21829.233": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip" }, "name": "aws-toolkit" }, @@ -448,16 +448,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.21829.154": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.21829.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.21829.210": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" }, "name": "vscode-keymap" }, @@ -479,16 +479,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.21829.154": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.21829.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.21829.210": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" }, "name": "eclipse-keymap" }, @@ -510,16 +510,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.21829.154": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.21829.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", "242.21829.210": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip" }, "name": "visual-studio-keymap" }, @@ -541,16 +541,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", "242.21829.154": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", "242.21829.162": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", "242.21829.210": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip" }, "name": "protocol-buffers" }, @@ -572,16 +572,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.142": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.149": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.150": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.153": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.21829.154": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.21829.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.173": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.198": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.21829.210": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "242.21829.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "242.21829.233": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.74": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.75": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.77": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.79": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.85": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -602,17 +602,17 @@ "webstorm" ], "builds": { - "241.18034.1093": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.154": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.162": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.210": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.154": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.210": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.21829.233": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip" }, "name": "github-copilot" }, @@ -634,16 +634,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.21829.154": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.21829.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.21829.210": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -665,16 +665,16 @@ ], "builds": { "241.18034.1093": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.142": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.149": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.150": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.153": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.21829.154": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.21829.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.21829.210": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "242.21829.220": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.77": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.79": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.85": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.92": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -685,9 +685,9 @@ "rust-rover" ], "builds": { - "242.21829.142": "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip", - "242.21829.173": "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip", - "242.21829.198": "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip" + "242.21829.233": "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip", + "242.22855.74": "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip" }, "name": "rust" } @@ -695,8 +695,8 @@ "files": { "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=", - "https://plugins.jetbrains.com/files/11349/599319/aws-toolkit-jetbrains-standalone-3.27-241.zip": "sha256-vuIy/D4SfC/da1/jk7eMTutzd78hLvpYxayKCFgW82o=", - "https://plugins.jetbrains.com/files/11349/599321/aws-toolkit-jetbrains-standalone-3.27-242.zip": "sha256-x4s8KTIsaFGAs0u9JEa9wYsuFl3BEtIdxKnyXi0rT9Q=", + "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip": "sha256-rMgAPGqgERLKmMNafg17h//WR9Z+etkawd/OdDse4eI=", + "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip": "sha256-bIj7qOW4CBCwNiBK700Zh90Ijy2I+78rwN5zhUeMwuw=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=", "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", @@ -708,21 +708,23 @@ "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", - "https://plugins.jetbrains.com/files/17718/598710/github-copilot-intellij-1.5.21.6667.zip": "sha256-e8HxsXEmIg+jG10xjgipohmW8ioMLF8oJwAjsfoV/7M=", + "https://plugins.jetbrains.com/files/17718/605023/github-copilot-intellij-1.5.23.6819.zip": "sha256-uL4rU//ylp54t6GZu+29fYtR6OOpnUcqeOb9O4ihc/g=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", - "https://plugins.jetbrains.com/files/22407/598980/intellij-rust-242.21829.198.zip": "sha256-FOk15tRjpx/nkqyBfsnAg/NuX7dXvBhUEfTujp7ZZ1E=", - "https://plugins.jetbrains.com/files/631/595102/python-242.21829.142.zip": "sha256-dj4iIATUB3PqS0d07VHeYB7jFGWVi5c/kChBUoqk9mI=", + "https://plugins.jetbrains.com/files/22407/604382/intellij-rust-242.21829.233.zip": "sha256-Xyk+BH3LOdMcX6wty93MlRlGHzF0JRscDBV433mQ+Hw=", + "https://plugins.jetbrains.com/files/631/605042/python-242.22855.74.zip": "sha256-N+tuECdbVGJa6O5ZkSuxalo8akQnPYYCj6HvSm5Jx4o=", "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip": "sha256-J6v5zHD7n1uqp3p2TptZpkPbGtkdFZdNCA+Xw4aHKDE=", + "https://plugins.jetbrains.com/files/6981/603932/ini-242.22855.37.zip": "sha256-3/tYDIubSx7/xV+u96UXIiJBBm3BMhKmarzOYSU1q0k=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", - "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip": "sha256-2E3Hk8JdhZH+JFHF725Z9vGncx6HSKgd+LYlCpmh1KY=", + "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip": "sha256-kRqgAW0bYEWLTCC6q2hhPmDwnOx3kiuqPhriZWizxTw=", "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=", + "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip": "sha256-As1MgvssBg+45DLRtNbirT5HyXPcabzt3ulKYBIiWj8=", "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=", "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=", "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip": "sha256-j5/LgTrFJ4OEIlocX4jcjgYzHlBId1nh1NfE2qLc1HQ=", - "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip": "sha256-FPwS5+ERGgGhIgHTZYzlKox3FpNbJoq288ZSviqQlR0=" + "https://plugins.jetbrains.com/files/9568/602850/go-plugin-242.22855.36.zip": "sha256-cDdxT0iKe11d1lM+oj6xiODMuwxwip//vH09V9ZTqBo=" } } diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 4a5214db0be8..05678e61362b 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -7,10 +7,6 @@ "date": "2021-12-07", "new": "cmp-tmux" }, - "taskwarrior": { - "date": "2024-08-13", - "new": "taskwarrior3 or taskwarrior2" - }, "fern-vim": { "date": "2024-05-12", "new": "vim-fern" @@ -67,6 +63,10 @@ "date": "2024-05-12", "new": "vim-suda" }, + "taskwarrior": { + "date": "2024-08-13", + "new": "taskwarrior3 or taskwarrior2" + }, "vim-fsharp": { "date": "2024-03-16", "new": "zarchive-vim-fsharp" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9968cc9e3fbd..4464302dde13 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-09-06"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "9e7010bd33808e31d3f729b5e18a772d8e84f704"; - sha256 = "1srs6hrbqkil9s0ckcwgi5gj5mawcgah43yc0rr9lalx5m9my1md"; + rev = "d43fab67c328946fbf8e24fdcadfdb5410517e1f"; + sha256 = "0g9hwzjrq55mx14ymgg5ragfmdijj6acz7bpj9wpgka6037yjvld"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -197,12 +197,12 @@ final: prev: LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-09-11"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "71ac24712da87ac127fd4d9656d61274909e938a"; - sha256 = "0ddjaiy7rmrz1cj5qpbch1md2f3rv3r9sydmh9yvgj7ali81nazf"; + rev = "00d18a8a5734c50ed68f72d07d88a1ce6efb9418"; + sha256 = "1lr667j0fjyhzrsxabq60anmfifa36p2pjv71cjylciifnfn388d"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-09-09"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b546852f7a477276805b01f84ac79c28a962c55b"; - sha256 = "1pfm1c8nrjyfwvgzdd23qgnxmxyp3ngaqk5a4wvxk9xglmbghzn3"; + rev = "bfe74baf72ca8964a211286fed864f30c672f19b"; + sha256 = "1578naydsb0b3jcpx8v39f9iqpna6ykdqdk4pmzbpqh40aahqc47"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-08-27"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "b6e8c64d96b02d60b3751d6a51af7dc958054f8f"; - sha256 = "1jkwcsh2hwsrax7p3dzp349i6sa3iqkpbmajzfcsbzllknax5sd5"; + rev = "63ab13e95141c252c545f9a6c7144ced6790d68f"; + sha256 = "0v7xb149q9wvmd7arin397415bl6rrscgipwcb46wmjm08qzwjyp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -558,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-09-10"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "fa75fd0286788c6c5a65ec46aafbfaf7b7826b74"; - sha256 = "05c8s4rviin0n33nvk1ccxvidvmp0vq5kjrk3bv406wzqfd2iab0"; + rev = "f6f74a04ba72f87c91a0f533d37e03c24518879a"; + sha256 = "146l8alnikcma0acf68vmw29q0my0hmxzgjd5x24nx4k60l50c61"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -739,12 +739,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-09-06"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "037c3dbd161d6744d274243dd71314b2964753b2"; - sha256 = "0pq9kv9xcxp3w1md301c7xlqp79517vji9nddwfpyabca5d7vanv"; + rev = "39e970c229de91258f959fe6f43c5c983ddfe5c6"; + sha256 = "1ags8fllxrb9wyn9mljyb7fszm3dv2ysy2fxydqrfza54f9y83gk"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -943,12 +943,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-09-02"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "a90aa7730efa60fdcc7e00497a8f36d94a6da709"; - sha256 = "1s78iq68s7y8grmxkrjbg6fczi60yzlkji0gh48gavkqrgf5yszx"; + rev = "aa01054d478c6d3efc0188cb2ed4850e9f475664"; + sha256 = "0m5zxnyr25plhi3pcil4vyvxq5shmf3jklr81739pismvj2xsn8w"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1616,12 +1616,12 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-09-11"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "5bf7e0e1d41b20ffbf68b54da2d9e391abb291ad"; - sha256 = "0a4znnm03y25pby6hxq45n9p3msbb9380kg5y6ag7pj84shppbzg"; + rev = "bd2fda1b72ba2e0b0c9cff3b358281515a79b44b"; + sha256 = "19gq9qk2g6paq7f4ik6sd1splwismbinhhrsgyfnmp1g3ka251zy"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; @@ -2071,12 +2071,12 @@ final: prev: cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; - version = "2024-08-29"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "0f4bf271a8f1eb2c5add4dab712c67aa1f9ca7bd"; - sha256 = "0x1i6zw7qdjj2g164l8899iir519fw5j46nrc97jdfayax3crs4h"; + rev = "c0167cdc86c15e782c5461ee62aebee89231c2ed"; + sha256 = "0z0p8n3nmykn05d7p0kcxir5w2wybkjf6dibinaq8zcjxxsgmcc3"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -2179,12 +2179,12 @@ final: prev: cmp_yanky = buildVimPlugin { pname = "cmp_yanky"; - version = "2023-11-16"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "cmp_yanky"; - rev = "c3d089186ccead26eba01023502f3eeadd7a92d2"; - sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ="; + rev = "4beeebf004c7e6e70a5d60fc73f8f419da8f6328"; + sha256 = "1kh431qipypj5y06bjvjfqncqqcanbd66fg0i22zywbfcmcddijq"; }; meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/"; }; @@ -2323,12 +2323,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-09-04"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "fc5a68d6273715f13a1257f02a63d668604d9f27"; - sha256 = "12jvq2qgh8g6dfdds1d7p3rs8v27lnqa6crd7mr5dbmh563m3cdg"; + rev = "fa65fa942aaf1aef73b6dbe3cc0faa713b738fbe"; + sha256 = "1nh0l6bwas6gbmyk6avmhdi4qkxd39dfb5cn5s19gp0qir7iynkz"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2611,12 +2611,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-09-10"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "936f2413e6c57185cd873623a29a0685bce4b423"; - sha256 = "049g7jhbvv4awpjg4vcbqw1d4k9bapn2nsvsnajhqmn65qhsif8q"; + rev = "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c"; + sha256 = "0r6isycbgi6n55c5sn5kqbs35i11ib4yym2awxpgr1w1bvxhcs01"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2672,12 +2672,12 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-09-10"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "f9e2c140643bd4519a4517a78a51f6ae8b8b2a95"; - sha256 = "14v1mh453wjdgip68js3aynilj0rddgkr1avnvi38ihw51mi707i"; + rev = "1a237cf50372830a61d92b0adf00d3b23882e0e1"; + sha256 = "0cjsygqvv2k8lrngln70x1ilb7fmsp812yayxvg3qhc7krc5cz4h"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2732,12 +2732,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-09-01"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "0b4015f9c18fb17e58891e645a652040e6f3e98d"; - sha256 = "1aw5wlgsn9ni11l8rafmqbcrnw76s2l172sjz8m0kssq14giz823"; + rev = "4bc64cbba3eeadd16dc1d13c3becf1e8457ddce5"; + sha256 = "0ghq5p29kq9ps95sa30qwjz4lb24db638v9al4db90ifcvz42g81"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2780,12 +2780,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-09-02"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b3b9ac6ed9618955b24bf9adede7530ef608495b"; - sha256 = "09qkny8m9awn8yp0bw1i6vyh5g4aaa59cch4mpvyn4nlwav91k0d"; + rev = "5a24e3ba60e28e0cfde540696630b3c5a4db6dfd"; + sha256 = "1aqigachc35j42656a229jdvyb7rihcrw2sxw2alljh165gnbapk"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2804,12 +2804,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-06-10"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "5a474b06743bb20a90191994457f5e62f444976b"; - sha256 = "0h98968hhd6zs3j6kpsycvgcvwkfp6bffr5114yr9i9j6s0hxcs9"; + rev = "f22fc4ab27db3184393721a6eaddf40ad8152d7b"; + sha256 = "0y1hdfyrd9dpyr8c2fy3b4pizz1gm3gnw92yp6qlfjm0sn03mzb9"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; @@ -2876,12 +2876,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-08-29"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "10d79f367abd585626aca5099907df67e4dfd7a6"; - sha256 = "1whnza3f63z7yj2n35ywdbx9pa70hp9v0qwx5p08iracqs1gga4q"; + rev = "cd3c2e7955034a5bec0e1beb9d7cb80c639ef5d5"; + sha256 = "1adcwgbcigipvmbldcxg413qf6zd8jad0maisn3vmm8z7saf6zbb"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2960,12 +2960,12 @@ final: prev: ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "2024-09-04"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "0c9ddf4281b67de629d37ac9e1f9e160f919543e"; - sha256 = "1sh4i2a4fgqy9qrfq2wvw9aah358pvbxqbfcapmw890rrlsrb5fn"; + rev = "23b69013f2948c80b3938165a0cb414f58e26ada"; + sha256 = "0h5f3i5v647ah1bxcwx6ap18qhb6b36jwi2mk89clnww6anaghh7"; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; }; @@ -3116,12 +3116,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-08-29"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "f32f02817729129abb3e093fc21e5160512a5673"; - sha256 = "0qp5if2qj12sh4k8fsrpih3qcy665j3gml4sk1pxnpqgl3m5kdg9"; + rev = "aed70a145b2b4c83542e40e767f00e1eeecb9170"; + sha256 = "0xnn8kpn7gwxnw5grcl9sq6jjdm2cky5z4dcfp9aln0ynv4qfs8d"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3536,6 +3536,18 @@ final: prev: meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; + earthly-vim = buildVimPlugin { + pname = "earthly.vim"; + version = "2024-04-02"; + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly.vim"; + rev = "cb0440a357a09fb9234ece56a6b09e04d25c1b1d"; + sha256 = "038g9sjik2jn5la06k7i5xfnzc28faibskn2fikgrxwlx240c8wv"; + }; + meta.homepage = "https://github.com/earthly/earthly.vim/"; + }; + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; @@ -4165,12 +4177,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-09-11"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "985e1002b5dc70f8196ea0605bbfffc8c8407e31"; - sha256 = "13g5y187hvl3x3i8w926p9mhmg64f8xb2y32vismq5wlfx0mny6k"; + rev = "f513524561060f2b9e3bd6d36ff046bfa03ca114"; + sha256 = "0rqh2bvh1bp5i4y1xrvggi0d27a6qbpkvcinrq0c6s9k8g84d7wy"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4249,12 +4261,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-07-28"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "50543e3993f4b996eea01ff5ccc8fe2a354c5388"; - sha256 = "1bn45k9w3g93srmr7dwymq90av5zx1zr21kki7fq3xpc5c9vmrwf"; + rev = "8c56e864d448e84e0162872c381dd2715824dce2"; + sha256 = "12l8pgm523r6cgfj73f9hzyq69205p8in8jvs6x9j7fwcv5y5jil"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4369,12 +4381,12 @@ final: prev: glance-nvim = buildVimPlugin { pname = "glance.nvim"; - version = "2024-03-31"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "51059bcf21016387b6233c89eed220cf47fca752"; - sha256 = "189si3pw3cri28lfkfs7p79wrkrnm043shx8k8frirpgsjz9slv6"; + rev = "cdf1ec8136cfbdf73edbe1163097223c763a84b7"; + sha256 = "0x2aiiy5h3wbg42gw6ahn1070ci6hzi6dv9g2ldk8h7xgbk1dc42"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -4405,12 +4417,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-09-11"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "73fd2b1d9f990b607610abc45a09af3f1600b731"; - sha256 = "00j8ci437ccw3z97m25i243ya6gmx194c31w5bamx0g25d87zd8i"; + rev = "789aca938a9a6f140fc2e2b585380a18f9cef422"; + sha256 = "1zch4pkljxqrzdi4227qilwxishsycla0grdlys08lkc7w0jblmr"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4525,12 +4537,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-09-09"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "76d86580f71bd2f07d4264c782ab8d1c12302e13"; - sha256 = "0zn847nfzh1ps9b1czsg1xmhdygvjg7dgq3wa5b6l7frv75lhwhk"; + rev = "907c3480a3392ec8a2db68cb2a4e59879379b464"; + sha256 = "0zsmhy5hgpvvsbkx2kh7ng84mlg5xzgcqg1whc491c43rjzr0mdd"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4776,12 +4788,12 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2024-09-09"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "c19bbff5ad47b35c4bbdae92fd810ec5f111f658"; - sha256 = "0khywlfh5ly337f5d2yzfgnjqchd6bhd7vbxh22s5aigrvvs8vpw"; + rev = "bf17c96a836ea27c0a7a2650ba385a7783ed322e"; + sha256 = "1y3hffh9kb5x35a0bjggjjgyhna14nvx5rzghj1hx0yrf9b1hrid"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; @@ -5548,12 +5560,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-09-11"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "47578d6a4008f4bf09803fa7bc0a4152f60ed62f"; - sha256 = "18l0xryljwq83gllasbf3d0cnayh27ga7bh2h9i2f35sbl9bri6z"; + rev = "530a75e2ae62ecbaa439d231ef295211fc75247a"; + sha256 = "0hcplgr2nndf4lz92fy7vzawm5l5dkg8jyiz2sq2lv9i4cifbp1w"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5752,12 +5764,12 @@ final: prev: limelight-vim = buildVimPlugin { pname = "limelight.vim"; - version = "2024-04-30"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "785c1e17fe90c587ebca88920baa3146cd6e30fa"; - sha256 = "0r97jh94r09a1c2vap7ybdn5kqpm24xwfsl9fxhvfhj6mlf1n2hm"; + rev = "0c8cc7f503a775c505dc9c67f1f5041ab4d5f1fd"; + sha256 = "0qdll4x01912ldlv9ixh5z4zn8fddybc9mv53c8dx2advkglb6cg"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -5848,12 +5860,12 @@ final: prev: live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; - version = "2024-09-09"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "79f89a2e3472e69fe00d4df50605e323d30f2d09"; - sha256 = "0716nd7fwfx83s8j5jgfqk93sjnb294ndy13bk37k9sqlq1bxsvk"; + rev = "70e4b80178080c95ebb82e5709639aad97600b28"; + sha256 = "1rd40xwcvibsirxcw7m1ld5vbg3pn03lhjpikwam59rddklv9fkh"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; @@ -5979,12 +5991,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-06-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "a38da0a61c172bb59e34befc12efe48359884793"; - sha256 = "1p6fznwg6pxr39x08lf9qhjkcvfysd58k1as6d4lwibkav7rfkki"; + rev = "fc38521ea4d9ec8dbd4c2819ba8126cea743943b"; + sha256 = "0ag79vvjz1dqyw9358ijdkckr1rqshxkpk5fl0kww1vl3pfwv9jv"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -6002,7 +6014,7 @@ final: prev: }; lspkind-nvim = buildVimPlugin { - pname = "lspkind-nvim"; + pname = "lspkind.nvim"; version = "2024-07-25"; src = fetchFromGitHub { owner = "onsails"; @@ -6063,12 +6075,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-08-28"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "45db5addf8d0a201e1cf247cae4cdce605ad3768"; - sha256 = "1lkh9lqs4k8m1s8nhwhilnmp1jmchq9asywvrsjaq8fjkbnnh8gr"; + rev = "e808bee352d1a6fcf902ca1a71cee76e60e24071"; + sha256 = "1yf50bwcg94bprbczcki7c1n318m6ar99m8h1yrmn6m0w4cbvf8r"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -6713,12 +6725,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-09-10"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f0d6e89515c6b055c20d257da717bd30211532f1"; - sha256 = "0g10yf5xvqf1i40d9hl0698bfm901x3hs82lkl5wnzahb5vv5kpn"; + rev = "e50cf9de614500a20e47cfc50e30a100042f91c3"; + sha256 = "1jsll8d3s1glah9ig6041ikpvhcpncd671v8cn55gsacazj46g4h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6953,24 +6965,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-09-04"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "2423411a3e8076f832613efe65318f259353dab4"; - sha256 = "0ivak64qiag3yar7mx62lniq7h6ivf0rbqh3b3ahd7sw9cxj410s"; + rev = "92b2599ef813b188391d5f00f5f94ce22ecd2598"; + sha256 = "1m3ydc34r9a5md6bfrp6zvp67dlvqyg076mygifly2iqfvq43n5a"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-05-25"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "2bad2a92fe0ff6c8581d33a853a1b17592b83239"; - sha256 = "0kbr165ifkn3g131chmn6c4ishfsjikninndscpcp8dq0gv81d4h"; + rev = "44317265d93098e794b73131e58d3bba1fe26e3e"; + sha256 = "0y6n5paffw51iwaga1n6bjsd5gn4iy7kvhb2q757riprv0wh977m"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -7289,12 +7301,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-09-11"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "206f6c0d96ff7ca1698e17cfe84d5b531050282e"; - sha256 = "0651cxpfggdprvmf95wjx4qqvhlm7wikxpbxsfmx7b3warcpjf3z"; + rev = "8c7f29ff02627bbe5060db9fbe35fe6154c4546c"; + sha256 = "10dcw84cm2n3n4lqnqnm7lg2f5fwqrqxrmm6q6i1mwbfc79z5l5m"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7361,12 +7373,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-09-10"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "eb5b156a41fb7147eed9f971504dfa8753d8b006"; - sha256 = "0d5mbv36qkfxhq1lbiz5cwba39pxk0z7bzpbvfh0nggjnw1wws1a"; + rev = "cfbdc888cdfb3cb675615eb96467d980b73b3da5"; + sha256 = "12zg69nqf8ql8d4nsr5s4fag0nl7823bcsflvglqyjdifym99wfl"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7640,12 +7652,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-09-08"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "ae2576dfef2035506b3d3339d676b306f1c03092"; - sha256 = "0s5n1vqzsfs6sr141ybhi09349p0xz1d6cgyg93xlqpbir36f9ip"; + rev = "ebf396f49f269ec706f401d6cf92f17b3a221006"; + sha256 = "1dq147dh1x0jj8a9k6cq91c3lpg7snibjs4ffp9viqhw7qk3lg8b"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -7724,12 +7736,12 @@ final: prev: neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2024-08-09"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "2cc925246d7e5324ddf9585fad891cec73c3947b"; - sha256 = "10466mg8mxqc95qz0q47h8qy0lrkn6qgcw5ccmmd6g4cls3rg7gn"; + rev = "3523adcf9ffaad1911960c5813b0136c1b63a2ec"; + sha256 = "12nsn035npdz5hyc9w6jdhx3wv2ixvdbqr78w2znn1p2a6mqc09m"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; @@ -7952,12 +7964,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-09-06"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "08f72f1ac63872756fe0f1d939037261325aa2d1"; - sha256 = "0f31j0pk54ch0zz8lkbxfh1jy859y8wq1nvyx9x80xkccw6s9z5h"; + rev = "d30f22b6019bf239ec8c3f240b0714ff50e48d35"; + sha256 = "02y6wyf3wndv3gski6ph9vw6a091b3m4g6f4369k7jh2r6fqpkfv"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7976,12 +7988,12 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-09-11"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "1bce99a52c78b94e1a38987001d3166858271cbe"; - sha256 = "1jq6h69amqwf2vkl5r8bk2yys01s877a9j36pi4xjh5f015lj7sf"; + rev = "86ed124c2f7e118670649701288e024444bf91e5"; + sha256 = "1zgi9m85z5pnfsh7p3rdnyz7rvrn44lfg5p6l005g3411h32pgiv"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; @@ -8036,12 +8048,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-09-11"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "3af82e912f5080933387fb625487590598af4759"; - sha256 = "1jnq1428d5l9xb0ccyhb5vr9pr5ahda2hj3cjl03p938826aymkv"; + rev = "d54d4c244dcaaf8faa5dcea17b3f4b68eac3f9cf"; + sha256 = "13hijwx2bmhh7lkp28wksb07kpg6rnrkm2dbrjazbr404ra6kpkf"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8168,12 +8180,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-26"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "61574ce6e60c815b0a0c4b5655b8486ba58089a1"; - sha256 = "1vllq6lkk7karc3n8h9wj2ax6sc99h26r96h18lbvi0nsy98ss53"; + rev = "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f"; + sha256 = "0klz9wy09jk74f39v6f7s5gn98nf3vq4lgv5d29mkszpykxaligp"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -8204,12 +8216,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-09-06"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "0e61fb765632508edf28a166ea8c6f1573d3069d"; - sha256 = "0f9ljhd82dypb9m0ddihyq9j378yfr5ky0vwzf5ymzfgyyn816y9"; + rev = "8d2bb359e47d816e67ff86b5ce2d8f5abfe2b631"; + sha256 = "0l1r7vsa02d9fb0fxkl6dn7nr1m4iflify6vh1ffdvcnlmri8ann"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -8252,12 +8264,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-09-02"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "fd2badc24e675f947162a16c124d395bde80dbd6"; - sha256 = "06jzi0rdrvw24bm6zwxzqd2clml8k8zmdnqkbqx5vj30rzjchc48"; + rev = "ffc139f2a96640ca6c4d3dff9b95b7b9eace87ae"; + sha256 = "0rgkfzdm2m3yb4dfvh1n3n6v85ppfajwdrkhvi02r1ylmbjsikn6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -8444,12 +8456,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-09-05"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "20a4859ebde1c9bc8e96f8cc11a20667e7fdd516"; - sha256 = "1miq5m71j7x34y7ii1rfx3d75sai967chjrh8i7zyzal7hp0x0x7"; + rev = "90616ae6ae40053103dc66872886fc26b94c70c8"; + sha256 = "07x5qm7p6lidafm9kkpapwc7wwjh1k4zrcg3hdgra7sknprppjp0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -8588,12 +8600,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-08-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "382ddb90a31313f0b2e059db50df0ca4dd2859d2"; - sha256 = "0nr5bzqa4b6vv1zqx1a419s34iq403mgama9i2ik9vf8awyih9q9"; + rev = "ca258b1e466d131e17eacf0c632abe932bce20ab"; + sha256 = "0l8qpj143s3csav39ixzhag6pyk6jfajvf469m9hg19m6wfbfg1v"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -8743,12 +8755,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-09-03"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5"; - sha256 = "1bbns4kdjaiisp1wiqdr91kg1jsngf485hm4r35pj8svza38awz9"; + rev = "99cab0b885aaa2f59736c047d23e9a7835d4f9a9"; + sha256 = "05ndjzpbhg6l43bnvvr2yfgvm1hx7c2i9aa1l5g0ccd4kkyd8kgw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8779,12 +8791,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-09-11"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d88ae6623fef09251e3aa20001bb761686eae730"; - sha256 = "0gvd1hkjq555yw5g5i3ydp1gbr279w6lh1c2hl4wc9psz9jvwrac"; + rev = "46ce5fd8c081f179a509da423077f8372e63ffc4"; + sha256 = "0s3hhh1nnd32m29nz8g2jc07nfnfdfqym5wdv6higbwkj6jgdwr4"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9091,12 +9103,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-09-01"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "6b495947e230a93de7021c275e174b128c7ddaf5"; - sha256 = "1n108419jdq9fv47d75k7r737hl437phizrbss7mw4rgm3p4nns5"; + rev = "87b9a4fc514a789fca833bf540484fbda6a946b3"; + sha256 = "1xj1i17685ck259psam0qzd5hrk4ywrz1dpmrzdxbyj9m6dh906d"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -9139,12 +9151,12 @@ final: prev: nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-08-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "7641ce03636633b986493fc6f52d5051cb1375ce"; - sha256 = "0566c1nizpb9qfrv6qq8vwmgx3cb611791gqhyqmf4qqhgyjpv5a"; + rev = "b1c542a78522d59432a827f6ec2b28f9422c7e7f"; + sha256 = "1b9ccj6qycxlcy84fdd7n7b20bmfpwyc8x4wzcakj3xymrp469d9"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -9199,36 +9211,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-09-09"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "d41b4ca013ed89e41b9c0ecbdae5f1633e42f7fa"; - sha256 = "0xrlkx31rlgyk6a8f4kvqg2k23bcl13933yg4xrdz3mss1lr46wr"; + rev = "45a93d99794fff3064141d5b3a50db98ce352697"; + sha256 = "1rp6k5zhawwxbg44ijzmlc15hy3ydz2fa2qxp28ywipxjjvn8w0k"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-09-11"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b6a6d8997c46dc15682020ce4fddc5a89ee1ac0d"; - sha256 = "0wmr08whizi71s6gv5fl6vving663b493cfyq0fpnkfc9smgncp4"; + rev = "b7160e87aadbb3f5f6ee87ce139406fe3433044e"; + sha256 = "1fzppzydwml3a26m4gqfyxilnmmp1jy66j43s4gdaigd04prpyja"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-09-02"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "e6cc783b74606d97ca9eff6494e3f5c2ca603a50"; - sha256 = "0j10zqwssvs09izkni8mcn899xl366r777yhb0q7cz2vl7m5sd60"; + rev = "7f7eeaa99e5a9beab518f502292871ae5f20de6f"; + sha256 = "0k33rf5vlshfh9kwwrpdd8sg47dh90rw87x5zh05bg8cqw847g55"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -9259,12 +9271,12 @@ final: prev: nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; - version = "2023-04-04"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "65ad2eca822dfaec2a3603119ec3cc8826a7859e"; - sha256 = "14vg4iykl56ii4m5jrbrw95yjzkqn53vyqpqm82a5lmxgsha8d6b"; + rev = "d8b74fa87afc6a1e97b18da23e762efb032dc270"; + sha256 = "0n5aygram7wfmhsy3sb68g4adpkx6z1z31cl0780zbdgs5k3785b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; @@ -9343,24 +9355,24 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2024-08-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "8dbc655f794202f45ab6a1cac1cb323a218ac6a1"; - sha256 = "0fj02l74ibcp4b8j6jkyjfq2k25a3jllf6cd1mddhhj7laa4zhfw"; + rev = "fcdec45b3bf33d3b279d2c5fee06abf4ce152008"; + sha256 = "0si4wzlnj3anm4w6l8bmzki1zk0wlcgjjmz3rjkz0rm7mn3krq6z"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-09-06"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "9793801f974bba70e4ac5d7eae6c4f5659993d8e"; - sha256 = "0gssmr3j5cv4313pc1vh0jfd2zi8y71dnr0xyxxndxljzxggcznr"; + rev = "9154484705968658e9aab2b894d1b2a64bf9f83d"; + sha256 = "164iyy9941jnya7qs33li9n5xic19zxis24lpb0w119vwcd16k9n"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -9475,24 +9487,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-09-06"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "fd50872494abd1cb580c604f1f52aae2257f7220"; - sha256 = "18sld24d3n0ai7acfw2w0frj5a3knkcxn4k5xgjfappqwb7whwwd"; + rev = "955f0fdd03b0da23ee1c3368d80bf806f0e36fa5"; + sha256 = "0lz2vvfs30bzqfv714m71vch89phyvyhh08qcfm07aix1pi24mf5"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-09-10"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "1eb9fb35a4613518f79790117ed82c367a0b4a22"; - sha256 = "0fg7f600v48md44wirnzz9bwy6minvk8123abqplpqiad9115xh7"; + rev = "f60bb7f793477d99ef1acf39e920bf2ca4e644de"; + sha256 = "11kmr7mgz2aaw2c22h96jwl8lf3hsvmg7zzx5fif5i40c7a3rmyw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -9849,12 +9861,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-09-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "1673a295db295999aaf8de7c7a3afd45e0b83a46"; - sha256 = "1qgspwk924w6gpb483v1446py8x1nzd6640nbfwjsarlb13jgryb"; + rev = "3006e641e2892b58fe51511c31595515e1a7dc00"; + sha256 = "19zp691z8lbxyg1fisqz8lf3jgra4sww6c6qj270im8kqc4h2spp"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -9945,12 +9957,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-05-20"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - sha256 = "0n2p8krzwiw682f0yb6n8faamffpp336rjy50pbqf3jmc6czd5z4"; + rev = "ec289423a1693aeae6cd0d503bac2856af74edaa"; + sha256 = "1ka431c9qjlz2lcnjg9cay3vsfjrq2iyl5i0ws4aplkw6vivwsg8"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -10175,12 +10187,12 @@ final: prev: qmk-nvim = buildVimPlugin { pname = "qmk.nvim"; - version = "2024-04-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "codethread"; repo = "qmk.nvim"; - rev = "cfa6cecae362d23778cd97317d33ab12671e157c"; - sha256 = "0p44i25iyryrvy1sf3bp10as39mgd6da1gai332rv2ky3zgc3lbh"; + rev = "ad51cb15e607da0983fcf9882d38a2aafac32149"; + sha256 = "14b8mx7hxv06cnh6xb1z0nrkhlj7xaxdky6lcmajn9bp9spdzlmq"; }; meta.homepage = "https://github.com/codethread/qmk.nvim/"; }; @@ -10414,12 +10426,13 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-19"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "e7843c55f9df6a9db9f97dac180035c6ff895a90"; - sha256 = "02iksjxamy83zix1gr495bvigvyzpv466wz6529nydhwkv8vjnbd"; + rev = "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b"; + sha256 = "03sfij7k1myz0nb6hy16wan3s64dk1vhq24akpmgw7xb1dasn3ay"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -10570,12 +10583,12 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-09-09"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "77aaade40b660c235e6a0fc80ea9a2e4094d1de0"; - sha256 = "0s3krvyksfy3lzi4qwfmjr194av72ny5934xzg72rzp434srysji"; + rev = "d5aa882186e3f0e088c046b03001d816aa0dc036"; + sha256 = "1ih53rfcnwmx4k0baqr0kqlgpc9mzd0bl5w8rgnj826hn0rivzfb"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; @@ -10775,12 +10788,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-09-09"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "f002d5dd6478a2171de08d2ca32db00d238d6976"; - sha256 = "11ji4wzd6g0v6jjaqmfxn9npl313bdba6v4shxvjm57cqblg8m0w"; + rev = "929349c8e0ee1dfea99ccfdcb1c45207b18afe96"; + sha256 = "0pk02l1jryw13brwqkhxcw00ykmd6bbbd6csyy56cx8if3byqw4s"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11196,12 +11209,12 @@ final: prev: supermaven-nvim = buildVimPlugin { pname = "supermaven-nvim"; - version = "2024-09-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "supermaven-inc"; repo = "supermaven-nvim"; - rev = "2d10d6c63a2c251e8f90d6f80faf4e9c1b8aa7d0"; - sha256 = "0arq4c5axh5yl3cawxysjiqkiwxrqvwa0pmaj9cm159c8pgq6vpi"; + rev = "b9f1eb32a4ca1782923ca0d4284d5c713583e4d4"; + sha256 = "0snph1hyg202r2jz7zs35hnjhmjmsykiaxqs1mg7x7nxsay14xfd"; }; meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; }; @@ -11317,12 +11330,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-07-31"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "43d61e7418c062c18b67b2136fcc564426f08db2"; - sha256 = "1snhf1shnqc4ybx19f1vf1jz09vwsjn5flqbjq1g65nm03m176kk"; + rev = "eb383958775608cfd74512a0d65c25492391074d"; + sha256 = "0b2iq25smh6w94w2c69q8m0xxrs2bkh13yp868nyhim88gg9pv7n"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -11559,12 +11572,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-09-05"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "c5a14e0550699a7db575805cdb9ddc969ba0f1f5"; - sha256 = "1787c0jkawz3gxkaxl6m6pmfw9qcjpg8rpy6c3xcy8fvgd4sngr2"; + rev = "dd9de68c08b6d678198a99f5ea13e0384a1f04cf"; + sha256 = "1gghyy82rcbq6q13h6gllr3qi367v19sdndq9sqrgp5grq30j5bq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -11656,12 +11669,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-09-10"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "6f12b6b378af873c46697814fb0dd27588bd255b"; - sha256 = "0mcnjz9ypsv4m2jifc7mg6zyq01zddn1l1hmlyzpy5ifx167dpc9"; + rev = "d72b761c401be2ebed736e4b6f7680de86dd0bea"; + sha256 = "1iw47xxxmjx3xd3fvpi6s442w9zbcx0413y01a2zipaya31azgb7"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11788,12 +11801,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-07-05"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "9c23e2fce1c0c7445f68f7765e5f3e512920184b"; - sha256 = "1cf2pwkbdnsm8qaqizjcidn12sfgn7yamxxr87h13cy5jl9v861x"; + rev = "5721be27df11a19b9cd95e6a4887f16f26599802"; + sha256 = "1h4id0qb3b764y528hgf6a0mr9wm9vnl1yhw8kn8dc8qmg65wap5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -11813,12 +11826,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-09-11"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "fe999db6e0c39c8984519ead75660e0e2d3245d3"; - sha256 = "0ycv08nlm1lbvc3bqxf37kb4is4k0sv7k0srd8fhdlwwpbvpnb5x"; + rev = "927c10f748e49c543b2d544c321a1245302ff324"; + sha256 = "0d4b81ilajckqa0zrnrrv3q6l25g690fs273754nwvjcx7jqwpkl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -12017,12 +12030,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-09-05"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "c0543b2980251a7a2024e936ef724dcdfb07bb87"; - sha256 = "11f821jqb4yvy1s6z3psxhwsbwssjxgikihiqpy1iw5px3h5zqjh"; + rev = "b2adb63ffd952c72eadd036a262e6e6c60de19f3"; + sha256 = "0in5qjqxqbx9158s9cbcf27hh0ly8jr7avydqaywrs97g3gzlk3b"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -12198,12 +12211,12 @@ final: prev: triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-08-31"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "c11c540efb50cbb79ca16ece9ffc9e0d761427ea"; - sha256 = "09w1z8l170ikxxswdxxis41sdsahzr8dslbva2lh65sa2nhp4kk8"; + rev = "94f3089a6391adad3eb72169429523719ee82d45"; + sha256 = "06k1mkzyz8xfdhc3709z8darsm268wr2jjv2909g0my1drxlnfmx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -12355,12 +12368,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-08-22"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "53ed7c65e466963c916251f9ce6df7dd3685dc36"; - sha256 = "1mn111slp5s894nyp9jaqxkc56vnzsbmwbg2fihyg933sq3n37dp"; + rev = "ff21db642847840db183b9421ab3d89795a7fbba"; + sha256 = "0rkxfmacwwpzifpnqfbizla425b7gfay0jfgw84bfidspvc33vab"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -12403,12 +12416,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-09-10"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "814f968b3d48813d949046a9ee6aa0b7388fa276"; - sha256 = "0zjnv574wyfd3pgkp08ivkg6j597lb72f9v94dw7lw3k67anfkn7"; + rev = "5bccedb06252ef92ec998c2bff29d9995cbc61a0"; + sha256 = "1095gdx28bqvix58k2rhh462kvgphqr13lk5998vcahw390lny26"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12511,12 +12524,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-09-09"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "960557d2cbfe3226187a4f542e53a6603ab87bce"; - sha256 = "1ir5ygyw1i9f5d7s2r74dadk809lnvbcv48q047yhil4ff51cwrg"; + rev = "b1fe33e532aa360203e8015a557ba79dd38e07e4"; + sha256 = "0gwcn7r43143k95k5gzni6g9gj20kf5k4yy0gax8kdmdfc6660k1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -13819,12 +13832,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-07-22"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "753fc863e488bd09580221d7829c3e4735a99fdb"; - sha256 = "0bzhbsnpabln2p6r1ns6dmxb6x01jy002y60w8ah49qjn6qnmk1n"; + rev = "39cfaec9ea71c22a82c459ecd64860c8850f1215"; + sha256 = "12j1gqkm3dhcfx1axi8cl2zzj20z9a3xf5ggyqlr41f1bzpmprdh"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -14117,18 +14130,6 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPlugin { - pname = "vim-fsharp"; - version = "2018-11-13"; - src = fetchFromGitHub { - owner = "fsharp"; - repo = "zarchive-vim-fsharp"; - rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; - sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; - }; - meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; - }; - vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; @@ -14600,12 +14601,12 @@ final: prev: vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; - version = "2021-06-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "e6f3f8ffaae9c2f9deea2bbb596b64468041616c"; - sha256 = "1lrkby9m60ccgm35y1z82llgzjd5vmdwfscy7byjd5ycnkhyangi"; + rev = "54edc719402c08b409d192e97f77325c418fb12e"; + sha256 = "11pfzsizvkzkhjivlfgjjzajyr4cb93wqrhh6862q50ib6kxkv05"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -15346,12 +15347,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-09-09"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "8522c9b3ba6c92ac64a609fa792134ce6ba9c4bc"; - sha256 = "01y7gq4q7y9cis9zql3x1g1vnz4nd8ax749vd088iqqvn5z6y7sw"; + rev = "1975afe63198ab6a0dff7200919828e5cd4330b9"; + sha256 = "05gwlf5fmkvs4p92n7l397brb8g6g62pvxcd93kffv289vmx7rzk"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -15946,12 +15947,12 @@ final: prev: vim-pets = buildVimPlugin { pname = "vim-pets"; - version = "2024-09-10"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "MeF0504"; repo = "vim-pets"; - rev = "0b406e97db767a1c4f1e5de2036e1bbf8934f95b"; - sha256 = "1pwra18q3kwr997w3kv22xykjs40sfdxnxkpammfac38ril8jl87"; + rev = "79a43dda7c90560c94c04587c8e5dc0961a0804b"; + sha256 = "14vclpxw8m0s4ma832rdkvyl0dgk7ladv0xbmj9gvgkkl5dm2ci8"; }; meta.homepage = "https://github.com/MeF0504/vim-pets/"; }; @@ -16150,12 +16151,12 @@ final: prev: vim-puppet = buildVimPlugin { pname = "vim-puppet"; - version = "2024-09-08"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "8f6abca1534c03cae0bd950016750e05ed67c7e2"; - sha256 = "0nnb98hy86d1w1s4p3m7ky9q5qc4l19zna935qmivhn2hb2c3gpf"; + rev = "10bf0b27c5be81ee26c3a0d32e39b270f95329ce"; + sha256 = "0a6gvzz27f2121hdnzszcs6haw8pysp1k1wzq3ygjq0nzrddnlk1"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -16474,12 +16475,12 @@ final: prev: vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; - version = "2024-06-04"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "itspriddle"; repo = "vim-shellcheck"; - rev = "52aaa9c0d976756923ee8bd5f02f7d6a4a7f1bcc"; - sha256 = "1749wi96gj9qzkws3hs494mnmc9w99s8gcmi35qzwng77jp7jvqm"; + rev = "35bccea0c566f9f005679d02fed07e96092e100b"; + sha256 = "140r70q9dy7l2v7zxxrv45gswr5i3hbvbazaz2cgmj2g3if4d91h"; }; meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; @@ -17111,12 +17112,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2024-05-26"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "5b3c701686fb4e6629c100ed32e827edf8dad01e"; - sha256 = "0kcrz2hlv672v0967n7zz1f5xl8vh41nmps0pvms9bplw1p5nzx3"; + rev = "a9b52e7d36114d40350099f254b5f299a35df978"; + sha256 = "0sfsyf2jk57511pba6g31zfp0qi6v02np78sq6pzgny8qv40rj11"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -17147,12 +17148,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-06-13"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "f59f144b73e79aae7a73bb86bf527e79ad86de8f"; - sha256 = "0h16bs65ic5iwry8mq22v4xkn1wc2a6xin0vqn5qnlg38q7fgpn1"; + rev = "72a624f97730059bab359cb0b58a23433bfec308"; + sha256 = "1sz3mqsji14yrrrkvnx00dgaf908zkwq9m2myb5jk2gyj3z1dgib"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -17603,12 +17604,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-09-10"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "ac48ef03271f7d5f34fa4c5371c231b257a28c89"; - sha256 = "0jlg51by287pxzjy503af142licfxbhf7aibbmndgn3bazbaqirf"; + rev = "51a7c79809e619c9bd45f9c369ee75c1bb326ea5"; + sha256 = "18zq54bdlf2qfl19kg8vjdii6qagb7nvss9ywyhls8yvdq3x4nfd"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17724,12 +17725,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-09-01"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ec3b648af5092372ddd72404fb5db46b2f78beb5"; - sha256 = "1nirjrzikw53kwn49bppwmaqfgxl5c0pr0y5cbynl9ijs30d732m"; + rev = "539a203f19531c6b9d2d1b093ee8911fb7050bbc"; + sha256 = "02d6znxk70qggmj57rkj7fzd3yh52hyywq2ndlxh55df360awpmf"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -17904,12 +17905,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-09-07"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "ba630e2e174f9fe963c4bce17024a4adbcb09624"; - sha256 = "1bk07sic3b2nyywyz714wjqs3mk8gajys5z7d3bnc1anq0h5navl"; + rev = "f8bb3343d4eaf14dfe153a0eb0302db2a751cf34"; + sha256 = "1m08bpahlkx5fl76nz7q4hj35nvapi4cf9d8c9li61a5vng7z2qj"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -18097,12 +18098,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-09-11"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "58bb48dd5e1e36b92bc3dae882b10c52e731f27f"; - sha256 = "0f7b8088z0jhwv784gwz6miw4m8vzv14y9ficqczhv2xl2pf3ihn"; + rev = "ac97d7c5e47490ecd179647bc0d0ea04c9ce3329"; + sha256 = "1iq9849g5vvqqpp7vdv9h746b1h5vvwindgqlgj5vapfsjrnzl0c"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18131,6 +18132,18 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; + zarchive-vim-fsharp = buildVimPlugin { + pname = "zarchive-vim-fsharp"; + version = "2018-11-13"; + src = fetchFromGitHub { + owner = "fsharp"; + repo = "zarchive-vim-fsharp"; + rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; + sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; + }; + meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; + }; + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; @@ -18181,12 +18194,12 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-08-24"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "006f15ad3437d85884ad50347bcbc60c9a377640"; - sha256 = "1cydhz2f82llms865jqpfrkkp8mab44mssdr1d245swgmw24fm12"; + rev = "12daea796d5079a65dd7032bb85540443e8b30e8"; + sha256 = "1a4b1zr3kpf1mcqq9zssa9hs75l5v8f4x18abh20q4v0x0ad59mi"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; }; @@ -18265,12 +18278,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-08-20"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "4fd72a9ab64b393c2c22b168508fd244877fec96"; - sha256 = "1fznbifj9xayimdjld2zhn9003mgp93sd87lpaky7pr6nsgsgnb8"; + rev = "63685e1562ef53873c9764b483d7ac5c7a608922"; + sha256 = "1b283i43p1i49mql84s6njfnf4mdf9csknp9hdkjjagwfi509wgm"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -18419,14 +18432,14 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - render-markdown-nvim = buildVimPlugin { - pname = "render-markdown.nvim"; - version = "2024-09-09"; + render-markdown = buildVimPlugin { + pname = "render-markdown"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "a5e2d0b1215814c3d033be1fd8eccf59ce366399"; - sha256 = "0xnz3kl45lh5n2zjas5hdqwd9ac7smcmshvvgjvkacl6xk9rgflr"; + rev = "f84eeaebac278e26bd2906fd47747631716a5edb"; + sha256 = "01vvnwlqgs0kj9w5ispsd621k94rjcipqpfq5ldr1ijbijln9k13"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a3d75e591c76..90283eff840b 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -900,12 +900,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=ddc3137"; + version = "0.0.0+rev=66aec57"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "ddc3137a2d775aca93084ff997fa13cc1691058a"; - hash = "sha256-q1xL3/4W442z1wjYL0HQNdz4sPZqqEijyLSvECHugXw="; + rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee"; + hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -966,12 +966,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=1f55029"; + version = "0.0.0+rev=3b01edc"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "1f55029bacd0a6a11f6eb894c4312d429dcf735c"; - hash = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; + rev = "3b01edce2b9ea6766ca19328d1850e456fde3103"; + hash = "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -1143,12 +1143,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=cf432a7"; + version = "0.0.0+rev=5439302"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "cf432a7420eb71e9b40954aa829dcb8a9bf6b546"; - hash = "sha256-LnbEEV8N9undyrC0ziH2nfbFOOEAPKVPXTyl7Xq0KG0="; + rev = "543930235970a04c2f0d549c9e88815847c7a74a"; + hash = "sha256-MElmidivJtIywWm4dRslrmtc/vVwGDO1f6k/0P3gb4E="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1220,12 +1220,12 @@ }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=fba6ed8"; + version = "0.0.0+rev=ff07a42"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "fba6ed8db3a009b9e7d656511931b181a3ee5b08"; - hash = "sha256-JWFEk1R19YIeDNm3LkBmdL+mmfhtBDhHfg6GESwruU0="; + rev = "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"; + hash = "sha256-9uRRlJWT0knZ3vvzGEq9CjyffQnYF53rnoBnsQ68zyE="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -1473,12 +1473,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=90fd989"; + version = "0.0.0+rev=1e4e303"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "90fd9894bebddce79f5b8041e7f82523364a619b"; - hash = "sha256-+wUGNYpw2udCrF4+qMD/4TAPkBCB7q/49Qx/k/FQa3U="; + rev = "1e4e30342b7a3b3a24886a632fbac53035d98871"; + hash = "sha256-A2uvHRoe9xtgsHSLYdZiztGLXdqXzsfw4BYeZ/Cmr4k="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1617,24 +1617,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=c25b635"; + version = "0.0.0+rev=d9287a6"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "c25b6354120182f1e0d5caa52f717b097a7e46a3"; - hash = "sha256-OdBFhflQbHlEcl6hKHnFiwNVf6DkSvJD7FbE6uiZB58="; + rev = "d9287a6f36347064e55c36858e9e522eb652c1ad"; + hash = "sha256-QFHPlvoJMTMepV1KxKXKjpiKMMmGzBO5mxxNcWKLO7s="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=c25b635"; + version = "0.0.0+rev=d9287a6"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "c25b6354120182f1e0d5caa52f717b097a7e46a3"; - hash = "sha256-OdBFhflQbHlEcl6hKHnFiwNVf6DkSvJD7FbE6uiZB58="; + rev = "d9287a6f36347064e55c36858e9e522eb652c1ad"; + hash = "sha256-QFHPlvoJMTMepV1KxKXKjpiKMMmGzBO5mxxNcWKLO7s="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1920,12 +1920,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=70db420"; + version = "0.0.0+rev=4659839"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "70db420b20885ecd7268e5a710ebb3aeaef3a293"; - hash = "sha256-4iatIqb2IaZ6McbkBY6JQiD2IMm3PNLz7qve+2iOrU8="; + rev = "465983954cae2d2f984eae82de5ed5f11ca291dc"; + hash = "sha256-jSVmxGkumDXExLjT+Nnsu+E0IBB3z6wBb4y8hpp5IQs="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; @@ -2233,12 +2233,12 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=c8b6e5f"; + version = "0.0.0+rev=4279b69"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "c8b6e5f3f3c055cfc76471ebc912286e9e73d7d2"; - hash = "sha256-B+pDrkXIaWd16hN5FzunrdmO/hbqQdHI6pgGUdWZYEg="; + rev = "4279b699c47fa87956045980c46c7d30f8c0121b"; + hash = "sha256-9IjhdtkQNshRJq48jBW6cvDd/tVNwgYfRK2YWhdFG84="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2442,12 +2442,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=b02af60"; + version = "0.0.0+rev=ec13dd6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "b02af60518ae1633d552ae2d0f25ca5e05f274f7"; - hash = "sha256-mfbYjU4Xs61oLqgABV1UXR/g4Qd7KRdlawX3/lAz2jc="; + rev = "ec13dd674bb8dd89213e0d6b1fe45efb68d5878f"; + hash = "sha256-ireSo04kG2RMlCZD1hf6BJcjT7eXjYdOqOsoMtQAwKQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2499,12 +2499,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=4a3fabd"; + version = "0.0.0+rev=dd991eb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "4a3fabd26b09efd7431ea4899e5f2d81b568a4b9"; - hash = "sha256-SlLN4KkuSuywWtZlP8J0/bf4sFIres1er3HiK+gj4vA="; + rev = "dd991eb3b6957a33d9044e0f5914588f7f449a78"; + hash = "sha256-Kt396lw3O3X4I3sEadfhoRVi598UCknOmdCPIMpqgdA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -3058,12 +3058,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=d63bc6c"; + version = "0.0.0+rev=83b7286"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "d63bc6c08a88715c89f4b1b06642e130dd899aba"; - hash = "sha256-RYYxkYGaWKFvkAgthchwxWqA3WYNzwd9dAJPv4um4jc="; + rev = "83b7286d8f4f33c88dff102bad22149d8e29d9eb"; + hash = "sha256-O9NXsijpl7+7KWLYwH95Pa4QeWfik6i+wAK5OWV/xgc="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5d6e94039192..8838032be3e1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -201,8 +201,8 @@ https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, -https://github.com/numtostr/comment.nvim/,, https://github.com/LudoPinelli/comment-box.nvim/,HEAD, +https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, https://github.com/hrsh7th/compe-conjure/,, https://github.com/GoldsteinE/compe-latex-symbols/,, @@ -294,6 +294,7 @@ https://github.com/NTBBloodbath/doom-one.nvim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, +https://github.com/earthly/earthly.vim/,HEAD, https://github.com/Shougo/echodoc.vim/,, https://github.com/sainnhe/edge/,, https://github.com/edgedb/edgedb-vim/,, @@ -663,8 +664,8 @@ https://github.com/preservim/nerdcommenter/,, https://github.com/preservim/nerdtree/,, https://github.com/Xuyuanp/nerdtree-git-plugin/,, https://github.com/miversen33/netman.nvim/,HEAD, -https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/prichrd/netrw.nvim/,HEAD, +https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, https://github.com/chr4/nginx.vim/,, @@ -904,7 +905,7 @@ https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, -https://github.com/danielfalk/smart-open.nvim,0.2.x, +https://github.com/danielfalk/smart-open.nvim/,0.2.x, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, @@ -994,6 +995,7 @@ https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, +https://github.com/joerdav/templ.vim/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/chomosuke/term-edit.nvim/,HEAD, @@ -1538,4 +1540,3 @@ https://github.com/ziglang/zig.vim/,, https://github.com/zk-org/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, -https://github.com/joerdav/templ.vim,HEAD, diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 80f8374c378f..7ca6cd4b4fc5 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1600"; + version = "1601"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-bSW0ZAPIBDh3+VhAJlp16W1z4fEIPUkI73grJE/KUx4="; + sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o="; }; installPhase = '' diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index d03b005d0b46..014bc216b40b 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -17,13 +17,20 @@ stdenv.mkDerivation rec { version = "2024.04"; - src = if stdenv.isAarch64 then fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; - } else fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; - }; + src = { + aarch64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; + hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src_repo = fetchFromGitHub { repo = "koreader"; @@ -68,7 +75,7 @@ stdenv.mkDerivation rec { "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; }; diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 9f59da0f9c12..9f3b685cd06c 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-lpXcH45BFgfRjkEHqimnHonDenm5YA6oahe4sN2wpY4="; + hash = "sha256-aVQSWvQTRdz5R9uEXU4CvveRaPdehcL7hrXwFoPCEyI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index 1d2c6681c1b9..9eeac726a83f 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-K0TXWFCSVjwogSXiTRX2eE92w5OzOGVeU4hFkDTJl+M="; + hash = "sha256-PRzLTlq8XfI5dYZhJ8YBtYi4H3883S2olp9jrn1Q5CQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index 9537ab4c1784..dfab962499f9 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2024.98.119300"; + version = "2024.263.131851"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-N0cabYHaF5H1EeriQRQL7bN5UM85oOGrm9pxGr1AlEk="; + hash = "sha256-8rmTGCHROdq+g+IsuZUMbhXfQEKfiy0riSXjLZ2yDhA="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index c8d5bea6f602..824476090c24 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -1,39 +1,39 @@ { stdenv , lib , fetchFromGitHub -, qmake +, cmake , pkg-config -, wrapQtAppsHook +, qt6 , libarchive , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "CEmu"; - version = "unstable-2022-06-29"; + version = "2.0"; src = fetchFromGitHub { owner = "CE-Programming"; repo = "CEmu"; - rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9"; - hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-fohsIJrvPDMmYHoPbmYQlKLMnj/B3XEBaerZYuqxvd8="; fetchSubmodules = true; }; + sourceRoot = "${finalAttrs.src.name}/gui/qt/"; + + nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook pkg-config ]; buildInputs = [ + qt6.qtbase libarchive libpng ]; - qmakeFlags = [ - "gui/qt" - ]; - meta = with lib; { description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; mainProgram = "CEmu"; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 00b69e03f1b8..8a3ff56e1f6b 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "3.27-unstable-2024-08-24"; + version = "3.27-unstable-2024-09-15"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "92ae1a3f9c9f6808f3faefa10ae66c0ff480dab2"; - hash = "sha256-AHZ9p7yyYENHywNppsSTfaM3KFqpX5ehxfjPwocHv5Q="; + rev = "ba00d77289f1c9ce64108b1bbcee02c71ce48633"; + hash = "sha256-yFzsMNVjQK64uQSfjQKC8LbdQu7/97hDolRMBc4Womc="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index d6ec352d32a2..f215ec0037d4 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { autoreconfHook ]; + # clang warning: passing arguments to '...' without a prototype is deprecated + # in all versions of C and is not supported in C23. + CFLAGS = "-std=c99 -Wno-deprecated-non-prototype"; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 884eeb893ac4..51822966e6e6 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - hash = "sha256-Mc9/P4VBmLOC05xqdx/yopbhvdpQS3uejc4YA7BIgug="; + hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I="; }; - cargoHash = "sha256-NyyficEDJReMLAw2VAK2fOXNIwHilnUqQRACGck+0Vo="; + cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 717a410eae80..a8dc37f177ef 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.29.2"; + version = "3.29.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-C3AQ5HHsD2JfF/BO+t3Rbx1DQwRXMG41i2wsk/9BkF8="; + hash = "sha256-3GXTdIXITZeDqe6gxwOCaFXwITYYfXTy57H2AHA5Zyc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 9b7ec4090dd5..59be77c454de 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; + hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix new file mode 100644 index 000000000000..af057af6b5cf --- /dev/null +++ b/pkgs/by-name/ba/backrest/package.nix @@ -0,0 +1,65 @@ +{ + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + lib, + restic, + util-linux, +}: +let + pname = "backrest"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "garethgeorge"; + repo = "backrest"; + rev = "refs/tags/v${version}"; + hash = "sha256-qxEZkRKkwKZ+EZ3y3aGcX2ioKOz19SRdi3+9mjF1LpE="; + }; + + frontend = buildNpmPackage { + inherit version; + pname = "${pname}-webui"; + src = "${src}/webui"; + + npmDepsHash = "sha256-mS8G3+JuASaOkAYi+vgWztrSIIu7vfaasu+YeRJjWZw="; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r dist/* $out + runHook postInstall + ''; + }; +in +buildGoModule { + inherit pname src version; + + vendorHash = "sha256-YukcHnXa/QimfX3nDtQI6yfPkEK9j5SPXOPIT++eWsU="; + + preBuild = '' + mkdir -p ./webui/dist + cp -r ${frontend}/* ./webui/dist + ''; + + nativeCheckInputs = [ util-linux ]; + + # Fails with handler returned wrong content encoding + checkFlags = [ "-skip=TestServeIndex" ]; + + preCheck = '' + # Use restic from nixpkgs, otherwise download fails in sandbox + export BACKREST_RESTIC_COMMAND="${restic}/bin/restic" + export HOME=$(pwd) + ''; + + meta = { + description = "Web UI and orchestrator for restic backup"; + homepage = "https://github.com/garethgeorge/backrest"; + changelog = "https://github.com/garethgeorge/backrest/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ interdependence ]; + mainProgram = "backrest"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 848f5406c1d2..7576636a5bf6 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,20 +26,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.28.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-SLND+eEEMFVHE5XPt2EKkJ+BjENqvUSrWkqnC6ghUBI="; + hash = "sha256-UXxMHTunsKXXt0NX5fuyzQbtp4AUzLXnFHqe8Is6Cmc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-RFn7Bbx1xMm4gt++lhPflXjEfTIgmls2TkrJ8Ta2qpI="; + npmDepsHash = "sha256-p3kdYuDiPZ9SmtrFajXd76Ohd+VUqn/Y8SpAPFrTBZA="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix index cbce445d630a..fd748332c230 100644 --- a/pkgs/by-name/di/diagrams-as-code/package.nix +++ b/pkgs/by-name/di/diagrams-as-code/package.nix @@ -29,6 +29,7 @@ python3Packages.buildPythonPackage rec { pythonRelaxDeps = [ "diagrams" "pydantic" + "pyyaml" ]; pythonImportsCheck = [ "diagrams_as_code" ]; diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 1436404bd9a1..b23a0a6314aa 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps="; + hash = "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 402b94f044a3..441fbf6cc4e8 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -9,18 +9,18 @@ installShellFiles, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.2-unstable-2024-08-02"; + version = "0.13.3"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; - rev = "d5199df24e6db039c460fa37fe3279f89c3bfc63"; - hash = "sha256-8/drsrJq8mfrWvTCcNX0eoPHzywxQNuyRdxQE/zb8lA="; + rev = "v${version}"; + hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk="; }; - cargoHash = "sha256-+LBmswq2mvM0hb6wwCQMxL+C/TdpRGZQGufgsqC1KSQ="; + cargoHash = "sha256-LEOORHD0j+HVl/fB9Q2xVZ2AxZKsPE5SeOS1ZsKwTSo="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix new file mode 100644 index 000000000000..337794ac642f --- /dev/null +++ b/pkgs/by-name/el/elvis/package.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchurl, + fetchpatch, + installShellFiles, + ncurses, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "elvis"; + version = "2.2_0"; + + src = fetchurl { + urls = [ + "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${finalAttrs.version}.tar.gz" + "http://www.the-little-red-haired-girl.org/pub/elvis/old/elvis-${finalAttrs.version}.tar.gz" + ]; + hash = "sha256-moRmsik3mEQQVrwnlzavOmFrqrovEZQDlsxg/3GSTqA="; + }; + + patches = [ + (fetchpatch { + name = "0000-resolve-stdio-getline-naming-conflict.patch"; + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + hash = "sha256-DCo2caiyE8zV5ss3O1AXy7oNlJ5AzFxdTeBx2Wtg83s="; + }) + ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ ncurses ]; + + configureFlags = [ "--ioctl=termios" ]; + + strictDeps = false; + + postPatch = '' + substituteInPlace configure \ + --replace-fail '-lcurses' '-lncurses' + ''; + + installPhase = '' + runHook preInstall + + installBin elvis ref elvtags elvfmt + + pushd doc + for page in *.man; do + installManPage $page + rm $page + done + popd + + mkdir -p $out/share/doc/elvis-${finalAttrs.version}/ $out/share/elvis/ + cp -R data/* $out/share/elvis/ + cp doc/* $out/share/doc/elvis-${finalAttrs.version}/ + + runHook postInstall + ''; + + meta = { + homepage = "http://elvis.the-little-red-haired-girl.org/"; + description = "Vi clone for Unix and other operating systems"; + license = lib.licenses.free; + mainProgram = "elvis"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index 0b57e3b37b8c..425184598af6 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -25,9 +25,9 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.31.1"; - rev = "1f44388cee449c9dae8ae34c0b4f09036bcbf560"; - hash = "sha256-XvlF3hMS2PH87HgFwKoFzxHDYgRjZmxn02L1aLwYOrY="; + version = "1.31.2"; + rev = "cc4a75482810de4b84c301d13deb551bd3147339"; + hash = "sha256-mfQpEGLMJV3UKqcUdbhy6/pP1sWut26zjwN6vDE7LmA="; }; # these need to be updated for any changes to fetchAttrs diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index 264ca14c408c..7393705254d7 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -let version = "0.41.2"; +let version = "0.41.3"; in buildGoModule { pname = "geesefs"; inherit version; @@ -12,7 +12,7 @@ in buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-W7f3vYjU1f6lxwkz24WjS3UzYy95bxk7nKoLpLsvUwM="; + hash = "sha256-KdxqOkz8U8ts/pU/sTMuDIBLxwvdtrkkGptYboh06Qo="; }; # hashes differ per architecture otherwise. diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix index fbfc407b8101..d5a0b78f494f 100644 --- a/pkgs/by-name/gi/githooks/package.nix +++ b/pkgs/by-name/gi/githooks/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "githooks"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "gabyx"; repo = "githooks"; rev = "v${version}"; - hash = "sha256-gTvbvW+AFyZUBt7gSKJGc9lrl7CAy+cOElcADlIvuRk="; + hash = "sha256-9IsE9XGeMgOPPEyBvGLZaZKyz5HjnugiELP76+alFmU="; }; modRoot = "./githooks"; diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 6d6b0bb03dfa..0b1419c8f331 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "glance"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-0P1f7IDEPSlVHtrygIsD502lIHqLISsSAi9pqB/gFdA="; + hash = "sha256-neoRuduQOC3DHeIy/sh1BWUwcwXPGQIgZRWQcL7gzlk="; }; vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08="; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 0d9027fbd07b..d3830c39b360 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Milkshiift"; repo = "GoofCord"; rev = "v${finalAttrs.version}"; - hash = "sha256-hG8nHAuEHw/tjFnGKhSXwO+2l91OOnQUIAK05SvEquU="; + hash = "sha256-ly0HkDFofdOgXOmlUW1za4u2INopiPs6B2kTC217/T0="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm'.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-wF7G8rs1Fg7whEftQ554s4C2CixP5/1oFudR5yY07Rk="; + hash = "sha256-455MGicIaC9WSUiwsbhdXxc8Cs3oqaneyOrMDPWsABw="; }; env = { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/by-name/ho/homebank/package.nix similarity index 60% rename from pkgs/applications/office/homebank/default.nix rename to pkgs/by-name/ho/homebank/package.nix index ef61bb15c301..ff5a4f5e86fb 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -1,16 +1,17 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 +{ fetchurl, lib, stdenv, gtk3, pkg-config, libofx, intltool, wrapGAppsHook3 , libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-1CpForKKHXp6le8vVlObm22VTh2LqQlI9Qk4bwlzfLA="; + url = + "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; + hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; + buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 439bc97d7a2d..11e9680d17d9 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, buildGo123Module +, buildGoModule , fetchFromGitHub , installShellFiles , buildPackages @@ -8,15 +8,15 @@ , hugo }: -buildGo123Module rec { +buildGoModule rec { pname = "hugo"; - version = "0.134.2"; + version = "0.134.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-/jq8YMBgADC2Y98HzZNcDYZ9xhh6am6+G/dgouOGowE="; + hash = "sha256-rdXiuFWMB+cTK5mhtpabWq8Uf9ihDnkHNG1JnD3rLKE="; }; vendorHash = "sha256-oDa5uWQ/vFSmTNwZ3zsYtsuLCzddV9DeaEGx5krwWRE="; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index ca09fcee4868..661eb4d0231c 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-09-15"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "b6f44b5cd020d95c405e149e4c3a0e9dc785e31a"; - hash = "sha256-dXDOX6IvAeznNoh73P2QWstBJ/jqfzEKjgNvdfsGTuY="; + rev = "44248d3cf4162944ec2e6a45f8cc058758bf5a86"; + hash = "sha256-WJ7M/1a8j5gRJJVzCJL6JrkGPckD5ZhKzTlmiKNdtm0="; }; buildInputs = [ diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index 73c7ebe1ec42..dd96593d5d18 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc="; + hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k="; }; - cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA="; + cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index 7ffdc1c83ec4..4216710c0280 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -128,8 +128,8 @@ buildGoModule rec { ui = callPackage ./ui.nix { }; - updateScript = writeScript "ovs-update.nu" '' - ${./update.nu} ${updateScriptArgs} + updateScript = writeScript "ovs-update.py" '' + ${./update.py} ${updateScriptArgs} ''; }; diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index ec0a38efb466..98fe4f2e7c5d 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,13 +1,12 @@ import ./generic.nix { - hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q="; - version = "6.0.1"; - vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; + hash = "sha256-roPBHqy5toYF0X9mATl6QYb5GGlgPoGZYOC9vKpca88="; + version = "6.0.2"; + vendorHash = "sha256-TP1NaUpsHF54mWQDcHS4uabfRJWu3k51ANNPdA4k1Go="; patches = [ # qemu 9.1 compat, remove when added to LTS ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch - ./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch ]; lts = true; - updateScriptArgs = "--lts=true --regex '6.0.*'"; + updateScriptArgs = "--lts --regex '6.0.*'"; } diff --git a/pkgs/by-name/in/incus/update.nu b/pkgs/by-name/in/incus/update.nu deleted file mode 100755 index 754da9b59abf..000000000000 --- a/pkgs/by-name/in/incus/update.nu +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts gnused - -def main [--lts = false, --regex: string] { - let attr = $"incus(if $lts {"-lts"})" - let file = $"(pwd)/pkgs/by-name/in/incus/(if $lts { "lts" } else { "package" }).nix" - - let tags = list-git-tags --url=https://github.com/lxc/incus | lines | sort --natural | str replace v '' - let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last - let current_version = nix eval --raw -f default.nix $"($attr).version" | str trim - - if $latest_tag != $current_version { - print $"Updating: new ($latest_tag) != old ($current_version)" - update-source-version $attr $latest_tag $"--file=($file)" - - let oldVendorHash = nix-instantiate . --eval --strict -A $"($attr).goModules.drvAttrs.outputHash" --json | from json - let checkBuild = do { nix-build -A $"($attr).goModules" } | complete - let vendorHash = $checkBuild.stderr | lines | str trim | find --regex 'got:[[:space:]]*sha256' | split row ' ' | last - - if $vendorHash != null { - open $file | str replace $oldVendorHash $vendorHash | save --force $file - } else { - print $checkBuild.stderr - exit 1 - } - } - - {"lts?": $lts, before: $current_version, after: $latest_tag} -} diff --git a/pkgs/by-name/in/incus/update.py b/pkgs/by-name/in/incus/update.py new file mode 100755 index 000000000000..1db118a596f9 --- /dev/null +++ b/pkgs/by-name/in/incus/update.py @@ -0,0 +1,87 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python3 python3Packages.looseversion common-updater-scripts nurl + +import argparse +import json +import os +import re +from looseversion import LooseVersion +from subprocess import run + +parser = argparse.ArgumentParser() +parser.add_argument("--lts", action="store_true") +parser.add_argument("--regex") +args = parser.parse_args() + +nixpkgs_path = os.environ["PWD"] + +attr = "incus" +file = f"pkgs/by-name/in/incus/package.nix" +if args.lts: + attr = "incus-lts" + file = f"pkgs/by-name/in/incus/lts.nix" + +tags = ( + run(["list-git-tags", "--url=https://github.com/lxc/incus"], capture_output=True) + .stdout.decode("utf-8") + .splitlines() +) +tags = [t.lstrip("v") for t in tags] + +latest_version = "0" +for tag in tags: + if args.regex != None and not re.match(args.regex, tag): + continue + + if LooseVersion(tag) > LooseVersion(latest_version): + latest_version = tag + +current_version = ( + run( + ["nix", "eval", "--raw", "-f", "default.nix", f"{attr}.version"], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() +) + +if LooseVersion(latest_version) <= LooseVersion(current_version): + print("No update available") + exit(0) + +print(f"Found new version {latest_version} > {current_version}") + +run(["update-source-version", attr, latest_version, f"--file={file}"]) + +current_vendor_hash = ( + run( + [ + "nix-instantiate", + ".", + "--eval", + "--strict", + "-A", + f"{attr}.goModules.drvAttrs.outputHash", + "--json", + ], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() + .strip('"') +) + +latest_vendor_hash = ( + run( + ["nurl", "--expr", f"(import {nixpkgs_path} {{}}).{attr}.goModules"], + capture_output=True, + ) + .stdout.decode("utf-8") + .strip() +) + +with open(file, "r+") as f: + file_content = f.read() + file_content = re.sub(current_vendor_hash, latest_vendor_hash, file_content) + f.seek(0) + f.write(file_content) diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix index 409e550109f2..3f00ccb82b52 100644 --- a/pkgs/by-name/lx/lxc/package.nix +++ b/pkgs/by-name/lx/lxc/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc="; + hash = "sha256-qc60oSs2KahQJpSmhrctXpV2Zumv7EvlnGFaOCSCX/E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index b7ade8381c05..7b7516ba72c6 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxcfs"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "v${version}"; - hash = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic="; + hash = "sha256-5r1X/yUXTMC/2dNhpI+BVYeClIydefg2lurCGt7iA8Y="; }; patches = [ diff --git a/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock b/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock new file mode 100644 index 000000000000..e9013801de04 --- /dev/null +++ b/pkgs/by-name/ma/matrix-authentication-service/Cargo.lock @@ -0,0 +1,7602 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli 0.29.0", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aide" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0e3b97a21e41ec5c19bfd9b4fc1f7086be104f8b988681230247ffc91cc8ed" +dependencies = [ + "aide-macros", + "axum", + "axum-extra", + "bytes", + "cfg-if", + "http", + "indexmap 2.5.0", + "schemars", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "aide-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0487f8598afe49e6bc950a613a678bd962c4a6f431022ded62643c8b990301a" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "apalis-core" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1deb48475efcdece1f23a0553209ee842f264c2a5e9bcc4928bfa6a15a044cde" +dependencies = [ + "async-stream", + "async-trait", + "chrono", + "futures", + "graceful-shutdown", + "http", + "log", + "pin-project-lite", + "serde", + "strum 0.25.0", + "thiserror", + "tokio", + "tower", + "tracing", + "ulid", +] + +[[package]] +name = "apalis-cron" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43310b7e0132f9520b09224fb6faafb32eec82a672aa79c09e46b5b488ed505b" +dependencies = [ + "apalis-core", + "async-stream", + "chrono", + "cron", + "futures", + "tokio", + "tower", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argon2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii_utils" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io 2.3.3", + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", + "once_cell", +] + +[[package]] +name = "async-graphql" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d37c3e9ba322eb00e9e5e997d58f08e8b6de037325b9367ac59bca8e3cd46af" +dependencies = [ + "async-graphql-derive", + "async-graphql-parser", + "async-graphql-value", + "async-stream", + "async-trait", + "base64 0.22.1", + "bytes", + "chrono", + "fast_chemail", + "fnv", + "futures-timer", + "futures-util", + "handlebars", + "http", + "indexmap 2.5.0", + "mime", + "multer", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions_next", + "tempfile", + "thiserror", + "tracing", + "tracing-futures", + "url", +] + +[[package]] +name = "async-graphql-derive" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1141703c11c6ad4fa9b3b0e1e476dea01dbd18a44db00f949b804afaab2f344" +dependencies = [ + "Inflector", + "async-graphql-parser", + "darling 0.20.10", + "proc-macro-crate", + "proc-macro2", + "quote", + "strum 0.26.3", + "syn 2.0.68", + "thiserror", +] + +[[package]] +name = "async-graphql-parser" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f66edcce4c38c18f7eb181fdf561c3d3aa2d644ce7358fc7a928c00a4ffef17" +dependencies = [ + "async-graphql-value", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-value" +version = "7.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0206011cad065420c27988f17dd7fe201a0e056b20c262209b7bffcd6fa176" +dependencies = [ + "bytes", + "indexmap 2.5.0", + "serde", + "serde_json", +] + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "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.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e89b6941c2d1a7045538884d6e760ccfffdf8e1ffc2613d8efa74305e1f3752" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-extra" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" +dependencies = [ + "axum", + "axum-core", + "bytes", + "cookie", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bcrypt" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" +dependencies = [ + "base64 0.22.1", + "blowfish", + "getrandom", + "subtle", + "zeroize", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", + "which", +] + +[[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 = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[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 = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] +name = "blowfish" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" +dependencies = [ + "byteorder", + "cipher", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +dependencies = [ + "serde", +] + +[[package]] +name = "calendrical_calculations" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "chronoutil" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b58b07a67cadda9502b270eca5e0f1cd3afd08445e0ab1d52d909db01b4543" +dependencies = [ + "chrono", +] + +[[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.5", + "stacker", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "aes-gcm", + "base64 0.22.1", + "hkdf", + "percent-encoding", + "rand", + "sha2", + "subtle", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" +dependencies = [ + "cookie", + "idna 0.5.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "cranelift-bforest" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6b33d7e757a887989eb18b35712b2a67d96171ec3149d1bfb657b29b7b367c" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-codegen" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9acf15cb22be42d07c3b57d7856329cb228b7315d385346149df2566ad5e4aa" +dependencies = [ + "bumpalo", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-control", + "cranelift-entity", + "cranelift-isle", + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "regalloc2", + "rustc-hash", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e934d301392b73b3f8b0540391fb82465a0f179a3cee7c726482ac4727efcc97" +dependencies = [ + "cranelift-codegen-shared", +] + +[[package]] +name = "cranelift-codegen-shared" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb2a2566b3d54b854dfb288b3b187f6d3d17d6f762c92898207eba302931da" + +[[package]] +name = "cranelift-control" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0100f33b704cdacd01ad66ff41f8c5030d57cbff078e2a4e49ab1822591299fa" +dependencies = [ + "arbitrary", +] + +[[package]] +name = "cranelift-entity" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8cfdc315e5d18997093e040a8d234bea1ac1e118a716d3e30f40d449e78207b" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "cranelift-frontend" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f74b84f16af2e982b0c0c72233503d9d55cbfe3865dbe807ca28dc6642a28b5" +dependencies = [ + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-isle" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf306d3dde705fb94bd48082f01d38c4ededc74293a4c007805f610bf08bc6e" + +[[package]] +name = "cranelift-native" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea0ebdef7aff4a79bcbc8b6495f31315f16b3bf311152f472eaa8d679352581" +dependencies = [ + "cranelift-codegen", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.109.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d549108a1942065cdbac3bb96c2952afa0e1b9a3beff4b08c4308ac72257576d" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools 0.12.1", + "log", + "smallvec", + "wasmparser", + "wasmtime-types", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cron" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.68", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.68", +] + +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "fuzzy-matcher", + "shell-words", + "tempfile", + "thiserror", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "duration-str" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709d653e7c92498eb29fb86a2a6f0f3502b97530f33aedb32ef848d4d28b31a3" +dependencies = [ + "rust_decimal", + "thiserror", + "winnow 0.6.13", +] + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "email-encoding" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +dependencies = [ + "base64 0.22.1", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" + +[[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" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "fast_chemail" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" +dependencies = [ + "ascii_utils", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "serde_yaml", + "tempfile", + "uncased", + "version_check", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" +dependencies = [ + "displaydoc", + "smallvec", + "writeable", +] + +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator", + "indexmap 2.5.0", + "stable_deref_trait", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand", + "smallvec", + "spinning_top", +] + +[[package]] +name = "graceful-shutdown" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3effbaf774a1da3462925bb182ccf975c284cf46edca5569ea93420a657af484" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_calendar" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb932a690c92f87955e923106181ee0d5682e688ff37fb5c7b296e1fe806edb" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22aec7d032735d9acb256eeef72adcac43c3b7572f19b51576a63d664b524ca2" + +[[package]] +name = "icu_datetime" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1508c7ed627cc0b031c81203eb98f34433e24b32b39d5b2c0238e4962a00957d" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6abc569cb4ee80b30707566f05c5c9ed4bed765f91ce41e7f5a37c5e6a75b3f" + +[[package]] +name = "icu_decimal" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf994f9ed8061c17bb313f28fba6cffc736f0a16c7fab827efc9b73fd3f7778" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2de3548316b697c70f30dec1395c9212db09df1d86a27624ee24872b71326c" + +[[package]] +name = "icu_list" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6c04ec71ad1bacdbfb47164d4801f80a0533d9340f94f1a880f521eff59f54" +dependencies = [ + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f6afcf7a9a7fedece70b7f17d7a7ecdfb8df145d37ae46d0277cd1e3932532" + +[[package]] +name = "icu_locid" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" + +[[package]] +name = "icu_plurals" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d807b123eb2a9ae8f12080fb8cce479f5c8a761fba0bb5ab52da6dd5e31a03" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3acd5f1f2f988ed2dae9316c3d3560dfe4e03a7516d142b4b89b92252ada41a" + +[[package]] +name = "icu_provider" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "icu_relativetime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47825312a5eb0790bad7b718fa8d41a8ea1e0ba597b4f7bb84bcfe97d7fc5aba" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_relativetime_data", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_relativetime_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b55cc15ea8981fbba78e9347d0c4003d4490c85f76e9adc7f270290046cae8" + +[[package]] +name = "icu_timezone" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35aabe571a7c653c0f543ff1512b8a1b2ad481cfa24b3d25115298d2ff3b50f" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceee21e181cce2ab44e95923da6b3418df75369f570df82264c29c51ca398d4" + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inherent" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "insta" +version = "1.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +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 0.3.9", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "iri-string" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + +[[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" +dependencies = [ + "serde", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "lettre" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" +dependencies = [ + "async-std", + "async-trait", + "base64 0.22.1", + "chumsky", + "email-encoding", + "email_address", + "fastrand 2.1.0", + "futures-io", + "futures-util", + "hostname", + "httpdate", + "idna 0.5.0", + "mime", + "nom", + "percent-encoding", + "quoted_printable", + "rustls", + "rustls-pemfile", + "socket2 0.5.7", + "tokio", + "tokio-rustls", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libloading" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "listenfd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" +dependencies = [ + "libc", + "uuid", + "winapi", +] + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "mas-axum-utils" +version = "0.12.0" +dependencies = [ + "async-trait", + "axum", + "axum-extra", + "bytes", + "chrono", + "data-encoding", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "hyper-util", + "icu_locid", + "mas-data-model", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mas-storage", + "mas-templates", + "mime", + "oauth2-types", + "rand", + "sentry", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tracing", + "ulid", + "url", +] + +[[package]] +name = "mas-cli" +version = "0.12.0" +dependencies = [ + "anyhow", + "axum", + "bytes", + "camino", + "clap", + "console", + "dialoguer", + "dotenvy", + "figment", + "http", + "http-body", + "http-body-util", + "httpdate", + "hyper", + "ipnetwork", + "itertools 0.13.0", + "listenfd", + "mas-config", + "mas-data-model", + "mas-email", + "mas-handlers", + "mas-http", + "mas-i18n", + "mas-iana", + "mas-keystore", + "mas-listener", + "mas-matrix", + "mas-matrix-synapse", + "mas-policy", + "mas-router", + "mas-spa", + "mas-storage", + "mas-storage-pg", + "mas-tasks", + "mas-templates", + "mas-tower", + "oauth2-types", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-jaeger-propagator", + "opentelemetry-otlp", + "opentelemetry-prometheus", + "opentelemetry-resource-detectors", + "opentelemetry-semantic-conventions", + "opentelemetry-stdout", + "opentelemetry_sdk", + "prometheus", + "rand", + "rand_chacha", + "rustls", + "sentry", + "sentry-tower", + "sentry-tracing", + "serde_json", + "serde_yaml", + "sqlx", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "zeroize", +] + +[[package]] +name = "mas-config" +version = "0.12.0" +dependencies = [ + "anyhow", + "camino", + "chrono", + "figment", + "governor", + "indoc", + "ipnetwork", + "mas-iana", + "mas-jose", + "mas-keystore", + "pem-rfc7468", + "rand", + "rand_chacha", + "rustls-pemfile", + "rustls-pki-types", + "schemars", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tracing", + "ulid", + "url", +] + +[[package]] +name = "mas-data-model" +version = "0.12.0" +dependencies = [ + "chrono", + "crc", + "mas-iana", + "mas-jose", + "oauth2-types", + "rand", + "rand_chacha", + "regex", + "serde", + "thiserror", + "ulid", + "url", + "woothee", +] + +[[package]] +name = "mas-email" +version = "0.12.0" +dependencies = [ + "async-trait", + "headers", + "lettre", + "mas-templates", + "thiserror", + "tracing", +] + +[[package]] +name = "mas-handlers" +version = "0.12.0" +dependencies = [ + "aide", + "anyhow", + "argon2", + "async-graphql", + "async-trait", + "axum", + "axum-extra", + "axum-macros", + "base64ct", + "bcrypt", + "camino", + "chrono", + "cookie_store", + "futures-util", + "governor", + "headers", + "hyper", + "indexmap 2.5.0", + "insta", + "lettre", + "mas-axum-utils", + "mas-config", + "mas-data-model", + "mas-http", + "mas-i18n", + "mas-iana", + "mas-jose", + "mas-keystore", + "mas-matrix", + "mas-oidc-client", + "mas-policy", + "mas-router", + "mas-spa", + "mas-storage", + "mas-storage-pg", + "mas-templates", + "mime", + "minijinja", + "nonzero_ext", + "oauth2-types", + "opentelemetry", + "opentelemetry-semantic-conventions", + "pbkdf2", + "psl", + "rand", + "rand_chacha", + "rustls", + "schemars", + "sentry", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "sqlx", + "thiserror", + "time", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", + "ulid", + "url", + "zeroize", + "zxcvbn", +] + +[[package]] +name = "mas-http" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "mas-tower", + "opentelemetry", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "rustls", + "rustls-platform-verifier", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "mas-i18n" +version = "0.12.0" +dependencies = [ + "camino", + "icu_calendar", + "icu_datetime", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_provider_adapters", + "icu_relativetime", + "pad", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", + "writeable", +] + +[[package]] +name = "mas-i18n-scan" +version = "0.12.0" +dependencies = [ + "camino", + "clap", + "mas-i18n", + "minijinja", + "serde_json", + "tracing", + "tracing-subscriber", + "walkdir", +] + +[[package]] +name = "mas-iana" +version = "0.12.0" +dependencies = [ + "schemars", + "serde", +] + +[[package]] +name = "mas-iana-codegen" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "camino", + "convert_case", + "csv", + "futures-util", + "reqwest", + "serde", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mas-jose" +version = "0.12.0" +dependencies = [ + "base64ct", + "chrono", + "digest", + "ecdsa", + "elliptic-curve", + "generic-array", + "hmac", + "insta", + "k256", + "mas-iana", + "p256", + "p384", + "rand", + "rand_chacha", + "rsa", + "schemars", + "sec1", + "serde", + "serde_json", + "serde_with", + "sha2", + "signature", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "mas-keystore" +version = "0.12.0" +dependencies = [ + "aead", + "base64ct", + "chacha20poly1305", + "const-oid", + "der", + "ecdsa", + "elliptic-curve", + "generic-array", + "insta", + "k256", + "mas-iana", + "mas-jose", + "p256", + "p384", + "pem-rfc7468", + "pkcs1", + "pkcs8", + "rand", + "rand_chacha", + "rsa", + "sec1", + "spki", + "thiserror", +] + +[[package]] +name = "mas-listener" +version = "0.12.0" +dependencies = [ + "anyhow", + "bytes", + "event-listener 5.3.1", + "futures-util", + "http-body", + "hyper", + "hyper-util", + "libc", + "pin-project-lite", + "rustls-pemfile", + "socket2 0.5.7", + "thiserror", + "tokio", + "tokio-rustls", + "tokio-test", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mas-matrix" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "http", + "serde", + "tokio", + "url", +] + +[[package]] +name = "mas-matrix-synapse" +version = "0.12.0" +dependencies = [ + "anyhow", + "async-trait", + "http", + "mas-axum-utils", + "mas-http", + "mas-matrix", + "serde", + "serde_json", + "tower", + "tracing", + "url", + "urlencoding", +] + +[[package]] +name = "mas-oidc-client" +version = "0.12.0" +dependencies = [ + "assert_matches", + "base64ct", + "bitflags 2.6.0", + "bytes", + "chrono", + "form_urlencoded", + "futures-util", + "headers", + "http", + "http-body-util", + "language-tags", + "mas-http", + "mas-iana", + "mas-jose", + "mas-keystore", + "mime", + "oauth2-types", + "rand", + "rand_chacha", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "thiserror", + "tokio", + "tower", + "tracing", + "url", + "wiremock", +] + +[[package]] +name = "mas-policy" +version = "0.12.0" +dependencies = [ + "anyhow", + "mas-data-model", + "oauth2-types", + "opa-wasm", + "schemars", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "mas-router" +version = "0.12.0" +dependencies = [ + "axum", + "serde", + "serde_urlencoded", + "ulid", + "url", +] + +[[package]] +name = "mas-spa" +version = "0.12.0" +dependencies = [ + "camino", + "serde", + "thiserror", +] + +[[package]] +name = "mas-storage" +version = "0.12.0" +dependencies = [ + "apalis-core", + "async-trait", + "chrono", + "futures-util", + "mas-data-model", + "mas-iana", + "mas-jose", + "oauth2-types", + "opentelemetry", + "rand_core", + "serde", + "serde_json", + "thiserror", + "tracing", + "tracing-opentelemetry", + "ulid", + "url", +] + +[[package]] +name = "mas-storage-pg" +version = "0.12.0" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "mas-data-model", + "mas-iana", + "mas-jose", + "mas-storage", + "oauth2-types", + "opentelemetry-semantic-conventions", + "rand", + "rand_chacha", + "sea-query", + "sea-query-binder", + "serde", + "serde_json", + "sqlx", + "thiserror", + "tracing", + "ulid", + "url", + "uuid", +] + +[[package]] +name = "mas-tasks" +version = "0.12.0" +dependencies = [ + "anyhow", + "apalis-core", + "apalis-cron", + "async-stream", + "async-trait", + "chrono", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "mas-data-model", + "mas-email", + "mas-i18n", + "mas-matrix", + "mas-router", + "mas-storage", + "mas-storage-pg", + "mas-templates", + "mas-tower", + "opentelemetry", + "rand", + "rand_chacha", + "serde", + "serde_json", + "sqlx", + "thiserror", + "tokio", + "tower", + "tracing", + "tracing-opentelemetry", + "ulid", + "url", +] + +[[package]] +name = "mas-templates" +version = "0.12.0" +dependencies = [ + "anyhow", + "arc-swap", + "camino", + "chrono", + "http", + "mas-data-model", + "mas-i18n", + "mas-router", + "mas-spa", + "minijinja", + "oauth2-types", + "rand", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "tokio", + "tracing", + "ulid", + "url", + "v_htmlescape", + "walkdir", +] + +[[package]] +name = "mas-tower" +version = "0.12.0" +dependencies = [ + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "pin-project-lite", + "tower", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memfd" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" +dependencies = [ + "rustix 0.38.34", +] + +[[package]] +name = "memo-map" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minijinja" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" +dependencies = [ + "memo-map", + "self_cell", + "serde", + "serde_json", + "v_htmlescape", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "memchr", + "mime", + "spin", + "version_check", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[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 = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "oauth2-types" +version = "0.12.0" +dependencies = [ + "assert_matches", + "chrono", + "data-encoding", + "http", + "language-tags", + "mas-iana", + "mas-jose", + "serde", + "serde_json", + "serde_with", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "object" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +dependencies = [ + "crc32fast", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opa-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b727ebe10814d69fb4c1f538e1a0772e1f9b258d30c5a097d04158f8d6017" +dependencies = [ + "anyhow", + "base64 0.22.1", + "chrono", + "chrono-tz", + "chronoutil", + "digest", + "duration-str", + "form_urlencoded", + "hex", + "hmac", + "json-patch", + "md-5", + "parse-size", + "rand", + "rayon", + "semver", + "serde", + "serde_json", + "serde_yaml", + "sha1", + "sha2", + "sprintf", + "thiserror", + "tokio", + "tracing", + "urlencoding", + "wasmtime", +] + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry-http" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" +dependencies = [ + "async-trait", + "bytes", + "http", + "http-body-util", + "hyper", + "hyper-util", + "opentelemetry", + "tokio", +] + +[[package]] +name = "opentelemetry-jaeger-propagator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" +dependencies = [ + "async-trait", + "futures-core", + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost", + "thiserror", +] + +[[package]] +name = "opentelemetry-prometheus" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" +dependencies = [ + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "prometheus", + "protobuf", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost", + "tonic", +] + +[[package]] +name = "opentelemetry-resource-detectors" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a7e965924ad5234917f135243605ef6f2ae3f4da8d3363065d679b2c150f2a" +dependencies = [ + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" + +[[package]] +name = "opentelemetry-stdout" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d408d4345b8be6129a77c46c3bfc75f0d3476f3091909c7dd99c1f3d78582287" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "opentelemetry", + "opentelemetry_sdk", + "ordered-float", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "pad" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.2", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parse-size" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", + "password-hash", + "rayon", + "sha2", +] + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "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_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[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.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[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" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.68", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "version_check", + "yansi", +] + +[[package]] +name = "prometheus" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot", + "protobuf", + "thiserror", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "protobuf" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + +[[package]] +name = "psl" +version = "2.1.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9398ad066421139b2e3afe16ea46772ffda30bd9ba57554dc035df5e26edc8" +dependencies = [ + "psl-types", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[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 = "raw-cpuid" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "regalloc2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +dependencies = [ + "hashbrown 0.13.2", + "log", + "rustc-hash", + "slice-group-by", + "smallvec", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "num-traits", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-roots", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "indexmap 2.5.0", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.68", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "sea-query" +version = "0.32.0-rc.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "chrono", + "inherent", + "sea-query-attr", + "sea-query-derive", + "uuid", +] + +[[package]] +name = "sea-query-attr" +version = "0.1.2" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "darling 0.14.4", + "heck 0.4.1", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sea-query-binder" +version = "0.7.0-rc.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "chrono", + "sea-query", + "sqlx", + "uuid", +] + +[[package]] +name = "sea-query-derive" +version = "0.4.1" +source = "git+https://github.com/sandhose/sea-query?branch=binder/relax-sqlx-dependency#513cee7ea623fd5d26a80fbd6132ace8d17acf22" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.68", + "thiserror", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "num-bigint", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "sentry" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +dependencies = [ + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-panic", + "sentry-tower", + "sentry-tracing", +] + +[[package]] +name = "sentry-backtrace" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +dependencies = [ + "hostname", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-panic" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74f229c7186dd971a9491ffcbe7883544aa064d1589bd30b83fb856cd22d63" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tower" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c90802b38c899a2c9e557dff25ad186362eddf755d5f5244001b172dd03bead" +dependencies = [ + "http", + "pin-project", + "sentry-core", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "sentry-tracing" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +dependencies = [ + "debugid", + "hex", + "rand", + "serde", + "serde_json", + "thiserror", + "time", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "indexmap 2.5.0", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6" +dependencies = [ + "axum", + "futures", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.5.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap 2.5.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[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 = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + +[[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 = "slice-group-by" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sprintf" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e0732124cafd6bf2c9bc15f330fce49acb262beb57c877a2997898244e7f8a" +dependencies = [ + "thiserror", +] + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "sqlformat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcfa89bea9500db4a0d038513d7a060566bfc51d46d1c014847049a45cce85e8" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06e2f2bd861719b1f3f0c7dbe1d80c30bf59e76cf019f07d9014ed7eefb8e08" +dependencies = [ + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener 5.3.1", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.14.5", + "hashlink", + "hex", + "indexmap 2.5.0", + "ipnetwork", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f998a9defdbd48ed005a89362bd40dd2117502f15294f61c8d47034107dbbdc" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.68", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d100558134176a2629d46cec0c8891ba0be8910f7896abfdb75ef4ab6f4e7ce" +dependencies = [ + "dotenvy", + "either", + "heck 0.5.0", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.68", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cac0ab331b14cb3921c62156d913e4c15b74fb6ec0f3146bd4ef6e4fb3c12" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9734dbce698c67ecf67c442f768a5e90a49b2a4d61a9f1d59f73874bd4cf0710" +dependencies = [ + "atoi", + "base64 0.22.1", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "ipnetwork", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75b419c3c1b1697833dd927bdc4c6545a620bc1bbafabd44e1efbe9afcd337e" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions_next" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +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.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.5.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "http", + "http-body", + "http-body-util", + "percent-encoding", + "pin-project", + "prost", + "tokio-stream", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "http-range-header", + "httpdate", + "iri-string", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "futures", + "futures-task", + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "tracing", + "tracing-core", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "ulid" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" +dependencies = [ + "getrandom", + "rand", + "serde", + "uuid", + "web-time", +] + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "serde", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-encoder" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4a05336882dae732ce6bd48b7e11fe597293cb72c13da4f35d7d5f8d53b2a7" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasmparser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "semver", + "serde", +] + +[[package]] +name = "wasmprinter" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceca8ae6eaa8c7c87b33c25c53bdf299f8c2a764aee1179402ff7652ef3a6859" +dependencies = [ + "anyhow", + "wasmparser", +] + +[[package]] +name = "wasmtime" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786d8b5e7a4d54917c5ebe555b9667337e5f93383f49bddaaeec2eba68093b45" +dependencies = [ + "anyhow", + "async-trait", + "bumpalo", + "cc", + "cfg-if", + "hashbrown 0.14.5", + "indexmap 2.5.0", + "libc", + "libm", + "log", + "mach2", + "memfd", + "memoffset", + "object", + "once_cell", + "paste", + "postcard", + "psm", + "rayon", + "rustix 0.38.34", + "serde", + "serde_derive", + "smallvec", + "sptr", + "target-lexicon", + "wasmparser", + "wasmtime-asm-macros", + "wasmtime-component-macro", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-fiber", + "wasmtime-jit-icache-coherence", + "wasmtime-slab", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d697d99c341d4a9ffb72f3af7a02124d233eeb59aee010f36d88e97cca553d5e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-component-macro" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29b462b068e73b5b27fae092a27f47e5937cabf6b26be2779c978698a52feca" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.68", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d2912c53d9054984b380dfbd7579f9c3681b2a73b903a56bd71a1c4f175f1e" + +[[package]] +name = "wasmtime-cranelift" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3975deafea000457ba84355c7c0fce0372937204f77026510b7b454f28a3a65" +dependencies = [ + "anyhow", + "cfg-if", + "cranelift-codegen", + "cranelift-control", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli 0.28.1", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-environ" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f444e900e848b884d8a8a2949b6f5b92af642a3e663ff8fbe78731143a55be61" +dependencies = [ + "anyhow", + "cranelift-entity", + "gimli 0.28.1", + "indexmap 2.5.0", + "log", + "object", + "postcard", + "serde", + "serde_derive", + "target-lexicon", + "wasm-encoder", + "wasmparser", + "wasmprinter", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-fiber" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ded58eb2d1bf0dcd2182d0ccd7055c4b10b50d711514f1d73f61515d0fa829d" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "rustix 0.38.34", + "wasmtime-asm-macros", + "wasmtime-versioned-export-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5afe2f0499542f9a4bcfa1b55bfdda803b6ade4e7c93c6b99e0f39dba44b0a91" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "wasmtime-slab" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7de1f2bec5bbb35d532e61c85c049dc84ae671df60492f90b954ecf21169e7" + +[[package]] +name = "wasmtime-types" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "412463e9000e14cf6856be48628d2213c20c153e29ffc22b036980c892ea6964" +dependencies = [ + "cranelift-entity", + "serde", + "serde_derive", + "smallvec", + "wasmparser", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc077306b38288262e5ba01d4b21532a6987416cdc0aedf04bb06c22a68fdc" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.5.0", + "wit-parser", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "wiremock" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http", + "http-body-util", + "hyper", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "wit-parser" +version = "0.209.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e79b9e3c0b6bb589dec46317e645851e0db2734c44e2be5e251b03ff4a51269" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.5.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + +[[package]] +name = "woothee" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "zxcvbn" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad76e35b00ad53688d6b90c431cabe3cbf51f7a4a154739e04b63004ab1c736c" +dependencies = [ + "chrono", + "derive_builder", + "fancy-regex", + "itertools 0.13.0", + "lazy_static", + "regex", + "time", + "wasm-bindgen", + "web-sys", +] diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index be17eeffcb4f..501bc3e8e4fd 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -15,21 +15,26 @@ rustPlatform.buildRustPackage rec { pname = "matrix-authentication-service"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "matrix-authentication-service"; rev = "refs/tags/v${version}"; - hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks="; + hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc="; }; - cargoHash = "sha256-mUHN1uEc1qM1Bm/J7qf0zyMKaJvyt9YbQ8TxvxG+vcM="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "sea-query-0.32.0-rc.1" = "sha256-Q/NFiIBu8L5rQj4jwcIo8ACmAhLBy4HSTcJv06UdK8E="; + }; + }; npmDeps = fetchNpmDeps { name = "${pname}-${version}-npm-deps"; src = "${src}/${npmRoot}"; - hash = "sha256-CMdnHS3sj9gXLpVlmuKvqFJ28+7fddG2Ld6t2nSFp24="; + hash = "sha256-EfDxbdjzF0yLQlueIYKmdpU4v9dx7g8bltU63mIWfo0="; }; npmRoot = "frontend"; @@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec { (cd "$npmRoot" && npm run build) ''; - # Adopted from https://github.com/matrix-org/matrix-authentication-service/blob/main/Dockerfile + # Adopted from https://github.com/element-hq/matrix-authentication-service/blob/main/Dockerfile postInstall = '' install -Dm444 -t "$out/share/$pname" "policies/policy.wasm" install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"* @@ -83,12 +88,12 @@ rustPlatform.buildRustPackage rec { cp -r translations "$out/share/$pname/translations" ''; - meta = with lib; { + meta = { description = "OAuth2.0 + OpenID Provider for Matrix Homeservers"; - homepage = "https://github.com/matrix-org/matrix-authentication-service"; - changelog = "https://github.com/matrix-org/matrix-authentication-service/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ teutat3s ]; + homepage = "https://github.com/element-hq/matrix-authentication-service"; + changelog = "https://github.com/element-hq/matrix-authentication-service/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teutat3s ]; mainProgram = "mas-cli"; }; } diff --git a/pkgs/by-name/ma/matrix-zulip-bridge/package.nix b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix new file mode 100644 index 000000000000..89d577665a1a --- /dev/null +++ b/pkgs/by-name/ma/matrix-zulip-bridge/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "MatrixZulipBridge"; + version = "0.4.1"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "GearKite"; + repo = "MatrixZulipBridge"; + rev = "v${version}"; + hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + zulip + beautifulsoup4 + bidict + coloredlogs + emoji + markdownify + mautrix + python-dotenv + ruamel-yaml + zulip-emoji-mapping + ]; + + pythonRelaxDeps = [ + "bidict" + "markdownify" + "ruamel-yaml" + "zulip-emoji-mapping" + ]; + + pythonImportsCheck = [ + "matrixzulipbridge" + ]; + + meta = { + description = "Matrix puppeting appservice bridge for Zulip"; + homepage = "https://github.com/GearKite/MatrixZulipBridge"; + changelog = "https://github.com/GearKite/MatrixZulipBridge/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ robertrichter ]; + mainProgram = "matrix-zulip-bridge"; + }; +} diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index c86c815e5d8c..bf9ed2523006 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.3.2"; + version = "0.4.0"; - subPackages = [ "." ]; + subPackages = [ "cmd/mautrix-meta" ]; src = fetchFromGitHub { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg="; + hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio="; + vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ="; passthru = { tests = { diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index d86221db875c..70a7417ce958 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-eSp2QyuO5sU2AqpFTTlXOSrcGy7nQLfvrY5/3N2qIqU="; + hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs="; }; patches = [ ./disable-tests-that-require-network-access.patch ]; diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix new file mode 100644 index 000000000000..3cb661703114 --- /dev/null +++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + systemd, +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-store-veritysetup-generator"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "nikstur"; + repo = "nix-store-veritysetup-generator"; + rev = version; + hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I="; + }; + + sourceRoot = "${src.name}/rust"; + + cargoHash = "sha256-NCxPLsBJX4Dp8LcWrjVrocqDBvWc587DF3WPXZg1uFY="; + + env = { + SYSTEMD_VERITYSETUP_PATH = "${systemd}/lib/systemd/systemd-veritysetup"; + SYSTEMD_ESCAPE_PATH = "${systemd}/bin/systemd-escape"; + }; + + # Use a fake path in tests so that they are not dependent on specific Nix + # Store paths and thus don't break on different Nixpkgs invocations. This is + # relevant so that this package can be compiled on different architectures. + preCheck = '' + export SYSTEMD_VERITYSETUP_PATH="systemd-veritysetup"; + ''; + + stripAllList = [ "bin" ]; + + meta = with lib; { + description = "Systemd unit generator for a verity protected Nix Store"; + homepage = "https://github.com/nikstur/nix-store-veritysetup-generator"; + license = licenses.mit; + maintainers = with lib.maintainers; [ nikstur ]; + }; +} diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 08f8fe9bcf1e..c7212f1a313c 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ let self = python3Packages.buildPythonApplication { pname = "nix-update"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; rev = "refs/tags/${self.version}"; - hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; + hash = "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 55a7deb1b442..bc449ce11245 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-AdSrhQhJb9ObCgM1iXnoIBBl+6cjRbuTST4Lt02AP5Q="; + hash = "sha256-ssx6Y665uoOO3PX6Mp9NAF8sqoGb7Ezfw+bTY69aGlE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/pkgs/by-name/ni/nixos-build-vms/build-vms.nix similarity index 87% rename from nixos/modules/installer/tools/nixos-build-vms/build-vms.nix rename to pkgs/by-name/ni/nixos-build-vms/build-vms.nix index 21a257378a63..12b3c44746a4 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/pkgs/by-name/ni/nixos-build-vms/build-vms.nix @@ -1,5 +1,6 @@ { system ? builtins.currentSystem , config ? {} +, nixpkgs , networkExpr }: @@ -9,9 +10,9 @@ let imports = [ module ]; }) (import networkExpr); - pkgs = import ../../../../.. { inherit system config; }; + pkgs = import nixpkgs { inherit system config; }; - testing = import ../../../../lib/testing-python.nix { + testing = import "${pkgs.path}/nixos/lib/testing-python.nix" { inherit system pkgs; }; diff --git a/nixos/modules/installer/tools/manpages/nixos-build-vms.8 b/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-build-vms.8 rename to pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8 diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh similarity index 86% rename from nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh rename to pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh index 490ede04e6bb..d55eb5d0620f 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh @@ -49,5 +49,6 @@ then fi # Build a network of VMs -nix-build '' \ - --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" +nix-build @buildVms@ \ + --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" \ + --arg nixpkgs "" diff --git a/pkgs/by-name/ni/nixos-build-vms/package.nix b/pkgs/by-name/ni/nixos-build-vms/package.nix new file mode 100644 index 000000000000..fc8b4f403e94 --- /dev/null +++ b/pkgs/by-name/ni/nixos-build-vms/package.nix @@ -0,0 +1,22 @@ +{ + substituteAll, + runtimeShell, + installShellFiles, +}: +substituteAll { + name = "nixos-build-vms"; + src = ./nixos-build-vms.sh; + inherit runtimeShell; + buildVms = ./build-vms.nix; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-build-vms.8} + ''; + + meta.mainProgram = "nixos-build-vms"; +} diff --git a/nixos/modules/installer/tools/manpages/nixos-enter.8 b/pkgs/by-name/ni/nixos-enter/nixos-enter.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-enter.8 rename to pkgs/by-name/ni/nixos-enter/nixos-enter.8 diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-enter.sh rename to pkgs/by-name/ni/nixos-enter/nixos-enter.sh diff --git a/pkgs/by-name/ni/nixos-enter/package.nix b/pkgs/by-name/ni/nixos-enter/package.nix new file mode 100644 index 000000000000..a548eed4092e --- /dev/null +++ b/pkgs/by-name/ni/nixos-enter/package.nix @@ -0,0 +1,28 @@ +{ + lib, + substituteAll, + runtimeShell, + installShellFiles, + util-linuxMinimal, +}: +substituteAll { + name = "nixos-enter"; + src = ./nixos-enter.sh; + + inherit runtimeShell; + + path = lib.makeBinPath [ + util-linuxMinimal + ]; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-enter.8} + ''; + + meta.mainProgram = "nixos-enter"; +} diff --git a/nixos/modules/installer/tools/manpages/nixos-install.8 b/pkgs/by-name/ni/nixos-install/nixos-install.8 similarity index 100% rename from nixos/modules/installer/tools/manpages/nixos-install.8 rename to pkgs/by-name/ni/nixos-install/nixos-install.8 diff --git a/nixos/modules/installer/tools/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-install.sh rename to pkgs/by-name/ni/nixos-install/nixos-install.sh diff --git a/pkgs/by-name/ni/nixos-install/package.nix b/pkgs/by-name/ni/nixos-install/package.nix new file mode 100644 index 000000000000..0d8ee638acc1 --- /dev/null +++ b/pkgs/by-name/ni/nixos-install/package.nix @@ -0,0 +1,33 @@ +{ + lib, + substituteAll, + runtimeShell, + installShellFiles, + nix, + jq, + nixos-enter, + util-linuxMinimal, +}: +substituteAll { + name = "nixos-install"; + src = ./nixos-install.sh; + + inherit runtimeShell nix; + + path = lib.makeBinPath [ + jq + nixos-enter + util-linuxMinimal + ]; + + dir = "bin"; + isExecutable = true; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage ${./nixos-install.8} + ''; + + meta.mainProgram = "nixos-install"; +} diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 9cafd07b5c45..b72c55b55736 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (source) version; src = fetchurl { - url = "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; + url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; inherit (platform) hash; }; diff --git a/pkgs/by-name/nr/nrfutil/source.nix b/pkgs/by-name/nr/nrfutil/source.nix index f768ac96bb88..6d48b7274120 100644 --- a/pkgs/by-name/nr/nrfutil/source.nix +++ b/pkgs/by-name/nr/nrfutil/source.nix @@ -1,15 +1,15 @@ { - version = "7.11.1"; + version = "7.13.0"; x86_64-linux = { name = "x86_64-unknown-linux-gnu"; - hash = "sha256-faF/iA07wWiAuxeqEZciIYlnoWe4LKCtDxD0BwIyeYw="; + hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw="; }; x86_64-darwin = { name = "x86_64-apple-darwin"; - hash = "sha256-EImYXMIvxPgzaGuAOWi4O6mG5S1awdGSX0HQgT1iHaI="; + hash = "sha256-cnZkVkTbQ/+ciITPEx2vxxZchCC54T0JOApB4HKp8e0="; }; aarch64-darwin = { name = "aarch64-apple-darwin"; - hash = "sha256-jgigeJRHH/c761wYGMHhtRHE59ms7obZPxiH5pKeoeQ="; + hash = "sha256-5VxDQ25tW+qTXHwkltpaAm4AnQvA18qGMaflYQzE2pQ="; }; } diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh index bd3bbadbfde5..a7efb9d49aae 100755 --- a/pkgs/by-name/nr/nrfutil/update.sh +++ b/pkgs/by-name/nr/nrfutil/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix nix-prefetch-github xq-xml +#!nix-shell -i bash -p jq nix nix-prefetch-github nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" @@ -17,12 +17,11 @@ architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" architectures["x86_64-darwin"]="x86_64-apple-darwin" architectures["aarch64-darwin"]="aarch64-apple-darwin" -binary_list=$(curl "https://developer.nordicsemi.com/.pc-tools/nrfutil/" | xq -q "#files" | grep -o -E 'nrfutil-(x86_64|aarch64)-.*?.gz' | cut -d' ' -f 1) +BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil" for a in ${!architectures[@]}; do - versions["$a"]=$(echo "$binary_list" | grep "${architectures[${a}]}" | sed -r "s/nrfutil-${architectures[${a}]}-(.*?).tar.gz/\\1/" | tail -n 1) - echo "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz" - hashes["$a"]=$(narhash "https://developer.nordicsemi.com/.pc-tools/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") + versions["$a"]=$(curl "$BASE_URL/index/${architectures[${a}]}/index.json" | jq -r '.packages.nrfutil.latest_version') + hashes["$a"]=$(narhash "$BASE_URL/packages/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") done { diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 9bd6934cd58c..43df56ac024e 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; - rev = "v${version}"; - hash = "sha256-Yf1cPv4SpmbL3o9uf3fJ/n0/ZW0wdhW/bbe2hRxDdyY="; + rev = "refs/tags/v${version}"; + hash = "sha256-0fbl50kugqYHeS+9a/kCkwy1wPDqDCYwPIGZ37NFa/Y="; }; - cargoHash = "sha256-H3pK/MSv7/YDEtnW2mi2xt5x2t3ugCc4IN43wohM4Ig="; + cargoHash = "sha256-9HLbGC6j0Wq/lG//CeEAfnYzlGG14CnDpmluL1moHWQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; nativeBuildInputs = [ @@ -74,7 +74,6 @@ rustPlatform.buildRustPackage rec { description = "Full-featured implementation of the Network Time Protocol"; homepage = "https://tweedegolf.nl/en/pendulum"; changelog = "https://github.com/pendulum-project/ntpd-rs/blob/v${version}/CHANGELOG.md"; - mainProgram = "ntp-ctl"; license = with lib.licenses; [ mit # or asl20 @@ -83,6 +82,7 @@ rustPlatform.buildRustPackage rec { fpletz getchoo ]; + mainProgram = "ntp-ctl"; # note: Undefined symbols for architecture x86_64: "_ntp_adjtime" broken = stdenv.isDarwin && stdenv.isx86_64; }; diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 6fd8adbb3db2..6f90b558bac4 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, curl -, webkitgtk -, libmicrohttpd -, libsecret -, qrencode -, libsodium -, pkg-config -, help2man -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + curl, + webkitgtk, + libmicrohttpd, + libsecret, + qrencode, + libsodium, + pkg-config, + help2man, + nix-update-script, }: stdenv.mkDerivation rec { @@ -39,14 +40,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" "BIN_PATH=$(out)" "LIB_PATH=$(out)/lib" ]; + makeFlags = [ + "PREFIX=$(out)" + "BIN_PATH=$(out)" + "PROMPT_BIN_PATH=$(out)" + "LIB_PATH=$(out)/lib" + ]; - installTargets = [ "install_bin" "install_lib" "install_conf" ]; + installTargets = [ + "install_bin" + "install_lib" + "install_conf" + ]; postFixup = '' # Override with patched binary to be used by help2man cp -r $out/bin/* bin - make install_man PREFIX=$out + make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man ''; passthru.updateScript = nix-update-script { }; @@ -58,4 +68,3 @@ stdenv.mkDerivation rec { license = licenses.mit; }; } - diff --git a/pkgs/by-name/ol/ollama/disable-git.patch b/pkgs/by-name/ol/ollama/disable-git.patch index 5f9b4b3323b6..5248905302dc 100644 --- a/pkgs/by-name/ol/ollama/disable-git.patch +++ b/pkgs/by-name/ol/ollama/disable-git.patch @@ -1,15 +1,17 @@ +diff --git a/llm/generate/gen_common.sh b/llm/generate/gen_common.sh +index 3825c155..d22eccd2 100644 --- a/llm/generate/gen_common.sh +++ b/llm/generate/gen_common.sh -@@ -65,6 +65,8 @@ - echo 'add_subdirectory(../ext_server ext_server) # ollama' >>${LLAMACPP_DIR}/CMakeLists.txt - fi +@@ -69,6 +69,8 @@ git_module_setup() { + } + apply_patches() { + return + - if [ -n "$(ls -A ../patches/*.diff)" ]; then - # apply temporary patches until fix is upstream - for patch in ../patches/*.diff; do -@@ -110,6 +112,8 @@ + # apply temporary patches until fix is upstream + for patch in ../patches/*.patch; do + git -c 'user.name=nobody' -c 'user.email=<>' -C ${LLAMACPP_DIR} am ${patch} +@@ -133,6 +135,8 @@ install() { # Keep the local tree clean after we're done with the build cleanup() { diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index d11e06833efc..f16103382494 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -8,6 +8,7 @@ makeWrapper, stdenv, addDriverRunpath, + nix-update-script, cmake, gcc12, @@ -39,13 +40,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-iNjqnhiM0L873BiBPAgI2Y0KEQyCInn2nEihzwLasFU="; + hash = "sha256-YYrNrlXL6ytLfnrvSHybi0va0lvgVNuIRP+IFE5XZX8="; fetchSubmodules = true; }; @@ -199,20 +200,24 @@ goBuild { "-X=github.com/ollama/ollama/server.mode=release" ]; - passthru.tests = - { - inherit ollama; - version = testers.testVersion { - inherit version; - package = ollama; + passthru = { + tests = + { + inherit ollama; + version = testers.testVersion { + inherit version; + package = ollama; + }; + } + // lib.optionalAttrs stdenv.isLinux { + inherit ollama-rocm ollama-cuda; + service = nixosTests.ollama; + service-cuda = nixosTests.ollama-cuda; + service-rocm = nixosTests.ollama-rocm; }; - } - // lib.optionalAttrs stdenv.isLinux { - inherit ollama-rocm ollama-cuda; - service = nixosTests.ollama; - service-cuda = nixosTests.ollama-cuda; - service-rocm = nixosTests.ollama-rocm; - }; + + updateScript = nix-update-script { }; + }; meta = { description = diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix index 5e1704cdeb78..28052ee7513b 100644 --- a/pkgs/by-name/pe/pegtl/package.nix +++ b/pkgs/by-name/pe/pegtl/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pegtl"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "taocpp"; repo = "PEGTL"; rev = finalAttrs.version; - hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU="; + hash = "sha256-nPWSO2wPl/qenUQgvQDQu7Oy1dKa/PnNFSclmkaoM8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 484df18f3f81..6cb67fe25999 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-09-08"; + version = "8.2-unstable-2024-09-14"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "c7f7d6ed3858ca507ed8abd057d1039fc889940a"; - hash = "sha256-LRUU516bfiN06mqLY7CWtrUmRubQ/ysPtciUNd/qGhA="; + rev = "0c46ea546d9c507e744612e80b25ef5dfa531855"; + hash = "sha256-g/RknjZh5O2/3Plk1w8QnNywWZXZaABfunBY6XyixnA="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; diff --git a/pkgs/by-name/po/polenum/package.nix b/pkgs/by-name/po/polenum/package.nix new file mode 100644 index 000000000000..728b47ed4e8d --- /dev/null +++ b/pkgs/by-name/po/polenum/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "polenum"; + version = "1.6.1-unstable-2024-07-30"; + format = "other"; + + src = fetchFromGitHub { + owner = "Wh1t3Fox"; + repo = "polenum"; + rev = "6f95ce0f9936d8c20820e199a4bb1ea68d2f061f"; + hash = "sha256-aCX7dByfkUSFHjhRAjrFhbbeIgYNGixnB5pHE/lftng="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ]; + + installPhase = '' + runHook preInstall + + install -vD $pname.py $out/bin/$pname + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to get the password policy from a windows machine"; + homepage = "https://github.com/Wh1t3Fox/polenum"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ exploitoverload ]; + mainProgram = "polenum"; + }; +} diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 5f9bb9bb27e9..17d6d1c1e5b0 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "2024.001p"; + version = "2024.001q"; format = "other"; src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - hash = "sha256-FtdPcv2JA/fJeD2jG/kadPhhDSbfH2QLjjvLdUZJpZQ="; + hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg="; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix index e764b2300d92..7048c95859c8 100644 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/pkgs/by-name/ru/ruff-lsp/package.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ruff-lsp"; - version = "0.0.56"; + version = "0.0.57"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-L5bfGW5R9kDCK8zcFh+a/zquJefwKxOB0JdYDTyPFuQ="; + hash = "sha256-w9NNdsDD+YLrCw8DHDhVx62MdwLhcN8QSmb/2rqlb5g="; }; postPatch = '' diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 02d1a20d7cc8..64652add4bfd 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -161,6 +161,21 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + [[package]] name = "autocfg" version = "1.2.0" @@ -240,6 +255,9 @@ name = "camino" version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] [[package]] name = "cast" @@ -722,6 +740,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.10.7" @@ -773,6 +797,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + [[package]] name = "drop_bomb" version = "0.1.5" @@ -968,6 +998,17 @@ dependencies = [ "regex-syntax 0.8.3", ] +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + [[package]] name = "half" version = "2.4.1" @@ -1864,6 +1905,33 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "pretty_assertions" version = "1.4.0" @@ -2187,10 +2255,11 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.5" +version = "0.6.6" dependencies = [ "anyhow", "argfile", + "assert_fs", "bincode", "bitflags 2.6.0", "cachedir", @@ -2200,7 +2269,9 @@ dependencies = [ "clearscreen", "colored", "filetime", + "globwalk", "ignore", + "indoc", "insta", "insta-cmd", "is-macro", @@ -2212,7 +2283,9 @@ dependencies = [ "rayon", "regex", "ruff_cache", + "ruff_db", "ruff_diagnostics", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_notebook", @@ -2295,6 +2368,7 @@ dependencies = [ "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "serde", "tempfile", "thiserror", "tracing", @@ -2370,6 +2444,23 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "ruff_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "red_knot_python_semantic", + "ruff_cache", + "ruff_db", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "salsa", + "schemars", + "serde", +] + [[package]] name = "ruff_index" version = "0.0.0" @@ -2380,7 +2471,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.5" +version = "0.6.6" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2700,7 +2791,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.6.5" +version = "0.6.6" dependencies = [ "console_error_panic_hook", "console_log", @@ -2743,6 +2834,7 @@ dependencies = [ "regex", "ruff_cache", "ruff_formatter", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_python_ast", @@ -3197,6 +3289,12 @@ dependencies = [ "phf_codegen", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "test-case" version = "3.3.1" diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 79c70c88f65c..288190ade1f0 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-1V95S0FWHzCxztgip+rbCjji4O71D+QdcSZ/hbABeKg="; + hash = "sha256-8EKOBlF6bgjgB5t3KP4AcWU7YkLaiFoAj+wuJWEOAic="; }; cargoLock = { @@ -31,13 +31,6 @@ rustPlatform.buildRustPackage rec { }; }; - # Revert the change made in https://github.com/astral-sh/ruff/pull/13299 - # It was causing linking issues: https://github.com/NixOS/nixpkgs/pull/341674#issuecomment-2351172084 - postPatch = '' - substituteInPlace crates/ruff_benchmark/Cargo.toml \ - --replace-fail '"unprefixed_malloc_on_supported_platforms"' ' ' - ''; - nativeBuildInputs = [ installShellFiles ]; buildInputs = [ diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix new file mode 100644 index 000000000000..930eab157eed --- /dev/null +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "rush-parallel"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "shenwei356"; + repo = "rush"; + rev = "v${version}"; + hash = "sha256-u3KGjZ5C8jDuAKE/dy4zR+EEFb35aJtj2YkwIb+kad4="; + }; + + vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "A cross-platform command-line tool for executing jobs in parallel"; + homepage = "https://github.com/shenwei356/rush"; + changelog = "https://github.com/shenwei356/rush/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kranzes ]; + mainProgram = "rush-parallel"; + }; +} diff --git a/pkgs/by-name/se/servo/Cargo.lock b/pkgs/by-name/se/servo/Cargo.lock new file mode 100644 index 000000000000..754f6fdf97fb --- /dev/null +++ b/pkgs/by-name/se/servo/Cargo.lock @@ -0,0 +1,8766 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accountable-refcell" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e2bba6f21fcf0ae382750eb6d9387c42807761fa7329d3a05fcd1334e8c3f2" +dependencies = [ + "backtrace", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.6.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" + +[[package]] +name = "android_logger" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" +dependencies = [ + "android_log-sys", + "env_filter", + "log", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "app_units" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a46058e45b48cf55b729e4ae34007fa904ea70cfcf2a0fa21dacf1441e521c" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "arboard" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +dependencies = [ + "clipboard-win", + "core-graphics", + "image", + "log", + "objc", + "objc-foundation", + "objc_id", + "parking_lot", + "thiserror", + "windows-sys 0.48.0", + "x11rb", +] + +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "tokio", + "tokio-rustls", + "tungstenite", + "webpki-roots", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "background_hang_monitor" +version = "0.0.1" +dependencies = [ + "background_hang_monitor_api", + "backtrace", + "base", + "crossbeam-channel", + "ipc-channel", + "libc", + "log", + "mach2", + "nix", + "serde_json", + "unwind-sys", +] + +[[package]] +name = "background_hang_monitor_api" +version = "0.0.1" +dependencies = [ + "base", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "parking_lot", + "serde", + "size_of_test", + "webrender_api", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base" +version = "0.0.1" +dependencies = [ + "crossbeam-channel", + "ipc-channel", + "libc", + "mach2", + "malloc_size_of", + "malloc_size_of_derive", + "parking_lot", + "serde", + "size_of_test", + "time 0.3.36", + "webrender_api", + "windows-sys 0.59.0", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[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.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +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 = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "bluetooth" +version = "0.0.1" +dependencies = [ + "bitflags 2.6.0", + "bluetooth_traits", + "blurdroid", + "blurmac", + "blurmock", + "blurz", + "embedder_traits", + "ipc-channel", + "log", + "servo_config", + "servo_rand", + "uuid", +] + +[[package]] +name = "bluetooth_traits" +version = "0.0.1" +dependencies = [ + "embedder_traits", + "ipc-channel", + "regex", + "serde", +] + +[[package]] +name = "blurdroid" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b23557dd27704797128f9db2816416bef20dad62d4a9768714eeb65f07d296" + +[[package]] +name = "blurmac" +version = "0.1.0" +dependencies = [ + "log", + "objc", +] + +[[package]] +name = "blurmock" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c150fd617830fd121919bbd500a784507e8af1bae744efcf587591c65c375d4" +dependencies = [ + "hex", +] + +[[package]] +name = "blurz" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6dae8337ff67fe8ead29a28a0115605753e6a5205d4b6017e9f42f198c3c50a" +dependencies = [ + "dbus", + "hex", +] + +[[package]] +name = "brotli" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "build-parallel" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb" +dependencies = [ + "crossbeam-utils", + "jobserver", + "num_cpus", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-slice-cast" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "calendrical_calculations" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.6.0", + "log", + "polling", + "rustix", + "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", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "canvas" +version = "0.0.1" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "byteorder", + "canvas_traits", + "crossbeam-channel", + "cssparser", + "euclid", + "fnv", + "font-kit", + "fonts", + "half", + "ipc-channel", + "log", + "lyon_geom", + "net_traits", + "num-traits", + "parking_lot", + "pathfinder_geometry", + "pixels", + "range", + "raqote", + "servo_arc", + "sparkle", + "style", + "style_traits", + "surfman", + "unicode-script", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", + "webxr-api", +] + +[[package]] +name = "canvas_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "euclid", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "pixels", + "serde", + "serde_bytes", + "servo_config", + "sparkle", + "style", + "webrender_api", + "webxr-api", +] + +[[package]] +name = "cc" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +dependencies = [ + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clang-sys" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + +[[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 = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "compiletest_rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0f4b0a27f9efcea6a012305682f0f7c5691df7097b9eaf6abb50b75c89a8af" +dependencies = [ + "diff", + "filetime", + "getopts", + "lazy_static", + "libc", + "log", + "miow", + "regex", + "rustfix", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "tester", + "winapi", +] + +[[package]] +name = "compositing" +version = "0.0.1" +dependencies = [ + "base", + "canvas", + "compositing_traits", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "gleam", + "image", + "ipc-channel", + "keyboard-types", + "libc", + "log", + "net", + "net_traits", + "pixels", + "profile_traits", + "script_traits", + "servo-media", + "servo_config", + "servo_geometry", + "servo_url", + "style_traits", + "surfman", + "time 0.1.45", + "tracing", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", +] + +[[package]] +name = "compositing_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fonts_traits", + "ipc-channel", + "keyboard-types", + "log", + "pixels", + "script_traits", + "servo_url", + "style_traits", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "constellation" +version = "0.0.1" +dependencies = [ + "background_hang_monitor", + "background_hang_monitor_api", + "backtrace", + "base", + "bluetooth_traits", + "canvas_traits", + "compositing_traits", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "euclid", + "fonts", + "fonts_traits", + "gaol", + "http", + "ipc-channel", + "keyboard-types", + "log", + "media", + "net", + "net_traits", + "parking_lot", + "profile_traits", + "script_layout_interface", + "script_traits", + "serde", + "servo_config", + "servo_rand", + "servo_url", + "style_traits", + "tracing", + "webgpu", + "webrender", + "webrender_api", + "webrender_traits", + "webxr-api", +] + +[[package]] +name = "content-security-policy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7225464dae1993d0045c023d0975f44d63337f35f85faddb998ff9abdfcd0f" +dependencies = [ + "base64", + "bitflags 2.6.0", + "once_cell", + "percent-encoding", + "regex", + "serde", + "sha2", + "url", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "time 0.3.36", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time 0.3.36", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core-text" +version = "20.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crown" +version = "0.0.1" +dependencies = [ + "compiletest_rs", +] + +[[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 = "cssparser" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf 0.11.2", + "serde", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "data-url" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + +[[package]] +name = "dbus" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "deny_public_fields" +version = "0.0.1" +dependencies = [ + "syn", + "synstructure", +] + +[[package]] +name = "deny_public_fields_tests" +version = "0.0.1" +dependencies = [ + "deny_public_fields", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_common" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "devtools" +version = "0.0.1" +dependencies = [ + "base", + "chrono", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "headers", + "http", + "ipc-channel", + "log", + "serde", + "serde_json", + "servo_config", + "servo_rand", + "servo_url", + "uuid", +] + +[[package]] +name = "devtools_traits" +version = "0.0.1" +dependencies = [ + "base", + "bitflags 2.6.0", + "http", + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "servo_url", + "time 0.1.45", + "uuid", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[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 = "diplomat" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3137c640d2bac491dbfca7f9945c948f888dd8c95bdf7ee6b164fbdfa5d3efc2" +dependencies = [ + "diplomat_core", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diplomat-runtime" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f9efe348e178ba77b6035bc6629138486f8b461654e7ac7ad8afaa61bd4d98" +dependencies = [ + "log", +] + +[[package]] +name = "diplomat_core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7aca1d8f9e7b73ad61785beedc9556ad79f84b15c15abaa7041377e42284c1" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "serde", + "smallvec", + "strck_ident", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] +name = "dom" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "dom_struct" +version = "0.0.1" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "domobject_derive" +version = "0.0.1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dwrote" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" +dependencies = [ + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", +] + +[[package]] +name = "ecolor" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" +dependencies = [ + "bytemuck", + "emath", +] + +[[package]] +name = "egui" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" +dependencies = [ + "ahash", + "emath", + "epaint", + "log", + "nohash-hasher", +] + +[[package]] +name = "egui-winit" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926" +dependencies = [ + "ahash", + "arboard", + "egui", + "log", + "raw-window-handle", + "smithay-clipboard", + "web-time", + "winit", +] + +[[package]] +name = "egui_glow" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103" +dependencies = [ + "ahash", + "bytemuck", + "egui", + "egui-winit", + "glow 0.13.1", + "log", + "memoffset", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "emath" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "embedder_traits" +version = "0.0.1" +dependencies = [ + "base", + "cfg-if", + "crossbeam-channel", + "ipc-channel", + "keyboard-types", + "log", + "num-derive", + "num-traits", + "serde", + "servo_url", + "webrender_api", + "webxr-api", +] + +[[package]] +name = "encoding_c" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af727805f3b0d79956bde5b35732669fb5c5d45a94893798e7b7e70cfbf9cc1" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "encoding_c_mem" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a80a16821fe8c7cab96e0c67b57cd7090e021e9615e6ce6ab0cf866c44ed1f0" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "epaint" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "log", + "nohash-hasher", + "parking_lot", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + +[[package]] +name = "etagere" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" +dependencies = [ + "euclid", + "serde", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.4", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +dependencies = [ + "cfg-if", + "libc", + "libredox 0.1.3", + "windows-sys 0.59.0", +] + +[[package]] +name = "fixed_decimal" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" +dependencies = [ + "displaydoc", + "ryu", + "smallvec", + "writeable", +] + +[[package]] +name = "fixedbitset" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide 0.8.0", +] + +[[package]] +name = "float-ord" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-kit" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "dirs", + "dwrote", + "float-ord", + "freetype-sys", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fonts" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "crossbeam-channel", + "cssparser", + "dwrote", + "euclid", + "fnv", + "fonts_traits", + "fontsan", + "freetype-sys", + "harfbuzz-sys", + "ipc-channel", + "itertools 0.13.0", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "net_traits", + "parking_lot", + "range", + "serde", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "smallvec", + "style", + "surfman", + "truetype", + "unicode-bidi", + "unicode-properties", + "unicode-script", + "url", + "webrender_api", + "webrender_traits", + "xi-unicode", + "xml-rs", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "fonts_traits" +version = "0.0.1" +dependencies = [ + "ipc-channel", + "malloc_size_of", + "malloc_size_of_derive", + "range", + "serde", + "webrender_api", +] + +[[package]] +name = "fontsan" +version = "0.5.2" +source = "git+https://github.com/servo/fontsan#8fbc406506cfd1f8ab60e625d1e926a0e72e1d8a" +dependencies = [ + "cc", + "glob", + "libc", + "miniz-sys", +] + +[[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", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freetype" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e" +dependencies = [ + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gaol" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061957ca7a966a39a79ebca393a9a6c7babda10bf9dd6f11d00041558d929c22" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gilrs" +version = "0.10.6" +source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] + +[[package]] +name = "gilrs-core" +version = "0.5.12" +source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" +dependencies = [ + "core-foundation", + "inotify", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.48.0", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "gio-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys 0.52.0", +] + +[[package]] +name = "git2" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +dependencies = [ + "bitflags 2.6.0", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "gleam" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0173481f2bb6e809bf4985de2e86c83876d84d2805830e3301cd37355e897f0f" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "glib" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.19.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glow" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glslopt" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913662ae8335df058d56e00f11340b20fa82e03e0276587797ef325ab01e50d4" +dependencies = [ + "cc", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gobject-sys" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "log", + "presser", + "thiserror", + "windows 0.58.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gstreamer" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools 0.13.0", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-app" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1363313eb1931d66ac0b82c9b477fdd066af9dc118ea844966f85b6d99f261fd" +dependencies = [ + "futures-core", + "futures-sink", + "glib", + "gstreamer", + "gstreamer-app-sys", + "gstreamer-base", + "libc", +] + +[[package]] +name = "gstreamer-app-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed667453517b47754b9f9d28c096074e5d565f1cc48c6fa2483b1ea10d7688d3" +dependencies = [ + "glib-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-audio" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cae69bbfce34108009117803fb808b1ef4d88d476c9e3e2f5f536aab1f6ae75" +dependencies = [ + "cfg-if", + "glib", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", + "once_cell", + "smallvec", +] + +[[package]] +name = "gstreamer-audio-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11267dce74a92bad96fbd58c37c43e330113dc460a0771283f7d6c390b827b7" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-base" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" +dependencies = [ + "atomic_refcell", + "cfg-if", + "glib", + "gstreamer", + "gstreamer-base-sys", + "libc", +] + +[[package]] +name = "gstreamer-base-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2776369ce07de81b1e6f52786caec898db5be5d4678a8104e8fcbffdae68332d" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-gl-sys", + "gstreamer-video", + "libc", + "once_cell", +] + +[[package]] +name = "gstreamer-gl-egl" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be51a7ceaeabf411ba01a2de5af163ea2b8d79f157d0d924b4682fd217182c15" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl-sys", + "libc", +] + +[[package]] +name = "gstreamer-gl-egl-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bc9d114f161ec27822c203f28e43c88b6523f31cbde29b4cb8d8378a3825a4" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "050a2cf158354bd5633079baf73d12767a5c90efc6377b4f9507aca082734286" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-gl-x11" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4867cfe9333b04ee14672001e914ea995707a8b02d7b12c1b6f3e9f4a5c4f0d" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-x11-sys", + "libc", +] + +[[package]] +name = "gstreamer-gl-x11-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c628a2a3d216df2f85d37923f65a4e0fdafe4652f7cd06c9432f8c8ce8199aa9" +dependencies = [ + "glib-sys", + "gstreamer-gl-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-player" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2811897ea4e664f508cb6eda94b42944e12a33915d10830270b4626862c44a9" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-player-sys", + "gstreamer-video", + "libc", +] + +[[package]] +name = "gstreamer-player-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786cfe2543b8a985bbc16fb8d0595a12aeac6edb92453b30eb36631f7e34a696" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-sdp" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3358eda88536ae1540b933d70ba8efaa6e5c9e5260322021b0b47a797b2075" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp-sys", +] + +[[package]] +name = "gstreamer-sdp-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d0bc7f3e5cfdca6c9c5b9e9e15f47975c951a83e32b6e4b53b0c6dc5850487" +dependencies = [ + "glib-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-video" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25acba301f86b02584a642de0f224317be2bd0ceec3acda49a0ef111cbced98c" +dependencies = [ + "cfg-if", + "futures-channel", + "glib", + "gstreamer", + "gstreamer-base", + "gstreamer-video-sys", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gstreamer-video-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ec210495f94cabaa45d08003081b550095c2d4ab12d5320f64856a91f3f01c" +dependencies = [ + "glib-sys", + "gobject-sys", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gstreamer-webrtc" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd1a55fc34cd2ba2be1dc694a49cf3be71c67cbcd28e80213123eebeb9b2b9f" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-sdp", + "gstreamer-webrtc-sys", + "libc", +] + +[[package]] +name = "gstreamer-webrtc-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49c3bdbed1d328b7823f05a079b1319eea7b452c4b6a3e6776a1788827dad96c" +dependencies = [ + "glib-sys", + "gstreamer-sdp-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "harfbuzz-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb86e2fef3ba40cebffb8fa2cba811f06aa5c5fd296a4e469473e5398d166594" +dependencies = [ + "cc", + "core-graphics", + "core-text", + "foreign-types 0.5.0", + "freetype-sys", + "pkg-config", + "winapi", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hilog" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5646a745e293209c82e88f05b40bb596479cd84738408410ea16d5242e7ad0" +dependencies = [ + "env_filter", + "hilog-sys", + "log", +] + +[[package]] +name = "hilog-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de0e35e8534a70b5af5ccc943ffa3e2dcfe481b2b983c9fd514d7421a46b69e" +dependencies = [ + "log", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "html5ever" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff6858c1f7e2a470c5403091866fa95b36fe0dbac5d771f932c15e5ff1ee501" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls", + "tokio", + "tokio-rustls", + "webpki-roots", +] + +[[package]] +name = "hyper_serde" +version = "0.13.2" +dependencies = [ + "cookie 0.18.1", + "headers", + "http", + "hyper", + "mime", + "serde", + "serde_bytes", + "serde_test", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "icu_calendar" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7265b2137f9a36f7634a308d91f984574bbdba8cfd95ceffe1c345552275a8ff" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e009b7f0151ee6fb28c40b1283594397e0b7183820793e9ace3dcd13db126d0" + +[[package]] +name = "icu_capi" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f73a82a8307633c08ca119631cd90b006e448009da2d4466f7d76ca8fedf3b1" +dependencies = [ + "diplomat", + "diplomat-runtime", + "fixed_decimal", + "icu_calendar", + "icu_casemap", + "icu_collator", + "icu_collections", + "icu_datetime", + "icu_decimal", + "icu_experimental", + "icu_list", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_plurals", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_segmenter", + "icu_timezone", + "log", + "simple_logger", + "tinystr", + "unicode-bidi", + "writeable", +] + +[[package]] +name = "icu_casemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff0c8ae9f8d31b12e27fc385ff9ab1f3cd9b17417c665c49e4ec958c37da75f" +dependencies = [ + "displaydoc", + "icu_casemap_data", + "icu_collections", + "icu_locid", + "icu_properties", + "icu_provider", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_casemap_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d57966d5ab748f74513be4046867f9a20e801e2775d41f91d04a0f560b61f08" + +[[package]] +name = "icu_collator" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d370371887d31d56f361c3eaa15743e54f13bc677059c9191c77e099ed6966b2" +dependencies = [ + "displaydoc", + "icu_collator_data", + "icu_collections", + "icu_locid_transform", + "icu_normalizer", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_collator_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee3f88741364b7d6269cce6827a3e6a8a2cf408a78f766c9224ab479d5e4ae5" + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_datetime" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d115efb85e08df3fd77e77f52e7e087545a783fffba8be80bfa2102f306b1780" +dependencies = [ + "displaydoc", + "either", + "fixed_decimal", + "icu_calendar", + "icu_datetime_data", + "icu_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals", + "icu_provider", + "icu_timezone", + "smallvec", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_datetime_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ba7e7f7a01269b9afb0a39eff4f8676f693b55f509b3120e43a0350a9f88bea" + +[[package]] +name = "icu_decimal" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8fd98f86ec0448d85e1edf8884e4e318bb2e121bd733ec929a05c0a5e8b0eb" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_decimal_data", + "icu_locid_transform", + "icu_provider", + "writeable", +] + +[[package]] +name = "icu_decimal_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d424c994071c6f5644f999925fc868c85fec82295326e75ad5017bc94b41523" + +[[package]] +name = "icu_experimental" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844ad7b682a165c758065d694bc4d74ac67f176da1c499a04d85d492c0f193b7" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_collections", + "icu_decimal", + "icu_experimental_data", + "icu_locid", + "icu_locid_transform", + "icu_normalizer", + "icu_pattern", + "icu_plurals", + "icu_properties", + "icu_provider", + "litemap", + "num-bigint", + "num-rational", + "num-traits", + "smallvec", + "tinystr", + "writeable", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_experimental_data" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c178b9a34083fca5bd70d61f647575335e9c197d0f30c38e8ccd187babc69d0" + +[[package]] +name = "icu_list" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfeda1d7775b6548edd4e8b7562304a559a91ed56ab56e18961a053f367c365" +dependencies = [ + "displaydoc", + "icu_list_data", + "icu_locid_transform", + "icu_provider", + "regex-automata 0.2.0", + "writeable", +] + +[[package]] +name = "icu_list_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1825170d2c6679cb20dbd96a589d034e49f698aed9a2ef4fafc9a0101ed298f" + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_pattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7f36aafd098d6717de34e668a8120822275c1fba22b936e757b7de8a2fd7e4" +dependencies = [ + "displaydoc", + "either", + "writeable", + "yoke", + "zerofrom", +] + +[[package]] +name = "icu_plurals" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a70e7c025dbd5c501b0a5c188cd11666a424f0dadcd4f0a95b7dafde3b114" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3e8f775b215d45838814a090a2227247a7431d74e9156407d9c37f6ef0f208" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "unicode-bidi", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "log", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "icu_segmenter" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" +dependencies = [ + "core_maths", + "displaydoc", + "icu_collections", + "icu_locid", + "icu_provider", + "icu_segmenter_data", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_segmenter_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" + +[[package]] +name = "icu_timezone" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa91ba6a585939a020c787235daa8aee856d9bceebd6355e283c0c310bc6de96" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c588878c508a3e2ace333b3c50296053e6483c6a7541251b546cc59dcd6ced8e" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imsz" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a49eaebc8750bcba241df1e1e47ebb51b81eb35c65e8f11ffa0aebac353f7f" + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +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 = "io-kit-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" +dependencies = [ + "core-foundation-sys", + "mach2", +] + +[[package]] +name = "io-surface" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef" +dependencies = [ + "cgl", + "core-foundation", + "leaky-cow", + "libc", +] + +[[package]] +name = "ipc-channel" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46231d1db8ea8f874012b1b87efb9e968f763c577220372a9c7caadce1448da" +dependencies = [ + "bincode", + "crossbeam-channel", + "fnv", + "lazy_static", + "libc", + "mio", + "rand", + "serde", + "tempfile", + "uuid", + "windows 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +dependencies = [ + "hermit-abi 0.4.0", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jstraceable_derive" +version = "0.0.1" +dependencies = [ + "proc-macro2", + "syn", + "synstructure", +] + +[[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.6.0", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "layout_2013" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "canvas_traits", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "html5ever", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "net_traits", + "parking_lot", + "pixels", + "profile_traits", + "range", + "rayon", + "script_layout_interface", + "script_traits", + "serde", + "serde_json", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_geometry", + "servo_url", + "size_of_test", + "smallvec", + "style", + "style_traits", + "unicode-bidi", + "unicode-script", + "webrender_api", + "webrender_traits", + "xi-unicode", +] + +[[package]] +name = "layout_2020" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "bitflags 2.6.0", + "canvas_traits", + "data-url", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "html5ever", + "icu_segmenter", + "ipc-channel", + "itertools 0.13.0", + "log", + "net_traits", + "parking_lot", + "pixels", + "quickcheck", + "range", + "rayon", + "script_layout_interface", + "script_traits", + "serde", + "serde_json", + "servo_arc", + "servo_config", + "servo_geometry", + "servo_url", + "style", + "style_traits", + "unicode-bidi", + "unicode-script", + "url", + "webrender_api", + "webrender_traits", + "xi-unicode", +] + +[[package]] +name = "layout_thread_2013" +version = "0.0.1" +dependencies = [ + "app_units", + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "ipc-channel", + "layout_2013", + "log", + "malloc_size_of", + "metrics", + "net_traits", + "parking_lot", + "profile_traits", + "rayon", + "script", + "script_layout_interface", + "script_traits", + "serde_json", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "style", + "style_traits", + "time 0.3.36", + "url", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "layout_thread_2020" +version = "0.0.1" +dependencies = [ + "app_units", + "base", + "embedder_traits", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "ipc-channel", + "layout_2020", + "log", + "malloc_size_of", + "metrics", + "net_traits", + "parking_lot", + "profile_traits", + "script", + "script_layout_interface", + "script_traits", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_url", + "style", + "style_traits", + "url", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leak" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" + +[[package]] +name = "leaky-cow" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" +dependencies = [ + "leak", +] + +[[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.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libflate" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" +dependencies = [ + "adler32", + "crc32fast", + "rle-decode-fast", + "take_mut", +] + +[[package]] +name = "libgit2-sys" +version = "0.17.0+1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.1", +] + +[[package]] +name = "libservo" +version = "0.0.1" +dependencies = [ + "background_hang_monitor", + "base", + "bluetooth", + "bluetooth_traits", + "canvas", + "canvas_traits", + "cfg-if", + "compositing", + "compositing_traits", + "constellation", + "crossbeam-channel", + "devtools", + "devtools_traits", + "embedder_traits", + "env_logger 0.10.2", + "euclid", + "fonts", + "fonts_traits", + "gaol", + "gleam", + "gstreamer", + "ipc-channel", + "keyboard-types", + "layout_thread_2013", + "layout_thread_2020", + "log", + "media", + "mozangle", + "net", + "net_traits", + "profile", + "profile_traits", + "script", + "script_layout_interface", + "script_traits", + "servo-media", + "servo-media-dummy", + "servo-media-gstreamer", + "servo_config", + "servo_geometry", + "servo_url", + "sparkle", + "style", + "style_traits", + "surfman", + "tracing", + "webdriver_server", + "webgpu", + "webrender", + "webrender_api", + "webrender_traits", + "webxr", + "webxr-api", +] + +[[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 = "libz-sys" +version = "1.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lyon_geom" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_size_of" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "accountable-refcell", + "app_units", + "content-security-policy", + "crossbeam-channel", + "cssparser", + "dom", + "euclid", + "http", + "indexmap", + "keyboard-types", + "selectors", + "serde", + "serde_bytes", + "servo_arc", + "smallbitvec", + "smallvec", + "string_cache", + "thin-vec", + "time 0.1.45", + "tokio", + "url", + "uuid", + "void", + "webrender_api", + "xml5ever", +] + +[[package]] +name = "malloc_size_of_derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" +dependencies = [ + "proc-macro2", + "syn", + "synstructure", +] + +[[package]] +name = "malloc_size_of_tests" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "servo_arc", +] + +[[package]] +name = "markup5ever" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d581ff8be69d08a2efa23a959d81aa22b739073f749f067348bd4f4ba4b69195" +dependencies = [ + "log", + "phf 0.11.2", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "media" +version = "0.0.1" +dependencies = [ + "euclid", + "fnv", + "ipc-channel", + "log", + "serde", + "servo-media", + "servo_config", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +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 = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "metrics" +version = "0.0.1" +dependencies = [ + "base", + "fonts_traits", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "profile_traits", + "script_traits", + "servo_config", + "servo_url", +] + +[[package]] +name = "metrics_tests" +version = "0.0.1" +dependencies = [ + "base", + "fonts_traits", + "ipc-channel", + "metrics", + "profile_traits", + "servo_url", + "time 0.1.45", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz-sys" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "miow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "mozangle" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14af7d1a65278923835af94ac23d4c3662478001ac6e78075fe1210a7067e4b" +dependencies = [ + "bindgen", + "cc", + "gl_generator", + "lazy_static", + "libz-sys", + "walkdir", +] + +[[package]] +name = "mozjs" +version = "0.14.1" +source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" +dependencies = [ + "bindgen", + "cc", + "lazy_static", + "libc", + "log", + "mozjs_sys", +] + +[[package]] +name = "mozjs_sys" +version = "0.128.0-9" +source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" +dependencies = [ + "bindgen", + "cc", + "encoding_c", + "encoding_c_mem", + "flate2", + "icu_capi", + "libc", + "libz-sys", + "tar", + "walkdir", +] + +[[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "naga" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "napi-derive-backend-ohos" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b18d697bedddd2d4c9f8f76b49fe65bd81ed1c55a7eec21ba40c176c236ddc" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn", +] + +[[package]] +name = "napi-derive-ohos" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8462d74a2d6c7a671bd610f99f9ba34c739aadd2da4d8dd9f109a7e666cc2ad2" +dependencies = [ + "cfg-if", + "convert_case", + "napi-derive-backend-ohos", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "napi-ohos" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad5a3bbb2ae61f345b8c11776f2e79fc2bb71d1901af9a5f81f03c9238a05d86" +dependencies = [ + "bitflags 2.6.0", + "ctor", + "napi-sys-ohos", + "once_cell", +] + +[[package]] +name = "napi-sys-ohos" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f101404db01422d034db5afa63eefff6d9c8f66c0894278bc456b4c30954e166" +dependencies = [ + "libloading", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "net" +version = "0.0.1" +dependencies = [ + "async-recursion", + "async-tungstenite", + "base", + "base64", + "brotli", + "bytes", + "chrono", + "content-security-policy", + "cookie 0.18.1", + "crossbeam-channel", + "data-url", + "devtools_traits", + "embedder_traits", + "flate2", + "futures 0.3.30", + "generic-array", + "headers", + "http", + "hyper", + "hyper-rustls", + "hyper_serde", + "imsz", + "ipc-channel", + "libflate", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "mime", + "mime_guess", + "net_traits", + "percent-encoding", + "pixels", + "profile_traits", + "rayon", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "servo_allocator", + "servo_arc", + "servo_config", + "servo_url", + "sha2", + "time 0.1.45", + "tokio", + "tokio-rustls", + "tokio-stream", + "tokio-test", + "tungstenite", + "url", + "uuid", + "webpki-roots", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "net_traits" +version = "0.0.1" +dependencies = [ + "base", + "content-security-policy", + "cookie 0.18.1", + "embedder_traits", + "headers", + "http", + "hyper", + "hyper_serde", + "image", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "mime", + "num-traits", + "percent-encoding", + "pixels", + "rustls", + "serde", + "servo_arc", + "servo_rand", + "servo_url", + "url", + "uuid", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[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 = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "ohos-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491c77f0fe6b4336266f9da68b8dffb15d3bbe19c32ac0145b861851af3c8e41" + +[[package]] +name = "ohos-vsync" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5871e38034a33e8d43c711a40d39e24fd3500f43b61b9269b8586f608a70aec3" +dependencies = [ + "ohos-sys", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openxr" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d6934d2508f94fd4cbda6c2a326f111f60ce59fd9136df6d478564397dd40" +dependencies = [ + "libc", + "libloading", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f10e7e38c47f2175fc39363713b656db899fa0b4a14341029702cbdfa6f44d05" +dependencies = [ + "libc", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordermap" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "peek-poke" +version = "0.3.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "euclid", + "peek-poke-derive", +] + +[[package]] +name = "peek-poke-derive" +version = "0.3.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", + "unicode-xid", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" +dependencies = [ + "fixedbitset 0.1.9", + "ordermap", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset 0.4.2", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pixels" +version = "0.0.1" +dependencies = [ + "euclid", + "image", + "ipc-channel", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "webrender_api", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plane-split" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f7d82649829ecdef8e258790b0587acf0a8403f0ce963473d8e918acc1643" +dependencies = [ + "euclid", + "log", + "smallvec", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.4", +] + +[[package]] +name = "polling" +version = "3.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", +] + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "prettyplease" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profile" +version = "0.0.1" +dependencies = [ + "base", + "ipc-channel", + "libc", + "profile_traits", + "regex", + "serde", + "serde_json", + "servo_config", + "task_info", + "tikv-jemalloc-sys", + "time 0.3.36", +] + +[[package]] +name = "profile_tests" +version = "0.0.1" +dependencies = [ + "ipc-channel", + "profile", + "profile_traits", + "servo_config", + "time 0.3.36", +] + +[[package]] +name = "profile_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "ipc-channel", + "log", + "serde", + "servo_config", + "signpost", + "time 0.3.36", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck", + "itertools 0.10.5", + "log", + "multimap", + "once_cell", + "petgraph 0.6.5", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "protobuf-src" +version = "2.1.0+27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7edafa3bcc668fa93efafcbdf58d7821bbda0f4b458ac7fae3d57ec0fec8167" +dependencies = [ + "cmake", +] + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger 0.8.4", + "log", + "rand", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_isaac" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "malloc_size_of_derive", + "num-traits", + "serde", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raqote" +version = "0.8.5" +source = "git+https://github.com/jrmuizel/raqote?rev=64716c8#64716c8d68436451ca151bb0c70ba300fd964f42" +dependencies = [ + "euclid", + "font-kit", + "lyon_geom", + "pathfinder_geometry", + "png", + "sw-composite", + "typed-arena", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.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_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox 0.1.3", + "thiserror", +] + +[[package]] +name = "ref_filter_map" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed" + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" +dependencies = [ + "memchr", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.6.0", + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f5b7fc8060f4f8373f9381a630304b42e1183535d9beb1d3f596b236c9106a" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rustix" +version = "0.38.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "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 = "script" +version = "0.0.1" +dependencies = [ + "accountable-refcell", + "app_units", + "arrayvec", + "atomic_refcell", + "background_hang_monitor_api", + "backtrace", + "base", + "base64", + "bincode", + "bitflags 2.6.0", + "bluetooth_traits", + "canvas_traits", + "chrono", + "content-security-policy", + "cookie 0.18.1", + "crossbeam-channel", + "cssparser", + "data-url", + "deny_public_fields", + "devtools_traits", + "dom", + "dom_struct", + "domobject_derive", + "embedder_traits", + "encoding_rs", + "euclid", + "fnv", + "fonts", + "fonts_traits", + "fxhash", + "headers", + "html5ever", + "http", + "hyper_serde", + "image", + "indexmap", + "ipc-channel", + "itertools 0.13.0", + "jstraceable_derive", + "keyboard-types", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "media", + "metrics", + "mime", + "mime_guess", + "mozangle", + "mozjs", + "net_traits", + "num-traits", + "num_cpus", + "parking_lot", + "percent-encoding", + "phf 0.10.1", + "phf_codegen", + "phf_shared 0.11.2", + "pixels", + "profile_traits", + "range", + "ref_filter_map", + "regex", + "script_layout_interface", + "script_traits", + "selectors", + "serde", + "serde_json", + "servo-media", + "servo_allocator", + "servo_arc", + "servo_atoms", + "servo_config", + "servo_geometry", + "servo_rand", + "servo_url", + "smallvec", + "sparkle", + "style", + "style_traits", + "swapper", + "tempfile", + "tendril", + "time 0.1.45", + "time 0.3.36", + "unicode-bidi", + "unicode-segmentation", + "url", + "utf-8", + "uuid", + "webdriver", + "webgpu", + "webrender_api", + "webrender_traits", + "webxr-api", + "xml5ever", +] + +[[package]] +name = "script_layout_interface" +version = "0.0.1" +dependencies = [ + "app_units", + "atomic_refcell", + "base", + "canvas_traits", + "crossbeam-channel", + "euclid", + "fonts", + "fonts_traits", + "html5ever", + "ipc-channel", + "libc", + "malloc_size_of", + "malloc_size_of_derive", + "metrics", + "net_traits", + "pixels", + "profile_traits", + "range", + "script_traits", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "servo_url", + "style", + "style_traits", + "webrender_api", + "webrender_traits", +] + +[[package]] +name = "script_tests" +version = "0.0.1" +dependencies = [ + "euclid", + "keyboard-types", + "script", + "servo_url", +] + +[[package]] +name = "script_traits" +version = "0.0.1" +dependencies = [ + "background_hang_monitor_api", + "base", + "bitflags 2.6.0", + "bluetooth_traits", + "canvas_traits", + "cookie 0.18.1", + "crossbeam-channel", + "devtools_traits", + "embedder_traits", + "euclid", + "fonts_traits", + "http", + "hyper_serde", + "ipc-channel", + "keyboard-types", + "libc", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "media", + "net_traits", + "pixels", + "profile_traits", + "serde", + "servo_atoms", + "servo_url", + "smallvec", + "style_traits", + "uuid", + "webdriver", + "webgpu", + "webrender_api", + "webrender_traits", + "webxr-api", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sctk-adwaita" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +dependencies = [ + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit", + "tiny-skia", +] + +[[package]] +name = "selectors" +version = "0.24.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "bitflags 2.6.0", + "cssparser", + "derive_more", + "fxhash", + "log", + "new_debug_unreachable", + "phf 0.11.2", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "size_of_test", + "smallvec", + "to_shmem", + "to_shmem_derive", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.128" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "servo-display-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1060be2a0bbc35e712ec35ae98119b8def1071a5f2edbe392fd4c899bc2a5f4" +dependencies = [ + "foreign-types 0.3.2", + "objc", + "objc-foundation", + "thiserror", + "time-point", +] + +[[package]] +name = "servo-media" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "once_cell", + "servo-media-audio", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", +] + +[[package]] +name = "servo-media-audio" +version = "0.2.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "byte-slice-cast", + "euclid", + "log", + "num-complex", + "num-traits", + "petgraph 0.4.13", + "serde", + "serde_derive", + "servo-media-derive", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "smallvec", + "speexdsp-resampler", +] + +[[package]] +name = "servo-media-derive" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo-media-dummy" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "ipc-channel", + "servo-media", + "servo-media-audio", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", +] + +[[package]] +name = "servo-media-gstreamer" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "byte-slice-cast", + "glib", + "glib-sys", + "gstreamer", + "gstreamer-app", + "gstreamer-audio", + "gstreamer-base", + "gstreamer-player", + "gstreamer-sdp", + "gstreamer-sys", + "gstreamer-video", + "gstreamer-webrtc", + "ipc-channel", + "lazy_static", + "log", + "mime", + "once_cell", + "servo-media", + "servo-media-audio", + "servo-media-gstreamer-render", + "servo-media-gstreamer-render-android", + "servo-media-gstreamer-render-unix", + "servo-media-player", + "servo-media-streams", + "servo-media-traits", + "servo-media-webrtc", + "url", +] + +[[package]] +name = "servo-media-gstreamer-render" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "gstreamer", + "gstreamer-video", + "servo-media-player", +] + +[[package]] +name = "servo-media-gstreamer-render-android" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-video", + "servo-media-gstreamer-render", + "servo-media-player", +] + +[[package]] +name = "servo-media-gstreamer-render-unix" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "glib", + "gstreamer", + "gstreamer-gl", + "gstreamer-gl-egl", + "gstreamer-gl-x11", + "gstreamer-video", + "servo-media-gstreamer-render", + "servo-media-player", +] + +[[package]] +name = "servo-media-player" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "ipc-channel", + "serde", + "serde_derive", + "servo-media-streams", + "servo-media-traits", +] + +[[package]] +name = "servo-media-streams" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "lazy_static", + "uuid", +] + +[[package]] +name = "servo-media-traits" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" + +[[package]] +name = "servo-media-webrtc" +version = "0.1.0" +source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" +dependencies = [ + "lazy_static", + "log", + "servo-media-streams", + "uuid", +] + +[[package]] +name = "servo_allocator" +version = "0.0.1" +dependencies = [ + "libc", + "tikv-jemalloc-sys", + "tikv-jemallocator", + "windows-sys 0.59.0", +] + +[[package]] +name = "servo_arc" +version = "0.2.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] +name = "servo_atoms" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "string_cache", + "string_cache_codegen", +] + +[[package]] +name = "servo_config" +version = "0.0.1" +dependencies = [ + "dirs", + "embedder_traits", + "euclid", + "getopts", + "log", + "num_cpus", + "serde", + "serde_json", + "servo_config_plugins", + "servo_geometry", + "servo_url", + "style_config", + "url", +] + +[[package]] +name = "servo_config_plugins" +version = "0.0.1" +dependencies = [ + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo_geometry" +version = "0.0.1" +dependencies = [ + "app_units", + "euclid", + "malloc_size_of", + "malloc_size_of_derive", + "webrender_api", +] + +[[package]] +name = "servo_rand" +version = "0.0.1" +dependencies = [ + "log", + "rand", + "rand_core", + "rand_isaac", + "uuid", +] + +[[package]] +name = "servo_url" +version = "0.0.1" +dependencies = [ + "malloc_size_of", + "malloc_size_of_derive", + "serde", + "servo_arc", + "servo_rand", + "to_shmem", + "url", + "uuid", +] + +[[package]] +name = "servoshell" +version = "0.0.1" +dependencies = [ + "android_logger", + "arboard", + "backtrace", + "cc", + "cfg-if", + "egui", + "egui-winit", + "egui_glow", + "env_filter", + "euclid", + "getopts", + "gilrs", + "gl_generator", + "gleam", + "glow 0.13.1", + "headers", + "hilog", + "http", + "image", + "ipc-channel", + "jni", + "keyboard-types", + "libc", + "libloading", + "libservo", + "log", + "mime_guess", + "napi-derive-ohos", + "napi-ohos", + "net", + "net_traits", + "nix", + "ohos-sys", + "ohos-vsync", + "raw-window-handle", + "serde_json", + "servo-media", + "servo_allocator", + "shellwords", + "sig", + "surfman", + "tinyfiledialogs", + "tokio", + "tracing", + "tracing-perfetto", + "tracing-subscriber", + "url", + "vergen", + "webxr", + "windows-sys 0.59.0", + "winit", + "winres", +] + +[[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 = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellwords" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e515aa4699a88148ed5ef96413ceef0048ce95b43fbc955a33bde0a70fcae6" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "sig" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" +dependencies = [ + "libc", +] + +[[package]] +name = "signpost" +version = "0.1.0" +source = "git+https://github.com/pcwalton/signpost.git#7ed712507f343c38646b9d1fefd049166f9c9a18" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simple_logger" +version = "4.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7e46c8c90251d47d08b28b8a419ffb4aede0f87c2eea95e17d1d5bacbf3ef1" +dependencies = [ + "colored", + "log", + "time 0.3.36", + "windows-sys 0.48.0", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "size_of_test" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "static_assertions", +] + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallbitvec" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3fc564a4b53fd1e8589628efafe57602d91bde78be18186b5f61e8faea470" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.6.0", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +dependencies = [ + "libc", + "smithay-client-toolkit", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sparkle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fc6c6346da9177de9894230716709c223c62adbf910a5c1e6096b2ee2e58e0" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "speexdsp-resampler" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72d540d5c565dbe1f891d7e21ceb21d2649508306782f1066989fccb0b363d3" + +[[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.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "static_prefs" +version = "0.1.0" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" + +[[package]] +name = "strck" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" + +[[package]] +name = "strck_ident" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" +dependencies = [ + "strck", + "unicode-ident", +] + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "style" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "app_units", + "arrayvec", + "atomic_refcell", + "bitflags 2.6.0", + "byteorder", + "cssparser", + "derive_more", + "dom", + "encoding_rs", + "euclid", + "fxhash", + "icu_segmenter", + "indexmap", + "itertools 0.10.5", + "itoa", + "lazy_static", + "log", + "malloc_size_of", + "malloc_size_of_derive", + "markup5ever", + "matches", + "mime", + "new_debug_unreachable", + "num-derive", + "num-integer", + "num-traits", + "num_cpus", + "parking_lot", + "precomputed-hash", + "rayon", + "rayon-core", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "smallbitvec", + "smallvec", + "static_assertions", + "static_prefs", + "string_cache", + "style_config", + "style_derive", + "style_traits", + "thin-vec", + "time 0.1.45", + "to_shmem", + "to_shmem_derive", + "uluru", + "unicode-bidi", + "url", + "void", + "walkdir", +] + +[[package]] +name = "style_config" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "style_derive" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "derive_common", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "style_tests" +version = "0.0.1" +dependencies = [ + "app_units", + "cssparser", + "euclid", + "html5ever", + "rayon", + "selectors", + "serde_json", + "servo_arc", + "servo_atoms", + "style", + "style_traits", + "url", +] + +[[package]] +name = "style_traits" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "cssparser", + "euclid", + "lazy_static", + "malloc_size_of", + "malloc_size_of_derive", + "selectors", + "serde", + "servo_arc", + "servo_atoms", + "size_of_test", + "thin-vec", + "to_shmem", + "to_shmem_derive", + "url", + "webrender_api", +] + +[[package]] +name = "surfman" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb5f2d85c044920e1f2aaf5ad3795ae3b935025297271f2eadb021931571b4c3" +dependencies = [ + "bitflags 2.6.0", + "cfg_aliases 0.2.1", + "cgl", + "cocoa", + "core-foundation", + "core-graphics", + "euclid", + "fnv", + "gl_generator", + "io-surface", + "lazy_static", + "libc", + "log", + "mach2", + "metal 0.24.0", + "objc", + "raw-window-handle", + "servo-display-link", + "sparkle", + "wayland-sys 0.30.1", + "winapi", + "wio", + "x11", +] + +[[package]] +name = "svg_fmt" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" + +[[package]] +name = "sw-composite" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac8fb7895b4afa060ad731a32860db8755da3449a47e796d5ecf758db2671d4" + +[[package]] +name = "swapper" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.9", + "version-compare", +] + +[[package]] +name = "take_mut" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "task_info" +version = "0.0.1" +dependencies = [ + "cc", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "encoding_rs", + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "tester" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" +dependencies = [ + "cfg-if", + "getopts", + "libc", + "num_cpus", + "term", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread-id" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "time-point" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06535c958d6abe68dc4b4ef9e6845f758fc42fe463d0093d0aca40254f03fb14" + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinyfiledialogs" +version = "3.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848eb50d6d21430349d82418c2244f611b1ad3e1c52c675320338b3102d06554" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "to_shmem" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "cssparser", + "servo_arc", + "smallbitvec", + "smallvec", + "string_cache", + "thin-vec", +] + +[[package]] +name = "to_shmem_derive" +version = "0.0.1" +source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" +dependencies = [ + "darling", + "derive_common", + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "topological-sort" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "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", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-perfetto" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd21777b526dfcb57f11f65aa8a2024d83e1db52841993229b6e282e511978b7" +dependencies = [ + "anyhow", + "bytes", + "chrono", + "prost", + "prost-build", + "protobuf-src", + "rand", + "thread-id", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracy-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce607aae8ab0ab3abf3a2723a9ab6f09bb8639ed83fdd888d857b8e556c868d8" + +[[package]] +name = "truetype" +version = "0.47.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fb887b8a8ee8832e5810114ad4ef84d89f0aae569d198baee7fb7f7363a4ca4" +dependencies = [ + "typeface", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typeface" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fdbc53aae2bf36c48f1bc36d73a62b84091b6535b08e4e15bca876ce5e8050" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uluru" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-properties" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "unwind-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a81ba64bc45243d442e9bb2a362f303df152b5078c56ce4a0dc7d813c8df91" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "url" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cfg-if", + "git2", + "rustversion", + "time 0.3.36", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "warp" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers", + "http", + "hyper", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-util", + "tower-service", + "tracing", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wayland-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.5", +] + +[[package]] +name = "wayland-client" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.6.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webdriver" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc8773336cf1ad6ffadae7d73fea436e5c4d6345a467292902876cb0f7b72107" +dependencies = [ + "base64", + "bytes", + "cookie 0.16.2", + "http", + "log", + "serde", + "serde_derive", + "serde_json", + "time 0.3.36", + "tokio", + "tokio-stream", + "unicode-segmentation", + "url", + "warp", +] + +[[package]] +name = "webdriver_server" +version = "0.0.1" +dependencies = [ + "base", + "base64", + "compositing_traits", + "cookie 0.18.1", + "crossbeam-channel", + "euclid", + "http", + "image", + "ipc-channel", + "keyboard-types", + "log", + "net_traits", + "pixels", + "script_traits", + "serde", + "serde_json", + "servo_config", + "servo_url", + "style_traits", + "uuid", + "webdriver", +] + +[[package]] +name = "webgpu" +version = "0.0.1" +dependencies = [ + "arrayvec", + "base", + "euclid", + "ipc-channel", + "log", + "malloc_size_of", + "serde", + "servo_config", + "smallvec", + "webrender", + "webrender_api", + "webrender_traits", + "wgpu-core", + "wgpu-types", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webrender" +version = "0.65.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "bincode", + "bitflags 2.6.0", + "build-parallel", + "byteorder", + "derive_more", + "etagere", + "euclid", + "fxhash", + "gleam", + "glslopt", + "lazy_static", + "log", + "malloc_size_of_derive", + "num-traits", + "peek-poke", + "plane-split", + "rayon", + "ron", + "serde", + "smallvec", + "svg_fmt", + "time 0.1.45", + "topological-sort", + "tracy-rs", + "webrender_api", + "webrender_build", + "wr_glyph_rasterizer", + "wr_malloc_size_of", +] + +[[package]] +name = "webrender_api" +version = "0.65.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "app_units", + "bitflags 2.6.0", + "byteorder", + "crossbeam-channel", + "euclid", + "malloc_size_of_derive", + "peek-poke", + "serde", + "serde_bytes", + "serde_derive", + "time 0.1.45", + "wr_malloc_size_of", +] + +[[package]] +name = "webrender_build" +version = "0.0.2" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "bitflags 2.6.0", + "lazy_static", +] + +[[package]] +name = "webrender_traits" +version = "0.0.1" +dependencies = [ + "base", + "crossbeam-channel", + "embedder_traits", + "euclid", + "ipc-channel", + "libc", + "log", + "serde", + "surfman", + "webrender_api", +] + +[[package]] +name = "webxr" +version = "0.0.1" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" +dependencies = [ + "crossbeam-channel", + "euclid", + "log", + "openxr", + "serde", + "sparkle", + "surfman", + "webxr-api", + "winapi", + "wio", +] + +[[package]] +name = "webxr-api" +version = "0.0.1" +source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" +dependencies = [ + "euclid", + "ipc-channel", + "log", + "serde", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "wgpu-core" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "profiling", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.6.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "glow 0.14.0", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal 0.29.0", + "naga", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "windows 0.58.0", + "windows-core 0.58.0", +] + +[[package]] +name = "wgpu-types" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "serde", + "web-sys", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +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-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[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-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winit" +version = "0.29.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.6.0", + "bytemuck", + "calloop", + "cfg_aliases 0.1.1", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "wr_glyph_rasterizer" +version = "0.1.0" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "core-foundation", + "core-graphics", + "core-text", + "dwrote", + "euclid", + "freetype", + "fxhash", + "lazy_static", + "libc", + "log", + "malloc_size_of_derive", + "objc", + "rayon", + "serde", + "smallvec", + "tracy-rs", + "webrender_api", + "wr_malloc_size_of", +] + +[[package]] +name = "wr_malloc_size_of" +version = "0.0.3" +source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" +dependencies = [ + "app_units", + "euclid", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +dependencies = [ + "either", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xcursor" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.6.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml-rs" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" + +[[package]] +name = "xml5ever" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b906d34d867d216b2d79fb0e9470aaa7f4948ea86b44c27846efedd596076c" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix new file mode 100644 index 000000000000..de7efca2767f --- /dev/null +++ b/pkgs/by-name/se/servo/package.nix @@ -0,0 +1,155 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + + # build deps + cargo-deny, + cmake, + dbus, + gcc, + git, + gnumake, + libxkbcommon, + llvm, + llvmPackages, + m4, + makeWrapper, + perl, + pkg-config, + python3, + taplo, + vulkan-loader, + which, + yasm, + zlib, + + # runtime deps + darwin, + fontconfig, + freetype, + gst_all_1, + libGL, + libunwind, + udev, + wayland, + xorg, +}: + +let + customPython = python3.withPackages ( + ps: with ps; [ + dbus + packaging + pip + six + virtualenv + ] + ); + runtimePaths = lib.makeLibraryPath [ + xorg.libXcursor + xorg.libXrandr + xorg.libXi + libxkbcommon + vulkan-loader + wayland + libGL + ]; +in + +rustPlatform.buildRustPackage { + pname = "servo"; + version = "0-unstable-2024-09-09"; + + src = fetchFromGitHub { + owner = "servo"; + repo = "servo"; + rev = "938fd8c12fc2489303e12538d3e3585bd771141f"; + hash = "sha256-CrpEBFYd8Qd0rxSnT81IvtxxEuYG0jWGJeHISvxalyY="; + }; + + # need to use a `Cargo.lock` as there are git dependencies + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "derive_common-0.0.1" = "sha256-z0I2fQQlbUqaFU1EX45eYDy5IbZJ4SIget7WHzq4St0="; + "fontsan-0.5.2" = "sha256-4id66xxQ8iu0+OvJKH77WYPUE0eoVa9oUHmr6lRFPa8="; + "gilrs-0.10.6" = "sha256-RIfowFShWTPqgVWliK8Fc4cJw0YKITLvmexmTC0SwQk="; + "mozjs-0.14.1" = "sha256-RMM28Rd0r58VLfNEJzjWw3Ze6oKEi5lC1Edv03tJbfY="; + "peek-poke-0.3.0" = "sha256-WCZYX68vZrPhaAZwpx9/lUp3bVsLMwtmlJSW8wNb2ks="; + "servo-media-0.1.0" = "sha256-+J/6ZJPM9eus6YHJA6ENJD63CBiJTtKZdfORq9n6Nf8="; + "signpost-0.1.0" = "sha256-xRVXwW3Gynace9Yk5r1q7xA60yy6xhC5wLAyMJ6rPRs="; + "webxr-0.0.1" = "sha256-HZ8oWm5BaBLBXo4dS2CbWjpExry7dzeB2ddRLh7+98w="; + "naga-22.0.0" = "sha256-Xi2lWZCv4V2mUbQmwV1aw3pcvIIcyltKvv/C+LVqqDI="; + "raqote-0.8.5" = "sha256-WLsz5q08VNmYBxUhQ0hOn0K0RVFnnjaWF/MuQGkO/Rg="; + }; + }; + + # Remap absolute path between modules to include SEMVER + # set `HOME` to a temp dir for write access + # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) + preConfigure = '' + sed -i -e 's/\/style\//\/style-0.0.1\//g' ../cargo-vendor-dir/servo_atoms-0.0.1/build.rs + export HOME=$TMPDIR + unset AS + ''; + + nativeBuildInputs = [ + cargo-deny + cmake + customPython + dbus + gcc + git + gnumake + llvm + llvmPackages.libstdcxxClang + m4 + makeWrapper + perl + pkg-config + python3 + taplo + which + yasm + zlib + ]; + + buildInputs = [ + fontconfig + freetype + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + libunwind + udev + wayland + libGL + xorg.libX11 + xorg.libxcb + ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]); + + # copy resources into `$out` to be used during runtime + # link runtime libraries + postFixup = '' + mkdir -p $out/resources + cp -r ./resources $out/ + + wrapProgram $out/bin/servo \ + --prefix LD_LIBRARY_PATH : ${runtimePaths} + ''; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + meta = { + description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine"; + homepage = "https://servo.org"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ supinie ]; + mainProgram = "servo"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 7faf5dec439e..b9842ae0a66b 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-kifUp/neqTBPRuZKqNdW6JOinzh9LKfppyvW9AgxAYo="; + hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index baff481f6f2b..3b5d66508efb 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "signaturepdf"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "24eme"; repo = "signaturepdf"; rev = "v${version}"; - hash = "sha256-WPcnG1iRT4l4S/CSZkj75lIiyzVLsrSyH3GUJa7Tedc="; + hash = "sha256-OFsTTF+QmjRv0LdfRTWig6LjRXq1TXWOLeyEX5Ak62o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index cd18281e7eb4..8a3650638312 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.55.41"; + version = "2.56.15"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-T1FE8CZNOk3FKnykEwgEhScu6aNbcd5BQlXZOaAxjEo="; + hash = "sha256-PpFZvUyRBOhQuXvnMnaqYgrxPh4owWpv9Y8SHEIu9ck="; }; postPatch = '' diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 5faab954c316..e9b8cf958607 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-nED8SIfrxlKKT4J88L1Vnpq4Iq6TA4QMFK9TQfX4uRk=", - "version": "0.2024.09.10.08.02.stable_01" + "hash": "sha256-qaJP+du/jaI8zZPRZnM7K1DnC2GOzdZzs5JmKWj6OLQ=", + "version": "0.2024.09.17.08.02.stable_01" }, "linux_x86_64": { - "hash": "sha256-fNy0cNNgpq3JoeZhN20/7pRwCf53DwGkHl92/974FLQ=", - "version": "0.2024.09.10.08.02.stable_01" + "hash": "sha256-l51KJoEOXGokgnDb9pz5LVhgBN7B1eipsFA9J+QpQzM=", + "version": "0.2024.09.17.08.02.stable_01" }, "linux_aarch64": { - "hash": "sha256-HlPR3Q94KEdVlBsy2L+GQcyQ1qxw+As6qhWF5N3n3i4=", - "version": "0.2024.09.10.08.02.stable_01" + "hash": "sha256-zyiDYhxYG+JmiSdB7JBJ+H7yaIIvXaDlpslfa3TTsfI=", + "version": "0.2024.09.17.08.02.stable_01" } } diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix index bd09d6efaeb7..2941a0030c53 100644 --- a/pkgs/data/fonts/i-dot-ming/default.nix +++ b/pkgs/data/fonts/i-dot-ming/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "i.ming"; - version = "8.00"; + version = "8.10"; src = fetchurl { url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-6345629OdKz6lTnD3Vjtp6DzsYy0ojaL0naXGrtdZvw="; + hash = "sha256-y6E7dbBQ1nG2EdAGMUcmLkIeFDWa1FMJSLBw9WER8PM="; }; dontUnpack = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 91c406cad1b1..f0eb0492f3ad 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20240304"; + version = "20240920"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-vXG9aa6Zdv5R7q62tpFaUIw4MVnT/jWwZ+jw1S9K7MM="; + sha256 = "sha256-u+buByJ7w1VHs4fGWNRy2EDFYheztbzpFga3tS6PnKk="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 100bd0de0da8..9276a311a581 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.43"; + version = "0.6.44"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-syw/UX0I2ECfxB3wUlL0aMG7qI27wvoDWBELshncREM="; + hash = "sha256-Pw6q3qmYehTPnB3MyDi8Q5tC018H3zLsZAXWuc+abjE="; }; - cargoHash = "sha256-03wB01D+4a5fT/Zvb8nMw8/KUULE7Go+Egax7YbHVcU="; + cargoHash = "sha256-uO+j1kmoCLy00P0QHGy30XVPyG1tH4FU6YvTfWxxvWE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 538711b2bd68..075088306de6 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z9xDMQXzVUeHne7KG4QsutQAiU01mgnV7ccdkjl+EkU="; + hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-XKHcA4DSVsWZfUHT6BkRjK0Mzz90E+ohYrtwZKPMtTY="; + cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index ee5efdb22bf1..4924dd11003f 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -25,9 +25,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs="; "20.0.0-git".gitRelease = { - rev = "ffcff4af59712792712b33648f8ea148b299c364"; - rev-version = "20.0.0-unstable-2024-09-09"; - sha256 = "sha256-RVxezpWFDH4prmaLhm0ASlpRwnMdmLqcZMsp2RiXq8I="; + rev = "48498ec7a4ded9f1bf813051abdc54c3e5b66fa7"; + rev-version = "20.0.0-unstable-2024-09-16"; + sha256 = "sha256-kybEr4T6vA4F9wtWdFf0QagVYU3tUvaXiSzPsxBkVUI="; }; } // llvmVersions; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 6f1f89ee6243..7be472525512 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -3,15 +3,17 @@ mkCoqDerivation { pname = "autosubst"; - release."1.7".rev = "v1.7"; + releaseRev = v: "v${v}"; + release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; - release."1.8".rev = "v1.8"; release."1.8".sha256 = "sha256-n0lD8D+tjqkDDjFiE4CggxczOPS5TkEnxpB3zEwWZ2I="; + release."1.9".sha256 = "sha256-XiLZjMc+1iwRGOstfLm/WQRF6FTdX6oJr5urn3wmLlA="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "1.7"; } + { case = range "8.14" "8.20"; out = "1.9"; } { case = range "8.14" "8.18"; out = "1.8"; } + { case = range "8.10" "8.13"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 5a6d1b98ae0f..66711d3709c9 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -273,14 +273,14 @@ buildLuarocksPackage { compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; - version = "0.13-1"; + version = "0.14.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/compat53-0.13-1.rockspec"; - sha256 = "10gmhd526a5q0dl4dvjq7a5c7f3i7hcdla8hpygl79dhgbm649i3"; + url = "mirror://luarocks/compat53-0.14.3-1.rockspec"; + sha256 = "0c50x5nprcfafjnb4gzy23xszmr97mspy1g9m6pyj81c2648288n"; }).outPath; src = fetchzip { - url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.13.zip"; - sha256 = "06kpx5qyk1zki2r2g6z3alwhvmays50670z7mbl55h7s0kff2cpz"; + url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.14.3.zip"; + sha256 = "00qgfl5n2rfp1gikky03dmc30jy4piz0js8d7zznaclxsq2nyp2x"; }; disabled = luaOlder "5.1" || luaAtLeast "5.5"; @@ -387,23 +387,23 @@ buildLuarocksPackage { }; }) {}; -digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lpeg, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; - version = "0.5.1-1"; + version = "0.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/digestif-0.5.1-1.rockspec"; - sha256 = "03hhzpq1szdw43slq38wbndwh8knv71q9pgwd7hvvkp9wykzjhwr"; + url = "mirror://luarocks/digestif-0.6-1.rockspec"; + sha256 = "0hp7r97b6ivywaxb02cbnm23gjz71mak5ag6m3hi7f3mjqxxxh8k"; }).outPath; src = fetchFromGitHub { owner = "astoff"; repo = "digestif"; - rev = "v0.5.1"; - hash = "sha256-8QTc4IKD1tjRlyrSZy7cyUzRkvm6IHwlOXchPf2BaMk="; + rev = "v0.6"; + hash = "sha256-sGwKt9suRVNrbRJlhNMHzc5r4sK/fvUc7smxmxmrn8Y="; }; disabled = luaOlder "5.3"; - propagatedBuildInputs = [ lpeg ]; + propagatedBuildInputs = [ lpeg luafilesystem ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -555,14 +555,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1415-1"; + version = "0.0.1457-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1415-1.rockspec"; - sha256 = "039hy10ml25z2kvm5xiayvswx42rj4di119vgl2ncrfvlr5lnxdf"; + url = "mirror://luarocks/fzf-lua-0.0.1457-1.rockspec"; + sha256 = "1b1bad930cyicv9g0rd9k5hzk93kgxqk9gqw7adr7a9srb5gm431"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/e9413dc2b6e8ab7f62385c972df1dceba483492d.zip"; - sha256 = "09bh0rjx9g96vz0zfnpi4ych64qawrj1rgrpznkjn1cph8qayj35"; + url = "https://github.com/ibhagwan/fzf-lua/archive/f513524561060f2b9e3bd6d36ff046bfa03ca114.zip"; + sha256 = "0rqh2bvh1bp5i4y1xrvggi0d27a6qbpkvcinrq0c6s9k8g84d7wy"; }; disabled = luaOlder "5.1"; @@ -606,8 +606,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "562dc47189ad3c8696dbf460d38603a74d544849"; - hash = "sha256-NNoqXn24Fzkopx1/Xwcv41EpqHwpcMPrQWLfXcPtha4="; + rev = "1ef74b546732f185d0f806860fa5404df7614f28"; + hash = "sha256-s3y8ZuLV00GIhizcK/zqsJOTKecql7Xn3LGYmH7NLsQ="; }; disabled = lua.luaversion != "5.1"; @@ -622,14 +622,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "4.0.0-1"; + version = "4.0.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec"; - sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v"; + url = "mirror://luarocks/haskell-tools.nvim-4.0.1-1.rockspec"; + sha256 = "1kz93jm9fx5qga4nszb0g3rgravzrz4qb8fbns87hl5qidrh20rq"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip"; - sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.1.zip"; + sha256 = "160mnzjf6f5aw2k9fb2g416wxj3fqhpig1myppglp1586hm7b3fl"; }; disabled = luaOlder "5.1"; @@ -2088,14 +2088,14 @@ buildLuarocksPackage { luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser"; - version = "4.1.0-1"; + version = "5.0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; - sha256 = "sha256-PIvmRtzb9YEkuwXfLfY3w+DrOZZRjGSAvPsnK3dDeWQ="; + url = "mirror://luarocks/luarocks-build-treesitter-parser-5.0.2-1.rockspec"; + sha256 = "037rap1aar6xx25xgnlknkkszarkbflpdfp1jaasq5py397gc61a"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; - sha256 = "sha256-KNU/opkfKTZnCYfMOXVuGvb9J+iqfworQ0t2YcHAaKA="; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v5.0.2.zip"; + sha256 = "03f17sljq1f7nqrdjn94p9p2j67bs5si2nl0xlv1njj326rby324"; }; disabled = luaOlder "5.1"; @@ -2112,14 +2112,14 @@ buildLuarocksPackage { luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser-cpp"; - version = "2.0.3-1"; + version = "2.0.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.3-1.rockspec"; - sha256 = "1pn8kn1kf9ak4b7hba1nd358dh146sr993gf8r10s3ywcnihmnw0"; + url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.4-1.rockspec"; + sha256 = "0hrqy1s9c1naad43bri4icf5y139h5wk52yv4f0dxbvsfqbf8isb"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.3.zip"; - sha256 = "1dcjy1vy76vszm9r1ck42w8a1xw0ls0vs9xg5wzh3wnk2d1y54m3"; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.4.zip"; + sha256 = "0r7mvc1f7wgmb4xgknmr38cv35chwdyxmj1fxw4xsdjrvb1qyvi6"; }; disabled = luaOlder "5.1"; @@ -2259,16 +2259,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.4.2-1"; + version = "0.4.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.4.2-1.rockspec"; - sha256 = "15z4n7pbggg1wy397k9mx0jls31snvw0dgr9yklwi4sayfcva3ip"; + url = "mirror://luarocks/luasystem-0.4.4-1.rockspec"; + sha256 = "0gk489qwxfvc5qwmj9fgwi60qnjnqasc665bg8iiggapdwcl5ny4"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.4.2"; - hash = "sha256-xYfHK/OtOFtGHAZTPDp/BTywAcCqJIx8+zt3/HPon0w="; + rev = "v0.4.4"; + hash = "sha256-Lxp3o94QxtsgBMilKBG21mFneh0ux7wRKDyPwMTDDUA="; }; disabled = luaOlder "5.1"; @@ -2407,8 +2407,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; - hash = "sha256-gutr36WJRktDxmRjNo0v5tn030nMsAe8vRWx/vKFa2o="; + rev = "45a79ec4acb5af783a6a29673a999ce37f00497e"; + hash = "sha256-meUCXjJ9kHOOpRd4TR2dc7Ai97zOQX35hYFEDZseiSk="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2492,14 +2492,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "2.5.2-1"; + version = "2.6.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.5.2-1.rockspec"; - sha256 = "1sr6yhkq5bwp8bkqx206cr8ignz5z82a6j1dw4qgwdlvzs5kr0vs"; + url = "mirror://luarocks/lz.n-2.6.1-1.rockspec"; + sha256 = "01zg2hhwy8fd60h8akh7rc3b4wmdjrn0hxm11gqrnla80dvww91c"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v2.5.2.zip"; - sha256 = "0pkw6wrrkzv6vl9jxx7qlr8yjghnkr1s7jy66dsw5yzfb8gz8kpd"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.6.1.zip"; + sha256 = "0j4pbaibf6zry4m15rb5xkx6ivycdfkfq0x2hdiwi82abir3ycaz"; }; disabled = luaOlder "5.1"; @@ -2721,14 +2721,14 @@ buildLuarocksPackage { neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.4.0-1"; + version = "5.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.4.0-1.rockspec"; - sha256 = "0bk5z3p2v6m2nwxh82xk0xsqb23xa9i13vfgnd9h9qy3r42jqmmj"; + url = "mirror://luarocks/neotest-5.4.1-1.rockspec"; + sha256 = "0js7f2z6bsww9wlzzc1xrimrzz35nxhsn01hj3yhn4m0x7da20wi"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/32ff2ac21135a372a42b38ae131e531e64833bd3.zip"; - sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; + url = "https://github.com/nvim-neotest/neotest/archive/808cc4e2290c5e7c2440d32876ca15d580b01d04.zip"; + sha256 = "1xc9mmpkjcxv64rx0b73mm3wlniyyiyhs73s7n6pl4cxc93f2vpl"; }; disabled = luaOlder "5.1"; @@ -2836,14 +2836,14 @@ buildLuarocksPackage { pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }: buildLuarocksPackage { pname = "pathlib.nvim"; - version = "2.2.2-1"; + version = "2.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/pathlib.nvim-2.2.2-1.rockspec"; - sha256 = "04dklc0ibl6dbfckmkpj2s1gvjfmr0k2hyagw37rxypifncrffkr"; + url = "mirror://luarocks/pathlib.nvim-2.2.3-1.rockspec"; + sha256 = "0qwsjcsl6760d8d5k1lxlykh78g6v7xcr9caq3yh75yn76mwrl4i"; }).outPath; src = fetchzip { - url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.2.zip"; - sha256 = "10jhbdffaw1rh1qppzllmy96dbsn741bk46mph5kxpjq4ldx27hz"; + url = "https://github.com/pysan3/pathlib.nvim/archive/v2.2.3.zip"; + sha256 = "1z3nwy83r3zbll9wc2wyvg60z0dqc5hm2xdfvqh3hwm5s9w8j432"; }; disabled = luaOlder "5.1"; @@ -2949,21 +2949,21 @@ buildLuarocksPackage { }; }) {}; -rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua-curl, luaOlder, mimetypes, nvim-nio, xml2lua }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, luaOlder, mimetypes, nvim-nio, xml2lua }: buildLuarocksPackage { pname = "rest.nvim"; - version = "2.0.1-1"; + version = "3.7.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-2.0.1-1.rockspec"; - sha256 = "1ra76wnhi4nh56amyd8zqmg0mpsnhp3m41m3iyiq4hp1fah6nbqb"; + url = "mirror://luarocks/rest.nvim-3.7.0-1.rockspec"; + sha256 = "192vhinbvnj040xn6zclrf147f6ymiqah5lc8ijmx1yd8p0f730w"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/v2.0.1.zip"; - sha256 = "09rs04d5h061zns1kdfycryx4ll8ix15q3ybpmqsdyp2gn8l77df"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v3.7.0.zip"; + sha256 = "03sfij7k1myz0nb6hy16wan3s64dk1vhq24akpmgw7xb1dasn3ay"; }; disabled = luaOlder "5.1"; - propagatedBuildInputs = [ lua-curl mimetypes nvim-nio xml2lua ]; + propagatedBuildInputs = [ fidget-nvim mimetypes nvim-nio xml2lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2976,14 +2976,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "2.2.0-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-2.2.0-1.rockspec"; - sha256 = "129zvspn6ln9yzsxfcgai8vyz7jysxvdf08yy19zdqj0q7swh1iq"; + url = "mirror://luarocks/rocks-config.nvim-2.3.1-1.rockspec"; + sha256 = "01pk8k2a81rxg5raysw3wbs0azk10ghh1f2nk2k4khnzw0b6xzpp"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.2.0.zip"; - sha256 = "0vchi7274j4yhs0mv1j2na8k1240xj42kz6787s0vf05xcnywbh6"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.3.1.zip"; + sha256 = "0arvwb7c55mhcmngh3x2j56qbxfx9vp87nsxyzrsvd31ldgbsqdn"; }; disabled = luaOlder "5.1"; @@ -3000,14 +3000,14 @@ buildLuarocksPackage { rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.3.0-1"; + version = "1.7.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.3.0-1.rockspec"; - sha256 = "0s8k4kvd7j72ja6qwwxdsqjffkja8pdp95vml5wy9mqwxgvcb5c6"; + url = "mirror://luarocks/rocks-dev.nvim-1.7.0-1.rockspec"; + sha256 = "0jc8nxxbr7m3vw4lcyxi8wm4w0nz1ml54sbs96z4kj0p6mm9fds6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.3.0.zip"; - sha256 = "1fhd4mjbwizszxq3wrcdsczljgssgswqi4ibi8kdmnd9biyvbx65"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.7.0.zip"; + sha256 = "13n9dkv5217qd8dhj54d1rfqp6mx5jir319fmsln47jv83x7micz"; }; disabled = luaOlder "5.1"; @@ -3024,14 +3024,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "2.0.1-1"; + version = "2.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-2.0.1-1.rockspec"; - sha256 = "0r341vg7x49lnmx77smab5hpjpzwih7jmchfh24xhnv6319d70yx"; + url = "mirror://luarocks/rocks-git.nvim-2.2.0-1.rockspec"; + sha256 = "07pfqirhyphz283b5hs6ggwb2xlnigj3vj17hwhmb2fcv9ib3f61"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.0.1.zip"; - sha256 = "121x32915sr8il95jjpza2awvh4jknhgb99c091sb4vmdkg3pj24"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.2.0.zip"; + sha256 = "10cp3bdy04m4x0yrcivkgnqbs65rcrkgf14awc87wn727drs68sz"; }; disabled = luaOlder "5.1"; @@ -3048,14 +3048,14 @@ buildLuarocksPackage { rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.36.1-1"; + version = "2.40.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.36.1-1.rockspec"; - sha256 = "165kij3rk0inh9g3d3jpczhji9bjc7biz5r30xgw9q5xnafy4q38"; + url = "mirror://luarocks/rocks.nvim-2.40.0-1.rockspec"; + sha256 = "11cjx1cm4nynrs099r556a5yhkah9hxpylx5r6sqy0vwccvwplxp"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.36.1.zip"; - sha256 = "0zsrvngwwj9qxsxfbfgfin73aacs763sygixgiibq8rrl6gannxs"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.40.0.zip"; + sha256 = "00x5mn83w19ssahwg1bsmn3m5j4pmlg1caqlfpgx3b2hczas1v7l"; }; disabled = luaOlder "5.1"; @@ -3063,7 +3063,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; - description = "Neovim plugin management inspired by Cargo, powered by luarocks"; + description = "🌒 Neovim plugin management inspired by Cargo, powered by luarocks"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; @@ -3072,14 +3072,14 @@ buildLuarocksPackage { rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rtp.nvim"; - version = "1.1.0-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rtp.nvim-1.1.0-1.rockspec"; - sha256 = "1wmg2rqw8jph4ymmc33j8r47p2ni7fdd3dmiiwp19symslcw71js"; + url = "mirror://luarocks/rtp.nvim-1.2.0-1.rockspec"; + sha256 = "0is9ssi3pwvshm88lnp4hkig4f0ckgl2f3a1axwci89y8lla50iv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.1.0.zip"; - sha256 = "0n3ydd1n0mbc0m81rdbs73gpdr3m6qj735sjqdf36qv52gjcisj8"; + url = "https://github.com/nvim-neorocks/rtp.nvim/archive/v1.2.0.zip"; + sha256 = "1b6hx50nr2s2mnhsx9zy54pjdq7f78mi394v2b2c9v687s45nqln"; }; disabled = luaOlder "5.1"; @@ -3095,14 +3095,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "5.2.0-1"; + version = "5.4.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-5.2.0-1.rockspec"; - sha256 = "15pz9m5livp0n2bhal8wmg8hbhvyb6195ayzjcm3xsivplc4drns"; + url = "mirror://luarocks/rustaceanvim-5.4.2-1.rockspec"; + sha256 = "114ydzvchla7vam2ijihr66x88p5ww3r58zdb3fgc6dbbpcxjnrb"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/5.2.0.zip"; - sha256 = "1mswi4fy0ggikl3cpwhx1lar5pb8zcfp9az8zb9cn00cmzf749s4"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/5.4.2.zip"; + sha256 = "1nq9s0fnqjgbj1vcwf15512lp6i3w0axmca2hskmalyj65k157y1"; }; disabled = luaOlder "5.1"; @@ -3314,8 +3314,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; - hash = "sha256-F5TGzfPSDQY+AOzaDXStswHjkGQvnLeTWW5/xdBalpo="; + rev = "927c10f748e49c543b2d544c321a1245302ff324"; + hash = "sha256-dF6O5elMbm5JOeMI7UAyrwhq8Ng52/yBwpNJRWNAizQ="; }; disabled = lua.luaversion != "5.1"; @@ -3406,14 +3406,14 @@ buildLuarocksPackage { tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser-cpp }: buildLuarocksPackage { pname = "tree-sitter-norg"; - version = "0.2.5-1"; + version = "0.2.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tree-sitter-norg-0.2.5-1.rockspec"; - sha256 = "1w3hns9n92ygc7x3wxq3pd2kjs2nfp1arxq9zda75h2alwapjink"; + url = "mirror://luarocks/tree-sitter-norg-0.2.6-1.rockspec"; + sha256 = "1s0wj59v4zjgimws742ybzy7nhnnkz8nas4y5k96c2z5z54ynxmq"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612.zip"; - sha256 = "12s4lvs2iw3v9hwfcql0phi8gxgpwfj3i6443f0mss5zn7f6w50g"; + url = "https://github.com/nvim-neorg/tree-sitter-norg/archive/v0.2.6.zip"; + sha256 = "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g"; }; nativeBuildInputs = [ luarocks-build-treesitter-parser-cpp ]; @@ -3452,16 +3452,16 @@ buildLuarocksPackage { vusted = callPackage({ buildLuarocksPackage, busted, fetchFromGitHub, fetchurl, luasystem }: buildLuarocksPackage { pname = "vusted"; - version = "2.3.4-1"; + version = "2.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.3.4-1.rockspec"; - sha256 = "1yzdr0xgsjfr4a80a2zrj58ls0gmms407q4h1dx75sszppzvm1wc"; + url = "mirror://luarocks/vusted-2.5.0-1.rockspec"; + sha256 = "05jv8kl0hy3pyrknafmynifrqyrcc5q9qkd4ly1vmxgmmbm30nqz"; }).outPath; src = fetchFromGitHub { owner = "notomo"; repo = "vusted"; - rev = "v2.3.4"; - hash = "sha256-Zh54mHNrbFH5qygzsXVv+Vc7oUP+RIQXBvK+UvaGvxY="; + rev = "v2.5.0"; + hash = "sha256-1/fZ8OAw9NZoY1YDN6OhOJRqwRDWps5JJDIsvWg1Nr4="; }; propagatedBuildInputs = [ busted luasystem ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index bee4f2dd131d..228572dd9f25 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -776,7 +776,7 @@ in }); sqlite = prev.sqlite.overrideAttrs (drv: { - doCheck = true; + doCheck = stdenv.isLinux; nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ]; # the plugin loads the library from either the LIBSQLITE env diff --git a/pkgs/development/ocaml-modules/brr/default.nix b/pkgs/development/ocaml-modules/brr/default.nix index e010bedebb0e..7dd46af26cb4 100644 --- a/pkgs/development/ocaml-modules/brr/default.nix +++ b/pkgs/development/ocaml-modules/brr/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-brr"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz"; - hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0="; + hash = "sha256-rcWuW6avI/RJZNAlxKOsPSEtDQZ1hb51oKpSk3iG7oY="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ]; diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 89c706c578cf..04755463bf61 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.1.0b0"; + version = "0.1.0b1"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-ocvNDLZ6h4PincCHhZfKEsIvQH0LScAsY3zrfDsXWHI="; + hash = "sha256-INpyN5jdXOzTC6t18PvbkbDM7n4Y4rejb08UfyJyFSk="; }; postPatch = '' @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = { description = "Client for Home Assistant Supervisor"; - homepage = "https://pypi.org/project/aiohasupervisor/"; + homepage = "https://github.com/home-assistant-libs/python-supervisor-client"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 68d45218f788..876c7f25fdec 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "31.0.0"; + version = "32.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-E0NY1/iMTSm0AJ+R12GYYeH61dvqXhR0At1hrZa1Yko="; + pname = "azure_mgmt_containerservice"; + inherit version; + hash = "sha256-zLWHR52Kk+x49xYlkK3ILk+6TeduStw0GfM60iXvspI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 2ae19e4d8e25..ff5d9d0bf27b 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -6,21 +6,25 @@ fetchPypi, isodate, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.5.1"; - format = "setuptools"; + version = "9.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI="; + pname = "azure_mgmt_cosmosdb"; + inherit version; + hash = "sha256-Znx9io9UKw55cuYydK9TatmFGH4kpswuPI7vNVYIgfw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 9a3ed6f0a1e9..377b77975b84 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.17.0"; + version = "12.18.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-97LGz8G3y4AJelOx7S76nlRbSaKRQw02nNtJ+vvIQdY="; + pname = "azure_storage_file_share"; + inherit version; + hash = "sha256-CoHa7l4TWYrM3jxzsa7Mxu39zsXpV79AFQwGIvuV3HY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index c6fcce00fddd..86f757e0ab44 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,19 +12,20 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.11.0"; + version = "12.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Cox3eDnbpcUIJMrEivo8xWvgRPqkXKYbcmnrMZ6/AXE="; + pname = "azure_storage_queue"; + inherit version; + hash = "sha256-uvLxvIK31PUpGSLD6k8jziJD6ULb50lPyheCKQs38eQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-core cryptography isodate diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 7acdf490acb4..5859e00c6cd8 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -71,6 +71,10 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_app_cleans_up_images" + # DeprecationWarning in dependency: reportlab + "test_align_option_1" + # Comparison w/ magic values in test + "test_generate_with_separate" ]; pythonImportsCheck = [ "blockdiag" ]; diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix index 0b32a37698be..ffa97d4c1909 100644 --- a/pkgs/development/python-modules/braceexpand/default.nix +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "braceexpand"; version = "0.1.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,15 +19,20 @@ buildPythonPackage rec { sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braceexpand" ]; - meta = with lib; { + meta = { description = "Bash-style brace expansion for Python"; homepage = "https://github.com/trendels/braceexpand"; changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ newam ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + newam + pbsds + ]; }; } diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index afa496973249..d0d8f753ea69 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evtx"; - version = "0.8.4"; + version = "0.8.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +20,13 @@ buildPythonPackage rec { owner = "omerbenamram"; repo = "pyevtx-rs"; rev = "refs/tags/${version}"; - hash = "sha256-s94KCUIJplrkMvFsFxPokTucB5TwVYD1xxcoJyvk5NU="; + hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-i16FNFbYrF2BONahLP7APMi9RPaLGmbnBH4hBPnHWzg="; + hash = "sha256-qBpc3PwvAceOMuRH4vrgURCsvKYhG2Id62n7sxW5AAg="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix index c1c9715f5a3f..9529615d0b1d 100644 --- a/pkgs/development/python-modules/exiv2/default.nix +++ b/pkgs/development/python-modules/exiv2/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "exiv2"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "jim-easterbrook"; repo = "python-exiv2"; rev = "refs/tags/${version}"; - hash = "sha256-nPSspQPq0y2Vg2S+iwQ1E+TdaOJ9aJN3eeXRrcDzdsM="; + hash = "sha256-AXBhCe7AvhQkGZaLMTGExwgUYQGdRkk14Rtceugexag="; }; # FAIL: test_localisation (test_types.TestTypesModule.test_localisation) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index c176c825943c..098e6cf28e6b 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -26,6 +25,7 @@ pytest-xdist, pytestCheckHook, tensorflow, + treescope, # optional-dependencies matplotlib, @@ -33,16 +33,14 @@ buildPythonPackage rec { pname = "flax"; - version = "0.8.5"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-6WOFq0758gtNdrlWqSQBlKmWVIGe5e4PAaGrvHoGjr0="; + hash = "sha256-iDWuUJKO7V4QrbVsS4ALgy6fbllOC43o7W4mhjtZ9xc="; }; build-system = [ @@ -75,6 +73,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook tensorflow + treescope ]; pytestFlagsArray = [ @@ -95,13 +94,18 @@ buildPythonPackage rec { "flax/nnx/examples/*" # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" - # Requires tree + # Too old version of tensorflow: + # ModuleNotFoundError: No module named 'keras.api._v2' "tests/tensorboard_test.py" ]; disabledTests = [ # ValueError: Checkpoint path should be absolute "test_overwrite_checkpoints0" + # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 + # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs + "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None + "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... ]; meta = { diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 83e063e9cc54..767f2262c287 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -55,6 +55,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_aws" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = { changelog = "https://github.com/langchain-ai/langchain-aws/releases/tag/v${version}"; description = "Build LangChain application on AWS"; diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index 0d9ce18648f6..9bf287ea2c34 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -23,8 +23,6 @@ responses, syrupy, toml, - - nix-update-script, }: buildPythonPackage rec { @@ -67,11 +65,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-azure-dynamic-sessions==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index d5a5a53ac90f..f9a35e759c8e 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -7,7 +7,6 @@ numpy, poetry-core, pytestCheckHook, - nix-update-script, }: buildPythonPackage rec { @@ -38,11 +37,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-chroma==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 8f42413117ae..54de5416be18 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { - updateScript = langchain-core.updateScript; + inherit (langchain-core) updateScript; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 0d835c4078c5..1149c31f382e 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -83,15 +83,25 @@ buildPythonPackage rec { ''; passthru = { + # Updates to core tend to drive updates in everything else updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-update set -u -o pipefail +e + # Common core nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community + + # Extensions + nix-update --commit --version-regex 'langchain-aws==(.*)' python3Packages.langchain-aws + nix-update --commit --version-regex 'langchain-azure-dynamic-sessions==(.*)' python3Packages.langchain-azure-dynamic-sessions + nix-update --commit --version-regex 'langchain-chroma==(.*)' python3Packages.langchain-chroma + nix-update --commit --version-regex 'langchain-huggingface==(.*)' python3Packages.langchain-huggingface + nix-update --commit --version-regex 'langchain-mongodb==(.*)' python3Packages.langchain-mongodb + nix-update --commit --version-regex 'langchain-openai==(.*)' python3Packages.langchain-openai ''; }; diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 51f201ea694f..91866b412112 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -26,8 +26,6 @@ responses, syrupy, toml, - - nix-update-script, }: buildPythonPackage rec { @@ -73,11 +71,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_huggingface" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-huggingface==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index cf99e1fdf16d..0a064621887c 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -18,8 +18,6 @@ pytestCheckHook, pytest-mock, syrupy, - - nix-update-script, }: buildPythonPackage rec { @@ -58,11 +56,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_mongodb" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-mongodb==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 1410e72aeac1..82f0a776208a 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -24,8 +24,6 @@ responses, syrupy, toml, - - nix-update-script, }: buildPythonPackage rec { @@ -89,11 +87,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_openai" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "langchain-openai==(.*)" - ]; + passthru = { + inherit (langchain-core) updateScript; }; meta = { diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 8da8f5e2d224..bf0c5af4b8c4 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -47,7 +47,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.9"; + version = "0.11.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-IebrdKC73Rwj4AgN26Ga3qqMEAeuVDMmFhDqQ9VIWIw="; + hash = "sha256-6wQs6hB609Du5/n5sKJT5E0OJCj3dMKvpKxJ9C75HpI="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 723ff4069f27..8b113fe587a1 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.7"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-pwmiazL4JwzoYhMZQTcqv3ZMwPgbBxMTOEjH7/x9MPs="; + hash = "sha256-VjdvOeOkAlO1xPuQ0Ptq8JPyG7KTWSVhXwwooo0CgYc="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 1f45758dcd32..9026edb15344 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-ILAOCbFNG1ehsEDkvWFDbVH0Nza3tRADBypNBbA170Q="; + hash = "sha256-PHTaEkbJvdYdY7f8ISBA6i29IY1H/JhqGOOXTmRZG4A="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mapclassify/default.nix b/pkgs/development/python-modules/mapclassify/default.nix index 0045daf1bd9f..67fac8b840f2 100644 --- a/pkgs/development/python-modules/mapclassify/default.nix +++ b/pkgs/development/python-modules/mapclassify/default.nix @@ -7,6 +7,7 @@ geopandas, libpysal, + matplotlib, networkx, numpy, pandas, @@ -17,15 +18,15 @@ buildPythonPackage rec { pname = "mapclassify"; - version = "2.6.1"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pysal"; repo = "mapclassify"; - rev = "v${version}"; - hash = "sha256-lb2Ui6zdx6MQBtBrL/Xj9k7cm6De8aLEuBLZDhPPDnE="; + rev = "refs/tags/v${version}"; + hash = "sha256-JrFKWkMUu8rjJJb1KK8+R9ANkLhTPf1EmWpzhfE7MAE="; }; build-system = [ setuptools-scm ]; @@ -42,10 +43,14 @@ buildPythonPackage rec { pytestCheckHook geopandas libpysal + matplotlib ]; # requires network access - disabledTestPaths = [ "mapclassify/tests/test_greedy.py" ]; + disabledTestPaths = [ + "mapclassify/tests/test_greedy.py" + "mapclassify/tests/test_rgba.py" + ]; pythonImportsCheck = [ "mapclassify" ]; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 664054df075b..fabca6700316 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -13,6 +13,7 @@ pythonOlder, pytest-httpserver, pytestCheckHook, + setuptools, shapely, werkzeug, isPyPy, @@ -22,18 +23,20 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.7.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; - disabled = pythonOlder "3.6" || isPyPy; + disabled = pythonOlder "3.7" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; - repo = pname; + repo = "pyosmium"; rev = "refs/tags/v${version}"; - hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; + hash = "sha256-HYp1MzXSa0tx0hY0JyMf2bmEvm5YuS2R+o25TsO8J6I="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -47,7 +50,7 @@ buildPythonPackage rec { lz4 ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; preBuild = "cd .."; @@ -58,11 +61,13 @@ buildPythonPackage rec { pytest-httpserver ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Python bindings for libosmium"; homepage = "https://osmcode.org/pyosmium"; changelog = "https://github.com/osmcode/pyosmium/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; }; } diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5494169e3b12..b664291e2c85 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.5"; + version = "21.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-i1YEcN615xeI4HcygXV9kzuXpT2yDSnlNU6bZqu1dPM="; + hash = "sha256-FwAlceRqQfTjCCi+Mqrf0LCxSZD4mV/CVN6YPs947c4="; }; build-system = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 4b63eb5dd759..4e236beb99d7 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.8"; + version = "0.9.9"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-3rwL47mXVzWBL4REE1Dchg8GQLWJn+bzoZnmXHgKX40="; + hash = "sha256-Zv81F7EvukrmA2uLFizJX6EIH4OBJICC7H9k8EtIumI="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index c1c8473c2658..09a1c303c520 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.22"; + version = "0.23"; pyproject = true; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-OAHhpVQIAT3+f/+Oo2MNcS+xP7KB/LVvXLpOyY1rumM="; + hash = "sha256-IZjPdfg6q5uWEpvQE3djekvChcB7HWbbPqAv/0tu6fM="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 209ca7090cc7..4bfbc9d1e54a 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -8,8 +8,8 @@ fetchPypi, firebase-messaging, freezegun, + hatchling, oauthlib, - poetry-core, pytest-asyncio, pytest-freezer, pytest-mock, @@ -18,11 +18,12 @@ pythonOlder, pytz, typing-extensions, + websockets, }: buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.9.3"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,12 +31,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-jzhboyDq3PXkwKKrAehX1F1UEUo9qofb+Z4/W5vwjiU="; + hash = "sha256-NnKcUr0SExXRDkNCIGU3LtwU1LIMAZzurn2Aoua1lzA="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiofiles @@ -44,6 +45,7 @@ buildPythonPackage rec { oauthlib pytz typing-extensions + websockets ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 008fb69e8aa7..88e126d4d5cc 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,25 +23,17 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "6.6.1"; + version = "6.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-tiler"; - rev = version; - hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ="; + rev = "refs/tags/${version}"; + hash = "sha256-i70Bh7RHPgLLaqBo9vHRrJylsNE3Ly3xJq9j12Ch58E="; }; - patches = [ - # fix xarray tests, remove on next release - (fetchpatch { - url = "https://github.com/cogeotiff/rio-tiler/commit/7a36ed58b649d2f4d644f280b54851ecb7ffa4e9.patch"; - hash = "sha256-QlX5ZKpjSpXevi76gx39dXok0aClApkLU0cAVpCuYYs="; - }) - ]; - build-system = [ hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index cfd0c71d38d4..c32adc8dc309 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.5.0"; + version = "6.6.1"; pyproject = true; # no tests included in PyPI tarball @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sB2lWFFpCGgF0XFes84fBBvR8GF+S8aWWJoih+xBmW8="; + sha256 = "sha256-ULY0FH1RFQIlhS45LU3vUKi6urZJHiDgi6NdqU5tV2g="; }; build-system = [ setuptools ]; @@ -46,6 +46,8 @@ buildPythonPackage rec { mkdir utest/output_dir ''; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 2b0177ffc3c4..b9cf305a8d65 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-Kp0B3+1zK45KypCaxH02U/JdzTBGwFAoxtmzek94QNI="; + hash = "sha256-YtAgv0vH2aL7UX3ETVfwDEQYEWYo5Pj/R45CeH7T3BU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/treescope/default.nix b/pkgs/development/python-modules/treescope/default.nix new file mode 100644 index 000000000000..c27e95cdff38 --- /dev/null +++ b/pkgs/development/python-modules/treescope/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + flit-core, + + # dependencies + numpy, + + # optional-dependencies + ipython, + jax, + palettable, + + # tests + absl-py, + jaxlib, + pytestCheckHook, + torch, +}: + +buildPythonPackage rec { + pname = "treescope"; + version = "0.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google-deepmind"; + repo = "treescope"; + rev = "refs/tags/v${version}"; + hash = "sha256-+Hm60O9tEXIiE0av1O0BsOdMln4e1s7ijb3WNiQ74jE="; + }; + + build-system = [ flit-core ]; + + dependencies = [ numpy ]; + + optional-dependencies = { + notebook = [ + ipython + jax + palettable + ]; + }; + + pythonImportsCheck = [ "treescope" ]; + + nativeCheckInputs = [ + absl-py + jax + jaxlib + pytestCheckHook + torch + ]; + + meta = { + description = "An interactive HTML pretty-printer for machine learning research in IPython notebooks"; + homepage = "https://github.com/google-deepmind/treescope"; + changelog = "https://github.com/google-deepmind/treescope/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 229ee20bc95c..db7c59df4c1c 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.23.0"; + version = "3.23.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-6yjWDHcEp1NLqyNopaKvLHtCstpVRPBdy2UiLa5Zvnw="; + hash = "sha256-8AtQxLOOgEKhkbza9YwXrZVh/++UeJq8n8a7VwIzHSc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zulip-emoji-mapping/default.nix b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix new file mode 100644 index 000000000000..74c6919b2e9b --- /dev/null +++ b/pkgs/development/python-modules/zulip-emoji-mapping/default.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonPackage rec { + pname = "zulip-emoji-mapping"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GearKite"; + repo = "zulip-emoji-mapping"; + rev = "v${version}"; + hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + pythonImportsCheck = [ + "zulip_emoji_mapping" + ]; + + meta = { + description = "Get emojis by Zulip names"; + homepage = "https://github.com/GearKite/zulip-emoji-mapping"; + changelog = "https://github.com/GearKite/zulip-emoji-mapping/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ robertrichter ]; + }; +} diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index afefaffdd61d..550bdb462b88 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1293.0"; + version = "1.1293.1"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-zCDxq+aP7StfgXTg6G/J4o5xjcKI4ak3N3Dh8cIUK8U="; + hash = "sha256-Vgt9h0LLIC5I9NZZKKWD9b1xnNOSkxApLxSGf2C0ODk="; }; - npmDepsHash = "sha256-XPJoDhCncucFTv1B+YlMQxh3KkXleQGRvcSuYrXcL4g="; + npmDepsHash = "sha256-1YtyQg14vj85KtOXP93vLkqIMmT+8DAJdG/ql+1ooyU="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 8298ff4c2557..c175badcc300 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZJ1TxkvOZWQWQrtQvAIN0G9cLXRH89GcrTuIbaIKgDE="; + hash = "sha256-T4NbblrjDv9gBLslwV/Y9Pbs0RBVluhtsYcf730YET0="; }; # tests make dns requests and fails diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index b1d5bee33651..95fa7c96c2bf 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.40.1"; + version = "1.42.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-NctOr9eAOQr2pkPSYbFasU2D9PsPxRPZOAxVBJNw5NY="; + hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU="; }; - vendorHash = "sha256-n6SGBfelHNdpU5O1mMrre0D0B/2UEhX0fqepy1UDHlY="; + vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo="; patches = [ # Skip a test that requires networking to be available to work. @@ -76,7 +76,7 @@ buildGoModule rec { changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}"; description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; license = licenses.asl20; - maintainers = with maintainers; [ jk lrewega ]; + maintainers = with maintainers; [ jk lrewega aaronjheng ]; mainProgram = "buf"; }; } diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index fdbe69b113c3..16ae0bbad20d 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-IgYfysinQnK8qSp4r1AuBpRYBFvwITjGHJduayDA9Fw="; + hash = "sha256-7bCfIWJV7gB+WbvMxmhJW1RM1pd3gA/bCuH+o4FGg/A="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index aa55cac49d75..d7abd37316c1 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.37.0"; + version = "0.38.0"; src = fetchCrate { inherit pname version; - hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg="; + hash = "sha256-NgaW/QsBaMMBbfUGyHwuu0fb3q3GmD8Qv5wG6qYPjvA="; }; - cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c="; + cargoHash = "sha256-KX3+tIdAyaWdaq2nabVTvoZRTXLSXEALFJYCa5nda4w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 66f0bd7a6431..c3ff06006b37 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.27"; + version = "1.1.29"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-I/axYOXXLU5V+82jfNwsmhjwGOMkK+e5Sx7pKqQlvBE="; + hash = "sha256-RSMuealmdHe7qGFwhK9e51TED3PaCwSqzd4aj2RKMxE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-LvIjCWx7fd0EOLEY9qy26SS5/5ztAvEPKdv8mUG+TCA="; + hash = "sha256-gY+MDJqDjQamxQsk/CJJVuHsBAfwgrebs/h6nI0HV78="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-/YgDnB8m0ZhkKpqPvFL8Hd6IBitySD+jMOJCn/7xxG8="; + hash = "sha256-j5jpgofGcfjto/3CtBsC4QV411lUGdk2wHwLGmLduo4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-Ir0EQH+bnHPwOTakrO/ZQ6pyeOWvhu5bK5j+YLN8Myc="; + hash = "sha256-RnKczYB/IkUYVBnRktCFhHsmvObQovVMfCilqJq3q1g="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 90351bc317b5..2fba60c53549 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.1"; + version = "0.3.6"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-5P6B52ekrAupoQh2K3LhC4ydwuKOTPfpjOVlGiDxQb0="; + hash = "sha256-Wj9omHywqXYEaap4w4C6wtwRs0QyKx4kp+QAkmK07fE="; }; - vendorHash = "sha256-QfequNmKLbZqMKcwhRXKaTflQYWKu8ucjaGcBM7Jn6g="; + vendorHash = "sha256-Z9qbrFctUv6F8374qyJ7Fw4HU/7BIhEfHfrwoFUXM4Q="; subPackages = [ "." ]; diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 8019e64ea588..7d855dae05eb 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -11,78 +11,89 @@ wayland-protocols, wayland, zxing-cpp, -}: let - allPackages = self: let - frameworks = import ./frameworks {inherit (self) callPackage;}; - gear = import ./gear {inherit (self) callPackage;}; - plasma = import ./plasma {inherit (self) callPackage;}; +}: +let + allPackages = + self: + let + frameworks = import ./frameworks { inherit (self) callPackage; }; + gear = import ./gear { inherit (self) callPackage; }; + plasma = import ./plasma { inherit (self) callPackage; }; - sets = ["gear" "frameworks" "plasma"]; + sets = [ + "gear" + "frameworks" + "plasma" + ]; - loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); - allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); + loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); + allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); - sources = lib.mapAttrs (_: v: - (fetchurl { - inherit (v) url hash; - }) - // {inherit (v) version;}) - allUrls; - in ( - qt6Packages - // frameworks - // gear - // plasma - // { - inherit sources; + sources = lib.mapAttrs ( + _: v: + (fetchurl { + inherit (v) url hash; + }) + // { + inherit (v) version; + } + ) allUrls; + in + ( + qt6Packages + // frameworks + // gear + // plasma + // { + inherit sources; - mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {}; + mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { }; - # THIRD PARTY - inherit - cmark - gpgme - taglib - wayland - wayland-protocols - zxing-cpp - ; + # THIRD PARTY + inherit + cmark + gpgme + taglib + wayland + wayland-protocols + zxing-cpp + ; - # Alias to match metadata - kquickimageeditor = self.kquickimageedit; + # Alias to match metadata + kquickimageeditor = self.kquickimageedit; - # Alias because it's just data - plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; + # Alias because it's just data + plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; - selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub + selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub - alpaka = self.callPackage ./misc/alpaka {}; - kdiagram = self.callPackage ./misc/kdiagram {}; - kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {}; - kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; - kirigami-addons = self.callPackage ./misc/kirigami-addons {}; - kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; - kio-fuse = self.callPackage ./misc/kio-fuse {}; - klevernotes = self.callPackage ./misc/klevernotes {}; - ktextaddons = self.callPackage ./misc/ktextaddons {}; - kunifiedpush = self.callPackage ./misc/kunifiedpush {}; - kup = self.callPackage ./misc/kup {}; - marknote = self.callPackage ./misc/marknote {}; - mpvqt = self.callPackage ./misc/mpvqt {}; - oxygen-icons = self.callPackage ./misc/oxygen-icons {}; - phonon = self.callPackage ./misc/phonon {}; - phonon-vlc = self.callPackage ./misc/phonon-vlc {}; - polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; - pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + alpaka = self.callPackage ./misc/alpaka { }; + kdiagram = self.callPackage ./misc/kdiagram { }; + kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; + kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { }; + kirigami-addons = self.callPackage ./misc/kirigami-addons { }; + kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 { }; + kio-fuse = self.callPackage ./misc/kio-fuse { }; + klevernotes = self.callPackage ./misc/klevernotes { }; + ktextaddons = self.callPackage ./misc/ktextaddons { }; + kunifiedpush = self.callPackage ./misc/kunifiedpush { }; + kup = self.callPackage ./misc/kup { }; + marknote = self.callPackage ./misc/marknote { }; + mpvqt = self.callPackage ./misc/mpvqt { }; + oxygen-icons = self.callPackage ./misc/oxygen-icons { }; + phonon = self.callPackage ./misc/phonon { }; + phonon-vlc = self.callPackage ./misc/phonon-vlc { }; + polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; + pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; - applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; - karousel = self.callPackage ./third-party/karousel {}; - krohnkite = self.callPackage ./third-party/krohnkite {}; - kzones = self.callPackage ./third-party/kzones {}; - } - ); + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { }; + karousel = self.callPackage ./third-party/karousel { }; + krohnkite = self.callPackage ./third-party/krohnkite { }; + kzones = self.callPackage ./third-party/kzones { }; + } + ); in - makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "kdePackages"; - f = allPackages; - } +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "kdePackages"; + f = allPackages; +} diff --git a/pkgs/kde/frameworks/attica/default.nix b/pkgs/kde/frameworks/attica/default.nix index 05b5c1e59be9..c2d8a5315778 100644 --- a/pkgs/kde/frameworks/attica/default.nix +++ b/pkgs/kde/frameworks/attica/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "attica"; } diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix index 40ab00ebd193..dc05d254dfd5 100644 --- a/pkgs/kde/frameworks/baloo/default.nix +++ b/pkgs/kde/frameworks/baloo/default.nix @@ -11,5 +11,8 @@ mkKdeDerivation { substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition ''; - extraBuildInputs = [qtdeclarative lmdb]; + extraBuildInputs = [ + qtdeclarative + lmdb + ]; } diff --git a/pkgs/kde/frameworks/bluez-qt/default.nix b/pkgs/kde/frameworks/bluez-qt/default.nix index 3bccb4309af7..24814d0d8d38 100644 --- a/pkgs/kde/frameworks/bluez-qt/default.nix +++ b/pkgs/kde/frameworks/bluez-qt/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluez-qt"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix index 103903c04cb4..e7c75aad85fb 100644 --- a/pkgs/kde/frameworks/breeze-icons/default.nix +++ b/pkgs/kde/frameworks/breeze-icons/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "breeze-icons"; extraNativeBuildInputs = [ - (python3.withPackages (ps: [ps.lxml])) + (python3.withPackages (ps: [ ps.lxml ])) libxml2 ]; diff --git a/pkgs/kde/frameworks/default.nix b/pkgs/kde/frameworks/default.nix index 302be8ad3eba..148c6a3d9895 100644 --- a/pkgs/kde/frameworks/default.nix +++ b/pkgs/kde/frameworks/default.nix @@ -1,74 +1,75 @@ -{callPackage}: { - attica = callPackage ./attica {}; - baloo = callPackage ./baloo {}; - bluez-qt = callPackage ./bluez-qt {}; - breeze-icons = callPackage ./breeze-icons {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration {}; - kapidox = callPackage ./kapidox {}; - karchive = callPackage ./karchive {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks {}; - kcalendarcore = callPackage ./kcalendarcore {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs {}; - kcolorscheme = callPackage ./kcolorscheme {}; - kcompletion = callPackage ./kcompletion {}; - kconfig = callPackage ./kconfig {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcontacts = callPackage ./kcontacts {}; - kcoreaddons = callPackage ./kcoreaddons {}; - kcrash = callPackage ./kcrash {}; - kdav = callPackage ./kdav {}; - kdbusaddons = callPackage ./kdbusaddons {}; - kdeclarative = callPackage ./kdeclarative {}; - kded = callPackage ./kded {}; - kdesu = callPackage ./kdesu {}; - kdnssd = callPackage ./kdnssd {}; - kdoctools = callPackage ./kdoctools {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel {}; - kguiaddons = callPackage ./kguiaddons {}; - kholidays = callPackage ./kholidays {}; - ki18n = callPackage ./ki18n {}; - kiconthemes = callPackage ./kiconthemes {}; - kidletime = callPackage ./kidletime {}; - kimageformats = callPackage ./kimageformats {}; - kio = callPackage ./kio {}; - kirigami = callPackage ./kirigami {}; - kitemmodels = callPackage ./kitemmodels {}; - kitemviews = callPackage ./kitemviews {}; - kjobwidgets = callPackage ./kjobwidgets {}; - knewstuff = callPackage ./knewstuff {}; - knotifications = callPackage ./knotifications {}; - knotifyconfig = callPackage ./knotifyconfig {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts {}; - kpeople = callPackage ./kpeople {}; - kplotting = callPackage ./kplotting {}; - kpty = callPackage ./kpty {}; - kquickcharts = callPackage ./kquickcharts {}; - krunner = callPackage ./krunner {}; - kservice = callPackage ./kservice {}; - kstatusnotifieritem = callPackage ./kstatusnotifieritem {}; - ksvg = callPackage ./ksvg {}; - ktexteditor = callPackage ./ktexteditor {}; - ktexttemplate = callPackage ./ktexttemplate {}; - ktextwidgets = callPackage ./ktextwidgets {}; - kunitconversion = callPackage ./kunitconversion {}; - kuserfeedback = callPackage ./kuserfeedback {}; - kwallet = callPackage ./kwallet {}; - kwidgetsaddons = callPackage ./kwidgetsaddons {}; - kwindowsystem = callPackage ./kwindowsystem {}; - kxmlgui = callPackage ./kxmlgui {}; - modemmanager-qt = callPackage ./modemmanager-qt {}; - networkmanager-qt = callPackage ./networkmanager-qt {}; - prison = callPackage ./prison {}; - purpose = callPackage ./purpose {}; - qqc2-desktop-style = callPackage ./qqc2-desktop-style {}; - solid = callPackage ./solid {}; - sonnet = callPackage ./sonnet {}; - syndication = callPackage ./syndication {}; - syntax-highlighting = callPackage ./syntax-highlighting {}; - threadweaver = callPackage ./threadweaver {}; +{ callPackage }: +{ + attica = callPackage ./attica { }; + baloo = callPackage ./baloo { }; + bluez-qt = callPackage ./bluez-qt { }; + breeze-icons = callPackage ./breeze-icons { }; + extra-cmake-modules = callPackage ./extra-cmake-modules { }; + frameworkintegration = callPackage ./frameworkintegration { }; + kapidox = callPackage ./kapidox { }; + karchive = callPackage ./karchive { }; + kauth = callPackage ./kauth { }; + kbookmarks = callPackage ./kbookmarks { }; + kcalendarcore = callPackage ./kcalendarcore { }; + kcmutils = callPackage ./kcmutils { }; + kcodecs = callPackage ./kcodecs { }; + kcolorscheme = callPackage ./kcolorscheme { }; + kcompletion = callPackage ./kcompletion { }; + kconfig = callPackage ./kconfig { }; + kconfigwidgets = callPackage ./kconfigwidgets { }; + kcontacts = callPackage ./kcontacts { }; + kcoreaddons = callPackage ./kcoreaddons { }; + kcrash = callPackage ./kcrash { }; + kdav = callPackage ./kdav { }; + kdbusaddons = callPackage ./kdbusaddons { }; + kdeclarative = callPackage ./kdeclarative { }; + kded = callPackage ./kded { }; + kdesu = callPackage ./kdesu { }; + kdnssd = callPackage ./kdnssd { }; + kdoctools = callPackage ./kdoctools { }; + kfilemetadata = callPackage ./kfilemetadata { }; + kglobalaccel = callPackage ./kglobalaccel { }; + kguiaddons = callPackage ./kguiaddons { }; + kholidays = callPackage ./kholidays { }; + ki18n = callPackage ./ki18n { }; + kiconthemes = callPackage ./kiconthemes { }; + kidletime = callPackage ./kidletime { }; + kimageformats = callPackage ./kimageformats { }; + kio = callPackage ./kio { }; + kirigami = callPackage ./kirigami { }; + kitemmodels = callPackage ./kitemmodels { }; + kitemviews = callPackage ./kitemviews { }; + kjobwidgets = callPackage ./kjobwidgets { }; + knewstuff = callPackage ./knewstuff { }; + knotifications = callPackage ./knotifications { }; + knotifyconfig = callPackage ./knotifyconfig { }; + kpackage = callPackage ./kpackage { }; + kparts = callPackage ./kparts { }; + kpeople = callPackage ./kpeople { }; + kplotting = callPackage ./kplotting { }; + kpty = callPackage ./kpty { }; + kquickcharts = callPackage ./kquickcharts { }; + krunner = callPackage ./krunner { }; + kservice = callPackage ./kservice { }; + kstatusnotifieritem = callPackage ./kstatusnotifieritem { }; + ksvg = callPackage ./ksvg { }; + ktexteditor = callPackage ./ktexteditor { }; + ktexttemplate = callPackage ./ktexttemplate { }; + ktextwidgets = callPackage ./ktextwidgets { }; + kunitconversion = callPackage ./kunitconversion { }; + kuserfeedback = callPackage ./kuserfeedback { }; + kwallet = callPackage ./kwallet { }; + kwidgetsaddons = callPackage ./kwidgetsaddons { }; + kwindowsystem = callPackage ./kwindowsystem { }; + kxmlgui = callPackage ./kxmlgui { }; + modemmanager-qt = callPackage ./modemmanager-qt { }; + networkmanager-qt = callPackage ./networkmanager-qt { }; + prison = callPackage ./prison { }; + purpose = callPackage ./purpose { }; + qqc2-desktop-style = callPackage ./qqc2-desktop-style { }; + solid = callPackage ./solid { }; + sonnet = callPackage ./sonnet { }; + syndication = callPackage ./syndication { }; + syntax-highlighting = callPackage ./syntax-highlighting { }; + threadweaver = callPackage ./threadweaver { }; } diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index b7dc85d277a3..d0b5c09a101d 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,5 +1,6 @@ -{ mkKdeDerivation -, python3 +{ + mkKdeDerivation, + python3, }: mkKdeDerivation { pname = "extra-cmake-modules"; diff --git a/pkgs/kde/frameworks/frameworkintegration/default.nix b/pkgs/kde/frameworks/frameworkintegration/default.nix index 3607c115c301..938ed4e1c081 100644 --- a/pkgs/kde/frameworks/frameworkintegration/default.nix +++ b/pkgs/kde/frameworks/frameworkintegration/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "frameworkintegration"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [packagekit-qt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ packagekit-qt ]; } diff --git a/pkgs/kde/frameworks/kapidox/default.nix b/pkgs/kde/frameworks/kapidox/default.nix index 2544e7921f87..8a79a0dde1fc 100644 --- a/pkgs/kde/frameworks/kapidox/default.nix +++ b/pkgs/kde/frameworks/kapidox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapidox"; } diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix index fe124e1187d1..d9d15c9592a8 100644 --- a/pkgs/kde/frameworks/karchive/default.nix +++ b/pkgs/kde/frameworks/karchive/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "karchive"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [xz]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ xz ]; } diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix index df033770a303..4ed23d29fd1c 100644 --- a/pkgs/kde/frameworks/kauth/default.nix +++ b/pkgs/kde/frameworks/kauth/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { # Late resolve paths so things end up in their own prefix # FIXME(later): discuss with upstream - patches = [./fix-paths.patch]; + patches = [ ./fix-paths.patch ]; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix index ac9255e6f83d..e52786637ff1 100644 --- a/pkgs/kde/frameworks/kbookmarks/default.nix +++ b/pkgs/kde/frameworks/kbookmarks/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kbookmarks"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcalendarcore/default.nix b/pkgs/kde/frameworks/kcalendarcore/default.nix index 0e9802e5aa22..05f1023a9b61 100644 --- a/pkgs/kde/frameworks/kcalendarcore/default.nix +++ b/pkgs/kde/frameworks/kcalendarcore/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcalendarcore"; - extraBuildInputs = [qtdeclarative libical]; + extraBuildInputs = [ + qtdeclarative + libical + ]; } diff --git a/pkgs/kde/frameworks/kcmutils/default.nix b/pkgs/kde/frameworks/kcmutils/default.nix index 617fb5978d11..62c80823df21 100644 --- a/pkgs/kde/frameworks/kcmutils/default.nix +++ b/pkgs/kde/frameworks/kcmutils/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kcmutils"; - extraPropagatedBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [ qtdeclarative ]; meta.mainProgram = "kcmshell6"; } diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix index be9126712055..c2649fe03dec 100644 --- a/pkgs/kde/frameworks/kcodecs/default.nix +++ b/pkgs/kde/frameworks/kcodecs/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcodecs"; - extraNativeBuildInputs = [qttools gperf]; + extraNativeBuildInputs = [ + qttools + gperf + ]; } diff --git a/pkgs/kde/frameworks/kcolorscheme/default.nix b/pkgs/kde/frameworks/kcolorscheme/default.nix index 05f32ce574f3..eb682a4e563c 100644 --- a/pkgs/kde/frameworks/kcolorscheme/default.nix +++ b/pkgs/kde/frameworks/kcolorscheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorscheme"; } diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix index c07f274e08ee..922182e9280b 100644 --- a/pkgs/kde/frameworks/kcompletion/default.nix +++ b/pkgs/kde/frameworks/kcompletion/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kcompletion"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix index b29a081524c7..451ec7db5d28 100644 --- a/pkgs/kde/frameworks/kconfig/default.nix +++ b/pkgs/kde/frameworks/kconfig/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kconfig"; - extraNativeBuildInputs = [qttools]; - extraPropagatedBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraPropagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kconfigwidgets/default.nix b/pkgs/kde/frameworks/kconfigwidgets/default.nix index 354972d005ae..7f026b34a152 100644 --- a/pkgs/kde/frameworks/kconfigwidgets/default.nix +++ b/pkgs/kde/frameworks/kconfigwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kconfigwidgets"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcontacts/default.nix b/pkgs/kde/frameworks/kcontacts/default.nix index 57e35a90a9ae..fa8e1429fa80 100644 --- a/pkgs/kde/frameworks/kcontacts/default.nix +++ b/pkgs/kde/frameworks/kcontacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcontacts"; } diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix index 12c6ae5d770b..55189f9f544f 100644 --- a/pkgs/kde/frameworks/kcoreaddons/default.nix +++ b/pkgs/kde/frameworks/kcoreaddons/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kcoreaddons"; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kcrash/default.nix b/pkgs/kde/frameworks/kcrash/default.nix index b3ade8fd6763..ae389456e51a 100644 --- a/pkgs/kde/frameworks/kcrash/default.nix +++ b/pkgs/kde/frameworks/kcrash/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcrash"; } diff --git a/pkgs/kde/frameworks/kdav/default.nix b/pkgs/kde/frameworks/kdav/default.nix index d53562fc9038..04e27a481894 100644 --- a/pkgs/kde/frameworks/kdav/default.nix +++ b/pkgs/kde/frameworks/kdav/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdav"; } diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix index 6803331b1e36..c75df4132c0b 100644 --- a/pkgs/kde/frameworks/kdbusaddons/default.nix +++ b/pkgs/kde/frameworks/kdbusaddons/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdbusaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; meta.mainProgram = "kquitapp6"; } diff --git a/pkgs/kde/frameworks/kdeclarative/default.nix b/pkgs/kde/frameworks/kdeclarative/default.nix index 8b05ec66b0f4..a1a0bb4089b8 100644 --- a/pkgs/kde/frameworks/kdeclarative/default.nix +++ b/pkgs/kde/frameworks/kdeclarative/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdeclarative"; - extraNativeBuildInputs = [spirv-tools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ spirv-tools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kded/default.nix b/pkgs/kde/frameworks/kded/default.nix index aa2ec5fc5ac2..2eecc23ab836 100644 --- a/pkgs/kde/frameworks/kded/default.nix +++ b/pkgs/kde/frameworks/kded/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kded"; meta.mainProgram = "kded6"; diff --git a/pkgs/kde/frameworks/kdesu/default.nix b/pkgs/kde/frameworks/kdesu/default.nix index ae7ed3a33c38..479c7cc6a4af 100644 --- a/pkgs/kde/frameworks/kdesu/default.nix +++ b/pkgs/kde/frameworks/kdesu/default.nix @@ -1,7 +1,7 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesu"; # Look for NixOS SUID wrapper first - patches = [./kdesu-search-for-wrapped-daemon-first.patch]; + patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; } diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix index 3241dcf9c2fb..ce22856035e3 100644 --- a/pkgs/kde/frameworks/kdnssd/default.nix +++ b/pkgs/kde/frameworks/kdnssd/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdnssd"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [avahi]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ avahi ]; } diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix index 2de9ed21d9c8..ee5115c9f469 100644 --- a/pkgs/kde/frameworks/kdoctools/default.nix +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -10,7 +10,17 @@ mkKdeDerivation { pname = "kdoctools"; # Perl could be used both at build time and at runtime. - extraNativeBuildInputs = [perl perlPackages.URI libxml2]; - extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; - extraPropagatedBuildInputs = [perl perlPackages.URI]; + extraNativeBuildInputs = [ + perl + perlPackages.URI + libxml2 + ]; + extraBuildInputs = [ + docbook_xml_dtd_45 + docbook-xsl-nons + ]; + extraPropagatedBuildInputs = [ + perl + perlPackages.URI + ]; } diff --git a/pkgs/kde/frameworks/kfilemetadata/default.nix b/pkgs/kde/frameworks/kfilemetadata/default.nix index 0e9fd5489e7e..9bd377380c18 100644 --- a/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -14,8 +14,16 @@ mkKdeDerivation { # Fix installing cmake files into wrong directory # FIXME(later): upstream - patches = [./cmake-install-paths.patch]; + patches = [ ./cmake-install-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + attr + ebook_tools + exiv2 + ffmpeg + kconfig + kdegraphics-mobipocket + libappimage + ]; } diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix index b7d5e627d64f..10d40753ae30 100644 --- a/pkgs/kde/frameworks/kglobalaccel/default.nix +++ b/pkgs/kde/frameworks/kglobalaccel/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kglobalaccel"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index 3aa8bcdf29f5..e4cf58bbb36f 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kguiaddons"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix index 07702734a06b..966ca350c6fd 100644 --- a/pkgs/kde/frameworks/kholidays/default.nix +++ b/pkgs/kde/frameworks/kholidays/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kholidays"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/ki18n/default.nix b/pkgs/kde/frameworks/ki18n/default.nix index 9c3bef785298..0e50c345f550 100644 --- a/pkgs/kde/frameworks/ki18n/default.nix +++ b/pkgs/kde/frameworks/ki18n/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "ki18n"; - extraNativeBuildInputs = [python3]; - propagatedNativeBuildInputs = [gettext]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ python3 ]; + propagatedNativeBuildInputs = [ gettext ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 7171822ec1da..1fc517f20585 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kidletime"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland xorg.libXScrnSaver]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + xorg.libXScrnSaver + ]; } diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 21c84cb56992..0b3d049dc185 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -10,7 +10,13 @@ mkKdeDerivation { pname = "kimageformats"; - extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libheif libjxl libavif libraw openexr_3]; + extraCmakeFlags = [ "-DKIMAGEFORMATS_HEIF=1" ]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libheif + libjxl + libavif + libraw + openexr_3 + ]; } diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 98d7a12f00b7..45f448692baa 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -13,5 +13,10 @@ mkKdeDerivation { ./0001-Remove-impure-smbd-search-path.patch ]; - extraBuildInputs = [qt5compat qttools acl attr]; + extraBuildInputs = [ + qt5compat + qttools + acl + attr + ]; } diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix index cf82923596a0..83edf8c52654 100644 --- a/pkgs/kde/frameworks/kirigami/default.nix +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -17,18 +17,27 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; - extraNativeBuildInputs = [qtsvg qttools]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "kirigami-wrapped"; inherit (unwrapped) version; - propagatedBuildInputs = [ unwrapped qqc2-desktop-style ]; + propagatedBuildInputs = [ + unwrapped + qqc2-desktop-style + ]; dontUnpack = true; dontWrapQtApps = true; - passthru = { inherit unwrapped; }; + passthru = { + inherit unwrapped; + }; } diff --git a/pkgs/kde/frameworks/kitemmodels/default.nix b/pkgs/kde/frameworks/kitemmodels/default.nix index 22476d21c4e4..9e818457334c 100644 --- a/pkgs/kde/frameworks/kitemmodels/default.nix +++ b/pkgs/kde/frameworks/kitemmodels/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemmodels"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix index b9831f05ea99..487d63092c00 100644 --- a/pkgs/kde/frameworks/kitemviews/default.nix +++ b/pkgs/kde/frameworks/kitemviews/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemviews"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix index 27e9720d84e1..b8b494310f45 100644 --- a/pkgs/kde/frameworks/kjobwidgets/default.nix +++ b/pkgs/kde/frameworks/kjobwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kjobwidgets"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/knewstuff/default.nix b/pkgs/kde/frameworks/knewstuff/default.nix index 26e3207764e7..8bbc171f2408 100644 --- a/pkgs/kde/frameworks/knewstuff/default.nix +++ b/pkgs/kde/frameworks/knewstuff/default.nix @@ -9,9 +9,12 @@ mkKdeDerivation { # Late resolve knsrcdir so other things install to their own prefix # FIXME(later): upstream - patches = [./delay-resolving-knsrcdir.patch]; + patches = [ ./delay-resolving-knsrcdir.patch ]; - extraBuildInputs = [qtdeclarative qttools]; - extraPropagatedBuildInputs = [kcmutils]; + extraBuildInputs = [ + qtdeclarative + qttools + ]; + extraPropagatedBuildInputs = [ kcmutils ]; meta.mainProgram = "knewstuff-dialog6"; } diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix index 232d4469f0e6..08b8decea8f0 100644 --- a/pkgs/kde/frameworks/knotifications/default.nix +++ b/pkgs/kde/frameworks/knotifications/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "knotifications"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative libcanberra]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + libcanberra + ]; } diff --git a/pkgs/kde/frameworks/knotifyconfig/default.nix b/pkgs/kde/frameworks/knotifyconfig/default.nix index 9c778a322b67..c0fb343c16fe 100644 --- a/pkgs/kde/frameworks/knotifyconfig/default.nix +++ b/pkgs/kde/frameworks/knotifyconfig/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "knotifyconfig"; - extraBuildInputs = [libcanberra]; + extraBuildInputs = [ libcanberra ]; } diff --git a/pkgs/kde/frameworks/kpackage/default.nix b/pkgs/kde/frameworks/kpackage/default.nix index 19e4d7932a56..f18b43d42d53 100644 --- a/pkgs/kde/frameworks/kpackage/default.nix +++ b/pkgs/kde/frameworks/kpackage/default.nix @@ -1,9 +1,9 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpackage"; # Follow symlinks when resolving packages # FIXME(later): upstream - patches = [./follow-symlinks.patch]; + patches = [ ./follow-symlinks.patch ]; meta.mainProgram = "kpackagetool6"; } diff --git a/pkgs/kde/frameworks/kparts/default.nix b/pkgs/kde/frameworks/kparts/default.nix index 547e8b1b016e..f3ae2c79ca77 100644 --- a/pkgs/kde/frameworks/kparts/default.nix +++ b/pkgs/kde/frameworks/kparts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kparts"; } diff --git a/pkgs/kde/frameworks/kpeople/default.nix b/pkgs/kde/frameworks/kpeople/default.nix index 18d56704c2d8..5f9ce156b1f8 100644 --- a/pkgs/kde/frameworks/kpeople/default.nix +++ b/pkgs/kde/frameworks/kpeople/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpeople"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kplotting/default.nix b/pkgs/kde/frameworks/kplotting/default.nix index b23c198fd879..27284e0006b7 100644 --- a/pkgs/kde/frameworks/kplotting/default.nix +++ b/pkgs/kde/frameworks/kplotting/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kplotting"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kpty/default.nix b/pkgs/kde/frameworks/kpty/default.nix index d60c2a5665f2..e0ba42a271f9 100644 --- a/pkgs/kde/frameworks/kpty/default.nix +++ b/pkgs/kde/frameworks/kpty/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpty"; } diff --git a/pkgs/kde/frameworks/kquickcharts/default.nix b/pkgs/kde/frameworks/kquickcharts/default.nix index 305df6000403..736f06510336 100644 --- a/pkgs/kde/frameworks/kquickcharts/default.nix +++ b/pkgs/kde/frameworks/kquickcharts/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kquickcharts"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/krunner/default.nix b/pkgs/kde/frameworks/krunner/default.nix index f817c1560c26..fcdc91e68e85 100644 --- a/pkgs/kde/frameworks/krunner/default.nix +++ b/pkgs/kde/frameworks/krunner/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "krunner"; - extraBuildInputs = [plasma-activities]; + extraBuildInputs = [ plasma-activities ]; } diff --git a/pkgs/kde/frameworks/kservice/default.nix b/pkgs/kde/frameworks/kservice/default.nix index c21bab7c8346..5a7bb7a5884a 100644 --- a/pkgs/kde/frameworks/kservice/default.nix +++ b/pkgs/kde/frameworks/kservice/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kservice"; diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix index bc3b255caaeb..e6845ef56985 100644 --- a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix +++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kstatusnotifieritem"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/ksvg/default.nix b/pkgs/kde/frameworks/ksvg/default.nix index 82dbce5c0829..1d91aa3143a4 100644 --- a/pkgs/kde/frameworks/ksvg/default.nix +++ b/pkgs/kde/frameworks/ksvg/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksvg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix index 9a666c4e6a61..e7c470c99d09 100644 --- a/pkgs/kde/frameworks/ktexteditor/default.nix +++ b/pkgs/kde/frameworks/ktexteditor/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktexteditor"; - extraBuildInputs = [qtdeclarative qtspeech editorconfig-core-c]; + extraBuildInputs = [ + qtdeclarative + qtspeech + editorconfig-core-c + ]; } diff --git a/pkgs/kde/frameworks/ktexttemplate/default.nix b/pkgs/kde/frameworks/ktexttemplate/default.nix index 673a10863ac6..6fc59c737627 100644 --- a/pkgs/kde/frameworks/ktexttemplate/default.nix +++ b/pkgs/kde/frameworks/ktexttemplate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ktexttemplate"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kunitconversion/default.nix b/pkgs/kde/frameworks/kunitconversion/default.nix index 1d7cb52566d4..544aebb871f3 100644 --- a/pkgs/kde/frameworks/kunitconversion/default.nix +++ b/pkgs/kde/frameworks/kunitconversion/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kunitconversion"; } diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix index 979362e6bfb8..7379061982b5 100644 --- a/pkgs/kde/frameworks/kuserfeedback/default.nix +++ b/pkgs/kde/frameworks/kuserfeedback/default.nix @@ -7,6 +7,12 @@ mkKdeDerivation { pname = "kuserfeedback"; # Disable server-side stuff we don't care about - extraCmakeFlags = ["-DENABLE_CONSOLE=0" "-DENABLE_CLI=0"]; - extraNativeBuildInputs = [qttools qtsvg]; + extraCmakeFlags = [ + "-DENABLE_CONSOLE=0" + "-DENABLE_CLI=0" + ]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index 32fc1612237b..331bdee02b31 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "kwallet"; - extraBuildInputs = [libgcrypt kcrash kdoctools]; + extraBuildInputs = [ + libgcrypt + kcrash + kdoctools + ]; } diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix index 09dfb3228d05..00e9adca5b2f 100644 --- a/pkgs/kde/frameworks/kwidgetsaddons/default.nix +++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kwidgetsaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix index a5fb8eddb7ea..5ae167b1cc9a 100644 --- a/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -8,6 +8,12 @@ mkKdeDerivation { pname = "kwindowsystem"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative qtwayland]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + qtwayland + ]; } diff --git a/pkgs/kde/frameworks/kxmlgui/default.nix b/pkgs/kde/frameworks/kxmlgui/default.nix index 64734cde5af6..3b93b5b35146 100644 --- a/pkgs/kde/frameworks/kxmlgui/default.nix +++ b/pkgs/kde/frameworks/kxmlgui/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kxmlgui"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/modemmanager-qt/default.nix b/pkgs/kde/frameworks/modemmanager-qt/default.nix index 34a6f1954842..5acc420a8909 100644 --- a/pkgs/kde/frameworks/modemmanager-qt/default.nix +++ b/pkgs/kde/frameworks/modemmanager-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "modemmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraPropagatedBuildInputs = [modemmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraPropagatedBuildInputs = [ modemmanager ]; } diff --git a/pkgs/kde/frameworks/networkmanager-qt/default.nix b/pkgs/kde/frameworks/networkmanager-qt/default.nix index bdec89a9ca1d..e276cb3a82ba 100644 --- a/pkgs/kde/frameworks/networkmanager-qt/default.nix +++ b/pkgs/kde/frameworks/networkmanager-qt/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "networkmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [networkmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ networkmanager ]; } diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix index 6411be8a34cf..4cde20f930b0 100644 --- a/pkgs/kde/frameworks/prison/default.nix +++ b/pkgs/kde/frameworks/prison/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "prison"; - extraBuildInputs = [qtdeclarative qtmultimedia qrencode libdmtx]; + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qrencode + libdmtx + ]; } diff --git a/pkgs/kde/frameworks/purpose/default.nix b/pkgs/kde/frameworks/purpose/default.nix index 8bf85ae19afe..a515728a3af4 100644 --- a/pkgs/kde/frameworks/purpose/default.nix +++ b/pkgs/kde/frameworks/purpose/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "purpose"; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [kaccounts-integration kdeclarative prison]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ + kaccounts-integration + kdeclarative + prison + ]; } diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index 5ceb41012d66..45f22d8fa5d3 100644 --- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "qqc2-desktop-style"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative kirigami.unwrapped]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + kirigami.unwrapped + ]; - excludeDependencies = ["kirigami"]; + excludeDependencies = [ "kirigami" ]; } diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index 2c628b8dbc3e..6b767e9d43f7 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -13,7 +13,11 @@ mkKdeDerivation { ./fix-search-path.patch ]; - extraNativeBuildInputs = [qttools bison flex]; - extraBuildInputs = [libimobiledevice]; + extraNativeBuildInputs = [ + qttools + bison + flex + ]; + extraBuildInputs = [ libimobiledevice ]; meta.mainProgram = "solid-hardware6"; } diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix index b5b82f6e675c..fbeb8b10d555 100644 --- a/pkgs/kde/frameworks/sonnet/default.nix +++ b/pkgs/kde/frameworks/sonnet/default.nix @@ -9,7 +9,14 @@ mkKdeDerivation { pname = "sonnet"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative aspell hunspell]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + aspell + hunspell + ]; meta.mainProgram = "parsetrigrams6"; } diff --git a/pkgs/kde/frameworks/syndication/default.nix b/pkgs/kde/frameworks/syndication/default.nix index cec50a6777f7..444fec861489 100644 --- a/pkgs/kde/frameworks/syndication/default.nix +++ b/pkgs/kde/frameworks/syndication/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "syndication"; } diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix index 1a5430901f2e..7985dcb95702 100644 --- a/pkgs/kde/frameworks/syntax-highlighting/default.nix +++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "syntax-highlighting"; - extraBuildInputs = [qtdeclarative]; - extraNativeBuildInputs = [qttools perl]; + extraBuildInputs = [ qtdeclarative ]; + extraNativeBuildInputs = [ + qttools + perl + ]; meta.mainProgram = "ksyntaxhighlighter6"; } diff --git a/pkgs/kde/frameworks/threadweaver/default.nix b/pkgs/kde/frameworks/threadweaver/default.nix index 9da07c2af2ac..dddae60d9666 100644 --- a/pkgs/kde/frameworks/threadweaver/default.nix +++ b/pkgs/kde/frameworks/threadweaver/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "threadweaver"; } diff --git a/pkgs/kde/gear/accessibility-inspector/default.nix b/pkgs/kde/gear/accessibility-inspector/default.nix index 1197f2933008..cb623e7cebb3 100644 --- a/pkgs/kde/gear/accessibility-inspector/default.nix +++ b/pkgs/kde/gear/accessibility-inspector/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "accessibility-inspector"; } diff --git a/pkgs/kde/gear/akonadi-calendar-tools/default.nix b/pkgs/kde/gear/akonadi-calendar-tools/default.nix index bc863c026709..0c0d88a42570 100644 --- a/pkgs/kde/gear/akonadi-calendar-tools/default.nix +++ b/pkgs/kde/gear/akonadi-calendar-tools/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar-tools"; } diff --git a/pkgs/kde/gear/akonadi-calendar/default.nix b/pkgs/kde/gear/akonadi-calendar/default.nix index 66c615e53b18..10ef8e6ed05e 100644 --- a/pkgs/kde/gear/akonadi-calendar/default.nix +++ b/pkgs/kde/gear/akonadi-calendar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar"; meta.mainProgram = "kalendarac"; diff --git a/pkgs/kde/gear/akonadi-contacts/default.nix b/pkgs/kde/gear/akonadi-contacts/default.nix index b8c1c5bf92cc..b93d750c0ffd 100644 --- a/pkgs/kde/gear/akonadi-contacts/default.nix +++ b/pkgs/kde/gear/akonadi-contacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-contacts"; } diff --git a/pkgs/kde/gear/akonadi-import-wizard/default.nix b/pkgs/kde/gear/akonadi-import-wizard/default.nix index 9037457ee8b0..ff7e72d54041 100644 --- a/pkgs/kde/gear/akonadi-import-wizard/default.nix +++ b/pkgs/kde/gear/akonadi-import-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-import-wizard"; meta.mainProgram = "akonadiimportwizard"; diff --git a/pkgs/kde/gear/akonadi-mime/default.nix b/pkgs/kde/gear/akonadi-mime/default.nix index 9db5272e6b4b..72cc1275afe6 100644 --- a/pkgs/kde/gear/akonadi-mime/default.nix +++ b/pkgs/kde/gear/akonadi-mime/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "akonadi-mime"; - extraNativeBuildInputs = [shared-mime-info libxslt]; + extraNativeBuildInputs = [ + shared-mime-info + libxslt + ]; } diff --git a/pkgs/kde/gear/akonadi-notes/default.nix b/pkgs/kde/gear/akonadi-notes/default.nix index a1cd161a510f..01f572f8fb90 100644 --- a/pkgs/kde/gear/akonadi-notes/default.nix +++ b/pkgs/kde/gear/akonadi-notes/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-notes"; } diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 4d7ec7aafc20..5b8add9abb8c 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -29,5 +29,8 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [corrosion xapian]; + extraBuildInputs = [ + corrosion + xapian + ]; } diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix index 64966c4fad58..bb6d2f609930 100644 --- a/pkgs/kde/gear/akonadi/default.nix +++ b/pkgs/kde/gear/akonadi/default.nix @@ -20,8 +20,16 @@ mkKdeDerivation { "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin" ]; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ + kaccounts-integration + accounts-qt + xz + mariadb + ]; # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically postFixup = '' diff --git a/pkgs/kde/gear/akonadiconsole/default.nix b/pkgs/kde/gear/akonadiconsole/default.nix index ca116910011c..dbed7d556452 100644 --- a/pkgs/kde/gear/akonadiconsole/default.nix +++ b/pkgs/kde/gear/akonadiconsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "akonadiconsole"; - extraBuildInputs = [xapian]; + extraBuildInputs = [ xapian ]; meta.mainProgram = "akonadiconsole"; } diff --git a/pkgs/kde/gear/akregator/default.nix b/pkgs/kde/gear/akregator/default.nix index 4d52e4947b78..17517816b73e 100644 --- a/pkgs/kde/gear/akregator/default.nix +++ b/pkgs/kde/gear/akregator/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "akregator"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/alligator/default.nix b/pkgs/kde/gear/alligator/default.nix index c2f7a14734e2..f317a97e8623 100644 --- a/pkgs/kde/gear/alligator/default.nix +++ b/pkgs/kde/gear/alligator/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "alligator"; meta.mainProgram = "alligator"; diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix index 318c0b648279..4402ab1d5300 100644 --- a/pkgs/kde/gear/analitza/default.nix +++ b/pkgs/kde/gear/analitza/default.nix @@ -9,6 +9,13 @@ mkKdeDerivation { pname = "analitza"; - extraNativeBuildInputs = [qt5compat qtsvg qttools]; - extraBuildInputs = [qtdeclarative eigen]; + extraNativeBuildInputs = [ + qt5compat + qtsvg + qttools + ]; + extraBuildInputs = [ + qtdeclarative + eigen + ]; } diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index b9883c7c2a1e..f599178ad37b 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -28,5 +28,10 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; + extraBuildInputs = [ + qtsvg + qtwebengine + corrosion + qcoro + ]; } diff --git a/pkgs/kde/gear/ark/default.nix b/pkgs/kde/gear/ark/default.nix index fb9c3d8e596f..6127e723dd40 100644 --- a/pkgs/kde/gear/ark/default.nix +++ b/pkgs/kde/gear/ark/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "ark"; - extraBuildInputs = [libarchive libzip]; + extraBuildInputs = [ + libarchive + libzip + ]; meta.mainProgram = "ark"; } diff --git a/pkgs/kde/gear/artikulate/default.nix b/pkgs/kde/gear/artikulate/default.nix index c82db10260f7..60bd663852ee 100644 --- a/pkgs/kde/gear/artikulate/default.nix +++ b/pkgs/kde/gear/artikulate/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "artikulate"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/audex/default.nix b/pkgs/kde/gear/audex/default.nix index c6043d641608..9a7c8fb0eabf 100644 --- a/pkgs/kde/gear/audex/default.nix +++ b/pkgs/kde/gear/audex/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "audex"; - extraBuildInputs = [libcdio libcdio-paranoia]; + extraBuildInputs = [ + libcdio + libcdio-paranoia + ]; } diff --git a/pkgs/kde/gear/audiocd-kio/default.nix b/pkgs/kde/gear/audiocd-kio/default.nix index c2f5c2558826..b4fa60026b18 100644 --- a/pkgs/kde/gear/audiocd-kio/default.nix +++ b/pkgs/kde/gear/audiocd-kio/default.nix @@ -20,5 +20,10 @@ mkKdeDerivation { }) ]; - extraBuildInputs = [cdparanoia flac libogg libvorbis]; + extraBuildInputs = [ + cdparanoia + flac + libogg + libvorbis + ]; } diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix index c9ae14f3be9b..b27ab60155a5 100644 --- a/pkgs/kde/gear/audiotube/default.nix +++ b/pkgs/kde/gear/audiotube/default.nix @@ -14,41 +14,40 @@ purpose, qcoro, python3, -}: let +}: +let ps = python3.pkgs; pythonDeps = [ ps.yt-dlp ps.ytmusicapi ]; in - mkKdeDerivation { - pname = "audiotube"; +mkKdeDerivation { + pname = "audiotube"; - extraNativeBuildInputs = [ - ps.pybind11 - ]; + extraNativeBuildInputs = [ + ps.pybind11 + ]; - extraBuildInputs = - [ - qtdeclarative - qtmultimedia - qtsvg + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qtsvg - extra-cmake-modules - futuresql - kirigami - kirigami-addons - kcoreaddons - ki18n - kcrash - kwindowsystem - purpose - qcoro - ] - ++ pythonDeps; + extra-cmake-modules + futuresql + kirigami + kirigami-addons + kcoreaddons + ki18n + kcrash + kwindowsystem + purpose + qcoro + ] ++ pythonDeps; - qtWrapperArgs = [ - "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" - ]; - meta.mainProgram = "audiotube"; - } + qtWrapperArgs = [ + "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" + ]; + meta.mainProgram = "audiotube"; +} diff --git a/pkgs/kde/gear/baloo-widgets/default.nix b/pkgs/kde/gear/baloo-widgets/default.nix index 7e576348f060..9835c248eec5 100644 --- a/pkgs/kde/gear/baloo-widgets/default.nix +++ b/pkgs/kde/gear/baloo-widgets/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "baloo-widgets"; meta.mainProgram = "baloo_filemetadata_temp_extractor"; diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix index 8b6fbc68066a..92cb126b089d 100644 --- a/pkgs/kde/gear/blinken/default.nix +++ b/pkgs/kde/gear/blinken/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "blinken"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "blinken"; } diff --git a/pkgs/kde/gear/bomber/default.nix b/pkgs/kde/gear/bomber/default.nix index 611edb5d2c7a..3e10833d322a 100644 --- a/pkgs/kde/gear/bomber/default.nix +++ b/pkgs/kde/gear/bomber/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "bomber"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "bomber"; } diff --git a/pkgs/kde/gear/bovo/default.nix b/pkgs/kde/gear/bovo/default.nix index 5bafedfd1b14..c3fef1c90778 100644 --- a/pkgs/kde/gear/bovo/default.nix +++ b/pkgs/kde/gear/bovo/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "bovo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "bovo"; } diff --git a/pkgs/kde/gear/calendarsupport/default.nix b/pkgs/kde/gear/calendarsupport/default.nix index b6632a384d65..9b80b02aa79d 100644 --- a/pkgs/kde/gear/calendarsupport/default.nix +++ b/pkgs/kde/gear/calendarsupport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "calendarsupport"; } diff --git a/pkgs/kde/gear/calindori/default.nix b/pkgs/kde/gear/calindori/default.nix index 41efa7a9e48f..565ffe6d5865 100644 --- a/pkgs/kde/gear/calindori/default.nix +++ b/pkgs/kde/gear/calindori/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "calindori"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix index 42963aabbba0..80d11e576a98 100644 --- a/pkgs/kde/gear/cantor/default.nix +++ b/pkgs/kde/gear/cantor/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "cantor"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/cervisia/default.nix b/pkgs/kde/gear/cervisia/default.nix index d8546e9d8a30..804cd7bed758 100644 --- a/pkgs/kde/gear/cervisia/default.nix +++ b/pkgs/kde/gear/cervisia/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "cervisia"; # FIXME(qt5) diff --git a/pkgs/kde/gear/colord-kde/default.nix b/pkgs/kde/gear/colord-kde/default.nix index 9e2aa630d688..e2ce75a98e77 100644 --- a/pkgs/kde/gear/colord-kde/default.nix +++ b/pkgs/kde/gear/colord-kde/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "colord-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [lcms2 xorg.libXrandr]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + lcms2 + xorg.libXrandr + ]; meta.mainProgram = "colord-kde-icc-importer"; } diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix index 303e3dde5da5..c296c82a8d9e 100644 --- a/pkgs/kde/gear/default.nix +++ b/pkgs/kde/gear/default.nix @@ -1,252 +1,253 @@ -{callPackage}: { - accessibility-inspector = callPackage ./accessibility-inspector {}; - akonadi = callPackage ./akonadi {}; - akonadi-calendar = callPackage ./akonadi-calendar {}; - akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; - akonadi-contacts = callPackage ./akonadi-contacts {}; - akonadi-import-wizard = callPackage ./akonadi-import-wizard {}; - akonadi-mime = callPackage ./akonadi-mime {}; - akonadi-notes = callPackage ./akonadi-notes {}; - akonadi-search = callPackage ./akonadi-search {}; - akonadiconsole = callPackage ./akonadiconsole {}; - akregator = callPackage ./akregator {}; - alligator = callPackage ./alligator {}; - analitza = callPackage ./analitza {}; - angelfish = callPackage ./angelfish {}; - arianna = callPackage ./arianna {}; - ark = callPackage ./ark {}; - artikulate = callPackage ./artikulate {}; - audex = callPackage ./audex {}; - audiocd-kio = callPackage ./audiocd-kio {}; - audiotube = callPackage ./audiotube {}; - baloo-widgets = callPackage ./baloo-widgets {}; - blinken = callPackage ./blinken {}; - bomber = callPackage ./bomber {}; - bovo = callPackage ./bovo {}; - calendarsupport = callPackage ./calendarsupport {}; - calindori = callPackage ./calindori {}; - cantor = callPackage ./cantor {}; - cervisia = callPackage ./cervisia {}; - colord-kde = callPackage ./colord-kde {}; - dolphin = callPackage ./dolphin {}; - dolphin-plugins = callPackage ./dolphin-plugins {}; - dragon = callPackage ./dragon {}; - elisa = callPackage ./elisa {}; - eventviews = callPackage ./eventviews {}; - falkon = callPackage ./falkon {}; - ffmpegthumbs = callPackage ./ffmpegthumbs {}; - filelight = callPackage ./filelight {}; - francis = callPackage ./francis {}; - ghostwriter = callPackage ./ghostwriter {}; - granatier = callPackage ./granatier {}; - grantlee-editor = callPackage ./grantlee-editor {}; - grantleetheme = callPackage ./grantleetheme {}; - gwenview = callPackage ./gwenview {}; - incidenceeditor = callPackage ./incidenceeditor {}; - isoimagewriter = callPackage ./isoimagewriter {}; - itinerary = callPackage ./itinerary {}; - juk = callPackage ./juk {}; - k3b = callPackage ./k3b {}; - kaccounts-integration = callPackage ./kaccounts-integration {}; - kaccounts-providers = callPackage ./kaccounts-providers {}; - kaddressbook = callPackage ./kaddressbook {}; - kajongg = callPackage ./kajongg {}; - kalarm = callPackage ./kalarm {}; - kalgebra = callPackage ./kalgebra {}; - kalk = callPackage ./kalk {}; - kalm = callPackage ./kalm {}; - kalzium = callPackage ./kalzium {}; - kamera = callPackage ./kamera {}; - kamoso = callPackage ./kamoso {}; - kanagram = callPackage ./kanagram {}; - kapman = callPackage ./kapman {}; - kapptemplate = callPackage ./kapptemplate {}; - kasts = callPackage ./kasts {}; - kate = callPackage ./kate {}; - katomic = callPackage ./katomic {}; - kbackup = callPackage ./kbackup {}; - kblackbox = callPackage ./kblackbox {}; - kblocks = callPackage ./kblocks {}; - kbounce = callPackage ./kbounce {}; - kbreakout = callPackage ./kbreakout {}; - kbruch = callPackage ./kbruch {}; - kcachegrind = callPackage ./kcachegrind {}; - kcalc = callPackage ./kcalc {}; - kcalutils = callPackage ./kcalutils {}; - kcharselect = callPackage ./kcharselect {}; - kclock = callPackage ./kclock {}; - kcolorchooser = callPackage ./kcolorchooser {}; - kcron = callPackage ./kcron {}; - kde-dev-scripts = callPackage ./kde-dev-scripts {}; - kde-dev-utils = callPackage ./kde-dev-utils {}; - kde-inotify-survey = callPackage ./kde-inotify-survey {}; - kdebugsettings = callPackage ./kdebugsettings {}; - kdeconnect-kde = callPackage ./kdeconnect-kde {}; - kdeedu-data = callPackage ./kdeedu-data {}; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing {}; - kdenlive = callPackage ./kdenlive {}; - kdepim-addons = callPackage ./kdepim-addons {}; - kdepim-runtime = callPackage ./kdepim-runtime {}; - kdesdk-kio = callPackage ./kdesdk-kio {}; - kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers {}; - kdev-php = callPackage ./kdev-php {}; - kdev-python = callPackage ./kdev-python {}; - kdevelop = callPackage ./kdevelop {}; - kdf = callPackage ./kdf {}; - kdialog = callPackage ./kdialog {}; - kdiamond = callPackage ./kdiamond {}; - keditbookmarks = callPackage ./keditbookmarks {}; - keysmith = callPackage ./keysmith {}; - kfind = callPackage ./kfind {}; - kfourinline = callPackage ./kfourinline {}; - kgeography = callPackage ./kgeography {}; - kget = callPackage ./kget {}; - kgoldrunner = callPackage ./kgoldrunner {}; - kgpg = callPackage ./kgpg {}; - kgraphviewer = callPackage ./kgraphviewer {}; - khangman = callPackage ./khangman {}; - khealthcertificate = callPackage ./khealthcertificate {}; - khelpcenter = callPackage ./khelpcenter {}; - kidentitymanagement = callPackage ./kidentitymanagement {}; - kig = callPackage ./kig {}; - kigo = callPackage ./kigo {}; - killbots = callPackage ./killbots {}; - kimagemapeditor = callPackage ./kimagemapeditor {}; - kimap = callPackage ./kimap {}; - kio-admin = callPackage ./kio-admin {}; - kio-extras = callPackage ./kio-extras {}; - kio-gdrive = callPackage ./kio-gdrive {}; - kio-zeroconf = callPackage ./kio-zeroconf {}; - kirigami-gallery = callPackage ./kirigami-gallery {}; - kiriki = callPackage ./kiriki {}; - kiten = callPackage ./kiten {}; - kitinerary = callPackage ./kitinerary {}; - kjournald = callPackage ./kjournald {}; - kjumpingcube = callPackage ./kjumpingcube {}; - kldap = callPackage ./kldap {}; - kleopatra = callPackage ./kleopatra {}; - klettres = callPackage ./klettres {}; - klickety = callPackage ./klickety {}; - klines = callPackage ./klines {}; - kmag = callPackage ./kmag {}; - kmahjongg = callPackage ./kmahjongg {}; - kmail = callPackage ./kmail {}; - kmail-account-wizard = callPackage ./kmail-account-wizard {}; - kmailtransport = callPackage ./kmailtransport {}; - kmbox = callPackage ./kmbox {}; - kmime = callPackage ./kmime {}; - kmines = callPackage ./kmines {}; - kmix = callPackage ./kmix {}; - kmousetool = callPackage ./kmousetool {}; - kmouth = callPackage ./kmouth {}; - kmplot = callPackage ./kmplot {}; - knavalbattle = callPackage ./knavalbattle {}; - knetwalk = callPackage ./knetwalk {}; - knights = callPackage ./knights {}; - koko = callPackage ./koko {}; - kolf = callPackage ./kolf {}; - kollision = callPackage ./kollision {}; - kolourpaint = callPackage ./kolourpaint {}; - kompare = callPackage ./kompare {}; - kongress = callPackage ./kongress {}; - konqueror = callPackage ./konqueror {}; - konquest = callPackage ./konquest {}; - konsole = callPackage ./konsole {}; - kontact = callPackage ./kontact {}; - kontactinterface = callPackage ./kontactinterface {}; - kontrast = callPackage ./kontrast {}; - konversation = callPackage ./konversation {}; - kopeninghours = callPackage ./kopeninghours {}; - korganizer = callPackage ./korganizer {}; - kosmindoormap = callPackage ./kosmindoormap {}; - kpat = callPackage ./kpat {}; - kpimtextedit = callPackage ./kpimtextedit {}; - kpkpass = callPackage ./kpkpass {}; - kpmcore = callPackage ./kpmcore {}; - kpublictransport = callPackage ./kpublictransport {}; - kqtquickcharts = callPackage ./kqtquickcharts {}; - krdc = callPackage ./krdc {}; - krecorder = callPackage ./krecorder {}; - kreversi = callPackage ./kreversi {}; - krfb = callPackage ./krfb {}; - kross-interpreters = callPackage ./kross-interpreters {}; - kruler = callPackage ./kruler {}; - ksanecore = callPackage ./ksanecore {}; - kshisen = callPackage ./kshisen {}; - ksirk = callPackage ./ksirk {}; - ksmtp = callPackage ./ksmtp {}; - ksnakeduel = callPackage ./ksnakeduel {}; - kspaceduel = callPackage ./kspaceduel {}; - ksquares = callPackage ./ksquares {}; - ksudoku = callPackage ./ksudoku {}; - ksystemlog = callPackage ./ksystemlog {}; - kteatime = callPackage ./kteatime {}; - ktimer = callPackage ./ktimer {}; - ktnef = callPackage ./ktnef {}; - ktorrent = callPackage ./ktorrent {}; - ktouch = callPackage ./ktouch {}; - ktrip = callPackage ./ktrip {}; - ktuberling = callPackage ./ktuberling {}; - kturtle = callPackage ./kturtle {}; - kubrick = callPackage ./kubrick {}; - kwalletmanager = callPackage ./kwalletmanager {}; - kwave = callPackage ./kwave {}; - kweather = callPackage ./kweather {}; - kweathercore = callPackage ./kweathercore {}; - kwordquiz = callPackage ./kwordquiz {}; - libgravatar = callPackage ./libgravatar {}; - libkcddb = callPackage ./libkcddb {}; - libkcompactdisc = callPackage ./libkcompactdisc {}; - libkdcraw = callPackage ./libkdcraw {}; - libkdegames = callPackage ./libkdegames {}; - libkdepim = callPackage ./libkdepim {}; - libkeduvocdocument = callPackage ./libkeduvocdocument {}; - libkexiv2 = callPackage ./libkexiv2 {}; - libkgapi = callPackage ./libkgapi {}; - libkleo = callPackage ./libkleo {}; - libkmahjongg = callPackage ./libkmahjongg {}; - libkomparediff2 = callPackage ./libkomparediff2 {}; - libksane = callPackage ./libksane {}; - libksieve = callPackage ./libksieve {}; - libktorrent = callPackage ./libktorrent {}; - lokalize = callPackage ./lokalize {}; - lskat = callPackage ./lskat {}; - mailcommon = callPackage ./mailcommon {}; - mailimporter = callPackage ./mailimporter {}; - marble = callPackage ./marble {}; - markdownpart = callPackage ./markdownpart {}; - massif-visualizer = callPackage ./massif-visualizer {}; - mbox-importer = callPackage ./mbox-importer {}; - merkuro = callPackage ./merkuro {}; - messagelib = callPackage ./messagelib {}; - mimetreeparser = callPackage ./mimetreeparser {}; - minuet = callPackage ./minuet {}; - neochat = callPackage ./neochat {}; - okular = callPackage ./okular {}; - palapeli = callPackage ./palapeli {}; - parley = callPackage ./parley {}; - partitionmanager = callPackage ./partitionmanager {}; - picmi = callPackage ./picmi {}; - pim-data-exporter = callPackage ./pim-data-exporter {}; - pim-sieve-editor = callPackage ./pim-sieve-editor {}; - pimcommon = callPackage ./pimcommon {}; - plasmatube = callPackage ./plasmatube {}; - poxml = callPackage ./poxml {}; - qmlkonsole = callPackage ./qmlkonsole {}; - rocs = callPackage ./rocs {}; - signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; - skanlite = callPackage ./skanlite {}; - skanpage = callPackage ./skanpage {}; - skladnik = callPackage ./skladnik {}; - spectacle = callPackage ./spectacle {}; - step = callPackage ./step {}; - svgpart = callPackage ./svgpart {}; - sweeper = callPackage ./sweeper {}; - telly-skout = callPackage ./telly-skout {}; - tokodon = callPackage ./tokodon {}; - umbrello = callPackage ./umbrello {}; - yakuake = callPackage ./yakuake {}; - zanshin = callPackage ./zanshin {}; +{ callPackage }: +{ + accessibility-inspector = callPackage ./accessibility-inspector { }; + akonadi = callPackage ./akonadi { }; + akonadi-calendar = callPackage ./akonadi-calendar { }; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools { }; + akonadi-contacts = callPackage ./akonadi-contacts { }; + akonadi-import-wizard = callPackage ./akonadi-import-wizard { }; + akonadi-mime = callPackage ./akonadi-mime { }; + akonadi-notes = callPackage ./akonadi-notes { }; + akonadi-search = callPackage ./akonadi-search { }; + akonadiconsole = callPackage ./akonadiconsole { }; + akregator = callPackage ./akregator { }; + alligator = callPackage ./alligator { }; + analitza = callPackage ./analitza { }; + angelfish = callPackage ./angelfish { }; + arianna = callPackage ./arianna { }; + ark = callPackage ./ark { }; + artikulate = callPackage ./artikulate { }; + audex = callPackage ./audex { }; + audiocd-kio = callPackage ./audiocd-kio { }; + audiotube = callPackage ./audiotube { }; + baloo-widgets = callPackage ./baloo-widgets { }; + blinken = callPackage ./blinken { }; + bomber = callPackage ./bomber { }; + bovo = callPackage ./bovo { }; + calendarsupport = callPackage ./calendarsupport { }; + calindori = callPackage ./calindori { }; + cantor = callPackage ./cantor { }; + cervisia = callPackage ./cervisia { }; + colord-kde = callPackage ./colord-kde { }; + dolphin = callPackage ./dolphin { }; + dolphin-plugins = callPackage ./dolphin-plugins { }; + dragon = callPackage ./dragon { }; + elisa = callPackage ./elisa { }; + eventviews = callPackage ./eventviews { }; + falkon = callPackage ./falkon { }; + ffmpegthumbs = callPackage ./ffmpegthumbs { }; + filelight = callPackage ./filelight { }; + francis = callPackage ./francis { }; + ghostwriter = callPackage ./ghostwriter { }; + granatier = callPackage ./granatier { }; + grantlee-editor = callPackage ./grantlee-editor { }; + grantleetheme = callPackage ./grantleetheme { }; + gwenview = callPackage ./gwenview { }; + incidenceeditor = callPackage ./incidenceeditor { }; + isoimagewriter = callPackage ./isoimagewriter { }; + itinerary = callPackage ./itinerary { }; + juk = callPackage ./juk { }; + k3b = callPackage ./k3b { }; + kaccounts-integration = callPackage ./kaccounts-integration { }; + kaccounts-providers = callPackage ./kaccounts-providers { }; + kaddressbook = callPackage ./kaddressbook { }; + kajongg = callPackage ./kajongg { }; + kalarm = callPackage ./kalarm { }; + kalgebra = callPackage ./kalgebra { }; + kalk = callPackage ./kalk { }; + kalm = callPackage ./kalm { }; + kalzium = callPackage ./kalzium { }; + kamera = callPackage ./kamera { }; + kamoso = callPackage ./kamoso { }; + kanagram = callPackage ./kanagram { }; + kapman = callPackage ./kapman { }; + kapptemplate = callPackage ./kapptemplate { }; + kasts = callPackage ./kasts { }; + kate = callPackage ./kate { }; + katomic = callPackage ./katomic { }; + kbackup = callPackage ./kbackup { }; + kblackbox = callPackage ./kblackbox { }; + kblocks = callPackage ./kblocks { }; + kbounce = callPackage ./kbounce { }; + kbreakout = callPackage ./kbreakout { }; + kbruch = callPackage ./kbruch { }; + kcachegrind = callPackage ./kcachegrind { }; + kcalc = callPackage ./kcalc { }; + kcalutils = callPackage ./kcalutils { }; + kcharselect = callPackage ./kcharselect { }; + kclock = callPackage ./kclock { }; + kcolorchooser = callPackage ./kcolorchooser { }; + kcron = callPackage ./kcron { }; + kde-dev-scripts = callPackage ./kde-dev-scripts { }; + kde-dev-utils = callPackage ./kde-dev-utils { }; + kde-inotify-survey = callPackage ./kde-inotify-survey { }; + kdebugsettings = callPackage ./kdebugsettings { }; + kdeconnect-kde = callPackage ./kdeconnect-kde { }; + kdeedu-data = callPackage ./kdeedu-data { }; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket { }; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers { }; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing { }; + kdenlive = callPackage ./kdenlive { }; + kdepim-addons = callPackage ./kdepim-addons { }; + kdepim-runtime = callPackage ./kdepim-runtime { }; + kdesdk-kio = callPackage ./kdesdk-kio { }; + kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers { }; + kdev-php = callPackage ./kdev-php { }; + kdev-python = callPackage ./kdev-python { }; + kdevelop = callPackage ./kdevelop { }; + kdf = callPackage ./kdf { }; + kdialog = callPackage ./kdialog { }; + kdiamond = callPackage ./kdiamond { }; + keditbookmarks = callPackage ./keditbookmarks { }; + keysmith = callPackage ./keysmith { }; + kfind = callPackage ./kfind { }; + kfourinline = callPackage ./kfourinline { }; + kgeography = callPackage ./kgeography { }; + kget = callPackage ./kget { }; + kgoldrunner = callPackage ./kgoldrunner { }; + kgpg = callPackage ./kgpg { }; + kgraphviewer = callPackage ./kgraphviewer { }; + khangman = callPackage ./khangman { }; + khealthcertificate = callPackage ./khealthcertificate { }; + khelpcenter = callPackage ./khelpcenter { }; + kidentitymanagement = callPackage ./kidentitymanagement { }; + kig = callPackage ./kig { }; + kigo = callPackage ./kigo { }; + killbots = callPackage ./killbots { }; + kimagemapeditor = callPackage ./kimagemapeditor { }; + kimap = callPackage ./kimap { }; + kio-admin = callPackage ./kio-admin { }; + kio-extras = callPackage ./kio-extras { }; + kio-gdrive = callPackage ./kio-gdrive { }; + kio-zeroconf = callPackage ./kio-zeroconf { }; + kirigami-gallery = callPackage ./kirigami-gallery { }; + kiriki = callPackage ./kiriki { }; + kiten = callPackage ./kiten { }; + kitinerary = callPackage ./kitinerary { }; + kjournald = callPackage ./kjournald { }; + kjumpingcube = callPackage ./kjumpingcube { }; + kldap = callPackage ./kldap { }; + kleopatra = callPackage ./kleopatra { }; + klettres = callPackage ./klettres { }; + klickety = callPackage ./klickety { }; + klines = callPackage ./klines { }; + kmag = callPackage ./kmag { }; + kmahjongg = callPackage ./kmahjongg { }; + kmail = callPackage ./kmail { }; + kmail-account-wizard = callPackage ./kmail-account-wizard { }; + kmailtransport = callPackage ./kmailtransport { }; + kmbox = callPackage ./kmbox { }; + kmime = callPackage ./kmime { }; + kmines = callPackage ./kmines { }; + kmix = callPackage ./kmix { }; + kmousetool = callPackage ./kmousetool { }; + kmouth = callPackage ./kmouth { }; + kmplot = callPackage ./kmplot { }; + knavalbattle = callPackage ./knavalbattle { }; + knetwalk = callPackage ./knetwalk { }; + knights = callPackage ./knights { }; + koko = callPackage ./koko { }; + kolf = callPackage ./kolf { }; + kollision = callPackage ./kollision { }; + kolourpaint = callPackage ./kolourpaint { }; + kompare = callPackage ./kompare { }; + kongress = callPackage ./kongress { }; + konqueror = callPackage ./konqueror { }; + konquest = callPackage ./konquest { }; + konsole = callPackage ./konsole { }; + kontact = callPackage ./kontact { }; + kontactinterface = callPackage ./kontactinterface { }; + kontrast = callPackage ./kontrast { }; + konversation = callPackage ./konversation { }; + kopeninghours = callPackage ./kopeninghours { }; + korganizer = callPackage ./korganizer { }; + kosmindoormap = callPackage ./kosmindoormap { }; + kpat = callPackage ./kpat { }; + kpimtextedit = callPackage ./kpimtextedit { }; + kpkpass = callPackage ./kpkpass { }; + kpmcore = callPackage ./kpmcore { }; + kpublictransport = callPackage ./kpublictransport { }; + kqtquickcharts = callPackage ./kqtquickcharts { }; + krdc = callPackage ./krdc { }; + krecorder = callPackage ./krecorder { }; + kreversi = callPackage ./kreversi { }; + krfb = callPackage ./krfb { }; + kross-interpreters = callPackage ./kross-interpreters { }; + kruler = callPackage ./kruler { }; + ksanecore = callPackage ./ksanecore { }; + kshisen = callPackage ./kshisen { }; + ksirk = callPackage ./ksirk { }; + ksmtp = callPackage ./ksmtp { }; + ksnakeduel = callPackage ./ksnakeduel { }; + kspaceduel = callPackage ./kspaceduel { }; + ksquares = callPackage ./ksquares { }; + ksudoku = callPackage ./ksudoku { }; + ksystemlog = callPackage ./ksystemlog { }; + kteatime = callPackage ./kteatime { }; + ktimer = callPackage ./ktimer { }; + ktnef = callPackage ./ktnef { }; + ktorrent = callPackage ./ktorrent { }; + ktouch = callPackage ./ktouch { }; + ktrip = callPackage ./ktrip { }; + ktuberling = callPackage ./ktuberling { }; + kturtle = callPackage ./kturtle { }; + kubrick = callPackage ./kubrick { }; + kwalletmanager = callPackage ./kwalletmanager { }; + kwave = callPackage ./kwave { }; + kweather = callPackage ./kweather { }; + kweathercore = callPackage ./kweathercore { }; + kwordquiz = callPackage ./kwordquiz { }; + libgravatar = callPackage ./libgravatar { }; + libkcddb = callPackage ./libkcddb { }; + libkcompactdisc = callPackage ./libkcompactdisc { }; + libkdcraw = callPackage ./libkdcraw { }; + libkdegames = callPackage ./libkdegames { }; + libkdepim = callPackage ./libkdepim { }; + libkeduvocdocument = callPackage ./libkeduvocdocument { }; + libkexiv2 = callPackage ./libkexiv2 { }; + libkgapi = callPackage ./libkgapi { }; + libkleo = callPackage ./libkleo { }; + libkmahjongg = callPackage ./libkmahjongg { }; + libkomparediff2 = callPackage ./libkomparediff2 { }; + libksane = callPackage ./libksane { }; + libksieve = callPackage ./libksieve { }; + libktorrent = callPackage ./libktorrent { }; + lokalize = callPackage ./lokalize { }; + lskat = callPackage ./lskat { }; + mailcommon = callPackage ./mailcommon { }; + mailimporter = callPackage ./mailimporter { }; + marble = callPackage ./marble { }; + markdownpart = callPackage ./markdownpart { }; + massif-visualizer = callPackage ./massif-visualizer { }; + mbox-importer = callPackage ./mbox-importer { }; + merkuro = callPackage ./merkuro { }; + messagelib = callPackage ./messagelib { }; + mimetreeparser = callPackage ./mimetreeparser { }; + minuet = callPackage ./minuet { }; + neochat = callPackage ./neochat { }; + okular = callPackage ./okular { }; + palapeli = callPackage ./palapeli { }; + parley = callPackage ./parley { }; + partitionmanager = callPackage ./partitionmanager { }; + picmi = callPackage ./picmi { }; + pim-data-exporter = callPackage ./pim-data-exporter { }; + pim-sieve-editor = callPackage ./pim-sieve-editor { }; + pimcommon = callPackage ./pimcommon { }; + plasmatube = callPackage ./plasmatube { }; + poxml = callPackage ./poxml { }; + qmlkonsole = callPackage ./qmlkonsole { }; + rocs = callPackage ./rocs { }; + signon-kwallet-extension = callPackage ./signon-kwallet-extension { }; + skanlite = callPackage ./skanlite { }; + skanpage = callPackage ./skanpage { }; + skladnik = callPackage ./skladnik { }; + spectacle = callPackage ./spectacle { }; + step = callPackage ./step { }; + svgpart = callPackage ./svgpart { }; + sweeper = callPackage ./sweeper { }; + telly-skout = callPackage ./telly-skout { }; + tokodon = callPackage ./tokodon { }; + umbrello = callPackage ./umbrello { }; + yakuake = callPackage ./yakuake { }; + zanshin = callPackage ./zanshin { }; } diff --git a/pkgs/kde/gear/dolphin-plugins/default.nix b/pkgs/kde/gear/dolphin-plugins/default.nix index cc88d732389f..652158c2e07b 100644 --- a/pkgs/kde/gear/dolphin-plugins/default.nix +++ b/pkgs/kde/gear/dolphin-plugins/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin-plugins"; } diff --git a/pkgs/kde/gear/dolphin/default.nix b/pkgs/kde/gear/dolphin/default.nix index eb70e9c9d086..df4c4c3bdaf3 100644 --- a/pkgs/kde/gear/dolphin/default.nix +++ b/pkgs/kde/gear/dolphin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin"; } diff --git a/pkgs/kde/gear/dragon/default.nix b/pkgs/kde/gear/dragon/default.nix index 3b49b3372ce6..a825f60421b9 100644 --- a/pkgs/kde/gear/dragon/default.nix +++ b/pkgs/kde/gear/dragon/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dragon"; meta.mainProgram = "dragon"; diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix index 459fb247390b..ee280ae93198 100644 --- a/pkgs/kde/gear/elisa/default.nix +++ b/pkgs/kde/gear/elisa/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "elisa"; - extraBuildInputs = [qtmultimedia libvlc]; + extraBuildInputs = [ + qtmultimedia + libvlc + ]; meta.mainProgram = "elisa"; } diff --git a/pkgs/kde/gear/eventviews/default.nix b/pkgs/kde/gear/eventviews/default.nix index d9d0eeb7d798..dfdca9c5ce10 100644 --- a/pkgs/kde/gear/eventviews/default.nix +++ b/pkgs/kde/gear/eventviews/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "eventviews"; } diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix index bc8125b99ec8..daa26d9ce5e7 100644 --- a/pkgs/kde/gear/falkon/default.nix +++ b/pkgs/kde/gear/falkon/default.nix @@ -9,7 +9,16 @@ mkKdeDerivation { pname = "falkon"; - extraNativeBuildInputs = [qttools qtwebchannel qtwebengine]; - extraBuildInputs = [extra-cmake-modules qtwebchannel qtwebengine python3Packages.pyside6]; + extraNativeBuildInputs = [ + qttools + qtwebchannel + qtwebengine + ]; + extraBuildInputs = [ + extra-cmake-modules + qtwebchannel + qtwebengine + python3Packages.pyside6 + ]; meta.mainProgram = "falkon"; } diff --git a/pkgs/kde/gear/ffmpegthumbs/default.nix b/pkgs/kde/gear/ffmpegthumbs/default.nix index 62bd0e10378c..71740192c421 100644 --- a/pkgs/kde/gear/ffmpegthumbs/default.nix +++ b/pkgs/kde/gear/ffmpegthumbs/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ffmpegthumbs"; - extraBuildInputs = [ffmpeg]; + extraBuildInputs = [ ffmpeg ]; } diff --git a/pkgs/kde/gear/francis/default.nix b/pkgs/kde/gear/francis/default.nix index 8e2494b65fe1..231eadcd85b4 100644 --- a/pkgs/kde/gear/francis/default.nix +++ b/pkgs/kde/gear/francis/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "francis"; - extraBuildInputs = [qtsvg knotifications]; + extraBuildInputs = [ + qtsvg + knotifications + ]; } diff --git a/pkgs/kde/gear/granatier/default.nix b/pkgs/kde/gear/granatier/default.nix index 1c8593258ca3..6f1f673c6f05 100644 --- a/pkgs/kde/gear/granatier/default.nix +++ b/pkgs/kde/gear/granatier/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "granatier"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "granatier"; } diff --git a/pkgs/kde/gear/grantlee-editor/default.nix b/pkgs/kde/gear/grantlee-editor/default.nix index a80ea7d8b939..4c82ad082c70 100644 --- a/pkgs/kde/gear/grantlee-editor/default.nix +++ b/pkgs/kde/gear/grantlee-editor/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "grantlee-editor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/grantleetheme/default.nix b/pkgs/kde/gear/grantleetheme/default.nix index 5e21e92a54e5..5457d75b0f0c 100644 --- a/pkgs/kde/gear/grantleetheme/default.nix +++ b/pkgs/kde/gear/grantleetheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "grantleetheme"; } diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix index 4bbb5f98eb1e..71780b6bf9a7 100644 --- a/pkgs/kde/gear/gwenview/default.nix +++ b/pkgs/kde/gear/gwenview/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "gwenview"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtwayland diff --git a/pkgs/kde/gear/incidenceeditor/default.nix b/pkgs/kde/gear/incidenceeditor/default.nix index cf8c1e7857c4..b5603c82ca0c 100644 --- a/pkgs/kde/gear/incidenceeditor/default.nix +++ b/pkgs/kde/gear/incidenceeditor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "incidenceeditor"; } diff --git a/pkgs/kde/gear/isoimagewriter/default.nix b/pkgs/kde/gear/isoimagewriter/default.nix index e9b41bcb84e9..e9dc082f3293 100644 --- a/pkgs/kde/gear/isoimagewriter/default.nix +++ b/pkgs/kde/gear/isoimagewriter/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "isoimagewriter"; - extraBuildInputs = [qgpgme]; + extraBuildInputs = [ qgpgme ]; meta.mainProgram = "isoimagewriter"; } diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix index ca1872662f32..0b2292a2ada3 100644 --- a/pkgs/kde/gear/itinerary/default.nix +++ b/pkgs/kde/gear/itinerary/default.nix @@ -10,9 +10,16 @@ mkKdeDerivation { pname = "itinerary"; # FIXME: this should really be fixed at ECM level somehow - patches = [./optional-runtime-dependencies.patch]; + patches = [ ./optional-runtime-dependencies.patch ]; - extraNativeBuildInputs = [pkg-config shared-mime-info]; - extraBuildInputs = [qtlocation qtpositioning libical]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + qtlocation + qtpositioning + libical + ]; meta.mainProgram = "itinerary"; } diff --git a/pkgs/kde/gear/juk/default.nix b/pkgs/kde/gear/juk/default.nix index 53eff6a9cc18..c0bc805639a4 100644 --- a/pkgs/kde/gear/juk/default.nix +++ b/pkgs/kde/gear/juk/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "juk"; - extraBuildInputs = [qtsvg taglib]; + extraBuildInputs = [ + qtsvg + taglib + ]; meta.mainProgram = "juk"; } diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix index ba4a1fc6aab4..a11f03a6333f 100644 --- a/pkgs/kde/gear/k3b/default.nix +++ b/pkgs/kde/gear/k3b/default.nix @@ -25,7 +25,10 @@ mkKdeDerivation { pname = "k3b"; - extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; # FIXME: Musicbrainz 2.x???, musepack extraBuildInputs = [ @@ -40,20 +43,27 @@ mkKdeDerivation { ]; qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - cdrdao - cdrtools - dvdplusrwtools - libburn - normalize - sox - transcode - vcdimager - flac - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + cdrdao + cdrtools + dvdplusrwtools + libburn + normalize + sox + transcode + vcdimager + flac + ] + }" # FIXME: this should really be done with patchelf --add-rpath, but it breaks the binary somehow - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ cdparanoia libdvdcss ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + cdparanoia + libdvdcss + ] + }" ]; meta.mainProgram = "k3b"; diff --git a/pkgs/kde/gear/kaccounts-integration/default.nix b/pkgs/kde/gear/kaccounts-integration/default.nix index 1b927d3e01ef..06a4436ba133 100644 --- a/pkgs/kde/gear/kaccounts-integration/default.nix +++ b/pkgs/kde/gear/kaccounts-integration/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kaccounts-integration"; - propagatedNativeBuildInputs = [intltool]; + propagatedNativeBuildInputs = [ intltool ]; } diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix index 6cd2fd7e3304..bf0ecf678302 100644 --- a/pkgs/kde/gear/kaccounts-providers/default.nix +++ b/pkgs/kde/gear/kaccounts-providers/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kaccounts-providers"; - extraNativeBuildInputs = [intltool]; - extraBuildInputs = [qtdeclarative qtwebengine]; + extraNativeBuildInputs = [ intltool ]; + extraBuildInputs = [ + qtdeclarative + qtwebengine + ]; } diff --git a/pkgs/kde/gear/kaddressbook/default.nix b/pkgs/kde/gear/kaddressbook/default.nix index a5ef9c659f4e..56039912bb51 100644 --- a/pkgs/kde/gear/kaddressbook/default.nix +++ b/pkgs/kde/gear/kaddressbook/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kaddressbook"; meta.mainProgram = "kaddressbook"; diff --git a/pkgs/kde/gear/kajongg/default.nix b/pkgs/kde/gear/kajongg/default.nix index 651ac3b3115a..555c384b6081 100644 --- a/pkgs/kde/gear/kajongg/default.nix +++ b/pkgs/kde/gear/kajongg/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "kajongg"; - extraBuildInputs = [qtsvg python3 python3.pkgs.twisted]; + extraBuildInputs = [ + qtsvg + python3 + python3.pkgs.twisted + ]; # FIXME: completely horked, is actually a Python app, needs a lot of fixing meta.broken = true; } diff --git a/pkgs/kde/gear/kalarm/default.nix b/pkgs/kde/gear/kalarm/default.nix index f795cd3bf68e..0a1dc3524417 100644 --- a/pkgs/kde/gear/kalarm/default.nix +++ b/pkgs/kde/gear/kalarm/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kalarm"; - extraBuildInputs = [libcanberra libvlc]; + extraBuildInputs = [ + libcanberra + libvlc + ]; } diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix index 89aaafc04c96..1b3cd47fc93e 100644 --- a/pkgs/kde/gear/kalgebra/default.nix +++ b/pkgs/kde/gear/kalgebra/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "kalgebra"; - extraBuildInputs = [qtsvg qtwebengine ncurses readline]; + extraBuildInputs = [ + qtsvg + qtwebengine + ncurses + readline + ]; } diff --git a/pkgs/kde/gear/kalk/default.nix b/pkgs/kde/gear/kalk/default.nix index 511b0bdf0654..6f339fe609dd 100644 --- a/pkgs/kde/gear/kalk/default.nix +++ b/pkgs/kde/gear/kalk/default.nix @@ -12,7 +12,11 @@ mkKdeDerivation { pname = "kalk"; - extraNativeBuildInputs = [pkg-config bison flex]; + extraNativeBuildInputs = [ + pkg-config + bison + flex + ]; extraBuildInputs = [ qtdeclarative kirigami-addons diff --git a/pkgs/kde/gear/kalm/default.nix b/pkgs/kde/gear/kalm/default.nix index 0c4eee90bc31..295084a63db7 100644 --- a/pkgs/kde/gear/kalm/default.nix +++ b/pkgs/kde/gear/kalm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kalm"; } diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix index 1c45498294d0..7cdcd1efec63 100644 --- a/pkgs/kde/gear/kalzium/default.nix +++ b/pkgs/kde/gear/kalzium/default.nix @@ -11,7 +11,15 @@ mkKdeDerivation { pname = "kalzium"; # FIXME: look into how to make it find libfacile - extraNativeBuildInputs = [pkg-config ocaml]; - extraBuildInputs = [eigen openbabel qtsvg qtscxml]; + extraNativeBuildInputs = [ + pkg-config + ocaml + ]; + extraBuildInputs = [ + eigen + openbabel + qtsvg + qtscxml + ]; meta.mainProgram = "kalzium"; } diff --git a/pkgs/kde/gear/kamera/default.nix b/pkgs/kde/gear/kamera/default.nix index 3ab21c99f4ed..d6f9be0bc99a 100644 --- a/pkgs/kde/gear/kamera/default.nix +++ b/pkgs/kde/gear/kamera/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kamera"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libgphoto2]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libgphoto2 ]; } diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix index b83e193f3117..fa86b87f2f8d 100644 --- a/pkgs/kde/gear/kamoso/default.nix +++ b/pkgs/kde/gear/kamoso/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kamoso"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kanagram/default.nix b/pkgs/kde/gear/kanagram/default.nix index e7d3d7b443ed..aec99c0f32c2 100644 --- a/pkgs/kde/gear/kanagram/default.nix +++ b/pkgs/kde/gear/kanagram/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kanagram"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kanagram"; } diff --git a/pkgs/kde/gear/kapman/default.nix b/pkgs/kde/gear/kapman/default.nix index 61cfb1fdf3fa..abae489b60f6 100644 --- a/pkgs/kde/gear/kapman/default.nix +++ b/pkgs/kde/gear/kapman/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kapman"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kapman"; } diff --git a/pkgs/kde/gear/kapptemplate/default.nix b/pkgs/kde/gear/kapptemplate/default.nix index 9b4f350b1b65..49b8dab441b0 100644 --- a/pkgs/kde/gear/kapptemplate/default.nix +++ b/pkgs/kde/gear/kapptemplate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapptemplate"; meta.mainProgram = "kapptemplate"; diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix index 2375bb00af21..f95ea1c80892 100644 --- a/pkgs/kde/gear/kasts/default.nix +++ b/pkgs/kde/gear/kasts/default.nix @@ -9,7 +9,7 @@ mkKdeDerivation { pname = "kasts"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtmultimedia diff --git a/pkgs/kde/gear/kate/default.nix b/pkgs/kde/gear/kate/default.nix index 044b7b35e8b5..622787ac3877 100644 --- a/pkgs/kde/gear/kate/default.nix +++ b/pkgs/kde/gear/kate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kate"; } diff --git a/pkgs/kde/gear/katomic/default.nix b/pkgs/kde/gear/katomic/default.nix index e9dcd6ebe040..61d3d6e653ea 100644 --- a/pkgs/kde/gear/katomic/default.nix +++ b/pkgs/kde/gear/katomic/default.nix @@ -1,11 +1,11 @@ { mkKdeDerivation, - _7zz + _7zz, }: mkKdeDerivation { pname = "katomic"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "katomic"; } diff --git a/pkgs/kde/gear/kbackup/default.nix b/pkgs/kde/gear/kbackup/default.nix index 49e43996b932..4ccab6e8ca3e 100644 --- a/pkgs/kde/gear/kbackup/default.nix +++ b/pkgs/kde/gear/kbackup/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kbackup"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qt5compat libarchive]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ + qt5compat + libarchive + ]; meta.mainProgram = "kbackup"; } diff --git a/pkgs/kde/gear/kblackbox/default.nix b/pkgs/kde/gear/kblackbox/default.nix index 26156c9195a9..5d1147074e4a 100644 --- a/pkgs/kde/gear/kblackbox/default.nix +++ b/pkgs/kde/gear/kblackbox/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kblackbox"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblackbox"; } diff --git a/pkgs/kde/gear/kblocks/default.nix b/pkgs/kde/gear/kblocks/default.nix index 1e4628b03037..228e02beb8cc 100644 --- a/pkgs/kde/gear/kblocks/default.nix +++ b/pkgs/kde/gear/kblocks/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kblocks"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblocks"; } diff --git a/pkgs/kde/gear/kbounce/default.nix b/pkgs/kde/gear/kbounce/default.nix index e93c9e50d673..d816a91632f1 100644 --- a/pkgs/kde/gear/kbounce/default.nix +++ b/pkgs/kde/gear/kbounce/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kbounce"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kbounce"; } diff --git a/pkgs/kde/gear/kbreakout/default.nix b/pkgs/kde/gear/kbreakout/default.nix index 541ae0789ed4..29fb4eeadd9b 100644 --- a/pkgs/kde/gear/kbreakout/default.nix +++ b/pkgs/kde/gear/kbreakout/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kbreakout"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kbreakout"; } diff --git a/pkgs/kde/gear/kbruch/default.nix b/pkgs/kde/gear/kbruch/default.nix index 9533db2c30e5..d4e4c40b20f2 100644 --- a/pkgs/kde/gear/kbruch/default.nix +++ b/pkgs/kde/gear/kbruch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kbruch"; meta.mainProgram = "kbruch"; diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix index 52de8a88e666..d657c059ca22 100644 --- a/pkgs/kde/gear/kcachegrind/default.nix +++ b/pkgs/kde/gear/kcachegrind/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "kcachegrind"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ graphviz ]}" diff --git a/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix index 28f1d314ce96..645ececef858 100644 --- a/pkgs/kde/gear/kcalc/default.nix +++ b/pkgs/kde/gear/kcalc/default.nix @@ -8,6 +8,11 @@ mkKdeDerivation { pname = "kcalc"; - extraBuildInputs = [qt5compat gmp mpfr kdoctools]; + extraBuildInputs = [ + qt5compat + gmp + mpfr + kdoctools + ]; meta.mainProgram = "kcalc"; } diff --git a/pkgs/kde/gear/kcalutils/default.nix b/pkgs/kde/gear/kcalutils/default.nix index 1b58cce9ff00..38f9951477c9 100644 --- a/pkgs/kde/gear/kcalutils/default.nix +++ b/pkgs/kde/gear/kcalutils/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcalutils"; } diff --git a/pkgs/kde/gear/kcharselect/default.nix b/pkgs/kde/gear/kcharselect/default.nix index 9ee054d9339a..3dae9bdfa84b 100644 --- a/pkgs/kde/gear/kcharselect/default.nix +++ b/pkgs/kde/gear/kcharselect/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcharselect"; meta.mainProgram = "kcharselect"; diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix index 97db5fd92f0e..56ec55e885da 100644 --- a/pkgs/kde/gear/kclock/default.nix +++ b/pkgs/kde/gear/kclock/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kclock"; - extraBuildInputs = [qtsvg qtmultimedia]; + extraBuildInputs = [ + qtsvg + qtmultimedia + ]; } diff --git a/pkgs/kde/gear/kcolorchooser/default.nix b/pkgs/kde/gear/kcolorchooser/default.nix index f4c5132800e3..f4f51cf5164f 100644 --- a/pkgs/kde/gear/kcolorchooser/default.nix +++ b/pkgs/kde/gear/kcolorchooser/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorchooser"; meta.mainProgram = "kcolorchooser"; diff --git a/pkgs/kde/gear/kcron/default.nix b/pkgs/kde/gear/kcron/default.nix index b1707101d49f..9278e6672d86 100644 --- a/pkgs/kde/gear/kcron/default.nix +++ b/pkgs/kde/gear/kcron/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcron"; } diff --git a/pkgs/kde/gear/kde-dev-scripts/default.nix b/pkgs/kde/gear/kde-dev-scripts/default.nix index 7e82f80b8114..41dcc71d8c17 100644 --- a/pkgs/kde/gear/kde-dev-scripts/default.nix +++ b/pkgs/kde/gear/kde-dev-scripts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-dev-scripts"; } diff --git a/pkgs/kde/gear/kde-dev-utils/default.nix b/pkgs/kde/gear/kde-dev-utils/default.nix index 6efce8354eec..98365e9f0c2d 100644 --- a/pkgs/kde/gear/kde-dev-utils/default.nix +++ b/pkgs/kde/gear/kde-dev-utils/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-dev-utils"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/kde-inotify-survey/default.nix b/pkgs/kde/gear/kde-inotify-survey/default.nix index 6e319b60c81d..5ecc800aa9da 100644 --- a/pkgs/kde/gear/kde-inotify-survey/default.nix +++ b/pkgs/kde/gear/kde-inotify-survey/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-inotify-survey"; meta.mainProgram = "kde-inotify-survey"; diff --git a/pkgs/kde/gear/kdebugsettings/default.nix b/pkgs/kde/gear/kdebugsettings/default.nix index 21477c665694..c2cceb383873 100644 --- a/pkgs/kde/gear/kdebugsettings/default.nix +++ b/pkgs/kde/gear/kdebugsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdebugsettings"; meta.mainProgram = "kdebugsettings"; diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix index c8575ee51ea6..3bc3abd422ea 100644 --- a/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -27,8 +27,15 @@ mkKdeDerivation { echo "${sshfs}" > $out/nix-support/depends ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtconnectivity + qtmultimedia + qtwayland + wayland + wayland-protocols + libfakekey + ]; extraCmakeFlags = [ "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" diff --git a/pkgs/kde/gear/kdeedu-data/default.nix b/pkgs/kde/gear/kdeedu-data/default.nix index 74bc3921389c..d47f41510a3a 100644 --- a/pkgs/kde/gear/kdeedu-data/default.nix +++ b/pkgs/kde/gear/kdeedu-data/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdeedu-data"; } diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix index 7636cbe1dd27..56596b0537f6 100644 --- a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix +++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdegraphics-mobipocket"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix index a91dc2529503..35292d554ef6 100644 --- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -5,10 +5,10 @@ mkKdeDerivation { pname = "kdenetwork-filesharing"; - patches = [./smbd-path.patch]; + patches = [ ./smbd-path.patch ]; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to - extraCmakeFlags = ["-DSAMBA_INSTALL=OFF"]; + extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ]; } diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 8c08272cd946..b9a6e321531c 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -17,13 +17,11 @@ mkKdeDerivation { pname = "kdenlive"; patches = [ - ( - substituteAll { - src = ./dependency-paths.patch; - inherit mediainfo mlt glaxnimate; - ffmpeg = ffmpeg-full; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo mlt glaxnimate; + ffmpeg = ffmpeg-full; + }) ]; extraNativeBuildInputs = [ shared-mime-info ]; diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index 4c59f3f5512a..4b800b7c1913 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -31,5 +31,9 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [discount corrosion alpaka]; + extraBuildInputs = [ + discount + corrosion + alpaka + ]; } diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix index a4c2f81afb82..e3cd581afcd5 100644 --- a/pkgs/kde/gear/kdepim-runtime/default.nix +++ b/pkgs/kde/gear/kdepim-runtime/default.nix @@ -14,11 +14,26 @@ mkKdeDerivation { pname = "kdepim-runtime"; - extraNativeBuildInputs = [pkg-config shared-mime-info libxslt]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + libxslt + ]; # FIXME: libkolabxml - extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl libetebase]; + extraBuildInputs = [ + qtnetworkauth + qtspeech + qtwebengine + cyrus_sasl + libetebase + ]; qtWrapperArgs = [ - "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}" + "--prefix SASL_PATH : ${ + lib.makeSearchPath "lib/sasl2" [ + cyrus_sasl.out + libkgapi + ] + }" ]; } diff --git a/pkgs/kde/gear/kdesdk-kio/default.nix b/pkgs/kde/gear/kdesdk-kio/default.nix index 1ec970a818f6..24a4601ddbb2 100644 --- a/pkgs/kde/gear/kdesdk-kio/default.nix +++ b/pkgs/kde/gear/kdesdk-kio/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdesdk-kio"; - extraNativeBuildInputs = [perl]; + extraNativeBuildInputs = [ perl ]; } diff --git a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix index 727fff83b3d2..47673f9bed22 100644 --- a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix +++ b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesdk-thumbnailers"; } diff --git a/pkgs/kde/gear/kdev-php/default.nix b/pkgs/kde/gear/kdev-php/default.nix index 861bc9615b1c..285c51170c6b 100644 --- a/pkgs/kde/gear/kdev-php/default.nix +++ b/pkgs/kde/gear/kdev-php/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdev-php"; - extraNativeBuildInputs = [kdevelop-pg-qt]; + extraNativeBuildInputs = [ kdevelop-pg-qt ]; } diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix index 6ddeff1b5850..23901bb4d78e 100644 --- a/pkgs/kde/gear/kdev-python/default.nix +++ b/pkgs/kde/gear/kdev-python/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdev-python"; } diff --git a/pkgs/kde/gear/kdf/default.nix b/pkgs/kde/gear/kdf/default.nix index 8021e701cbaa..f4350dc606df 100644 --- a/pkgs/kde/gear/kdf/default.nix +++ b/pkgs/kde/gear/kdf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdf"; } diff --git a/pkgs/kde/gear/kdialog/default.nix b/pkgs/kde/gear/kdialog/default.nix index 2ef126650578..c1f96a49b1e9 100644 --- a/pkgs/kde/gear/kdialog/default.nix +++ b/pkgs/kde/gear/kdialog/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdialog"; } diff --git a/pkgs/kde/gear/kdiamond/default.nix b/pkgs/kde/gear/kdiamond/default.nix index 1636a80fd727..11e0dbf40f50 100644 --- a/pkgs/kde/gear/kdiamond/default.nix +++ b/pkgs/kde/gear/kdiamond/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdiamond"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kdiamond"; } diff --git a/pkgs/kde/gear/keditbookmarks/default.nix b/pkgs/kde/gear/keditbookmarks/default.nix index 8eec9c76ec75..4308c79ccee3 100644 --- a/pkgs/kde/gear/keditbookmarks/default.nix +++ b/pkgs/kde/gear/keditbookmarks/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "keditbookmarks"; } diff --git a/pkgs/kde/gear/keysmith/default.nix b/pkgs/kde/gear/keysmith/default.nix index 4d96f630a661..e01b7a61e266 100644 --- a/pkgs/kde/gear/keysmith/default.nix +++ b/pkgs/kde/gear/keysmith/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "keysmith"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg libsodium]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + libsodium + ]; meta.mainProgram = "keysmith"; } diff --git a/pkgs/kde/gear/kfind/default.nix b/pkgs/kde/gear/kfind/default.nix index b652b790eb7f..d1e815913254 100644 --- a/pkgs/kde/gear/kfind/default.nix +++ b/pkgs/kde/gear/kfind/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kfind"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "kfind"; } diff --git a/pkgs/kde/gear/kfourinline/default.nix b/pkgs/kde/gear/kfourinline/default.nix index 2c77d372fc16..1bd6606b2cf2 100644 --- a/pkgs/kde/gear/kfourinline/default.nix +++ b/pkgs/kde/gear/kfourinline/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kfourinline"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/kgeography/default.nix b/pkgs/kde/gear/kgeography/default.nix index 560faec8e010..c2c04553c24d 100644 --- a/pkgs/kde/gear/kgeography/default.nix +++ b/pkgs/kde/gear/kgeography/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kgeography"; meta.mainProgram = "kgeography"; diff --git a/pkgs/kde/gear/kget/default.nix b/pkgs/kde/gear/kget/default.nix index e88cd601bb0e..412d0a3c0b69 100644 --- a/pkgs/kde/gear/kget/default.nix +++ b/pkgs/kde/gear/kget/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kget"; - extraBuildInputs = [qgpgme libmms]; + extraBuildInputs = [ + qgpgme + libmms + ]; meta.mainProgram = "kget"; } diff --git a/pkgs/kde/gear/kgoldrunner/default.nix b/pkgs/kde/gear/kgoldrunner/default.nix index ba82b55cccad..10a0634e1b50 100644 --- a/pkgs/kde/gear/kgoldrunner/default.nix +++ b/pkgs/kde/gear/kgoldrunner/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kgoldrunner"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kgoldrunner"; } diff --git a/pkgs/kde/gear/kgpg/default.nix b/pkgs/kde/gear/kgpg/default.nix index 2b974de5123c..d2979a933a54 100644 --- a/pkgs/kde/gear/kgpg/default.nix +++ b/pkgs/kde/gear/kgpg/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kgpg"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [gpgme]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ gpgme ]; meta.mainProgram = "kgpg"; } diff --git a/pkgs/kde/gear/kgraphviewer/default.nix b/pkgs/kde/gear/kgraphviewer/default.nix index de47a29cb6a1..560d4685921a 100644 --- a/pkgs/kde/gear/kgraphviewer/default.nix +++ b/pkgs/kde/gear/kgraphviewer/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { pname = "kgraphviewer"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ qt5compat qtsvg boost graphviz ]; + extraBuildInputs = [ + qt5compat + qtsvg + boost + graphviz + ]; } diff --git a/pkgs/kde/gear/khangman/default.nix b/pkgs/kde/gear/khangman/default.nix index e3f95b7a6a5a..460baf52760b 100644 --- a/pkgs/kde/gear/khangman/default.nix +++ b/pkgs/kde/gear/khangman/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "khangman"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "khangman"; } diff --git a/pkgs/kde/gear/khealthcertificate/default.nix b/pkgs/kde/gear/khealthcertificate/default.nix index 6d5461bffc3c..ef4b1ab16680 100644 --- a/pkgs/kde/gear/khealthcertificate/default.nix +++ b/pkgs/kde/gear/khealthcertificate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "khealthcertificate"; - extraNativeBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix index 231d1036b0b1..2348754b71b6 100644 --- a/pkgs/kde/gear/khelpcenter/default.nix +++ b/pkgs/kde/gear/khelpcenter/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "khelpcenter"; - extraBuildInputs = [qtwebengine xapian]; + extraBuildInputs = [ + qtwebengine + xapian + ]; meta.mainProgram = "khelpcenter"; } diff --git a/pkgs/kde/gear/kidentitymanagement/default.nix b/pkgs/kde/gear/kidentitymanagement/default.nix index c66c416fd7ce..bfcfa3f19696 100644 --- a/pkgs/kde/gear/kidentitymanagement/default.nix +++ b/pkgs/kde/gear/kidentitymanagement/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kidentitymanagement"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/kig/default.nix b/pkgs/kde/gear/kig/default.nix index a3e4de99e6a8..8a1761644378 100644 --- a/pkgs/kde/gear/kig/default.nix +++ b/pkgs/kde/gear/kig/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kig"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kigo/default.nix b/pkgs/kde/gear/kigo/default.nix index 4fd00e721f81..6c2f4a1793d7 100644 --- a/pkgs/kde/gear/kigo/default.nix +++ b/pkgs/kde/gear/kigo/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kigo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kigo"; } diff --git a/pkgs/kde/gear/killbots/default.nix b/pkgs/kde/gear/killbots/default.nix index 592cb97ba681..71853ae6eb96 100644 --- a/pkgs/kde/gear/killbots/default.nix +++ b/pkgs/kde/gear/killbots/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "killbots"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "killbots"; } diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix index 71efc86fd2ae..9341cf5ab4db 100644 --- a/pkgs/kde/gear/kimagemapeditor/default.nix +++ b/pkgs/kde/gear/kimagemapeditor/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kimagemapeditor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; meta.mainProgram = "kimagemapeditor"; } diff --git a/pkgs/kde/gear/kimap/default.nix b/pkgs/kde/gear/kimap/default.nix index d106166ec4a6..3f5bc4496070 100644 --- a/pkgs/kde/gear/kimap/default.nix +++ b/pkgs/kde/gear/kimap/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kimap"; - extraBuildInputs = [cyrus_sasl]; + extraBuildInputs = [ cyrus_sasl ]; } diff --git a/pkgs/kde/gear/kio-admin/default.nix b/pkgs/kde/gear/kio-admin/default.nix index 042253978983..7734ac049225 100644 --- a/pkgs/kde/gear/kio-admin/default.nix +++ b/pkgs/kde/gear/kio-admin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-admin"; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 79a5cb405ae4..2260feeac62c 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -19,7 +19,11 @@ mkKdeDerivation { pname = "kio-extras"; - extraNativeBuildInputs = [pkg-config gperf shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + gperf + shared-mime-info + ]; extraBuildInputs = [ qt5compat qtsvg diff --git a/pkgs/kde/gear/kio-gdrive/default.nix b/pkgs/kde/gear/kio-gdrive/default.nix index 1c28dd3dcd10..3fc930a31699 100644 --- a/pkgs/kde/gear/kio-gdrive/default.nix +++ b/pkgs/kde/gear/kio-gdrive/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-gdrive"; } diff --git a/pkgs/kde/gear/kio-zeroconf/default.nix b/pkgs/kde/gear/kio-zeroconf/default.nix index 0b731162af83..8a1d91bbb1a5 100644 --- a/pkgs/kde/gear/kio-zeroconf/default.nix +++ b/pkgs/kde/gear/kio-zeroconf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-zeroconf"; } diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix index d9e1e12367a2..bb739046baca 100644 --- a/pkgs/kde/gear/kirigami-gallery/default.nix +++ b/pkgs/kde/gear/kirigami-gallery/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kirigami-gallery"; - extraNativeBuildInputs = [qtsvg qttools]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; } diff --git a/pkgs/kde/gear/kiriki/default.nix b/pkgs/kde/gear/kiriki/default.nix index 50d04e49e939..91290cbc3a29 100644 --- a/pkgs/kde/gear/kiriki/default.nix +++ b/pkgs/kde/gear/kiriki/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiriki"; meta.mainProgram = "kiriki"; diff --git a/pkgs/kde/gear/kiten/default.nix b/pkgs/kde/gear/kiten/default.nix index 5f87c6c66b39..d6eeab96eb66 100644 --- a/pkgs/kde/gear/kiten/default.nix +++ b/pkgs/kde/gear/kiten/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiten"; } diff --git a/pkgs/kde/gear/kitinerary/default.nix b/pkgs/kde/gear/kitinerary/default.nix index de3f4ef00005..28710c095fcc 100644 --- a/pkgs/kde/gear/kitinerary/default.nix +++ b/pkgs/kde/gear/kitinerary/default.nix @@ -10,7 +10,7 @@ mkKdeDerivation { pname = "kitinerary"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; extraBuildInputs = [ qtsvg qtdeclarative diff --git a/pkgs/kde/gear/kjournald/default.nix b/pkgs/kde/gear/kjournald/default.nix index 879e698db4d1..f902fba1e0dc 100644 --- a/pkgs/kde/gear/kjournald/default.nix +++ b/pkgs/kde/gear/kjournald/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kjournald"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtdeclarative + systemd + ]; meta.mainProgram = "kjournaldbrowser"; } diff --git a/pkgs/kde/gear/kjumpingcube/default.nix b/pkgs/kde/gear/kjumpingcube/default.nix index 0141748b39dc..65ae1386cf27 100644 --- a/pkgs/kde/gear/kjumpingcube/default.nix +++ b/pkgs/kde/gear/kjumpingcube/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kjumpingcube"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kjumpingcube"; } diff --git a/pkgs/kde/gear/kldap/default.nix b/pkgs/kde/gear/kldap/default.nix index 99c17b169147..7c3e9b960002 100644 --- a/pkgs/kde/gear/kldap/default.nix +++ b/pkgs/kde/gear/kldap/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kldap"; - extraBuildInputs = [cyrus_sasl openldap]; + extraBuildInputs = [ + cyrus_sasl + openldap + ]; } diff --git a/pkgs/kde/gear/kleopatra/default.nix b/pkgs/kde/gear/kleopatra/default.nix index 58d3f4b5a9cf..560ab8fb71fc 100644 --- a/pkgs/kde/gear/kleopatra/default.nix +++ b/pkgs/kde/gear/kleopatra/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kleopatra"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [akonadi-mime]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ akonadi-mime ]; } diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix index ef6305d0f121..b01e22878385 100644 --- a/pkgs/kde/gear/klettres/default.nix +++ b/pkgs/kde/gear/klettres/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "klettres"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "klettres"; } diff --git a/pkgs/kde/gear/klickety/default.nix b/pkgs/kde/gear/klickety/default.nix index 339fa31003a5..a0d214f3e79c 100644 --- a/pkgs/kde/gear/klickety/default.nix +++ b/pkgs/kde/gear/klickety/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klickety"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klickety"; } diff --git a/pkgs/kde/gear/klines/default.nix b/pkgs/kde/gear/klines/default.nix index 52bb95c0d787..fe39ba85440c 100644 --- a/pkgs/kde/gear/klines/default.nix +++ b/pkgs/kde/gear/klines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klines"; } diff --git a/pkgs/kde/gear/kmag/default.nix b/pkgs/kde/gear/kmag/default.nix index 3d8046715dca..0650d3bd763c 100644 --- a/pkgs/kde/gear/kmag/default.nix +++ b/pkgs/kde/gear/kmag/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmag"; meta.mainProgram = "kmag"; diff --git a/pkgs/kde/gear/kmahjongg/default.nix b/pkgs/kde/gear/kmahjongg/default.nix index 9d01f435be00..1816b16f283c 100644 --- a/pkgs/kde/gear/kmahjongg/default.nix +++ b/pkgs/kde/gear/kmahjongg/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kmahjongg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkmahjongg}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkmahjongg}/share" ]; meta.mainProgram = "kmahjongg"; } diff --git a/pkgs/kde/gear/kmail-account-wizard/default.nix b/pkgs/kde/gear/kmail-account-wizard/default.nix index acd23f72d683..88e790f1a93a 100644 --- a/pkgs/kde/gear/kmail-account-wizard/default.nix +++ b/pkgs/kde/gear/kmail-account-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail-account-wizard"; meta.mainProgram = "accountwizard"; diff --git a/pkgs/kde/gear/kmail/default.nix b/pkgs/kde/gear/kmail/default.nix index f3f659fbaf5f..ce38c7d15fdc 100644 --- a/pkgs/kde/gear/kmail/default.nix +++ b/pkgs/kde/gear/kmail/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail"; } diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix index cf1bf8c1b223..7953ec021b64 100644 --- a/pkgs/kde/gear/kmailtransport/default.nix +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmailtransport"; } diff --git a/pkgs/kde/gear/kmbox/default.nix b/pkgs/kde/gear/kmbox/default.nix index ef840d3eda4d..9f1a0ef7c400 100644 --- a/pkgs/kde/gear/kmbox/default.nix +++ b/pkgs/kde/gear/kmbox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmbox"; } diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix index a2beb4fdf58f..300185643481 100644 --- a/pkgs/kde/gear/kmime/default.nix +++ b/pkgs/kde/gear/kmime/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kmime"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [ki18n]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ ki18n ]; } diff --git a/pkgs/kde/gear/kmines/default.nix b/pkgs/kde/gear/kmines/default.nix index 687cf0d29480..243fd722e954 100644 --- a/pkgs/kde/gear/kmines/default.nix +++ b/pkgs/kde/gear/kmines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kmines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kmines"; } diff --git a/pkgs/kde/gear/kmix/default.nix b/pkgs/kde/gear/kmix/default.nix index b83392baa7df..8c6e1a3c4b81 100644 --- a/pkgs/kde/gear/kmix/default.nix +++ b/pkgs/kde/gear/kmix/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmix"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix index 78a73e45768b..7eca9ab12c73 100644 --- a/pkgs/kde/gear/kmousetool/default.nix +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kmousetool"; - extraBuildInputs = [qtmultimedia xorg.libXt]; + extraBuildInputs = [ + qtmultimedia + xorg.libXt + ]; meta.mainProgram = "kmousetool"; } diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix index 9abffa1d2da6..098f8a5ec33f 100644 --- a/pkgs/kde/gear/kmouth/default.nix +++ b/pkgs/kde/gear/kmouth/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmouth"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kmouth"; } diff --git a/pkgs/kde/gear/kmplot/default.nix b/pkgs/kde/gear/kmplot/default.nix index b38941765747..6830d3edeae1 100644 --- a/pkgs/kde/gear/kmplot/default.nix +++ b/pkgs/kde/gear/kmplot/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmplot"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kmplot"; } diff --git a/pkgs/kde/gear/knavalbattle/default.nix b/pkgs/kde/gear/knavalbattle/default.nix index abd9281ff52e..a04c8dee5baa 100644 --- a/pkgs/kde/gear/knavalbattle/default.nix +++ b/pkgs/kde/gear/knavalbattle/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "knavalbattle"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knavalbattle"; } diff --git a/pkgs/kde/gear/knetwalk/default.nix b/pkgs/kde/gear/knetwalk/default.nix index 265e6d32f542..36305d57cc87 100644 --- a/pkgs/kde/gear/knetwalk/default.nix +++ b/pkgs/kde/gear/knetwalk/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "knetwalk"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knetwalk"; } diff --git a/pkgs/kde/gear/knights/default.nix b/pkgs/kde/gear/knights/default.nix index 4deca218d095..2fd61dc79f19 100644 --- a/pkgs/kde/gear/knights/default.nix +++ b/pkgs/kde/gear/knights/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "knights"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg qtspeech]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + qtspeech + ]; meta.mainProgram = "knights"; } diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index 1241f68e12a7..e823a6cff139 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/pkgs/kde/gear/koko/default.nix @@ -7,7 +7,8 @@ qtsvg, exiv2, kirigami-addons, -}: let +}: +let # URLs snapshotted through # https://web.archive.org/save/$url # Update when stale enough I guess? @@ -24,22 +25,22 @@ sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; }; in - mkKdeDerivation { - pname = "koko"; +mkKdeDerivation { + pname = "koko"; - prePatch = '' - ln -s ${admin1} src/admin1CodesASCII.txt - ln -s ${admin2} src/admin2Codes.txt - ln -s ${cities1000} src/cities1000.zip - ''; + prePatch = '' + ln -s ${admin1} src/admin1CodesASCII.txt + ln -s ${admin2} src/admin2Codes.txt + ln -s ${cities1000} src/cities1000.zip + ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtmultimedia - qtpositioning - qtsvg - exiv2 - kirigami-addons - ]; - meta.mainProgram = "koko"; - } + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtpositioning + qtsvg + exiv2 + kirigami-addons + ]; + meta.mainProgram = "koko"; +} diff --git a/pkgs/kde/gear/kolf/default.nix b/pkgs/kde/gear/kolf/default.nix index 39657f077a7d..020ffdad5c99 100644 --- a/pkgs/kde/gear/kolf/default.nix +++ b/pkgs/kde/gear/kolf/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kolf"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kolf"; } diff --git a/pkgs/kde/gear/kollision/default.nix b/pkgs/kde/gear/kollision/default.nix index 299549d47513..f8924cb68930 100644 --- a/pkgs/kde/gear/kollision/default.nix +++ b/pkgs/kde/gear/kollision/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kollision"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kollision"; } diff --git a/pkgs/kde/gear/kolourpaint/default.nix b/pkgs/kde/gear/kolourpaint/default.nix index 7cf5583345d2..752be8e2bd45 100644 --- a/pkgs/kde/gear/kolourpaint/default.nix +++ b/pkgs/kde/gear/kolourpaint/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kolourpaint"; meta.mainProgram = "kolourpaint"; diff --git a/pkgs/kde/gear/kompare/default.nix b/pkgs/kde/gear/kompare/default.nix index 32bcaf2401d9..223db6239307 100644 --- a/pkgs/kde/gear/kompare/default.nix +++ b/pkgs/kde/gear/kompare/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kompare"; meta.mainProgram = "kompare"; diff --git a/pkgs/kde/gear/kongress/default.nix b/pkgs/kde/gear/kongress/default.nix index e91c9cf59069..c82cb663f37e 100644 --- a/pkgs/kde/gear/kongress/default.nix +++ b/pkgs/kde/gear/kongress/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "kongress"; - extraBuildInputs = [kcontacts qtsvg qtlocation]; + extraBuildInputs = [ + kcontacts + qtsvg + qtlocation + ]; } diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix index 9ae274fc84c3..5bd29359e979 100644 --- a/pkgs/kde/gear/konqueror/default.nix +++ b/pkgs/kde/gear/konqueror/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "konqueror"; - extraNativeBuildInputs = [hunspell]; - extraBuildInputs = [qtwebengine]; + extraNativeBuildInputs = [ hunspell ]; + extraBuildInputs = [ qtwebengine ]; extraCmakeFlags = [ "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict" diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix index 538428d84c72..3b7cfbf59e54 100644 --- a/pkgs/kde/gear/konquest/default.nix +++ b/pkgs/kde/gear/konquest/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "konquest"; - extraBuildInputs = [qtscxml qtsvg]; + extraBuildInputs = [ + qtscxml + qtsvg + ]; meta.mainProgram = "konquest"; } diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix index 65a94bb19096..0e95e6a045a8 100644 --- a/pkgs/kde/gear/konsole/default.nix +++ b/pkgs/kde/gear/konsole/default.nix @@ -6,7 +6,10 @@ mkKdeDerivation { pname = "konsole"; - extraBuildInputs = [qt5compat qtmultimedia]; + extraBuildInputs = [ + qt5compat + qtmultimedia + ]; meta.mainProgram = "konsole"; } diff --git a/pkgs/kde/gear/kontactinterface/default.nix b/pkgs/kde/gear/kontactinterface/default.nix index 4c7d6acab1ca..1f81eda91e92 100644 --- a/pkgs/kde/gear/kontactinterface/default.nix +++ b/pkgs/kde/gear/kontactinterface/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kontactinterface"; } diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix index 1ad85ad64802..6d3ef5d3adb9 100644 --- a/pkgs/kde/gear/kontrast/default.nix +++ b/pkgs/kde/gear/kontrast/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kontrast"; - extraBuildInputs = [qtsvg qcoro]; + extraBuildInputs = [ + qtsvg + qcoro + ]; meta.mainProgram = "kontrast"; } diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix index ba58215e3093..b78bb62f62fc 100644 --- a/pkgs/kde/gear/konversation/default.nix +++ b/pkgs/kde/gear/konversation/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "konversation"; - extraBuildInputs = [qt5compat]; - extraNativeBuildInputs = [qtmultimedia qttools]; + extraBuildInputs = [ qt5compat ]; + extraNativeBuildInputs = [ + qtmultimedia + qttools + ]; meta.mainProgram = "konversation"; } diff --git a/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix index 7ba5214ac09f..7cb81e62ee78 100644 --- a/pkgs/kde/gear/kopeninghours/default.nix +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -9,7 +9,10 @@ mkKdeDerivation { pname = "kopeninghours"; - extraNativeBuildInputs = [bison flex]; + extraNativeBuildInputs = [ + bison + flex + ]; extraBuildInputs = [ qtdeclarative (boost.override { diff --git a/pkgs/kde/gear/korganizer/default.nix b/pkgs/kde/gear/korganizer/default.nix index c20e6625e1bd..17331248185f 100644 --- a/pkgs/kde/gear/korganizer/default.nix +++ b/pkgs/kde/gear/korganizer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "korganizer"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; meta.mainProgram = "korganizer"; } diff --git a/pkgs/kde/gear/kosmindoormap/default.nix b/pkgs/kde/gear/kosmindoormap/default.nix index 37f991a7adeb..26ad09427458 100644 --- a/pkgs/kde/gear/kosmindoormap/default.nix +++ b/pkgs/kde/gear/kosmindoormap/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kosmindoormap"; - extraNativeBuildInputs = [bison flex]; - extraBuildInputs = [recastnavigation]; + extraNativeBuildInputs = [ + bison + flex + ]; + extraBuildInputs = [ recastnavigation ]; } diff --git a/pkgs/kde/gear/kpat/default.nix b/pkgs/kde/gear/kpat/default.nix index e770f5935705..0462c8c4f9aa 100644 --- a/pkgs/kde/gear/kpat/default.nix +++ b/pkgs/kde/gear/kpat/default.nix @@ -10,13 +10,16 @@ mkKdeDerivation { pname = "kpat"; - extraNativeBuildInputs = [_7zz shared-mime-info]; + extraNativeBuildInputs = [ + _7zz + shared-mime-info + ]; extraBuildInputs = [ qtsvg black-hole-solver freecell-solver ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkdegames}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkdegames}/share" ]; meta.mainProgram = "kpat"; } diff --git a/pkgs/kde/gear/kpimtextedit/default.nix b/pkgs/kde/gear/kpimtextedit/default.nix index 0c33280cc059..f24c126f4669 100644 --- a/pkgs/kde/gear/kpimtextedit/default.nix +++ b/pkgs/kde/gear/kpimtextedit/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpimtextedit"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kpkpass/default.nix b/pkgs/kde/gear/kpkpass/default.nix index a2f116f67d77..662873300447 100644 --- a/pkgs/kde/gear/kpkpass/default.nix +++ b/pkgs/kde/gear/kpkpass/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpkpass"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/kpmcore/default.nix b/pkgs/kde/gear/kpmcore/default.nix index 9dfa4f3d6813..3da512e1701a 100644 --- a/pkgs/kde/gear/kpmcore/default.nix +++ b/pkgs/kde/gear/kpmcore/default.nix @@ -24,7 +24,8 @@ udftools, xfsprogs, zfs, -}: let +}: +let # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h runtimeDeps = [ cryptsetup @@ -54,21 +55,23 @@ # FIXME: audit to see if these are all still required ]; - trustedprefixes = writeText "kpmcore-trustedprefixes" (lib.concatStringsSep "\n" (map lib.getBin runtimeDeps)); + trustedprefixes = writeText "kpmcore-trustedprefixes" ( + lib.concatStringsSep "\n" (map lib.getBin runtimeDeps) + ); in - mkKdeDerivation { - pname = "kpmcore"; +mkKdeDerivation { + pname = "kpmcore"; - postPatch = '' - cp ${trustedprefixes} src/util/trustedprefixes - ''; + postPatch = '' + cp ${trustedprefixes} src/util/trustedprefixes + ''; - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + substituteInPlace src/backend/corebackend.cpp \ + --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy + ''; - extraNativeBuildInputs = [pkg-config]; - } + extraNativeBuildInputs = [ pkg-config ]; +} diff --git a/pkgs/kde/gear/kpublictransport/default.nix b/pkgs/kde/gear/kpublictransport/default.nix index bc1a663b7762..40f0587d3024 100644 --- a/pkgs/kde/gear/kpublictransport/default.nix +++ b/pkgs/kde/gear/kpublictransport/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kpublictransport"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/kqtquickcharts/default.nix b/pkgs/kde/gear/kqtquickcharts/default.nix index 682cd0531b7b..310b50170b15 100644 --- a/pkgs/kde/gear/kqtquickcharts/default.nix +++ b/pkgs/kde/gear/kqtquickcharts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kqtquickcharts"; # FIXME(qt5) diff --git a/pkgs/kde/gear/krdc/default.nix b/pkgs/kde/gear/krdc/default.nix index e589de328b82..f54d12364497 100644 --- a/pkgs/kde/gear/krdc/default.nix +++ b/pkgs/kde/gear/krdc/default.nix @@ -9,8 +9,13 @@ mkKdeDerivation { pname = "krdc"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libssh libvncserver freerdp]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libssh + libvncserver + freerdp + ]; meta.mainProgram = "krdc"; } diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix index a975f1b95684..04d9d4c05826 100644 --- a/pkgs/kde/gear/krecorder/default.nix +++ b/pkgs/kde/gear/krecorder/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "krecorder"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "krecorder"; } diff --git a/pkgs/kde/gear/kreversi/default.nix b/pkgs/kde/gear/kreversi/default.nix index 3f5591c299b6..4b15b9c1a8be 100644 --- a/pkgs/kde/gear/kreversi/default.nix +++ b/pkgs/kde/gear/kreversi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kreversi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kreversi"; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index 3ab41fcc4f51..808067fb0000 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -13,6 +13,11 @@ mkKdeDerivation { "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libvncserver + pipewire + xorg.libXdamage + ]; } diff --git a/pkgs/kde/gear/kross-interpreters/default.nix b/pkgs/kde/gear/kross-interpreters/default.nix index 4040fa401ef9..186c4bc67ccf 100644 --- a/pkgs/kde/gear/kross-interpreters/default.nix +++ b/pkgs/kde/gear/kross-interpreters/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kross-interpreters"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/kruler/default.nix b/pkgs/kde/gear/kruler/default.nix index 9eb9a917fc17..9a21899a18d2 100644 --- a/pkgs/kde/gear/kruler/default.nix +++ b/pkgs/kde/gear/kruler/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kruler"; meta.mainProgram = "kruler"; diff --git a/pkgs/kde/gear/ksanecore/default.nix b/pkgs/kde/gear/ksanecore/default.nix index 7f7e63fb2caf..36b7b1b45804 100644 --- a/pkgs/kde/gear/ksanecore/default.nix +++ b/pkgs/kde/gear/ksanecore/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksanecore"; - extraBuildInputs = [sane-backends]; + extraBuildInputs = [ sane-backends ]; } diff --git a/pkgs/kde/gear/kshisen/default.nix b/pkgs/kde/gear/kshisen/default.nix index 3859610e0f1d..7d41717f9ba6 100644 --- a/pkgs/kde/gear/kshisen/default.nix +++ b/pkgs/kde/gear/kshisen/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kshisen"; meta.mainProgram = "kshisen"; diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix index 5c4196a7aff0..2123d3d54abf 100644 --- a/pkgs/kde/gear/ksirk/default.nix +++ b/pkgs/kde/gear/ksirk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksirk"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; } diff --git a/pkgs/kde/gear/ksmtp/default.nix b/pkgs/kde/gear/ksmtp/default.nix index c098ddd49c81..290456b3273d 100644 --- a/pkgs/kde/gear/ksmtp/default.nix +++ b/pkgs/kde/gear/ksmtp/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksmtp"; - extraBuildInputs = [qt5compat cyrus_sasl]; + extraBuildInputs = [ + qt5compat + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/ksnakeduel/default.nix b/pkgs/kde/gear/ksnakeduel/default.nix index 3f07eaa0e48f..a5e656fa427b 100644 --- a/pkgs/kde/gear/ksnakeduel/default.nix +++ b/pkgs/kde/gear/ksnakeduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ksnakeduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "ksnakeduel"; } diff --git a/pkgs/kde/gear/kspaceduel/default.nix b/pkgs/kde/gear/kspaceduel/default.nix index 34194d2322cf..28e0f9f256a6 100644 --- a/pkgs/kde/gear/kspaceduel/default.nix +++ b/pkgs/kde/gear/kspaceduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kspaceduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kspaceduel"; } diff --git a/pkgs/kde/gear/ksquares/default.nix b/pkgs/kde/gear/ksquares/default.nix index 8dfbcf00244d..b13cd0c56f6f 100644 --- a/pkgs/kde/gear/ksquares/default.nix +++ b/pkgs/kde/gear/ksquares/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksquares"; meta.mainProgram = "ksquares"; diff --git a/pkgs/kde/gear/ksudoku/default.nix b/pkgs/kde/gear/ksudoku/default.nix index 15ac4e2ce4f8..4b6841bf1b1f 100644 --- a/pkgs/kde/gear/ksudoku/default.nix +++ b/pkgs/kde/gear/ksudoku/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "ksudoku"; - extraBuildInputs = [qtsvg]; - extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "ksudoku"; } diff --git a/pkgs/kde/gear/ksystemlog/default.nix b/pkgs/kde/gear/ksystemlog/default.nix index 772a4f54b077..6594c685e149 100644 --- a/pkgs/kde/gear/ksystemlog/default.nix +++ b/pkgs/kde/gear/ksystemlog/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "ksystemlog"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qt5compat audit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qt5compat + audit + ]; meta.mainProgram = "ksystemlog"; } diff --git a/pkgs/kde/gear/kteatime/default.nix b/pkgs/kde/gear/kteatime/default.nix index 408bc14883cf..ac7056109d72 100644 --- a/pkgs/kde/gear/kteatime/default.nix +++ b/pkgs/kde/gear/kteatime/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kteatime"; meta.mainProgram = "kteatime"; diff --git a/pkgs/kde/gear/ktimer/default.nix b/pkgs/kde/gear/ktimer/default.nix index 1b46f8b72c72..714643cc40d0 100644 --- a/pkgs/kde/gear/ktimer/default.nix +++ b/pkgs/kde/gear/ktimer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktimer"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "ktimer"; } diff --git a/pkgs/kde/gear/ktnef/default.nix b/pkgs/kde/gear/ktnef/default.nix index 7fcd568ade72..81bd5c70b616 100644 --- a/pkgs/kde/gear/ktnef/default.nix +++ b/pkgs/kde/gear/ktnef/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktnef"; } diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix index 92e0646e696a..ae1d8aedfdf3 100644 --- a/pkgs/kde/gear/ktorrent/default.nix +++ b/pkgs/kde/gear/ktorrent/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktorrent"; - extraBuildInputs = [qtwebengine taglib libmaxminddb]; + extraBuildInputs = [ + qtwebengine + taglib + libmaxminddb + ]; } diff --git a/pkgs/kde/gear/ktouch/default.nix b/pkgs/kde/gear/ktouch/default.nix index 7f744a9f79d5..6955dc3f0402 100644 --- a/pkgs/kde/gear/ktouch/default.nix +++ b/pkgs/kde/gear/ktouch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktouch"; # FIXME(qt5) diff --git a/pkgs/kde/gear/ktrip/default.nix b/pkgs/kde/gear/ktrip/default.nix index 0f8b001c7d6b..feb8f5c54a74 100644 --- a/pkgs/kde/gear/ktrip/default.nix +++ b/pkgs/kde/gear/ktrip/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktrip"; meta.mainProgram = "ktrip"; diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix index 100301670bf3..278f7f823d3d 100644 --- a/pkgs/kde/gear/ktuberling/default.nix +++ b/pkgs/kde/gear/ktuberling/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktuberling"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "ktuberling"; } diff --git a/pkgs/kde/gear/kturtle/default.nix b/pkgs/kde/gear/kturtle/default.nix index 8997c051b189..aa628c11219a 100644 --- a/pkgs/kde/gear/kturtle/default.nix +++ b/pkgs/kde/gear/kturtle/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kturtle"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kturtle"; } diff --git a/pkgs/kde/gear/kubrick/default.nix b/pkgs/kde/gear/kubrick/default.nix index a194ebae5b68..27648efe830f 100644 --- a/pkgs/kde/gear/kubrick/default.nix +++ b/pkgs/kde/gear/kubrick/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kubrick"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg libGLU]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + libGLU + ]; meta.mainProgram = "kubrick"; } diff --git a/pkgs/kde/gear/kwalletmanager/default.nix b/pkgs/kde/gear/kwalletmanager/default.nix index 4ce00339a259..466d42129ef3 100644 --- a/pkgs/kde/gear/kwalletmanager/default.nix +++ b/pkgs/kde/gear/kwalletmanager/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwalletmanager"; meta.mainProgram = "kwalletmanager5"; diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix index 1c0f82ac7b3d..0c0fa7aca5ac 100644 --- a/pkgs/kde/gear/kwave/default.nix +++ b/pkgs/kde/gear/kwave/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwave"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix index 53e122c98fe6..20d4c8a1e670 100644 --- a/pkgs/kde/gear/kweather/default.nix +++ b/pkgs/kde/gear/kweather/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "kweather"; - extraBuildInputs = [qtsvg qtcharts kholidays]; + extraBuildInputs = [ + qtsvg + qtcharts + kholidays + ]; meta.mainProgram = "kweather"; } diff --git a/pkgs/kde/gear/libgravatar/default.nix b/pkgs/kde/gear/libgravatar/default.nix index ddbdfa6dc6c8..fe2fddb9f018 100644 --- a/pkgs/kde/gear/libgravatar/default.nix +++ b/pkgs/kde/gear/libgravatar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libgravatar"; } diff --git a/pkgs/kde/gear/libkcddb/default.nix b/pkgs/kde/gear/libkcddb/default.nix index 8325f19cedff..fea14f50c6e3 100644 --- a/pkgs/kde/gear/libkcddb/default.nix +++ b/pkgs/kde/gear/libkcddb/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcddb"; - extraBuildInputs = [libmusicbrainz5]; + extraBuildInputs = [ libmusicbrainz5 ]; } diff --git a/pkgs/kde/gear/libkcompactdisc/default.nix b/pkgs/kde/gear/libkcompactdisc/default.nix index 66615d3791d6..bbe58fc00a41 100644 --- a/pkgs/kde/gear/libkcompactdisc/default.nix +++ b/pkgs/kde/gear/libkcompactdisc/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcompactdisc"; - extraBuildInputs = [alsa-lib]; + extraBuildInputs = [ alsa-lib ]; } diff --git a/pkgs/kde/gear/libkdcraw/default.nix b/pkgs/kde/gear/libkdcraw/default.nix index df6717b22ded..883d86f3b12f 100644 --- a/pkgs/kde/gear/libkdcraw/default.nix +++ b/pkgs/kde/gear/libkdcraw/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "libkdcraw"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libraw]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libraw ]; } diff --git a/pkgs/kde/gear/libkdegames/default.nix b/pkgs/kde/gear/libkdegames/default.nix index 95a0265f0836..81325c12837a 100644 --- a/pkgs/kde/gear/libkdegames/default.nix +++ b/pkgs/kde/gear/libkdegames/default.nix @@ -10,6 +10,14 @@ mkKdeDerivation { pname = "libkdegames"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [openal libsndfile qtdeclarative qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ + openal + libsndfile + qtdeclarative + qtsvg + ]; } diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix index d682c45225eb..fc9d3f3d637c 100644 --- a/pkgs/kde/gear/libkdepim/default.nix +++ b/pkgs/kde/gear/libkdepim/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkdepim"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/libkeduvocdocument/default.nix b/pkgs/kde/gear/libkeduvocdocument/default.nix index f67c4e0ba497..3a68dabf464b 100644 --- a/pkgs/kde/gear/libkeduvocdocument/default.nix +++ b/pkgs/kde/gear/libkeduvocdocument/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libkeduvocdocument"; } diff --git a/pkgs/kde/gear/libkexiv2/default.nix b/pkgs/kde/gear/libkexiv2/default.nix index fa5cb7851ea2..c6d1d034e5da 100644 --- a/pkgs/kde/gear/libkexiv2/default.nix +++ b/pkgs/kde/gear/libkexiv2/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkexiv2"; - extraBuildInputs = [qt5compat exiv2]; - extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qt5compat + exiv2 + ]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/kde/gear/libkgapi/default.nix b/pkgs/kde/gear/libkgapi/default.nix index 87d3beb23c50..43322955a26a 100644 --- a/pkgs/kde/gear/libkgapi/default.nix +++ b/pkgs/kde/gear/libkgapi/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libkgapi"; - extraBuildInputs = [qttools cyrus_sasl]; + extraBuildInputs = [ + qttools + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/libkleo/default.nix b/pkgs/kde/gear/libkleo/default.nix index 47cd88fee577..e6a01bfdc7d8 100644 --- a/pkgs/kde/gear/libkleo/default.nix +++ b/pkgs/kde/gear/libkleo/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkleo"; - extraBuildInputs = [qt5compat boost]; - extraPropagatedBuildInputs = [qgpgme]; + extraBuildInputs = [ + qt5compat + boost + ]; + extraPropagatedBuildInputs = [ qgpgme ]; } diff --git a/pkgs/kde/gear/libkmahjongg/default.nix b/pkgs/kde/gear/libkmahjongg/default.nix index f411605318a2..5a736622beed 100644 --- a/pkgs/kde/gear/libkmahjongg/default.nix +++ b/pkgs/kde/gear/libkmahjongg/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkmahjongg"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/libkomparediff2/default.nix b/pkgs/kde/gear/libkomparediff2/default.nix index 43cccc19603f..c7b15720d837 100644 --- a/pkgs/kde/gear/libkomparediff2/default.nix +++ b/pkgs/kde/gear/libkomparediff2/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkomparediff2"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/libksane/default.nix b/pkgs/kde/gear/libksane/default.nix index 319d47b8b2d9..a5a67b012356 100644 --- a/pkgs/kde/gear/libksane/default.nix +++ b/pkgs/kde/gear/libksane/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libksane"; } diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix index cec2f027b73d..e36d8995687e 100644 --- a/pkgs/kde/gear/libksieve/default.nix +++ b/pkgs/kde/gear/libksieve/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libksieve"; - extraBuildInputs = [qtwebengine cyrus_sasl]; + extraBuildInputs = [ + qtwebengine + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/libktorrent/default.nix b/pkgs/kde/gear/libktorrent/default.nix index 263cbb3cadb3..c802f01111f9 100644 --- a/pkgs/kde/gear/libktorrent/default.nix +++ b/pkgs/kde/gear/libktorrent/default.nix @@ -9,7 +9,11 @@ mkKdeDerivation { pname = "libktorrent"; - extraNativeBuildInputs = [doxygen]; - extraBuildInputs = [qt5compat]; - extraPropagatedBuildInputs = [boost gmp libgcrypt]; + extraNativeBuildInputs = [ doxygen ]; + extraBuildInputs = [ qt5compat ]; + extraPropagatedBuildInputs = [ + boost + gmp + libgcrypt + ]; } diff --git a/pkgs/kde/gear/lokalize/default.nix b/pkgs/kde/gear/lokalize/default.nix index b92c8e9fb5e8..28fd32734933 100644 --- a/pkgs/kde/gear/lokalize/default.nix +++ b/pkgs/kde/gear/lokalize/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "lokalize"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [hunspell]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ hunspell ]; } diff --git a/pkgs/kde/gear/lskat/default.nix b/pkgs/kde/gear/lskat/default.nix index eefb95f9e1b4..84b7c2715d8e 100644 --- a/pkgs/kde/gear/lskat/default.nix +++ b/pkgs/kde/gear/lskat/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "lskat"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "lskat"; } diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix index a82e6adb266c..51a702ac9d9b 100644 --- a/pkgs/kde/gear/mailcommon/default.nix +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "mailcommon"; - extraNativeBuildInputs = [libxslt]; - extraBuildInputs = [qtwebengine qttools]; + extraNativeBuildInputs = [ libxslt ]; + extraBuildInputs = [ + qtwebengine + qttools + ]; } diff --git a/pkgs/kde/gear/mailimporter/default.nix b/pkgs/kde/gear/mailimporter/default.nix index d43e0a2288f9..f9b3c490b9a1 100644 --- a/pkgs/kde/gear/mailimporter/default.nix +++ b/pkgs/kde/gear/mailimporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mailimporter"; } diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix index 1f6e574ed312..d2ecc7ae5093 100644 --- a/pkgs/kde/gear/marble/default.nix +++ b/pkgs/kde/gear/marble/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "marble"; # FIXME(qt5) diff --git a/pkgs/kde/gear/markdownpart/default.nix b/pkgs/kde/gear/markdownpart/default.nix index e40b6d03f883..962be3a91b5f 100644 --- a/pkgs/kde/gear/markdownpart/default.nix +++ b/pkgs/kde/gear/markdownpart/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "markdownpart"; } diff --git a/pkgs/kde/gear/massif-visualizer/default.nix b/pkgs/kde/gear/massif-visualizer/default.nix index 27eb0515ee64..04b958217e74 100644 --- a/pkgs/kde/gear/massif-visualizer/default.nix +++ b/pkgs/kde/gear/massif-visualizer/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "massif-visualizer"; - extraBuildInputs = [ qt5compat qtsvg ]; + extraBuildInputs = [ + qt5compat + qtsvg + ]; extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/mbox-importer/default.nix b/pkgs/kde/gear/mbox-importer/default.nix index 44092f401a43..3e28187b3d20 100644 --- a/pkgs/kde/gear/mbox-importer/default.nix +++ b/pkgs/kde/gear/mbox-importer/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mbox-importer"; meta.mainProgram = "mboximporter"; diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix index 7ad2c3637f70..ec149aea4bf7 100644 --- a/pkgs/kde/gear/merkuro/default.nix +++ b/pkgs/kde/gear/merkuro/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "merkuro"; - extraBuildInputs = [qtsvg libplasma]; + extraBuildInputs = [ + qtsvg + libplasma + ]; } diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix index 47058be34826..db8f4e04f045 100644 --- a/pkgs/kde/gear/messagelib/default.nix +++ b/pkgs/kde/gear/messagelib/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "messagelib"; - extraPropagatedBuildInputs = [qtwebengine]; + extraPropagatedBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/mimetreeparser/default.nix b/pkgs/kde/gear/mimetreeparser/default.nix index 3bebd8aee726..67c271ad2612 100644 --- a/pkgs/kde/gear/mimetreeparser/default.nix +++ b/pkgs/kde/gear/mimetreeparser/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "mimetreeparser"; - extraBuildInputs = [qt5compat qtdeclarative qgpgme]; + extraBuildInputs = [ + qt5compat + qtdeclarative + qgpgme + ]; } diff --git a/pkgs/kde/gear/minuet/default.nix b/pkgs/kde/gear/minuet/default.nix index 05e80a590128..347d2cd7e9ee 100644 --- a/pkgs/kde/gear/minuet/default.nix +++ b/pkgs/kde/gear/minuet/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "minuet"; - extraBuildInputs = [qtdeclarative qtsvg fluidsynth]; + extraBuildInputs = [ + qtdeclarative + qtsvg + fluidsynth + ]; meta.mainProgram = "minuet"; } diff --git a/pkgs/kde/gear/neochat/default.nix b/pkgs/kde/gear/neochat/default.nix index a45aa2c328fc..56c96f2245ff 100644 --- a/pkgs/kde/gear/neochat/default.nix +++ b/pkgs/kde/gear/neochat/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "neochat"; - extraBuildInputs = [qtlocation qtwebview kunifiedpush]; + extraBuildInputs = [ + qtlocation + qtwebview + kunifiedpush + ]; meta.mainProgram = "neochat"; } diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix index e500709a28b8..b6048d9611d4 100644 --- a/pkgs/kde/gear/okular/default.nix +++ b/pkgs/kde/gear/okular/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "okular"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtspeech qtsvg diff --git a/pkgs/kde/gear/palapeli/default.nix b/pkgs/kde/gear/palapeli/default.nix index 144ef589e51c..f6a96aed4f55 100644 --- a/pkgs/kde/gear/palapeli/default.nix +++ b/pkgs/kde/gear/palapeli/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "palapeli"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "palapeli"; } diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix index 35342dd958cb..e2a275c4c02c 100644 --- a/pkgs/kde/gear/parley/default.nix +++ b/pkgs/kde/gear/parley/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "parley"; - extraBuildInputs = [qtsvg qtmultimedia qtwebengine]; + extraBuildInputs = [ + qtsvg + qtmultimedia + qtwebengine + ]; meta.mainProgram = "parley"; } diff --git a/pkgs/kde/gear/partitionmanager/default.nix b/pkgs/kde/gear/partitionmanager/default.nix index 68cb09a01a5a..9f36e91df58c 100644 --- a/pkgs/kde/gear/partitionmanager/default.nix +++ b/pkgs/kde/gear/partitionmanager/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "partitionmanager"; - propagatedUserEnvPkgs = [kpmcore]; + propagatedUserEnvPkgs = [ kpmcore ]; passthru = { inherit kpmcore; diff --git a/pkgs/kde/gear/picmi/default.nix b/pkgs/kde/gear/picmi/default.nix index 341cd3922aff..aa7bf73fe97a 100644 --- a/pkgs/kde/gear/picmi/default.nix +++ b/pkgs/kde/gear/picmi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "picmi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "picmi"; } diff --git a/pkgs/kde/gear/pim-data-exporter/default.nix b/pkgs/kde/gear/pim-data-exporter/default.nix index da2097f46763..162a2524f828 100644 --- a/pkgs/kde/gear/pim-data-exporter/default.nix +++ b/pkgs/kde/gear/pim-data-exporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-data-exporter"; } diff --git a/pkgs/kde/gear/pim-sieve-editor/default.nix b/pkgs/kde/gear/pim-sieve-editor/default.nix index 5cc193d0d7ee..323ec35e768b 100644 --- a/pkgs/kde/gear/pim-sieve-editor/default.nix +++ b/pkgs/kde/gear/pim-sieve-editor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-sieve-editor"; meta.mainProgram = "sieveeditor"; diff --git a/pkgs/kde/gear/pimcommon/default.nix b/pkgs/kde/gear/pimcommon/default.nix index 9ef947dde6fe..853c6e0afba6 100644 --- a/pkgs/kde/gear/pimcommon/default.nix +++ b/pkgs/kde/gear/pimcommon/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "pimcommon"; - extraBuildInputs = [qttools]; - extraNativeBuildInputs = [libxslt]; + extraBuildInputs = [ qttools ]; + extraNativeBuildInputs = [ libxslt ]; } diff --git a/pkgs/kde/gear/plasmatube/default.nix b/pkgs/kde/gear/plasmatube/default.nix index 63236fe00d76..46b32c579040 100644 --- a/pkgs/kde/gear/plasmatube/default.nix +++ b/pkgs/kde/gear/plasmatube/default.nix @@ -10,9 +10,18 @@ mkKdeDerivation { pname = "plasmatube"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + qtsvg + mpv-unwrapped + ]; - qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ yt-dlp ]) + ]; meta.mainProgram = "plasmatube"; } diff --git a/pkgs/kde/gear/poxml/default.nix b/pkgs/kde/gear/poxml/default.nix index 963f0502964a..508d311dbc4a 100644 --- a/pkgs/kde/gear/poxml/default.nix +++ b/pkgs/kde/gear/poxml/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "poxml"; } diff --git a/pkgs/kde/gear/qmlkonsole/default.nix b/pkgs/kde/gear/qmlkonsole/default.nix index 9be6552020f6..470752ffd795 100644 --- a/pkgs/kde/gear/qmlkonsole/default.nix +++ b/pkgs/kde/gear/qmlkonsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "qmlkonsole"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "qmlkonsole"; } diff --git a/pkgs/kde/gear/rocs/default.nix b/pkgs/kde/gear/rocs/default.nix index 73e7143f8df0..0e368461a770 100644 --- a/pkgs/kde/gear/rocs/default.nix +++ b/pkgs/kde/gear/rocs/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "rocs"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/signon-kwallet-extension/default.nix b/pkgs/kde/gear/signon-kwallet-extension/default.nix index 15900552d50f..ec954b987328 100644 --- a/pkgs/kde/gear/signon-kwallet-extension/default.nix +++ b/pkgs/kde/gear/signon-kwallet-extension/default.nix @@ -6,11 +6,11 @@ mkKdeDerivation { pname = "signon-kwallet-extension"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [signond]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ signond ]; # NB: not actually broken, just makes it install to $out instead of $signon/lib/extensions # This is useless without a wrapped signond. # FIXME: wrap signond with SSO_EXTENSIONS_DIR=$wrapper/lib/extensions - extraCmakeFlags = ["-DINSTALL_BROKEN_SIGNON_EXTENSION=1"]; + extraCmakeFlags = [ "-DINSTALL_BROKEN_SIGNON_EXTENSION=1" ]; } diff --git a/pkgs/kde/gear/skanlite/default.nix b/pkgs/kde/gear/skanlite/default.nix index 4a9c26e41588..20fff8d8c1df 100644 --- a/pkgs/kde/gear/skanlite/default.nix +++ b/pkgs/kde/gear/skanlite/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "skanlite"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "skanlite"; } diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix index c855041220c9..4c9e10422098 100644 --- a/pkgs/kde/gear/skanpage/default.nix +++ b/pkgs/kde/gear/skanpage/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, qtwebengine, - tesseractLanguages ? [], + tesseractLanguages ? [ ], tesseract5, leptonica, }: @@ -10,7 +10,7 @@ mkKdeDerivation { extraBuildInputs = [ qtwebengine - (tesseract5.override {enableLanguages = tesseractLanguages;}) + (tesseract5.override { enableLanguages = tesseractLanguages; }) leptonica ]; meta.mainProgram = "skanpage"; diff --git a/pkgs/kde/gear/skladnik/default.nix b/pkgs/kde/gear/skladnik/default.nix index ae4dd03f3e3c..6c574514dbb7 100644 --- a/pkgs/kde/gear/skladnik/default.nix +++ b/pkgs/kde/gear/skladnik/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "skladnik"; } diff --git a/pkgs/kde/gear/spectacle/default.nix b/pkgs/kde/gear/spectacle/default.nix index dba026d22f24..c5c71a1beaa2 100644 --- a/pkgs/kde/gear/spectacle/default.nix +++ b/pkgs/kde/gear/spectacle/default.nix @@ -11,9 +11,12 @@ mkKdeDerivation { qtwayland qtmultimedia (opencv.override { - enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport - enabledModules = [ "core" "imgproc" ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 - runAccuracyTests = false; # tests will fail because of missing plugins but that's okay + enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport + enabledModules = [ + "core" + "imgproc" + ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 + runAccuracyTests = false; # tests will fail because of missing plugins but that's okay }) ]; meta.mainProgram = "spectacle"; diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix index f921df199128..983755d21139 100644 --- a/pkgs/kde/gear/step/default.nix +++ b/pkgs/kde/gear/step/default.nix @@ -11,7 +11,16 @@ mkKdeDerivation { pname = "step"; - extraNativeBuildInputs = [qttools qtsvg pkg-config shared-mime-info]; - extraBuildInputs = [eigen gsl libqalculate]; + extraNativeBuildInputs = [ + qttools + qtsvg + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + eigen + gsl + libqalculate + ]; meta.mainProgram = "step"; } diff --git a/pkgs/kde/gear/svgpart/default.nix b/pkgs/kde/gear/svgpart/default.nix index 44f25d0312b1..b79a9053a065 100644 --- a/pkgs/kde/gear/svgpart/default.nix +++ b/pkgs/kde/gear/svgpart/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "svgpart"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/sweeper/default.nix b/pkgs/kde/gear/sweeper/default.nix index 24e75b7c5301..99aad7379dd8 100644 --- a/pkgs/kde/gear/sweeper/default.nix +++ b/pkgs/kde/gear/sweeper/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sweeper"; diff --git a/pkgs/kde/gear/telly-skout/default.nix b/pkgs/kde/gear/telly-skout/default.nix index 9bcae06c9049..d179f8d5be86 100644 --- a/pkgs/kde/gear/telly-skout/default.nix +++ b/pkgs/kde/gear/telly-skout/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "telly-skout"; meta.mainProgram = "telly-skout"; diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index fd47144eda1d..47411b5e37c2 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -11,7 +11,14 @@ mkKdeDerivation { pname = "tokodon"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtsvg + qtwebsockets + qtwebview + mpv-unwrapped + sonnet + ]; meta.mainProgram = "tokodon"; } diff --git a/pkgs/kde/gear/umbrello/default.nix b/pkgs/kde/gear/umbrello/default.nix index 6aca83a9e825..836ae577c7f4 100644 --- a/pkgs/kde/gear/umbrello/default.nix +++ b/pkgs/kde/gear/umbrello/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "umbrello"; # FIXME(qt5) diff --git a/pkgs/kde/gear/yakuake/default.nix b/pkgs/kde/gear/yakuake/default.nix index a5955e5c2e18..fb7fc1ecf007 100644 --- a/pkgs/kde/gear/yakuake/default.nix +++ b/pkgs/kde/gear/yakuake/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "yakuake"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "yakuake"; } diff --git a/pkgs/kde/gear/zanshin/default.nix b/pkgs/kde/gear/zanshin/default.nix index 357b6963ff09..2b814696444d 100644 --- a/pkgs/kde/gear/zanshin/default.nix +++ b/pkgs/kde/gear/zanshin/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "zanshin"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; } diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index b32e79295f6d..37921f442173 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -1,21 +1,22 @@ -self: { +self: +{ lib, stdenv, makeSetupHook, fetchurl, cmake, qt6, -}: let +}: +let dependencies = (lib.importJSON ../generated/dependencies.json).dependencies; projectInfo = lib.importJSON ../generated/projects.json; licenseInfo = lib.importJSON ../generated/licenses.json; licensesBySpdxId = (lib.mapAttrs' (_: v: { - name = v.spdxId or "unknown"; - value = v; - }) - lib.licenses) + name = v.spdxId or "unknown"; + value = v; + }) lib.licenses) // { # https://community.kde.org/Policies/Licensing_Policy "LicenseRef-KDE-Accepted-GPL" = lib.licenses.gpl3Plus; @@ -71,78 +72,89 @@ self: { None = null; }; - moveDevHook = makeSetupHook {name = "kf6-move-dev-hook";} ./move-dev-hook.sh; + moveDevHook = makeSetupHook { name = "kf6-move-dev-hook"; } ./move-dev-hook.sh; in - { - pname, - version ? self.sources.${pname}.version, - src ? self.sources.${pname}, - extraBuildInputs ? [], - extraNativeBuildInputs ? [], - extraPropagatedBuildInputs ? [], - extraCmakeFlags ? [], - excludeDependencies ? [], - ... - } @ args: let - depNames = dependencies.${pname} or []; - filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; +{ + pname, + version ? self.sources.${pname}.version, + src ? self.sources.${pname}, + extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], + extraPropagatedBuildInputs ? [ ], + extraCmakeFlags ? [ ], + excludeDependencies ? [ ], + ... +}@args: +let + depNames = dependencies.${pname} or [ ]; + filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; - # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, - # but cross is currently very broken anyway, so we can figure this out later. - deps = map (dep: self.${dep}) filteredDepNames; + # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, + # but cross is currently very broken anyway, so we can figure this out later. + deps = map (dep: self.${dep}) filteredDepNames; - traceDuplicateDeps = attrName: attrValue: - let - pretty = lib.generators.toPretty {}; - duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; - in - if duplicates != [] - then lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" - else lib.id; + traceDuplicateDeps = + attrName: attrValue: + let + pretty = lib.generators.toPretty { }; + duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; + in + if duplicates != [ ] then + lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" + else + lib.id; - traceAllDuplicateDeps = lib.flip lib.pipe [ - (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) - (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + traceAllDuplicateDeps = lib.flip lib.pipe [ + (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) + (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + ]; + + defaultArgs = { + inherit version src; + + outputs = [ + "out" + "dev" + "devtools" ]; - defaultArgs = { - inherit version src; + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + moveDevHook + ] ++ extraNativeBuildInputs; + buildInputs = [ qt6.qtbase ] ++ extraBuildInputs; - outputs = ["out" "dev" "devtools"]; + # FIXME: figure out what to propagate here + propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; + strictDeps = true; - nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; - buildInputs = [qt6.qtbase] ++ extraBuildInputs; + dontFixCmake = true; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ] ++ extraCmakeFlags; - # FIXME: figure out what to propagate here - propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; - strictDeps = true; + separateDebugInfo = true; - dontFixCmake = true; - cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; + env.LANG = "C.UTF-8"; + }; - separateDebugInfo = true; + cleanArgs = builtins.removeAttrs args [ + "extraBuildInputs" + "extraNativeBuildInputs" + "extraPropagatedBuildInputs" + "extraCmakeFlags" + "excludeDependencies" + "meta" + ]; - env.LANG = "C.UTF-8"; - }; + meta = { + description = projectInfo.${pname}.description; + homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; + license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); + maintainers = lib.teams.qt-kde.members; + # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. + platforms = lib.platforms.linux ++ lib.platforms.freebsd; + } // (args.meta or { }); - cleanArgs = builtins.removeAttrs args [ - "extraBuildInputs" - "extraNativeBuildInputs" - "extraPropagatedBuildInputs" - "extraCmakeFlags" - "excludeDependencies" - "meta" - ]; - - meta = { - description = projectInfo.${pname}.description; - homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; - license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); - maintainers = lib.teams.qt-kde.members; - # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - } // (args.meta or { }); - - pos = builtins.unsafeGetAttrPos "pname" args; - in - traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) + pos = builtins.unsafeGetAttrPos "pname" args; +in +traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) diff --git a/pkgs/kde/misc/kdevelop-pg-qt/default.nix b/pkgs/kde/misc/kdevelop-pg-qt/default.nix index cca569099b8f..534733516757 100644 --- a/pkgs/kde/misc/kdevelop-pg-qt/default.nix +++ b/pkgs/kde/misc/kdevelop-pg-qt/default.nix @@ -10,14 +10,17 @@ mkKdeDerivation rec { version = "2.3.0"; # Breaks with split -dev - outputs = ["out"]; + outputs = [ "out" ]; src = fetchurl { url = "mirror://kde/stable/kdevelop-pg-qt/${version}/src/kdevelop-pg-qt-${version}.tar.xz"; hash = "sha256-PT7zyzlelnDmDDmepthlzHluAOUsNV7tlD++yn2nEg0="; }; - extraNativeBuildInputs = [ bison flex ]; + extraNativeBuildInputs = [ + bison + flex + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index f5d6d9d8bc58..48355004b761 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -14,7 +14,10 @@ mkKdeDerivation rec { hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0="; }; - extraNativeBuildInputs = [qttools qtsvg]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; - meta.license = [lib.licenses.gpl2Only]; + meta.license = [ lib.licenses.gpl2Only ]; } diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix index f4c2637a9600..aead489e80d4 100644 --- a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix +++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix @@ -13,7 +13,7 @@ mkKdeDerivation rec { hash = "sha256-LNJHwBPnX0EGWbrDcq/5PSLXHFpUwFnhN7lESvizQno="; }; - extraNativeBuildInputs = [doxygen]; + extraNativeBuildInputs = [ doxygen ]; - meta.license = [lib.licenses.gpl3Plus]; + meta.license = [ lib.licenses.gpl3Plus ]; } diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix index b5461fd02de0..cf28083b0813 100644 --- a/pkgs/kde/misc/kio-fuse/default.nix +++ b/pkgs/kde/misc/kio-fuse/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-fRBFgSJ9Whm0JLM/QWjRgVVrEBXW3yIY4BqI1kRJ6Us="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [fuse3]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ fuse3 ]; - meta.license = with lib.licenses; [gpl3Plus]; + meta.license = with lib.licenses; [ gpl3Plus ]; } diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 5930357a7ee8..d23cc7175baf 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-VuPOtSBVtWAzIOoIsn02c9MqORqNWGRtmYIn2LUfCpM="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; meta.license = with lib.licenses; [ bsd2 diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix index ae37770e9927..4ca047e52f40 100644 --- a/pkgs/kde/misc/ktextaddons/default.nix +++ b/pkgs/kde/misc/ktextaddons/default.nix @@ -15,7 +15,11 @@ mkKdeDerivation rec { hash = "sha256-ZLgGAuhLJekWRiCvP2NB+oZbhegmq49eAgYa4koneyA="; }; - extraBuildInputs = [qtspeech qttools kxmlgui]; + extraBuildInputs = [ + qtspeech + qttools + kxmlgui + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/pkgs/kde/misc/kunifiedpush/default.nix b/pkgs/kde/misc/kunifiedpush/default.nix index 9e7cb57ba3ad..5e9ac62a9732 100644 --- a/pkgs/kde/misc/kunifiedpush/default.nix +++ b/pkgs/kde/misc/kunifiedpush/default.nix @@ -18,8 +18,17 @@ mkKdeDerivation { hash = "sha256-bhlsEP7cLuA6Rj6nrpp5iC3uolc02twNMLsWl+d/BXo="; }; - extraBuildInputs = [qtwebsockets kdeclarative kpackage]; + extraBuildInputs = [ + qtwebsockets + kdeclarative + kpackage + ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc0 lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc0 + lgpl2Plus + ]; meta.mainProgram = "kunifiedpush-distributor"; } diff --git a/pkgs/kde/misc/kup/default.nix b/pkgs/kde/misc/kup/default.nix index 420b6bc72c5d..60ae6db479e9 100644 --- a/pkgs/kde/misc/kup/default.nix +++ b/pkgs/kde/misc/kup/default.nix @@ -1,7 +1,8 @@ -{ lib -, mkKdeDerivation -, fetchFromGitLab -, libgit2 +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + libgit2, }: mkKdeDerivation rec { pname = "kup"; diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index 84d78e26bc00..c7bd84f17401 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -17,8 +17,17 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [mpv-unwrapped]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ mpv-unwrapped ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc-by-sa-40 + cc0 + lgpl21Only + lgpl3Only + lgpl3Plus + mit + ]; } diff --git a/pkgs/kde/misc/oxygen-icons/default.nix b/pkgs/kde/misc/oxygen-icons/default.nix index 91144f0c0bcf..b556bd989e2c 100644 --- a/pkgs/kde/misc/oxygen-icons/default.nix +++ b/pkgs/kde/misc/oxygen-icons/default.nix @@ -14,5 +14,5 @@ mkKdeDerivation rec { dontStrip = true; - meta.license = [lib.licenses.lgpl3Plus]; + meta.license = [ lib.licenses.lgpl3Plus ]; } diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix index bd828172bf8d..88f278d92986 100644 --- a/pkgs/kde/misc/phonon-vlc/default.nix +++ b/pkgs/kde/misc/phonon-vlc/default.nix @@ -14,10 +14,13 @@ mkKdeDerivation rec { hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU="; }; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [libvlc]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ libvlc ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus]; + meta.license = with lib.licenses; [ lgpl21Plus ]; } diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix index ed0aad052746..76e57f30b3a5 100644 --- a/pkgs/kde/misc/phonon/default.nix +++ b/pkgs/kde/misc/phonon/default.nix @@ -30,8 +30,14 @@ mkKdeDerivation rec { qttools ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus gpl2Plus]; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl2Plus + ]; meta.mainProgram = "phononsettings"; } diff --git a/pkgs/kde/misc/polkit-qt-1/default.nix b/pkgs/kde/misc/polkit-qt-1/default.nix index 432cc5da8059..78ce60455d09 100644 --- a/pkgs/kde/misc/polkit-qt-1/default.nix +++ b/pkgs/kde/misc/polkit-qt-1/default.nix @@ -15,10 +15,17 @@ mkKdeDerivation rec { sha256 = "sha256-XTthHAYtK3apN1C7EMkHv9IdH/CNChXcLPY+J44Wd/s="; }; - patches = [./full-paths.patch]; + patches = [ ./full-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [glib polkit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + glib + polkit + ]; - meta.license = with lib.licenses; [bsd3 gpl2Plus lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd3 + gpl2Plus + lgpl2Plus + ]; } diff --git a/pkgs/kde/misc/pulseaudio-qt/default.nix b/pkgs/kde/misc/pulseaudio-qt/default.nix index d5a69da692ac..108824c87ff6 100644 --- a/pkgs/kde/misc/pulseaudio-qt/default.nix +++ b/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -14,8 +14,11 @@ mkKdeDerivation rec { hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ pulseaudio ]; - meta.license = with lib.licenses; [lgpl21Only lgpl3Only]; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl3Only + ]; } diff --git a/pkgs/kde/plasma/bluedevil/default.nix b/pkgs/kde/plasma/bluedevil/default.nix index 993d121d1f37..3a6695833654 100644 --- a/pkgs/kde/plasma/bluedevil/default.nix +++ b/pkgs/kde/plasma/bluedevil/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluedevil"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/plasma/breeze-grub/default.nix b/pkgs/kde/plasma/breeze-grub/default.nix index 5dd3d199e44a..033e2a34800f 100644 --- a/pkgs/kde/plasma/breeze-grub/default.nix +++ b/pkgs/kde/plasma/breeze-grub/default.nix @@ -1,12 +1,12 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "breeze-grub"; # doesn't actually use cmake or anything - nativeBuildInputs = []; - buildInputs = []; + nativeBuildInputs = [ ]; + buildInputs = [ ]; - outputs = ["out"]; + outputs = [ "out" ]; installPhase = '' runHook preInstall diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d48..88c424d0fd27 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -8,7 +8,11 @@ mkKdeDerivation { pname = "breeze-gtk"; # FIXME(later): upstream - patches = [./0001-fix-add-executable-bit.patch]; + patches = [ ./0001-fix-add-executable-bit.patch ]; - extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; + extraNativeBuildInputs = [ + sass + python3 + python3Packages.pycairo + ]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e3a..97abe3948ac9 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -12,41 +12,58 @@ osVersion ? null, topColor ? "black", bottomColor ? "black", -}: let - validColors = ["black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green"]; +}: +let + validColors = [ + "black" + "cardboard_grey" + "charcoal_grey" + "icon_blue" + "paper_white" + "plasma_blue" + "neon_blue" + "neon_green" + ]; resolvedLogoName = - if (logoFile != null && logoName == null) - then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) - else logoName; + if (logoFile != null && logoName == null) then + lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) + else + logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - mkKdeDerivation { - pname = "breeze-plymouth"; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +mkKdeDerivation { + pname = "breeze-plymouth"; - # FIXME(later): discuss with upstream - patches = [./install-paths.patch]; + # FIXME(later): discuss with upstream + patches = [ ./install-paths.patch ]; - extraNativeBuildInputs = [pkg-config] ++ lib.optionals (logoFile != null) [imagemagick netpbm perl]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = + [ pkg-config ] + ++ lib.optionals (logoFile != null) [ + imagemagick + netpbm + perl + ]; + extraBuildInputs = [ plymouth ]; - extraCmakeFlags = - [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" - ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; + extraCmakeFlags = + [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; - postPatch = - '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out - '' - + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + postPatch = + '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + '' + + lib.optionalString (logoFile != null) '' + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png - ''; - } + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + ''; +} diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index 3b6fed6221fd..6768ffb94ecf 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "breeze"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index 6fa4d2383f99..4610811b357c 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -1,66 +1,67 @@ -{callPackage}: { - bluedevil = callPackage ./bluedevil {}; - breeze = callPackage ./breeze {}; - breeze-grub = callPackage ./breeze-grub {}; - breeze-gtk = callPackage ./breeze-gtk {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover {}; - drkonqi = callPackage ./drkonqi {}; - flatpak-kcm = callPackage ./flatpak-kcm {}; - kactivitymanagerd = callPackage ./kactivitymanagerd {}; - kde-cli-tools = callPackage ./kde-cli-tools {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration {}; - kdeplasma-addons = callPackage ./kdeplasma-addons {}; - kgamma = callPackage ./kgamma {}; - kglobalacceld = callPackage ./kglobalacceld {}; - kinfocenter = callPackage ./kinfocenter {}; - kmenuedit = callPackage ./kmenuedit {}; - kpipewire = callPackage ./kpipewire {}; - krdp = callPackage ./krdp {}; - kscreen = callPackage ./kscreen {}; - kscreenlocker = callPackage ./kscreenlocker {}; - ksshaskpass = callPackage ./ksshaskpass {}; - ksystemstats = callPackage ./ksystemstats {}; - kwallet-pam = callPackage ./kwallet-pam {}; - kwayland = callPackage ./kwayland {}; - kwayland-integration = callPackage ./kwayland-integration {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited {}; - layer-shell-qt = callPackage ./layer-shell-qt {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - libplasma = callPackage ./libplasma {}; - milou = callPackage ./milou {}; - ocean-sound-theme = callPackage ./ocean-sound-theme {}; - oxygen = callPackage ./oxygen {}; - oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma-activities = callPackage ./plasma-activities {}; - plasma-activities-stats = callPackage ./plasma-activities-stats {}; - plasma-browser-integration = callPackage ./plasma-browser-integration {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks {}; - plasma-firewall = callPackage ./plasma-firewall {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa {}; - plasma-sdk = callPackage ./plasma-sdk {}; - plasma-systemmonitor = callPackage ./plasma-systemmonitor {}; - plasma-thunderbolt = callPackage ./plasma-thunderbolt {}; - plasma-vault = callPackage ./plasma-vault {}; - plasma-welcome = callPackage ./plasma-welcome {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; - plasma5support = callPackage ./plasma5support {}; - plymouth-kcm = callPackage ./plymouth-kcm {}; - polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; - powerdevil = callPackage ./powerdevil {}; - print-manager = callPackage ./print-manager {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style {}; - sddm-kcm = callPackage ./sddm-kcm {}; - systemsettings = callPackage ./systemsettings {}; - wacomtablet = callPackage ./wacomtablet {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde {}; +{ callPackage }: +{ + bluedevil = callPackage ./bluedevil { }; + breeze = callPackage ./breeze { }; + breeze-grub = callPackage ./breeze-grub { }; + breeze-gtk = callPackage ./breeze-gtk { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover { }; + drkonqi = callPackage ./drkonqi { }; + flatpak-kcm = callPackage ./flatpak-kcm { }; + kactivitymanagerd = callPackage ./kactivitymanagerd { }; + kde-cli-tools = callPackage ./kde-cli-tools { }; + kde-gtk-config = callPackage ./kde-gtk-config { }; + kdecoration = callPackage ./kdecoration { }; + kdeplasma-addons = callPackage ./kdeplasma-addons { }; + kgamma = callPackage ./kgamma { }; + kglobalacceld = callPackage ./kglobalacceld { }; + kinfocenter = callPackage ./kinfocenter { }; + kmenuedit = callPackage ./kmenuedit { }; + kpipewire = callPackage ./kpipewire { }; + krdp = callPackage ./krdp { }; + kscreen = callPackage ./kscreen { }; + kscreenlocker = callPackage ./kscreenlocker { }; + ksshaskpass = callPackage ./ksshaskpass { }; + ksystemstats = callPackage ./ksystemstats { }; + kwallet-pam = callPackage ./kwallet-pam { }; + kwayland = callPackage ./kwayland { }; + kwayland-integration = callPackage ./kwayland-integration { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited { }; + layer-shell-qt = callPackage ./layer-shell-qt { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + libplasma = callPackage ./libplasma { }; + milou = callPackage ./milou { }; + ocean-sound-theme = callPackage ./ocean-sound-theme { }; + oxygen = callPackage ./oxygen { }; + oxygen-sounds = callPackage ./oxygen-sounds { }; + plasma-activities = callPackage ./plasma-activities { }; + plasma-activities-stats = callPackage ./plasma-activities-stats { }; + plasma-browser-integration = callPackage ./plasma-browser-integration { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks { }; + plasma-firewall = callPackage ./plasma-firewall { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; + plasma-pa = callPackage ./plasma-pa { }; + plasma-sdk = callPackage ./plasma-sdk { }; + plasma-systemmonitor = callPackage ./plasma-systemmonitor { }; + plasma-thunderbolt = callPackage ./plasma-thunderbolt { }; + plasma-vault = callPackage ./plasma-vault { }; + plasma-welcome = callPackage ./plasma-welcome { }; + plasma-workspace = callPackage ./plasma-workspace { }; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers { }; + plasma5support = callPackage ./plasma5support { }; + plymouth-kcm = callPackage ./plymouth-kcm { }; + polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 { }; + powerdevil = callPackage ./powerdevil { }; + print-manager = callPackage ./print-manager { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style { }; + sddm-kcm = callPackage ./sddm-kcm { }; + systemsettings = callPackage ./systemsettings { }; + wacomtablet = callPackage ./wacomtablet { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; } diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix index d25a4fc6ea9b..89d3df681814 100644 --- a/pkgs/kde/plasma/discover/default.nix +++ b/pkgs/kde/plasma/discover/default.nix @@ -9,10 +9,15 @@ mkKdeDerivation { pname = "discover"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwebview discount flatpak fwupd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwebview + discount + flatpak + fwupd + ]; # The PackageKit backend doesn't work for us and causes Discover # to freak out when loading. Disable it to not confuse users. - excludeDependencies = ["packagekit-qt"]; + excludeDependencies = [ "packagekit-qt" ]; } diff --git a/pkgs/kde/plasma/drkonqi/default.nix b/pkgs/kde/plasma/drkonqi/default.nix index 2fa13f09d0bd..6e936a23cd99 100644 --- a/pkgs/kde/plasma/drkonqi/default.nix +++ b/pkgs/kde/plasma/drkonqi/default.nix @@ -5,7 +5,8 @@ gdb, python3, substituteAll, -}: let +}: +let gdb' = gdb.override { hostCpuOnly = true; python3 = python3.withPackages (ps: [ @@ -15,21 +16,21 @@ ]); }; in - mkKdeDerivation { - pname = "drkonqi"; +mkKdeDerivation { + pname = "drkonqi"; - patches = [ - (substituteAll { - src = ./gdb-path.patch; - gdb = "${gdb'}/bin/gdb"; - }) - ]; + patches = [ + (substituteAll { + src = ./gdb-path.patch; + gdb = "${gdb'}/bin/gdb"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ systemd ]; - extraCmakeFlags = [ - "-DWITH_GDB12=1" - "-DWITH_PYTHON_VENDORING=0" - ]; - } + extraCmakeFlags = [ + "-DWITH_GDB12=1" + "-DWITH_PYTHON_VENDORING=0" + ]; +} diff --git a/pkgs/kde/plasma/flatpak-kcm/default.nix b/pkgs/kde/plasma/flatpak-kcm/default.nix index a43447a15413..1afd87240d16 100644 --- a/pkgs/kde/plasma/flatpak-kcm/default.nix +++ b/pkgs/kde/plasma/flatpak-kcm/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "flatpak-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [flatpak qtsvg]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + flatpak + qtsvg + ]; } diff --git a/pkgs/kde/plasma/kactivitymanagerd/default.nix b/pkgs/kde/plasma/kactivitymanagerd/default.nix index b0d2fea109cc..48c539521d29 100644 --- a/pkgs/kde/plasma/kactivitymanagerd/default.nix +++ b/pkgs/kde/plasma/kactivitymanagerd/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kactivitymanagerd"; - extraBuildInputs = [qt5compat boost]; + extraBuildInputs = [ + qt5compat + boost + ]; } diff --git a/pkgs/kde/plasma/kde-cli-tools/default.nix b/pkgs/kde/plasma/kde-cli-tools/default.nix index cbaddad84169..45b3040e6d9f 100644 --- a/pkgs/kde/plasma/kde-cli-tools/default.nix +++ b/pkgs/kde/plasma/kde-cli-tools/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-cli-tools"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/kde-gtk-config/default.nix b/pkgs/kde/plasma/kde-gtk-config/default.nix index 045358ffbde5..c9b5a827eea8 100644 --- a/pkgs/kde/plasma/kde-gtk-config/default.nix +++ b/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -17,24 +17,26 @@ mkKdeDerivation { # aren't found. patches = [ ./0001-gsettings-schemas-path.patch - ( - substituteAll { - src = ./dependency-paths.patch; - pgrep = lib.getExe' procps "pgrep"; - xsettingsd = lib.getExe xsettingsd; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + pgrep = lib.getExe' procps "pgrep"; + xsettingsd = lib.getExe xsettingsd; + }) ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; - extraNativeBuildInputs = [pkg-config wrapGAppsHook3 sass]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + sass + ]; + extraBuildInputs = [ qtsvg ]; dontWrapGApps = true; # There is nothing to wrap - extraCmakeFlags = ["-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"]; + extraCmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' diff --git a/pkgs/kde/plasma/kdecoration/default.nix b/pkgs/kde/plasma/kdecoration/default.nix index 9f879b1cea17..21025a6678ce 100644 --- a/pkgs/kde/plasma/kdecoration/default.nix +++ b/pkgs/kde/plasma/kdecoration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdecoration"; } diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix index afb0708e8e6b..e23fdacdf158 100644 --- a/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdeplasma-addons"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix index dcd119ace8ec..607a04a945ea 100644 --- a/pkgs/kde/plasma/kgamma/default.nix +++ b/pkgs/kde/plasma/kgamma/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kgamma"; - extraBuildInputs = [xorg.libXxf86vm]; + extraBuildInputs = [ xorg.libXxf86vm ]; } diff --git a/pkgs/kde/plasma/kglobalacceld/default.nix b/pkgs/kde/plasma/kglobalacceld/default.nix index caafb6c91347..afe98e7fa6b2 100644 --- a/pkgs/kde/plasma/kglobalacceld/default.nix +++ b/pkgs/kde/plasma/kglobalacceld/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kglobalacceld"; } diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 2ef5008905ac..8911e77cf452 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -40,9 +40,12 @@ mkKdeDerivation { patches = [ # fwupdmgr is provided through NixOS' module - (substituteAll ({ - src = ./0001-tool-paths.patch; - } // tools)) + (substituteAll ( + { + src = ./0001-tool-paths.patch; + } + // tools + )) ]; postPatch = '' @@ -50,7 +53,7 @@ mkKdeDerivation { --replace-fail " aha " " ${lib.getExe aha} " ''; - extraBuildInputs = [libusb1]; + extraBuildInputs = [ libusb1 ]; # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in # the same directory, while it is actually located in a completely different diff --git a/pkgs/kde/plasma/kmenuedit/default.nix b/pkgs/kde/plasma/kmenuedit/default.nix index 4f88e8013173..85e56a3de6d9 100644 --- a/pkgs/kde/plasma/kmenuedit/default.nix +++ b/pkgs/kde/plasma/kmenuedit/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmenuedit"; meta.mainProgram = "kmenuedit"; diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d51..eb604d1a61c4 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -10,6 +10,12 @@ mkKdeDerivation { pname = "kpipewire"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + pipewire + ffmpeg + mesa + libva + ]; } diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 38208475ca27..8dd95c1a7659 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -20,7 +20,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtkeychain qtwayland diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix index 3ceedb860de0..379e13d561c8 100644 --- a/pkgs/kde/plasma/kscreen/default.nix +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kscreen"; - extraBuildInputs = [qtsensors]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace $out/share/kglobalaccel/org.kde.kscreen.desktop \ diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix index cab85f5e6889..edf549ef75e9 100644 --- a/pkgs/kde/plasma/kscreenlocker/default.nix +++ b/pkgs/kde/plasma/kscreenlocker/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kscreenlocker"; - extraNativeBuildInputs = [wayland-scanner]; - extraBuildInputs = [pam qqc2-breeze-style]; + extraNativeBuildInputs = [ wayland-scanner ]; + extraBuildInputs = [ + pam + qqc2-breeze-style + ]; } diff --git a/pkgs/kde/plasma/ksshaskpass/default.nix b/pkgs/kde/plasma/ksshaskpass/default.nix index dee8ae1e2ce8..4a148489a129 100644 --- a/pkgs/kde/plasma/ksshaskpass/default.nix +++ b/pkgs/kde/plasma/ksshaskpass/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksshaskpass"; meta.mainProgram = "ksshaskpass"; diff --git a/pkgs/kde/plasma/ksystemstats/default.nix b/pkgs/kde/plasma/ksystemstats/default.nix index 1d098b10b023..5582de47cb9f 100644 --- a/pkgs/kde/plasma/ksystemstats/default.nix +++ b/pkgs/kde/plasma/ksystemstats/default.nix @@ -9,8 +9,14 @@ mkKdeDerivation { pname = "ksystemstats"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [networkmanager-qt lm_sensors libnl]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + networkmanager-qt + lm_sensors + libnl + ]; - cmakeFlags = ["-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml"]; + cmakeFlags = [ + "-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml" + ]; } diff --git a/pkgs/kde/plasma/kwallet-pam/default.nix b/pkgs/kde/plasma/kwallet-pam/default.nix index a540f54a85ce..4dc35d59f485 100644 --- a/pkgs/kde/plasma/kwallet-pam/default.nix +++ b/pkgs/kde/plasma/kwallet-pam/default.nix @@ -13,6 +13,9 @@ mkKdeDerivation { sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pam libgcrypt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + pam + libgcrypt + ]; } diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 0274068f7f79..8de6d3fae8be 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwayland-integration"; # FIXME(qt5) diff --git a/pkgs/kde/plasma/kwayland/default.nix b/pkgs/kde/plasma/kwayland/default.nix index 86713b834bec..f456e94dc3c6 100644 --- a/pkgs/kde/plasma/kwayland/default.nix +++ b/pkgs/kde/plasma/kwayland/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kwayland"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index ffa7e146ece6..85679de86150 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -41,7 +41,10 @@ mkKdeDerivation { "--set-default TZDIR /etc/zoneinfo" ]; - extraNativeBuildInputs = [pkg-config python3]; + extraNativeBuildInputs = [ + pkg-config + python3 + ]; extraBuildInputs = [ qtquick3d qtsensors diff --git a/pkgs/kde/plasma/kwrited/default.nix b/pkgs/kde/plasma/kwrited/default.nix index c9bb0ff6e6ca..2b66791b1685 100644 --- a/pkgs/kde/plasma/kwrited/default.nix +++ b/pkgs/kde/plasma/kwrited/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwrited"; meta.mainProgram = "kwrited"; diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix index dd7290379c5f..009b2633b6f7 100644 --- a/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "layer-shell-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix index ccd11318e2be..fa969f46a537 100644 --- a/pkgs/kde/plasma/libkscreen/default.nix +++ b/pkgs/kde/plasma/libkscreen/default.nix @@ -8,7 +8,12 @@ mkKdeDerivation { pname = "libkscreen"; - extraNativeBuildInputs = [qttools qtwayland jq wayland]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ + qttools + qtwayland + jq + wayland + ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kscreen-doctor"; } diff --git a/pkgs/kde/plasma/libksysguard/default.nix b/pkgs/kde/plasma/libksysguard/default.nix index 9dae888737ab..5f6ecce54353 100644 --- a/pkgs/kde/plasma/libksysguard/default.nix +++ b/pkgs/kde/plasma/libksysguard/default.nix @@ -10,5 +10,12 @@ mkKdeDerivation { pname = "libksysguard"; - extraBuildInputs = [qtwebchannel qtwebengine qttools libpcap libnl lm_sensors]; + extraBuildInputs = [ + qtwebchannel + qtwebengine + qttools + libpcap + libnl + lm_sensors + ]; } diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix index 1ff05b92ef0e..348bd4cb2bc2 100644 --- a/pkgs/kde/plasma/libplasma/default.nix +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "libplasma"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg qtwayland wayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland + wayland + ]; } diff --git a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix index 9d508409f9d3..e6b7b64f925d 100644 --- a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix +++ b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "lightdm-greeter-kde"; } diff --git a/pkgs/kde/plasma/milou/default.nix b/pkgs/kde/plasma/milou/default.nix index 555c7cbee2c7..69a69e14753f 100644 --- a/pkgs/kde/plasma/milou/default.nix +++ b/pkgs/kde/plasma/milou/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "milou"; } diff --git a/pkgs/kde/plasma/ocean-sound-theme/default.nix b/pkgs/kde/plasma/ocean-sound-theme/default.nix index 72adf43e3604..784e80f5997a 100644 --- a/pkgs/kde/plasma/ocean-sound-theme/default.nix +++ b/pkgs/kde/plasma/ocean-sound-theme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ocean-sound-theme"; } diff --git a/pkgs/kde/plasma/oxygen-sounds/default.nix b/pkgs/kde/plasma/oxygen-sounds/default.nix index 68ee47d20eb8..8153b0d75715 100644 --- a/pkgs/kde/plasma/oxygen-sounds/default.nix +++ b/pkgs/kde/plasma/oxygen-sounds/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "oxygen-sounds"; } diff --git a/pkgs/kde/plasma/oxygen/default.nix b/pkgs/kde/plasma/oxygen/default.nix index 718a9737a8e1..7d4eb0c37874 100644 --- a/pkgs/kde/plasma/oxygen/default.nix +++ b/pkgs/kde/plasma/oxygen/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "oxygen"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/pkgs/kde/plasma/plasma-activities-stats/default.nix b/pkgs/kde/plasma/plasma-activities-stats/default.nix index dff496e4f631..3e25cdb19674 100644 --- a/pkgs/kde/plasma/plasma-activities-stats/default.nix +++ b/pkgs/kde/plasma/plasma-activities-stats/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-activities-stats"; } diff --git a/pkgs/kde/plasma/plasma-activities/default.nix b/pkgs/kde/plasma/plasma-activities/default.nix index c9fdd0821181..01354b5a6a28 100644 --- a/pkgs/kde/plasma/plasma-activities/default.nix +++ b/pkgs/kde/plasma/plasma-activities/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "plasma-activities"; - extraBuildInputs = [qtdeclarative boost]; + extraBuildInputs = [ + qtdeclarative + boost + ]; meta.mainProgram = "plasma-activities-cli6"; } diff --git a/pkgs/kde/plasma/plasma-browser-integration/default.nix b/pkgs/kde/plasma/plasma-browser-integration/default.nix index e069d067f294..b4fb1c2b03a3 100644 --- a/pkgs/kde/plasma/plasma-browser-integration/default.nix +++ b/pkgs/kde/plasma/plasma-browser-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-browser-integration"; meta.mainProgram = "plasma-browser-integration-host"; diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index a84a55779d36..46a0a73fb453 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -18,55 +18,56 @@ libcanberra, libxkbfile, ibus, -}: let +}: +let # run gsettings with desktop schemas for using in "kcm_access" kcm # and in kaccess - gsettings-wrapper = runCommandLocal "gsettings-wrapper" {nativeBuildInputs = [makeWrapper];} '' + gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name} ''; in - mkKdeDerivation { - pname = "plasma-desktop"; +mkKdeDerivation { + pname = "plasma-desktop"; - patches = [ - (substituteAll { - src = ./hwclock-path.patch; - hwclock = "${lib.getBin util-linux}/bin/hwclock"; - }) - (substituteAll { - src = ./kcm-access.patch; - gsettings = "${gsettings-wrapper}/bin/gsettings"; - }) - ./tzdir.patch - ./no-discover-shortcut.patch - (substituteAll { - src = ./wallpaper-paths.patch; - wallpapers = "${lib.getBin breeze}/share/wallpapers"; - }) - ]; + patches = [ + (substituteAll { + src = ./hwclock-path.patch; + hwclock = "${lib.getBin util-linux}/bin/hwclock"; + }) + (substituteAll { + src = ./kcm-access.patch; + gsettings = "${gsettings-wrapper}/bin/gsettings"; + }) + ./tzdir.patch + ./no-discover-shortcut.patch + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtsvg - qtwayland + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland - kaccounts-integration + kaccounts-integration - SDL2 - libcanberra - libxkbfile - xkeyboard_config + SDL2 + libcanberra + libxkbfile + xkeyboard_config - xorg.libXcursor - xorg.libXft - xorg.xf86inputlibinput - xorg.xf86inputevdev - xorg.xorgserver + xorg.libXcursor + xorg.libXft + xorg.xf86inputlibinput + xorg.xf86inputevdev + xorg.xorgserver - ibus - ]; + ibus + ]; - # wrap kaccess with wrapped gsettings so it can access accessibility schemas - qtWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [gsettings-wrapper]}"]; - } + # wrap kaccess with wrapped gsettings so it can access accessibility schemas + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ]; +} diff --git a/pkgs/kde/plasma/plasma-firewall/default.nix b/pkgs/kde/plasma/plasma-firewall/default.nix index 202d3ea089b2..b777de3bb619 100644 --- a/pkgs/kde/plasma/plasma-firewall/default.nix +++ b/pkgs/kde/plasma/plasma-firewall/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-firewall"; } diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index a626b9447934..55c1bb7ee10a 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -9,9 +9,13 @@ mkKdeDerivation { pname = "plasma-integration"; # force it to check our custom import path too - patches = [./qml-path.patch]; + patches = [ ./qml-path.patch ]; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. @@ -57,7 +61,10 @@ mkKdeDerivation { "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; - extraBuildInputs = [qtwayland xorg.libXcursor]; + extraBuildInputs = [ + qtwayland + xorg.libXcursor + ]; # Move Qt5 plugin to Qt5 plugin path postInstall = '' diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix index 8c6766e13b03..18654f28dc3d 100644 --- a/pkgs/kde/plasma/plasma-mobile/default.nix +++ b/pkgs/kde/plasma/plasma-mobile/default.nix @@ -7,8 +7,8 @@ mkKdeDerivation { pname = "plasma-mobile"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsensors]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \ --replace-fail \ diff --git a/pkgs/kde/plasma/plasma-nano/default.nix b/pkgs/kde/plasma/plasma-nano/default.nix index 9cdb24f013e7..2d16f3085f17 100644 --- a/pkgs/kde/plasma/plasma-nano/default.nix +++ b/pkgs/kde/plasma/plasma-nano/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-nano"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index a53ec99a8bed..6d93b623477b 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -17,7 +17,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebengine mobile-broadband-provider-info diff --git a/pkgs/kde/plasma/plasma-pa/default.nix b/pkgs/kde/plasma/plasma-pa/default.nix index 4d721ecc711b..8213000dc40e 100644 --- a/pkgs/kde/plasma/plasma-pa/default.nix +++ b/pkgs/kde/plasma/plasma-pa/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "plasma-pa"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcanberra pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libcanberra + pulseaudio + ]; } diff --git a/pkgs/kde/plasma/plasma-sdk/default.nix b/pkgs/kde/plasma/plasma-sdk/default.nix index 68f5a30fc936..52e3f6859e5b 100644 --- a/pkgs/kde/plasma/plasma-sdk/default.nix +++ b/pkgs/kde/plasma/plasma-sdk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-sdk"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/plasma-systemmonitor/default.nix b/pkgs/kde/plasma/plasma-systemmonitor/default.nix index a8e20716ed56..0aceb98496ac 100644 --- a/pkgs/kde/plasma/plasma-systemmonitor/default.nix +++ b/pkgs/kde/plasma/plasma-systemmonitor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-systemmonitor"; meta.mainProgram = "plasma-systemmonitor"; diff --git a/pkgs/kde/plasma/plasma-thunderbolt/default.nix b/pkgs/kde/plasma/plasma-thunderbolt/default.nix index 5b1b682ac9bc..6a1a96371047 100644 --- a/pkgs/kde/plasma/plasma-thunderbolt/default.nix +++ b/pkgs/kde/plasma/plasma-thunderbolt/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-thunderbolt"; } diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix index 9ab545ab87b8..f933687143a8 100644 --- a/pkgs/kde/plasma/plasma-vault/default.nix +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -25,5 +25,5 @@ mkKdeDerivation { ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/kde/plasma/plasma-welcome/default.nix b/pkgs/kde/plasma/plasma-welcome/default.nix index 7265a3f3f1ff..3786b3d0c89a 100644 --- a/pkgs/kde/plasma/plasma-welcome/default.nix +++ b/pkgs/kde/plasma/plasma-welcome/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "plasma-welcome"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "plasma-welcome"; } diff --git a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix index af8c89249274..5d661c1c94fd 100644 --- a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix +++ b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-workspace-wallpapers"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index a8dfdd9a9e12..2bb51422b0af 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -36,7 +36,10 @@ mkKdeDerivation { chmod -x $out/libexec/plasma-sourceenv.sh ''; - extraNativeBuildInputs = [pkg-config spirv-tools]; + extraNativeBuildInputs = [ + pkg-config + spirv-tools + ]; extraBuildInputs = [ qtsvg qtwayland @@ -61,5 +64,8 @@ mkKdeDerivation { echo "${lsof} ${xorg.xmessage} ${xorg.xsetroot}" > $out/nix-support/depends ''; - passthru.providedSessions = ["plasma" "plasmax11"]; + passthru.providedSessions = [ + "plasma" + "plasmax11" + ]; } diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix index 385626aeedc0..f1c0632fdcf3 100644 --- a/pkgs/kde/plasma/plasma5support/default.nix +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma5support"; } diff --git a/pkgs/kde/plasma/plymouth-kcm/default.nix b/pkgs/kde/plasma/plymouth-kcm/default.nix index ccb117f11a53..b5f7f6578014 100644 --- a/pkgs/kde/plasma/plymouth-kcm/default.nix +++ b/pkgs/kde/plasma/plymouth-kcm/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "plymouth-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ plymouth ]; meta.mainProgram = "kplymouththemeinstaller"; } diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix index 6c4bf0653f09..53f7f2959d60 100644 --- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix +++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "polkit-kde-agent-1"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index 8b0c270e85c6..3faa5c38417e 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "powerdevil"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcap]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libcap ]; } diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix index fce60dcb968b..dd06f5217637 100644 --- a/pkgs/kde/plasma/print-manager/default.nix +++ b/pkgs/kde/plasma/print-manager/default.nix @@ -6,5 +6,5 @@ mkKdeDerivation { pname = "print-manager"; # FIXME: cups-smb? - extraBuildInputs = [cups]; + extraBuildInputs = [ cups ]; } diff --git a/pkgs/kde/plasma/qqc2-breeze-style/default.nix b/pkgs/kde/plasma/qqc2-breeze-style/default.nix index 2d950f63e0c5..97a7da956794 100644 --- a/pkgs/kde/plasma/qqc2-breeze-style/default.nix +++ b/pkgs/kde/plasma/qqc2-breeze-style/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "qqc2-breeze-style"; } diff --git a/pkgs/kde/plasma/sddm-kcm/default.nix b/pkgs/kde/plasma/sddm-kcm/default.nix index d21ea6ac58f2..e6ba4bb608f2 100644 --- a/pkgs/kde/plasma/sddm-kcm/default.nix +++ b/pkgs/kde/plasma/sddm-kcm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sddm-kcm"; meta.mainProgram = "sddmthemeinstaller"; diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix index 10feafc859c3..7902e83710ff 100644 --- a/pkgs/kde/plasma/systemsettings/default.nix +++ b/pkgs/kde/plasma/systemsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "systemsettings"; meta.mainProgram = "systemsettings"; diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix index 58b80fa9575f..c4482a689606 100644 --- a/pkgs/kde/plasma/wacomtablet/default.nix +++ b/pkgs/kde/plasma/wacomtablet/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "wacomtablet"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libwacom xf86_input_wacom]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libwacom + xf86_input_wacom + ]; meta.mainProgram = "kde_wacom_tabletfinder"; } diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 7563e934e502..0614c0c191d5 100644 --- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "xdg-desktop-portal-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland cups]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + cups + ]; } diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix index be70f8398f41..282978fbc338 100644 --- a/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, extra-cmake-modules -, kcoreaddons -, kdeclarative -, kdecoration -, libplasma +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + extra-cmake-modules, + kcoreaddons, + kdeclarative, + kdecoration, + libplasma, }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 957f03c5fc8e..023bdde5b90d 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -548,6 +548,26 @@ getNixDrv() { fi } +getVersion() { + local dir="$1" + local rev= + local gitDir="$dir/.git" + if [ -e "$gitDir" ]; then + if [ -z "$(type -P git)" ]; then + echo "warning: Git not found; cannot figure out revision of $dir" >&2 + return + fi + cd "$dir" + rev=$(git --git-dir="$gitDir" rev-parse --short HEAD) + if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then + rev+=M + fi + fi + + echo ".git.$rev" +} + + if [[ -n $buildNix && -z $flake ]]; then log "building Nix..." getNixDrv @@ -569,7 +589,7 @@ fi # nixos-version shows something useful). if [[ -n $canRun && -z $flake ]]; then if nixpkgs=$(runCmd nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$(runCmd $SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) + suffix=$(getVersion "$nixpkgs" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index b61b24229188..b0da374d9874 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; @@ -11,6 +11,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM="; }; + patches = [ + # Fix build on kernel 6.11 + # https://github.com/medusalix/xone/pull/48 + (fetchpatch { + name = "kernel-6.11.patch"; + url = "https://github.com/medusalix/xone/commit/28df566c38e0ee500fd5f74643fc35f21a4ff696.patch"; + hash = "sha256-X14oZmxqqZJoBZxPXGZ9R8BAugx/hkSOgXlGwR5QCm8="; + }) + ]; + setSourceRoot = '' export sourceRoot=$(pwd)/${finalAttrs.src.name} ''; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index f0295a5e94ee..4d9eb36af84d 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-PxfJdOnw6Yb41LsqaTwyY7v4hLuaTJwlXgUuy+7XGQo="; + sha256 = "sha256-ihZS4mNHOk0QoK1SCfjVWATyfGNpwTS/X4f5tr2aoBU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index dd7bb795952d..58e4be36878a 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.9.8"; + version = "5.9.9"; outputs = [ "out" "lambda" ]; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-0WcjmX3SXRfx6ged2lfNTZBWfICYVtXznR+7J/ASAFQ="; + hash = "sha256-Y39v+OBhR4WpytCeQN6qBuQpdwKlEgiKgeG5U79QFxU="; }; vendorHash = "sha256-i2+nefRE4BD93rG842oZj0/coamYVRMPxEHio80bdWk="; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 98a26fa5a9f5..fd1307c10f61 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-qSxm00zC1Ms9C5R077Zn5FKluEqFs8KYUPnDUaMvMs8="; + hash = "sha256-0pwsZONhouGuypGTP64oJd3+nq8VMlyulb/WUJj0qGw="; }; - vendorHash = "sha256-rC8iqCZ6tzXVCOHNqH+jAMDh2yTAR88zj45HcgJ2lSg="; + vendorHash = "sha256-vz65gr56wj6PNiQwmfz1wg9SVmRUnrv7ZeWQkqdA4WI="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/internal/web/ui/yarn.lock"; - hash = "sha256-FvrfWcuKld242YfZ8CixF5GGFRp8iFWZ3Vkef3Kf4ag="; + hash = "sha256-bnJL7W7VfJIrJKvRt9Q6kdEyjLH/IJoCi0TENxz7SUE="; }; ldflags = let diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 7b6b0e473907..63f1d7e7b89e 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prom2json"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prom2json"; - sha256 = "sha256-oOnrIGtNQqS/7XCKcFtzXskv7N6syNyS52pZMwrY5wU="; + sha256 = "sha256-cKz+ZFQYjsL7dFfXXCrl4T8OuvQkdqVAotG9HRNtN7o="; }; - vendorHash = "sha256-d+/38wUMFChuLlVb84DELRQylCDIqopzk2bw/yd5B/E="; + vendorHash = "sha256-pCy4oECZnvoODezUD1+lOT46yWUr78zvnHgEB2BJN3c="; meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 08a9eb2da05a..76a0ebfdf245 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -5,7 +5,7 @@ hash = "sha256-bIRmTqmzIRo1KdhAcJa1GxhVcTEiEaLFPzlNFbzfLcQ="; }; wordpress_6_6 = { - version = "6.6.1"; - hash = "sha256-YW6BhlP48okxLrpsJwPgynSHpbdRqyMoXaq9IBd8TlU="; + version = "6.6.2"; + hash = "sha256-JpemjLPc9IP0/OiASSVpjHRmQBs2n8Mt4nB6WcTCB9Y="; }; } diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/shells/zsh/zsh-autopair/default.nix index e950eadbcf40..8b0cfd6ed523 100644 --- a/pkgs/shells/zsh/zsh-autopair/default.nix +++ b/pkgs/shells/zsh/zsh-autopair/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "zsh-autopair"; - version = "1.0"; + version = "1.0-unstable-2024-07-14"; src = fetchFromGitHub { owner = "hlissner"; repo = "zsh-autopair"; - rev = "v${version}"; - sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; + rev = "449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d"; + hash = "sha256-3zvOgIi+q7+sTXrT+r/4v98qjeiEL4Wh64rxBYnwJvQ="; }; - strictDeps = true; - installPhase = '' install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh ''; @@ -21,7 +23,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hlissner/zsh-autopair"; description = "Plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently"; license = licenses.mit; - maintainers = with maintainers; [ _0qq ]; + maintainers = with maintainers; [ + _0qq + DataHearth + ]; platforms = platforms.all; }; } diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 9cd22e364ea6..b2b6576c4acd 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -42,6 +42,24 @@ let inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags; inherit (import ../../build-support/lib/meson.nix { inherit lib stdenv; }) makeMesonFlags; + /** + This function creates a derivation, and returns it in the form of a [package attribute set](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) + that refers to the derivation's outputs. + + `mkDerivation` takes many argument attributes, most of which affect the derivation environment, + but [`meta`](#chap-meta) and [`passthru`](#var-stdenv-passthru) only directly affect package attributes. + + The `mkDerivation` argument attributes can be made to refer to one another by passing a function to `mkDerivation`. + See [Fixed-point argument of `mkDerivation`](#mkderivation-recursive-attributes). + + Reference documentation see: https://nixos.org/manual/nixpkgs/stable/#sec-using-stdenv + + :::{.note} + This is used as the fundamental building block of most other functions in Nixpkgs for creating derivations. + + Most arguments are also passed through to the underlying call of [`builtins.derivation`](https://nixos.org/manual/nix/stable/language/derivations). + ::: + */ mkDerivation = fnOrAttrs: if builtins.isFunction fnOrAttrs diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index 38a67622edb5..3eca45ee7ca5 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "sha256-onxneLmXs1rYwpTzcnn+rbDboWVoEQgtGMHx/bMPRa8="; + sha256 = "sha256-smhqovPgDdSLhAwW1y/hnPjNwFcpIUocs3MKizdvZj0="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index b6f4faad4d81..125c2a6c4d38 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.55.1"; + version = "0.55.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-NStDXhJ2nOaPxirD6qbLyqIZZFLp5vm5/u5tego7MyI="; + hash = "sha256-DwIklbBd2g/zVPwRqcl+GFfTUm3LHs/x37X5T+tX4aI="; }; # Hash mismatch on across Linux and Darwin @@ -30,7 +30,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/aquasecurity/trivy/pkg/version.ver=v${version}" + "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -58,13 +58,13 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = trivy; command = "trivy --version"; - version = "Version: v${version}"; + version = "Version: ${version}"; }; meta = with lib; { + description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; homepage = "https://github.com/aquasecurity/trivy"; changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; - description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; longDescription = '' Trivy is a simple and comprehensive vulnerability scanner for containers and other artifacts. A software vulnerability is a glitch, flaw, or diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 46639ea92bbb..860906fdd555 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-lfn9RKN2TiHEroDaKJTeQ7wLU2tjoUTyD5Ar5QTNOlY="; + hash = "sha256-ktCfIFSGXOqHfqFkXt2ZO8jZFGTRd8wTxukGLZD1PTU="; }; - cargoHash = "sha256-zmqkGmN0fEYW+6U6cUQK27/OSV4JZW1EQiRswvBnA3M="; + cargoHash = "sha256-R5p7f+eEMDs0rs+45XNJC4znrJ9BrPBv5+dvMgoHFdA="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index bb4f78b0861b..c0e0a9d34820 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-Aoa3cqjnyPXxS0KRZ+2L0EK5KhjEUVQtQuKbO+ouo3I="; + sha256 = "sha256-LUIKVMI8ljPzAmrq3jYQ+ZDCGs2p+7EO8ECp1A1osUk="; }; - vendorHash = "sha256-AhoS/I1ypHI4oxsBaFGsMA74eX8so1kAf5Fui36uDaE="; + vendorHash = "sha256-1zjXy6x/IzBY7MrtAtynmoneEpjAnYv/H5IsMZtRQAo="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 3b8b80ffe3cc..697cc08ec4f6 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -16,12 +16,12 @@ , openvpn , electron }: let - version = "1.3.3785.81"; + version = "1.3.4026.10"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-0tlWX9vHiFHewiisI8lwsQdHyEhntu+x415hfbymhIo="; + sha256 = "sha256-3P2MEQy9RE2dY7aRCGQl+kmVIaRZp6VvrcHQUzhiAEY="; }; cli = buildGoModule { @@ -29,7 +29,7 @@ inherit version src; modRoot = "cli"; - vendorHash = "sha256-1sAJbEZHagG6hnZBkb6EbQpSdNmTyTWfKpbektXSWYU="; + vendorHash = "sha256-wwPgyIo14zpA+oCJH0CQ4+7zyP+Itxbd6S0P7t01wBw="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client @@ -41,7 +41,7 @@ inherit version src; modRoot = "service"; - vendorHash = "sha256-QvuEQX1+sJOGB1AJNhnM3pVPxGmizDu8EN1yRspXjhU="; + vendorHash = "sha256-uy8+R4l3e4YAWMxWWbVHhkwxvbOsY5PF7fs1dVyMIAg="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index 3db0be269b8e..2f86a714d506 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-PW9OS/ccRxigP0ikk1XR4QhQX4j9+ALQz0FMKXF3yRA="; + hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ="; }; - cargoHash = "sha256-lNz4E+dcJ6ACkNraM4DUR4yFbkWgAZ4ngbAML8JYVtE="; + cargoHash = "sha256-poQDzC5DLkwLMwt5ieZCSyrQIKkuYq6hu6cj7lcDb4c="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index d87d388cd2e8..acff56e8c015 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -2,15 +2,17 @@ , stdenv , fetchFromGitHub , bzip2 -, nix +, nixVersions , perl , makeWrapper , nixosTests +, fetchpatch }: let - rev = "e4675e38ab54942e351c7686e40fabec822120b9"; - sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; + rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24"; + sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY="; + nix = nixVersions.nix_2_24; in stdenv.mkDerivation { @@ -23,6 +25,14 @@ stdenv.mkDerivation { inherit rev sha256; }; + patches = [ + # Part of https://github.com/edolstra/nix-serve/pull/61 + (fetchpatch { + url = "https://github.com/edolstra/nix-serve/commit/9e434fff4486afeb3cc3f631f6dc56492b204704.patch"; + sha256 = "sha256-TxQ6q6UApTKsYIMdr/RyrkKSA3k47stV63bTbxchNTU="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/tools/package-management/nix-serve/nix-command.patch b/pkgs/tools/package-management/nix-serve/nix-command.patch new file mode 100644 index 000000000000..5bf8eaac8711 --- /dev/null +++ b/pkgs/tools/package-management/nix-serve/nix-command.patch @@ -0,0 +1,40 @@ +From 9e434fff4486afeb3cc3f631f6dc56492b204704 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Wed, 31 Jul 2024 23:53:31 +0200 +Subject: [PATCH] add extra-experimental-features for nix-command + +fixes https://github.com/NixOS/nixpkgs/pull/331230 +--- + nix-serve.psgi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nix-serve.psgi b/nix-serve.psgi +index 928fa3b..65a8680 100644 +--- a/nix-serve.psgi ++++ b/nix-serve.psgi +@@ -64,7 +64,7 @@ my $app = sub { + return [404, ['Content-Type' => 'text/plain'], ["Incorrect NAR hash. Maybe the path has been recreated.\n"]] + unless $narHash eq "sha256:$expectedNarHash"; + my $fh = new IO::Handle; +- open $fh, "-|", "nix", "dump-path", "--", $storePath; ++ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath; + return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh]; + } + +@@ -75,14 +75,14 @@ my $app = sub { + return [404, ['Content-Type' => 'text/plain'], ["No such path.\n"]] unless $storePath; + my ($deriver, $narHash, $time, $narSize, $refs) = $store->queryPathInfo($storePath, 1) or die; + my $fh = new IO::Handle; +- open $fh, "-|", "nix", "dump-path", "--", $storePath; ++ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath; + return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh]; + } + + elsif ($path =~ /^\/log\/([0-9a-z]+-[0-9a-zA-Z\+\-\.\_\?\=]+)/) { + my $storePath = "$Nix::Config::storeDir/$1"; + my $fh = new IO::Handle; +- open $fh, "-|", "nix", "log", $storePath; ++ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "log", $storePath; + return [200, ['Content-Type' => 'text/plain' ], $fh]; + } + diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e03fb5bdae59..38cd370d064a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,12 +3,14 @@ , stdenv , aws-sdk-cpp , boehmgc +, libgit2 , callPackage , fetchFromGitHub , fetchpatch , fetchpatch2 , runCommand , overrideSDK +, buildPackages , Security , storeDir ? "/nix/store" @@ -85,6 +87,27 @@ let requiredSystemFeatures = [ ]; }; + libgit2-thin-packfile = libgit2.overrideAttrs (args: { + nativeBuildInputs = args.nativeBuildInputs or [] + # gitMinimal does not build on Windows. See packbuilder patch. + ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + # Needed for `git apply`; see `prePatch` + buildPackages.gitMinimal + ]; + # Only `git apply` can handle git binary patches + prePatch = args.prePatch or "" + + lib.optionalString (!stdenv.hostPlatform.isWindows) '' + patch() { + git apply + } + ''; + # taken from https://github.com/NixOS/nix/tree/master/packaging/patches + patches = (args.patches or []) ++ [ + ./patches/libgit2-mempack-thin-packfile.patch + ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + ./patches/libgit2-packbuilder-callback-interruptible.patch + ]; + }); common = args: callPackage @@ -93,6 +116,7 @@ let inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix; + libgit2 = if lib.versionAtLeast args.version "2.25.0" then libgit2-thin-packfile else libgit2; }; # https://github.com/NixOS/nix/pull/7585 @@ -151,8 +175,8 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.5"; - hash = "sha256-xEcYQuJz6DjdYfS6GxIYcn8U+3Hgopne3CvqrNoGguQ="; + version = "2.18.7"; + hash = "sha256-ZfcL4utJHuxCGILb/zIeXVVbHkskgp70+c2IitkFJwA="; self_attribute_name = "nix_2_18"; }; @@ -187,8 +211,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.6"; - hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w="; + version = "2.24.7"; + hash = "sha256-NAyc5MR/T70umcSeMv7y3AVt00ZkmDXGm7LfYKTONfE="; self_attribute_name = "nix_2_24"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: @@ -203,12 +227,12 @@ in lib.makeExtensible (self: ({ git = (common rec { version = "2.25.0"; - suffix = "pre20240910_${lib.substring 0 8 src.rev}"; + suffix = "pre20240920_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b9d3cdfbd2b873cf34600b262247d77109dfd905"; - hash = "sha256-7zH8TU5g3Bsg6ES0O8RcTm6JGYOMuDCGlSI3AQKbKy8="; + rev = "ca3fc1693b309ab6b8b0c09408a08d0055bf0363"; + hash = "sha256-Hp7dkx7zfB9a4l5QusXUob0b1T2qdZ23LFo5dcp3xrU="; }; self_attribute_name = "git"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { diff --git a/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch b/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch new file mode 100644 index 000000000000..fb74b1683136 --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch @@ -0,0 +1,282 @@ +commit 9bacade4a3ef4b6b26e2c02f549eef0e9eb9eaa2 +Author: Robert Hensing +Date: Sun Aug 18 20:20:36 2024 +0200 + + Add unoptimized git_mempack_write_thin_pack + +diff --git a/include/git2/sys/mempack.h b/include/git2/sys/mempack.h +index 17da590a3..3688bdd50 100644 +--- a/include/git2/sys/mempack.h ++++ b/include/git2/sys/mempack.h +@@ -44,6 +44,29 @@ GIT_BEGIN_DECL + */ + GIT_EXTERN(int) git_mempack_new(git_odb_backend **out); + ++/** ++ * Write a thin packfile with the objects in the memory store. ++ * ++ * A thin packfile is a packfile that does not contain its transitive closure of ++ * references. This is useful for efficiently distributing additions to a ++ * repository over the network, but also finds use in the efficient bulk ++ * addition of objects to a repository, locally. ++ * ++ * This operation performs the (shallow) insert operations into the ++ * `git_packbuilder`, but does not write the packfile to disk; ++ * see `git_packbuilder_write_buf`. ++ * ++ * It also does not reset the memory store; see `git_mempack_reset`. ++ * ++ * @note This function may or may not write trees and blobs that are not ++ * referenced by commits. Currently everything is written, but this ++ * behavior may change in the future as the packer is optimized. ++ * ++ * @param backend The mempack backend ++ * @param pb The packbuilder to use to write the packfile ++ */ ++GIT_EXTERN(int) git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb); ++ + /** + * Dump all the queued in-memory writes to a packfile. + * +diff --git a/src/libgit2/odb_mempack.c b/src/libgit2/odb_mempack.c +index 6f27f45f8..0b61e2b66 100644 +--- a/src/libgit2/odb_mempack.c ++++ b/src/libgit2/odb_mempack.c +@@ -132,6 +132,35 @@ cleanup: + return err; + } + ++int git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb) ++{ ++ struct memory_packer_db *db = (struct memory_packer_db *)backend; ++ const git_oid *oid; ++ size_t iter = 0; ++ int err = -1; ++ ++ /* TODO: Implement the recency heuristics. ++ For this it probably makes sense to only write what's referenced ++ through commits, an option I've carved out for you in the docs. ++ wrt heuristics: ask your favorite LLM to translate https://git-scm.com/docs/pack-heuristics/en ++ to actual normal reference documentation. */ ++ while (true) { ++ err = git_oidmap_iterate(NULL, db->objects, &iter, &oid); ++ if (err == GIT_ITEROVER) { ++ err = 0; ++ break; ++ } ++ if (err != 0) ++ return err; ++ ++ err = git_packbuilder_insert(pb, oid, NULL); ++ if (err != 0) ++ return err; ++ } ++ ++ return 0; ++} ++ + int git_mempack_dump( + git_buf *pack, + git_repository *repo, +diff --git a/tests/libgit2/mempack/thinpack.c b/tests/libgit2/mempack/thinpack.c +new file mode 100644 +index 000000000..604a4dda2 +--- /dev/null ++++ b/tests/libgit2/mempack/thinpack.c +@@ -0,0 +1,196 @@ ++#include "clar_libgit2.h" ++#include "git2/indexer.h" ++#include "git2/odb_backend.h" ++#include "git2/tree.h" ++#include "git2/types.h" ++#include "git2/sys/mempack.h" ++#include "git2/sys/odb_backend.h" ++#include "util.h" ++ ++static git_repository *_repo; ++static git_odb_backend * _mempack_backend; ++ ++void test_mempack_thinpack__initialize(void) ++{ ++ git_odb *odb; ++ ++ _repo = cl_git_sandbox_init_new("mempack_thinpack_repo"); ++ ++ cl_git_pass(git_mempack_new(&_mempack_backend)); ++ cl_git_pass(git_repository_odb(&odb, _repo)); ++ cl_git_pass(git_odb_add_backend(odb, _mempack_backend, 999)); ++ git_odb_free(odb); ++} ++ ++void _mempack_thinpack__cleanup(void) ++{ ++ cl_git_sandbox_cleanup(); ++} ++ ++/* ++ Generating a packfile for an unchanged repo works and produces an empty packfile. ++ Even if we allow this scenario to be detected, it shouldn't misbehave if the ++ application is unaware of it. ++*/ ++void test_mempack_thinpack__empty(void) ++{ ++ git_packbuilder *pb; ++ int version; ++ int n; ++ git_buf buf = GIT_BUF_INIT; ++ ++ git_packbuilder_new(&pb, _repo); ++ ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_assert_in_range(12, buf.size, 1024 /* empty packfile is >0 bytes, but certainly not that big */); ++ cl_assert(buf.ptr[0] == 'P'); ++ cl_assert(buf.ptr[1] == 'A'); ++ cl_assert(buf.ptr[2] == 'C'); ++ cl_assert(buf.ptr[3] == 'K'); ++ version = (buf.ptr[4] << 24) | (buf.ptr[5] << 16) | (buf.ptr[6] << 8) | buf.ptr[7]; ++ /* Subject to change. https://git-scm.com/docs/pack-format: Git currently accepts version number 2 or 3 but generates version 2 only.*/ ++ cl_assert_equal_i(2, version); ++ n = (buf.ptr[8] << 24) | (buf.ptr[9] << 16) | (buf.ptr[10] << 8) | buf.ptr[11]; ++ cl_assert_equal_i(0, n); ++ git_buf_dispose(&buf); ++ ++ git_packbuilder_free(pb); ++} ++ ++#define LIT_LEN(x) x, sizeof(x) - 1 ++ ++/* ++ Check that git_mempack_write_thin_pack produces a thin packfile. ++*/ ++void test_mempack_thinpack__thin(void) ++{ ++ /* Outline: ++ - Create tree 1 ++ - Flush to packfile A ++ - Create tree 2 ++ - Flush to packfile B ++ ++ Tree 2 has a new blob and a reference to a blob from tree 1. ++ ++ Expectation: ++ - Packfile B is thin and does not contain the objects from packfile A ++ */ ++ ++ ++ git_oid oid_blob_1; ++ git_oid oid_blob_2; ++ git_oid oid_blob_3; ++ git_oid oid_tree_1; ++ git_oid oid_tree_2; ++ git_treebuilder *tb; ++ ++ git_packbuilder *pb; ++ git_buf buf = GIT_BUF_INIT; ++ git_indexer *indexer; ++ git_indexer_progress stats; ++ char pack_dir_path[1024]; ++ ++ char sbuf[1024]; ++ const char * repo_path; ++ const char * pack_name_1; ++ const char * pack_name_2; ++ git_str pack_path_1 = GIT_STR_INIT; ++ git_str pack_path_2 = GIT_STR_INIT; ++ git_odb_backend * pack_odb_backend_1; ++ git_odb_backend * pack_odb_backend_2; ++ ++ ++ cl_assert_in_range(0, snprintf(pack_dir_path, sizeof(pack_dir_path), "%s/objects/pack", git_repository_path(_repo)), sizeof(pack_dir_path)); ++ ++ /* Create tree 1 */ ++ ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_2, _repo, LIT_LEN("thinpack blob 2"))); ++ ++ ++ cl_git_pass(git_treebuilder_new(&tb, _repo, NULL)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob2", &oid_blob_2, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_write(&oid_tree_1, tb)); ++ ++ /* Flush */ ++ ++ cl_git_pass(git_packbuilder_new(&pb, _repo)); ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); ++ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); ++ cl_git_pass(git_indexer_commit(indexer, &stats)); ++ pack_name_1 = strdup(git_indexer_name(indexer)); ++ cl_assert(pack_name_1); ++ git_buf_dispose(&buf); ++ git_mempack_reset(_mempack_backend); ++ git_indexer_free(indexer); ++ git_packbuilder_free(pb); ++ ++ /* Create tree 2 */ ++ ++ cl_git_pass(git_treebuilder_clear(tb)); ++ /* blob 1 won't be used, but we add it anyway to test that just "declaring" an object doesn't ++ necessarily cause its inclusion in the next thin packfile. It must only be included if new. */ ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); ++ cl_git_pass(git_blob_create_from_buffer(&oid_blob_3, _repo, LIT_LEN("thinpack blob 3"))); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob3", &oid_blob_3, GIT_FILEMODE_BLOB)); ++ cl_git_pass(git_treebuilder_write(&oid_tree_2, tb)); ++ ++ /* Flush */ ++ ++ cl_git_pass(git_packbuilder_new(&pb, _repo)); ++ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); ++ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); ++ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); ++ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); ++ cl_git_pass(git_indexer_commit(indexer, &stats)); ++ pack_name_2 = strdup(git_indexer_name(indexer)); ++ cl_assert(pack_name_2); ++ git_buf_dispose(&buf); ++ git_mempack_reset(_mempack_backend); ++ git_indexer_free(indexer); ++ git_packbuilder_free(pb); ++ git_treebuilder_free(tb); ++ ++ /* Assertions */ ++ ++ assert(pack_name_1); ++ assert(pack_name_2); ++ ++ repo_path = git_repository_path(_repo); ++ ++ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_1); ++ git_str_joinpath(&pack_path_1, repo_path, sbuf); ++ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_2); ++ git_str_joinpath(&pack_path_2, repo_path, sbuf); ++ ++ /* If they're the same, something definitely went wrong. */ ++ cl_assert(strcmp(pack_name_1, pack_name_2) != 0); ++ ++ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_1, pack_path_1.ptr)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_1)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_2)); ++ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_3)); ++ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_1)); ++ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_2)); ++ ++ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_2, pack_path_2.ptr)); ++ /* blob 1 is already in the packfile 1, so packfile 2 must not include it, in order to be _thin_. */ ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_1)); ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_2)); ++ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_3)); ++ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_1)); ++ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_2)); ++ ++ pack_odb_backend_1->free(pack_odb_backend_1); ++ pack_odb_backend_2->free(pack_odb_backend_2); ++ free((void *)pack_name_1); ++ free((void *)pack_name_2); ++ git_str_dispose(&pack_path_1); ++ git_str_dispose(&pack_path_2); ++ ++} diff --git a/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch b/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch new file mode 100644 index 000000000000..c67822ff755e --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch @@ -0,0 +1,930 @@ +commit e9823c5da4fa977c46bcb97167fbdd0d70adb5ff +Author: Robert Hensing +Date: Mon Aug 26 20:07:04 2024 +0200 + + Make packbuilder interruptible using progress callback + + Forward errors from packbuilder->progress_cb + + This allows the callback to terminate long-running operations when + the application is interrupted. + +diff --git a/include/git2/pack.h b/include/git2/pack.h +index 0f6bd2ab9..bee72a6c0 100644 +--- a/include/git2/pack.h ++++ b/include/git2/pack.h +@@ -247,6 +247,9 @@ typedef int GIT_CALLBACK(git_packbuilder_progress)( + * @param progress_cb Function to call with progress information during + * pack building. Be aware that this is called inline with pack building + * operations, so performance may be affected. ++ * When progress_cb returns an error, the pack building process will be ++ * aborted and the error will be returned from the invoked function. ++ * `pb` must then be freed. + * @param progress_cb_payload Payload for progress callback. + * @return 0 or an error code + */ +diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c +index b2d80cba9..7c331c2d5 100644 +--- a/src/libgit2/pack-objects.c ++++ b/src/libgit2/pack-objects.c +@@ -932,6 +932,9 @@ static int report_delta_progress( + { + int ret; + ++ if (pb->failure) ++ return pb->failure; ++ + if (pb->progress_cb) { + uint64_t current_time = git_time_monotonic(); + uint64_t elapsed = current_time - pb->last_progress_report_time; +@@ -943,8 +946,10 @@ static int report_delta_progress( + GIT_PACKBUILDER_DELTAFICATION, + count, pb->nr_objects, pb->progress_cb_payload); + +- if (ret) ++ if (ret) { ++ pb->failure = ret; + return git_error_set_after_callback(ret); ++ } + } + } + +@@ -976,7 +981,10 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list, + } + + pb->nr_deltified += 1; +- report_delta_progress(pb, pb->nr_deltified, false); ++ if ((error = report_delta_progress(pb, pb->nr_deltified, false)) < 0) { ++ GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); ++ goto on_error; ++ } + + po = *list++; + (*list_size)--; +@@ -1124,6 +1132,10 @@ struct thread_params { + size_t depth; + size_t working; + size_t data_ready; ++ ++ /* A pb->progress_cb can stop the packing process by returning an error. ++ When that happens, all threads observe the error and stop voluntarily. */ ++ bool stopped; + }; + + static void *threaded_find_deltas(void *arg) +@@ -1133,7 +1145,12 @@ static void *threaded_find_deltas(void *arg) + while (me->remaining) { + if (find_deltas(me->pb, me->list, &me->remaining, + me->window, me->depth) < 0) { +- ; /* TODO */ ++ me->stopped = true; ++ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); ++ me->working = false; ++ git_cond_signal(&me->pb->progress_cond); ++ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_unlock(me->pb) == 0, NULL); ++ return NULL; + } + + GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); +@@ -1175,8 +1192,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + pb->nr_threads = git__online_cpus(); + + if (pb->nr_threads <= 1) { +- find_deltas(pb, list, &list_size, window, depth); +- return 0; ++ return find_deltas(pb, list, &list_size, window, depth); + } + + p = git__mallocarray(pb->nr_threads, sizeof(*p)); +@@ -1195,6 +1211,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + p[i].depth = depth; + p[i].working = 1; + p[i].data_ready = 0; ++ p[i].stopped = 0; + + /* try to split chunks on "path" boundaries */ + while (sub_size && sub_size < list_size && +@@ -1262,7 +1279,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + (!victim || victim->remaining < p[i].remaining)) + victim = &p[i]; + +- if (victim) { ++ if (victim && !target->stopped) { + sub_size = victim->remaining / 2; + list = victim->list + victim->list_size - sub_size; + while (sub_size && list[0]->hash && +@@ -1286,7 +1303,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + } + target->list_size = sub_size; + target->remaining = sub_size; +- target->working = 1; ++ target->working = 1; /* even when target->stopped, so that we don't process this thread again */ + GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); + + if (git_mutex_lock(&target->mutex)) { +@@ -1299,7 +1316,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + git_cond_signal(&target->cond); + git_mutex_unlock(&target->mutex); + +- if (!sub_size) { ++ if (target->stopped || !sub_size) { + git_thread_join(&target->thread, NULL); + git_cond_free(&target->cond); + git_mutex_free(&target->mutex); +@@ -1308,7 +1325,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, + } + + git__free(p); +- return 0; ++ return pb->failure; + } + + #else +@@ -1319,6 +1336,7 @@ int git_packbuilder__prepare(git_packbuilder *pb) + { + git_pobject **delta_list; + size_t i, n = 0; ++ int error; + + if (pb->nr_objects == 0 || pb->done) + return 0; /* nothing to do */ +@@ -1327,8 +1345,10 @@ int git_packbuilder__prepare(git_packbuilder *pb) + * Although we do not report progress during deltafication, we + * at least report that we are in the deltafication stage + */ +- if (pb->progress_cb) +- pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload); ++ if (pb->progress_cb) { ++ if ((error = pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload)) < 0) ++ return git_error_set_after_callback(error); ++ } + + delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list)); + GIT_ERROR_CHECK_ALLOC(delta_list); +@@ -1345,31 +1365,33 @@ int git_packbuilder__prepare(git_packbuilder *pb) + + if (n > 1) { + git__tsort((void **)delta_list, n, type_size_sort); +- if (ll_find_deltas(pb, delta_list, n, ++ if ((error = ll_find_deltas(pb, delta_list, n, + GIT_PACK_WINDOW + 1, +- GIT_PACK_DEPTH) < 0) { ++ GIT_PACK_DEPTH)) < 0) { + git__free(delta_list); +- return -1; ++ return error; + } + } + +- report_delta_progress(pb, pb->nr_objects, true); ++ error = report_delta_progress(pb, pb->nr_objects, true); + + pb->done = true; + git__free(delta_list); +- return 0; ++ return error; + } + +-#define PREPARE_PACK if (git_packbuilder__prepare(pb) < 0) { return -1; } ++#define PREPARE_PACK error = git_packbuilder__prepare(pb); if (error < 0) { return error; } + + int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *payload), void *payload) + { ++ int error; + PREPARE_PACK; + return write_pack(pb, cb, payload); + } + + int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb) + { ++ int error; + PREPARE_PACK; + + return write_pack(pb, &write_pack_buf, buf); +diff --git a/src/libgit2/pack-objects.h b/src/libgit2/pack-objects.h +index bbc8b9430..380a28ebe 100644 +--- a/src/libgit2/pack-objects.h ++++ b/src/libgit2/pack-objects.h +@@ -100,6 +100,10 @@ struct git_packbuilder { + uint64_t last_progress_report_time; + + bool done; ++ ++ /* A non-zero error code in failure causes all threads to shut themselves ++ down. Some functions will return this error code. */ ++ volatile int failure; + }; + + int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb); +diff --git a/tests/libgit2/pack/cancel.c b/tests/libgit2/pack/cancel.c +new file mode 100644 +index 000000000..a0aa9716a +--- /dev/null ++++ b/tests/libgit2/pack/cancel.c +@@ -0,0 +1,240 @@ ++#include "clar_libgit2.h" ++#include "futils.h" ++#include "pack.h" ++#include "hash.h" ++#include "iterator.h" ++#include "vector.h" ++#include "posix.h" ++#include "hash.h" ++#include "pack-objects.h" ++ ++static git_repository *_repo; ++static git_revwalk *_revwalker; ++static git_packbuilder *_packbuilder; ++static git_indexer *_indexer; ++static git_vector _commits; ++static int _commits_is_initialized; ++static git_indexer_progress _stats; ++ ++extern bool git_disable_pack_keep_file_checks; ++ ++static void pack_packbuilder_init(const char *sandbox) { ++ _repo = cl_git_sandbox_init(sandbox); ++ /* cl_git_pass(p_chdir(sandbox)); */ ++ cl_git_pass(git_revwalk_new(&_revwalker, _repo)); ++ cl_git_pass(git_packbuilder_new(&_packbuilder, _repo)); ++ cl_git_pass(git_vector_init(&_commits, 0, NULL)); ++ _commits_is_initialized = 1; ++ memset(&_stats, 0, sizeof(_stats)); ++ p_fsync__cnt = 0; ++} ++ ++void test_pack_cancel__initialize(void) ++{ ++ pack_packbuilder_init("small.git"); ++} ++ ++void test_pack_cancel__cleanup(void) ++{ ++ git_oid *o; ++ unsigned int i; ++ ++ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_FSYNC_GITDIR, 0)); ++ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, false)); ++ ++ if (_commits_is_initialized) { ++ _commits_is_initialized = 0; ++ git_vector_foreach(&_commits, i, o) { ++ git__free(o); ++ } ++ git_vector_free(&_commits); ++ } ++ ++ git_packbuilder_free(_packbuilder); ++ _packbuilder = NULL; ++ ++ git_revwalk_free(_revwalker); ++ _revwalker = NULL; ++ ++ git_indexer_free(_indexer); ++ _indexer = NULL; ++ ++ /* cl_git_pass(p_chdir("..")); */ ++ cl_git_sandbox_cleanup(); ++ _repo = NULL; ++} ++ ++static int seed_packbuilder(void) ++{ ++ int error; ++ git_oid oid, *o; ++ unsigned int i; ++ ++ git_revwalk_sorting(_revwalker, GIT_SORT_TIME); ++ cl_git_pass(git_revwalk_push_ref(_revwalker, "HEAD")); ++ ++ while (git_revwalk_next(&oid, _revwalker) == 0) { ++ o = git__malloc(sizeof(git_oid)); ++ cl_assert(o != NULL); ++ git_oid_cpy(o, &oid); ++ cl_git_pass(git_vector_insert(&_commits, o)); ++ } ++ ++ git_vector_foreach(&_commits, i, o) { ++ if((error = git_packbuilder_insert(_packbuilder, o, NULL)) < 0) ++ return error; ++ } ++ ++ git_vector_foreach(&_commits, i, o) { ++ git_object *obj; ++ cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJECT_COMMIT)); ++ error = git_packbuilder_insert_tree(_packbuilder, ++ git_commit_tree_id((git_commit *)obj)); ++ git_object_free(obj); ++ if (error < 0) ++ return error; ++ } ++ ++ return 0; ++} ++ ++static int fail_stage; ++ ++static int packbuilder_cancel_after_n_calls_cb(int stage, uint32_t current, uint32_t total, void *payload) ++{ ++ ++ /* Force the callback to run again on the next opportunity regardless ++ of how fast we're running. */ ++ _packbuilder->last_progress_report_time = 0; ++ ++ if (stage == fail_stage) { ++ int *calls = (int *)payload; ++ int n = *calls; ++ /* Always decrement, including past zero. This way the error is only ++ triggered once, making sure it is picked up immediately. */ ++ --*calls; ++ if (n == 0) ++ return GIT_EUSER; ++ } ++ ++ return 0; ++} ++ ++static void test_cancel(int n) ++{ ++ ++ int calls_remaining = n; ++ int err; ++ git_buf buf = GIT_BUF_INIT; ++ ++ /* Switch to a small repository, so that `packbuilder_cancel_after_n_calls_cb` ++ can hack the time to call the callback on every opportunity. */ ++ ++ cl_git_pass(git_packbuilder_set_callbacks(_packbuilder, &packbuilder_cancel_after_n_calls_cb, &calls_remaining)); ++ err = seed_packbuilder(); ++ if (!err) ++ err = git_packbuilder_write_buf(&buf, _packbuilder); ++ ++ cl_assert_equal_i(GIT_EUSER, err); ++} ++void test_pack_cancel__cancel_after_add_0(void) ++{ ++ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; ++ test_cancel(0); ++} ++ ++void test_pack_cancel__cancel_after_add_1(void) ++{ ++ cl_skip(); ++ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; ++ test_cancel(1); ++} ++ ++void test_pack_cancel__cancel_after_delta_0(void) ++{ ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(0); ++} ++ ++void test_pack_cancel__cancel_after_delta_1(void) ++{ ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(1); ++} ++ ++void test_pack_cancel__cancel_after_delta_0_threaded(void) ++{ ++#ifdef GIT_THREADS ++ git_packbuilder_set_threads(_packbuilder, 8); ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(0); ++#else ++ cl_skip(); ++#endif ++} ++ ++void test_pack_cancel__cancel_after_delta_1_threaded(void) ++{ ++#ifdef GIT_THREADS ++ git_packbuilder_set_threads(_packbuilder, 8); ++ fail_stage = GIT_PACKBUILDER_DELTAFICATION; ++ test_cancel(1); ++#else ++ cl_skip(); ++#endif ++} ++ ++static int foreach_cb(void *buf, size_t len, void *payload) ++{ ++ git_indexer *idx = (git_indexer *) payload; ++ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); ++ return 0; ++} ++ ++void test_pack_cancel__foreach(void) ++{ ++ git_indexer *idx; ++ ++ seed_packbuilder(); ++ ++#ifdef GIT_EXPERIMENTAL_SHA256 ++ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); ++#else ++ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); ++#endif ++ ++ cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx)); ++ cl_git_pass(git_indexer_commit(idx, &_stats)); ++ git_indexer_free(idx); ++} ++ ++static int foreach_cancel_cb(void *buf, size_t len, void *payload) ++{ ++ git_indexer *idx = (git_indexer *)payload; ++ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); ++ return (_stats.total_objects > 2) ? -1111 : 0; ++} ++ ++void test_pack_cancel__foreach_with_cancel(void) ++{ ++ git_indexer *idx; ++ ++ seed_packbuilder(); ++ ++#ifdef GIT_EXPERIMENTAL_SHA256 ++ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); ++#else ++ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); ++#endif ++ ++ cl_git_fail_with( ++ git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111); ++ git_indexer_free(idx); ++} ++ ++void test_pack_cancel__keep_file_check(void) ++{ ++ assert(!git_disable_pack_keep_file_checks); ++ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, true)); ++ assert(git_disable_pack_keep_file_checks); ++} +diff --git a/tests/resources/small.git/HEAD b/tests/resources/small.git/HEAD +new file mode 100644 +index 0000000000000000000000000000000000000000..cb089cd89a7d7686d284d8761201649346b5aa1c +GIT binary patch +literal 23 +ecmXR)O|w!cN=+-)&qz&7Db~+TEG|hc;sO9;xClW2 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/config b/tests/resources/small.git/config +new file mode 100644 +index 0000000000000000000000000000000000000000..07d359d07cf1ed0c0074fdad71ffff5942f0adfa +GIT binary patch +literal 66 +zcmaz}&M!)h<>D+#Eyypk5{uv*03B5png9R* + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/description b/tests/resources/small.git/description +new file mode 100644 +index 0000000000000000000000000000000000000000..498b267a8c7812490d6479839c5577eaaec79d62 +GIT binary patch +literal 73 +zcmWH|%S+5nO;IRHEyyp$t+PQ$;d2LNXyJgRZve!Elw`VEGWs$&r??@ +Q$yWgB0LrH#Y0~2Y0PnOK(EtDd + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/applypatch-msg.sample b/tests/resources/small.git/hooks/applypatch-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..dcbf8167fa503f96ff6a39c68409007eadc9b1f3 +GIT binary patch +literal 535 +zcmY+AX;Q;542A#a6e8^~FyI8r&I~hf2QJ{GO6(?HuvEG*+#R{4EI%zhfA8r{j%sh$ +zHE~E-UtQd8{bq4@*S%jq3@bmxwQDXGv#o!N`o3AHMw3xD)hy0#>&E&zzl%vRffomqo=v6>_2NRa#TwDdYvTVQyueO*15Nlo%=#DXgC0bhF3vTa`LQGaO9;jeD$OP?~ +za$G4Q{z+Q_{5V?5h;a-noM$P{<>Q~j4o7u%#P6^o^16{y*jU=-K8GYD_dUtdj4FSx +zSC0C!DvAnv%S!4dgk +XB^)11aoGMJPCqWs%IS0YSv(eBT&%T6 + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/commit-msg.sample b/tests/resources/small.git/hooks/commit-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..f3780f92349638ebe32f6baf24c7c3027675d7c9 +GIT binary patch +literal 953 +zcmaJy@-{3h^^Cx;#d0zEA@DDc$nY4ez&|=%jTg@_HU*ub=!!y$xW09TSjlj +z(`I@QCsM`!9&80$I98wsQ8yK#)Orb<8re8FjkKh630D$QUDwi~(gkX=RunYm$rDjk +zlp%RUSnzA#6yjdG5?T?2DcYKp+v_lts0ljn&bh3J0bD5@N@1UKZ190O6ZeWr-BuZ^ +zWRebCX%(%=Xoj#(xYk1Cjtr!=tyBesf@m6}8zY6Ijbz9i9ziI_jG9MvR +zDH*e>^ga9IR?2wrSrAVm;eButj4Y>7(E2?b~jsu>& +zRKCJ7bp#19sqYh627wD%D9R$8=Ml$TNlumDypl~$jBu*G>5fIR^FB0h0Ex&TGZNr> +zL5hs1_K>taRb!|ThN9ns7^@4MXKP+6aGI_UK)T-M#rcP$;kN(Vcf#P)+5GzWa{l@J +z>-E{`$1iiNVYxq27}j;uo%;)r3kJI2xCFF~Ux;$Q%) +wjbk6JlDCM`jU&P+UVOvg`|iYl<7~9k>HHB4I;pdlQ=I-^$DrHaN$@lH1?P!0U;qFB + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/fsmonitor-watchman.sample b/tests/resources/small.git/hooks/fsmonitor-watchman.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..41184ebc318c159f51cd1ebe2290559805df89d8 +GIT binary patch +literal 4777 +zcmbtYYi}F368$Xwipg4lq(BeHMvzvH-4;n7DGJBPqq#tw3aed8+IU5-m)yvL>;Cqh +z8FFRGj$`9CA8aoJ?j^$%==FV``-=rhLcPW`McSytRm~mEO7_&_cAVZrf1fFy*ha@8oe%*-aBYE +zcjzZg>LOkgxuUr-XJnHyD;zmPnRaSc#!k_P*d_BttRdc+J6G7za5#+^Y1nkc2Oowk`ya47uUR3Feu?B(w;S{(VYzxh}q-=#zP@uxSx{wbyPUMFU;K(06)$o{07&3yI?q{GqMcQ1c_^M<0< +zF4acAV)Il-V(rCTC1(;bsZ*}bl8dmejAk~yb`B}!^0;g^(o9kGUfZfDOvyp@x4OQt +zSgWh6T|3eq;9MFs8-#z+FDM1h(IjRUP|``PxupgJ7CUHOH90gbgl^2~97`?_X{P)) +zB*$r1cDlF-%azKND}?Gv`2K8-9v5e`gQoft=j?T<&a13c^!wY_$D`5z-X1g?ty&6- +zQN50{8?bUk9AI->^W@~~nkOghHIC2YN+AXkLQG_2-{Pq3%{`3KUMeG$iIn%%^6*NYb +zn|_BdV#C)n4565VccX;uT8&z3vSi!HXGbUj2B!R +zdz~&#fk#L-&k$fLwo$4?>12g@AXOKFekuo#6EHB%gmpD?1eyh%N8s{2wGoTu +z*@6cEZ^ZW!FAF_|JL`NkV7k}0ow|-2jHwbgH0;c@Dq*o?@&c*HnGdyx6^su8Qk%2{ +z*ye(dxO*6-&>qn1+zw}tc6;=sOX{4WB=VqjTS^))y1jlX2Q;=e!qMmFA5lC$#;BxC +z=Y%tRpWxb+_uQAvAw7Q{HGV#R$xb&udLCzZ+HN?kTyB};1EJ8UlQ5!>5eGW@)RX0n +zkjj>EF!3=0Gl^8dzv$B^NMGRxJoqN4A`xq-@wCbrx*u2NmIJ1xZ%H +zh;{|4T3(!E9sY#Ni(wUJYs1MmIc9bl)(4Nl3_wD_BWB>i<1S(LX7m*{Q7PU$muMS* +zM!%0EZx-Vw=Zey;erC?SNxF;pY@^A%-krqzfLV2meBp1vWdyArFYn`DD19T)Hw(?n +z)}{NP(Lk(o*?gl#B@pP7^*r|=;PIDT4|F#{2Hzh-AL0Rv$6uT;n|WzE4=slK?on@(fZeGhRgQCu56qB +z{+n81Az96qnQjMY*-*r-KV*7;Z#4QuJRJJV$M^KdldiMhj?ImK6~FvwJ*L5a){QoM=L5TYHkGO1$UrO3`a>{?Opw|b +zG(#59NQ#jFL9v~vgOVkM@^^(^A}onOE))yWEwhIlk&{ZyseZ^O0b=w8&O=BK{k<5B +k^Q-B@eG}LeHrquz%(SVEp_N)VhYZikCW__82JXfD17`J9Qvd(} + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-applypatch.sample b/tests/resources/small.git/hooks/pre-applypatch.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..625837e25f91421b8809a097f4a3103dd387ef31 +GIT binary patch +literal 481 +zcmY+ATTa6;5Jms9iouO45IBJXEg&Jm9@v1LPHMM_ZR|;#6tQh$71hSXq*MxP;V& +zj0cY7SCL=x4`a46sF)C>94Gk%=3q$W2s;j6iHtB2$R0%gix4oK@&T~=ALd_o*CKxt +I-`Pv{1Bpzc>;M1& + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-commit.sample b/tests/resources/small.git/hooks/pre-commit.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..10b39b2e26981b8f87ea424e735ef87359066dbb +GIT binary patch +literal 1706 +zcmZuxU2ohr5PY_N#pZ0-F<{-v&v-X^RA+u>k}E$4d&uD7=g_fA8+pNNV=4s0|iD3p<=DTXClTS +zXV23tJ;ECmN@M0j@zUAKEYW@3bv!SeYZ8ZH`YQNTApFVNc;F|9r5p4TqGs=>8E?6y +zi|gY{iM#PG1nL?UE9YCnWTk72kgZPG*Usqw!~Qd3c?~@w2?%eg@~)+VlSs6N5Yf2^ +zz;owF#K#r^&KMq1A`oqVGFpD&-!Pv|Rc +zO3KSqA@h9nSc%bm`0)Amk6*J}@14J*1-219l%%7D!Pl}UK>|lVi0Dfgu2jN3WC!uL +z0ej??b2iSehVgdnWHmZV4kUo*QL#aiIp}U=9x)IXk}JJ7VQ;CI9Rtn5e0VcjbYcVt+`x5D+svCGD;Z5hm*E$jSEQZ%SQ(}oLgslTvrKK@9Qf#b!hajVFnp9@oIix;NcI9Wk +xjnh0ya!AWet{I7YpD;y6HXyzI*lfSvH=o6*7mJZPkuaYpm>vzZ`wyGEBtOQPo|pgt + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/pre-push.sample b/tests/resources/small.git/hooks/pre-push.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..02cbd80c287f959fe33975bb66c56293e3f5b396 +GIT binary patch +literal 1431 +zcmaJ>U60!~5PUX&#a1@z9B{IIZkjLT0t5kq9#8~D(I5{+8&J~9;#ndUk~-ZT`r|uG +z$#K$$J{TsKs*LP1}9!GoZ@4I4myMMG_di|of +z%?llx{O8TS-#^;(OioEmPy%kwWQBA1OMzV{hsQ8XFzS1k!~YQoLa5 +zhtP1fA$q6VmMbbAC_9)4I628k*O5J$NR19uHe4QYDK<==I~SQk)Nu%xQ~KH +z53w=!ke(FGb_PpnZfd*+hnXDTn;2*`u^~;?+5C~cn?bRka7NR%06%e6O91{MAgN6J +zmlO8{Biw4&wr&&(z4p3eln`E}XR9m9bNYZ7Ibrg(4yZIXrfgD7N*AFD7L3YSM#j}% +zo__rOS5fr;@8UM<6cl+cv_$YB$PQ&9dv($eM*))g!_cu!QcSh-mqE9i#QDZT)=o#` +z?8!RtE?w6p?GkGZ-6yt_p~5~4ecu|Sf^)6096%h*q-eNiEA1;Xwg)p~Q&iGSG7-IQ +z9aII&`ps$WOojFA`*bjGkFk|E@sHHuD}W^d`7YJ3YE^zrQnqR +zGoq?;YGKe)93o|_=^f%3U1KYZGPOXRRxK7w`UUbMMa3<86OmVH!EKP$8RCrn9mWX+ +zC?9yF!fRVLmud3hF<}x;;sR}f(*r}6Gap3fR6zLHR~kbMgD{98N`L+r&?3p~*0+FX +zcAL%j=(SO}xTJUTvA`&Lf`2mv4koPG9&|;2+68$XxiXKL@ma;l5d2^5Ba_rPh_DHI-u1#&_upttZXp;no03$20|NFiM +zK#D#xQ>!Z3JkX8T-LDVm!B5j7y_{;JDmmTTef+K1oIiPzeEr+Ai*<2PUgnG4^ZB>p +z_fkAvoR1emuf~ri^K$-px=4#D-vY9w& +z`bCv#2zVn=YnJyeNey(Y +zRh`9vtLw~A+5zsjp|W0Nsa|29Rm!B>OoG5a+vi;ari8O>KkU!KAWg_fa3btK2x*_@ +z0bEc7J;Ubghm}n9bOi(Sv_B66nQ7U)J7f0fO}8Wuf*uorcIgEG +zOHc|-V6+HlRhOP}?Cn?@5iwSl43abmBA^2lyL$+cpabCGVES+v^j^FO_}?FIp%En%Ll?Z*7*}TwrZyg5OSZ9rY-`aU~Mc-jjv{Ll)FLMgtB4ujktfQ`Xhqrka +zT=P!A;9w^;Z?PqpLwOLu=cj3L>TdUKw2;DMu)`oVkj}#bcDx4tYg=j%D`+i{W~fVM +zVmZ>W9VMyin9c-0KzI_;iZ-g|OyzuG`Yq%(%dvl;ifnVr0;jWE&S`z|rQu=!yHBBO +zx`OJ;oOQ(KKM<$(bC38o>pD0%|HA(E0TRw7qj$fJ_pRN+7Nm>dSC(gLg{(`t+5Z=?o+}wXU4tHy+&%F&aRhFebeEhR2R5|$#Ycbp^w@t +zTl%=f1t=w+WpJzF<|CE@?SCNAz)%9?w33lQ8vrHJqPfH9@}qs*QXOG71W=ylx;wOB +zcx!Bj^)Yy6WX$a^vBkBJ5CobqlaDx_B0c<3b+8)f84LCrt;e;qxc+7>VbwVK{skNv!wvBiTa^9Iu +zkwP;VK)jH$WJ{`MRwAA9fal!y0dtV;FWg8PTkWU>CwnqD>1ZX2B@;$DlX%C5MI+}{ +z9xQVnffR*~v2KAUj*hCdgul~`bk#mk`o>zk9)<2Uc8?hUZAEvd!`9em)~$Z)zev>w^8 +zyAgCP_$&Y)7HSQ84`xG}OeTavaEswwF|8Xpi5iZzZa@hCiv(J-%bfFC&)HLlO+Rhw +zG6g?9eL5&A!SuJnQ6}LxG%tU+@vZ`i+!+Rz6iYvsTdhnPo7lW{m-}{hya@viX4)XZ +zngaw+j;gloB#|UwI@8sOmQpc`h+bicQJnQIB5eifIMQNgD2+oai33m!34~xU|0Azj +zhu$8z+T5^;Pxx@d{N)pzOJLSa^e;aDf$W%N5XcOf!mGC9l9j$Ev2h6N+6ZQC+CJzl +zaM7?S!SrFLS2DASjj(h6y1WN3N?|bmqmyzm!&nLoE|`rKBOc_yDF$a#FsUn!IQf(t +zdC&Us(kQz*7mvH^j*^MC@>wTDb}g%~sx*ng#>{@lR=XG-Z5_ +z#<9*Oh0joMzt;nS)ObAp)347`D=}r-;nV!TbIq&xrGRGsF6fZg+!VkfUei@_&l-M& +zPqQ+Dw)RV}+)I8RuqAxa`Pv8e&!_gXS=e2-un>=Ktn}-;%lLZxaVn?Q>yZCb2R3Wk +z77zr%;Rq&h|2ncqyKYmFI0148JVY7Q$V5p=dWj+Qqpu%i|xp2C=WaOb2Wudn^h0EcD%$p9YVU1fnoRV9`(cy(vv6K>FXS!2jY>1GnU--7)4usH&K +zao*&P^@9~YmUe|ZdLW@C>H;!*Vt3>Nw4M*;=?j(TBD#O@XCv0|MEhA;z}kTFRv@`tPHhp=&Yh +zg%Zhg4i7o_k{a5i&f5;tZ==%}^Sn4aD_6%qs_XAuJt&EumdH4Yu`UjT<-+XHTuHss+b +YOmM2;hq8Egm*4=7_P9T{21QBYH*F=mfB*mh + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/prepare-commit-msg.sample b/tests/resources/small.git/hooks/prepare-commit-msg.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..b1970da1b6d3f42f00069fd17c325de72cda812e +GIT binary patch +literal 1702 +zcmb_cTW{Mo6n>t6#i?x6xmZ$SFLf{QfG*3r0L?Pg?px55l8$UTGO3bO;spKi{V3XX +z))weX0X>M9bNMcZ-6yG%>(n}JI2|25dr}WZBP@ih?JX^+@ +zu#5O48P>yRX(mfDIhYP)doc1&TADZa@ZGpusJ$6G+e$ZMcmC +zoOosDQPS}l{H?YPsq(4;0SGkATa9eeqAaDcjq8n2wALbFwU@2i@FAaRV!=uw-nwx1gKn2SvY +z>Ff>;2sg!+Hxfkwv1lsiii=p6WenF=5)6LZcQaZ=aS_}+-4Y&?!@HWh|<^gJ21!|T@+%On#w6azxPHV}XsRbe*w +zR_TZ2XEsQa1lPK~biYqg@0-RW@5J1@=<87cFzEUABdCoFH2CZo?}l(Z*!OFqUxo>K +z_d`l#4d9|H6;VPT{X?^{VJ>oL|D7K{BJwwqB>`YcPoGk+9hbvHnoQ{EM|kPgD_`wk +zKm4#2xu;-y`RAm!=L_BnLvJ8$AZm8@?)v<%vwvsw8AF2x6!mTT;c72A_~U9nIq0ST +zv)N0!I!^1p=g8-RQfx5)E_Mb_4I2vtQpI30XZ&t-9h5!Hn + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/hooks/push-to-checkout.sample b/tests/resources/small.git/hooks/push-to-checkout.sample +new file mode 100755 +index 0000000000000000000000000000000000000000..a80611e18896f212c390d845e49a3f6d5693b41d +GIT binary patch +literal 2840 +zcmai0U31$u5PXh)#YOS7cE^-rw@uolNhe9&aUS|HtvhX>G$45tVUYj>fRdF?|9kfU +zNR~aG=E)WbEbeyq7JTw}ZuHIE2kUtL<AoeCNptd-NM1aZLhESzC;I`+Ns +zfmNNjdAp^W8#Q*}l>CT7RB9F5(BbI8ly2l~+E};JW|>&d1)=epZ-8vm8ppkbEVn#R +zt30a5A-c(YQR8eM5%;|UAnO>rt!&@x@G@yp+92%w-}%(5P_+P&Wf_zb$f-Qrl5(7z +z2ah(bkE;!DK(&aAMuQ%1TS>ai?wSXCOCSj=_}8x4IbCx^$}9q)whwv)SBt| +zg#MX4;;Oau`m=MI9(^&zPbueY@~>3*ixX%mvR5m_1&nAg@ZKvY1E$O}&EtLiG;mhV +z1xhMIm~fGjmf_#{62f`y;09?I7M1W2tWQvz<}i9lR>OpQyUJi45_&*pQus&EkwY<> +zI|ZAx=*3i9a-)g)hXkvO7>UJ5MNgL(Z+-wpXVcgbSgpmFmbf1~DPA(OVGI&FNLeIE +zNH!_aiH$vsif$_j7=T2{cS(!DOI`~bn@)vSd-0d7xL=DF;UNP|tW}4ih>DvHtu9tY_pbJ6x(6E*hxgC +zzNDao%qlr-IE%YGbS4hF!n!on7#W3$bX-_hbZAaws^nHu#)Dx=WzdbJ>AKzAy@T$x +zSWE^x9+|TEHVEPyaPYa0DOChp?AeHSBBDbZNokQpAY{lE!7geZI=jV)G^2@l)&91Zb1+`T+oq9wWF +zRV~kGTGce0O~p^6mj{kT5kL(pv>r;Lvd7VDX*P>A^Th`$3cWO0L81p4Ysdo3ZP1(SrR-peEdTo;-@bkB((G +zPHYQXUL!@Q$e(OQ;R9r%@Afz+50I7>*^^c&&|E*r-jN)LH=pM4AqMwWxSv|nqjddE +Z4{_hwv8!W(T +zYw`X3V>TCdnSD1ru8&`j=2DIPbCT@SnIgUw>$+lEYP}+x8(BMYnr=iT3*ndq)xzaV +z>I+qjv}vC#8_9M+b1p#uNS0M0)q

8!3p_LRQ0MA3M`!2foxzRUjbFY@}O~(ki=S +zqscnq8cU*dY)D$$cqE}n)V0yIk>CNKHCrndOtSP*HbOb;nbwAHSb;R+gs^?^Dve%) +zoW}t(*D}$>O3ab0TS^-;J|u&sb-PkZzo#kn*#xYt(;FGuwzSb^g&RDiGcOz9TB;Hu`nJh)$W=C=XCSm2AY=$w3G3P-V#Oo+N*;#2 +z4ijJ-pBZ=;T(RTgp_HYrD!uW-dTMfkuqY5jwOy)~gM;#=P^i{!l7`pXTS^s(&^{RU +zydaw}OpS#^D1cXM8?FW+fh`t7D(g;yr6|}fdaNtZBx3hlK~IpkTu3!Qq%R+zAo#t}Bs8^3$vHD+-TGT@`F>H1Cc#WAVW;&$S6%fE2d6@kLS0g&ihIM{}0z +z8#XhD>b>3{(BH|Px7}&lJ4%y1v(CihZJx@8MPoGdl*BJGD;usf*iS7%;{Joe; +zNFuBa>*~o&qETDPo~u&~$FxE1xb^x&(CbE`Y3GfsibL2rl+L;>P6j&Y3U>K$mkp*6 +zd`Q{<^+^&;GskGjwD-%!boR&i-TCA9UOR|@=GYb5x#+dhd7fkaVIR^pol`Mv+rUbmZ43dVL6^S7g3{NsPiG$iy$5EDB% +z6KIgnb$H(n&t3e4E6d4V7w^B?JS}JkG)PM6+X3Co`SQs($O*AA+MG~{S7RJ=cy-l& +z>~%3y`tjfx2>uOutB_^s +ziwG=e=ch|FQ0IkN91US7rhdQkXhwwt$gU0WEVDjo=IPb+?6PC=s8}J*ua(Ms))`UL +fi$|vMHn?H_tSE3ettp-hLlsZCxaLX8(nU;bVRB;Ce6@s#eu2|WvLz>- +zvy(&>Gyfp@+BtKnpqWkKi^+v{4jn_pNw_zeuxETifiGO|)w}OANj2n2D^K=o3j6P6uOL70#cbA{uzWXDlk1wr9GV1X(2W{RuTvjXV +zCmd8u +zH%V`94=q3)Dk)PHNrnFC(T1)Om6f{Usj;u1R->&XoCYVK2V3ZlgZuF?N}1+33OER*x +z*9Z=L=zI8CN>A_^jYjt0F$psO$sL=38q5q|SG)qCN6{^>RFh5E&l5GZ$pEahnF&d+ +z5c>64t}uJPkf~_!VUj#&N%nC-gUMj%=@B=!V>&}xtj2%@-mOm#rQUSJ3(ccmc+fza +znZ#uxF>N?QN5UrIEd!5RgHEfW#;(nKYF+D<*rdshJ$X-z2OZ2X;)nn@KSVdVhaA?}@3;6gZxb4v +zozoWSr{{+!h}zGpumG3H`=AvWpm^9kW;J$Jp^Xl*?8ckr`fqN%c|Z;VC0|cM4vSrk +zH_O8Yvh85nvJp^;``wo8=z0f`FWg?`>gO#y1hjX1{}rTlg9rwIKia8eyGexA3GnuR +z`Rg~XZoW;0pA)vI8=p5!+6sIn#C^FCvR>ffv39h6SCNi9v);%WD;WZ`of_MgwyRWy +z-yY%n*Y>X89W-v4`Ff%bx$Vkn}$!Ay}rnY6F$m-Kg*KD_+;Lx#g4|^&N +I02NaX#p`nv=Kufz + +literal 0 +HcmV?d00001 + +diff --git a/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b b/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b +new file mode 100644 +index 0000000000000000000000000000000000000000..822bc151862ec3763cf2d3fa2372b93bbd3a4b65 +GIT binary patch +literal 30 +mcmb>0i}&W3IZ_@1U=^!a~EV1casc=c+{&un1qQN*i9hD|0|m(2n|iwp*q%W +z%N;b$hu%cM`$TMo*~EnC1BFP&Pfj~;jZVKXQ96s_PhV<-XAROi+@-v8dBLUa`!;GB +k^iXlEv8$>R)1G>9th&t3j;s7J{?^9n|7U^`%mXoWC24Q^m!3%@{ + +literal 0 +HcmV?d00001 + diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 6c6bb7451eac..b8e75978e2d3 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.63"; + version = "1.0.65"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-LL8uyzj97Fp7Vbv4WC8OjI2YUzml7v08ITXkDoJAbT4="; + hash = "sha256-SbsHc6gSHPmtDWHR+fJAcvWZMxae/Ufc4XB6cvoPTbE="; }; pythonRelaxDeps = [ diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 757ee6d75d8f..152fef3acc97 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.1.7"; + version = "8.1.8"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-oQL3EI4yTQOi+BM9ZkTILYulWD13Pof3JC1KVLSJWcA="; + hash = "sha256-d/U37QWC6e41P9GuohpWjP0MNZCzHbxFMBBASpIKpQk="; }; - npmDepsHash = "sha256-colrMoVN5uGVBeCvDfEU9tjjW9qkaiSKHPmTZ83EgCk="; + npmDepsHash = "sha256-2v8pGIB5W2jgjsJPKBjymAv2rzq9judVdYZexohAclo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 89348e1ea6b1..d4d295e0057a 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-Geq4I4QjWg2dBfGw0j68gG5butWFLXynLC5c9AQTfPs="; + hash = "sha256-3iaj4bMm9nVDwd8kqBzPdpaAavxb19NwfvSX3oCihRA="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-G+vTW3hYNjZN3V5svltbKEeeUEolAVVbTOaAKVHEcUI="; + cargoHash = "sha256-KEJOpQ9Y832M0IUrm6u7SYWTH8/blDfu0kubS2GMuRE="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/tools/text/papertrail/Gemfile.lock index 37cd23eab6f5..5c3d3f0aa3c5 100644 --- a/pkgs/tools/text/papertrail/Gemfile.lock +++ b/pkgs/tools/text/papertrail/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: ansi (1.5.0) chronic (0.10.2) - papertrail (0.10.1) + papertrail (0.11.2) ansi (~> 1.5) chronic (~> 0.10) @@ -14,4 +14,4 @@ DEPENDENCIES papertrail BUNDLED WITH - 2.1.4 + 2.5.16 diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index 5e2b080f9852..a01bc3fb889c 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript, testers, papertrail }: let papertrail-env = bundlerEnv { @@ -21,6 +21,8 @@ in stdenv.mkDerivation { passthru.updateScript = bundlerUpdateScript "papertrail"; + passthru.tests.version = testers.testVersion { package = papertrail; }; + meta = with lib; { description = "Command-line client for Papertrail log management service"; mainProgram = "papertrail"; diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/tools/text/papertrail/gemset.nix index dcdfcdf7ea58..abfbed17a987 100644 --- a/pkgs/tools/text/papertrail/gemset.nix +++ b/pkgs/tools/text/papertrail/gemset.nix @@ -1,5 +1,7 @@ { ansi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14ims9zfal4gs2wpx2m5rd8zsrl2k794d359shkrsgg3fhr2a22l"; @@ -8,6 +10,8 @@ version = "1.5.0"; }; chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -16,11 +20,14 @@ version = "0.10.2"; }; papertrail = { + dependencies = ["ansi" "chronic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vb7bh7qh5hr4v3w711bl0yrr3rlhz5c3h3qx3fq31dr5y4100v7"; + sha256 = "170zhgahrgpwj4cb9xj8104yqcf9gva8qk5vqpmw3g8rq29jxshy"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.2"; }; } diff --git a/pkgs/tools/typesetting/bibtex-tidy/default.nix b/pkgs/tools/typesetting/bibtex-tidy/default.nix index 2c1167fc21cd..862c82c9d5c9 100644 --- a/pkgs/tools/typesetting/bibtex-tidy/default.nix +++ b/pkgs/tools/typesetting/bibtex-tidy/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "bibtex-tidy"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "FlamingTempura"; repo = "bibtex-tidy"; - rev = "9658d907d990fd80d25ab37d9aee120451bf5d19"; - hash = "sha256-4TrEabxIVB0Vu/E1ClKwk7lXcnPgoVh3RjLYsPwH2yQ="; + rev = "v${version}"; + hash = "sha256-sMgy29deEfc3DFSC0Z4JZCeNAFpBKNYj+mJnFI1pSY4="; }; - npmDepsHash = "sha256-VzzHGmW7Rb6dEdBxd84GXKSPasqfTkn+5rNw9C2lt8k="; + npmDepsHash = "sha256-FKde5/ZZcS5g0fUaDjhRlKGLiS8kk1PvkZw9PUmvAAE="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7686e7424890..c874ee7429e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29210,8 +29210,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - elvis = callPackage ../applications/editors/elvis { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 emacs28-gtk2 @@ -30189,10 +30187,6 @@ with pkgs; hmm = callPackage ../applications/misc/hmm { }; - homebank = callPackage ../applications/office/homebank { - gtk = gtk3; - }; - hollywood = callPackage ../applications/misc/hollywood { inherit (python3Packages) pygments; }; @@ -38008,9 +38002,7 @@ with pkgs; nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; - nix-serve = callPackage ../tools/package-management/nix-serve { - nix = nixVersions.nix_2_18; - }; + nix-serve = callPackage ../tools/package-management/nix-serve { }; nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 52bf1b19da26..57d29f4d91ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1047,16 +1047,16 @@ with self; { ArchiveLibarchive = buildPerlPackage { pname = "Archive-Libarchive"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.08.tar.gz"; - hash = "sha256-6ONC1U/T1uXn4xYP4IjBOgpQM8/76JSBodJHHUNyAFk="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.09.tar.gz"; + hash = "sha256-avdG7P9/GjUwzmtaWNCtR0MaaZjUWduw8VYqEiPn3v8="; }; patches = [ ../development/perl-modules/ArchiveLibarchive-set-findlib-path.patch ]; postPatch = '' - substituteInPlace lib/Archive/Libarchive/Lib.pm --replace "@@libarchive@@" "${pkgs.libarchive.lib}/lib" + substituteInPlace lib/Archive/Libarchive/Lib.pm --replace-fail "@@libarchive@@" "${lib.getLib pkgs.libarchive}/lib" ''; - buildInputs = [ FFIC Filechdir PathTiny SubIdentify TermTable Test2Suite Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; + buildInputs = [ FFIC Filechdir PathTiny SubIdentify Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; propagatedBuildInputs = [ FFICStat FFICheckLib FFIPlatypus FFIPlatypusTypeEnum FFIPlatypusTypePtrObject RefUtil ]; meta = { homepage = "https://metacpan.org/pod/Archive::Libarchive"; @@ -9517,10 +9517,10 @@ with self; { FFIPlatypus = buildPerlPackage { pname = "FFI-Platypus"; - version = "2.08"; + version = "2.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.08.tar.gz"; - hash = "sha256-EbOrEU7ZY1YxzYWzjSKXhuFEv5Sjr5rAnD17s0M2uSQ="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.09.tar.gz"; + hash = "sha256-nTEjEiieeHNbRcMRt6wWqejaCT93m/aUaccK+sTdW2M="; }; buildInputs = [ AlienFFI Test2Suite ]; propagatedBuildInputs = [ CaptureTiny FFICheckLib ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e081cf227c56..74cb990650ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15778,6 +15778,8 @@ self: super: with self; { treeo = callPackage ../development/python-modules/treeo { }; + treescope = callPackage ../development/python-modules/treescope { }; + treex = callPackage ../development/python-modules/treex { }; treq = callPackage ../development/python-modules/treq { }; @@ -17864,6 +17866,8 @@ self: super: with self; { zulip = callPackage ../development/python-modules/zulip { }; + zulip-emoji-mapping = callPackage ../development/python-modules/zulip-emoji-mapping { }; + zwave-me-ws = callPackage ../development/python-modules/zwave-me-ws { }; zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { };