diff --git a/lib/asserts.nix b/lib/asserts.nix index b22252a7654b..41908d00a812 100644 --- a/lib/asserts.nix +++ b/lib/asserts.nix @@ -1,5 +1,16 @@ { lib }: +let + inherit (lib.strings) + concatStringsSep + ; + inherit (lib.lists) + filter + ; + inherit (lib.trivial) + showWarnings + ; +in rec { /** @@ -131,4 +142,61 @@ rec { "each element in ${name} must be one of ${lib.generators.toPretty { } xs}, but is: ${ lib.generators.toPretty { } vals }"; + + /** + Wrap a value with logic that throws an error when assertions + fail and emits any warnings. + + # Inputs + + `assertions` + + : A list of assertions. If any of their `assertion` attrs is `false`, their `message` attrs will be emitted in a `throw`. + + `warnings` + + : A list of strings to emit as warnings. This function does no filtering on this list. + + `val` + + : A value to return, wrapped in `warn`, if a `throw` is not necessary. + + # Type + + ``` + checkAssertWarn :: [ { assertion :: Bool; message :: String } ] -> [ String ] -> Any -> Any + ``` + + # Examples + :::{.example} + ## `lib.asserts.checkAssertWarn` usage example + ```nix + checkAssertWarn + [ { assertion = false; message = "Will fail"; } ] + [ ] + null + stderr> error: + stderr> Failed assertions: + stderr> - Will fail + + checkAssertWarn + [ { assertion = true; message = "Will not fail"; } ] + [ "Will warn" ] + null + stderr> evaluation warning: Will warn + null + ``` + + ::: + */ + checkAssertWarn = + assertions: warnings: val: + let + failedAssertions = map (x: x.message) (filter (x: !x.assertion) assertions); + in + if failedAssertions != [ ] then + throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" + else + showWarnings warnings val; + } diff --git a/lib/licenses.nix b/lib/licenses.nix index 2aa16bc0f305..38fb12d2a887 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -651,6 +651,11 @@ lib.mapAttrs mkLicense ( url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception"; }; + gpl2UBDLPlus = { + fullName = "GNU General Public License v3.0 or later (with UBDL exception)"; + url = "https://spdx.org/licenses/UBDL-exception.html"; + }; + gpl2Oss = { fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; url = "https://www.mysql.com/about/legal/licensing/foss-exception"; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index de33fce3e8eb..7378b3bc5ecb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -146,6 +146,10 @@ rec { riscv64 = riscv "64"; riscv32 = riscv "32"; + riscv64-musl = { + config = "riscv64-unknown-linux-musl"; + }; + riscv64-embedded = { config = "riscv64-none-elf"; libc = "newlib"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 25e657c37d32..6cf65123db85 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11409,6 +11409,17 @@ githubId = 10786794; name = "Markus Hihn"; }; + jess = { + name = "Jessica"; + email = "jess+nix@jessie.cafe"; + github = "ttrssreal"; + githubId = 43591752; + keys = [ + { + fingerprint = "8092 3BD1 ECD0 E436 671D C8E9 BA33 5068 6C91 8606"; + } + ]; + }; jessemoore = { email = "jesse@jessemoore.dev"; github = "jesseDMoore1994"; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 675ce7176a0a..d5cf314c2678 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -562,7 +562,7 @@ - All services that require a root certificate bundle now use the value of a new read-only option, `security.pki.caBundle`. -- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes. +- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes. The settings options have been modified to use an attrset, enabling configurations with multiple instances of the daemon running at once, eg, for two separate drive bays. - `nextcloud-news-updater` is unmaintained and was removed from nixpkgs. diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index b95142bc83b5..13c90aa9ab7a 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -3,6 +3,7 @@ { config, + options, pkgs, lib, utils, @@ -258,50 +259,29 @@ in ''; }; + assertions = lib.mkOption { + type = options.assertions.type; + default = [ ]; + internal = true; + visible = false; + description = '' + Assertions only evaluated by the repart image, not by the system toplevel. + ''; + }; + + warnings = lib.mkOption { + type = options.warnings.type; + default = [ ]; + internal = true; + visible = false; + description = '' + Warnings only evaluated by the repart image, not by the system toplevel. + ''; + }; + }; config = { - assertions = lib.mapAttrsToList ( - fileName: partitionConfig: - let - inherit (partitionConfig) repartConfig; - labelLength = builtins.stringLength repartConfig.Label; - in - { - assertion = repartConfig ? Label -> GPTMaxLabelLength >= labelLength; - message = '' - The partition label '${repartConfig.Label}' - defined for '${fileName}' is ${toString labelLength} characters long, - but the maximum label length supported by UEFI is ${toString GPTMaxLabelLength}. - ''; - } - ) cfg.partitions; - - warnings = lib.filter (v: v != null) ( - lib.mapAttrsToList ( - fileName: partitionConfig: - let - inherit (partitionConfig) repartConfig; - suggestedMaxLabelLength = GPTMaxLabelLength - 2; - labelLength = builtins.stringLength repartConfig.Label; - in - if (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) then - '' - The partition label '${repartConfig.Label}' - defined for '${fileName}' is ${toString labelLength} characters long. - The suggested maximum label length is ${toString suggestedMaxLabelLength}. - - If you use sytemd-sysupdate style A/B updates, this might - not leave enough space to increment the version number included in - the label in a future release. For example, if your label is - ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and - you're at version 9, you cannot increment this to 10. - '' - else - null - ) cfg.partitions - ); - image.baseName = let version = config.image.repart.version; @@ -352,6 +332,47 @@ in }; finalPartitions = lib.mapAttrs addClosure cfg.partitions; + + assertions = lib.mapAttrsToList ( + fileName: partitionConfig: + let + inherit (partitionConfig) repartConfig; + labelLength = builtins.stringLength repartConfig.Label; + in + { + assertion = repartConfig ? Label -> GPTMaxLabelLength >= labelLength; + message = '' + The partition label '${repartConfig.Label}' + defined for '${fileName}' is ${toString labelLength} characters long, + but the maximum label length supported by UEFI is ${toString GPTMaxLabelLength}. + ''; + } + ) cfg.partitions; + + warnings = lib.filter (v: v != null) ( + lib.mapAttrsToList ( + fileName: partitionConfig: + let + inherit (partitionConfig) repartConfig; + suggestedMaxLabelLength = GPTMaxLabelLength - 2; + labelLength = builtins.stringLength repartConfig.Label; + in + if (repartConfig ? Label && labelLength >= suggestedMaxLabelLength) then + '' + The partition label '${repartConfig.Label}' + defined for '${fileName}' is ${toString labelLength} characters long. + The suggested maximum label length is ${toString suggestedMaxLabelLength}. + + If you use sytemd-sysupdate style A/B updates, this might + not leave enough space to increment the version number included in + the label in a future release. For example, if your label is + ${toString GPTMaxLabelLength} characters long (the maximum enforced by UEFI) and + you're at version 9, you cannot increment this to 10. + '' + else + null + ) cfg.partitions + ); }; system.build.image = @@ -367,21 +388,22 @@ in ); mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions; + val = pkgs.callPackage ./repart-image.nix { + systemd = cfg.package; + imageFileBasename = config.image.baseName; + inherit (cfg) + name + version + compression + split + seed + sectorSize + finalPartitions + ; + inherit fileSystems definitionsDirectory mkfsEnv; + }; in - pkgs.callPackage ./repart-image.nix { - systemd = cfg.package; - imageFileBasename = config.image.baseName; - inherit (cfg) - name - version - compression - split - seed - sectorSize - finalPartitions - ; - inherit fileSystems definitionsDirectory mkfsEnv; - }; + lib.asserts.checkAssertWarn cfg.assertions cfg.warnings val; }; meta.maintainers = with lib.maintainers; [ diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index 942425d63f7e..a1e36012893d 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -18,64 +18,162 @@ in "hddfancontrol" "smartctl" ] "Smartctl is now automatically used when necessary, which makes this option redundant") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "disks" + ] "Disks should now be specified per hddfancontrol instance in its attrset") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "pwmPaths" + ] "Pwm Paths should now be specified per hddfancontrol instance in its attrset") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "logVerbosity" + ] "Log Verbosity should now be specified per hddfancontrol instance in its attrset") + (lib.mkRemovedOptionModule [ + "services" + "hddfancontrol" + "extraArgs" + ] "Extra Args should now be specified per hddfancontrol instance in its attrset") ]; options = { services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon"; - services.hddfancontrol.disks = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = [ ]; - description = '' - Drive(s) to get temperature from - ''; - example = [ "/dev/sda" ]; - }; + services.hddfancontrol.settings = lib.mkOption { + type = lib.types.attrsWith { + placeholder = "drive-bay-name"; + elemType = ( + lib.types.submodule ( + { ... }: + { + options = { + disks = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + Drive(s) to get temperature from + ''; + example = [ "/dev/sda" ]; + }; - services.hddfancontrol.pwmPaths = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = [ ]; - description = '' - PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values - ''; - example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ]; - }; + pwmPaths = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values + ''; + example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ]; + }; - services.hddfancontrol.logVerbosity = lib.mkOption { - type = lib.types.enum [ - "TRACE" - "DEBUG" - "INFO" - "WARN" - "ERROR" - ]; - default = "INFO"; - description = '' - Verbosity of the log level - ''; - }; + logVerbosity = lib.mkOption { + type = lib.types.enum [ + "TRACE" + "DEBUG" + "INFO" + "WARN" + "ERROR" + ]; + default = "INFO"; + description = '' + Verbosity of the log level + ''; + }; - services.hddfancontrol.extraArgs = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Extra commandline arguments for hddfancontrol + ''; + example = [ + "--min-fan-speed-prct=10" + "--interval=1min" + ]; + }; + }; + } + ) + ); + }; + default = { }; description = '' - Extra commandline arguments for hddfancontrol + Parameter-sets for each instance of hddfancontrol. + ''; + example = lib.literalExpression '' + { + harddrives = { + disks = [ + "/dev/sda" + "/dev/sdb" + "/dev/sdc" + ]; + pwmPaths = [ + "/sys/class/hwmon/hwmon1/pwm1:25:10" + ]; + logVerbosity = "DEBUG"; + }; + ssddrives = { + disks = [ + "/dev/sdd" + "/dev/sde" + "/dev/sdf" + ]; + pwmPaths = [ + "/sys/class/hwmon/hwmon1/pwm2:25:10" + ]; + extraArgs = [ + "--interval=30s" + ]; + }; + } ''; - example = [ - "--min-fan-speed-prct=10" - "--interval=1min" - ]; }; }; config = lib.mkIf cfg.enable ( let - args = lib.concatLists [ - [ "-d" ] - cfg.disks - [ "-p" ] - cfg.pwmPaths - cfg.extraArgs + args = + cnf: + lib.concatLists [ + [ "-d" ] + cnf.disks + [ "-p" ] + cnf.pwmPaths + cnf.extraArgs + ]; + + createService = cnf: { + description = "HDD fan control"; + documentation = [ "man:hddfancontrol(1)" ]; + after = [ "hddtemp.service" ]; + wants = [ "hddtemp.service" ]; + serviceConfig = { + ExecStart = "${lib.getExe pkgs.hddfancontrol} -v ${cnf.logVerbosity} daemon ${lib.escapeShellArgs (args cnf)}"; + + CPUSchedulingPolicy = "rr"; + CPUSchedulingPriority = 49; + + ProtectSystem = "strict"; + PrivateTmp = true; + ProtectHome = true; + SystemCallArchitectures = "native"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + }; + wantedBy = [ "multi-user.target" ]; + }; + + services = lib.attrsets.mergeAttrsList [ + (lib.attrsets.mapAttrs' ( + name: cnf: lib.nameValuePair "hddfancontrol-${name}" (createService cnf) + ) cfg.settings) + { + "hddfancontrol".enable = false; + } ]; in { @@ -83,16 +181,10 @@ in hardware.sensor.hddtemp = { enable = true; - drives = cfg.disks; + drives = lib.lists.flatten (lib.attrsets.catAttrs "disks" (lib.attrsets.attrValues cfg.settings)); }; - systemd.services.hddfancontrol = { - wantedBy = [ "multi-user.target" ]; - environment = { - HDDFANCONTROL_LOG_LEVEL = cfg.logVerbosity; - HDDFANCONTROL_DAEMON_ARGS = lib.escapeShellArgs args; - }; - }; + systemd.services = services; } ); } diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index 49d76a82a921..06ee43f2a26d 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -596,7 +596,9 @@ in ${pkgs.envsubst}/bin/envsubst -i ${configJson} -o ${cfg.dataDir}/config.json export PHPRC=${phpIni} + INIT=false if [[ ! -s ${cfg.dataDir}/.env ]]; then + INIT=true # init .env file echo "APP_KEY=" > ${cfg.dataDir}/.env ${artisanWrapper}/bin/librenms-artisan key:generate --ansi @@ -655,6 +657,10 @@ in echo "${package.version}" > ${cfg.dataDir}/version fi + if [[ $INIT == "true" ]]; then + ${artisanWrapper}/bin/librenms-artisan db:seed --force --no-interaction + fi + # regenerate cache if package has changed if [[ $OLD_PACKAGE != "${package}" ]]; then ${artisanWrapper}/bin/librenms-artisan view:clear diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index dd03daefe710..0a6a09dabf2b 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -369,7 +369,7 @@ in RuntimeDirectoryMode = "0400"; LoadCredential = [ "credentials.json:${tunnel.credentialsFile}" - ] ++ (lib.optional (certFile != null) "cert.pem:certFile"); + ] ++ (lib.optional (certFile != null) "cert.pem:${certFile}"); ExecStart = "${cfg.package}/bin/cloudflared tunnel --config=${mkConfigFile} --no-autoupdate run"; Restart = "on-failure"; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index f76509d78b69..0a901148dc9c 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -55,10 +55,19 @@ let were removed. Please use, respectively, {rescanIntervalS,fsWatcherEnabled,fsWatcherDelayS} instead. '' { - devices = map ( - device: - if builtins.isString device then { deviceId = cfg.settings.devices.${device}.id; } else device - ) folder.devices; + devices = + let + folderDevices = folder.devices; + in + map ( + device: + if builtins.isString device then + { deviceId = cfg.settings.devices.${device}.id; } + else if builtins.isAttrs device then + { deviceId = cfg.settings.devices.${device.name}.id; } // device + else + throw "Invalid type for devices in folder '${folderName}'; expected list or attrset." + ) folderDevices; } ) (filterAttrs (_: folder: folder.enable) cfg.settings.folders); @@ -128,9 +137,79 @@ let # don't exist in the array given. That's why we use here `POST`, and # only if s.override == true then we DELETE the relevant folders # afterwards. - (map (new_cfg: '' - curl -d ${lib.escapeShellArg (builtins.toJSON new_cfg)} -X POST ${s.baseAddress} - '')) + (map ( + new_cfg: + let + jsonPreSecretsFile = pkgs.writeTextFile { + name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json"; + text = builtins.toJSON new_cfg; + }; + injectSecretsJqCmd = + { + # There are no secrets in `devs`, so no massaging needed. + "devs" = "${jq} ."; + "dirs" = + let + folder = new_cfg; + devicesWithSecrets = lib.pipe folder.devices [ + (lib.filter (device: (builtins.isAttrs device) && device ? encryptionPasswordFile)) + (map (device: { + deviceId = device.deviceId; + variableName = "secret_${builtins.hashString "sha256" device.encryptionPasswordFile}"; + secretPath = device.encryptionPasswordFile; + })) + ]; + # At this point, `jsonPreSecretsFile` looks something like this: + # + # { + # ..., + # "devices": [ + # { + # "deviceId": "id1", + # "encryptionPasswordFile": "/etc/bar-encryption-password", + # "name": "..." + # } + # ], + # } + # + # We now generate a `jq` command that can replace those + # `encryptionPasswordFile`s with `encryptionPassword`. + # The `jq` command ends up looking like this: + # + # jq --rawfile secret_DEADBEEF /etc/bar-encryption-password ' + # .devices[] |= ( + # if .deviceId == "id1" then + # del(.encryptionPasswordFile) | + # .encryptionPassword = $secret_DEADBEEF + # else + # . + # end + # ) + # ' + jqUpdates = map (device: '' + .devices[] |= ( + if .deviceId == "${device.deviceId}" then + del(.encryptionPasswordFile) | + .encryptionPassword = ''$${device.variableName} + else + . + end + ) + '') devicesWithSecrets; + jqRawFiles = map ( + device: "--rawfile ${device.variableName} ${lib.escapeShellArg device.secretPath}" + ) devicesWithSecrets; + in + "${jq} ${lib.concatStringsSep " " jqRawFiles} ${ + lib.escapeShellArg (lib.concatStringsSep "|" ([ "." ] ++ jqUpdates)) + }"; + } + .${conf_type}; + in + '' + ${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress} + '' + )) (lib.concatStringsSep "\n") ] /* @@ -438,11 +517,48 @@ in }; devices = mkOption { - type = types.listOf types.str; + type = types.listOf ( + types.oneOf [ + types.str + (types.submodule ( + { ... }: + { + freeformType = settingsFormat.type; + options = { + name = mkOption { + type = types.str; + default = null; + description = '' + The name of a device defined in the + [devices](#opt-services.syncthing.settings.devices) + option. + ''; + }; + encryptionPasswordFile = mkOption { + type = types.nullOr ( + types.pathWith { + inStore = false; + absolute = true; + } + ); + default = null; + description = '' + Path to encryption password. If set, the file will be read during + service activation, without being embedded in derivation. + ''; + }; + }; + } + )) + ] + ); default = [ ]; description = '' The devices this folder should be shared with. Each device must be defined in the [devices](#opt-services.syncthing.settings.devices) option. + + A list of either strings or attribute sets, where values + are device names or device configurations. ''; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 0a6647e0cab7..6f92c0ca5e58 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -9,6 +9,11 @@ with lib; let cfg = config.services.nextcloud; + + overridePackage = cfg.package.override { + inherit (config.security.pki) caBundle; + }; + fpm = config.services.phpfpm.pools.nextcloud; jsonFormat = pkgs.formats.json { }; @@ -51,13 +56,13 @@ let }; webroot = - pkgs.runCommand "${cfg.package.name or "nextcloud"}-with-apps" + pkgs.runCommand "${overridePackage.name or "nextcloud"}-with-apps" { preferLocalBuild = true; } '' mkdir $out - ln -sfv "${cfg.package}"/* "$out" + ln -sfv "${overridePackage}"/* "$out" ${concatStrings ( mapAttrsToList ( name: store: @@ -185,8 +190,8 @@ let mysqlLocal = cfg.database.createLocally && cfg.config.dbtype == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql"; - nextcloudGreaterOrEqualThan = versionAtLeast cfg.package.version; - nextcloudOlderThan = versionOlder cfg.package.version; + nextcloudGreaterOrEqualThan = versionAtLeast overridePackage.version; + nextcloudOlderThan = versionOlder overridePackage.version; # https://github.com/nextcloud/documentation/pull/11179 ocmProviderIsNotAStaticDirAnymore = @@ -1028,12 +1033,12 @@ in If you have an existing installation with a custom table prefix, make sure it is set correctly in `config.php` and remove the option from your NixOS config. '') - ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) - ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) - ++ (optional (versionOlder cfg.package.version "28") (upgradeWarning 27 "24.05")) - ++ (optional (versionOlder cfg.package.version "29") (upgradeWarning 28 "24.11")) - ++ (optional (versionOlder cfg.package.version "30") (upgradeWarning 29 "24.11")) - ++ (optional (versionOlder cfg.package.version "31") (upgradeWarning 30 "25.05")); + ++ (optional (versionOlder overridePackage.version "26") (upgradeWarning 25 "23.05")) + ++ (optional (versionOlder overridePackage.version "27") (upgradeWarning 26 "23.11")) + ++ (optional (versionOlder overridePackage.version "28") (upgradeWarning 27 "24.05")) + ++ (optional (versionOlder overridePackage.version "29") (upgradeWarning 28 "24.11")) + ++ (optional (versionOlder overridePackage.version "30") (upgradeWarning 29 "24.11")) + ++ (optional (versionOlder overridePackage.version "31") (upgradeWarning 30 "25.05")); services.nextcloud.package = with pkgs; @@ -1386,6 +1391,8 @@ in datadirectory = lib.mkDefault "${datadir}/data"; trusted_domains = [ cfg.hostName ]; "upgrade.disable-web" = true; + # NixOS already provides its own integrity check and the nix store is read-only, therefore Nextcloud does not need to do its own integrity checks. + "integrity.check.disabled" = true; }) (lib.mkIf cfg.configureRedis { "memcache.distributed" = ''\OC\Memcache\Redis''; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 75738bc0f5db..56e97d3fdea9 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -77,14 +77,7 @@ let ); # Handle assertions and warnings - - failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions); - - baseSystemAssertWarn = - if failedAssertions != [ ] then - throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" - else - showWarnings config.warnings baseSystem; + baseSystemAssertWarn = lib.asserts.checkAssertWarn config.assertions config.warnings baseSystem; # Replace runtime dependencies system = diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ab914de71f38..bd191334efe8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1273,6 +1273,7 @@ in syncthing-no-settings = handleTest ./syncthing-no-settings.nix { }; syncthing-init = handleTest ./syncthing-init.nix { }; syncthing-many-devices = handleTest ./syncthing-many-devices.nix { }; + syncthing-folders = runTest ./syncthing-folders.nix; syncthing-relay = handleTest ./syncthing-relay.nix { }; sysinit-reactivation = runTest ./sysinit-reactivation.nix; systemd = handleTest ./systemd.nix { }; diff --git a/nixos/tests/librenms.nix b/nixos/tests/librenms.nix index d8d3e5eb92fa..d4aff22392cf 100644 --- a/nixos/tests/librenms.nix +++ b/nixos/tests/librenms.nix @@ -50,9 +50,6 @@ in API_USER_NAME=api API_TOKEN=${api_token} # random md5 hash - # seeding database to get the admin roles - ${pkgs.librenms}/artisan db:seed --force --no-interaction - # we don't need to know the password, it just has to exist API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1) ${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix index 802c070b879d..53800b8238bc 100644 --- a/nixos/tests/nextcloud/with-objectstore.nix +++ b/nixos/tests/nextcloud/with-objectstore.nix @@ -26,11 +26,13 @@ runTest ( nodes = { nextcloud = - { config, pkgs, ... }: { - networking.firewall.allowedTCPPorts = [ 9000 ]; - environment.systemPackages = [ pkgs.minio-client ]; - + config, + pkgs, + nodes, + ... + }: + { services.nextcloud.config.dbtype = "sqlite"; services.nextcloud.config.objectstore.s3 = { @@ -39,13 +41,66 @@ runTest ( autocreate = true; key = accessKey; secretFile = "${pkgs.writeText "secretKey" secretKey}"; - hostname = "nextcloud"; - useSsl = false; - port = 9000; + hostname = "acme.test"; + useSsl = true; + port = 443; usePathStyle = true; region = "us-east-1"; }; + security.pki.certificates = [ + (builtins.readFile ../common/acme/server/ca.cert.pem) + ]; + + environment.systemPackages = [ pkgs.minio-client ]; + + # The dummy certs are for acme.test, so we pretend that's the FQDN + # of the minio VM. + networking.extraHosts = '' + ${nodes.minio.networking.primaryIPAddress} acme.test + ''; + }; + + client = + { nodes, ... }: + { + security.pki.certificates = [ + (builtins.readFile ../common/acme/server/ca.cert.pem) + ]; + networking.extraHosts = '' + ${nodes.minio.networking.primaryIPAddress} acme.test + ''; + }; + + minio = + { ... }: + { + security.pki.certificates = [ + (builtins.readFile ../common/acme/server/ca.cert.pem) + ]; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + + virtualHosts."acme.test" = { + onlySSL = true; + sslCertificate = ../common/acme/server/acme.test.cert.pem; + sslCertificateKey = ../common/acme/server/acme.test.key.pem; + locations."/".proxyPass = "http://127.0.0.1:9000"; + }; + }; + + networking.extraHosts = '' + 127.0.0.1 acme.test + ''; + + networking.firewall.allowedTCPPorts = [ + 9000 + 80 + 443 + ]; + services.minio = { enable = true; listenAddress = "0.0.0.0:9000"; @@ -56,18 +111,22 @@ runTest ( }; test-helpers.init = '' - nextcloud.wait_for_open_port(9000) + minio.start() + minio.wait_for_open_port(9000) + minio.wait_for_unit("nginx.service") + minio.wait_for_open_port(443) ''; test-helpers.extraTests = { nodes, ... }: '' + with subtest("File is not on the filesystem"): nextcloud.succeed("test ! -e ${nodes.nextcloud.services.nextcloud.home}/data/root/files/test-shared-file") with subtest("Check if file is in S3"): nextcloud.succeed( - "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" + "mc config host add minio https://acme.test ${accessKey} ${secretKey} --api s3v4" ) files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n') @@ -100,8 +159,8 @@ runTest ( with subtest("Test download from S3"): client.succeed( "env AWS_ACCESS_KEY_ID=${accessKey} AWS_SECRET_ACCESS_KEY=${secretKey} " - + f"${lib.getExe pkgs.awscli2} s3 cp s3://nextcloud/{file} test --endpoint-url http://nextcloud:9000 " - + "--region us-east-1" + + f"${lib.getExe pkgs.awscli2} s3 cp s3://nextcloud/{file} test --endpoint-url https://acme.test " + + "--region us-east-1 --ca-bundle /etc/ssl/certs/ca-bundle.crt" ) client.succeed("test hi = $(cat test)") diff --git a/nixos/tests/syncthing-folders.nix b/nixos/tests/syncthing-folders.nix new file mode 100644 index 000000000000..d0623f7194d5 --- /dev/null +++ b/nixos/tests/syncthing-folders.nix @@ -0,0 +1,135 @@ +{ lib, pkgs, ... }: +let + genNodeId = + name: + pkgs.runCommand "syncthing-test-certs-${name}" { } '' + mkdir -p $out + ${pkgs.syncthing}/bin/syncthing generate --config=$out + ${pkgs.libxml2}/bin/xmllint --xpath 'string(configuration/device/@id)' $out/config.xml > $out/id + ''; + idA = genNodeId "a"; + idB = genNodeId "b"; + idC = genNodeId "c"; + testPassword = "it's a secret"; +in +{ + name = "syncthing"; + meta.maintainers = with pkgs.lib.maintainers; [ zarelit ]; + + nodes = { + a = + { config, ... }: + { + environment.etc.bar-encryption-password.text = testPassword; + services.syncthing = { + enable = true; + openDefaultPorts = true; + cert = "${idA}/cert.pem"; + key = "${idA}/key.pem"; + settings = { + devices.b.id = lib.fileContents "${idB}/id"; + devices.c.id = lib.fileContents "${idC}/id"; + folders.foo = { + path = "/var/lib/syncthing/foo"; + devices = [ "b" ]; + }; + folders.bar = { + path = "/var/lib/syncthing/bar"; + devices = [ + { + name = "c"; + encryptionPasswordFile = "/etc/${config.environment.etc.bar-encryption-password.target}"; + } + ]; + }; + }; + }; + }; + b = + { config, ... }: + { + environment.etc.bar-encryption-password.text = testPassword; + services.syncthing = { + enable = true; + openDefaultPorts = true; + cert = "${idB}/cert.pem"; + key = "${idB}/key.pem"; + settings = { + devices.a.id = lib.fileContents "${idA}/id"; + devices.c.id = lib.fileContents "${idC}/id"; + folders.foo = { + path = "/var/lib/syncthing/foo"; + devices = [ "a" ]; + }; + folders.bar = { + path = "/var/lib/syncthing/bar"; + devices = [ + { + name = "c"; + encryptionPasswordFile = "/etc/${config.environment.etc.bar-encryption-password.target}"; + } + ]; + }; + }; + }; + }; + c = { + services.syncthing = { + enable = true; + openDefaultPorts = true; + cert = "${idC}/cert.pem"; + key = "${idC}/key.pem"; + settings = { + devices.a.id = lib.fileContents "${idA}/id"; + devices.b.id = lib.fileContents "${idB}/id"; + folders.bar = { + path = "/var/lib/syncthing/bar"; + devices = [ + "a" + "b" + ]; + type = "receiveencrypted"; + }; + }; + }; + }; + }; + + testScript = '' + start_all() + + a.wait_for_unit("syncthing.service") + b.wait_for_unit("syncthing.service") + c.wait_for_unit("syncthing.service") + a.wait_for_open_port(22000) + b.wait_for_open_port(22000) + c.wait_for_open_port(22000) + + # Test foo + + a.wait_for_file("/var/lib/syncthing/foo") + b.wait_for_file("/var/lib/syncthing/foo") + + a.succeed("echo a2b > /var/lib/syncthing/foo/a2b") + b.succeed("echo b2a > /var/lib/syncthing/foo/b2a") + + a.wait_for_file("/var/lib/syncthing/foo/b2a") + b.wait_for_file("/var/lib/syncthing/foo/a2b") + + # Test bar + + a.wait_for_file("/var/lib/syncthing/bar") + b.wait_for_file("/var/lib/syncthing/bar") + c.wait_for_file("/var/lib/syncthing/bar") + + a.succeed("echo plaincontent > /var/lib/syncthing/bar/plainname") + + # B should be able to decrypt, check that content of file matches + b.wait_for_file("/var/lib/syncthing/bar/plainname") + file_contents = b.succeed("cat /var/lib/syncthing/bar/plainname") + assert "plaincontent\n" == file_contents, f"Unexpected file contents: {file_contents=}" + + # Bar on C is untrusted, check that content is not in cleartext + c.fail("grep -R plaincontent /var/lib/syncthing/bar") + ''; +} diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 50a5aa29af4e..8a2974b8517b 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "magnetophon"; repo = "VoiceOfFaust"; - rev = version; - sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU="; + tag = "V${version}"; + sha256 = "sha256-wsc4yzytK2hPVBQwMhdhjnH1pDtpkNCFJnItyzszEs0="; }; plugins = [ @@ -45,15 +45,17 @@ stdenv.mkDerivation rec { ]; patchPhase = '' - sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper sed -i "s@jack_connect@${jack-example-tools}/bin/jack_connect@g" launchers/synthWrapper + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/pitchTracker sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTracker + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/pitchTrackerGUI + sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTrackerGUI ''; meta = { description = "Turn your voice into a synthesizer"; homepage = "https://github.com/magnetophon/VoiceOfFaust"; - license = lib.licenses.gpl3; + license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7bd06028bffd..8710ab266168 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2909,6 +2909,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + codecompanion-history-nvim = buildVimPlugin { + pname = "codecompanion-history.nvim"; + version = "2025-05-15"; + src = fetchFromGitHub { + owner = "ravitemer"; + repo = "codecompanion-history.nvim"; + rev = "f787607922be1189b58e2c61bdd0e4bae3a38c00"; + sha256 = "16bivgra12wyhiwcci89sa7fcj0y8q4a61xzlf2gsm84bv295jms"; + }; + meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/"; + meta.hydraPlatforms = [ ]; + }; + codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; version = "2025-05-01"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f8dca3a625e4..5acf77734986 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -631,6 +631,15 @@ in ]; }; + codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs { + dependencies = with self; [ + # transitive dependency for codecompanion-nvim + plenary-nvim + + codecompanion-nvim + ]; + }; + windsurf-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fcb5e8db7a4f..b2272aa48d35 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -222,6 +222,7 @@ https://github.com/coc-extensions/coc-svelte/,, https://github.com/iamcco/coc-tailwindcss/,, https://github.com/neoclide/coc.nvim/,release, https://github.com/manicmaniac/coconut.vim/,HEAD, +https://github.com/ravitemer/codecompanion-history.nvim/,HEAD, https://github.com/olimorris/codecompanion.nvim/,HEAD, https://github.com/gorbit99/codewindow.nvim/,HEAD, https://github.com/metakirby5/codi.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 32528842c863..296b3366339c 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.0.1"; - hash = "sha256-4Q/38zO8G39oeZh4N9hOSFBeB0rI7ouH5vlBmV78EnQ="; + version = "25.0.3"; + hash = "sha256-rD2Uzzt8xfkfgM+Y0NLe7lthfxinv1Zatpr56OjfABM="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 306df8c3cb55..a31f8a10bb37 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.66.0"; - hash = "sha256-EnNwlSmJWBcSfFCayxJS94qVUqgQlbX0RLCB4jJsn+4="; + version = "1.67.0"; + hash = "sha256-1GShGk0ulYlpJpcdai7T2n0p2v1qicLE4X2d7Pqx4Zc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix new file mode 100644 index 000000000000..1e4a7d7069a1 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -0,0 +1,37 @@ +{ + jq, + lib, + moreutils, + vscode-utils, + eslint, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eslint"; + publisher = "dbaeumer"; + version = "3.0.13"; + hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ eslint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."eslint.nodePath".default = "${eslint}/lib/node_modules"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 81ee790ab649..7d6f5df0634f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -43,8 +43,8 @@ let mktplcRef = { publisher = "1Password"; name = "op-vscode"; - version = "1.0.4"; - hash = "sha256-s6acue8kgFLf5fs4A7l+IYfhibdY76cLcIwHl+54WVk="; + version = "1.0.5"; + hash = "sha256-J7vAK2t6fSjm5i6y3+88aO84ipFwekQkJMD7W3EIWrc="; }; meta = { changelog = "https://github.com/1Password/op-vscode/releases"; @@ -493,8 +493,8 @@ let mktplcRef = { publisher = "banacorn"; name = "agda-mode"; - version = "0.5.6"; - hash = "sha256-FKcPJzdhK0QbaG3wBkdGOkiDkZ4qVJh3RBTnD4wLIh8="; + version = "0.5.7"; + hash = "sha256-Lif7fvR2fozQDko0G74/+UhTnlbFjGAQj5eb2IIH61I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; @@ -1195,8 +1195,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.34"; - hash = "sha256-Xec6UHMe/6ChA4SHCPzMuUAJZejKpGo3YHy9paashmY="; + version = "0.1.35"; + hash = "sha256-Kem8o0gM1+cYohmua17kIlAH1RURgqoc0sPuIFDVU8Q="; }; meta = { description = "Visual Studio Code extension for Odin language"; @@ -1308,22 +1308,7 @@ let }; }; - dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-eslint"; - publisher = "dbaeumer"; - version = "3.0.13"; - hash = "sha256-l5VvhQPxPaQsPhXUbFW2yGJjaqnNvijn4QkXPjf1WXo="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; - description = "Integrates ESLint JavaScript into VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; - homepage = "https://github.com/Microsoft/vscode-eslint"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; + dbaeumer.vscode-eslint = callPackage ./dbaeumer.vscode-eslint { }; dendron.adjust-heading-level = callPackage ./dendron.adjust-heading-level { }; @@ -1789,22 +1774,7 @@ let }; }; - esbenp.prettier-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "prettier-vscode"; - publisher = "esbenp"; - version = "11.0.0"; - hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; - description = "Code formatter using prettier"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; - homepage = "https://github.com/prettier/prettier-vscode"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; + esbenp.prettier-vscode = callPackage ./esbenp.prettier-vscode { }; ethansk.restore-terminals = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2527,7 +2497,7 @@ let mktplcRef = { publisher = "influxdata"; name = "flux"; - version = "1.0.4"; + version = "1.0.5"; hash = "sha256-KIKROyfkosBS1Resgl+s3VENVg4ibaeIgKjermXESoA="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix new file mode 100644 index 000000000000..8304dd57ee0e --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -0,0 +1,37 @@ +{ + jq, + lib, + moreutils, + vscode-utils, + nodePackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "prettier-vscode"; + publisher = "esbenp"; + version = "11.0.0"; + hash = "sha256-pNjkJhof19cuK0PsXJ/Q/Zb2H7eoIkfXJMLZJ4lDn7k="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ nodePackages.prettier ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."prettier.prettierPath".default = "${nodePackages.prettier}/lib/node_modules/prettier"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; + description = "Code formatter using prettier"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; + homepage = "https://github.com/prettier/prettier-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; +} diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 37e907ba0b18..253c9f54b64b 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -29,20 +29,20 @@ clangStdenv.mkDerivation rec { pname = "gnome-decoder"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; rev = version; - hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY="; + hash = "sha256-lLZ8tll/R9cwk3t/MULmrR1KWZ1e+zneXL93035epPE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-xQlzSsvwDNK3Z8xnUQgCU6Q8+ls0Urks778pYwN2X1Y="; + hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg="; }; preFixup = '' diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 333f08aa9d1b..3c1a0f0533a7 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - hash = "sha256-VS5f+9daEQpPu5vam8DWhRqU0AWMmJab8KaRzTnRU/M="; + hash = "sha256-Jum9DEbwTtiT0mlrBCBJ0XHhH+DnhXf/AnthZ+qKSZg="; }; postPatch = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ecefca97eb3a..099fe0a59cdc 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper + qt5.wrapQtAppsHook ]; dontWrapQtApps = true; @@ -137,6 +138,7 @@ stdenv.mkDerivation rec { systemd libva qt5.qtbase + qt5.qtwayland freetype fontconfig libXrender @@ -219,6 +221,7 @@ stdenv.mkDerivation rec { --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ --prefix PATH : ${coreutils}/bin \ + ''${qtWrapperArgs[@]} \ ${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + lib.optionalString enableWidevine '' diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md index 26ec48e0273c..4e31e798beb8 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md +++ b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md @@ -33,7 +33,7 @@ Note here we are pointing the nvidia runtime to "/run/current-system/sw/bin/nvid Now apply the following runtime class to k3s cluster: -``` +```yaml apiVersion: node.k8s.io/v1 handler: nvidia kind: RuntimeClass @@ -43,9 +43,12 @@ metadata: name: nvidia ``` -Following [k8s-device-plugin](https://github.com/NVIDIA/k8s-device-plugin#deployment-via-helm) install the helm chart with `runtimeClassName: nvidia` set. In order to passthrough the nvidia card into the container, your deployments spec must contain - runtimeClassName: nvidia - env: +Following [k8s-device-plugin](https://github.com/NVIDIA/k8s-device-plugin#deployment-via-helm) install the helm chart with `runtimeClassName: nvidia` set. In order to passthrough the nvidia card into the container, your deployments spec must contain -``` +```yaml +runtimeClassName: nvidia +# for each container + env: - name: NVIDIA_VISIBLE_DEVICES value: all - name: NVIDIA_DRIVER_CAPABILITIES diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/by-name/ad/adlplug/package.nix similarity index 83% rename from pkgs/applications/audio/adlplug/default.nix rename to pkgs/by-name/ad/adlplug/package.nix index bf1278e42ce8..16fb9beb6825 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/by-name/ad/adlplug/package.nix @@ -16,7 +16,7 @@ # Enabling JACK requires a JACK server at runtime, no fallback mechanism withJack ? false, - jack, + libjack2, type ? "ADL", }: @@ -34,7 +34,7 @@ let .${type}; mainProgram = "${type}plug"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "${lib.strings.toLower type}plug"; version = "unstable-2021-12-17"; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DADLplug_CHIP=${chip}" - "-DADLplug_USE_SYSTEM_FMT=ON" - "-DADLplug_Jack=${if withJack then "ON" else "OFF"}" + (lib.cmakeFeature "ADLplug_CHIP" chip) + (lib.cmakeBool "ADLplug_USE_SYSTEM_FMT" true) + (lib.cmakeBool "ADLplug_Jack" withJack) ]; NIX_LDFLAGS = toString ( @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { libXext libXcursor ] - ++ lib.optional withJack jack; + ++ lib.optionals withJack [ libjack2 ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}} @@ -100,12 +100,12 @@ stdenv.mkDerivation rec { mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/ ''; - meta = with lib; { + meta = { inherit mainProgram; description = "${chip} FM Chip Synthesizer"; - homepage = src.meta.homepage; - license = licenses.boost; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; + homepage = "https://github.com/jpcima/ADLplug"; + license = lib.licenses.boost; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ OPNA2608 ]; }; } diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index a97efd139000..345f66c6470a 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -27,16 +27,14 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - prePatch = '' - chmod +w .. # make sure that /build/source is writeable - ''; - npmDeps = fetchNpmDeps { inherit src; - sourceRoot = "${src.name}"; hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE="; }; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; + useFetchCargoVendor = true; cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA="; @@ -61,12 +59,6 @@ rustPlatform.buildRustPackage rec { libappindicator-gtk3 ]; - npmRoot = ".."; - - sourceRoot = "${src.name}/src-tauri"; - - buildAndTestDir = "."; - meta = { homepage = "https://github.com/btpf/Alexandria"; changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}"; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index bfce006ee85d..59a189d9e5d8 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.2.12"; + version = "1.2.13"; pname = "bun"; src = @@ -86,19 +86,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-ibU/bbdU0yTNaJz95dA1zBJMkDREI8XWvAf48AlPx6k="; + hash = "sha256-gVQ2dSTYwpjtsmm40N9h1GnsQZTTYcB+S40sZfu8Lvs="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-yJiiBX+Rm3AL8onYQ9rknuEUyPYlx8H+0EN5D1RpRQk="; + hash = "sha256-tqJVN7wtEevkSkeN1iqOAdvJ9OHEt9LXMLSn6dNYDMk="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-Ye0Or7vDQGRAp4t0A6t8B4jgkmrR2Y7CjDMjMvW7bu4="; + hash = "sha256-BTh6RkWJFTig33Ql6JEuwWt0JRFs1BZ2aqUsowE/jGQ="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-MzeWT6ox2LzhmfkXCBMHEO8ucLmP80o09ZCxdFiApjM="; + hash = "sha256-i7LkxH6uGD8kc8Vbm853mMSig21kbCWHp5h6PRBi4QA="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index 5c0cc6df71ce..06dd4c480f87 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { payloads to compatible requests. ''; homepage = "https://cartero.danirod.es"; + changelog = "https://github.com/danirod/cartero/releases"; license = lib.licenses.gpl3Plus; mainProgram = "cartero"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index 93b6b9993991..918a95f10788 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { dnspython elementpath eventlet + extruct feedgen flask flask-compress diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 36a1a38de8e8..c90de82444f5 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -7,15 +7,15 @@ }: rustPlatform.buildRustPackage rec { pname = "clang-tidy-sarif"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-DFen1QYQxArNfc0CXNtP0nZEvbCxqTH5KS3q3FcfDPs="; + hash = "sha256-ALwEsF1n6WYqITfYTn8mIyn3sxTbDux17FxKIorKkFc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-AfkiK91vXaw4oWvfYlV3C0M/cGf4ZThALB/cANcZmFQ="; + cargoHash = "sha256-cTBXStAA+oCRze2Bh/trultdqtBNOOpXQltJ6R34nF8="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix index ad640a6a6077..c459e6555e63 100644 --- a/pkgs/by-name/co/cozette/package.nix +++ b/pkgs/by-name/co/cozette/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.28.0"; + version = "1.29.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${ builtins.replaceStrings [ "." ] [ "-" ] version }.zip"; - hash = "sha256-KxlChsydFtm26CFugbWqeJi5DQP0BxONSz5mOcyiE28="; + hash = "sha256-DHUnCzp6c3d57cfkO2kH+czXRiqRWn6DBTo9NVTghQ0="; }; installPhase = '' diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 353905fa0979..2df598aa57f6 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.24.4"; + version = "1.24.5"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-sd8Ux3zkKd9L2phv0dovWHSIpLS/OXCNwxTGGcvBQ3c="; + hash = "sha256-CyYGmxYJ5ef+H1qt0CiFcGOslBwkeHqdDQcmuqu4g9M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 2468dd302b24..c4e42b702aa5 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -9,25 +9,15 @@ stdenv.mkDerivation rec { pname = "debase"; # NOTE: When updating version, also update commit hash in prePatch. - version = "2"; + version = "3"; - src = - (fetchFromGitHub { - owner = "toasterllc"; - repo = "debase"; - tag = "v${version}"; - hash = "sha256-6AavH8Ag+879ntcxJDbVgsg8V6U4cxwPQYPKvq2PpoQ="; - fetchSubmodules = true; - }).overrideAttrs - { - # Workaround to fetch git@github.com submodules. - # See https://github.com/NixOS/nixpkgs/issues/195117 - # - # Already fixed in latest upstream, so delete at next version bump. - GIT_CONFIG_COUNT = 1; - GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; - GIT_CONFIG_VALUE_0 = "git@github.com:"; - }; + src = fetchFromGitHub { + owner = "toasterllc"; + repo = "debase"; + tag = "v${version}"; + hash = "sha256-IOh5TlFHFhIaP5bpQHYzY4wwmQUdwKePmSzEM2qx8oE="; + fetchSubmodules = true; + }; prePatch = '' # xcrun is not available in the Darwin stdenv, but we don't need it anyway. @@ -36,18 +26,13 @@ stdenv.mkDerivation rec { # NOTE: Update this when updating version. substituteInPlace Makefile \ - --replace-fail 'git rev-parse HEAD' 'echo bbe9f1737ab229dd370640a4b5d5e742a051c13b' \ + --replace-fail 'git rev-parse HEAD' 'echo aa083074d67938d50336bd3737c960b038d91134' \ --replace-fail '$(GITHASHHEADER): .git/HEAD .git/index' '$(GITHASHHEADER):' ''; patches = [ # Ignore debase's vendored copy of libgit2 in favor of the nixpkgs version. ./ignore-vendored-libgit2.patch - # Already fixed in latest upstream, so delete at next version bump. - (fetchpatch { - url = "https://github.com/toasterllc/debase/commit/d483c5ac016ac2ef3600e93ae4022cd9d7781c83.patch"; - hash = "sha256-vVQMOEiLTd46+UknZm8Y197sjyK/kTK/M+9sRX9AssY="; - }) ]; buildInputs = [ @@ -78,8 +63,6 @@ stdenv.mkDerivation rec { meta = { description = "TUI for drag-and-drop manipulation of git commits"; homepage = "https://toaster.llc/debase"; - # The author has not yet specified a license. - # See https://github.com/toasterllc/debase/pull/4 license = lib.licenses.publicDomain; mainProgram = "debase"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix index cdb4c73d07e2..96619f708e72 100644 --- a/pkgs/by-name/de/descent3-unwrapped/package.nix +++ b/pkgs/by-name/de/descent3-unwrapped/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { # the wrapped version of Descent 3. Once there’s a stable version of Descent # 3 that supports the -additionaldir command-line option, we can stop using # an unstable version of Descent 3. - version = "1.5.0-beta-unstable-2025-03-25"; + version = "1.5.0-beta-unstable-2025-05-08"; src = fetchFromGitHub { owner = "DescentDevelopers"; repo = "Descent3"; - rev = "67244d953588c8c63baa17c150076153c526258b"; + rev = "72cca136162ccff6d738693d109e29568de90ebb"; leaveDotGit = true; # Descent 3 is supposed to display its Git commit hash in the bottom right # corner of the main menu. That feature only works if either the .git @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt rm -r .git ''; - hash = "sha256-lRTzy5GQJ5J9ban7Q6pBmHHXgHNpgemlYYlzmUnvFW0="; + hash = "sha256-IcOSYIBqkk1e8NlPc4srr9glxWA4p0FY0QDAWb1Hb6I="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/di/dim/Cargo.lock b/pkgs/by-name/di/dim/Cargo.lock deleted file mode 100644 index 9cc6b9834d80..000000000000 --- a/pkgs/by-name/di/dim/Cargo.lock +++ /dev/null @@ -1,4186 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -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 = "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 = "anitomy" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5dbd2cfb14d3a442954182c1e8804a859e65143473ddfc7521e8766a4c44a9d" -dependencies = [ - "anitomy-sys", -] - -[[package]] -name = "anitomy-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ade7dff1b0d6e91f90986f26538baa14f8143d9c5d79cae3f914070a2e30ea" -dependencies = [ - "cc", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-compression" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "zstd", - "zstd-safe", -] - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "atoi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "axum-macros", - "base64 0.21.5", - "bitflags 1.3.2", - "bytes 1.5.0", - "futures-util", - "http 0.2.9", - "http-body 0.4.5", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "multer", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202651474fe73c62d9e0a56c6133f7a0ff1dc1c8cf7a5b03381af2a26553ac9d" -dependencies = [ - "async-trait", - "axum-core 0.4.1", - "bytes 1.5.0", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes 1.5.0", - "futures-util", - "http 0.2.9", - "http-body 0.4.5", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cb22c689c44d4c07b0ab44ebc25d69d8ae601a2f28fb8d672d344178fa17aa" -dependencies = [ - "async-trait", - "bytes 1.5.0", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-extra" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523ae92256049a3b02d3bb4df80152386cd97ddba0c8c5077619bdc8c4b1859b" -dependencies = [ - "axum 0.7.2", - "axum-core 0.4.1", - "bytes 1.5.0", - "cookie", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "http-body-util", - "mime", - "pin-project-lite", - "serde", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-macros" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "barrage" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87" -dependencies = [ - "concurrent-queue", - "event-listener", - "spin 0.9.8", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[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 = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cache-padded" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "catty" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf0adb3cc1c06945672f8dcc827e42497ac6d0aff49f459ec918132b82a5cbc" -dependencies = [ - "spin 0.9.8", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags 1.3.2", - "textwrap", - "unicode-width", -] - -[[package]] -name = "clap" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "cookie" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" -dependencies = [ - "percent-encoding", - "time 0.3.36", - "version_check", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -dependencies = [ - "atty", - "cast", - "clap 2.34.0", - "criterion-plot", - "csv", - "futures", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "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.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[package]] -name = "darwin-libproc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" -dependencies = [ - "darwin-libproc-sys", - "libc", - "memchr", -] - -[[package]] -name = "darwin-libproc-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" -dependencies = [ - "libc", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.2", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "dia-i18n" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292babb903a8ffc5e23d17085137a0f33c00a07dfbc6117619c7e6dc7f4111ae" - -[[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 = "dim" -version = "0.1.0" -dependencies = [ - "clap 4.4.7", - "dim-auth", - "dim-core", - "dim-database", - "dim-events", - "dim-extern-api", - "dim-utils", - "dim-web", - "fdlimit", - "nightfall", - "tokio", - "tracing", - "xtra", -] - -[[package]] -name = "dim-auth" -version = "0.4.0-dev" -dependencies = [ - "aes-gcm", - "base64 0.13.1", - "displaydoc", - "once_cell", - "rand", - "serde", - "thiserror", -] - -[[package]] -name = "dim-core" -version = "0.4.0-dev" -dependencies = [ - "async-trait", - "axum 0.6.20", - "cfg-if", - "chrono", - "criterion", - "dia-i18n", - "dim-auth", - "dim-database", - "dim-events", - "dim-extern-api", - "dim-utils", - "displaydoc", - "futures", - "fuzzy-matcher", - "http 0.2.9", - "hyper", - "ignore", - "image", - "itertools", - "lazy_static", - "libsqlite3-sys", - "nightfall", - "nix 0.23.2", - "notify", - "once_cell", - "parking_lot 0.12.1", - "percent-encoding", - "rand", - "reqwest", - "rusqlite", - "rust-embed", - "serde", - "serde_derive", - "serde_json", - "serial_test", - "sqlx", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "toml", - "tracing", - "tracing-appender", - "tracing-subscriber", - "url", - "uuid 1.10.0", - "xmlwriter", - "xtra", - "zip", -] - -[[package]] -name = "dim-database" -version = "0.4.0-dev" -dependencies = [ - "base64 0.13.1", - "cfg-if", - "dim-auth", - "displaydoc", - "itertools", - "lazy_static", - "once_cell", - "ring 0.16.20", - "serde", - "serde_derive", - "serde_json", - "sqlx", - "thiserror", - "tokio", - "tracing", - "uuid 0.8.2", -] - -[[package]] -name = "dim-events" -version = "0.4.0-dev" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "dim-extern-api" -version = "0.4.0-dev" -dependencies = [ - "anitomy", - "async-trait", - "chrono", - "dashmap", - "displaydoc", - "governor", - "rand", - "reqwest", - "retry-block", - "serde", - "serde_json", - "thiserror", - "tokio", - "torrent-name-parser", - "tracing", -] - -[[package]] -name = "dim-utils" -version = "0.1.0" -dependencies = [ - "dia-i18n", -] - -[[package]] -name = "dim-web" -version = "0.1.0" -dependencies = [ - "axum 0.6.20", - "axum-extra", - "cfg-if", - "chrono", - "dim-core", - "dim-database", - "dim-events", - "dim-extern-api", - "dim-utils", - "displaydoc", - "dominant_color", - "futures", - "fuzzy-matcher", - "http 0.2.9", - "hyper", - "image", - "nightfall", - "once_cell", - "percent-encoding", - "rust-embed", - "serde", - "serde_derive", - "serde_json", - "sqlx", - "thiserror", - "tokio", - "tokio-stream", - "tower", - "tower-http", - "tracing", - "tracing-appender", - "tracing-subscriber", - "uuid 1.10.0", -] - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "dominant_color" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2494b5d589b485e8b75ef5e81b4dc271fb0d5814132c308d5d11f0de9b300d96" - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "errno" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" -dependencies = [ - "libc", - "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 = "exr" -version = "1.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" -dependencies = [ - "bit_field", - "flume 0.11.0", - "half 2.2.1", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fdeflate" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fdlimit" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" -dependencies = [ - "libc", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "pin-project", - "spin 0.9.8", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin 0.9.8", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futures" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-executor" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.11.2", -] - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-macro" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "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", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "globset" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "governor" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot 0.12.1", - "quanta", - "rand", - "smallvec", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes 1.5.0", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.9", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "hashlink" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -dependencies = [ - "hashbrown 0.11.2", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes 1.5.0", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -dependencies = [ - "bytes 1.5.0", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes 1.5.0", - "http 0.2.9", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes 1.5.0", - "http 1.0.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" -dependencies = [ - "bytes 1.5.0", - "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes 1.5.0", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body 0.4.5", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.10", - "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 0.2.9", - "hyper", - "rustls 0.21.8", - "tokio", - "tokio-rustls 0.24.1", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -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 = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "iri-string" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libsqlite3-sys" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libva-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e4c5aa2cb99e640a357c42cf83dcb978ed08f99a3ca09eac534091aee2e9ba" -dependencies = [ - "cc", - "cfg-if", - "libc", - "pkg-config", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[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 = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -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_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mp4" -version = "0.8.2" -source = "git+https://github.com/vgarleanu/mp4-rust#d4f85ce3a438bc80d93df467c3f3320c5b3352e7" -dependencies = [ - "byteorder", - "bytes 0.5.6", - "num-rational", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes 1.5.0", - "encoding_rs", - "futures-util", - "http 0.2.9", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - -[[package]] -name = "nightfall" -version = "0.3.12-rc4" -source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7" -dependencies = [ - "async-trait", - "cfg-if", - "err-derive", - "lazy_static", - "mp4", - "nix 0.27.1", - "ntapi", - "once_cell", - "psutil", - "rusty_vainfo", - "serde", - "serde_derive", - "serde_json", - "tokio", - "tokio-stream", - "tracing", - "uuid 1.10.0", - "winapi", - "xtra", - "xtra_proc", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] - -[[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 = "notify" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" -dependencies = [ - "bitflags 1.3.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.3", - "libc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "pollster" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[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 = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psutil" -version = "3.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f866af2b0f8e4b0d2d00aad8a9c5fc48fad33466cd99a64cbb3a4c1505f1a62d" -dependencies = [ - "cfg-if", - "darwin-libproc", - "mach", - "nix 0.23.2", - "once_cell", - "thiserror", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quanta" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" -dependencies = [ - "crossbeam-utils", - "libc", - "mach", - "once_cell", - "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "async-compression", - "base64 0.21.5", - "bytes 1.5.0", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body 0.4.5", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.8", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.2", - "winreg", -] - -[[package]] -name = "retry-block" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095a7c37fd304fa4fef479da6293cd8dcd8ddb7eb26a03c28cc33f949362a379" -dependencies = [ - "async-trait", - "futures-util", - "rand", - "serde", - "tokio", - "tokio-stream", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rusqlite" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" -dependencies = [ - "bitflags 1.3.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", - "smallvec", -] - -[[package]] -name = "rust-embed" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "syn 1.0.109", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" -dependencies = [ - "walkdir", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" -dependencies = [ - "log", - "ring 0.17.5", - "rustls-webpki", - "sct 0.7.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.5", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rusty_vainfo" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7e34bc5c01a524319b395c0eaab6dd5a521d6d1d796de4de714ad2ccd6caf8" -dependencies = [ - "libva-sys", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", -] - -[[package]] -name = "serde" -version = "1.0.192" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half 1.8.2", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.192" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" -dependencies = [ - "itoa", - "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 = "serial_test" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15" -dependencies = [ - "lazy_static", - "parking_lot 0.11.2", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881bccd7d60fb32dfa3d7b3136385312f8ad75e2674aab2852867a09790cae8" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[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 = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sqlformat" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" -dependencies = [ - "sqlx-core", - "sqlx-macros", -] - -[[package]] -name = "sqlx-core" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" -dependencies = [ - "ahash", - "atoi", - "bitflags 1.3.2", - "byteorder", - "bytes 1.5.0", - "crc", - "crossbeam-queue", - "either", - "event-listener", - "flume 0.10.14", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink", - "hex", - "indexmap", - "itoa", - "libc", - "libsqlite3-sys", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.19.1", - "sha2", - "smallvec", - "sqlformat", - "sqlx-rt", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki", - "webpki-roots 0.21.1", -] - -[[package]] -name = "sqlx-macros" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" -dependencies = [ - "dotenv", - "either", - "heck", - "once_cell", - "proc-macro2", - "quote", - "sha2", - "sqlx-core", - "sqlx-rt", - "syn 1.0.109", - "url", -] - -[[package]] -name = "sqlx-rt" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.22.0", -] - -[[package]] -name = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.4.1", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[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 = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" -dependencies = [ - "backtrace", - "bytes 1.5.0", - "libc", - "mio", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.5", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.8", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes 1.5.0", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "torrent-name-parser" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2db832ca29f7c5c063a8678bc82f50d50abd6c33af3246ab34a3169e5f5ee51" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "async-compression", - "base64 0.21.5", - "bitflags 2.4.1", - "bytes 1.5.0", - "futures-core", - "futures-util", - "http 0.2.9", - "http-body 0.4.5", - "http-range-header", - "httpdate", - "iri-string", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "uuid 1.10.0", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time 0.3.36", - "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.39", -] - -[[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.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes 1.5.0", - "data-encoding", - "http 0.2.9", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "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.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[package]] -name = "web-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[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-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "xtra" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca0a1b28e7cf635b4e961c7330416bf842a89bca42f5c707ab02a065e1ee60f" -dependencies = [ - "async-trait", - "barrage", - "catty", - "flume 0.10.14", - "futures-core", - "futures-sink", - "futures-timer", - "futures-util", - "pollster", - "tokio", -] - -[[package]] -name = "xtra_proc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0972940e244acf1715d05b50b6e937d2ca97db4247437e9d07c5eaf0d978ebb0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "flate2", - "thiserror", - "time 0.1.43", -] - -[[package]] -name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] - -[[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/di/dim/bump-nightfall.patch b/pkgs/by-name/di/dim/bump-nightfall.patch index 37979efd5f78..74649e980273 100644 --- a/pkgs/by-name/di/dim/bump-nightfall.patch +++ b/pkgs/by-name/di/dim/bump-nightfall.patch @@ -1,21 +1,243 @@ -diff --git a/dim/Cargo.toml b/dim/Cargo.toml -index b7c8106493...38518ba29d 100644 ---- a/dim/Cargo.toml -+++ b/dim/Cargo.toml -@@ -15,7 +15,7 @@ - fdlimit = "0.2.1" +diff --git a/Cargo.lock b/Cargo.lock +index adb78aa..5634132 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 - # git dependencies --nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ -+nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ - "cuda", - "ssa_transmux", - ] } + [[package]] + name = "addr2line" +@@ -58,7 +58,7 @@ version = "0.7.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.11", + "once_cell", + "version_check", + ] +@@ -979,7 +979,7 @@ dependencies = [ + "tracing-appender", + "tracing-subscriber", + "url", +- "uuid 1.5.0", ++ "uuid 1.16.0", + "xmlwriter", + "xtra", + "zip", +@@ -1079,7 +1079,7 @@ dependencies = [ + "tracing", + "tracing-appender", + "tracing-subscriber", +- "uuid 1.5.0", ++ "uuid 1.16.0", + ] + + [[package]] +@@ -1411,6 +1411,18 @@ dependencies = [ + "wasi 0.11.0+wasi-snapshot-preview1", + ] + ++[[package]] ++name = "getrandom" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasi 0.14.2+wasi-0.2.4", ++] ++ + [[package]] + name = "ghash" + version = "0.4.4" +@@ -1874,9 +1886,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + + [[package]] + name = "libc" +-version = "0.2.150" ++version = "0.2.172" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + + [[package]] + name = "libsqlite3-sys" +@@ -2049,14 +2061,14 @@ dependencies = [ + [[package]] + name = "nightfall" + version = "0.3.12-rc4" +-source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c" ++source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7" + dependencies = [ + "async-trait", + "cfg-if", + "err-derive", + "lazy_static", + "mp4", +- "nix 0.20.0", ++ "nix 0.27.1", + "ntapi", + "once_cell", + "psutil", +@@ -2067,7 +2079,7 @@ dependencies = [ + "tokio", + "tokio-stream", + "tracing", +- "uuid 0.8.2", ++ "uuid 1.16.0", + "winapi", + "xtra", + "xtra_proc", +@@ -2075,27 +2087,26 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.20.0" ++version = "0.23.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" ++checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" + dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", ++ "memoffset 0.6.5", + ] + + [[package]] + name = "nix" +-version = "0.23.2" ++version = "0.27.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" ++checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" + dependencies = [ +- "bitflags 1.3.2", +- "cc", ++ "bitflags 2.4.1", + "cfg-if", + "libc", +- "memoffset 0.6.5", + ] + + [[package]] +@@ -2140,9 +2151,9 @@ dependencies = [ + + [[package]] + name = "ntapi" +-version = "0.3.7" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" ++checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" + dependencies = [ + "winapi", + ] +@@ -2481,6 +2492,12 @@ dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "r-efi" ++version = "5.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++ + [[package]] + name = "rand" + version = "0.8.5" +@@ -2508,7 +2525,7 @@ version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.11", + ] + + [[package]] +@@ -2689,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" + dependencies = [ + "cc", +- "getrandom", ++ "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", +@@ -3505,7 +3522,7 @@ dependencies = [ + "tower-layer", + "tower-service", + "tracing", +- "uuid 1.5.0", ++ "uuid 1.16.0", + ] + + [[package]] +@@ -3742,16 +3759,16 @@ version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + dependencies = [ +- "getrandom", ++ "getrandom 0.2.11", + ] + + [[package]] + name = "uuid" +-version = "1.5.0" ++version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" ++checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" + dependencies = [ +- "getrandom", ++ "getrandom 0.3.3", + ] + + [[package]] +@@ -3803,6 +3820,15 @@ version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + ++[[package]] ++name = "wasi" ++version = "0.14.2+wasi-0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" ++dependencies = [ ++ "wit-bindgen-rt", ++] ++ + [[package]] + name = "wasm-bindgen" + version = "0.2.88" +@@ -4092,6 +4118,15 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "wit-bindgen-rt" ++version = "0.39.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" ++dependencies = [ ++ "bitflags 2.4.1", ++] ++ + [[package]] + name = "xmlwriter" + version = "0.1.0" diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml -index b311b7c7af...ffc5d85dbb 100644 +index b311b7c..ffc5d85 100644 --- a/dim-core/Cargo.toml +++ b/dim-core/Cargo.toml -@@ -11,7 +11,7 @@ +@@ -11,7 +11,7 @@ vaapi = ["nightfall/vaapi"] [dependencies] # git dependencies @@ -24,7 +246,7 @@ index b311b7c7af...ffc5d85dbb 100644 "cuda", "ssa_transmux", ] } -@@ -72,7 +72,7 @@ +@@ -72,7 +72,7 @@ tracing-subscriber = { version = "^0.3.10", features = [ "json", ] } url = "2.2.2" @@ -34,10 +256,10 @@ index b311b7c7af...ffc5d85dbb 100644 xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] } diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml -index 2da5764d50...4c7574c0b4 100644 +index 2da5764..4c7574c 100644 --- a/dim-web/Cargo.toml +++ b/dim-web/Cargo.toml -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ dim-utils = { path = "../dim-utils" } dim-events = { path = "../dim-events" } dim-core = { path = "../dim-core" } @@ -46,3 +268,16 @@ index 2da5764d50...4c7574c0b4 100644 "cuda", "ssa_transmux", ] } +diff --git a/dim/Cargo.toml b/dim/Cargo.toml +index b7c8106..38518ba 100644 +--- a/dim/Cargo.toml ++++ b/dim/Cargo.toml +@@ -15,7 +15,7 @@ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] } + fdlimit = "0.2.1" + + # git dependencies +-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [ ++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [ + "cuda", + "ssa_transmux", + ] } diff --git a/pkgs/by-name/di/dim/bump-time.patch b/pkgs/by-name/di/dim/bump-time.patch new file mode 100644 index 000000000000..0e40ceebdfef --- /dev/null +++ b/pkgs/by-name/di/dim/bump-time.patch @@ -0,0 +1,74 @@ +From af60408709d51a002944a3deb92cb4d2b242add5 Mon Sep 17 00:00:00 2001 +From: Gabriel Fontes +Date: Thu, 8 Aug 2024 10:40:44 -0300 +Subject: [PATCH] fix build failure with rust 1.80 + +--- + Cargo.lock | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index adb78aa7..7c057bad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -643,7 +643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" + dependencies = [ + "percent-encoding", +- "time 0.3.30", ++ "time 0.3.36", + "version_check", + ] + +@@ -2157,6 +2157,12 @@ dependencies = [ + "winapi", + ] + ++[[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.45" +@@ -3301,12 +3307,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.30" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -3321,10 +3328,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3539,7 +3547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" + dependencies = [ + "crossbeam-channel", +- "time 0.3.30", ++ "time 0.3.36", + "tracing-subscriber", + ] + diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix index 2ead070f750d..c28db10cab47 100644 --- a/pkgs/by-name/di/dim/package.nix +++ b/pkgs/by-name/di/dim/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - patches = [ + cargoPatches = [ # Upstream uses a 'ffpath' function to look for config directory and # (ffmpeg) binaries in the same directory as the binary. Patch it to use # the working dir and PATH instead. @@ -55,6 +55,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # revision for FFmpeg >= 6 support. ./bump-nightfall.patch + # Bump the time dependency to fix build failure with rust 1.80+ + # https://github.com/Dusk-Labs/dim/pull/614 + ./bump-time.patch + # Upstream has some unused imports that prevent things from compiling... # Remove for next release. (fetchpatch { @@ -64,6 +68,9 @@ rustPlatform.buildRustPackage (finalAttrs: { }) ]; + useFetchCargoVendor = true; + cargoHash = "sha256-T0v7pajg3UfRnVOx3ie6rOf+vJSW2l7yoCsJrtxIwcg="; + postPatch = '' substituteInPlace dim-core/src/lib.rs \ --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" @@ -71,7 +78,6 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" substituteInPlace dim-database/src/lib.rs \ --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" - ln -sf ${./Cargo.lock} Cargo.lock ''; postConfigure = '' @@ -88,14 +94,6 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = lib.optional libvaSupport "vaapi"; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno="; - "nightfall-0.3.12-rc4" = "sha256-AbSuLe3ySOla3NB+mlfHRHqHuMqQbrThAaUZ747GErE="; - }; - }; - checkFlags = [ # Requires network "--skip=tmdb::tests::johhny_test_seasons" diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 150b1574f17d..f31b2603c289 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.4"; + version = "1.9.9"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-EFcfkj0NOmQrWgLJpWHdIX7iitqfZwgTmkMvueJPS/c="; + hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/du/dualsensectl/package.nix b/pkgs/by-name/du/dualsensectl/package.nix index 347edafa9aee..66ec9e66deff 100644 --- a/pkgs/by-name/du/dualsensectl/package.nix +++ b/pkgs/by-name/du/dualsensectl/package.nix @@ -2,6 +2,9 @@ lib, stdenv, fetchFromGitHub, + installShellFiles, + meson, + ninja, pkg-config, dbus, hidapi, @@ -12,20 +15,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "dualsensectl"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "nowrep"; repo = "dualsensectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-Wu3TcnHoMZELC7I2PlE8z00+CycgpNd6SiZd5MjYD+I="; + hash = "sha256-/EPFZWpa7U4fmcdX2ycFkPgaqlKEA2cD84LBkcvVVhc="; }; - postPatch = '' - substituteInPlace Makefile --replace "/usr/" "/" - ''; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + installShellFiles + meson + ninja + pkg-config + ]; buildInputs = [ dbus @@ -33,7 +37,11 @@ stdenv.mkDerivation (finalAttrs: { udev ]; - makeFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + installShellCompletion --cmd dualsensectl \ + --bash ../completion/dualsensectl \ + --zsh ../completion/_dualsensectl + ''; passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 2d4b0696cd0a..0f8aac729c08 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -123,7 +123,10 @@ stdenv.mkDerivation ( "Chat" ]; startupWMClass = "Element"; - mimeTypes = [ "x-scheme-handler/element" ]; + mimeTypes = [ + "x-scheme-handler/element" + "x-scheme-handler/io.element.desktop" + ]; }; postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index cd341ac4296b..7032068f91e6 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "emblem"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "emblem"; rev = version; - sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; + sha256 = "sha256-knq8OKoc8Xv7lOr0ub9+2JfeQE84UlTHR1q4SFFF8Ug="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-j9PrnXt0GyyfCKmcq1zYmDNlrvogtK5n316MIC+z+w0="; + hash = "sha256-CsISaVlRGtVVEna1jyGZo/IdWcJdwHJv6LXcXYha2UE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix index e00ad339e69d..9a8f9fa49e8c 100644 --- a/pkgs/by-name/ey/eyedropper/package.nix +++ b/pkgs/by-name/ey/eyedropper/package.nix @@ -18,21 +18,20 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eyedropper"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = "eyedropper"; - rev = "v${version}"; - hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-t/OFA4oDXtnMmyFptG7zsGW5ubaSNrSnaDR1l9nVbLQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-nYmH7Nu43TDJKvwfSaBKSihD0acLPmIUQpQM6kV4CAk="; + inherit (finalAttrs) pname src version; + hash = "sha256-39BWpyGhX6fYzxwrodiK1A3ASuRiI7tOA+pSKu8Bx5Q="; }; nativeBuildInputs = [ @@ -61,10 +60,11 @@ stdenv.mkDerivation rec { meta = { description = "Pick and format colors"; homepage = "https://github.com/FineFindus/eyedropper"; + changelog = "https://github.com/FineFindus/eyedropper/releases/tag/v${finalAttrs.version}"; mainProgram = "eyedropper"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ zendo ]; teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/by-name/fa/faust2/package.nix similarity index 98% rename from pkgs/applications/audio/faust/faust2.nix rename to pkgs/by-name/fa/faust2/package.nix index 9304f4536e19..d8b9aefceee0 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/by-name/fa/faust2/package.nix @@ -21,8 +21,6 @@ fetchpatch, }: -with lib.strings; - let version = "2.79.3"; @@ -170,7 +168,7 @@ let runHook preInstall mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do + for script in ${lib.concatStringsSep " " scripts}; do cp "${dir}/$script" "$out/bin/" done @@ -267,7 +265,7 @@ let let - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); + runtimePath = lib.concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); in stdenv.mkDerivation ( diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/by-name/fa/faust2alqt/package.nix similarity index 82% rename from pkgs/applications/audio/faust/faust2alqt.nix rename to pkgs/by-name/fa/faust2alqt/package.nix index 66d394e9d740..9f15d92840c5 100644 --- a/pkgs/applications/audio/faust/faust2alqt.nix +++ b/pkgs/by-name/fa/faust2alqt/package.nix @@ -1,7 +1,7 @@ { faust, alsa-lib, - qtbase, + qt5, writeText, buildPackages, }: @@ -14,7 +14,7 @@ let cd -- "$(dirname "$p")" binary=$(basename --suffix=.dsp "$p") rm -f .$binary-wrapped - wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" + wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' cd $workpath done @@ -26,7 +26,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ alsa-lib - qtbase + qt5.qtbase ]; dontWrapQtApps = true; @@ -36,7 +36,7 @@ faust.wrapWithBuildEnv { # append the wrapping code to the compilation script cat ${wrapBinary} >> $script # prevent the qmake error when running the script - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script done ''; } diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/by-name/fa/faust2alsa/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2alsa.nix rename to pkgs/by-name/fa/faust2alsa/package.nix diff --git a/pkgs/applications/audio/faust/faust2csound.nix b/pkgs/by-name/fa/faust2csound/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2csound.nix rename to pkgs/by-name/fa/faust2csound/package.nix diff --git a/pkgs/applications/audio/faust/faust2firefox.nix b/pkgs/by-name/fa/faust2firefox/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2firefox.nix rename to pkgs/by-name/fa/faust2firefox/package.nix diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/by-name/fa/faust2jack/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jack.nix rename to pkgs/by-name/fa/faust2jack/package.nix diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/by-name/fa/faust2jackrust/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2jackrust.nix rename to pkgs/by-name/fa/faust2jackrust/package.nix diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/by-name/fa/faust2jaqt/package.nix similarity index 85% rename from pkgs/applications/audio/faust/faust2jaqt.nix rename to pkgs/by-name/fa/faust2jaqt/package.nix index 5429d1bfb45a..cfdfe66cc2fa 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/by-name/fa/faust2jaqt/package.nix @@ -2,7 +2,7 @@ bash, faust, jack2, - qtbase, + qt5, libsndfile, alsa-lib, writeText, @@ -18,7 +18,7 @@ let cd -- "$(dirname "$p")" binary=$(basename --suffix=.dsp "$p") rm -f .$binary-wrapped - wrapProgram $binary --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" + wrapProgram $binary --set QT_PLUGIN_PATH "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" sed -i $binary -e 's@exec@cd "$(dirname "$(readlink -f "''${BASH_SOURCE[0]}")")" \&\& exec@g' cd $workpath done @@ -39,7 +39,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2 - qtbase + qt5.qtbase libsndfile alsa-lib which @@ -52,7 +52,7 @@ faust.wrapWithBuildEnv { # append the wrapping code to the compilation script cat ${wrapBinary} >> $script # prevent the qmake error when running the script - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" $script + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" $script done ''; } diff --git a/pkgs/applications/audio/faust/faust2ladspa.nix b/pkgs/by-name/fa/faust2ladspa/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2ladspa.nix rename to pkgs/by-name/fa/faust2ladspa/package.nix diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/by-name/fa/faust2lv2/package.nix similarity index 68% rename from pkgs/applications/audio/faust/faust2lv2.nix rename to pkgs/by-name/fa/faust2lv2/package.nix index 4a310440ad8a..964412540822 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/by-name/fa/faust2lv2/package.nix @@ -3,7 +3,7 @@ boost, faust, lv2, - qtbase, + qt5, }: faust.wrapWithBuildEnv { @@ -17,12 +17,12 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ boost lv2 - qtbase + qt5.qtbase ]; dontWrapQtApps = true; preFixup = '' - sed -i "/QMAKE=/c\ QMAKE="${qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2; + sed -i "/QMAKE=/c\ QMAKE="${qt5.qtbase.dev}/bin/qmake"" "$out"/bin/faust2lv2; ''; } diff --git a/pkgs/applications/audio/faust/faust2sc.nix b/pkgs/by-name/fa/faust2sc/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faust2sc.nix rename to pkgs/by-name/fa/faust2sc/package.nix diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/by-name/fa/faustlive/package.nix similarity index 100% rename from pkgs/applications/audio/faust/faustlive.nix rename to pkgs/by-name/fa/faustlive/package.nix diff --git a/pkgs/by-name/fl/flips/package.nix b/pkgs/by-name/fl/flips/package.nix index 6ba965db41c2..c7a629ca7a42 100644 --- a/pkgs/by-name/fl/flips/package.nix +++ b/pkgs/by-name/fl/flips/package.nix @@ -2,9 +2,12 @@ lib, stdenv, fetchFromGitHub, - gtk3, libdivsufsort, pkg-config, + + withGTK3 ? !stdenv.hostPlatform.isDarwin, + gtk3, + llvmPackages, wrapGAppsHook3, }: @@ -21,24 +24,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook3 - ]; + ] ++ lib.optional withGTK3 wrapGAppsHook3; - buildInputs = [ - gtk3 - libdivsufsort - ]; + buildInputs = + [ + libdivsufsort + ] + ++ lib.optional withGTK3 gtk3 + ++ lib.optional (withGTK3 && stdenv.hostPlatform.isDarwin) llvmPackages.openmp; patches = [ ./use-system-libdivsufsort.patch ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "TARGET=${if withGTK3 then "gtk" else "cli"}" + ]; + + installPhase = lib.optionalString (!withGTK3) '' + runHook preInstall + install -Dm755 flips -t $out/bin + runHook postInstall + ''; meta = { description = "Patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "flips"; }; } diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index da441f7839d3..b05fc3fffe45 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "framework-tool"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${version}"; - hash = "sha256-JPIpaAfXraqU6YM31bLImeJUCD3/O+PLcaZBxUjDqlM="; + hash = "sha256-eH6EUpdITFX3FDV0LbeOnqvDmbriDT5R02jhM2DVqtA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Kf3DXEDpCbbixUjeyBi1xkR32sW2uuasxqeWeq/X2Xk="; + cargoHash = "sha256-qS65k/cqP9t71TxuqP1/0xIPkhe56WEEbzDzV6JfKrs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index 72ee6927f02e..af726ce4f0c9 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "fretboard"; - version = "8.0"; + version = "9.1"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "fretboard"; rev = "v${finalAttrs.version}"; - hash = "sha256-8xINlVhWgg73DrRi8S5rhNc1sbG4DbWOsiEBjU8NSXo="; + hash = "sha256-LTUZPOecX1OiLcfdiY/P2ffq91QcnFjW6knM9H/Z+Lc="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-wYDlJ5n878Apv+ywnHnDy1Rgn+WJtcuePsGYEWSNvs4="; + hash = "sha256-Gl78z9FR/sB14uFDLKgnfN4B5yOi6A6MH64gDXcLiWA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index 85130c463ffa..562ea3bd6b89 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "fx"; - version = "35.0.0"; + version = "36.0.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-EirlA/gcW77UP9I4pVCjjG3pSYnCPw+idX9YS1izEpY="; + hash = "sha256-wUiyMczToGqfHZ/FMUhCO4ud6h/bNHhVt4eWoZJckbU="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-h9BUL7b8rNmhVxmXL3CBF39WSkX+8eS2M9NDJhbPI0o="; + vendorHash = "sha256-8KiCj2khO0zxsZDG1YD0EjsoZSY4q+IXC+NLeeXgVj4="; postInstall = '' installShellCompletion --cmd fx \ diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index 910f095a6763..f955b0ed54a1 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -4,6 +4,10 @@ fetchurl, ncurses5, libxcrypt-legacy, + xz, + zstd, + makeBinaryWrapper, + darwin, }: stdenv.mkDerivation rec { @@ -38,6 +42,11 @@ stdenv.mkDerivation rec { ./info-fix.patch ]; + nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + makeBinaryWrapper + darwin.sigtool + ]; + dontConfigure = true; dontBuild = true; dontPatchELF = true; @@ -50,20 +59,32 @@ stdenv.mkDerivation rec { rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : ''; - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses5 - libxcrypt-legacy - ] - } "$f" || true - done - ''; + preFixup = + lib.optionalString stdenv.isLinux '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ + lib.makeLibraryPath [ + "$out" + stdenv.cc.cc + ncurses5 + libxcrypt-legacy + ] + } "$f" || true + done + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + find "$out" -executable -type f | while read executable; do + ( \ + install_name_tool \ + -change "/usr/local/opt/zstd/lib/libzstd.1.dylib" "${lib.getLib zstd}/lib/libzstd.1.dylib" \ + -change "/usr/local/opt/xz/lib/liblzma.5.dylib" "${lib.getLib xz}/lib/liblzma.5.dylib" \ + "$executable" \ + && codesign -f -s - "$executable" \ + ) || true + done + ''; meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix index 757969b43095..960225011253 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix @@ -6,6 +6,8 @@ libxcrypt-legacy, xz, zstd, + makeBinaryWrapper, + darwin, }: stdenv.mkDerivation rec { @@ -34,6 +36,11 @@ stdenv.mkDerivation rec { .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; + nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + makeBinaryWrapper + darwin.sigtool + ]; + patches = [ # fix double entry in share/info/porting.info # https://github.com/NixOS/nixpkgs/issues/363902 @@ -52,22 +59,34 @@ stdenv.mkDerivation rec { rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : ''; - preFixup = lib.optionalString stdenv.isLinux '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ - lib.makeLibraryPath [ - "$out" - stdenv.cc.cc - ncurses6 - libxcrypt-legacy - xz - zstd - ] - } "$f" || true - done - ''; + preFixup = + lib.optionalString stdenv.isLinux '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ + lib.makeLibraryPath [ + "$out" + stdenv.cc.cc + ncurses6 + libxcrypt-legacy + xz + zstd + ] + } "$f" || true + done + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + find "$out" -executable -type f | while read executable; do + ( \ + install_name_tool \ + -change "/usr/local/opt/zstd/lib/libzstd.1.dylib" "${lib.getLib zstd}/lib/libzstd.1.dylib" \ + -change "/usr/local/opt/xz/lib/liblzma.5.dylib" "${lib.getLib xz}/lib/liblzma.5.dylib" \ + "$executable" \ + && codesign -f -s - "$executable" \ + ) || true + done + ''; meta = with lib; { description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 895797545a58..87be17d1c964 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "3.2.2"; + version = "3.2.4"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-8gvulVq3RQZ/v7DCJ1Azrs23WMEznJCaalyjqD6iCU8="; + hash = "sha256-i7Yqe89b9kAR+ygHL2dlYvdPizBZG6MRMlPFvbHsIdQ="; }; postPatch = diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 91443aed737f..0428f87e21f1 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.5.3"; + version = "3.5.4"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-DO9BtU0TW1HzCgrwx4Hocxlhl+tO0IztifqBloqmmtM="; + hash = "sha256-WhhEBhwv2bBwsWPPMDIA2jhUzqcD6yJhHg1Eunu8y14="; }; # TODO: build this from source @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gmic.eu/gmic_stdlib_community${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }.h"; - hash = "sha256-LWAzg72MZ4kOTAS+2xwR3iVY8vPch3NAjx/uXX2Y0W4="; + hash = "sha256-JO8ijrOgrOq7lB8NaxnlsQhDXSMgAGQlOG3lT9NfuMw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index 54e44104ed3e..f0e5454cd4dc 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apps.gnome.org/Calculator/"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; + mainProgram = "gnome-calculator"; teams = [ teams.gnome ]; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index 22b72675f74b..cda7b6abd5e1 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -24,19 +24,19 @@ let meta.license = lib.licenses.mit; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "goose-cli"; - version = "1.0.17"; + version = "1.0.23"; src = fetchFromGitHub { owner = "block"; repo = "goose"; - tag = "v${version}"; - hash = "sha256-l/lcwTNUq2xJHh0MKhnDZjRJ/5cANbdar/Vusf38esQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jdoopa4pbW3MSgbNmNSp47iiXZF8H2GEgyhpkV1cB4A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1xKWzgptnM1ZP0nQXILBoaKVwL2FyXpldTUIa1ITQO0="; + cargoHash = "sha256-We2v/U9pK4O7JVXyVDvHwyrujPLp9jL1m4SKcMg/Hvc="; nativeBuildInputs = [ pkg-config ]; @@ -59,14 +59,22 @@ rustPlatform.buildRustPackage rec { # need dbus-daemon "--skip=config::base::tests::test_multiple_secrets" "--skip=config::base::tests::test_secret_management" + "--skip=config::base::tests::test_concurrent_extension_writes" # Observer should be Some with both init project keys set "--skip=tracing::langfuse_layer::tests::test_create_langfuse_observer" "--skip=providers::gcpauth::tests::test_token_refresh_race_condition" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Lazy instance has previously been poisoned "--skip=jetbrains::tests::test_capabilities" "--skip=jetbrains::tests::test_router_creation" + "--skip=logging::tests::test_log_file_name::with_session_name_without_error_capture" + "--skip=logging::tests::test_log_file_name::without_session_name" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--skip=providers::gcpauth::tests::test_load_from_metadata_server" + "--skip=providers::oauth::tests::test_get_workspace_endpoints" + "--skip=tracing::langfuse_layer::tests::test_batch_manager_spawn_sender" + "--skip=tracing::langfuse_layer::tests::test_batch_send_partial_failure" + "--skip=tracing::langfuse_layer::tests::test_batch_send_success" ]; passthru.updateScript = nix-update-script { }; @@ -76,7 +84,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/block/goose"; mainProgram = "goose"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cloudripper ]; + maintainers = with lib.maintainers; [ + cloudripper + thardin + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/hy/hyperswarm/package.nix b/pkgs/by-name/hy/hyperswarm/package.nix index 9392b8d3b92a..5c0072f448e5 100644 --- a/pkgs/by-name/hy/hyperswarm/package.nix +++ b/pkgs/by-name/hy/hyperswarm/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "hyperswarm"; - version = "4.11.5"; + version = "4.11.7"; src = fetchFromGitHub { owner = "holepunchto"; repo = "hyperswarm"; tag = "v${finalAttrs.version}"; - hash = "sha256-jyEwIb8nAnk6Fiw3lMgURoSOqz3lka085c58qq4Vxwc="; + hash = "sha256-Z/FNBDJbiyR5AY40RDtiuQmjNUZ+BSGv8aewBnhSNZw="; }; npmDepsHash = "sha256-4ysUYFIFlzr57J7MdZit1yX3Dgpb2eY0rdYnwyppwK0="; diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 580c5eecdaf7..543c906f90ec 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -26,19 +26,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "identity"; - version = "0.7.0"; + version = "25.03"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "YaLTeR"; repo = "identity"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JZyhT220ARZ2rX0CZYeFkHx8i9ops7TcfGje0NKebnU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-YkbhZQUpe8ffBpHcYl7wjFgs3krAXlvHgcBdP/6uvek="; + hash = "sha256-RCSTxtHXkLsH8smGp2XzQeV9SSpLx5llrFg3cgIsWKY="; }; strictDeps = true; diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 7a48a7e40a88..2d5bcf6217f3 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.10.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-KTA2nOifVksKfHNwayHBqsTypWw3PB7nDEN6j7UjCCI="; + hash = "sha256-tuF2ienJPQgPSugJQMZsqgPEB+b/zW013Hx9OUTvV6E="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-KN8RuS6yQLG+PWVKfVFii38+xM0aUGvIV38RGYPAIUk="; + npmDepsHash = "sha256-fl2oboifADrWIOKfdKtckuG4jiOSGT8oMRRXeXpJ8E0="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index fb5b02ef33c1..4bdb023bae93 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -142,7 +142,15 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Network boot firmware"; homepage = "https://ipxe.org/"; - license = lib.licenses.gpl2Only; + license = with lib.licenses; [ + bsd2 + bsd3 + gpl2Only + gpl2UBDLPlus + isc + mit + mpl11 + ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sigmasquadron ]; }; diff --git a/pkgs/by-name/k2/k2pdfopt/package.nix b/pkgs/by-name/k2/k2pdfopt/package.nix index a7da6638c61b..110cc469c0a9 100644 --- a/pkgs/by-name/k2/k2pdfopt/package.nix +++ b/pkgs/by-name/k2/k2pdfopt/package.nix @@ -21,12 +21,16 @@ mupdf, enableDJVU ? true, djvulibre, - enableGOCR ? false, - gocr, # Disabled by default due to crashes - enableTesseract ? true, - leptonica, + enableGOCR ? false, # Disabled by default due to crashes + gocr, + # Tesseract support is currently broken + # See: https://github.com/NixOS/nixpkgs/issues/368349 + enableTesseract ? false, tesseract5, + enableLeptonica ? true, + leptonica, opencl-headers, + fetchDebianPatch, }: # k2pdfopt is a pain to package. It requires modified versions of mupdf, @@ -88,6 +92,20 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-CMakeLists.patch + (fetchDebianPatch { + inherit pname; + version = "${version}+ds"; + debianRevision = "3.1"; + patch = "0007-k2pdfoptlib-k2ocr.c-conditionally-enable-tesseract-r.patch"; + hash = "sha256-uJ9Gpyq64n/HKqo0hkQ2dnkSLCKNN4DedItPGzHfqR8="; + }) + (fetchDebianPatch { + inherit pname; + version = "${version}+ds"; + debianRevision = "3.1"; + patch = "0009-willuslib-CMakeLists.txt-conditionally-add-source-fi.patch"; + hash = "sha256-cBSlcuhsw4YgAJtBJkKLW6u8tK5gFwWw7pZEJzVMJDE="; + }) ]; postPatch = '' @@ -239,10 +257,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableMuPDF mupdf_modded ++ lib.optional enableDJVU djvulibre ++ lib.optional enableGOCR gocr - ++ lib.optionals enableTesseract [ - leptonica_modded - tesseract_modded - ]; + ++ lib.optional enableTesseract tesseract_modded + ++ lib.optional (enableLeptonica || enableTesseract) leptonica_modded; dontUseCmakeBuildDir = true; diff --git a/pkgs/by-name/kd/kdiff3/package.nix b/pkgs/by-name/kd/kdiff3/package.nix index 30ddc904204c..a3d8e0b76b2c 100644 --- a/pkgs/by-name/kd/kdiff3/package.nix +++ b/pkgs/by-name/kd/kdiff3/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-MaN8vPnUIHintIRdQqwaAzp9cjKlq66qAo9kJbufpDk="; + hash = "sha256-4iZUxFeIF5mAgwVSnGtZbAydw4taLswULsdtRvaHP0w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index 2b03816e0d01..ed15ad19fccb 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "keypunch"; - version = "5.1"; + version = "6.3"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "keypunch"; tag = "v${finalAttrs.version}"; - hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI="; + hash = "sha256-NjPC7WbzOk0tDjM8la+TKGy+U2NNT2kwcrSkaG7TylQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-SQ1BI9BuUfUvafsBnC1P5YQ8qVAaer6ywuRQkfS/V1w="; + hash = "sha256-gQg6CCb5OzK2fLWMtkRTv1hK642IezRN+5qLMGVV6s8="; }; strictDeps = true; @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Practice your typing skills"; homepage = "https://github.com/bragefuglseth/keypunch"; + changelog = "https://github.com/bragefuglseth/keypunch/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; mainProgram = "keypunch"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index f63d9f808d95..0c6ba902535d 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,15 +23,15 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.72.0"; + version = "1.76.1"; pyproject = false; src = fetchFromGitea { domain = "codeberg.org"; owner = "valos"; repo = "Komikku"; - rev = "v${version}"; - hash = "sha256-Kdt4nEWdxfZB7rmPbCegbj4abfv1nMSvAAC6mmUcv44="; + tag = "v${version}"; + hash = "sha256-js9mywNlv13ZDmvoBt9yuXJePaSuKOimek3uNlVIeHM="; }; nativeBuildInputs = [ @@ -54,14 +54,14 @@ python3.pkgs.buildPythonApplication rec { webkitgtk_6_0 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ beautifulsoup4 brotli - colorthief dateparser emoji keyring lxml + modern-colorthief natsort piexif pillow @@ -92,12 +92,7 @@ python3.pkgs.buildPythonApplication rec { # Prevent double wrapping. dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - ) - ''; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index a90fdbbdb8e3..affb889faf1b 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.159.4"; + version = "1.159.5"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-OLE3BoQNgpOHYuMUFBmk+raXimJGOsXySkfP+UTDk/8="; + hash = "sha256-qooN7XRWFqR/bVPAQ8e7KOYNnBD9E70uAesaLUUeXXs="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-+h93tSiKxnnNXPGk7elMQrcIuw3G/j2/gugqSbqOrDw="; + hash = "sha256-TmizhgXMYX0hn4GnsL1QiSyMdahebh0QFbk/cOA48jg="; }; nativeBuildInputs = diff --git a/pkgs/by-name/li/lifeograph/package.nix b/pkgs/by-name/li/lifeograph/package.nix index c44d85c96452..7e26c1ddfbca 100644 --- a/pkgs/by-name/li/lifeograph/package.nix +++ b/pkgs/by-name/li/lifeograph/package.nix @@ -1,26 +1,27 @@ { - stdenv, lib, + stdenv, fetchgit, pkg-config, meson, ninja, - wrapGAppsHook3, + wrapGAppsHook4, enchant, - gtkmm3, + gtkmm4, libchamplain, libgcrypt, shared-mime-info, + libshumate, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lifeograph"; - version = "2.0.3"; + version = "3.0.1"; src = fetchgit { url = "https://git.launchpad.net/lifeograph"; - rev = "v${version}"; - hash = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-tcq1A1P8sJ57Tr2MLxsFIru+VJdORuvPBq6fMgBmuY0="; }; nativeBuildInputs = [ @@ -28,27 +29,28 @@ stdenv.mkDerivation rec { ninja pkg-config shared-mime-info # for update-mime-database - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ libgcrypt enchant - gtkmm3 + gtkmm4 libchamplain + libshumate ]; postInstall = '' substituteInPlace $out/share/applications/net.sourceforge.Lifeograph.desktop \ - --replace "Exec=" "Exec=$out/bin/" + --replace-fail "Exec=" "Exec=$out/bin/" ''; - meta = with lib; { - homepage = "https://lifeograph.sourceforge.net/wiki/Main_Page"; - description = "Lifeograph is an off-line and private journal and note taking application"; - license = licenses.gpl3Only; - maintainers = [ ]; + meta = { + homepage = "https://lifeograph.sourceforge.net/doku.php?id=start"; + description = "Off-line and private journal and note taking application"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ emaryn ]; mainProgram = "lifeograph"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ma/mar1d/fix-aarch64.patch b/pkgs/by-name/ma/mar1d/fix-aarch64.patch new file mode 100644 index 000000000000..b45d54eb6d50 --- /dev/null +++ b/pkgs/by-name/ma/mar1d/fix-aarch64.patch @@ -0,0 +1,45 @@ +diff --git a/src/parsing.c b/src/parsing.c +index 8d97a7e..786a536 100644 +--- a/src/parsing.c ++++ b/src/parsing.c +@@ -348,8 +348,8 @@ void io_getLevels(level** ls, char* fn){ + memset(io_cs, 0, sizeof(color) * CHAR_MAX); + *ls = salloc(sizeof(level) * CHAR_MAX); + memset(*ls, 0, sizeof(level *) * CHAR_MAX); +- char c; +- char name = '\0'; ++ int c; ++ int name = '\0'; + while((c = fgetc(f)) != EOF){ + if (c == 'C' || c == 'O' || c == 'L') { + name = fgetc(f); +diff --git a/src/parsing.h b/src/parsing.h +index d4be0a0..ae485ae 100644 +--- a/src/parsing.h ++++ b/src/parsing.h +@@ -16,9 +16,9 @@ int io_getFont(bool**, char*); + + void io_getColor(FILE*, color*); + +-void io_getLevel(FILE*, level*, obj[127]); ++void io_getLevel(FILE*, level*, obj[CHAR_MAX]); + +-void io_getObj(FILE*, obj*, char, color[127]); ++void io_getObj(FILE*, obj*, char, color[CHAR_MAX]); + + // TODO: this is named terribly. There should be another function io_readLevels that's exposed. this should be private and take in FILE* + void io_getLevels(level**, char*); +diff --git a/src/visual_sounds.c b/src/visual_sounds.c +index 067e2e3..5e5cdc4 100644 +--- a/src/visual_sounds.c ++++ b/src/visual_sounds.c +@@ -921,6 +921,9 @@ void vs_mainPlay(int snd) { + } + + void vs_mainStop() { ++ if (vs_mainVisual == SND_none) { ++ return; ++ } + vs_sounds[vs_mainVisual].cur = NULL; + vs_mainVisual = SND_none; + } diff --git a/pkgs/by-name/ma/mar1d/package.nix b/pkgs/by-name/ma/mar1d/package.nix index 5494432ac91a..2b57511e4dd9 100644 --- a/pkgs/by-name/ma/mar1d/package.nix +++ b/pkgs/by-name/ma/mar1d/package.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Radvendii/MAR1D/commit/baf3269e90eca69f154a43c4c1ef14677a6300fd.patch"; hash = "sha256-ybdLA2sO8e0J7w4roSdMWn72OkttD3y+cJ3ScuGiHCI="; }) + # https://github.com/Radvendii/MAR1D/pull/5 + ./fix-aarch64.patch ]; meta = { diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index 37145774f515..b935b23d1930 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-ynG5M21YQzGhII19kmJv0y5L3HIoEdf30dZA+nScuYA="; + hash = "sha256-rn5Lr2BSrGitI16MLlP91znSPm2Asd6j0qI8N+1c+Lo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -95,6 +95,8 @@ stdenv.mkDerivation (finalAttrs: { extraArgs = [ "--url" "https://github.com/matomo-org/matomo" + "--version-regex" + "^(\\d+\\.\\d+\\.\\d+)$" ]; }; tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index 3b99c51ac6a5..6a97121ff564 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "metals"; - version = "1.5.2"; + version = "1.5.3"; deps = stdenv.mkDerivation { name = "metals-deps-${finalAttrs.version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-Qh8T0/nLVpfdJiWqdi1mpvUom5B9Xr8jsNGqzEx8OLs="; + outputHash = "sha256-jxrAtlD+s3yjcDWYLoN7mr8RozutItCv8dt28/UoVjk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 59bbc8ed4346..9eaed863a826 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -89,6 +89,9 @@ rustPlatform.buildRustPackage rec { --bash ./completions/mise.bash \ --fish ./completions/mise.fish \ --zsh ./completions/_mise + + mkdir -p $out/lib/mise + touch $out/lib/mise/.disable-self-update ''; passthru = { diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix index 7fc13890008b..4be5daba1788 100644 --- a/pkgs/by-name/mu/musicpod/package.nix +++ b/pkgs/by-name/mu/musicpod/package.nix @@ -1,6 +1,6 @@ { lib, - flutter327, + flutter329, fetchFromGitHub, mpv-unwrapped, libass, @@ -12,15 +12,15 @@ gitUpdater, }: -flutter327.buildFlutterApplication rec { +flutter329.buildFlutterApplication rec { pname = "musicpod"; - version = "2.9.0"; + version = "2.11.4"; src = fetchFromGitHub { owner = "ubuntu-flutter-community"; repo = "musicpod"; tag = "v${version}"; - hash = "sha256-jq133GdeuEENPb2igNWkjeFTpI5qqxF2RuCu78y6L8o="; + hash = "sha256-bZAVkYSQ8NFW4wAXjfEZYt/Z/gSYn51MPLY+hENWQac="; }; postPatch = '' @@ -30,14 +30,18 @@ flutter327.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; - media_kit = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; - media_kit_libs_video = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; - media_kit_video = "sha256-uRQmrV1jAxsWXFm5SimAY/VYMHBB9fPSnRXvUCvEI8g="; - phoenix_theme = "sha256-HGMRQ5wdhoqYNkrjLTfz6mE/dh45IRyuQ79/E4oo+9w="; - yaru = "sha256-lwyl5aRf5HzWHk7aXYXFj6a9QiFpDN9piHYXzVccYWY="; - }; + gitHashes = + let + media_kit-hash = "sha256-uSVSLh4E/iUJaxA1JxKRYmDFyMpuoTWTyEwsbJuPldU="; + in + { + audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; + media_kit = media_kit-hash; + media_kit_libs_video = media_kit-hash; + media_kit_video = media_kit-hash; + phoenix_theme = "sha256-HGMRQ5wdhoqYNkrjLTfz6mE/dh45IRyuQ79/E4oo+9w="; + yaru = "sha256-8TgDrI1vWIi8V1e/DrKVb4PS+KLCguG0bB15/XFFnX4="; + }; buildInputs = [ mpv-unwrapped diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json index 4f3da3d51278..1aa9bb7278f2 100644 --- a/pkgs/by-name/mu/musicpod/pubspec.lock.json +++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json @@ -4,27 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "88399e291da5f7e889359681a8f64b18c5123e03576b01f32a6a276611e511c3", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", "url": "https://pub.dev" }, "source": "hosted", - "version": "78.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.3" + "version": "80.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "62899ef43d0b962b056ed2ebac6b47ec76ffd003d5f7c4e4dc870afe63188e33", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.0" + "version": "7.3.0" }, "animated_emoji": { "dependency": "direct main", @@ -60,61 +54,61 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "assorted_layout_widgets": { "dependency": "transitive", "description": { "name": "assorted_layout_widgets", - "sha256": "0fa75b70e3d0a8c6a8d4d89ff138eead007c1e42c6b27f7863bc2f18ea1481fa", + "sha256": "86eacbd25f7dd14a8182003935b07d94205ae4b0e6bedee03bde1404746bb7a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.4.4" + "version": "10.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audio_metadata_reader": { "dependency": "direct main", "description": { "name": "audio_metadata_reader", - "sha256": "9f05d016a3277357308eb6d2f283cd1229c7fae62d6943ee6ab95b374e265222", + "sha256": "3a8f69540f2c8ffab3d22fad65d3dd91a29170850766843390d2b5beebc902ee", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.4.1" }, "audio_service": { "dependency": "direct main", "description": { "name": "audio_service", - "sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f", + "sha256": "887ddf15fce31fd12aa8044c3bffd14c58929fb20e31d96284fe3aaf48315ac6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.16" + "version": "0.18.17" }, "audio_service_mpris": { "dependency": "direct main", @@ -141,51 +135,51 @@ "dependency": "transitive", "description": { "name": "audio_service_web", - "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9", + "sha256": "b8ea9243201ee53383157fbccf13d5d2a866b5dda922ec19d866d1d5d70424df", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "0.1.4" }, "audio_session": { "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", + "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.23" + "version": "0.1.25" }, "basic_utils": { "dependency": "direct main", "description": { "name": "basic_utils", - "sha256": "2064b21d3c41ed7654bc82cc476fd65542e04d60059b74d5eed490a4da08fc6c", + "sha256": "548047bef0b3b697be19fa62f46de54d99c9019a69fb7db92c69e19d87f633c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.2" }, "blur": { "dependency": "direct main", "description": { "name": "blur", - "sha256": "c17450404bceea429100e0838d19bbfaa6ad1f3053e7bac78a0264bbd60cfe01", + "sha256": "4009ea0c63d55b335794ac5cbbe9544fd10527a21b6272bfb6a44b5eda1a814c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.1" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", @@ -221,31 +215,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -271,11 +265,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "cached_network_image": { "dependency": "direct main", @@ -311,11 +305,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charset": { "dependency": "transitive", @@ -351,11 +345,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -371,21 +365,21 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "8a68739d3ee113e51ad35583fdf9ab82c55d09d693d3c39da1aebab87c938412", + "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.3" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -431,11 +425,11 @@ "dependency": "transitive", "description": { "name": "csslib", - "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.17.3" + "version": "1.0.2" }, "cupertino_icons": { "dependency": "direct main", @@ -461,11 +455,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "desktop_notifications": { "dependency": "direct main", @@ -501,21 +495,21 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.1" }, "equatable": { "dependency": "transitive", @@ -531,21 +525,21 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "direct main", @@ -561,11 +555,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204", + "sha256": "36a1652d99cb6bf8ccc8b9f43aded1fd60b234d23ce78af422c07f950a436ef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.7" + "version": "10.0.0" }, "file_selector": { "dependency": "direct main", @@ -581,11 +575,11 @@ "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc", + "sha256": "f3a3d48a36d1640b4dca22a086f26b426c246925a80eddc2953120775fbcf86a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+12" + "version": "0.5.1+13" }, "file_selector_ios": { "dependency": "transitive", @@ -641,11 +635,11 @@ "dependency": "transitive", "description": { "name": "file_selector_windows", - "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4", + "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+3" + "version": "0.9.3+4" }, "fixnum": { "dependency": "transitive", @@ -687,21 +681,21 @@ "dependency": "direct main", "description": { "name": "flutter_html", - "sha256": "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee", + "sha256": "38a2fd702ffdf3243fb7441ab58aa1bc7e6922d95a50db76534de8260638558d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0-beta.2" + "version": "3.0.0" }, "flutter_launcher_icons": { "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5", + "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.14.2" + "version": "0.14.3" }, "flutter_lints": { "dependency": "direct dev", @@ -723,21 +717,21 @@ "dependency": "direct main", "description": { "name": "flutter_markdown", - "sha256": "e37f4c69a07b07bb92622ef6b131a53c9aae48f64b176340af9e8e5238718487", + "sha256": "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.5" + "version": "0.7.7" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_rust_bridge": { "dependency": "transitive", @@ -825,11 +819,11 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", @@ -875,21 +869,21 @@ "dependency": "direct main", "description": { "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.4" + "version": "0.15.5" }, "http": { "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", @@ -915,11 +909,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "intl": { "dependency": "direct main", @@ -965,11 +959,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "json_annotation": { "dependency": "transitive", @@ -995,21 +989,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1081,16 +1075,6 @@ "source": "hosted", "version": "1.0.3" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3-main.0" - }, "markdown": { "dependency": "transitive", "description": { @@ -1105,11 +1089,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1136,21 +1120,21 @@ "description": { "path": "media_kit", "ref": "HEAD", - "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "resolved-ref": "d544e1c52db47a45097a8332a862687c832359d9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.1.11" + "version": "1.2.0" }, "media_kit_libs_android_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_android_video", - "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "sha256": "adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "media_kit_libs_ios_video": { "dependency": "transitive", @@ -1166,11 +1150,11 @@ "dependency": "transitive", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_macos_video": { "dependency": "transitive", @@ -1187,45 +1171,45 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "HEAD", - "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "resolved-ref": "d544e1c52db47a45097a8332a862687c832359d9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.0.5" + "version": "1.0.6" }, "media_kit_libs_windows_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_windows_video", - "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.10" + "version": "1.0.11" }, "media_kit_video": { "dependency": "direct main", "description": { "path": "media_kit_video", "ref": "HEAD", - "resolved-ref": "4d8c634c28d439384aab40b9d2edff83077f37c9", + "resolved-ref": "d544e1c52db47a45097a8332a862687c832359d9", "url": "https://github.com/media-kit/media-kit" }, "source": "git", - "version": "1.2.5" + "version": "1.3.0" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "mime", "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", @@ -1264,55 +1248,65 @@ "source": "hosted", "version": "2.1.0" }, + "opml": { + "dependency": "direct main", + "description": { + "name": "opml", + "sha256": "812ac9abc81c486c24c26dc96de0ffab71696f88c26edc39e21f3435f97dbd56", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, "package_config": { "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.3" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "palette_generator": { "dependency": "direct main", "description": { "name": "palette_generator", - "sha256": "0b20245c451f14a5ca0818ab7a377765162389f8e8f0db361cceabf0fed9d1ea", + "sha256": "5a96b78983752faeb94866b30cb8f52e94ef176722bf51d1c5541d6a3044368f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+5" + "version": "0.3.3+6" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", @@ -1338,11 +1332,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1388,31 +1382,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1428,11 +1422,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1448,11 +1442,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "phoenix_theme": { "dependency": "direct main", @@ -1529,11 +1523,11 @@ "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.9.1" + "version": "4.0.0" }, "pool": { "dependency": "transitive", @@ -1559,11 +1553,11 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1639,11 +1633,11 @@ "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", + "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "screen_brightness_platform_interface": { "dependency": "transitive", @@ -1719,21 +1713,21 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84", + "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.8" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1769,11 +1763,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "shared_preferences_windows": { "dependency": "transitive", @@ -1799,11 +1793,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "shimmer": { "dependency": "direct main", @@ -1845,11 +1839,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "sprintf": { "dependency": "transitive", @@ -1865,41 +1859,41 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1+1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1915,11 +1909,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "state_notifier": { "dependency": "transitive", @@ -1935,11 +1929,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1955,11 +1949,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "super_clipboard": { "dependency": "transitive", @@ -1992,14 +1986,14 @@ "version": "0.8.24" }, "synchronized": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "system_theme": { "dependency": "direct main", @@ -2025,21 +2019,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "timing": { "dependency": "transitive", @@ -2095,21 +2089,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -2185,31 +2179,31 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "volume_controller": { "dependency": "transitive", "description": { "name": "volume_controller", - "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "sha256": "e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "3.3.3" }, "wakelock_plus": { "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -2225,14 +2219,14 @@ "dependency": "direct main", "description": { "name": "watch_it", - "sha256": "8ce7e442a65ef81db155dc505594f1856660fa5dd068471a1fe9c5eeaced9b93", + "sha256": "44ad14c66c9a4240ac39243c8e09849a85ab6511b7b9217cacde024ed45796e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.2" + "version": "1.6.5" }, "watcher": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "watcher", "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", @@ -2245,11 +2239,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -2265,21 +2259,21 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.0" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", @@ -2335,12 +2329,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "4a943961ad6c1d382b1bfc3bc0e67bb9f6440089", - "resolved-ref": "4a943961ad6c1d382b1bfc3bc0e67bb9f6440089", + "ref": "b75bb6e2b3c30126b17d73a67577ad43f5c65d7c", + "resolved-ref": "b75bb6e2b3c30126b17d73a67577ad43f5c65d7c", "url": "https://github.com/ubuntu/yaru.dart" }, "source": "git", - "version": "6.0.0" + "version": "7.0.0" }, "yaru_window": { "dependency": "direct main", @@ -2394,7 +2388,7 @@ } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.2" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.2" } } diff --git a/pkgs/by-name/nb/nbxplorer/deps.json b/pkgs/by-name/nb/nbxplorer/deps.json index 1b3dad6dd7b2..408869628806 100644 --- a/pkgs/by-name/nb/nbxplorer/deps.json +++ b/pkgs/by-name/nb/nbxplorer/deps.json @@ -166,13 +166,13 @@ }, { "pname": "NBitcoin", - "version": "8.0.4", - "hash": "sha256-9GxJVcByg3zHl9uR01KpTkFkwKuFyr2hm0uZWWlDGeE=" + "version": "8.0.12", + "hash": "sha256-OBJu6fQd0MBKSVHERI7EBtSQQvAL9T8Gr0e7Kx2q9/I=" }, { "pname": "NBitcoin.Altcoins", - "version": "4.0.4", - "hash": "sha256-fHG/dlTbEu9DjFnHpEVI6/LbVz0BSJdqkPOo6tQW0fg=" + "version": "4.0.7", + "hash": "sha256-WN9uLRlIW+WGUSS4NE7ZE8kftQEaVDh7AnT1+P8g2gg=" }, { "pname": "NETStandard.Library", diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix index d2ee363c3205..df6948d838bc 100644 --- a/pkgs/by-name/nb/nbxplorer/package.nix +++ b/pkgs/by-name/nb/nbxplorer/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.5.25"; + version = "2.5.26"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; tag = "v${version}"; - hash = "sha256-RTkKyckdAv6+wJSlDlR+Q8fw0aZEbi4AwB+OPHI7TR4="; + hash = "sha256-gXLzUgFZxrDNbDjpPmVDIj2xi6I+IfkNwXBYvelRYPU="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix new file mode 100644 index 000000000000..ec087044dc0d --- /dev/null +++ b/pkgs/by-name/op/opencode/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule (finalAttrs: { + pname = "opencode"; + version = "0.0.34"; + + src = fetchFromGitHub { + owner = "opencode-ai"; + repo = "opencode"; + tag = "v${finalAttrs.version}"; + hash = "sha256-EaspkL0TEBJEUU3f75EhZ4BOIvbneUKnTNeNGhJdjYE="; + }; + + vendorHash = "sha256-cFzkMunPkGQDFhQ4NQZixc5z7JCGNI7eXBn826rWEvk="; + + checkFlags = + let + skippedTests = [ + # permission denied + "TestBashTool_Run" + "TestSourcegraphTool_Run" + "TestLsTool_Run" + ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "Powerful terminal-based AI assistant providing intelligent coding assistance"; + homepage = "https://github.com/opencode-ai/opencode"; + mainProgram = "opencode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + zestsystem + ]; + }; +}) diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix new file mode 100644 index 000000000000..7c408263745b --- /dev/null +++ b/pkgs/by-name/pa/particle-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + udev, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "particle-cli"; + version = "3.35.8"; + + src = fetchFromGitHub { + owner = "particle-iot"; + repo = "particle-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-t4alWb6W6AHBAsyRGLBTmjB0JpfzKBQ+yt2LESuU7YE="; + }; + + npmDepsHash = "sha256-FEpj9u0KqQ+yLtwFgahun6AUSolbEiWjWstglD9yyQ8="; + + buildInputs = [ + udev + ]; + + dontNpmBuild = true; + dontNpmPrune = true; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + postInstall = '' + install -D -t $out/etc/udev/rules.d \ + $out/lib/node_modules/particle-cli/assets/50-particle.rules + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command Line Interface for Particle Cloud and devices"; + homepage = "https://github.com/particle-iot/particle-cli"; + maintainers = with lib.maintainers; [ jess ]; + mainProgram = "particle"; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index 6e64e55eabcd..94e92d587920 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdf4qt"; - version = "1.5.0.0"; + version = "1.5.1.0"; src = fetchFromGitHub { owner = "JakubMelka"; repo = "PDF4QT"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ELdmnOEKFGCtuf240R/0M6r8aPwRQiXurAxrqcCZvOI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ysrz/uCSTFK5wGNdTXhpq6QVf7Ju1xWisNVUtBtdEjc="; }; patches = [ @@ -30,19 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ./find_lcms2_path.patch ]; - # make calls to QString::arg compatible with Qt 6.9 - # see https://doc-snapshots.qt.io/qt6-6.9/whatsnew69.html#new-features-in-qt-6-9 - postPatch = '' - substituteInPlace Pdf4QtLibCore/sources/pdf{documentsanitizer,optimizer}.cpp \ - --replace-fail \ - '.arg(counter)' \ - '.arg(counter)' - substituteInPlace Pdf4QtLibCore/sources/pdfoptimizer.cpp \ - --replace-fail \ - '.arg(bytesSaved)' \ - '.arg(bytesSaved)' - ''; - nativeBuildInputs = [ cmake pkg-config @@ -83,8 +70,9 @@ stdenv.mkDerivation (finalAttrs: { functionality based on PDF Reference 2.0. ''; homepage = "https://jakubmelka.github.io"; - license = lib.licenses.lgpl3Only; - mainProgram = "Pdf4QtViewerLite"; + changelog = "https://github.com/JakubMelka/PDF4QT/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "Pdf4QtViewer"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix index d21f0b2d3117..025652d69b87 100644 --- a/pkgs/by-name/pd/pdftk/package.nix +++ b/pkgs/by-name/pd/pdftk/package.nix @@ -3,20 +3,12 @@ stdenv, fetchFromGitLab, gradle_8, - jre_headless, - jre_minimal, + jre, runtimeShell, }: let # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." gradle = gradle_8; - - jre = jre_minimal.override { - modules = [ - "java.base" - ]; - jdk = jre_headless; - }; in stdenv.mkDerivation rec { pname = "pdftk"; diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index bf23b4401ef9..10098cccb472 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0Q1hf1AGAZv6jt05tV3F6++lzLpddvjhiykIhV40cPs="; }; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; - postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -46,11 +44,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ="; }; - pnpmRoot = ".."; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; + inherit (finalAttrs) + pname + version + src + cargoRoot + ; hash = "sha256-dyXINRttgsqCfmgtZNXxr/Rl8Yn0F2AVm8v2Ao+OBsw="; }; @@ -93,12 +96,6 @@ stdenv.mkDerivation (finalAttrs: { } )}"; - preConfigure = '' - # pnpm.configHook has to write to .., as our sourceRoot is set to src-tauri - # TODO: move frontend into its own drv - chmod +w .. - ''; - meta = { description = "Cross-platform translation software"; mainProgram = "pot"; diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 0074ce54bf06..c9bb0474e366 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.40"; + version = "0.9.41"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-GpdlxDwjWveFvkGP2pju5cMlXPbjOOxEIdmpxz6RNTw="; + hash = "sha256-sX/Er2G4V2jmIp5DAXR158nmAXqkVvEb9bMqP44z7P4="; fetchSubmodules = true; }; @@ -39,14 +39,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-+fJbQmoa89WSfA4dteUSRoEfgEN38tsHZiuWyOvuvhw="; + hash = "sha256-ozRDNXWqg0CZ1IgU33C6yJu4e05010jsHeTdIVhB72M="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-5mWnKjV9FBgO3trYZyOe+rWFMnJkp17NEbBz7gLg6tw="; + cargoHash = "sha256-5DIagAKSq427kwZTH/QKY3vbb+TmFscKSANoSkEJMGg="; cargoRoot = "../.."; diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index 0606b8f4306f..b835ac901c1c 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-wanxiang"; - version = "6.7.8"; + version = "6.7.9"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-U5aM8LMBh0ncGPIllhioJCS1/5SncWYg8e+C5tXDST0="; + hash = "sha256-cOHwgy0rjqce7MedL0hK59royKlAPmZRGcVHRx0FrRU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rn/rnnoise-plugin/package.nix b/pkgs/by-name/rn/rnnoise-plugin/package.nix index 136f86bef9c8..78fb11fca707 100644 --- a/pkgs/by-name/rn/rnnoise-plugin/package.nix +++ b/pkgs/by-name/rn/rnnoise-plugin/package.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { pname = "rnnoise-plugin"; version = "1.10"; + outputs = [ + "out" + "ladspa" + "lv2" + "lxvst" + "vst3" + ]; src = fetchFromGitHub { owner = "werman"; @@ -43,6 +50,15 @@ stdenv.mkDerivation rec { webkitgtk_4_1 ]; + # Move each plugin into a dedicated output, leaving a symlink in $out for backwards compatibility + postInstall = '' + for plugin in ladspa lv2 lxvst vst3; do + mkdir -p ''${!plugin}/lib + mv $out/lib/$plugin ''${!plugin}/lib/$plugin + ln -s ''${!plugin}/lib/$plugin $out/lib/$plugin + done + ''; + meta = with lib; { description = "Real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 7b560a8f0714..3ad024bea40e 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -61,13 +61,13 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-05-13"; + version = "0-unstable-2025-05-15"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "a572bf1191f8807e63d6bec4734ecae2b50439c3"; - hash = "sha256-iMB2dJA0TVV6l14WqZt8KJehHRoGozycjjCHPXPjMsI="; + rev = "103cbed928b0b9ecd7084b5e9dcab135eca19327"; + hash = "sha256-TMrtD7f0bay6NtodM3SZfi8tLCQp6dE5iBicyGXZAco="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-HtyRHaYBadqqpJ8dSBOMp5xOwzRfBYjeuj4Kb/xx5ds="; + cargoHash = "sha256-7PTrE2FA2cvOKU35qTYBr7cop65gWY+zSOVlDZiJdow="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/by-name/so/sosreport/package.nix similarity index 83% rename from pkgs/applications/logging/sosreport/default.nix rename to pkgs/by-name/so/sosreport/package.nix index ccd49916804d..af8f7c768f2d 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/by-name/so/sosreport/package.nix @@ -1,15 +1,11 @@ { lib, - buildPythonPackage, + python3Packages, fetchFromGitHub, gettext, - packaging, - pexpect, - pyyaml, - setuptools, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "sosreport"; version = "4.9.1"; pyproject = true; @@ -21,13 +17,13 @@ buildPythonPackage rec { hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE="; }; - build-system = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; nativeBuildInputs = [ gettext ]; - dependencies = [ + dependencies = with python3Packages; [ packaging pexpect pyyaml diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index cba31e5699b6..470c7eeaba75 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "spacetimedb"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "clockworklabs"; repo = "spacetimedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ay9nJ4b+lRBbZU/LmpG8agLcjp3jyDFyJdESeNoGsLQ="; + hash = "sha256-eBbRdkJafkMXOEsnh1yoht8WJAwZToPobWnhjTWhnA4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-O74clwtMQ1roSy9Jg0l4vzBKuG3DXHDx4yRH/pbT8E0="; + cargoHash = "sha256-gs1A/gtjA941TWZw+wxMR+9TCayRa1k49/G8XnzW2ek="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index cab4d40841bb..4a3a3c38b991 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${version}"; - hash = "sha256-cseTLVs3LXksajOq9TULUbofwG/kp29sgulZ83QUXYk="; + hash = "sha256-D7eujFJiFHmWlEoVkMkUSIdJt5fx+jTTqDwZs0JJw4o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-y5hzOGTJeOZ1JjJNsxo80KL1DnWL87DU1M1yxiOkeb0="; + cargoHash = "sha256-dXLJKwwNIv4QcbROJyWB9oGBqh6bztz37tXMzc5jYUM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/ta/taler-twister/package.nix b/pkgs/by-name/ta/taler-twister/package.nix new file mode 100644 index 000000000000..0183ab9405cd --- /dev/null +++ b/pkgs/by-name/ta/taler-twister/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + pkg-config, + curl, + gnunet, + jansson, + libgcrypt, + libmicrohttpd, + libsodium, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "taler-twister"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.taler.net/twister.git"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ir+kU9bCWwhqR88hmNHB5cm1DXOQowI5y6GdhWpX/L0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + curl + gnunet + jansson + libgcrypt + libmicrohttpd + libsodium + ]; + + doInstallCheck = true; + + meta = { + homepage = "https://git.taler.net/twister.git"; + description = "Fault injector for HTTP traffic"; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + license = lib.licenses.agpl3Plus; + mainProgram = "twister"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix index 9574e9ff9bd9..98e4b0c3f158 100644 --- a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "bypass.yazi"; - version = "25.3.2-unstable-2025-04-22"; + version = "25.3.2-unstable-2025-05-11"; src = fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "bypass.yazi"; - rev = "17e86529b2aa8ea7c08e117debf7c55044f9edb4"; - hash = "sha256-Q5g23sCGx9Ecm350ZiGKA1OaRieECWtF1xe22WzTtdY="; + rev = "85b5e9624a9eaa14c70b17b873209a2054f4062a"; + hash = "sha256-2fblXb2uE6tq9goZKzMFgiEUVsx+uaRLyIq9BzTM8KA="; }; meta = { diff --git a/pkgs/by-name/yo/youtubeuploader/package.nix b/pkgs/by-name/yo/youtubeuploader/package.nix new file mode 100644 index 000000000000..e43d728ba85c --- /dev/null +++ b/pkgs/by-name/yo/youtubeuploader/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule rec { + pname = "youtubeuploader"; + version = "1.24.4"; + + src = fetchFromGitHub { + owner = "porjo"; + repo = "youtubeuploader"; + tag = "v${version}"; + hash = "sha256-93VqB8tnl5o6YRY2cNBF/uARrJI6ywNg83lXGMxtgYM="; + }; + + vendorHash = "sha256-FgAfUcgY2dY8Jj3YcxrIGOpzQeAAICELeKL+scblZq0="; + + passthru.updateScript = nix-update-script { }; + + ldflags = [ + "-s" + "-X main.appVersion=${version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + + meta = { + description = "Scripted uploads to Youtube using Golang"; + homepage = "https://github.com/porjo/youtubeuploader"; + changelog = "https://github.com/porjo/youtubeuploader/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ srghma ]; + mainProgram = "youtubeuploader"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/zp/zprint/package.nix b/pkgs/by-name/zp/zprint/package.nix index d1e41f5bb1f2..39e105697bbf 100644 --- a/pkgs/by-name/zp/zprint/package.nix +++ b/pkgs/by-name/zp/zprint/package.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage rec { pname = "zprint"; - version = "1.2.9"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-4gSGD7Jiu1mqyPMoQrrPT60EFXs7ySfjpT9wSyhp3ig="; + sha256 = "sha256-0ogZkC8j+ja0aWvFgNhygof4GZ78aqQA75lRxYfu6do="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index 59862d182a86..e5adef9a0bb3 100644 --- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -1,19 +1,40 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + meson, + ninja, + pkg-config, + wrapGAppsHook3, glib, gtk3, libxfce4ui, libxfce4util, xfce4-panel, + gitUpdater, }: -mkXfceDerivation { - category = "apps"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-dict"; - version = "0.8.8"; + version = "0.8.9"; - sha256 = "sha256-nVpEeOSSfXCIxuIj0qie+oi8FVRiVUmDMPZZwIZ9L/k="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = "xfce4-dict"; + tag = "xfce4-dict-${finalAttrs.version}"; + hash = "sha256-cl5TnPlgGUZ4esdkptyXO+LagdAboSzR4m0cCre9RHA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + glib # glib-compile-resources + meson + ninja + pkg-config + wrapGAppsHook3 + ]; buildInputs = [ glib @@ -23,9 +44,14 @@ mkXfceDerivation { xfce4-panel ]; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "xfce4-dict-"; }; + + meta = { description = "Dictionary Client for the Xfce desktop environment"; + homepage = "https://gitlab.xfce.org/apps/xfce4-dict"; + license = lib.licenses.gpl2Plus; mainProgram = "xfce4-dict"; - teams = [ teams.xfce ]; + teams = [ lib.teams.xfce ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index ce4c4970dc66..d535db4cd727 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -5,7 +5,7 @@ babel, buildPythonPackage, dnspython, - fetchFromGitHub, + fetchFromGitea, lxml, multidict, pyasn1-modules, @@ -27,13 +27,21 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "horazont"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "jssfr"; repo = "aioxmpp"; tag = "v${version}"; hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo="; }; + postPatch = '' + substituteInPlace tests/bookmarks/test_service.py \ + --replace-fail 'can only assign an iterable$' 'must assign iterable' + substituteInPlace tests/test_utils.py \ + --replace-fail 'property of .* has no' 'property .*of .* has no' + ''; + pythonRelaxDeps = [ "lxml" ]; @@ -87,8 +95,8 @@ buildPythonPackage rec { meta = { description = "Pure-python XMPP library for asyncio"; - homepage = "https://github.com/horazont/aioxmpp"; - changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; + homepage = "https://codeberg.org/jssfr/aioxmpp"; + changelog = "https://codeberg.org/jssfr/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 115d0500f632..44eac5c91c86 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.29.0"; + version = "2.30.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-KUDqaZv6gE0t5FXjQiuKUsmtV0qMKyF637z7Zg+LYoE="; + hash = "sha256-HTWd3jEStoRlX9NYYEO3PmC9i/cn3k+SJ7RFP0fxa3M="; }; build-system = [ diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 88f1ae00a475..0146091c8ea6 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -7,6 +7,7 @@ certifi, ecs-logging, fetchFromGitHub, + fetchpatch, httpx, jinja2, jsonschema, @@ -44,6 +45,14 @@ buildPythonPackage rec { hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-latest-starlette-and-sanic.patch"; + url = "https://github.com/elastic/apm-agent-python/commit/80d167f54b6bf1db8b6e7ee52e2ac6803bc64f54.patch"; + hash = "sha256-VtA7+SyEZiL3aqpikyYJQ4tmdmsUpIdkSx6RtC1AzqY="; + }) + ]; + pythonRelaxDeps = [ "wrapt" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/modern-colorthief/default.nix b/pkgs/development/python-modules/modern-colorthief/default.nix new file mode 100644 index 000000000000..52932819ae48 --- /dev/null +++ b/pkgs/development/python-modules/modern-colorthief/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + colorthief, + fetchFromGitHub, + nix-update-script, + pillow, + pytestCheckHook, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "modern-colorthief"; + version = "0.1.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "baseplate-admin"; + repo = "modern_colorthief"; + tag = version; + hash = "sha256-tALF9EIBTyVi3Ca4kQl9x+V12gjr0xH9OOmuoToxuJA="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-DldfoDpE7epb99Huq0RXkS3cAw0RtIzdWvr9OuZRZTI="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + optional-dependencies = { + test = [ + colorthief + pillow + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.attrValues optional-dependencies; + + disabledTestPaths = [ + # Requires `fast_colorthief`, which isn't packaged + "examples/test_time.py" + ]; + + pythonImportsCheck = [ "modern_colorthief" ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://modern-colorthief.readthedocs.io/"; + changelog = "https://github.com/baseplate-admin/modern_colorthief/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + }; +} diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index 3ec853572a6c..353fd5aa7832 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -6,16 +6,15 @@ # build-system setuptools, + setuptools-scm, # dependencies - multimethod, numpy, packaging, pandas, pydantic, typeguard, typing-inspect, - wrapt, # optional-dependencies black, @@ -39,27 +38,30 @@ buildPythonPackage rec { pname = "pandera"; - version = "0.22.1"; + version = "0.23.1"; pyproject = true; src = fetchFromGitHub { owner = "unionai-oss"; repo = "pandera"; tag = "v${version}"; - hash = "sha256-QOks3L/ZebkoWXWbHMn/tV9SmYSbR+gZ8wpqWoydkPM="; + hash = "sha256-aKyuOA/N5QPv6NoN6OFNSFMuN4+8XMpglVtoDFDJZBs="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; dependencies = [ - multimethod numpy packaging pandas pydantic typeguard typing-inspect - wrapt ]; optional-dependencies = diff --git a/pkgs/development/python-modules/paramax/default.nix b/pkgs/development/python-modules/paramax/default.nix index 70a91c6e61ec..c224505027b8 100644 --- a/pkgs/development/python-modules/paramax/default.nix +++ b/pkgs/development/python-modules/paramax/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "paramax"; - version = "0.0.0"; + version = "0.0.3"; pyproject = true; src = fetchFromGitHub { owner = "danielward27"; repo = "paramax"; tag = "v${version}"; - hash = "sha256-w6F9XuQEwRfOei6gDAyCHt2HUY7I4H92AlEv1Xddv54="; + hash = "sha256-aPbYG3UGR8YbRa2GLLrZvYPxRK5LRGMF8HBTpaZmKds="; }; build-system = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; meta = { - description = "A small library of paramaterizations and parameter constraints for PyTrees"; + description = "Small library of paramaterizations and parameter constraints for PyTrees"; homepage = "https://github.com/danielward27/paramax"; changelog = "https://github.com/danielward27/paramax/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 46ab52ab23df..69ebdfd69da8 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.45.0"; + version = "0.45.2"; pyproject = true; src = fetchFromGitHub { owner = "pyvista"; repo = "pyvista"; tag = "v${version}"; - hash = "sha256-ruhG9HsD1PzTs/S6IDtuqIxg7UBmn67Ne2Y/H8y/9Cs="; + hash = "sha256-szI9kzJQOVCKcGTWj9Twq9i2DzbrHt/LmYBBfq6MBy8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index 7b8131f8cc7f..4fbb1a4b394d 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/pkgs/development/python-modules/stim/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "stim"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; src = fetchFromGitHub { owner = "quantumlib"; repo = "Stim"; tag = "v${version}"; - hash = "sha256-Tx+4FfkMShzTP1QEQVwHEz3FZ5pz3uXK2mlJFLNlTas="; + hash = "sha256-Wls7dJkuV/RXnMizwrYOJOKopWEf1r21FKoKHjmpEQ0="; }; postPatch = '' @@ -86,7 +86,7 @@ buildPythonPackage rec { description = "Tool for high performance simulation and analysis of quantum stabilizer circuits, especially quantum error correction (QEC) circuits"; mainProgram = "stim"; homepage = "https://github.com/quantumlib/stim"; - changelog = "https://github.com/quantumlib/Stim/releases/tag/v${version}"; + changelog = "https://github.com/quantumlib/Stim/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ chrispattison ]; }; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 13154fab62d8..19bc95582e47 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -18,7 +18,6 @@ SDL2_image, SDL2_ttf, SDL2_gfx, - libX11, freetype, fluidsynth, sdl2Client ? false, @@ -35,13 +34,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-lT3sXD5lFjG/63eBXEG+rU9idem/8kXfUXj6iB3AGOg="; + hash = "sha256-+kAV9Jz0aQpzeVUFp3so+rYbWOn52NuxRwE8kP5hzM8="; }; postPatch = '' @@ -79,7 +78,6 @@ stdenv.mkDerivation rec { SDL2_image SDL2_ttf SDL2_gfx - libX11 # can be removed when https://github.com/freeciv/freeciv/commit/00a9d69fa38d8618893e1eaad2830abb395ef25b is tagged, likely in 3.2.0 freetype fluidsynth ] diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index de02f05797e3..9fa994315089 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.15-rc5", - "hash": "sha256:158bpvdbgaknywz4wh3k72qf85p5n3szk5h74cnpya8ic5z5qpmb" + "version": "6.15-rc6", + "hash": "sha256:1l18hsnzh28m2f34rsvq4khwblzl60qc61qs6ic13jbd8jsnhsi9" }, "6.1": { "version": "6.1.138", diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 31c253cbb62e..b9e36faa4446 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -3,6 +3,8 @@ stdenvNoCC, fetchurl, nixosTests, + cacert, + caBundle ? "${cacert}/etc/ssl/certs/ca-bundle.crt", nextcloud30Packages, nextcloud31Packages, }: @@ -32,6 +34,10 @@ let inherit packages; }; + postPatch = '' + cp ${caBundle} resources/config/ca-bundle.crt + ''; + installPhase = '' runHook preInstall mkdir -p $out/ diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 03003b20dc0c..5b2c4e0089c5 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -41,6 +41,7 @@ lib.mapAttrs (n: make) ( # musl aarch64-unknown-linux-musl = aarch64-multiplatform-musl; armv6l-unknown-linux-musleabihf = muslpi; + riscv64-unknown-linux-musl = riscv64-musl; x86_64-unknown-linux-musl = musl64; } ) diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index ece354ab29e7..432780d0455c 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -171,9 +171,6 @@ flask-cors ]; zero = { }; -} -# NOTE: There will be no need for this conditional once beets is updated. -// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") { _typing = { testPaths = [ ]; }; diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index d06e10494b59..c914a44ef616 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -101,8 +101,6 @@ python3Packages.buildPythonApplication { pyyaml unidecode typing-extensions - ] - ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [ lap ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); @@ -151,8 +149,6 @@ python3Packages.buildPythonApplication { mock rarfile responses - ] - ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [ requests-mock ] ++ [ diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index a0ff569b4179..d13ce2d71c5c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -31,12 +31,12 @@ lib.makeExtensible ( beets-stable = callPackage ./common.nix rec { inherit python3Packages extraPatches; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; tag = "v${version}"; - hash = "sha256-mH3m2O+q5Ys9DJD3ulmhViyf/VPEpHevjmNerVe327s="; + hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY="; }; }; @@ -44,12 +44,12 @@ lib.makeExtensible ( beets-unstable = callPackage ./common.nix { inherit python3Packages; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "250b0da900c095a09bedc1a0717381010c01a3c6"; - hash = "sha256-mH3m2O+q5Ys9DJD3ulmhViyf/VPEpHevjmNerVe327s="; + rev = "d487d675b9115672c484eab8a6729b1f0fd24b68"; + hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY="; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d17a68d9b5c..2a9b06dba028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1011,12 +1011,7 @@ with pkgs; actdiag = with python3.pkgs; toPythonApplication actdiag; - adlplug = callPackage ../applications/audio/adlplug { - jack = libjack2; - }; - opnplug = adlplug.override { - type = "OPN"; - }; + opnplug = adlplug.override { type = "OPN"; }; akkoma = callPackage ../by-name/ak/akkoma/package.nix { beamPackages = beam_minimal.packages.erlang_26.extend ( @@ -12768,8 +12763,6 @@ with pkgs; singularity-overriden-nixos ; - sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; - inherit (callPackages ../development/libraries/wlroots { }) wlroots_0_17 wlroots_0_18 @@ -16211,31 +16204,7 @@ with pkgs; # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - faust = res.faust2; - - faust2 = callPackage ../applications/audio/faust/faust2.nix { }; - - faust2alqt = libsForQt5.callPackage ../applications/audio/faust/faust2alqt.nix { }; - - faust2alsa = callPackage ../applications/audio/faust/faust2alsa.nix { }; - - faust2csound = callPackage ../applications/audio/faust/faust2csound.nix { }; - - faust2sc = callPackage ../applications/audio/faust/faust2sc.nix { }; - - faust2firefox = callPackage ../applications/audio/faust/faust2firefox.nix { }; - - faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { }; - - faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { }; - - faust2jaqt = libsForQt5.callPackage ../applications/audio/faust/faust2jaqt.nix { }; - - faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { }; - - faust2lv2 = libsForQt5.callPackage ../applications/audio/faust/faust2lv2.nix { }; - - faustlive = callPackage ../applications/audio/faust/faustlive.nix { }; + faust = faust2; flashprint = libsForQt5.callPackage ../applications/misc/flashprint { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d7487070cd8..bb1251370fcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9059,6 +9059,8 @@ self: super: with self; { modeled = callPackage ../development/python-modules/modeled { }; + modern-colorthief = callPackage ../development/python-modules/modern-colorthief { }; + moderngl = callPackage ../development/python-modules/moderngl { }; moderngl-window = callPackage ../development/python-modules/moderngl-window { };