diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index 65db03ffaee5..20b717238996 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -481,22 +481,6 @@ module.exports = async ({ github, context, core, dry }) => { }, ) - if (item.pull_request || context.payload.pull_request) { - stats.prs++ - Object.assign( - itemLabels, - await handlePullRequest({ item, stats, events }), - ) - } else { - stats.issues++ - if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) { - // If this returns true, the issue was closed. In this case we return, to not - // label the issue anymore. Most importantly this avoids unlabeling stale issues - // which are closed via auto-close. - if (await handleAutoClose(item)) return - } - } - const latest_event_at = new Date( events .filter(({ event }) => @@ -537,6 +521,29 @@ module.exports = async ({ github, context, core, dry }) => { log('latest_event_at', latest_event_at.toISOString()) const stale_at = new Date(new Date().setDate(new Date().getDate() - 180)) + const is_stale = latest_event_at < stale_at + + if (item.pull_request || context.payload.pull_request) { + // No need to compute merge commits for stale PRs over and over again. + // This increases the repo size on GitHub's side unnecessarily and wastes + // a lot of API requests, too. Any relevant change will result in the + // stale status to change and thus pick up the PR again for labeling. + if (!is_stale) { + stats.prs++ + Object.assign( + itemLabels, + await handlePullRequest({ item, stats, events }), + ) + } + } else { + stats.issues++ + if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) { + // If this returns true, the issue was closed. In this case we return, to not + // label the issue anymore. Most importantly this avoids unlabeling stale issues + // which are closed via auto-close. + if (await handleAutoClose(item)) return + } + } // Create a map (Label -> Boolean) of all currently set labels. // Each label is set to True and can be disabled later. @@ -550,8 +557,7 @@ module.exports = async ({ github, context, core, dry }) => { ) Object.assign(itemLabels, { - '2.status: stale': - !before['1.severity: security'] && latest_event_at < stale_at, + '2.status: stale': !before['1.severity: security'] && is_stale, }) const after = Object.assign({}, before, itemLabels) diff --git a/flake.nix b/flake.nix index 98861323e026..1bac7569d3ea 100644 --- a/flake.nix +++ b/flake.nix @@ -113,7 +113,7 @@ ( self.legacyPackages.${system}.stdenv.hostPlatform.isLinux # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 - && !self.legacyPackages.${system}.targetPlatform.isPower64 + && !self.legacyPackages.${system}.stdenv.targetPlatform.isPower64 # Exclude armv6l-linux because "cannot bootstrap GHC on this platform ('armv6l-linux' with libc 'defaultLibc')" && system != "armv6l-linux" # Exclude riscv64-linux because "cannot bootstrap GHC on this platform ('riscv64-linux' with libc 'defaultLibc')" diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ae2df2599021..0d022c7f1dfa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2768,6 +2768,12 @@ githubId = 333807; name = "Pascal Bach"; }; + backtail = { + name = "Max Genson"; + email = "mail@maxgenson.de"; + github = "backtail"; + githubId = 95583524; + }; backuitist = { email = "biethb@gmail.com"; github = "backuitist"; @@ -6696,6 +6702,11 @@ githubId = 5251658; name = "Dominic Mills"; }; + dmitriiStepanidenko = { + github = "dmitriiStepanidenko"; + githubId = 93157285; + name = "Dmitrii Stepanidenko"; + }; DmitryTsygankov = { email = "dmitry.tsygankov@gmail.com"; github = "DmitryTsygankov"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 84e1fcfaa6db..88e5ef96f57b 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -158,6 +158,8 @@ - [pmount](https://salsa.debian.org/debian/pmount), a tool that allows normal users to mount removable devices without requiring root privileges Available at [programs.pmount](#opt-programs.pmount.enable). +- [rauc](https://rauc.io/) (the Robust Auto-Update Controller), a daemon that allows reliable and secure software updates in embedded Linux systems. Available at [services.rauc](#opt-services.rauc.enable). + - [lemurs](https://github.com/coastalwhite/lemurs), a customizable TUI display/login manager. Available at [services.displayManager.lemurs](#opt-services.displayManager.lemurs.enable). - [docuseal](https://github.com/docusealco/docuseal), a DocuSign alternative. Create, fill, and sign digital documents. Available at [services.docuseal](#opt-services.docuseal.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1ee073ab3bc0..1352e67dcb28 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -678,6 +678,7 @@ ./services/hardware/powerstation.nix ./services/hardware/rasdaemon.nix ./services/hardware/ratbagd.nix + ./services/hardware/rauc.nix ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix ./services/hardware/sane_extra_backends/brscan5.nix diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix index b38e77ce9f4e..b56da132c801 100644 --- a/nixos/modules/services/audio/music-assistant.nix +++ b/nixos/modules/services/audio/music-assistant.nix @@ -26,6 +26,9 @@ let finalPackage = cfg.package.override { inherit (cfg) providers; }; + + # YouTube Music needs deno with JIT to solve yt-dlp challenges + useYTMusic = lib.elem "ytmusic" cfg.providers; in { @@ -89,6 +92,10 @@ in ] ++ lib.optionals (lib.elem "snapcast" cfg.providers) [ snapcast + ] + ++ lib.optionals useYTMusic [ + deno + ffmpeg ]; serviceConfig = { @@ -104,7 +111,7 @@ in CapabilityBoundingSet = [ "" ]; DevicePolicy = "closed"; LockPersonality = true; - MemoryDenyWriteExecute = true; + MemoryDenyWriteExecute = !useYTMusic; ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; @@ -125,6 +132,9 @@ in SystemCallFilter = [ "@system-service" "~@privileged @resources" + ] + ++ lib.optionals useYTMusic [ + "@pkey" ]; RestrictSUIDSGID = true; UMask = "0077"; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index d1718d3bca9d..df9a25564eec 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -172,12 +172,9 @@ in serviceConfig.Restart = "always"; serviceConfig.User = "minetest"; serviceConfig.Group = "minetest"; - - script = '' - cd /var/lib/minetest - - exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags} - ''; + serviceConfig.StateDirectory = "minetest"; + serviceConfig.WorkingDirectory = "/var/lib/minetest"; + serviceConfig.ExecStart = "${pkgs.luanti}/bin/luanti ${lib.escapeShellArgs flags}"; }; }; } diff --git a/nixos/modules/services/hardware/rauc.nix b/nixos/modules/services/hardware/rauc.nix new file mode 100644 index 000000000000..e42d7d02a5ae --- /dev/null +++ b/nixos/modules/services/hardware/rauc.nix @@ -0,0 +1,196 @@ +{ + lib, + pkgs, + config, + ... +}: + +let + inherit (lib.options) mkEnableOption mkPackageOption mkOption; + inherit (lib.modules) mkMerge mkIf; + inherit (lib.lists) flatten filter imap0; + inherit (lib.attrsets) + recursiveUpdate + mapAttrsToList + listToAttrs + nameValuePair + ; + inherit (lib.strings) concatStringsSep; + inherit (lib) types; + + cfg = config.services.rauc; + format = pkgs.formats.ini { }; + + mountDir = "${cfg.dataDir}/mnt"; + + mkSlot = + slot: + if slot.enable then + slot.settings + // { + inherit (slot) device type; + } + else + null; + + slotSections = listToAttrs ( + filter (slot: slot != null) ( + flatten ( + mapAttrsToList ( + name: indexes: imap0 (idx: slot: nameValuePair "slot.${name}.${toString idx}" (mkSlot slot)) indexes + ) cfg.slots + ) + ) + ); + + configFile = format.generate "rauc.conf" ( + recursiveUpdate cfg.settings ( + recursiveUpdate { + system = { + inherit (cfg) compatible bootloader; + bundle-formats = concatStringsSep " " cfg.bundleFormats; + data-directory = cfg.dataDir; + mountprefix = mountDir; + }; + } slotSections + ) + ); +in +{ + options = { + services.rauc = { + enable = mkEnableOption "RAUC A/B update service"; + mark-good.enable = mkEnableOption "RAUC Good-marking service"; + client.enable = mkEnableOption "RAUC client in the system environment"; + package = mkPackageOption pkgs "rauc" { }; + compatible = mkOption { + description = "The compatibility string for this system. Can be any format so long as you are consistent."; + type = types.str; + example = "nix/appliance/foo"; + }; + bootloader = mkOption { + description = "The bootloader backend for RAUC."; + type = types.enum [ + "barebox" + "grub" + "uboot" + "efi" + "custom" + "noop" + ]; + example = "grub"; + }; + bundleFormats = mkOption { + description = "Allowable formats for the RAUC bundle."; + type = with types; listOf str; + default = [ + "-plain" + "+verity" + ]; + example = [ + "-plain" + "+verity" + ]; + }; + dataDir = mkOption { + description = "The state directory for RAUC."; + default = "/var/lib/rauc"; + type = types.path; + }; + slots = mkOption { + description = "RAUC slot definitions. Every key is a slot class and every value is a list of slot indexes."; + default = { }; + type = types.attrsOf ( + types.listOf ( + types.submodule { + options = { + enable = mkEnableOption "this RAUC slot"; + device = mkOption { + description = "The device to update."; + type = types.str; + }; + type = mkOption { + description = "The type of the device."; + type = types.enum [ + "raw" + "nand" + "nor" + "ubivol" + "ubifs" + "ext4" + "vfat" + ]; + default = "raw"; + }; + settings = mkOption { + description = "Settings for this slot."; + type = types.attrs; + default = { }; + }; + }; + } + ) + ); + }; + settings = mkOption { + type = format.type; + default = { }; + description = '' + Rauc configuration that will be converted to INI. Refer to: + + for details on supported values. + + All module-specific options override these. + ''; + }; + }; + }; + + config = mkMerge [ + (mkIf cfg.enable { + systemd.services.rauc = { + description = "RAUC Update Service"; + documentation = [ "https://rauc.readthedocs.io" ]; + wants = [ "basic.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ + "dbus.service" + ]; + serviceConfig = { + Type = "dbus"; + BusName = "de.pengutronix.rauc"; + ExecStart = "${lib.getExe cfg.package} --conf=${configFile} --mount=/run/rauc/mnt service"; + RuntimeDirectory = "rauc/mnt"; + MountFlags = "slave"; + StateDirectory = baseNameOf cfg.dataDir; + WorkingDirectory = cfg.dataDir; + }; + }; + systemd.tmpfiles.rules = [ + "d ${cfg.dataDir} 0750 root root - -" + "d ${mountDir} 0750 root root - -" + ]; + }) + (mkIf (cfg.enable && cfg.client.enable) { + services.dbus.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + }) + (mkIf (cfg.enable && cfg.mark-good.enable) { + systemd.services.rauc-mark-good = { + description = "RAUC Good-marking service"; + documentation = [ "https://rauc.readthedocs.io" ]; + wantedBy = [ "multi-user.target" ]; + after = [ + "rauc.service" + "multi-user.target" + ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${lib.getExe cfg.package} --conf=${configFile} status mark-good"; + }; + }; + }) + ]; + + meta.maintainers = with lib.maintainers; [ numinit ]; +} diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix index a42c43fc4a48..b1288d30fb28 100644 --- a/nixos/modules/services/mail/postfix-tlspol.nix +++ b/nixos/modules/services/mail/postfix-tlspol.nix @@ -142,7 +142,7 @@ in else "inet:${cfg.settings.server.address}"; in - [ "socketmap:${address}:${if config.services.tlsrpt.enable then "QUERYwithTLSRPT" else "QUERY"}" ]; + [ "socketmap:${address}:QUERYwithTLSRPT" ]; }; systemd.services.postfix = { diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 14bb792790a7..38a77f7aaace 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -629,9 +629,10 @@ in users = lib.optionalAttrs (cfg.user == defaultUser) { users.${defaultUser} = { + extraGroups = [ config.services.redis.servers.paperless.group ]; group = defaultUser; - uid = config.ids.uids.paperless; home = cfg.dataDir; + uid = config.ids.uids.paperless; }; groups.${defaultUser} = { diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index 3d8d3dbd8296..c744ca2e4666 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -11,22 +11,26 @@ let configJson = settingsFormat.generate "librenms-config.json" cfg.settings; package = cfg.package.override { - logDir = cfg.logDir; - dataDir = cfg.dataDir; + inherit (cfg) logDir dataDir; + }; + + toKeyValue = lib.generators.toKeyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } " = "; + }; + + defaultPHPSettings = { + log_errors = "on"; + post_max_size = "100M"; + upload_max_filesize = "100M"; + memory_limit = "${toString cfg.settings.php_memory_limit}M"; + "date.timezone" = config.time.timeZone; }; - phpOptions = '' - log_errors = on - post_max_size = 100M - upload_max_filesize = 100M - memory_limit = ${toString cfg.settings.php_memory_limit}M - date.timezone = "${config.time.timeZone}" - ''; phpIni = pkgs.runCommand "php.ini" { inherit (package) phpPackage; - inherit phpOptions; + phpOptions = toKeyValue cfg.phpOptions; preferLocalBuild = true; passAsFile = [ "phpOptions" ]; } @@ -212,6 +216,51 @@ in }; }; + phpOptions = mkOption { + type = + with types; + attrsOf (oneOf [ + str + int + ]); + defaultText = literalExpression ( + generators.toPretty { } ( + defaultPHPSettings + // { + "zend_extension" = lib.literalExpression "opcache"; + "opcache.enable" = lib.literalExpression "1"; + "opcache.memory_consumption" = lib.literalExpression "256"; + "date.timezone" = lib.literalExpression "config.time.timeZone"; + memory_limit = lib.literalExpression "\${toString cfg.settings.php_memory_limit}M"; + } + ) + ); + description = '' + Options for PHP's php.ini file for librenms. + + Please note that this option is _additive_ on purpose while the + attribute values inside the default are option defaults: that means that + + ```nix + { + services.librenms.phpOptions."opcache.enable" = 1; + } + ``` + + will override the `php.ini` option `opcache.enable` without discarding the rest of the defaults. + + Overriding all of `phpOptions` can be done like this: + + ```nix + { + services.librenms.phpOptions = lib.mkForce { + /* ... */ + }; + } + ``` + ''; + }; + poolConfig = mkOption { type = with types; @@ -399,6 +448,8 @@ in users.groups.${cfg.group} = { }; + services.librenms.phpOptions = lib.mapAttrs (lib.const lib.mkOptionDefault) defaultPHPSettings; + services.librenms.settings = { # basic configs "user" = cfg.user; @@ -511,7 +562,7 @@ in user = cfg.user; group = cfg.group; inherit (package) phpPackage; - inherit phpOptions; + phpOptions = toKeyValue cfg.phpOptions; settings = { "listen.mode" = "0660"; "listen.owner" = config.services.nginx.user; diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix index dc2e5178dc58..612c4995879a 100644 --- a/nixos/modules/services/scheduling/scx.nix +++ b/nixos/modules/services/scheduling/scx.nix @@ -38,6 +38,7 @@ in scheduler = lib.mkOption { type = lib.types.enum [ + "scx_beerland" "scx_bpfland" "scx_chaos" "scx_cosmos" diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ac16eaf315a7..237494449a0f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1316,6 +1316,7 @@ in ragnarwm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ragnarwm.nix; rasdaemon = runTest ./rasdaemon.nix; rathole = runTest ./rathole.nix; + rauc = runTest ./rauc.nix; readarr = runTest ./readarr.nix; readeck = runTest ./readeck.nix; realm = runTest ./realm.nix; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 8a6756b8f9e5..4665428a4027 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -18,7 +18,7 @@ let }: let masterName = head ( - filter (machineName: lib.elem "master" machines.${machineName}.roles) (attrNames machines) + filter (machineName: elem "master" machines.${machineName}.roles) (attrNames machines) ); master = machines.${masterName}; extraHosts = '' diff --git a/nixos/tests/rauc.nix b/nixos/tests/rauc.nix new file mode 100644 index 000000000000..0c650fd3c48b --- /dev/null +++ b/nixos/tests/rauc.nix @@ -0,0 +1,258 @@ +{ pkgs, lib, ... }: + +{ + name = "rauc"; + + nodes.machine = + { + pkgs, + lib, + config, + ... + }: + let + inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey + ; + + snakeOilRaucCert = + pkgs.runCommand "rauc.crt" + { + inherit snakeOilPrivateKey; + } + '' + ${lib.getExe pkgs.openssl} req -x509 -key $snakeOilPrivateKey -out $out -days 3650 \ + -addext subjectKeyIdentifier=hash \ + -addext authorityKeyIdentifier=keyid:always,issuer:always \ + -addext basicConstraints=CA:FALSE \ + -addext extendedKeyUsage=critical,codeSigning \ + -subj "/OU=Smoke Test/OU=RAUC/CN=NixOS/" + ''; + + raucManifest = pkgs.writeText "manifest.raucm" ( + lib.generators.toINI { } { + update = { + inherit (config.services.rauc) compatible; + version = "@VERSION@"; + }; + bundle.format = "verity"; + "image.rauc".filename = "rauc.img"; + } + ); + rauc-mkimg = pkgs.writeShellApplication { + name = "rauc-mkimg"; + runtimeInputs = with pkgs; [ + config.services.rauc.package + e2fsprogs + squashfsTools + ]; + + text = '' + set -xeuo pipefail + tmpdir="$(mktemp -dt rauc.XXXXX)" + + cleanup() { + rm -rf "$tmpdir" + } + trap cleanup EXIT + + cd "$tmpdir" + mkdir bundle target + cat ${raucManifest} > bundle/manifest.raucm + sed -i "s/@VERSION@/$2/g" bundle/manifest.raucm + echo "$1" > target/label + truncate -s128M bundle/rauc.img + mkfs.ext4 -v -L "rauc_$1" -d target bundle/rauc.img + cd bundle + rauc bundle --cert=${snakeOilRaucCert} --key=${snakeOilPrivateKey} . "$3" + ''; + }; + rauc-bundle-c = pkgs.runCommand "rauc_c.bundle" { } '' + ${lib.getExe rauc-mkimg} c 42 $out + ''; + + rauc-do-update = pkgs.writeShellScriptBin "rauc-do-update" '' + if [ "$1" == c ]; then + bundle=${rauc-bundle-c} + else + exit 1 + fi + exec rauc install "$bundle" + ''; + in + { + environment.systemPackages = with pkgs; [ + jq + rauc-do-update + ]; + + services.rauc = { + enable = true; + client.enable = true; + mark-good.enable = true; + compatible = "nix/widget/smoketest"; + bootloader = "custom"; + slots = { + rauc = + let + slot = ab: { + enable = true; + device = "/dev/vd${lib.replaceStrings [ "a" "b" ] [ "b" "c" ] ab}"; + settings.bootname = ab; + }; + in + [ + (slot "a") + (slot "b") + ]; + }; + settings = { + keyring = { + path = toString snakeOilRaucCert; + use-bundle-signing-time = true; + check-purpose = "codesign"; + }; + handlers = { + system-info = toString ( + pkgs.writeShellScript "rauc-sysinfo.sh" '' + echo "RAUC_SYSTEM_SERIAL=nixos" + echo "RAUC_SYSTEM_VARIANT=nix/widget/smoketest" + '' + ); + bootloader-custom-backend = toString ( + pkgs.writeShellScript "rauc-backend.sh" '' + case "$1" in + get-primary) + cat /rauc.current || exit $? + ;; + set-primary) + echo "$2" > /rauc.current + ;; + get-state) + cat "/rauc.$2.status" || echo bad + ;; + set-state) + echo "$3" > "/rauc.$2.status" + ;; + get-current) + cat /rauc.booted + ;; + *) + exit 1 + ;; + esac + '' + ); + }; + }; + }; + + boot.initrd = { + postDeviceCommands = '' + ensure_ext4() { + x="$(echo "$1" | tr ab bc)" + if [ "$(blkid -t TYPE=ext4 -l -o device "/dev/vd$x")" != "/dev/vd$x" ]; then + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -v -L "rauc_$1" "/dev/vd$x" || exit $? + fi + } + ensure_ext4 a + ensure_ext4 b + ''; + + postMountCommands = '' + # Keep track of the current RAUC partition and the booted one. + if [ ! -f /mnt-root/rauc.current ]; then + echo a > /mnt-root/rauc.current + fi + cat /mnt-root/rauc.current > /mnt-root/rauc.booted + + # Initialize test rauc partitions using a custom backend for the test. + init_ab() { + mkdir -p "/mnt-root/rauc_$1" + umount "/mnt-root/rauc_$1" + mount -t ext4 "/dev/vd$(echo "$1" | tr ab bc)" "/mnt-root/rauc_$1" || exit $? + if [ -d "/mnt-root/rauc_$1" ] && [ ! -f "/mnt-root/rauc_$1/label" ]; then + echo "$1" > "/mnt-root/rauc_$1/label" + fi + echo bad > "/mnt-root/rauc.$1.status" + umount "/mnt-root/rauc_$1" + rm -rf "/mnt-root/rauc_$1" + } + init_ab a + init_ab b + + # Mount the RAUC boot directory. + mkdir -p /mnt-root/rauc + booted="/dev/vd$(tr ab bc < /mnt-root/rauc.booted)" + echo "Mounting $booted to /rauc" | tee /dev/stderr + mount "$booted" /mnt-root/rauc | tee /dev/stderr + ''; + }; + + virtualisation = { + emptyDiskImages = [ + 256 + 256 + ]; + }; + }; + + testScript = + { nodes, ... }: + '' + from shlex import quote, join + + def rauc(*rauc_args): + rauc_cmd = join(rauc_args) + ret = machine.succeed(f'rauc {rauc_cmd} --output-format=json') + machine.succeed('rauc status >&2') + return ret + + def wait_rauc(result, *jq_args): + jq_cmd = join([*jq_args[:-1], '-r', *jq_args[-1:]]) + machine.wait_until_succeeds(f'[ "$(rauc status --output-format=json | jq {jq_cmd})" == {quote(result)} ]') + machine.succeed("rauc status >&2") + + def name(slot): + return 'rauc.%d' % (int(slot, 16) - 10) + + def wait_booted(slot, image=None): + if image is None: + image = slot + wait_rauc(slot, '.booted') + machine.wait_until_succeeds(f'[ "$(&2") + wait_booted(a, image) + wait_current(a) + wait_status(a, 'good') + wait_status(b, 'bad') + wait_state(a, 'booted') + wait_state(b, 'inactive') + set_slot(b) + wait_current(b) + set_slot(a) + wait_current(a) + set_slot(b) + wait_current(b) + + if update != "": + machine.succeed(f'rauc-do-update {quote(update)}') + + machine.reboot() + ''; +} diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix index d321314b4ef6..6865390737f8 100644 --- a/nixos/tests/scx/default.nix +++ b/nixos/tests/scx/default.nix @@ -11,6 +11,7 @@ services.scx.enable = true; specialisation = { + beerland.configuration.services.scx.scheduler = "scx_beerland"; bpfland.configuration.services.scx.scheduler = "scx_bpfland"; cosmos.configuration.services.scx.scheduler = "scx_cosmos"; flash.configuration.services.scx.scheduler = "scx_flash"; @@ -27,6 +28,7 @@ testScript = '' specialisation = [ + "beerland", "bpfland", "cosmos", "flash", diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 876f6c2d67c7..c830950dbac9 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -26,25 +26,10 @@ pythonPackages.buildPythonApplication rec { pythonPackages.requests ]; - optional-dependencies = { - lint = with pythonPackages; [ - black - check-manifest - flake8 - flake8-bugbear - isort - ]; - - test = with pythonPackages; [ - pytest - pytest-cov - responses - ]; - - dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ pythonPackages.tox ]; - }; - - nativeCheckInputs = [ pythonPackages.pytestCheckHook ] ++ optional-dependencies.test; + nativeCheckInputs = [ + pythonPackages.pytestCheckHook + pythonPackages.responses + ]; pythonImportsCheck = [ "mopidy_spotify" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 4d53cecada38..275aac2b793d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -12,13 +12,13 @@ }: melpaBuild (finalAttrs: { pname = "copilot"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "copilot-emacs"; repo = "copilot.el"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-hIA+qdWoOJI9/hqBUSHhmh+jjzDnPiZkIzszCPuQxd0="; + sha256 = "sha256-UA0Ra3sYVFwY1xL8COhOG8dLwtMLiQ7Euq5tk6e8M1g="; }; files = ''(:defaults "dist")''; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index fb6958f0b2dc..124f49cfd93c 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-11-09"; + version = "0.0.27-unstable-2025-11-12"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "f8a7cd1a606460ec0a2c4ec886bc102daccf912e"; - hash = "sha256-jRIPBO/5JKFe2bZYjPtW8o0dDujoCxU8zq9Ot3hCtzs="; + rev = "ca95e0386433da2077184719886fa658257261a3"; + hash = "sha256-J3wIR1kACtX8qnspPGxHDkBvTWbWHP/T51qYSZsZrgs="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 275f26fb0667..38e0da5d945b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5122,8 +5122,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.32.0"; - hash = "sha256-qZYtCjqWoqE2qjrJN70ws9/w0FncLCWqTeVX/B66CmQ="; + version = "1.32.1"; + hash = "sha256-c88Mf3yzo2SJ4lmyzoiVm6ioMY0jkkH+N1EkVZBGzrQ="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 75c742aef34c..00c61c3b9020 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.31.5"; - hash = "sha256-D7k+hA786w7IZHVI+Og6vHGAAohpfpuOmmCcDUU0WsY="; + version = "0.33.1"; + hash = "sha256-qiWuoxd/CXTxYtlOcj1Aww16wLvTZbQ7qJYhPPEndqk="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 8c4dc7c8fb8a..caec8fdc6765 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-yTkzftw8du9LlzIh36s+1JgLDR0DCQszJxqIdEksXvs="; + hash = "sha256-P5LEN+wTfJ9p0vG4z/FAB4u2hFLcqy7Xc18qC4W5x8U="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-JRRmbJcP6YEoHfDnK69fJIsYRNB6qK1cRZUqk9JZNiI="; + hash = "sha256-cNiXCrOw3ET/BTfMxYfr01F+5lTXbKH3vKpRQQdnRLc="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-zsU4lTCjebimApI4cnMSwtqYLAHqakwAUjk1W2gN7FE="; + hash = "sha256-zCGwaw5Dgd0o5t+h0sjPZ1nDp/JqC2Wx4QfQYv3jg4w="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-rbGctv/AA7H4SsqUfFjNKv+5dE/JSN/2YRPIcD4Loxs="; + hash = "sha256-M5BQdlEe5eN91Mz8trMFbFNeRoMIpGSOHpBSGQQVJc0="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.19.4"; + version = "0.20.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 5b120ac1db09..8a5c5666c972 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-11-14"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "6ac3c05aeddeb6dd5f28f448354d1f8e2e5d6810"; - hash = "sha256-Y/ct+nDlbIZNRxRQJVsgaQs3mFODfuhToZdXairaesk="; + rev = "d6383bff89a93e02aad10a586e804829861c3de1"; + hash = "sha256-90NhPleaA/YnkQ0EDbvjIGOVn49m+LFy1ovw7/scqlc="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/freeintv.nix b/pkgs/applications/emulators/libretro/cores/freeintv.nix index c0f4ca005ae0..e09316233333 100644 --- a/pkgs/applications/emulators/libretro/cores/freeintv.nix +++ b/pkgs/applications/emulators/libretro/cores/freeintv.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "freeintv"; - version = "0-unstable-2025-03-05"; + version = "0-unstable-2025-11-11"; src = fetchFromGitHub { owner = "libretro"; repo = "freeintv"; - rev = "6efc4b8fd4c7423ec1f5ff1913b854529135b565"; - hash = "sha256-B5GEzI/U/F0IsppdOx5znu+4LdZOxQLcGAez+oR2PCI="; + rev = "1b51f41238ef9691d9fe16722f7d093bb6a6e379"; + hash = "sha256-kuznjK9HnqR42Cuz6bmUhEUnerrWb5VIvkiU0p//ecw="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 464630bde241..04e35090ebed 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-11-07"; + version = "0-unstable-2025-11-14"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "180bed8e35fc48827f087926c4770f9ccdeaad0c"; - hash = "sha256-7RfO2GdsMZ/9VZ0cK2pl/s+kOUyUBbqTSDVzn1icN6k="; + rev = "46a55214d0dab654e5a525ae0c54921ca9716872"; + hash = "sha256-DDdaMhTvSUXTtrdMK4DfALQe7qIsh+oV91dD8aefcU8="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index a28afb58f016..0581de85285b 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-10-05"; + version = "0-unstable-2025-11-13"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "870e8ba3fa4e6635e2eb9d85c939589498659c32"; - hash = "sha256-FU7GKuLssyGuWeHQZGjborz/QdgAxw3JKe9Hstq9ckk="; + rev = "62c7089644966f6ac5fc79fe03592603579a409d"; + hash = "sha256-NHJfZpo4/aR9a6Sn3x+BQaVfKtkMBUoDQlgtvIkXDFI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 34a35397b4d7..03b5506e99b4 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "organicmaps"; - version = "2025.10.23-22"; + version = "2025.11.11-5"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; tag = "${finalAttrs.version}-android"; - hash = "sha256-4TSN4G5tUvtzSXASDfOE1xiitQx9wE2/ZydFwpov+UM="; + hash = "sha256-lO6pJUV+PBgE3SLUfD7i4zySB6vg9ZAXN1G3dK4XYqs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index 3253dc38c6a5..8dbfeec28a8e 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "helm-dt"; - version = "0.4.11"; + version = "0.4.12"; src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; rev = "refs/tags/v${version}"; - hash = "sha256-k7+t52UU5dfElD7885AppO2+mccjQwh2mRImByUfAaE="; + hash = "sha256-/fU56Dw7tvUnby4S78tyH/dasg4n3rb0hMlIkzvrv4M="; }; vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 24c48991da9a..0a3fa074c75b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-+51Roeyn0+vNo3dCLMD8kyiOXf6ATVAQlEZ4O7B7zCw=", + "hash": "sha256-WcozZUc2z1V8wxRSgoU20Zwolpr12a+dSjXmEKKHnp4=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.46.1", + "rev": "v4.47.0", "spdx": "MIT", - "vendorHash": "sha256-8cChWCS8yV69djpoeElLgaorpbHY2Jg04WKY3e+pvsg=" + "vendorHash": "sha256-G83ixFWqkVlbm8mTEC1fIvnuUUZ2InPdWqQbbgJG7UY=" }, "akamai_akamai": { "hash": "sha256-HjrBPaLYeJ8/9gmdn+BGHtu5dmyT5MeTsIBgzS0X0gY=", @@ -561,22 +561,22 @@ "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" }, "hashicorp_google": { - "hash": "sha256-PoPYcCr66g+3S94q0SprdQokgVkFM1p3oYSBEMOdSWY=", + "hash": "sha256-MrQ16YJBPm0f89lYbbDSPrqSFhB0eShN6VUM1lPI2D4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.10.0", + "rev": "v7.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-BghusRVsU7HrX6hWpbanGJ93UdHSq8nWmcEGnyyVOTs=" + "vendorHash": "sha256-bpyTtuK3kcntk9hzCU2d+RZ0K0jfFtUlEZezyZHvFW8=" }, "hashicorp_google-beta": { - "hash": "sha256-lL4BtInJu/STew7SaNrwPnmLDLucMvbyGanAK9tsJKE=", + "hash": "sha256-2R7zZRiAZaTABOyQyUwRRba6zhdFmIeCXbdPEnDDtcI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.10.0", + "rev": "v7.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zLUlrIdfqhiVITQe7bmoYl570LvLS8aEMU2HC4xmKTU=" + "vendorHash": "sha256-JDFKEn011onzch07tLu/kVbiCwXPqwomFA/X5fbQ3bc=" }, "hashicorp_helm": { "hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=", @@ -642,13 +642,13 @@ "vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE=" }, "hashicorp_tfe": { - "hash": "sha256-VKRifnvUTtGCs9XEMeqTVvbtES7rvWBWoiSYLfMxIhQ=", + "hash": "sha256-W0O3J08p6QtQVCqE3AGZbR+19SQVXLbxLkkDhpZhJMM=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.70.0", + "rev": "v0.71.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JrdL91xO4EyAtWfDFsjr09oTfgx+tQQ965ex/AnBkGk=" + "vendorHash": "sha256-dZFjjogCIRzxXgJ/VW/WJY1mCNqoa3Es4q+oXLgcGQg=" }, "hashicorp_time": { "hash": "sha256-ZArYfbzbrkxGlL1BRFM7PN3hLzdssIL4COsUBdLVMYY=", @@ -823,13 +823,13 @@ "vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI=" }, "launchdarkly_launchdarkly": { - "hash": "sha256-U3l2Tf7vcLAz7nZYKaGR0Nv/Qw2HgbGNV7w1dYBvSEc=", + "hash": "sha256-4vOAkZac3dpYdzZDk+vvqmr/S37q/Gl0HmOAFuDKyag=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.25.3", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-b9+0YLuv9AVszGDQ2v+VbYameN16PCdE3jUhL9efK6M=" + "vendorHash": "sha256-Y1L1nIOubhBN5vNIXY7miQgR9OzoTCS7QA55DEMwDSA=" }, "linode_linode": { "hash": "sha256-t6vHW9t3MWsPsGUh44OXvYTfHa03qiH3lveKK0dit9Q=", @@ -1264,11 +1264,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic_sumologic": { - "hash": "sha256-5b+hCWXyafLeCA7F5RlUj2GpO7Ipy8UVAQxjQaoYnJA=", + "hash": "sha256-6wKzxaF/cSfGPeRTmmSGAZeFmDlpaYimnbCQYdclkhc=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.1.7", + "rev": "v3.1.8", "spdx": "MPL-2.0", "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index c502aa52d90b..7fdb45fe9ff5 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y3MGKpfhjmqnIvmt4mXnkmpjF/riXPDXyUiSrsceY6o="; + hash = "sha256-TgXPJP+Xm8LrO2d8yMu6aCCypuBRKNtYuZAb0dYfhng="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 4a0f71daba06..18e15acba8d2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -42,14 +42,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "6.2.3"; + version = "6.3.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-ojhZgzxNXUkJaXoERuOti4E2vaGLsEoQp3eSuYtvhrY="; + hash = "sha256-YExl9mn2aEL1WOqT2fuX/KxKAV28q0WKVG1AMvPANwA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 5fe91023ff64..b320250e807a 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -23,6 +23,7 @@ }: assert blas.isILP64 == lapack.isILP64; +assert blas.isILP64 == scalapack.isILP64; let versionGA = "5.8.2"; # Fixed by nwchem @@ -138,7 +139,7 @@ stdenv.mkDerivation rec { export BLAS_SIZE=${if blas.isILP64 then "8" else "4"} export USE_SCALAPACK="y" export SCALAPACK="-L${scalapack}/lib -lscalapack" - export SCALAPACK_SIZE="4" + export SCALAPACK_SIZE=${if scalapack.isILP64 then "8" else "4"} export LIBXC_INCLUDE="${lib.getDev libxc}/include" export LIBXC_MODDIR="${lib.getDev libxc}/include" diff --git a/pkgs/by-name/_2/_2ship2harkinian/0001-deps.patch b/pkgs/by-name/_2/_2ship2harkinian/dont-fetch-stb.patch similarity index 100% rename from pkgs/by-name/_2/_2ship2harkinian/0001-deps.patch rename to pkgs/by-name/_2/_2ship2harkinian/dont-fetch-stb.patch diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index ae11ddc63bb3..074e8635fac4 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -1,50 +1,59 @@ { lib, + fetchFromGitHub, + applyPatches, + _2ship2harkinian, + fetchurl, + writeTextFile, stdenv, - SDL2, cmake, copyDesktopItems, - fetchFromGitHub, - fetchpatch, - fetchurl, imagemagick, - imgui, + lsb-release, + makeWrapper, + ninja, + pkg-config, + python3, + libGL, libpng, libpulseaudio, libzip, - lsb-release, - makeDesktopItem, - makeWrapper, - ninja, nlohmann_json, - pkg-config, - python3, + SDL2, spdlog, - stormlib, tinyxml-2, - writeTextFile, zenity, + bzip2, + libogg, + libopus, + libvorbis, + libX11, + opusfile, + sdl_gamecontrollerdb, + makeDesktopItem, }: let - # This would get fetched at build time otherwise, see: - # https://github.com/HarbourMasters/2ship2harkinian/blob/1.0.2/mm/CMakeLists.txt#L708 - gamecontrollerdb = fetchurl { - name = "gamecontrollerdb.txt"; - url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/b1759cf84028aab89caa1c395e198c340b8dfd89/gamecontrollerdb.txt"; - hash = "sha256-7C5EkqBIhLGNJuhi3832y0ffW5Ep7iuTYXb1bL5h2Js="; + # The following are either normally fetched during build time or a specific version is required + + dr_libs = fetchFromGitHub { + owner = "mackron"; + repo = "dr_libs"; + rev = "da35f9d6c7374a95353fd1df1d394d44ab66cf01"; + hash = "sha256-ydFhQ8LTYDBnRTuETtfWwIHZpRciWfqGsZC6SuViEn0="; }; - # 2ship needs a specific imgui version - imgui' = imgui.overrideAttrs rec { - version = "1.90.6"; + imgui' = applyPatches { src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - tag = "v${version}-docking"; - hash = "sha256-Y8lZb1cLJF48sbuxQ3vXq6GLru/WThR78pq7LlORIzc="; + tag = "v1.91.9b-docking"; + hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ="; }; + patches = [ + "${_2ship2harkinian.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch" + ]; }; libgfxd = fetchFromGitHub { @@ -54,6 +63,13 @@ let hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8="; }; + prism = fetchFromGitHub { + owner = "KiritoDv"; + repo = "prism-processor"; + rev = "bbcbc7e3f890a5806b579361e7aa0336acd547e7"; + hash = "sha256-jRPwO1Vub0cH12YMlME6kd8zGzKmcfIrIJZYpQJeOks="; + }; + stb_impl = writeTextFile { name = "stb_impl.c"; text = '' @@ -68,24 +84,17 @@ let hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw="; }; - # Apply 2ship's patch for stormlib - stormlib' = stormlib.overrideAttrs (prev: rec { - version = "9.25"; + stormlib' = applyPatches { src = fetchFromGitHub { owner = "ladislav-zezula"; repo = "StormLib"; - tag = "v${version}"; + tag = "v9.25"; hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc="; }; - nativeBuildInputs = prev.nativeBuildInputs ++ [ pkg-config ]; - patches = (prev.patches or [ ]) ++ [ - (fetchpatch { - name = "stormlib-optimizations.patch"; - url = "https://github.com/briaguya-ai/StormLib/commit/ff338b230544f8b2bb68d2fbe075175ed2fd758c.patch"; - hash = "sha256-Jbnsu5E6PkBifcx/yULMVC//ab7tszYgktS09Azs5+4="; - }) + patches = [ + "${_2ship2harkinian.src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch" ]; - }); + }; thread_pool = fetchFromGitHub { owner = "bshoshany"; @@ -97,19 +106,27 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "2ship2harkinian"; - version = "1.0.2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "HarbourMasters"; repo = "2ship2harkinian"; tag = finalAttrs.version; - hash = "sha256-1iSFzroKxwFpsIGNMetSlQKTKRWCy7QtgCTepFdSeY8="; + hash = "sha256-EC8o5FIP/eXa+0LZt0C8EWHzKVAniv9SIXkZdbibcxg="; fetchSubmodules = true; + deepClone = true; + postFetch = '' + cd $out + git branch --show-current > GIT_BRANCH + git rev-parse --short=7 HEAD > GIT_COMMIT_HASH + (git describe --tags --abbrev=0 --exact-match HEAD 2>/dev/null || echo "") > GIT_COMMIT_TAG + rm -rf .git + ''; }; patches = [ # remove fetching stb as we will patch our own - ./0001-deps.patch + ./dont-fetch-stb.patch ]; nativeBuildInputs = [ @@ -124,14 +141,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - SDL2 - imgui' + bzip2 + libGL + libogg + (lib.getDev libopus) libpng libpulseaudio + libvorbis + libX11 libzip nlohmann_json + (lib.getDev opusfile) + SDL2 spdlog - stormlib' tinyxml-2 zenity ]; @@ -139,12 +161,18 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "NON_PORTABLE" true) (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/2s2h") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DR_LIBS" "${dr_libs}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") + (lib.cmakeFeature "OPUS_INCLUDE_DIR" "${lib.getDev libopus}/include/opus") + (lib.cmakeFeature "OPUSFILE_INCLUDE_DIR" "${lib.getDev opusfile}/include/opus") ]; + strictDeps = true; + dontAddPrefix = true; # Linking fails without this @@ -155,15 +183,22 @@ stdenv.mkDerivation (finalAttrs: { mkdir stb cp ${stb'} ./stb/${stb'.name} cp ${stb_impl} ./stb/${stb_impl.name} - substituteInPlace libultraship/cmake/dependencies/common.cmake \ - --replace-fail "\''${STB_DIR}" "/build/source/stb" + --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)" + ''; + + postPatch = '' + substituteInPlace mm/src/boot/build.c.in \ + --replace-fail "@CMAKE_PROJECT_GIT_BRANCH@" "$(cat GIT_BRANCH)" \ + --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_HASH@" "$(cat GIT_COMMIT_HASH)" \ + --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_TAG@" "$(cat GIT_COMMIT_TAG)" ''; postBuild = '' - cp ${gamecontrollerdb} ${gamecontrollerdb.name} + port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2) + cp ${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt gamecontrollerdb.txt pushd ../OTRExporter - python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../mm/assets/xml --custom-assets-path ../mm/assets/custom --custom-otr-file 2ship.o2r --port-ver ${finalAttrs.version} + python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../mm/assets/xml --custom-assets-path ../mm/assets/custom --custom-otr-file 2ship.o2r --port-ver $port_ver popd ''; @@ -176,6 +211,13 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin ln -s $out/2s2h/2s2h.elf $out/bin/2s2h install -Dm644 ../mm/linux/2s2hIcon.png $out/share/pixmaps/2s2h.png + + install -Dm644 -t $out/share/licenses/2ship2harkinian ../LICENSE + install -Dm644 -t $out/share/licenses/2ship2harkinian/OTRExporter ../OTRExporter/LICENSE + install -Dm644 -t $out/share/licenses/2ship2harkinian/ZAPDTR ../ZAPDTR/LICENSE + install -Dm644 -t $out/share/licenses/2ship2harkinian/libgfxd ${libgfxd}/LICENSE + install -Dm644 -t $out/share/licenses/2ship2harkinian/libultraship ../libultraship/LICENSE + install -Dm644 -t $out/share/licenses/2ship2harkinian/thread_pool ${thread_pool}/LICENSE.txt ''; postFixup = '' @@ -201,7 +243,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ qubitnano ]; license = with lib.licenses; [ - # OTRExporter, OTRGui, ZAPDTR, libultraship + # OTRExporter, ZAPDTR, libultraship, libgfxd, thread_pool mit # 2 Ship 2 Harkinian cc0 diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 092a6eabd684..4788f5b14e25 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, telegram-desktop, alsa-lib, @@ -15,13 +14,13 @@ telegram-desktop.override { inherit withWebkit; unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { pname = "64gram-unwrapped"; - version = "1.1.82"; + version = "1.1.84"; src = fetchFromGitHub { owner = "TDesktop-x64"; repo = "tdesktop"; tag = "v${version}"; - hash = "sha256-Jul9gKhoazNMicdkZerzAPpsuO+MSvtqr6ZzaALTeJ0="; + hash = "sha256-CtDCrgKZpaTdR+Eh9H1uq7EmO0SFIgHKlW/zeeWBaCM="; fetchSubmodules = true; }; @@ -43,7 +42,7 @@ telegram-desktop.override { homepage = "https://github.com/TDesktop-x64/tdesktop"; changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; maintainers = with lib.maintainers; [ clot27 ]; - mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; + mainProgram = "Telegram"; }; }); } diff --git a/pkgs/by-name/al/alcove/package.nix b/pkgs/by-name/al/alcove/package.nix new file mode 100644 index 000000000000..2d0ee0dd4561 --- /dev/null +++ b/pkgs/by-name/al/alcove/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nix-update-script, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "alcove"; + version = "1.4.1"; + + src = fetchurl { + url = "https://github.com/henrikruscon/alcove-releases/releases/download/${finalAttrs.version}/Alcove.zip"; + hash = "sha256-9SYqvJqLC4h4AcK/F86S7H15PiW+tcmaF83ILdc/ejE="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -R ./Alcove.app $out/Applications + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Dynamic Island for your Mac"; + homepage = "https://tryalcove.com/"; + changelog = "https://github.com/henrikruscon/alcove-releases/releases/tag/${finalAttrs.version}"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ delafthi ]; + platforms = [ "aarch64-darwin" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index f111d93990d1..366169ce947b 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.1.2"; + version = "3.1.4"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-8nwCVhUMQLXnWcrA9XSOM6R+Y7E+H+gwSYXDjk2WtAs="; + hash = "sha256-7G7kgRe89G/WbiirIsRJeunbM4VzrePqA1cqQvb5oZY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/altermime/package.nix b/pkgs/by-name/al/altermime/package.nix index 41c5ef19e828..c00cae2e35f6 100644 --- a/pkgs/by-name/al/altermime/package.nix +++ b/pkgs/by-name/al/altermime/package.nix @@ -23,7 +23,9 @@ gccStdenv.mkDerivation rec { postPatch = '' mkdir -p $out/bin - substituteInPlace Makefile --replace "/usr/local" "$out" + substituteInPlace Makefile \ + --replace-fail "/usr/local" "$out" \ + --replace-fail "strip " "${gccStdenv.cc.targetPrefix}strip " ''; meta = with lib; { diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index c461b335b4e2..12a8094604e6 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.21"; + version = "0.30.22"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-YDEu1fn1EHeMulvno6KeHIr4bAJ5RwPXWomqzGFUfrQ="; + hash = "sha256-wHspbxGnTOFF6zKWlW0OjgxmYPdoG2LWUTq2lH7i5Fk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-JFDwztOEupORbkhOm/Vl5SuTaLbdp8YXXRO0jVJI/Uk="; + vendorHash = "sha256-6AP2cf5URe2vVKVYl9O00CbGPXD8Zg1OE8V8rF9+/MI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index e3f226194dcc..c77839ddf6d8 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "art"; - version = "1.25.10"; + version = "1.25.11"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; tag = version; - hash = "sha256-qGrkRsdQppfIolxAhxWnJrbYotELKga6X7CFY55xCKk="; + hash = "sha256-viX2GjPV4ZvaK7u6KgANbbMLCFRLbCwd48NiIcsHqSY="; }; # Fix the build with CMake 4. diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index e8df0f738cdc..2008cb72faa7 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchPypi, git, + versionCheckHook, }: let @@ -25,14 +26,15 @@ in python.pkgs.buildPythonApplication rec { pname = "awsebcli"; - version = "3.25.2"; + version = "3.25.3"; pyproject = true; + doInstallCheck = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = version; - hash = "sha256-6PeOn0owjEjTWdEwgXILiGq+6T5GBBc61viiG5GNeYo="; + hash = "sha256-PFyLVpmye+WIiF9xR37ydjLy0OvlIMDSIMaN4y0WM/E="; }; pythonRelaxDeps = [ @@ -68,7 +70,9 @@ python.pkgs.buildPythonApplication rec { mock pytest-socket pytestCheckHook + versionCheckHook ]; + versionCheckProgramArg = "--version"; enabledTestPaths = [ "tests/unit" diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 57fa92699d2e..1a10f8224352 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -1,6 +1,5 @@ { lib, - fetchpatch2, fetchFromGitHub, nix-update-script, telegram-desktop, @@ -13,25 +12,16 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "ayugram-desktop-unwrapped"; - version = "5.16.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "AyuGram"; repo = "AyuGramDesktop"; - rev = "aafdac6da465e6498e39e1b55566fc8fe2402843"; - hash = "sha256-GNFkGw/CxtbeoEMBjExNudBcKFwlfXee5VVnXa4wGko="; + tag = "v${finalAttrs.version}"; + hash = "sha256-bFGk8lqPlNlaxbrulYe0+8ayj33frctruce3/TZ+W2c="; fetchSubmodules = true; }; - # fix build failure with Qt 6.10 - patches = fetchpatch2 { - name = "fix-build-with-qt-610.patch"; - url = "https://github.com/desktop-app/cmake_helpers/commit/682f1b57.patch"; - hash = "sha256-DHwgxAEFc1byQkVvrPwyctQKvUsK/KQ/cnzRv6PQuTM="; - stripLen = 1; - extraPrefix = "cmake/"; - }; - passthru.updateScript = nix-update-script { }; meta = previousAttrs.meta // { diff --git a/pkgs/by-name/ba/bayescan/package.nix b/pkgs/by-name/ba/bayescan/package.nix index 7fc5e767c470..097f1f17f6dc 100644 --- a/pkgs/by-name/ba/bayescan/package.nix +++ b/pkgs/by-name/ba/bayescan/package.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { sourceRoot = "BayeScan${version}/source"; postPatch = '' - substituteInPlace Makefile --replace "-static" "" \ - --replace "g++" "c++" + substituteInPlace Makefile --replace-fail "-static" "" \ + --replace-fail "g++" "${stdenv.cc.targetPrefix}c++" ''; installPhase = '' diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index b479570937af..f4051cc380cb 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "bootdev-cli"; - version = "1.20.5"; + version = "1.20.6"; src = fetchFromGitHub { owner = "bootdotdev"; repo = "bootdev"; tag = "v${version}"; - hash = "sha256-iVL2nRQb4A7UfhiQSBBbaxM1Yqc2pESvRfQ3xSjGq10="; + hash = "sha256-/53s+XYMhxo9i1ZeWuV3xiZnhcS5rBJUvM3acb8TiWM="; }; vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 1584120da753..f193aeca2925 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.10.4"; + version = "2025.11"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-Y6VeAAKeVxS0LclD9xu56KIiMK7FjlTHAhjtt5m6S2I="; + hash = "sha256-/LudYYETnUT7Ynqw3HO822hdMUoz3mrTPae7ZO8SMyE="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-cHnQmhiSl/c0HteD+LED2wjvDvdJJmgDD00CynFdkB0="; + hash = "sha256-x4q5QkBIBFqG8Bjx5NuschNB4dX/8t2vCHNVRDa0kQQ="; }; src = fetchurl { diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index e87f68db14ac..d7fa1f01c8fc 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -1,38 +1,48 @@ { - fetchFromGitHub, lib, + fetchCrate, rustPlatform, + nix-update-script, testers, - cargo-shear, }: -let - version = "1.5.1"; -in -rustPlatform.buildRustPackage { - pname = "cargo-shear"; - inherit version; - src = fetchFromGitHub { - owner = "Boshen"; - repo = "cargo-shear"; - rev = "v${version}"; - hash = "sha256-4qj+hSoByE5sfT9LTm7hsYsYpOJc5Yxak1V980L/F3c="; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-shear"; + version = "1.6.2"; + + src = fetchCrate { + pname = "cargo-shear"; + version = finalAttrs.version; + hash = "sha256-5N8sAKStdQnrgzXECxu/oRuGVLwLx/KfW2vcPClVZGM="; }; - cargoHash = "sha256-btXeytQRZ74S55cbANRGHmLPSXssNPpE/yjA1cJTy7g="; + cargoHash = "sha256-WdB4oJtQAh90Fe+Km+SddpmyvHdyemo3KsuRyBtZ5FY="; - # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 - SHEAR_VERSION = version; - passthru.tests.version = testers.testVersion { - package = cargo-shear; + env = { + # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54 + SHEAR_VERSION = finalAttrs.version; + }; + + # Integration tests require network access + cargoTestFlags = [ + "--lib" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; }; meta = { description = "Detect and remove unused dependencies from Cargo.toml"; mainProgram = "cargo-shear"; homepage = "https://github.com/Boshen/cargo-shear"; - changelog = "https://github.com/Boshen/cargo-shear/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md"; license = [ lib.licenses.mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.cathalmullan ]; }; -} +}) diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix index 980ad0ceb8c2..2a8b9afa6178 100644 --- a/pkgs/by-name/ch/chamber/package.nix +++ b/pkgs/by-name/ch/chamber/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "chamber"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "segmentio"; repo = "chamber"; rev = "v${version}"; - sha256 = "sha256-Hh+u5Rf7YN1Gk2whBMXmtXdXCSeh2CqaQBSzw8KNb5E="; + sha256 = "sha256-CSLG1y7D2dozwB5Lme9xX+kjDuPB/5cOrsfmvGDXX4E="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index 2b1df7be436b..27909b08278a 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.34.1"; + version = "0.35.0"; pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = version; - hash = "sha256-TI8NW8ULsig/YL6LC8L//YS0lSIUS2Ns9awFJ50ov2k="; + hash = "sha256-IiNUgv0XZtTzCJjp/4jyTpw9MAyBFtuf3N4VFqatZVg="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 135f5710e008..5cb105c0a024 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-11-05"; + version = "0.4.0-unstable-2025-11-12"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "0d2703ecad8b055a33220de592dc11bcbc153a20"; - hash = "sha256-5O0bmxVpmAkonRInl3L2MplYnZSkkFVLRd4bz59HFv4="; + rev = "7c1d614e74b590f84f1e01bf735143d1de017fcb"; + hash = "sha256-o6bkA/Xjv0Q8oQE/aAUEYOqlZfEXn3rcDfFfhqm6TTE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 927d9904b7de..bb172b29cf48 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.8.0"; + version = "12.9.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-9vGqElva4sS0uV2Be1WV9dW2bLYNOFZRB3wF3rSassM="; + hash = "sha256-90bM85hKI1XOxdHsVstzJANnWJEhTmmDzzUqL3qx9n4="; }; proxyVendor = true; - vendorHash = "sha256-aEiHnYEJGg+kTUN2k9GKUtSaNpdQio5OsEJ8EnbxPLk="; + vendorHash = "sha256-Jf5R5Bz6VgPON49qrrV0Pyd42NfTImSFX0TATT+udOM="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix index 94ebe58feec0..f68a289a230f 100644 --- a/pkgs/by-name/co/coc-markdownlint/package.nix +++ b/pkgs/by-name/co/coc-markdownlint/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-markdownlint"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-11-15"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "4e507d516ccb0e0287c95d909db85676d786e9bd"; - hash = "sha256-fNUmrwjCiMYZHXkI4RPn4BMRxiWW+BoVEvaSMIsEMeQ="; + rev = "5bdcde01bf7c8f468581dc8bab54d3a5de04fb86"; + hash = "sha256-ndvqkYnD1skKhV3DHgKQkC5fsrbmt+COo+jGyLJjpDA="; }; - npmDepsHash = "sha256-JMXeWQZMYkhUqE5DdYBRRhyHDAqr9VkKATRQE6eOGys="; + npmDepsHash = "sha256-LomwzsDT2I+fhcmiabj6CzwaSzV4bgV7azG6/TcJuQw="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/commitlint/package.nix b/pkgs/by-name/co/commitlint/package.nix index b273859cf1a0..4d05613266cc 100644 --- a/pkgs/by-name/co/commitlint/package.nix +++ b/pkgs/by-name/co/commitlint/package.nix @@ -5,6 +5,8 @@ fetchYarnDeps, yarnConfigHook, nodejs, + makeBinaryWrapper, + versionCheckHook, nix-update-script, }: @@ -15,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "conventional-changelog"; repo = "commitlint"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-o8AnIewSmg8vRjs8LU6QwRyl2hMQ2iK5W7WL137treU="; }; @@ -27,16 +29,41 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarnConfigHook nodejs + makeBinaryWrapper ]; buildPhase = '' runHook preBuild - pkgs=("config-validator" "rules" "parse" "is-ignored" "lint" - "resolve-extends" "execute-rule" "load" "read" "types" "cli") + # Remove test files to avoid dependency on commitlint test packages + rm -rf @commitlint/**/*.test.{js,ts} + + # See https://github.com/conventional-changelog/commitlint/blob/20.1.0/Dockerfile.ci + # Excludes `config-nx-scopes` which is a plain JavaScript package + pkgs=( + "config-validator" + "rules" + "parse" + "is-ignored" + "lint" + "resolve-extends" + "execute-rule" + "load" + "read" + "types" + "cli" + "config-conventional" + "config-pnpm-scopes" + "ensure" + "format" + "message" + "to-lines" + "top-level" + ) for p in "''${pkgs[@]}" ; do + echo "Building package: @commitlint/$p" cd @commitlint/$p/ - yarn run tsc --build --force + yarn run --offline tsc --build --force cd ../.. done @@ -50,15 +77,23 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin mkdir -p $out/lib/node_modules/@commitlint/root mv * $out/lib/node_modules/@commitlint/root/ - ln -s $out/lib/node_modules/@commitlint/root/@commitlint/cli/cli.js $out/bin/commitlint + + makeBinaryWrapper ${lib.getExe nodejs} $out/bin/commitlint \ + --add-flags "$out/lib/node_modules/@commitlint/root/@commitlint/cli/cli.js" \ + --set NODE_PATH "$out/lib/node_modules/@commitlint/root/node_modules" runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/conventional-changelog/commitlint/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/conventional-changelog/commitlint/releases/tag/${finalAttrs.src.tag}"; description = "Lint your commit messages"; homepage = "https://commitlint.js.org/"; license = lib.licenses.mit; diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix index 37cbadffbb68..47cec8d7d2e5 100644 --- a/pkgs/by-name/co/conmon-rs/package.nix +++ b/pkgs/by-name/co/conmon-rs/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "containers"; repo = "conmon-rs"; rev = "v${version}"; - hash = "sha256-FZwX9xihg2mKpHT11FCASyoJ5nDUkAa4Cqk5zRQOfeY="; + hash = "sha256-fs+IcibhyoC5+Sbr9lWtBbb0Sk6Uf+YVockXNbCLXCY="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ]; doCheck = false; - cargoHash = "sha256-JVUckmOAJj4zNBe4yq/JzrPw+IqfhiZRB6s03ZxXFV4="; + cargoHash = "sha256-l+FcrLPE+EGb3IEWikUJ1Ak8lOSlYz9WvUffGHzU0tc="; meta = with lib; { description = "OCI container runtime monitor written in Rust"; diff --git a/pkgs/by-name/co/contact/package.nix b/pkgs/by-name/co/contact/package.nix index 35107a2b2070..c1c6a63a4e45 100644 --- a/pkgs/by-name/co/contact/package.nix +++ b/pkgs/by-name/co/contact/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "contact"; - version = "1.4.1"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pdxlocations"; repo = "contact"; tag = version; - hash = "sha256-od0sF+c6ToNNtGmGxikGsXniQ3HCm4Hz3ynrzXCNJmw="; + hash = "sha256-PjWVjvuHAgHR1/G4LfwhG0g45XoLTUf6BumopwgOPe0="; }; dependencies = [ python3Packages.meshtastic ]; diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index c3d264d6ec0f..f4620912cbb5 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -55,7 +55,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-warn '"exports": "./src/index.ts"' '"exports": "./dist/index.js"' ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--use-github-releases" + "--version-regex" + "conventional-changelog-v(.*)" + ]; + }; meta = { changelog = "https://github.com/conventional-changelog/conventional-changelog/releases/tag/conventional-changelog-v${finalAttrs.version}"; diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix index fdcb486eadc1..eb84f453f638 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-caffeine"; - version = "0-unstable-2025-10-29"; + version = "0-unstable-2025-11-04"; src = fetchFromGitHub { owner = "tropicbliss"; repo = "cosmic-ext-applet-caffeine"; - rev = "5eeb6e505eba172fbfee6b9551df8f8a3702213e"; - hash = "sha256-sTvP62oQknRzuc3qQqUAK70uS2MqXl8lAF27V0To8NM="; + rev = "1a4ab86d1db1ef294b2cfb24a07f068da0f715ae"; + hash = "sha256-8bu9a7CNAtxXV7VKw232ZwgMGOLwvPKVXWoVtX7RKKc="; }; - cargoHash = "sha256-89/0XEdQ7MCycAkHhTkA5FCj/eKVLgWDhljKB/Lo4+4="; + cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index cf8cd87587a3..45ce102800a9 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.2.0"; + version = "1.2.1"; executables = "csharpier"; - nugetHash = "sha256-YEIUoh6af8DIAN6hh+3H5XbTbdJwe+f7TPXdZxWNgck="; + nugetHash = "sha256-JJS/jlUM2GRYKPzsIbAnRM8Jhr8/Mr6Nlmjtq9TMBuc="; meta = with lib; { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index f593abd3f5e9..1d4b2754b7d9 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.25.1"; + version = "2.25.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-+BZs8WUoDoW5mA7s6WIalEq3F5konJsJuZwWSdUeYiA="; + hash = "sha256-6gG3IVxq+N0g5e/ev9xAEcb1HxA+3961T5MSXWxUzyo="; }; pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/de/dex-oidc/package.nix b/pkgs/by-name/de/dex-oidc/package.nix index 7cbed4569302..980b42651939 100644 --- a/pkgs/by-name/de/dex-oidc/package.nix +++ b/pkgs/by-name/de/dex-oidc/package.nix @@ -1,24 +1,24 @@ { lib, - buildGo124Module, + buildGoModule, fetchFromGitHub, nixosTests, testers, dex-oidc, }: -buildGo124Module rec { +buildGoModule (finalAttrs: { pname = "dex"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "dexidp"; repo = "dex"; - rev = "v${version}"; - sha256 = "sha256-ELklXlB691xcUdCi+B1Vwd9yvS1Txg+X+QKBMGP8354="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-wpy7pZBpqAaPjWbnsqtnE+65a58IGg0pyp4CEUnmmc4="; }; - vendorHash = "sha256-td15lXx6h4SFfTQdc4Whe2bbOpXK57OD8fyDzRvas8M="; + vendorHash = "sha256-3ef2G4+UlLGsBW09ZM20qU82uj/hVlMAnujcd2BulGg="; subPackages = [ "cmd/dex" @@ -27,7 +27,7 @@ buildGo124Module rec { ldflags = [ "-w" "-s" - "-X main.version=${src.rev}" + "-X main.version=${finalAttrs.src.rev}" ]; postInstall = '' @@ -40,7 +40,7 @@ buildGo124Module rec { version = testers.testVersion { package = dex-oidc; command = "dex version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; }; @@ -54,4 +54,4 @@ buildGo124Module rec { ]; mainProgram = "dex"; }; -} +}) diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix index 363b6ba695c2..6b99e21b93c7 100644 --- a/pkgs/by-name/dp/dpt-rp1-py/package.nix +++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.18"; + version = "0.1.19"; format = "pyproject"; src = fetchFromGitHub { owner = "janten"; repo = "dpt-rp1-py"; rev = "v${version}"; - sha256 = "sha256-5Ny62Kp1GHH9vmPSZ6smNqyEt9PZYPHAiungHZQMB/A="; + sha256 = "sha256-cJ9dc8TRuduIka6T/MQsetDAjIhb+i2U9F8Qm9h29d8="; }; doCheck = false; diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 19040fc4048f..2f7d4fb39e6d 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-11-02"; + version = "4.0.0-unstable-2025-11-11"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "79095df59b255996611fdc84d75bf06253f152ce"; - hash = "sha256-NMcm5fn4P5K5OueS3sdBXX6QMMqzVAOdPHNDMb+lqh8="; + rev = "4d8e487dd47ad388b0bd1d9b019a8b70b72f4f78"; + hash = "sha256-ZE1P883H1o0Gq+3a0w/eRkYajz7GQfjl1BX9Q67hfuE="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 9b1bf57d2051..8de32103610a 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -1,23 +1,20 @@ { lib, stdenv, - appstream-glib, calf, + cmake, deepfilternet, - desktop-file-utils, fetchFromGitHub, fftw, fftwFloat, - fmt_9, glib, gsl, - gtk4, - itstool, + intltool, + kdePackages, ladspaH, - libadwaita, libbs2b, libebur128, - libportal-gtk4, + libportal-qt6, libsamplerate, libsigcxx30, libsndfile, @@ -25,61 +22,82 @@ lsp-plugins, lv2, mda_lv2, - meson, ninja, nix-update-script, nlohmann_json, pipewire, pkg-config, + qt6, rnnoise, rubberband, soundtouch, speexdsp, onetbb, - wrapGAppsHook4, + webrtc-audio-processing, zam-plugins, zita-convolver, }: let - # Fix crashes with speexdsp effects - speexdsp' = speexdsp.override { withFftw3 = false; }; + inherit (qt6) + qtbase + qtgraphs + qtwebengine + wrapQtAppsHook + ; + inherit (kdePackages) + appstream-qt + breeze-icons + extra-cmake-modules + kcolorscheme + kconfigwidgets + kiconthemes + kirigami + kirigami-addons + qqc2-desktop-style + ; in stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.2.5"; + version = "8.0.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${version}"; - hash = "sha256-w3Mb13LOSF8vgcdJrqbesLqyyilI5AoA19jFquE5lEw="; + hash = "sha256-N1VxA68IzNPZcDodoFTdQ0zpS5hCrHyLjP8Y/bqO/JA="; }; + patches = [ ./qmlmodule-fix.patch ]; + nativeBuildInputs = [ - desktop-file-utils - itstool - meson + cmake + extra-cmake-modules + intltool ninja pkg-config - wrapGAppsHook4 + wrapQtAppsHook ]; buildInputs = [ - appstream-glib + appstream-qt + breeze-icons deepfilternet fftw fftwFloat - fmt_9 glib gsl - gtk4 + kcolorscheme + kconfigwidgets + kiconthemes + kirigami + kirigami-addons ladspaH - libadwaita + qqc2-desktop-style libbs2b libebur128 - libportal-gtk4 + libportal-qt6 libsamplerate libsigcxx30 libsndfile @@ -87,11 +105,15 @@ stdenv.mkDerivation rec { lv2 nlohmann_json pipewire + qtbase + qtgraphs + qtwebengine rnnoise rubberband soundtouch - speexdsp' + speexdsp onetbb + webrtc-audio-processing zita-convolver ]; @@ -110,7 +132,7 @@ stdenv.mkDerivation rec { ]; in '' - gappsWrapperArgs+=( + qtWrapperArgs+=( --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" ) @@ -130,6 +152,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ getchoo aleksana + Gliczy ]; mainProgram = "easyeffects"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch b/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch new file mode 100644 index 000000000000..5ef0be2365fa --- /dev/null +++ b/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2736ac18b..85be09a90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ find_package(KF${QT_MAJOR_VERSION} REQUIRED COMPONENTS + QQC2DesktopStyle + ) + +-ecm_find_qmlmodule(org.kde.kirigami REQUIRED) ++ecm_find_qmlmodule(org.kde.kirigami) + + qt_policy(SET QTP0001 NEW) diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index 9dadd70f89f8..5715f244096d 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-J6OzbZbKT1ZnVG559JKLDh5R9xI3WUYx3pvvb15CAI8="; + hash = "sha256-r5r7vfTbMPjAqMg5f7L/YfSzlxZgrSFjO6WHO64wfIo="; }; - cargoHash = "sha256-I5L+TKMKpUUvkh7tWw7hdCRK6CLj0PBzkfdJqPk3YJE="; + cargoHash = "sha256-11EcYZw6Dq0Ls1fhBYLlvvHeZtiaweg6JAGBmkX+acw="; buildFeatures = [ "libvips" ]; diff --git a/pkgs/by-name/fa/fastddsgen/493-addendum.patch b/pkgs/by-name/fa/fastddsgen/493-addendum.patch new file mode 100644 index 000000000000..69cd3e731b9a --- /dev/null +++ b/pkgs/by-name/fa/fastddsgen/493-addendum.patch @@ -0,0 +1,17 @@ + Fix gradle error + + https://docs.gradle.org/9.1.0/userguide/validation_problems.html#private_method_must_not_be_annotated + +diff --git a/build.gradle b/build.gradle +index c6d537e..9029aae 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -69,7 +69,7 @@ public abstract class InstallPath extends DefaultTask { + * Install Task Action that copies the script and jar files + */ + @TaskAction +- private void install() { ++ public void install() { + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + final String install_path = (path != null && !path.isEmpty()) ? path : "C:\\Program Files\\fastddsgen\\"; + diff --git a/pkgs/by-name/fa/fastddsgen/package.nix b/pkgs/by-name/fa/fastddsgen/package.nix index 9167ff012b5b..175daf70105f 100644 --- a/pkgs/by-name/fa/fastddsgen/package.nix +++ b/pkgs/by-name/fa/fastddsgen/package.nix @@ -3,36 +3,53 @@ stdenv, makeWrapper, fetchFromGitHub, - gradle_7, - openjdk17, + fetchpatch2, + gradle, + openjdk, + testers, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "fastddsgen"; version = "4.2.0"; - gradle = gradle_7; - -in -stdenv.mkDerivation { - inherit pname version; - src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-weGS340MvPitWMgWx1cWTgYgGcQfJSTUus8EcBob7hY="; }; + patches = [ + # Note: PR is not yet merged + # Select commit from https://github.com/eProsima/IDL-Parser/pull/179 + (fetchpatch2 { + url = "https://github.com/eProsima/IDL-Parser/commit/801ed2f671322c0134b8db180529c9a400d5ed2b.patch"; + stripLen = 1; + extraPrefix = "thirdparty/idl-parser/"; + includes = [ "thirdparty/idl-parser/build.gradle" ]; + hash = "sha256-OzywQ02yaMnya+536DeHWeKwZefI4meYqmZcp3onwR8="; + }) + + # Note: PR is not yet merged + # Select commit from https://github.com/eProsima/Fast-DDS-Gen/pull/493 + (fetchpatch2 { + url = "https://github.com/eProsima/Fast-DDS-Gen/commit/b1b66d587f38d4fd6227aa1969c3a10c2095ae7d.patch"; + hash = "sha256-qVp9Xk8og8Ga2BMiqt2BFM0lAtDnmmwzteceievfcXE="; + }) + + ./493-addendum.patch + ]; + nativeBuildInputs = [ gradle - openjdk17 + openjdk makeWrapper ]; mitmCache = gradle.fetchDeps { - inherit pname; + inherit (finalAttrs) pname; data = ./deps.json; }; @@ -51,7 +68,7 @@ stdenv.mkDerivation { # Override the default start script to use absolute java path. # Make the unwrapped "cpp" available in the path, since the wrapped "cpp" # passes additional flags and produces output incompatible with fastddsgen. - makeWrapper ${openjdk17}/bin/java $out/bin/fastddsgen \ + makeWrapper ${openjdk}/bin/java $out/bin/fastddsgen \ --add-flags "-jar $out/share/fastddsgen/java/fastddsgen.jar" \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc ]} @@ -65,6 +82,11 @@ stdenv.mkDerivation { gradle nixDownloadDeps ''; + passthru.tests = testers.testVersion { + command = "${finalAttrs.meta.mainProgram} -version"; + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Fast-DDS IDL code generator tool"; mainProgram = "fastddsgen"; @@ -79,6 +101,6 @@ stdenv.mkDerivation { used to publish or subscribe. ''; maintainers = with maintainers; [ wentasah ]; - platforms = openjdk17.meta.platforms; + platforms = openjdk.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/fa/fastmail-desktop/darwin.nix b/pkgs/by-name/fa/fastmail-desktop/darwin.nix index 6e815849081c..3e0d58bda7c4 100644 --- a/pkgs/by-name/fa/fastmail-desktop/darwin.nix +++ b/pkgs/by-name/fa/fastmail-desktop/darwin.nix @@ -5,6 +5,7 @@ passthru, meta, stdenvNoCC, + unzip, }: stdenvNoCC.mkDerivation { inherit @@ -15,6 +16,9 @@ stdenvNoCC.mkDerivation { meta ; + sourceRoot = "."; + nativeBuildInputs = [ unzip ]; + installPhase = '' mkdir -p $out/Applications cp -R Fastmail.app $out/Applications/ diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix index da373f653e94..d5d7f802508b 100644 --- a/pkgs/by-name/fa/fastmail-desktop/sources.nix +++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix @@ -1,20 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-10-30 +# Last updated: 2025-11-11 { fetchurl, fetchzip }: { aarch64-darwin = { - version = "1.0.3"; - src = fetchzip { - url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.3-arm64-mac.zip"; - hash = "sha512-lqJj0tTwOJx1jzzXtlKOOduUEtSgVHpQCM5WkbXjmOh2OejLRcdJ1Y9CxvZJGSPBGWrErKzytMOB8QmJ1BkIdw=="; - stripRoot = false; + version = "1.0.4"; + src = fetchurl { + url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.4-arm64-mac.zip"; + hash = "sha512-DoBG2pY8a1BjNby0/PFAmRnEdMzX3n/JNlGW1/uHvi8lmzDMfEK5F0RAE4bNW08TPnaomjQOMRnqcas/9SecuA=="; }; }; x86_64-linux = { - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.3.AppImage"; - hash = "sha512-L+h0GHAAlZndB4Q5Z7GiHuZqv1kTF5yCAJYYb9tPXnHfdcrwHvfBRnixEnVPPia46rp2IJ56z4ZS8RSut3ATFQ=="; + url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.4.AppImage"; + hash = "sha512-lavGgtrIRiYL4NQEecpppvcTLZCgp54sTDFyVgySzBZmB6bcwCk9Kpjgepjma6iCUtUQYkN5ydtEYLZqTcSw4Q=="; }; }; } diff --git a/pkgs/by-name/fa/fastmail-desktop/update.sh b/pkgs/by-name/fa/fastmail-desktop/update.sh index 52c07e300a96..c21c13c3fe7a 100755 --- a/pkgs/by-name/fa/fastmail-desktop/update.sh +++ b/pkgs/by-name/fa/fastmail-desktop/update.sh @@ -24,10 +24,9 @@ cat >sources.nix < qcs ") ++set(CMAKE_CXX_ARCHIVE_FINISH true) + add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING) + + # To avoid dependency on WebKit. This also came with MacOS, but as webkit is heavyweight, it is probably a good idea to turn it off for all +diff --git a/The-Orm/CMakeLists.txt b/The-Orm/CMakeLists.txt +index 1c7186e..39cebd0 100644 +--- a/The-Orm/CMakeLists.txt ++++ b/The-Orm/CMakeLists.txt +@@ -5,20 +5,7 @@ + # + + cmake_minimum_required(VERSION 3.14) +- +-# Get the version from our sub cmakefile +-execute_process( +- COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/gitversion.cmake" +- ERROR_VARIABLE PROJECT_VERSION +- ERROR_STRIP_TRAILING_WHITESPACE +-) +-# Cleanup output +-string(REGEX REPLACE "^[[:space:]]+|[[:space:]]+$" "" PROJECT_VERSION "${PROJECT_VERSION}") +-string(REGEX REPLACE "\n$" "" PROJECT_VERSION "${PROJECT_VERSION}") +-message(STATUS "Project version is '${PROJECT_VERSION}'") +- +-# Start project +-project(KnobKraftOrm VERSION ${PROJECT_VERSION}) ++project(KnobKraftOrm VERSION 2.7.1) + + # Now you can use PROJECT_DEV_TAG in your CMake scripts or in your code to handle the "-dev" part. + # For example, you could add a preprocessor definition that your code could use: diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 69aff018b305..7caac82ac09e 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "kolla"; - version = "20.2.0"; + version = "20.3.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "kolla"; tag = version; - hash = "sha256-aqYEzBphzwB42Z0HmnCPQlV71dOi3yLKh+zL2dMTaB8="; + hash = "sha256-DLoQkI2cWaH+LYA97/ramOb2bAeZ8kRX386QX8WEivI="; }; postPatch = '' diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix index cded2b298a30..9ad94f0076d1 100644 --- a/pkgs/by-name/ku/kubecolor/package.nix +++ b/pkgs/by-name/ku/kubecolor/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "kubecolor"; repo = "kubecolor"; rev = "v${version}"; - sha256 = "sha256-T0xqcDDmp/XjDxUnh/wCfs+b4cQG78d/61rdypCEDoY="; + sha256 = "sha256-F/ws7KevH0mGtSqp+iHyWpNccIBdF5gIoZfmLJ5H4YM="; }; vendorHash = "sha256-QenYTQTNXaBvzpyVHOCx3lEheiWZMfulEfzB+ll+q+4="; diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index fab3716094e5..942b877ccc53 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.24.0"; + version = "4.25.0"; # Using a vendored version rather than nixpkgs' version to match the exact version required by # Lean. Apparently, even a slight version change can impact greatly the final performance. @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "leanprover"; repo = "lean4"; tag = "v${finalAttrs.version}"; - hash = "sha256-m0DjKjFia5F5rCVMgn2xxPbbU/5uy7g84FUXSBPgy3w="; + hash = "sha256-VM7Y3KzsAWAvDTFXbi183s6tVqlyrMlV3oEsc9d8Rk0="; }; postPatch = diff --git a/pkgs/by-name/li/libblockdev/package.nix b/pkgs/by-name/li/libblockdev/package.nix index d86676412022..cee436a7c3de 100644 --- a/pkgs/by-name/li/libblockdev/package.nix +++ b/pkgs/by-name/li/libblockdev/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, gtk-doc, @@ -36,23 +35,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; - rev = finalAttrs.version; - hash = "sha256-Q7610i+2PQi+Oza3c2SwPneljrb+1cuFA4K4DQTpt8A="; + tag = finalAttrs.version; + hash = "sha256-KvcGvMsASgEKTerhh/lSPjQoXYDMBvbaPSdc6f5p7wc="; }; - patches = [ - # CVE-2025-6019: https://www.openwall.com/lists/oss-security/2025/06/17/5 - (fetchpatch { - url = "https://github.com/storaged-project/libblockdev/commit/4e35eb93e4d2672686789b9705623cc4f9f85d02.patch"; - hash = "sha256-3pQxvbFX6jmT5LCaePoVfvPTNPoTPPhT0GcLaGkVVso="; - }) - ]; - outputs = [ "out" "dev" @@ -70,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: { "--with-python_prefix=${placeholder "python"}" ]; + strictDeps = true; + nativeBuildInputs = [ autoconf-archive autoreconfHook @@ -112,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; + changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.tag}/NEWS.rst"; description = "Library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; license = with lib.licenses; [ diff --git a/pkgs/by-name/li/libnfc-nci/package.nix b/pkgs/by-name/li/libnfc-nci/package.nix index 041b7f5362f1..6e83a6ebf777 100644 --- a/pkgs/by-name/li/libnfc-nci/package.nix +++ b/pkgs/by-name/li/libnfc-nci/package.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-iSvDiae+A2hUok426Lj5TMn3Q9G+vH1G0jajP48PehQ="; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - pkg-config autoreconfHook ]; diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 85a103157e1a..a1a3ff89592e 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-saqxH7SyDpdfwC+69oBXQGSXowqpSnbQXsPgPGeVvHI="; + hash = "sha256-9di+WCu19cjJXBjtQN29JpGUEFygcIYTJXrdRwSg+TE="; }; - vendorHash = "sha256-U+epe3zEq28UNJkcABlOg9URfxl1hlRWrcqwYnn78uE="; + vendorHash = "sha256-FM7ORm4loMi06T5eAs8KiKFErcXk4XV8yLQYFy3uBRM="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix new file mode 100644 index 000000000000..de5244bfefc4 --- /dev/null +++ b/pkgs/by-name/lu/lunar/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + _7zz, + fetchurl, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lunar"; + version = "6.9.5"; + + src = fetchurl { + url = "https://github.com/alin23/Lunar/releases/download/v${finalAttrs.version}/Lunar-${finalAttrs.version}.dmg"; + hash = "sha256-1Y0SFfGliGf1zf4k9iolotMzoAbBH27R0ablMmfeyDM="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ _7zz ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -R ./Lunar.app $out/Applications + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Defacto app for controlling monitors"; + homepage = "https://lunar.fyi/"; + changelog = "https://github.com/alin23/Lunar/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + mit + unfree + ]; + maintainers = with lib.maintainers; [ delafthi ]; + platforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index 5db8aeb1f0b8..b944570be8c4 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.4.6"; + version = "7.5.0"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-4Cqhr++RP8FlWUMQyfpEY7df2Ai3aqrzwX+kZ+SzGCQ="; + hash = "sha256-jI/V8tczgBHl3/LOEui+DbjWB5kD67+mL2HMvPz80+8="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/ma/mariokart64recomp/package.nix b/pkgs/by-name/ma/mariokart64recomp/package.nix new file mode 100644 index 000000000000..a692e9e3b3e4 --- /dev/null +++ b/pkgs/by-name/ma/mariokart64recomp/package.nix @@ -0,0 +1,171 @@ +{ + lib, + mk64baserom ? null, + requireFile, + fetchFromGitHub, + llvmPackages_19, + cmake, + copyDesktopItems, + installShellFiles, + makeWrapper, + ninja, + pkg-config, + wrapGAppsHook3, + SDL2, + gtk3, + vulkan-loader, + graphicsmagick, + makeDesktopItem, + n64recomp, + directx-shader-compiler, + sdl_gamecontrollerdb, + forceX11 ? false, +}: + +let + + baseRom = + if mk64baserom != null then + mk64baserom + else + requireFile { + name = "mk64.us.z64"; + message = '' + mariokart64recomp only supports the US version of Mario Kart 64. + Please dump your copy and rename it to mk64.us.z64 + and add it to the nix store using + nix-store --add-fixed sha256 mk64.us.z64 + See https://dumping.guide/carts/nintendo/n64 for more details. + ''; + hash = "sha256-1rhTjdY/ATLssoVufTKBbtPDDj5HmuzSPPg/troXpdo="; + }; + +in + +llvmPackages_19.stdenv.mkDerivation (finalAttrs: { + pname = "mariokart64recomp"; + version = "0.9.1-unstable-2025-10-02"; + + src = + (fetchFromGitHub { + owner = "sonicdcer"; + repo = "MarioKart64Recomp"; + rev = "6f5791b3f4eae60bd341502b7af71372a9d531a9"; + hash = "sha256-qVAXFUJYR4Q7WfbuY0h7ZhvIsgkfpD5W0eo5mUv4TEg="; + fetchSubmodules = true; + }).overrideAttrs + (_: { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }); + + strictDeps = true; + + nativeBuildInputs = [ + cmake + copyDesktopItems + installShellFiles + llvmPackages_19.lld + makeWrapper + ninja + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + SDL2 + gtk3 + vulkan-loader + ]; + + desktopItems = [ + (makeDesktopItem { + name = "MarioKart64Recompiled"; + icon = "MarioKart64Recompiled"; + exec = "MarioKart64Recompiled"; + comment = "Recompilation of MarioKart 64"; + genericName = "Recompilation of MarioKart 64"; + desktopName = "MarioKart64Recompiled"; + categories = [ "Game" ]; + }) + ]; + + preConfigure = '' + ln -s ${baseRom} ./mk64.us.z64 + cp ${n64recomp}/bin/* . + + ./N64Recomp us.toml + ./RSPRecomp aspMain.us.toml + + substituteInPlace lib/rt64/CMakeLists.txt \ + --replace-fail "\''${PROJECT_SOURCE_DIR}/src/contrib/dxc/lib/x64" "${directx-shader-compiler}/lib/" \ + --replace-fail "\''${PROJECT_SOURCE_DIR}/src/contrib/dxc/bin/x64/dxc-linux" "${directx-shader-compiler}/bin/dxc" \ + --replace-fail "\''${PROJECT_SOURCE_DIR}/src/contrib/dxc/inc" "${directx-shader-compiler.src}/include/dxc" + + substituteInPlace CMakeLists.txt \ + --replace-fail "\''${PROJECT_SOURCE_DIR}/lib/rt64/src/contrib/dxc/lib/x64" "${directx-shader-compiler}/lib/" \ + --replace-fail "\''${PROJECT_SOURCE_DIR}/lib/rt64/src/contrib/dxc/bin/x64/dxc-linux" "${directx-shader-compiler}/bin/dxc" + ''; + + # This is required or else nothing will build + hardeningDisable = [ + "format" + "pic" + "stackprotector" + "zerocallusedregs" + ]; + + installPhase = '' + runHook preInstall + + installBin MarioKart64Recompiled + install -Dm644 -t $out/share ../recompcontrollerdb.txt + install -Dm644 ../icons/512.png $out/share/icons/hicolor/scalable/apps/MarioKart64Recompiled.png + install -Dm644 ../flatpak/io.github.mariokart64recomp.mariokart64recomp.desktop $out/share/applications/MarioKart64Recompiled.desktop + cp -r ../assets $out/share/ + ln -s $out/share/recompcontrollerdb.txt $out/bin/recompcontrollerdb.txt + ln -s $out/share/assets $out/bin/assets + + install -Dm644 -t $out/share/licenses/mariokart64recompiled ../COPYING + install -Dm644 -t $out/share/licenses/mariokart64recompiled/N64ModernRuntime ../lib/N64ModernRuntime/COPYING + install -Dm644 -t $out/share/licenses/mariokart64recompiled/RmlUi ../lib/RmlUi/LICENSE.txt + install -Dm644 -t $out/share/licenses/mariokart64recompiled/lunasvg ../lib/lunasvg/LICENSE + install -Dm644 -t $out/share/licenses/mariokart64recompiled/rt64 ../lib/rt64/LICENSE + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + ) + ''; + + # This is needed as MarioKart64Recompiled will segfault when not run from the same + # directory as the binary. It also used to exit when run without X11. Recent rt64 + # updates enabled wayland support, but leave the option to disable this on the + # application level if desired. + postFixup = '' + wrapProgram $out/bin/MarioKart64Recompiled --chdir "$out/bin/" \ + ${lib.optionalString forceX11 ''--set SDL_VIDEODRIVER x11''} + ''; + + meta = { + description = "Recompilation of MarioKart 64"; + homepage = "https://github.com/sonicdcer/MarioKart64Recomp"; + license = with lib.licenses; [ + # MarioKart64Recompiled, N64ModernRuntime + gpl3Only + + # RT64, RmlUi, lunasvg, sse2neon + mit + + # reverse engineering + unfree + ]; + maintainers = with lib.maintainers; [ qubitnano ]; + mainProgram = "MarioKart64Recompiled"; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index a6e08d9b2f6c..23aecd1079ca 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-MlOilH01OpiYHxhCceSXVw1zhyNQXYomTvSMkM9sUrk="; + hash = "sha256-JSuhI38fLi9z7dMRL04eQ1UdMMe8S/F3qXrJT1DwnS0="; }; - cargoHash = "sha256-hvEr+cMjPJ4DLigAL9SQLUJqOVSOktsP8v4xTtOKvSg="; + cargoHash = "sha256-PNPZFxCsBXwiQ2leDyHWOFtEQJW0DxU6pTEs04sdM+M="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index 771180c7f536..7da393294afd 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -16,22 +16,23 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.5"; + version = "25.11"; + tag = "v0.2511.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; - tag = "v${version}"; - hash = "sha256-AIw7Grh4BEDT33N4004XjOtIepguO2SbdUmTHGJ1A2M="; + inherit tag; + hash = "sha256-WmZ2eRKRckZtYMsI7r0b+atLSYA5e3N4ifeSEI2Rvu8="; }; - vendorHash = "sha256-73a+OyauFJv2Rx6tbjwN9SBaXu4ZL5qM5xFt5m8a7c4="; + vendorHash = "sha256-HVM9W4gOZFs9BDT1wFzDXkhDklCDtKUyNdYxPWkGZ3w="; ldflags = [ "-s" "-w" "-X" - "main.Tag=${version}" + "main.Tag=${tag}" ]; buildInputs = lib.optional (!withGoolm) olm; diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index b829cb71199b..bdef2abf3d99 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -36,8 +36,13 @@ let fetchedMavenDeps = stdenv.mkDerivation ( { - name = "${pname}-${version}-maven-deps"; - inherit src sourceRoot patches; + pname = "maven-deps-${pname}"; + inherit + src + sourceRoot + patches + version + ; nativeBuildInputs = [ maven diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix index 1c0d61ed2436..c9bf1509605d 100644 --- a/pkgs/by-name/mc/mcphost/package.nix +++ b/pkgs/by-name/mc/mcphost/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcphost"; - version = "0.31.3"; + version = "0.31.4"; src = fetchFromGitHub { owner = "mark3labs"; repo = "mcphost"; tag = "v${finalAttrs.version}"; - hash = "sha256-1pPwW4Q84OWTcMVz4rEWEt1ZwWmxHmQTsCiqXKpOkvs="; + hash = "sha256-iVcoNOCD8g0HDrp4agK8m7gv4DkcYekdRlPpN41Wrf0="; }; - vendorHash = "sha256-xZ7JbX1sAt2ZtgSMm86MQEJWwjL17O9LMsjOmkhzWt0="; + vendorHash = "sha256-4qioHQXdikYItQkYlyXp/Qtuun8FICxyzyWQx/mTSpA="; doCheck = false; diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix index cfe185d988f4..b0b1cdfa5d0a 100644 --- a/pkgs/by-name/md/mdsf/package.nix +++ b/pkgs/by-name/md/mdsf/package.nix @@ -9,7 +9,7 @@ }: let pname = "mdsf"; - version = "0.10.8"; + version = "0.11.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "hougesen"; repo = "mdsf"; tag = "v${version}"; - hash = "sha256-mvD4eBUIulPr4e7jj2As05svDH2BXJwSrWSOfMFJMzE="; + hash = "sha256-hz28Aj4sD4/bA6T1ZUW50SzYV6dmM04vSgYwNSWyaVg="; }; - cargoHash = "sha256-atSGHGaRlXdHKvW1Gv23D6aBiBdjByg3sLUCXVqQyDY="; + cargoHash = "sha256-dTQucEYGpsBhKonLJRtQziXkbEGkHL+w9FMi9+iLvnw="; # many tests fail for various reasons of which most depend on the build sandbox doCheck = false; diff --git a/pkgs/by-name/me/meetingbar/package.nix b/pkgs/by-name/me/meetingbar/package.nix new file mode 100644 index 000000000000..1038adb66296 --- /dev/null +++ b/pkgs/by-name/me/meetingbar/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + _7zz, + fetchurl, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "meetingbar"; + version = "4.11.6"; + + src = fetchurl { + url = "https://github.com/leits/MeetingBar/releases/download/v${finalAttrs.version}/MeetingBar.dmg"; + hash = "sha256-TxmvSW1P9EubDuAr4CvHYgfz42Wn+ed8chmgjGB4ONc="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ _7zz ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -R ./MeetingBar.app $out/Applications + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Menu-bar app for your calendar meetings"; + homepage = "https://meetingbar.app/"; + changelog = "https://github.com/leits/MeetingBar/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ delafthi ]; + platforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 917d06708271..6467d75ebe8b 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.15"; + version = "1.19.16"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-WygZtgXikBq7jhXeppDD74WcV9STxUviQqx8Cz1R0X4="; + hash = "sha256-tao4/caGLbqHMvD2I9mSK0SskyKEpSGZ9uz8B1ViUcA="; }; - vendorHash = "sha256-t+v+szM5uXRy173tAtRf+IqiGNHaL6nNRgf6OZmeJyQ="; + vendorHash = "sha256-tKOiSKOorJ9vX83FNCUE4xQcO2cN33v43zYSoo+lKZY="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/millisecond/package.nix b/pkgs/by-name/mi/millisecond/package.nix new file mode 100644 index 000000000000..1ea56431c645 --- /dev/null +++ b/pkgs/by-name/mi/millisecond/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + python313, + gobject-introspection, + gtk4, + desktop-file-utils, + appstream, + glib, + wrapGAppsHook4, + libadwaita, +}: + +let + pythonEnv = python313.withPackages (p: [ + p.pygobject3 + ]); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "millisecond"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "gaheldev"; + repo = "Millisecond"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SMGcSlbOfBX5gAwB7CaHRthf9EN5QWAN9ZzrcbQXtm8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + appstream + desktop-file-utils + glib + gobject-introspection + gtk4 + meson + ninja + pkg-config + pythonEnv + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + ]; + + meta = { + homepage = "https://github.com/gaheldev/Millisecond"; + description = "Optimize your Linux system for low latency audio"; + mainProgram = "millisecond"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + backtail + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/mo/monaspace/package.nix b/pkgs/by-name/mo/monaspace/package.nix index 2330e3aed858..da3fe65ddf0f 100644 --- a/pkgs/by-name/mo/monaspace/package.nix +++ b/pkgs/by-name/mo/monaspace/package.nix @@ -1,17 +1,18 @@ { lib, stdenvNoCC, - fetchzip, + fetchFromGitHub, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "monaspace"; - version = "1.200"; + version = "1.301"; - src = fetchzip { - url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip"; - stripRoot = false; - hash = "sha256-j1xQYVxfTNDVuzCKvT5FbU29t8XsH4XqcZ477sjydts="; + src = fetchFromGitHub { + owner = "githubnext"; + repo = "monaspace"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8tPwm92ZtaXL9qeDL+ay9PdXLUBBsspdk7/0U8VO0Tg="; }; outputs = [ @@ -20,16 +21,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; installPhase = '' - runHook preInstall + # Install TrueType fonts + install -Dm644 -t $out/share/fonts/truetype fonts/Frozen\ Fonts/*/*.ttf + install -Dm644 -t $out/share/fonts/truetype fonts/Variable\ Fonts/*/*.ttf - pushd monaspace-v${finalAttrs.version}/fonts/ - install -Dm644 frozen/*.ttf -t $out/share/fonts/truetype - install -Dm644 otf/*.otf -t $out/share/fonts/opentype - install -Dm644 variable/*.ttf -t $out/share/fonts/truetype - install -Dm644 webfonts/*.woff -t $woff/share/fonts/woff - popd + # Install OpenType fonts + install -Dm644 -t $out/share/fonts/opentype fonts/Static\ Fonts/*/*.otf + install -Dm644 -t $out/share/fonts/opentype fonts/NerdFonts/*/*.otf - runHook postInstall + # Install Web fonts + install -Dm644 -t $woff/share/fonts/woff fonts/Web\ Fonts/*/*/*.woff + install -Dm644 -t $woff/share/fonts/woff fonts/Web\ Fonts/*/*/*.woff2 ''; meta = { diff --git a/pkgs/by-name/mo/monodraw/package.nix b/pkgs/by-name/mo/monodraw/package.nix new file mode 100644 index 000000000000..3a80b9f382bf --- /dev/null +++ b/pkgs/by-name/mo/monodraw/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenvNoCC, + unzip, + fetchurl, + writeShellScript, + curl, + xmlstarlet, + gnused, + common-updater-scripts, +}: + +let + # Monodraw uses build numbers (tracked via Sparkle appcast) + # Appcast: https://updates.helftone.com/monodraw/appcast-beta.xml + build = "118"; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "monodraw"; + version = "1.7.1"; + + src = fetchurl { + url = "https://updates.helftone.com/monodraw/downloads/Monodraw-b${build}.zip"; + hash = "sha256-7ti/FXoxNMhSYV7TWTeP8mAnCdqukI0SgDdW6RRQsFc="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -R ./Monodraw.app $out/Applications + + runHook postInstall + ''; + + passthru = { + inherit build; + updateScript = writeShellScript "monodraw-update-script" '' + set -euo pipefail + export PATH="${ + lib.makeBinPath [ + curl + xmlstarlet + gnused + common-updater-scripts + ] + }" + + xml=$(curl -s "https://updates.helftone.com/monodraw/appcast-beta.xml") + + version=$(echo "$xml" | xmlstarlet sel -t -v '//enclosure/@sparkle:shortVersionString') + build=$(echo "$xml" | xmlstarlet sel -t -v '//enclosure/@sparkle:version') + + # Update build number in let binding + sed -i "s/build = \"[0-9]*\"/build = \"$build\"/" pkgs/by-name/mo/monodraw/package.nix + + # Update version and hash + update-source-version monodraw "$version" + ''; + }; + + meta = { + description = "Powerful ASCII art editor designed for the Mac"; + homepage = "https://monodraw.helftone.com/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ delafthi ]; + platforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix index f34241bebd57..27511eddd42d 100644 --- a/pkgs/by-name/mo/moonraker/package.nix +++ b/pkgs/by-name/mo/moonraker/package.nix @@ -35,13 +35,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "0.9.3-unstable-2025-10-20"; + version = "0.9.3-unstable-2025-11-10"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "8426f4107c7afb9adf876fce53b2cd725370523a"; - sha256 = "sha256-gNmgUwp+OHW18Ylzzve1Ey63L5kobOoldAkr0VdfG3w="; + rev = "abd2026b90d86fb738c6619be3ceefcedee2006c"; + sha256 = "sha256-Vmrvpj5Bdhn9czrswqtFiRL7GoplMcBvVs1FJTZwQxs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 06d7be4dd40b..637ff1e8e630 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -44,13 +44,13 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.31"; + version = "0.32.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-rW751UhDBhakOrAT4BOiRDPpGldf1EwNZY8iavXlpLk="; + hash = "sha256-1sNStxgvP8iaiINIa4UOFz8RGeQlFvJK5+RGlK/3Xa8="; }; php = php.buildEnv ( @@ -88,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - vendorHash = "sha256-Ke+bh/mvKUk5qxjlBZo4jJhLneyFRq0HYXTwK/KZMBs="; + vendorHash = "sha256-t95OVDUb7hJfbokFhSOyGP02laVcTTJX7bK/reYJ99I="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; @@ -100,8 +100,8 @@ php.buildComposerProject2 (finalAttrs: { # Point to PHP + PHP INI in the Nix store substituteInPlace src/Movim/Console/DaemonCommand.php \ - --replace-fail "php vendor/bin/phinx migrate" \ - "${lib.getBin finalAttrs.php} vendor/bin/phinx migrate" \ + --replace-fail "composer movim:migrate" \ + "${lib.getBin finalAttrs.php.packages.composer} movim:migrate" \ --replace-fail "php daemon.php setAdmin {jid}" \ "${finalAttrs.meta.mainProgram} setAdmin {jid}" diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 9a11c26799d3..af6e38d4cf17 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "muffet"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; tag = "v${finalAttrs.version}"; - hash = "sha256-GfRR+9PdfY63Pzv2XZenKs8XXAKRr9qMzcHOVhl+hv4="; + hash = "sha256-VG8vewpC3PoKb7rUsfjXdqXGk7JDT3X9ESp3zREPiXg="; }; - vendorHash = "sha256-oidOSV8y0VwTabipe7XwurUAra9F65nkTXslwXJ94Jw="; + vendorHash = "sha256-63L1uvOyAJsIOP+oM5z2YuIO9TmQJ0os1ekkg0el2k4="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/n6/n64recomp/package.nix b/pkgs/by-name/n6/n64recomp/package.nix new file mode 100644 index 000000000000..3b80aa278803 --- /dev/null +++ b/pkgs/by-name/n6/n64recomp/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zip, + unzip, + makeWrapper, + installShellFiles, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "n64recomp"; + version = "0-unstable-2025-09-06"; + + src = fetchFromGitHub { + owner = "N64Recomp"; + repo = "N64Recomp"; + rev = "6888c1f1df03349906acdec1a7ed3b308c86020c"; + hash = "sha256-xIpbGtnGyK+UYBBk8/+33H/oFzZKstGCv8Q/OF04ukE="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + makeWrapper + installShellFiles + ]; + + installPhase = '' + runHook preInstall + + installBin {N64Recomp,RSPRecomp,RecompModTool} + install -Dm644 -t $out/share/licenses/n64recomp ../LICENSE + + wrapProgram $out/bin/RecompModTool \ + --prefix PATH : ${zip}/bin \ + --prefix PATH : ${unzip}/bin + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + description = "Tool to statically recompile N64 games into native executables"; + homepage = "https://github.com/N64Recomp/N64Recomp"; + license = with lib.licenses; [ + # N64Recomp + mit + + # reverse engineering + unfree + ]; + maintainers = with lib.maintainers; [ qubitnano ]; + mainProgram = "N64Recomp"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 356c366272b6..d970f00de5f5 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.448"; + version = "0.0.449"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-7M5rs0SZwEI4g/E1P/A46trA/iaxrb4g68xCFwoee+s="; + hash = "sha256-QN/8MhZyGotvaB8gRCHglv1x6fU5Hvw6TSIyY0O4GE0="; }; - vendorHash = "sha256-bUKtHQcD8wq1VH5plbP8KXt+HXb/FoFKeqw6Ud15ZNw="; + vendorHash = "sha256-W0KYcpFw+laDfkKS9W339egozHJP/EohCZJk5Tj6Bx0="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix index 867ee19ee279..c98cf6a9245e 100644 --- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "25.10.14"; + version = "25.11.15"; src = fetchFromGitHub { owner = "numixproject"; repo = "numix-icon-theme-circle"; rev = version; - sha256 = "sha256-JIFzNNrlEWoQcZbaXPw3JMLVGnNj0oPKPW6COQJdC5A="; + sha256 = "sha256-+JV+2PEcXjIUxKTHV+jIejem/oANiMwytzwUPMa2zkc="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 4472a612da3d..b69111f77292 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.70.0"; + version = "3.70.1"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-RB6NTxLFHnDunDEPTVg9fWoIKiWCAzUgzhlydFshmaI="; + hash = "sha256-9RMBMvl1NBhajbMCw1aJZTMclbul5dZDpxhHWCPWi+s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 624d9568975b..a386c5a81dca 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -136,16 +136,16 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.12.9"; + version = "0.12.11"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-D61jCyOUYXyPgztgEAFHd2oL5IXsO5TnE2AGEHOnows="; + hash = "sha256-o6jjn9VyLRwD1wFoUv8nNwf5QC6TOVipmMrcHtikNjI="; }; - vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; + vendorHash = "sha256-rKRRcwmon/3K2bN7iQaMap5yNYKMCZ7P0M1C2hv4IlQ="; env = lib.optionalAttrs enableRocm { @@ -228,12 +228,8 @@ goBuild (finalAttrs: { ''; postFixup = - # the app doesn't appear functional at the moment, so hide it - '' - mv "$out/bin/app" "$out/bin/.ollama-app" - '' # expose runtime libraries necessary to use the gpu - + lib.optionalString (enableRocm || enableCuda) '' + lib.optionalString (enableRocm || enableCuda) '' wrapProgram "$out/bin/ollama" ${wrapperArgs} ''; diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index 57fbcc195e8e..8b8934b1f44e 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -31,9 +31,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "25.11.09.03"; - buildId = "5277"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "6a1e895a5fa5ccf2d0ba494d03ffe3280aebd9d9"; + version = "25.11.15.08"; + buildId = "5295"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "bd7c18567da8705787eeb1ba2a3890afb9482de9"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -44,7 +44,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-Qog5U4MuGm50aULo1U0WcSASH+hEJ1QMyhV6u+1r6jU="; + hash = "sha256-FFm/Crwy2AfOk+OCDnqLsNv4srW/445iW4VbL+mmMWM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 81c9db239ab9..6e949aee72a6 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2025.2.0"; + version = "2025.2.1"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = version; fetchSubmodules = true; - hash = "sha256-EtXHMOIk4hGcLiaoC0ZWYF6XZCD2qNtt1HeJoJIuuTA="; + hash = "sha256-Bu0m7nGqyHwHsa7FKr4nvUh/poJxMTgwuAU81QBmI4g="; }; patches = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" "-DOpenCV_DIR=${lib.getLib opencv}/lib/cmake/opencv4/" - "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DCMAKE_PREFIX_PATH=${lib.getLib protobuf}" "-DPython_EXECUTABLE=${python.interpreter}" (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) @@ -142,7 +142,8 @@ stdenv.mkDerivation rec { # system libs (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true) (cmakeBool "ENABLE_SYSTEM_OPENCL" true) - (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false) + (cmakeBool "ENABLE_SYSTEM_PROTOBUF" true) + (cmakeBool "Protobuf_USE_STATIC_LIBS" false) (cmakeBool "ENABLE_SYSTEM_PUGIXML" true) (cmakeBool "ENABLE_SYSTEM_SNAPPY" true) (cmakeBool "ENABLE_SYSTEM_TBB" true) @@ -163,6 +164,7 @@ stdenv.mkDerivation rec { libxml2 ocl-icd opencv + protobuf pugixml snappy onetbb diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index 3479014f9bcb..99f4e7e3cb6d 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "openvswitch"; repo = "ovs"; tag = "v${version}"; - hash = "sha256-zzEE1H0fjFOZY3KXFPb91Bmk3irPL1mHEbEBsumPlkw="; + hash = "sha256-I5ISLOu1MMT/mtyH4tcgdFe2zjSsutMWkJiPIbadbQI="; }; outputs = [ diff --git a/pkgs/by-name/pa/pascube/package.nix b/pkgs/by-name/pa/pascube/package.nix new file mode 100644 index 000000000000..2d8a1684bce2 --- /dev/null +++ b/pkgs/by-name/pa/pascube/package.nix @@ -0,0 +1,96 @@ +{ + autoPatchelfHook, + copyDesktopItems, + fetchFromGitHub, + fpc, + lazarus-qt6, + lib, + libGLU, + makeDesktopItem, + nix-update-script, + qt6Packages, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pascube"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "benjamimgois"; + repo = "pascube"; + tag = "v${finalAttrs.version}"; + hash = "sha256-djkrMgX3RTTXSLISYpBfdyCIh3/WWODxd473M53iFKE="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + fpc + lazarus-qt6 + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + qt6Packages.libqtpas + qt6Packages.qtbase + ]; + + runtimeDependencies = [ + libGLU + ]; + + buildPhase = '' + runHook preBuild + HOME=$(mktemp -d) lazbuild \ + --lazarusdir=${lazarus-qt6}/share/lazarus \ + --widgetset=qt6 \ + pascube.lpi + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 pascube $out/bin/pascube + for sz in 128x128 256x256 512x512; do + install -Dm644 "data/icons/''${sz}/pascube.png" \ + "$out/share/icons/hicolor/''${sz}/apps/pascube.png" + done + install -Dm644 "data/skybox.png" "$out/share/pascube/skybox.png" + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "pascube"; + desktopName = "pasCube"; + comment = finalAttrs.meta.description; + exec = finalAttrs.meta.mainProgram; + icon = "pascube"; + terminal = false; + categories = [ + "Graphics" + "Education" + "Qt" + ]; + }) + ]; + + preFixup = '' + qtWrapperArgs+=( + --set QT_QPA_PLATFORM xcb + ) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple OpenGL spinning cube written in Pascal"; + homepage = "https://github.com/benjamimgois/pascube"; + changelog = "https://github.com/benjamimgois/pascube/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ RoGreat ]; + mainProgram = "pascube"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index 95c7cbe2a198..b61d8d6d0983 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoenixd"; - version = "0.7.0"; + version = "0.7.1"; src = let @@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; hash = selectSystem { - aarch64-darwin = "sha256-8j3fzT2KWlspp4+5vplbvO6nrd1G+Fox6B6+YB+NE1k="; - x86_64-darwin = "sha256-f7OwOr0PRkfX6rdddoW4GNvIv16wjAU0G7LiI+oS+xQ="; - x86_64-linux = "sha256-2oVnY/BjSC3HxfOMlqWyI/Yue3PT+vNWten4ty2DZVk="; - aarch64-linux = "sha256-oRUXFZwGShZzqNiY18gKm1ZNVJ/zfARhr9d7S4hN8XQ="; + aarch64-darwin = "sha256-WCXmXBqMQxovBYg9QtgOy/76tu3TeJ91ERusZZRHPhY="; + x86_64-darwin = "sha256-g23VWjZyt7V1YVoaHi/6M7m/SO7nOr56zt9M5j1t5hU="; + x86_64-linux = "sha256-m0Ibi1LG6PtdaGFgfhS7UOIhuFprDdJlj6SLzjTW8HY="; + aarch64-linux = "sha256-UuWoD4WsQA009CcdXLhIfs5VBlCqvX7yOVWyKZxJnlQ="; }; }; diff --git a/pkgs/by-name/pi/picolisp/package.nix b/pkgs/by-name/pi/picolisp/package.nix index e9bfca1a2370..e03b301bcd9f 100644 --- a/pkgs/by-name/pi/picolisp/package.nix +++ b/pkgs/by-name/pi/picolisp/package.nix @@ -19,13 +19,15 @@ stdenv.mkDerivation { sha256 = "sha256-FB43DAjHBFgxdysoLzBXLxii52a2CCh1skZP/RTzfdc="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; buildInputs = [ clang libffi llvm openssl - pkg-config readline ]; sourceRoot = ''pil21''; diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix index a19126f0f492..fb9d3fd9b6c7 100644 --- a/pkgs/by-name/pk/pkcs11-provider/package.nix +++ b/pkgs/by-name/pk/pkcs11-provider/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ p11-kit.bin opensc - softhsm kryoptic nss.tools gnutls @@ -57,6 +56,13 @@ stdenv.mkDerivation rec { expect valgrind pkcs11ProviderPython3 + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # softokn and kryoptic are OK; softhsm is pretty flaky. + # This fails with a `pkcs11-provider:softhsm / tls - FAIL - exit status 1`. + # Considering that kryoptic is the Rust replacement, we can rely on it instead: + # https://github.com/softhsm/SoftHSMv2/issues/803 + softhsm ]; env = { diff --git a/pkgs/by-name/pq/pqiv/package.nix b/pkgs/by-name/pq/pqiv/package.nix index ef4da7d1d6d7..e97de1663bb4 100644 --- a/pkgs/by-name/pq/pqiv/package.nix +++ b/pkgs/by-name/pq/pqiv/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pqiv"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; - rev = finalAttrs.version; - hash = "sha256-wpM8eG2/sEfwYLfh6s3AL+z73IzeXxwGm/scWRRKLPo="; + tag = finalAttrs.version; + hash = "sha256-A02YB2VJ3gajnUqzkvmGUGQrEU5XIMSnHS1HLmPnN00="; }; nativeBuildInputs = [ pkg-config ]; @@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { prePatch = "patchShebangs ."; - meta = with lib; { + meta = { description = "Powerful image viewer with minimal UI"; homepage = "https://www.pberndt.com/Programme/Linux/pqiv"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ donovanglover ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.unix; mainProgram = "pqiv"; }; }) diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix index 12f1cd29c0f3..942d2d42e7e3 100644 --- a/pkgs/by-name/pr/privatebin/package.nix +++ b/pkgs/by-name/pr/privatebin/package.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchFromGitHub, nixosTests, - nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -26,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru = { tests = nixosTests.privatebin; - updateScript = nix-update-script { }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/pr/privatebin/update.sh b/pkgs/by-name/pr/privatebin/update.sh new file mode 100755 index 000000000000..426dbcf5a919 --- /dev/null +++ b/pkgs/by-name/pr/privatebin/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-update + +version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://api.github.com/repos/PrivateBin/PrivateBin/releases/latest" | jq -r .tag_name) +nix-update --version="$version" privatebin diff --git a/pkgs/by-name/pt/ptcpdump/package.nix b/pkgs/by-name/pt/ptcpdump/package.nix new file mode 100644 index 000000000000..d392993454f4 --- /dev/null +++ b/pkgs/by-name/pt/ptcpdump/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + versionCheckHook, + buildGoModule, + libpcap, +}: + +buildGoModule (finalAttr: { + pname = "ptcpdump"; + version = "0.37.0"; + + src = fetchFromGitHub { + owner = "mozillazg"; + repo = "ptcpdump"; + tag = "v${finalAttr.version}"; + hash = "sha256-ouH7VFWSCOElbmbSWAkmM4dtNVp545mC/FnoNAFtaEw="; + }; + + vendorHash = null; + + buildInputs = [ libpcap ]; + + tags = [ "dynamic" ]; + + ldflags = [ + "-X github.com/mozillazg/ptcpdump/internal.Version=v${finalAttr.version}" + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "Test_loadSpecFromBTFHub" + "Test_loadSpecFromOpenanolis" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + homepage = "https://github.com/mozillazg/ptcpdump/"; + description = "Process-aware, eBPF-based tcpdump"; + mainProgram = "ptcpdump"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ neilmayhew ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix index 04ab659125ff..292a3d70400d 100644 --- a/pkgs/by-name/pu/pure-prompt/package.nix +++ b/pkgs/by-name/pu/pure-prompt/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-Z4iBLmbQuil2tGpCGdA/uOqL28AAeA/PxtRKLYI3y7I="; + sha256 = "sha256-AZSxP2g6BWoxyiSQH7yzbbbfGcwD8jgnXPPfcYwJUL0="; }; strictDeps = true; diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 5ef7341efa3d..c1bb5db49936 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication { pname = "ranger"; - version = "1.9.3-unstable-2025-11-05"; + version = "1.9.3-unstable-2025-11-14"; format = "setuptools"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "f28690ef42778eb7982e2b309a2cc8d99f682eb4"; - hash = "sha256-ZmUHHFth1jvMsyJ8XWRbLjoJnowRPZivFTim1VLh8hc="; + rev = "08913377c968d39f11fa2d546aa8d53a99bb5e98"; + hash = "sha256-vn1rAOFB2vq04Y/WAE44iH/b/zamAmvq8putUKwNqR8="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index 80dfd50f7186..a0464109488d 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -35,13 +35,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-zKcdI2sMqAp9o4Z/HMnKmu9ajOrhgFm+BgtJArMxfSw="; + hash = "sha256-WG9Dlo7yRt+QZGA5112+BX3HHhjV0XW5nrj7PUORUFE="; fetchSubmodules = true; # darwin/linux hash mismatch in rawler submodule @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-yhx4rb8Fsm7xUQka/zKXP8ObS35o/SFOAXoglqtuQVY="; + cargoHash = "sha256-6oI88cvlCR6TBiAAUka+Q8bkoYyTXvpMDNMfwlPjtIU="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix index 38626a51ebba..b16bbcf2b63f 100644 --- a/pkgs/by-name/ra/rauc/package.nix +++ b/pkgs/by-name/ra/rauc/package.nix @@ -14,7 +14,8 @@ ninja, util-linux, libnl, - systemd, + systemdLibs, + nixosTests, }: stdenv.mkDerivation rec { @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { openssl util-linux libnl - systemd + systemdLibs ]; mesonFlags = [ @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests.rauc = nixosTests.rauc; }; meta = { diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index ae4a0a77b032..6fa1a6ea725e 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -16,23 +16,24 @@ libsoup_3, webkitgtk_6_0, sqlite, + nix-update-script, }: stdenv.mkDerivation rec { pname = "read-it-later"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "read-it-later"; tag = version; - hash = "sha256-ia65XGJonf/327o7L/862tOh04DOM2oXbKq86cCaVp4="; + hash = "sha256-dXDpZ5CXR/+lJUpQ1EpGgzYC6WKE4Y6CKytvCPrsMNk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-mn3Jl5XEHYbCCFjLd8TBqtZKEdevH95IWKdgHwAtXk0="; + hash = "sha256-zC9rb+yUWKozTTc3aBOnpTkhqykhQYemnzPtjjKnOdQ="; }; nativeBuildInputs = [ @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { sqlite ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple Wallabag client with basic features to manage articles"; homepage = "https://gitlab.gnome.org/World/read-it-later"; diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix index 280eec71ba1d..8de3c647cba1 100644 --- a/pkgs/by-name/re/readsb/package.nix +++ b/pkgs/by-name/re/readsb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "readsb"; - version = "3.16.5"; + version = "3.16.6"; src = fetchFromGitHub { owner = "wiedehopf"; repo = "readsb"; tag = "v${finalAttrs.version}"; - hash = "sha256-MYtrCjWuTEM8sYiDWbCL+BJVtdWuItduqEb4LQGiovs="; + hash = "sha256-qVh7igj2tIeKcy2+AEgi8cauKaroc2HsFpL+kPb0oPQ="; }; strictDeps = true; diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix index b40fda40d753..6d8576eb90ed 100644 --- a/pkgs/by-name/re/regolith/package.nix +++ b/pkgs/by-name/re/regolith/package.nix @@ -7,19 +7,19 @@ }: buildGoModule rec { pname = "regolith"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "Bedrock-OSS"; repo = "regolith"; tag = version; - hash = "sha256-ZAOQluoeE6c32ETtikBPoDppk1RpuSVjh9p42fT5W48="; + hash = "sha256-4STEivb2nlIYE6X0vnO8L4UtFrtmaNS+rxtuE0SwKmA="; }; # Requires network access. doCheck = false; - vendorHash = "sha256-+4J4Z7lhbAphi6WUEJN9pzNXf6ROUKqN4NdKI2sQSW0="; + vendorHash = "sha256-EWfc4VzVrg1D012dsPqdXoiGpBjpQRYiWNd0wrWlw34="; ldflags = [ "-X main.buildSource=nix" diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 480fe8ebeb24..8a707bfba15a 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -7,16 +7,16 @@ php82.buildComposerProject2 (finalAttrs: { pname = "robo"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "consolidation"; repo = "robo"; tag = finalAttrs.version; - hash = "sha256-bAT4jHvqWeYcACeyGtBwVBA2Rz+AvkZcUGLDwSf+fLg="; + hash = "sha256-OYuP56KlS9onuYcy9xL0XrH9hqf/njwVUju1pDyRgKM="; }; - vendorHash = "sha256-Rg8WTZUnWA4bemNmE7hxFwfnlMtYyPkeltAQEWJ2VDU="; + vendorHash = "sha256-HGVeoy6duUfRLtx05mlZc3wCOeRTzNXJXxXurZDzZFs="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 109f71454fe2..4fea7834c994 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -14,7 +14,7 @@ vulkan-loader, libpng, libSM, - ffmpeg, + ffmpeg_7, libevdev, libusb1, zlib, @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers vulkan-loader libpng - ffmpeg + ffmpeg_7 libevdev zlib libusb1 diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 1d6be29f3c34..793592af14b9 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; tag = "v${version}"; - hash = "sha256-lyxm1GUFZBsJNsEaY+xiE55fbNAgRSG708GW10UVQ58="; + hash = "sha256-IyAfaCeppmIKrnEb/RxNV3nNYLjlZR28u5HXNbyc8wc="; }; - cargoHash = "sha256-rYfLfhxp29H5dRbnmmpN2/YpT79hhIruvIADNyP/lVs="; + cargoHash = "sha256-wkI38C0ol0q5od+mbmr8JVekLMGEyWT+eQyy9kILyFs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index fa44247c99fa..6f0119bd67e5 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -63,15 +63,15 @@ let ); in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "servo"; - version = "0.0.1-unstable-2025-11-12"; + version = "0.0.2"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "59526928afc81c840f9890eb0a653b16e8128ba6"; - hash = "sha256-BidSQ/c4dST5qJLHZX5Sbcnw7JxfQl/mlI2F6qg0fxw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mhZaAyLznchFUd9f2HqD7th3RDO2inH6U3L5PcZLPFA="; # 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 @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage { ''; }; - cargoHash = "sha256-qVpQ/LK8aAy2MrcuY4Hr3cv6+xh/vtxQZfN8Et3yPik="; + cargoHash = "sha256-jrspfHjJgNAzuCtFqOE7dwgMN02NwVkCOisYAOE8CrU="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) @@ -160,7 +160,7 @@ rustPlatform.buildRustPackage { ''; passthru = { - updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + updateScript = nix-update-script { }; tests = { inherit (nixosTests) servo; }; }; @@ -178,4 +178,4 @@ rustPlatform.buildRustPackage { mainProgram = "servo"; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix index 9c09f83ee06b..7071e28703d2 100644 --- a/pkgs/by-name/sl/slack/sources.nix +++ b/pkgs/by-name/sl/slack/sources.nix @@ -1,26 +1,26 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-10-08 +# Last updated: 2025-11-14 { fetchurl }: { aarch64-darwin = { - version = "4.46.101"; + version = "4.47.59"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.46.101/Slack-4.46.101-macOS.dmg"; - hash = "sha256-rQ3t8Nvwry/YNkMfcEj6z45nfwQKtYDJ2/hJMdPxUaU="; + url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.47.59/Slack-4.47.59-macOS.dmg"; + hash = "sha256-q6rNYr2wCN/a50fCZMxNiM2R7PKC+DBxJ5KJy9Wnb/Y="; }; }; x86_64-darwin = { - version = "4.46.101"; + version = "4.47.59"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.46.101/Slack-4.46.101-macOS.dmg"; - hash = "sha256-fNNgslRmporwMM4059ZSQcJ3WEPg/BwZTl+kZC8/bfQ="; + url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.47.59/Slack-4.47.59-macOS.dmg"; + hash = "sha256-CIESzdXIHeDelIos7ZW9Z2/mnrltk7o92oqS1yM2MnY="; }; }; x86_64-linux = { - version = "4.46.101"; + version = "4.47.59"; src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.46.101/slack-desktop-4.46.101-amd64.deb"; - hash = "sha256-HK8B8aUq6FxYhvffiO/yeKcU0mJ5IgGYYIH3SMFweTU="; + url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.47.59/slack-desktop-4.47.59-amd64.deb"; + hash = "sha256-R+WmtvIw6FLqsskG/hOdEdwZgsCZwWprGhbE7/Xpr1s="; }; }; } diff --git a/pkgs/by-name/sm/smfh/package.nix b/pkgs/by-name/sm/smfh/package.nix index b7dae3aa956d..0ef31c4535b0 100644 --- a/pkgs/by-name/sm/smfh/package.nix +++ b/pkgs/by-name/sm/smfh/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "smfh"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "feel-co"; repo = "smfh"; tag = finalAttrs.version; - hash = "sha256-LxLu578DRp1l3ekybZ+g6zNbvt27rOx7wORP9ch5O2c="; + hash = "sha256-Pjq/Q+W0bapu0EDRlDYQxLjKHA0OHdVn7hWfJumjWdM="; }; - cargoHash = "sha256-DOE0Bs09TRP7fUqzB0mdylFc1vYsRjcz9chrQG79ajg="; + cargoHash = "sha256-ULU2fMVTeHvFM374GwZlHO5/a9bcf8AmwbqvXp1YRAk="; meta = { description = "Sleek Manifest File Handler"; diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix index 629b14eac6e2..5f12c784daa9 100644 --- a/pkgs/by-name/sm/smpmgr/package.nix +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "smpmgr"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "intercreate"; repo = "smpmgr"; tag = version; - hash = "sha256-PhsJa0Z1EnpFyoI6fEN5opG23xB+JTI1uB2sstuOcTw="; + hash = "sha256-ZIIHxQLBwd5OAxFqg0iOrdC7Xu3oZPHSJjdpo2CidAg="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix index 96e717066690..c3b31f2d659a 100644 --- a/pkgs/by-name/sm/smtprelay/package.nix +++ b/pkgs/by-name/sm/smtprelay/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "smtprelay"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "decke"; repo = "smtprelay"; tag = "v${version}"; - hash = "sha256-mlaTZXzbZLdtzDqj8y2e8WjyaNxOPQ1a6YXbPhCxc1c="; + hash = "sha256-8xDyJFSBCHRYVfJ5xDjSHVV3f4nSyW/2DUqQlARS1ns="; }; - vendorHash = "sha256-wr53cIkygsM0+R02PjQAtIPrQDu7vploRTsMOrPBt4o="; + vendorHash = "sha256-LZZubLD+uQz6o0SW0bqbcU/VO7jOhsWB9MrQ0KrebI0="; subPackages = [ "." diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 7c8a750e39b3..64e7e95a8ec5 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "6.9.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-zhVsn5M0RA8JIops07IOBWOvKXI8nthCdedJ3wTr3co="; + hash = "sha256-x35ER65LNw3049JLrRA5SyPjUYh/zXhRJM8FIp9iW60="; }; - vendorHash = "sha256-bpfDnVqJoJi9WhlA6TDWAhBRkbbQn1BHfnLJ8BTmhGM="; + vendorHash = "sha256-rsmgKSmgjtxeNhTrwA7RBtNAa7qyDKhbKSVmfP5AgFg="; subPackages = [ "cmd/src" diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 4078267b82ec..b7cd56b9e5c1 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.31"; + version = "3.16.34"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-9L4jyN+ByqdjpsymZW+W56IV3D1mi63D9hm4bcltlfI="; + hash = "sha256-8bMy/zGjf42QG5c/6v99dZQiLNsUI68+ij4l5RC8L7s="; }; outputs = [ diff --git a/pkgs/by-name/su/subler/package.nix b/pkgs/by-name/su/subler/package.nix new file mode 100644 index 000000000000..b4e3928c6190 --- /dev/null +++ b/pkgs/by-name/su/subler/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nix-update-script, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "subler"; + version = "1.9.1"; + + src = fetchurl { + url = "https://github.com/SublerApp/Subler/releases/download/${finalAttrs.version}/Subler-${finalAttrs.version}.zip"; + hash = "sha256-tYFyBG2G2Am+1HdS+pyOKr9MoAEpaYmITad04CyWL3Y="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -R ./Subler.app $out/Applications + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "MP4 muxer and editor"; + homepage = "https://subler.org/"; + changelog = "https://github.com/SublerApp/Subler/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ delafthi ]; + platforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix index 29ed442b9186..d011d9420503 100644 --- a/pkgs/by-name/su/sunsetr/package.nix +++ b/pkgs/by-name/su/sunsetr/package.nix @@ -6,16 +6,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sunsetr"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "psi4j"; repo = "sunsetr"; tag = "v${finalAttrs.version}"; - hash = "sha256-ds5z/Um7NaewS4f5n2xVpr+EFile6Nz6P6sVW+XcnRo="; + hash = "sha256-fV4yb8+a2AbXkvalL9TU9JmPGX04GNE60a8OnQKNuEU="; }; - cargoHash = "sha256-fbSN52WOIxxISaP90UQ6YGSqPqFqEcUSH88xDkvLGlM="; + cargoHash = "sha256-Cxdy/4lOf7nFoHaDeLekI0o7xT1ZUjV1yyKoGUcjNGs="; + + checkFlags = [ + "--skip=config::tests::test_geo_toml_exists_before_config_creation" + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix index 4afee56add8f..633aeeba301c 100644 --- a/pkgs/by-name/su/sunvox/package.nix +++ b/pkgs/by-name/su/sunvox/package.nix @@ -12,6 +12,8 @@ makeDesktopItem, makeWrapper, SDL2, + fetchurl, + imagemagick, }: let platforms = { @@ -25,6 +27,11 @@ let bindir = platforms."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + icon = fetchurl { + url = "https://warmplace.ru/soft/sunvox/images/icon.png"; + hash = "sha256-ld2GCOhBhMThuUYBNa+2iTdY2HsYBRyApWiHTPuVgKA="; + }; + in stdenv.mkDerivation (finalAttrs: { pname = "sunvox"; @@ -43,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook copyDesktopItems + imagemagick ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper @@ -67,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { desktopName = "SunVox"; genericName = "Modular Synthesizer"; comment = "Modular synthesizer with pattern-based sequencer"; + icon = "sunvox"; categories = [ "AudioVideo" "Audio" @@ -96,6 +105,14 @@ stdenv.mkDerivation (finalAttrs: { # Cleanup, make sure we didn't miss anything find $out/share/sunvox/sunvox -type f -name readme.txt -delete rmdir $out/share/sunvox/sunvox/${bindir} $out/share/sunvox/sunvox + + # Resize & install icons + for size in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + magick ${icon} -resize ''${size}x''${size} \ + $out/share/icons/hicolor/''${size}x''${size}/apps/sunvox.png + done + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix index d7b08a39e6b1..4cd14acdd754 100644 --- a/pkgs/by-name/su/supercronic/package.nix +++ b/pkgs/by-name/su/supercronic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supercronic"; - version = "0.2.38"; + version = "0.2.39"; src = fetchFromGitHub { owner = "aptible"; repo = "supercronic"; rev = "v${version}"; - hash = "sha256-/+jGi1l9q7nlT5uRJVtFk490XuAw8Fi5QOdMnLUTac4="; + hash = "sha256-yAIn5f/ci3oJV55Q8Fd9YrNPI7Cs5yKbnE71Cak9p3I="; }; - vendorHash = "sha256-+fEAlt6KBXfyzfDffde/XmWBXre8w41Q1zr7CfRX9bs="; + vendorHash = "sha256-lIFEF0A2JI96ixLLgbOAnGjxXwm39P4SCbKdsVVxC+0="; excludedPackages = [ "cronexpr/cronexpr" ]; diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index dda3283106dc..ebf716872f09 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -1,5 +1,6 @@ { buildGoModule, + bun, cairo, cargo-tauri, cargo, @@ -17,13 +18,13 @@ openssl, pango, pkg-config, - pnpm_9, rustc, rustPlatform, stdenv, + typescript, webkitgtk_4_1, + writableTmpDirAsHomeHook, }: - let esbuild_21-5 = let @@ -46,31 +47,64 @@ let } ); }; - in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "3.2.4"; + version = "3.6.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; - hash = "sha256-FWNGC0QoEUu1h3e3sfgWmbvqcNNvfWXU7PEjTXxu9Qo="; + hash = "sha256-L2O3iMoNptNgzEy7gXptAaHXhv4J5ED/72GLrH43/kQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; - hash = "sha256-Su9ZOPIskV5poeS8pgtri+sZANBpdgnuCsQqE4WKFdA="; + hash = "sha256-NhgSfiBb4FGEnirpDFWI3MIMElen8frKDFKmCBJlSBY="; }; - pnpmDeps = pnpm_9.fetchDeps { - inherit (finalAttrs) pname version src; - fetcherVersion = 1; - hash = "sha256-oreeV9g16/F7JGLApi0Uq+vTqNhIg7Lg1Z4k00RUOYI="; + node_modules = stdenv.mkDerivation { + inherit (finalAttrs) src version; + pname = "surrealist-node_modules"; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + dontConfigure = true; + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + + bun install --no-progress --frozen-lockfile --no-cache + + runHook postBuild + ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/node_modules + cp -R ./node_modules $out + + runHook postInstall + ''; + outputHash = + { + x86_64-linux = "sha256-mjQ/OfUYUbaBQ2hCAq/+HYjUS7JwrtMvkoA2nflRMSQ="; + aarch64-linux = "sha256-zvL5siDAr6IXMSwP+bPePH1kHS2Tydm4qNIMvtpX+rk="; + } + .${stdenv.hostPlatform.system} + or (throw "${finalAttrs.pname}: Platform ${stdenv.hostPlatform.system} is not packaged yet. Supported platforms: x86_64-linux, aarch64-linux."); + outputHashMode = "recursive"; }; nativeBuildInputs = [ + bun cargo cargo-tauri.hook gobject-introspection @@ -79,9 +113,9 @@ stdenv.mkDerivation (finalAttrs: { moreutils nodejs pkg-config - pnpm_9.configHook rustc rustPlatform.cargoSetupHook + typescript ]; buildInputs = [ @@ -116,12 +150,31 @@ stdenv.mkDerivation (finalAttrs: { --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; + configurePhase = '' + runHook preConfigure + + cp -R ${finalAttrs.node_modules}/node_modules . + + # Bun takes executables from this folder + chmod -R u+rw node_modules + chmod -R u+x node_modules/.bin + patchShebangs node_modules + + export HOME=$TMPDIR + export PATH="$PWD/node_modules/.bin:$PATH" + + runHook postConfigure + ''; + meta = with lib; { description = "Visual management of your SurrealDB database"; homepage = "https://surrealdb.com/surrealist"; license = licenses.mit; mainProgram = "surrealist"; - maintainers = with maintainers; [ frankp ]; + maintainers = with maintainers; [ + frankp + dmitriiStepanidenko + ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix index 086402e40a45..7b0a4bfee8c8 100644 --- a/pkgs/by-name/sw/swaylock-plugin/package.nix +++ b/pkgs/by-name/sw/swaylock-plugin/package.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "swaylock-plugin"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "mstoeckl"; repo = "swaylock-plugin"; rev = "v${finalAttrs.version}"; - hash = "sha256-j2MTmk2hS7yUFo/OMQpYxG03HxxTxpbzbnl6na3jjzY="; + hash = "sha256-UoBLEO7KaYihN/Suw9LjMXeV5sKxCULlJFynvuwwplM="; }; strictDeps = true; diff --git a/pkgs/by-name/sy/systemd-credsubst/package.nix b/pkgs/by-name/sy/systemd-credsubst/package.nix new file mode 100644 index 000000000000..864a5bf9a72a --- /dev/null +++ b/pkgs/by-name/sy/systemd-credsubst/package.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "systemd-credsubst"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "yaxitech"; + repo = "systemd-credsubst"; + tag = "v${version}"; + hash = "sha256-3KbO93OWJuiV8oYLSlqaj0i2x/2GwGxfQ7QwwSrfb1Y="; + }; + cargoHash = "sha256-B2TxFgq/8z0KyL2soFwz/OqFVOVMNP7bamOXg0MuSK8="; + meta = { + description = "envsubst for systemd credentials"; + longDescription = "Substitute systemd credential references from ExecStart=/ExecStartPre= calls"; + homepage = "https://github.com/yaxitech/systemd-credsubst"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + mainProgram = "systemd-credsubst"; + maintainers = [ lib.maintainers.veehaitch ]; + }; +} diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 739aef740e99..3f25ca827c64 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tanka"; rev = "v${version}"; - sha256 = "sha256-UsmeVLCgZeNRoqOYwbwIzWCFtLDgXyojNzA63VvBTc8="; + sha256 = "sha256-966A8ZQAMeO+M97bEmhKzi0FSJCC0EhOrn+4zVvTmbY="; }; - vendorHash = "sha256-jXIDECIW9xnct8bAxsvoMGpdwZuKCLCuCbuTM2dgXik="; + vendorHash = "sha256-IXGs6OozvtLcB+UgnLYdmE/ieWiYLN38Sdj8njcAdbA="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 4a165b103098..28a962fc330b 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.36.3"; + version = "1.36.4"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-aEMvBKDE+fbjXyvi3MkbV1/Bu0q4F7W7DPwTRUcWY8M="; + hash = "sha256-sqFknEDhBR370w7MRHV34mz/j+TNzY2+vNDqouDAiwA="; }; - vendorHash = "sha256-BofW6hvcpQb1OWTbfoS+o2RJg4N0zMqid1ergeVh/wM="; + vendorHash = "sha256-8Dtztt5Z8Wn2ZsDCOJ5NiID6w3/xNXwEy0WnQYNwFg4="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 55a1b4ad9517..ff4cd4e2c344 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -19,16 +19,16 @@ let television = rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.13.5"; + version = "0.13.9"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ="; + hash = "sha256-xKb8XY+k5SbblIQx5tvuNxSjcfdyAAIzgZi4Q9176Qo="; }; - cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E="; + cargoHash = "sha256-peVEGnUqxQLyqdOhkVK5FZiRjqkrYZgvXy9OTXFbk4g="; strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix index 4c7cb47c66a0..a709121cf69b 100644 --- a/pkgs/by-name/te/termimage/package.nix +++ b/pkgs/by-name/te/termimage/package.nix @@ -22,6 +22,8 @@ rustPlatform.buildRustPackage rec { ronn ]; + env.RUSTFLAGS = "-Adangerous_implicit_autorefs"; + postInstall = '' ronn --roff --organization="termimage developers" termimage.md installManPage termimage.1 diff --git a/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch b/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch new file mode 100644 index 000000000000..853db4d5176b --- /dev/null +++ b/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch @@ -0,0 +1,35 @@ +From d5680fd01964755c39c0fd5c128c972d9bd9a044 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Tue, 28 Oct 2025 16:57:58 +0800 +Subject: [PATCH 1/2] nix: read timestamp from SOURCE_DATE_EPOCH + +--- + timestamp/src/lib.rs | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/timestamp/src/lib.rs b/timestamp/src/lib.rs +index 142abf3..3935272 100644 +--- a/timestamp/src/lib.rs ++++ b/timestamp/src/lib.rs +@@ -1,15 +1,11 @@ + extern crate proc_macro; + use proc_macro::TokenStream; +-use std::time::{SystemTime, UNIX_EPOCH}; + + #[proc_macro] + pub fn compile_time(_: TokenStream) -> TokenStream { + lazy_static::lazy_static! { +- static ref TIMESTAMP: u128 = SystemTime::now() +- .duration_since(UNIX_EPOCH) +- .unwrap() +- .as_millis(); ++ static ref TIMESTAMP: u128 = std::fs::read_to_string("SOURCE_DATE_EPOCH").ok().and_then(|s| s.trim().parse().ok()).unwrap_or(0); + } + + return format!("({}u128)", *TIMESTAMP).parse().unwrap(); +-} +\ No newline at end of file ++} +-- +2.51.0 + diff --git a/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch b/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch new file mode 100644 index 000000000000..6b95c3f6d2cd --- /dev/null +++ b/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch @@ -0,0 +1,80 @@ +From 8c8ef3bcdbebb11999a6a229de2d537c9a0110a9 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Tue, 28 Oct 2025 17:01:29 +0800 +Subject: [PATCH 2/2] nix: use easytier from nix input + +--- + build.rs | 3 ++- + src/easytier.rs | 31 +++---------------------------- + 2 files changed, 5 insertions(+), 29 deletions(-) + +diff --git a/build.rs b/build.rs +index dc6e117..df454d9 100644 +--- a/build.rs ++++ b/build.rs +@@ -12,7 +12,8 @@ fn main() { + println!("cargo::rerun-if-changed=Cargo.toml"); + + println!("cargo::rerun-if-changed=.easytier"); +- download_easytier(); ++ // Use easytier from nix ++ // download_easytier(); + + sevenz_rust2::compress_to_path( + "web", +diff --git a/src/easytier.rs b/src/easytier.rs +index c657a08..38e6abd 100644 +--- a/src/easytier.rs ++++ b/src/easytier.rs +@@ -14,12 +14,6 @@ use std::{ + time::Duration, + }; + +-static EASYTIER_ARCHIVE: (&str, &str, &[u8]) = ( +- include_str!(env!("TERRACOTTA_ET_ENTRY_CONF")), +- include_str!(env!("TERRACOTTA_ET_CLI_CONF")), +- include_bytes!(env!("TERRACOTTA_ET_ARCHIVE")), +-); +- + lazy_static::lazy_static! { + pub static ref FACTORY: EasytierFactory = create(); + } +@@ -36,32 +30,13 @@ pub struct Easytier { + } + + fn create() -> EasytierFactory { +- let _ = fs::create_dir_all(&*EASYTIER_DIR); +- + logging!( + "Easytier", +- "Releasing easytier to {}", +- &*EASYTIER_DIR.to_string_lossy() ++ "Using path @TERRACOTTA_ET_PATH@ (Nix)." + ); + +- sevenz_rust2::decompress(Cursor::new(EASYTIER_ARCHIVE.2.to_vec()), &*EASYTIER_DIR) +- .map_err(|e| Error::other(e.to_string())) +- .unwrap(); +- +- let exe: PathBuf = Path::join(&EASYTIER_DIR, EASYTIER_ARCHIVE.0); +- let cli: PathBuf = Path::join(&EASYTIER_DIR, EASYTIER_ARCHIVE.1); +- #[cfg(target_family = "unix")] +- { +- use std::os::unix::fs::PermissionsExt; +- +- let mut permissions = fs::metadata(exe.clone()).unwrap().permissions(); +- permissions.set_mode(permissions.mode() | 0o100); +- fs::set_permissions(exe.clone(), permissions).unwrap(); +- +- let mut permissions = fs::metadata(cli.clone()).unwrap().permissions(); +- permissions.set_mode(permissions.mode() | 0o100); +- fs::set_permissions(cli.clone(), permissions).unwrap(); +- } ++ let exe: PathBuf = PathBuf::from("@TERRACOTTA_ET_EXE@"); ++ let cli: PathBuf = PathBuf::from("@TERRACOTTA_ET_CLI@"); + EasytierFactory { exe, cli } + } + +-- +2.51.0 + diff --git a/pkgs/by-name/te/terracotta/Cargo.lock b/pkgs/by-name/te/terracotta/Cargo.lock new file mode 100644 index 000000000000..b318ad3409ef --- /dev/null +++ b/pkgs/by-name/te/terracotta/Cargo.lock @@ -0,0 +1,3589 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[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 = "arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "ascii" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" + +[[package]] +name = "async-compression" +version = "0.4.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" +dependencies = [ + "compression-codecs", + "compression-core", + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "binascii" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" + +[[package]] +name = "bitflags" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" +dependencies = [ + "objc2", +] + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytemuck" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "bzip2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" +dependencies = [ + "libbz2-rs-sys", +] + +[[package]] +name = "cc" +version = "1.2.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +dependencies = [ + "find-msvc-tools", + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "num-traits", + "windows-link 0.2.1", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "compression-codecs" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" +dependencies = [ + "compression-core", + "flate2", + "zstd", + "zstd-safe", +] + +[[package]] +name = "compression-core" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[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 = "deflate64" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" + +[[package]] +name = "deranged" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "devise" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d90b0c4c777a2cad215e3c7be59ac7c15adf45cf76317009b7d096d46f651d" +dependencies = [ + "devise_codegen", + "devise_core", +] + +[[package]] +name = "devise_codegen" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71b28680d8be17a570a2334922518be6adc3f58ecc880cbb404eaeb8624fd867" +dependencies = [ + "devise_core", + "quote", +] + +[[package]] +name = "devise_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b035a542cf7abf01f2e3c4d5a7acbaebfefe120ae4efc7bde3df98186e4b8af7" +dependencies = [ + "bitflags", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", +] + +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic 0.6.1", + "pear", + "serde", + "toml 0.8.23", + "uncased", + "version_check", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +dependencies = [ + "crc32fast", + "libz-rs-sys", + "miniz_oxide", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "formatx" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8866fac38f53fc87fa3ae1b09ddd723e0482f8fa74323518b4c59df2c55a00a" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + +[[package]] +name = "generic-array" +version = "0.14.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasip2", + "wasm-bindgen", +] + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "h2" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.3.1", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.3.1", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "h2", + "http 1.3.1", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http 1.3.1", + "hyper 1.7.0", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "hyper 1.7.0", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2 0.6.1", + "system-configuration", + "tokio", + "tower-service", + "tracing", + "windows-registry", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +dependencies = [ + "equivalent", + "hashbrown", + "serde", + "serde_core", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-terminal" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libbz2-rs-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" + +[[package]] +name = "libc" +version = "0.2.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" + +[[package]] +name = "liblzma" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73c36d08cad03a3fbe2c4e7bb3a9e84c57e4ee4135ed0b065cade3d98480c648" +dependencies = [ + "liblzma-sys", +] + +[[package]] +name = "liblzma-sys" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "libredox" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "libz-rs-sys" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" +dependencies = [ + "zlib-rs", +] + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "local-ip-address" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "656b3b27f8893f7bbf9485148ff9a65f019e3f33bd5cdc87c83cab16b3fd9ec8" +dependencies = [ + "libc", + "neli", + "thiserror", + "windows-sys 0.59.0", +] + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + +[[package]] +name = "lzma-rust2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60b8ad6122c05a4d5e23db8eab1ced778e252b3e29c5e96b4a965fc72476277" + +[[package]] +name = "matchers" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", +] + +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 1.3.1", + "httparse", + "memchr", + "mime", + "spin", + "tokio", + "tokio-util", + "version_check", +] + +[[package]] +name = "native-dialog" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b63bf0e60ee0eca886b5df70269240b6197b6ee46ec37da9a7d28d8e8e24" +dependencies = [ + "ascii", + "block2", + "dirs", + "dispatch2", + "formatx", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation", + "raw-window-handle", + "thiserror", + "versions", + "wfd", + "which", + "winapi", +] + +[[package]] +name = "neli" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93062a0dce6da2517ea35f301dfc88184ce18d3601ec786a727a87bf535deca9" +dependencies = [ + "byteorder", + "libc", + "log", + "neli-proc-macros", +] + +[[package]] +name = "neli-proc-macros" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8034b7fbb6f9455b2a96c19e6edf8dc9fc34c70449938d8ee3b4df363f61fe" +dependencies = [ + "either", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", +] + +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + +[[package]] +name = "nu-ansi-term" +version = "0.50.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "objc2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" +dependencies = [ + "bitflags", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" +dependencies = [ + "bitflags", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags", + "dispatch2", + "objc2", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" +dependencies = [ + "bitflags", + "dispatch2", + "objc2", + "objc2-core-foundation", + "objc2-io-surface", +] + +[[package]] +name = "objc2-core-image" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-text" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", +] + +[[package]] +name = "objc2-core-video" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-io-surface", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-javascript-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" +dependencies = [ + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-security" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-web-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "objc2-javascript-core", + "objc2-security", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "open" +version = "5.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link 0.2.1", +] + +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppmd-rust" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c834641d8ad1b348c9ee86dec3b9840d805acd5f24daa5f90c788951a52ff59b" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", + "version_check", + "yansi", +] + +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2 0.6.1", + "thiserror", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash", + "rustls", + "rustls-pki-types", + "slab", + "thiserror", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.1", + "tracing", + "windows-sys 0.60.2", +] + +[[package]] +name = "quote" +version = "1.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "reqwest" +version = "0.12.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +dependencies = [ + "async-compression", + "base64", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "mime", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.16", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rocket" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a516907296a31df7dc04310e7043b61d71954d703b603cc6867a026d7e72d73f" +dependencies = [ + "async-stream", + "async-trait", + "atomic 0.5.3", + "binascii", + "bytes", + "either", + "figment", + "futures", + "indexmap", + "log", + "memchr", + "multer", + "num_cpus", + "parking_lot", + "pin-project-lite", + "rand 0.8.5", + "ref-cast", + "rocket_codegen", + "rocket_http", + "serde", + "serde_json", + "state", + "tempfile", + "time", + "tokio", + "tokio-stream", + "tokio-util", + "ubyte", + "version_check", + "yansi", +] + +[[package]] +name = "rocket_codegen" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46" +dependencies = [ + "devise", + "glob", + "indexmap", + "proc-macro2", + "quote", + "rocket_http", + "syn 2.0.108", + "unicode-xid", + "version_check", +] + +[[package]] +name = "rocket_http" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e274915a20ee3065f611c044bd63c40757396b6dbc057d6046aec27f14f882b9" +dependencies = [ + "cookie", + "either", + "futures", + "http 0.2.12", + "hyper 0.14.32", + "indexmap", + "log", + "memchr", + "pear", + "percent-encoding", + "pin-project-lite", + "ref-cast", + "serde", + "smallvec", + "stable-pattern", + "state", + "time", + "tokio", + "uncased", +] + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls" +version = "0.23.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "serde_json" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +dependencies = [ + "serde_core", +] + +[[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 = "sevenz-rust2" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f3cc2b52a3f98e75e6a1884e40fc986bf5f1966274aec869a4e6a0a5f72292" +dependencies = [ + "byteorder", + "crc32fast", + "js-sys", + "lzma-rust2", + "wasm-bindgen", +] + +[[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 = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "socket2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stable-pattern" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" +dependencies = [ + "memchr", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "state" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" +dependencies = [ + "loom", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix", + "windows-sys 0.61.2", +] + +[[package]] +name = "terracotta" +version = "0.0.0-snapshot" +dependencies = [ + "cfg-if", + "chrono", + "hex", + "lazy_static", + "libc", + "local-ip-address", + "native-dialog", + "num-bigint", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-web-kit", + "open", + "parking_lot", + "rand_chacha 0.9.0", + "rand_core 0.9.3", + "reqwest", + "rocket", + "serde", + "serde_json", + "sevenz-rust2", + "socket2 0.6.1", + "timestamp", + "toml 0.9.8", + "winapi", + "winresource", + "zip", +] + +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "thread_local" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "time" +version = "0.3.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "timestamp" +version = "0.0.0" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.6.1", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-macros" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", + "toml_edit", +] + +[[package]] +name = "toml" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +dependencies = [ + "indexmap", + "serde_core", + "serde_spanned 1.0.3", + "toml_datetime 0.7.3", + "toml_parser", + "toml_writer", + "winnow", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", + "toml_write", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + +[[package]] +name = "toml_writer" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tracing-core" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex-automata", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "ubyte" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea" +dependencies = [ + "serde", +] + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "serde", + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "versions" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80a7e511ce1795821207a837b7b1c8d8aca0c648810966ad200446ae58f6667f" +dependencies = [ + "itertools", + "nom", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.108", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "wfd" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c17bbfb155305bcb79144f568c3b796275ba4db5d5856597bc85acefe29b819" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "which" +version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" +dependencies = [ + "either", + "env_home", + "rustix", + "winsafe", +] + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-registry" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +dependencies = [ + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +dependencies = [ + "memchr", +] + +[[package]] +name = "winresource" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f882b1d5b5ab0c26bdd08afa85da4b829a982772088d1da911698e08976daf9b" +dependencies = [ + "toml 0.9.8", + "version_check", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +dependencies = [ + "is-terminal", +] + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "zip" +version = "4.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "deflate64", + "flate2", + "getrandom 0.3.4", + "hmac", + "indexmap", + "liblzma", + "memchr", + "pbkdf2", + "ppmd-rust", + "sha1", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zlib-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" + +[[package]] +name = "zopfli" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" +dependencies = [ + "bumpalo", + "crc32fast", + "log", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/te/terracotta/package.nix b/pkgs/by-name/te/terracotta/package.nix new file mode 100644 index 000000000000..69400580d8f3 --- /dev/null +++ b/pkgs/by-name/te/terracotta/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + easytier, + replaceVars, + imagemagick, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "terracotta"; + version = "0.3.13"; + + src = fetchFromGitHub { + owner = "burningtnt"; + repo = "Terracotta"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2Ghn/f0EaWOLhabxY7WBEesB/28fojreXs1ve1PvpdM="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + echo $(git log -1 --pretty=%ct)"000" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + patches = [ + # For reproducibility + ./0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch + # Use easytier from inputs instead + (replaceVars ./0002-nix-use-easytier-from-nix-input.patch { + TERRACOTTA_ET_PATH = easytier; + TERRACOTTA_ET_EXE = "${easytier}/bin/easytier-core"; + TERRACOTTA_ET_CLI = "${easytier}/bin/easytier-cli"; + }) + ]; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + daemon_plist="$out/Library/LaunchAgents/org.nixos.terracotta.daemon.plist" + substituteInPlace src/main.rs \ + --replace-fail '/Library/LaunchAgents/net.burningtnt.terracotta.daemon.plist' "$daemon_plist" + ''; + + nativeBuildInputs = [ imagemagick ]; + + cargoLock.lockFile = ./Cargo.lock; + + env = { + # terracotta depends on nightly features + RUSTC_BOOTSTRAP = 1; + TERRACOTTA_ET_VERSION = "v${easytier.version}"; + TERRACOTTA_VERSION = finalAttrs.version; + }; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm0644 build/linux/terracotta.desktop -t $out/share/applications + + for n in 16 32 48 64 96 128 256 + do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + magick build/linux/icon.png -resize $size $out/share/icons/hicolor/$size/apps/terracotta.png + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Library/LaunchAgents,Applications} + + cp -r build/macos/terracotta.app $out/Applications/ + ln -sr $out/bin/terracotta $out/Applications/terracotta.app/Contents/MacOS/terracotta + + cat > "$daemon_plist" < { Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`); -@@ -883,7 +883,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ +@@ -879,7 +879,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ ); ctx.CtrlExe.Execute( @@ -44,20 +33,4 @@ index e0dd1a2..9dcb87a 100644 false, success => { Lib.TalkativeLog(`-^-CALLBACK async S= ${success}`); -diff --git i/utilaudio.js w/utilaudio.js -index b07e181..ed7d3ba 100644 ---- i/utilaudio.js -+++ w/utilaudio.js -@@ -14,10 +14,8 @@ - - import GObject from 'gi://GObject'; - import GIRepository from 'gi://GIRepository'; --GIRepository.Repository.prepend_search_path('/usr/lib/gnome-shell'); --GIRepository.Repository.prepend_library_path('/usr/lib/gnome-shell'); --GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); --GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); -+GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell'); -+GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell'); - import Gvc from 'gi://Gvc'; - - import * as Lib from './convenience.js'; + diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix index 250838d7edf8..ed051ec3bb0e 100644 --- a/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/pkgs/desktops/gnome/extensions/argos/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "argos"; - version = "unstable-2025-03-27"; + version = "unstable-2025-09-25"; src = fetchFromGitHub { owner = "p-e-w"; repo = "argos"; - rev = "13264042ae8b8a6f9f4778c623780e38e5d1cd89"; - hash = "sha256-PMMpTaihMHj1FmnjJoZqAhDYVd263M1OZAC+OAnaZEg="; + rev = "c0dc23880e52a2f78b7a5c35b5b3781d5b1366f7"; + hash = "sha256-A/ugbKxnUJdoMN724ECtRm0QWwCVopmbltt+fUKBp7E="; }; installPhase = '' diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 8e8cd09c72c7..86fc4a91b1c2 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "elixir-ls"; - version = "0.29.3"; + version = "0.30.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-ikx0adlDrkUpMXPEbPtIsb2/1wcOt1jLwciVdBEKnss="; + hash = "sha256-GtkFuof60cOTlHuhcwCnIVtGx6KlHrcazTa/UjAIGAQ="; }; patches = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/elixir-lsp/elixir-ls"; + changelog = "https://github.com/elixir-lsp/elixir-ls/releases/tag/v${version}"; description = '' A frontend-independent IDE "smartness" server for Elixir. Implements the "Language Server Protocol" standard and provides debugger support via the "Debug Adapter Protocol" diff --git a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch index 1e370ef0233e..59f12bbccbf7 100644 --- a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch +++ b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch @@ -1,5 +1,5 @@ diff --git c/scripts/launch.sh w/scripts/launch.sh -index d9c33952..8bc5c382 100755 +index 524f2294..bbea062d 100755 --- c/scripts/launch.sh +++ w/scripts/launch.sh @@ -1,114 +1,4 @@ @@ -118,7 +118,7 @@ index d9c33952..8bc5c382 100755 # In case that people want to tweak the path, which Elixir to use, or # whatever prior to launching the language server or the debug adapter, we -@@ -127,29 +17,22 @@ fi +@@ -127,12 +17,8 @@ fi # script so we can correctly configure the Erlang library path to # include the local .ez files, and then do what we were asked to do. @@ -131,6 +131,9 @@ index d9c33952..8bc5c382 100755 +SCRIPT=$(readlink -f "$0") +SCRIPTPATH=$(dirname "$SCRIPT")/../scripts + # Unset MIX_OS_DEPS_COMPILE_PARTITION_COUNT as it pollutes stdout + # breaking LSP protocol. See https://github.com/elixir-lsp/elixir-ls/issues/1195 +@@ -141,19 +27,16 @@ unset MIX_OS_DEPS_COMPILE_PARTITION_COUNT export MIX_ENV=prod # Mix.install prints to stdout and reads from stdin # we need to make sure it doesn't interfere with LSP/DAP diff --git a/pkgs/development/compilers/elm/packages/elm-graphql/update.sh b/pkgs/development/compilers/elm/packages/elm-graphql/update.sh index 0829cdfec07b..fa4796a52eaa 100755 --- a/pkgs/development/compilers/elm/packages/elm-graphql/update.sh +++ b/pkgs/development/compilers/elm/packages/elm-graphql/update.sh @@ -6,7 +6,7 @@ set -eu -o pipefail PACKAGE_DIR=$(realpath "$(dirname "$0")") # Update version, src and npm deps -nix-update "$UPDATE_NIX_ATTR_PATH" +nix-update "$UPDATE_NIX_ATTR_PATH" --version-regex "v(.*)" # Update elm deps cp "$(nix-build -A "$UPDATE_NIX_ATTR_PATH".src)/generator/elm.json" elm.json diff --git a/pkgs/development/compilers/elm/packages/elm-optimize-level-2/default.nix b/pkgs/development/compilers/elm/packages/elm-optimize-level-2/default.nix index f72119f41d9a..dcc5777d4127 100644 --- a/pkgs/development/compilers/elm/packages/elm-optimize-level-2/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-optimize-level-2/default.nix @@ -7,7 +7,7 @@ buildNpmPackage (finalAttrs: { pname = "elm-optimize-level-2"; - version = "0.3.5-unstable-2022-04-05"; + version = "0.3.4-unstable-2022-04-05"; src = fetchFromGitHub { owner = "mdgriffith"; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 350554481e95..87a1f460923e 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -27,9 +27,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY="; "22.0.0-git".gitRelease = { - rev = "f734cebc396bfb0a3523d205071764f689432ab4"; - rev-version = "22.0.0-unstable-2025-11-09"; - sha256 = "sha256-YMLjygfO/r5wP/pI+XBfIGgpGo6c7HOl0IV8uJbDSFI="; + rev = "99630eb1bf752d93f31aae8f90bd3772a0566ad5"; + rev-version = "22.0.0-unstable-2025-11-16"; + sha256 = "sha256-jNxmoarX9ZMUpjJM8XFAC9dIguK5BZiDc1SNpQahYmw="; }; } // llvmVersions; diff --git a/pkgs/development/libraries/maplibre-native-qt/default.nix b/pkgs/development/libraries/maplibre-native-qt/default.nix index 89230500a68f..3784356e6a2a 100644 --- a/pkgs/development/libraries/maplibre-native-qt/default.nix +++ b/pkgs/development/libraries/maplibre-native-qt/default.nix @@ -18,10 +18,22 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + postPatch = lib.optionals (lib.versionAtLeast qtlocation.version "6.10") '' + # fix build with Qt 6.10 + # included in https://github.com/maplibre/maplibre-native-qt/pull/216 + substituteInPlace CMakeLists.txt \ + --replace-fail 'find_package(Qt''${QT_VERSION_MAJOR} COMPONENTS Location REQUIRED)' \ + 'find_package(Qt''${QT_VERSION_MAJOR} COMPONENTS Location LocationPrivate REQUIRED)' + ''; + nativeBuildInputs = [ cmake ]; + env.CXXFLAGS = toString [ + "-DQT_NO_USE_NODISCARD_FILE_OPEN" + ]; + buildInputs = [ qtlocation ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4320ea6d6360..59e68c60de96 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -340,6 +340,7 @@ stdenv.mkDerivation { moveToOutput bin/panfrost_compile $cross_tools moveToOutput bin/panfrost_texfeatures $cross_tools moveToOutput bin/panfrostdump $cross_tools + moveToOutput bin/pco_clc $cross_tools moveToOutput bin/vtn_bindgen2 $cross_tools moveToOutput "lib/lib*OpenCL*" $opencl diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 2653d33a944c..3e3bb16f84a6 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "25.8.2"; + version = "25.11.0"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-compat"; tag = "v${version}"; - hash = "sha256-g3iSSj42QB0kr0yTIfUVR9q2NCu/peQTRStlUjKKkl8="; + hash = "sha256-UzrZOUWKeU/4tnc7o5JQqNKsFcLhCKVwXT+2hZXXcbw="; }; build-system = [ diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 791596ce4a34..56581c0981b8 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -1,18 +1,19 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, + stdenv, spglib, numpy, scipy, matplotlib, ase, netcdf4, - pythonOlder, cython, cmake, setuptools, setuptools-scm, + pytestCheckHook, }: buildPythonPackage rec { @@ -26,12 +27,11 @@ buildPythonPackage rec { setuptools-scm ]; - disabled = pythonOlder "3.5"; - - src = fetchPypi { - pname = "boltztrap2"; - inherit version; - hash = "sha256-JUIGh/6AF+xYLmF3QN47/A5E9zPKdhO2lhn97giZJ48="; + src = fetchFromGitLab { + owner = "sousaw"; + repo = "BoltzTraP2"; + tag = "v${version}"; + hash = "sha256-eocstudmgMkuxa94txU8uqIp8HpNEuWQys7WvRRZ4as="; }; postPatch = '' @@ -57,11 +57,29 @@ buildPythonPackage rec { netcdf4 ]; - # pypi release does no include files for tests - doCheck = false; - pythonImportsCheck = [ "BoltzTraP2" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + preInstallCheck = '' + tar xf data.tar.xz + rm -rf BoltzTraP2 + ''; + + pytestFlags = [ "tests" ]; + + disabledTests = lib.optionals (stdenv.system != "x86_64-linux") [ + # Tests np.load numpy arrays from disk that were, apparently, saved on + # x86_64-linux. Then these files are used to compare results of + # calculations, which won't work as expected if running on a different + # platform. + "test_DOS_Si" + "test_BTPDOS_Si" + "test_calc_cv_Si" + "test_fermiintegrals_Si" + "test_fitde3D_saved_noder" + ]; + meta = with lib; { description = "Band-structure interpolator and transport coefficient calculator"; mainProgram = "btp2"; diff --git a/pkgs/development/python-modules/coq-tools/default.nix b/pkgs/development/python-modules/coq-tools/default.nix index b4e1edbfedb0..07a05d2a02d9 100644 --- a/pkgs/development/python-modules/coq-tools/default.nix +++ b/pkgs/development/python-modules/coq-tools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coq-tools"; - version = "0.0.36"; + version = "0.0.39"; pyproject = true; src = fetchPypi { pname = "coq_tools"; inherit version; - hash = "sha256-lZ469FZ19Cy+LdC4ymU4wVWe7ZtPSbYlgmym/ouQSwk="; + hash = "sha256-MPgu5inr2CMOU3qlF9v8QtqhkPuP/uIQrJYyfmpZBxE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 808a83238c36..905555ff465f 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -3,8 +3,6 @@ buildPythonPackage, fetchPypi, hypothesis, - pythonOlder, - mock, nose2, pytestCheckHook, setuptools, @@ -13,31 +11,28 @@ buildPythonPackage rec { pname = "dpath"; version = "2.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-NPfmMNxV6j8hnlVXJvXaS0sl8iADGcjmkCw5Qljdaj4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ hypothesis - mock nose2 pytestCheckHook ]; pythonImportsCheck = [ "dpath" ]; - meta = with lib; { + meta = { description = "Python library for accessing and searching dictionaries via /slashed/paths ala xpath"; homepage = "https://github.com/akesterson/dpath-python"; changelog = "https://github.com/dpath-maintainers/dpath-python/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ mmlb ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mmlb ]; }; } diff --git a/pkgs/development/python-modules/fenics-basix/default.nix b/pkgs/development/python-modules/fenics-basix/default.nix index 35d8b3b3d3c7..f2372f56ce16 100644 --- a/pkgs/development/python-modules/fenics-basix/default.nix +++ b/pkgs/development/python-modules/fenics-basix/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fenics-basix"; - version = "0.10.0"; + version = "0.10.0.post0"; pyproject = true; src = fetchFromGitHub { owner = "fenics"; repo = "basix"; tag = "v${version}"; - hash = "sha256-atrfIMyLY9EAyw6eiVaC/boG2/a8PCrrv/7J0ntHgSo="; + hash = "sha256-iKG6Cs28D0scPEIRKoGk/CgquKzGZvIjf4UIj4MQXHA="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 167398c0c2cf..9524059c7784 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -3,30 +3,28 @@ stdenv, buildPythonPackage, fetchFromGitHub, - setuptools, + uv-build, tqdm, pytest-asyncio, pytestCheckHook, - pythonOlder, ffmpeg, procps, + versionCheckHook, }: buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "1.0.2"; + version = "1.0.5"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "slhck"; repo = "ffmpeg-progress-yield"; tag = "v${version}"; - hash = "sha256-tX4CioyhZvHNe5PItNwCF68ZQhs4fpG1ZrloGtei07I="; + hash = "sha256-L3q0Tyh0e1qBV13NRlFxjS/39uKfJWVeN/AGXH+Jss8="; }; - build-system = [ setuptools ]; + build-system = [ uv-build ]; dependencies = [ tqdm @@ -39,8 +37,6 @@ buildPythonPackage rec { procps ]; - enabledTestPaths = [ "test/test.py" ]; - disabledTests = lib.optional stdenv.hostPlatform.isDarwin [ # cannot access /usr/bin/pgrep from the sandbox "test_context_manager" @@ -53,12 +49,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "ffmpeg_progress_yield" ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { description = "Run an ffmpeg command with progress"; mainProgram = "ffmpeg-progress-yield"; homepage = "https://github.com/slhck/ffmpeg-progress-yield"; - changelog = "https://github.com/slhck/ffmpeg-progress-yield/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ prusnak ]; + changelog = "https://github.com/slhck/ffmpeg-progress-yield/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ prusnak ]; }; } diff --git a/pkgs/development/python-modules/firebase-admin/default.nix b/pkgs/development/python-modules/firebase-admin/default.nix index 65e61d7321e0..b1f982a0ec4a 100644 --- a/pkgs/development/python-modules/firebase-admin/default.nix +++ b/pkgs/development/python-modules/firebase-admin/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, cachecontrol, cryptography, @@ -33,6 +34,14 @@ buildPythonPackage rec { build-system = [ setuptools ]; + patches = [ + (fetchpatch { + name = "remove-asyncio-default-fixture-loop-scope.patch"; + url = "https://github.com/firebase/firebase-admin-python/commit/de713d21da83b1f50c24c5a23132ffc442700448.patch"; + hash = "sha256-D4edbVHMejpnSmIYblrq9E5+YdbBzLe/VWbObvMNGdk="; + }) + ]; + dependencies = [ cachecontrol cryptography diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 335fdf391ac7..fa2b082e5a93 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.12.3"; + version = "6.12.4"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; tag = "v${version}"; - hash = "sha256-bcljg9PZXvUk6KQJKKotzifvKYQaS6AKRYkMseX2mx0="; + hash = "sha256-kT2FpfqDb5q3eJJ1K1zpaeR0dSUrXlFvYTeCpAQNdAo="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index cf24c6278821..4bad96cb92eb 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "highdicom"; - version = "0.26.1"; + version = "0.27.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "MGHComputationalPathology"; repo = "highdicom"; tag = "v${version}"; - hash = "sha256-zaa0daGMQHktYkG56JA2a7s5UZSv8AbinO5roe9rWQc="; + hash = "sha256-Tfy7u5MVapRE24CZLFzTnYChnH9JJ9V7FuUhDoktBFc="; }; build-system = [ diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 87450865bcc8..42e9375c1d86 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511161"; + version = "0.1.202511171"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-50RiHTnMAZyd2Adl0s2vAr+qgcObKJiIbm8u1Bjzeh8="; + hash = "sha256-kmGW7RmAvz1+ay8rKv3xpVhsFc/tZ7WZznTjtYQ+TTw="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 5599c11f105b..c2d1f255d764 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "keboola"; repo = "sapi-python-client"; tag = version; - hash = "sha256-VNIi7YYtgPSpulY7W+fNrlVxDMgbo4Urxp8adLqESn8="; + hash = "sha256-FlafM42CVlYtJGFToLIjg0RKhwJ0/oVvGd3T8PNwhOI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 4f1300cf8d05..3c556c1293be 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.7.3"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; repo = "LibreTranslate"; tag = "v${version}"; - hash = "sha256-eX/CZlHqUkarrilE4UoTMF8U/b7hn6F3nMxYnDPQ238="; + hash = "sha256-Hes5ZDzqbulUxEhuBCcwuOmNDClY8xyzeXbj1FaVvd0="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 3287ac61d725..90a8f4399ecf 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.18.2"; + version = "1.19.0"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; tag = version; - hash = "sha256-BdUNj7EJAbOs8Ff+IGbd7be+lRG6MQCIgNAi5oH9OgA="; + hash = "sha256-B+DFezICqYdfGfK90rsnetRt0dI1v6XEsuDL9Xd2QTc="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 9daa9fd2ee5f..2d0e7f930217 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "4.7.1"; + version = "4.8.0"; pyproject = true; outputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-IzSKppxsxsHtDo8D+0KxVlGe2M/NFD54PvXB3YAK2fE="; + hash = "sha256-TcA44cF9iTAF86ColRRWr9nRSPP2XUSPlK3M6yeNfzE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index d63cb655fa12..2faf7e27005a 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "10.0.0"; + version = "10.1.0"; pyproject = true; src = fetchPypi { pname = "oslo_config"; inherit version; - hash = "sha256-Mz5nXbjGvncVs97PeMOYyhE4Q5IlqidGMuiTFIN/bqM="; + hash = "sha256-k6aPm9UiQhmLQEuweyuB9kQAgESkiC6xtQQkF7mBmzY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index 9a306cd53a50..a7d3e071b608 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.6.0"; + version = "6.7.0"; pyproject = true; src = fetchPypi { pname = "oslo_i18n"; inherit version; - hash = "sha256-u1477O+i5ASIsln52xLMWtiU3TCbW1rKVjgv8ZDBj14="; + hash = "sha256-0m1SlXtFCgSuD6Xjl4p+TF6gXTcC+2Hv2CqoCcpVx8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 1c5ad412a46b..09b018e94673 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslotest"; - version = "5.0.1"; + version = "6.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WpRA0o2MywC89f56BWkEF+pilDsMjpOkMX2LG9Au6O4="; + hash = "sha256-CHBKOnoEtZtQAu5YTFPKlYn0VU/hAA5nbs4wwZVHgj4="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix index bbadd55d3afe..72c662c2680f 100644 --- a/pkgs/development/python-modules/persist-queue/default.nix +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -1,48 +1,58 @@ { lib, + aiofiles, + aiosqlite, buildPythonPackage, - fetchPypi, - pythonOlder, - nose2, - msgpack, cbor2, + dbutils, + fetchFromGitHub, + msgpack, + pymysql, + pytest-asyncio, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "persist-queue"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; + src = fetchFromGitHub { + owner = "peter-wangxu"; + repo = "persist-queue"; + tag = "v${version}"; + hash = "sha256-8LtXTpwAk71sjxvZudwk+4P4ohlWC0zagr5F8PTkTwk="; }; - disabled = pythonOlder "3.6"; + build-system = [ setuptools ]; + + optional-dependencies = { + async = [ + aiofiles + aiosqlite + ]; + extra = [ + cbor2 + dbutils + msgpack + pymysql + ]; + }; nativeCheckInputs = [ - nose2 - msgpack - cbor2 - ]; - - checkPhase = '' - runHook preCheck - - # Don't run MySQL tests, as they require a MySQL server running - rm persistqueue/tests/test_mysqlqueue.py - - nose2 - - runHook postCheck - ''; + pytest-asyncio + pytestCheckHook + ] + ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "persistqueue" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/peter-wangxu/persist-queue/releases/tag/${src.tag}"; description = "Thread-safe disk based persistent queue in Python"; homepage = "https://github.com/peter-wangxu/persist-queue"; - license = licenses.bsd3; - maintainers = with maintainers; [ huantian ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ huantian ]; }; } diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix index 3e0d3b275268..954c2702b18b 100644 --- a/pkgs/development/python-modules/polyfactory/default.nix +++ b/pkgs/development/python-modules/polyfactory/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "polyfactory"; - version = "2.22.3"; + version = "2.22.4"; pyproject = true; src = fetchFromGitHub { owner = "litestar-org"; repo = "polyfactory"; tag = "v${version}"; - hash = "sha256-/LHGUQsYwEPBHWSyzaX0gUrqNm2cvWGraxMhWWvMkBc="; + hash = "sha256-yX71aWRubQ4kjYmhNIKLHG+F+oLh6OHN71xfJcmRaT4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index a7d1bc73ef6e..30d349a1dfbf 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "timlaing"; repo = "pyicloud"; tag = version; - hash = "sha256-bGS5yAizdaZUdwKNoZPKP/DSpJs5XI70hyTLfJg9QmI="; + hash = "sha256-Lkabmeh+D+nv30DyVRTQhnoyEt6cp2003uGn/GyOrHs="; }; build-system = [ diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 41320ca8b5b8..dfcc76bb132b 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -82,10 +82,9 @@ buildPythonPackage rec { # GetPrefPath for OrgName/AppName is None "test_SDL_GetPrefPath" - # TODO: Remove once sdl2-compat is updated to 2.32.56 - "test_SDL_SetWindowDisplayMode" - "test_SDL_SetWindowFullscreen" - "test_SDL_GetPlatform" + # AssertionError: + # clip: Could not set clip rect SDL_Rect(x=2, y=2, w=0, h=0) + "test_SDL_GetSetClipRect" ]; meta = { diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix index 4b43ff247fde..70423d65a6bf 100644 --- a/pkgs/development/python-modules/python-mistralclient/default.nix +++ b/pkgs/development/python-modules/python-mistralclient/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "python-mistralclient"; - version = "6.0.0"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-mistralclient"; tag = version; - hash = "sha256-zdCqBua6S+a7iS3VzELM02oJKwLlI24tHWfx4Pt3nQw="; + hash = "sha256-8tB1QPaxdLdti96gOzaXuqLftmTJVM0bosJiKs+0CFs="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 3898978c74d8..b08dad39b6ba 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck stestr run -E \ - "openstackclient.tests.unit.network.v2.test_security_group_network.(TestCreateSecurityGroupNetwork.(test_create_with_tags|test_create_with_no_tag|test_create_min_options|test_create_all_options)|TestShowSecurityGroupNetwork.test_show_all_options)" + "openstackclient.tests.unit.volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)" runHook postCheck ''; diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index 91c865f96e77..d5e0f6aecae9 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -40,13 +40,13 @@ }: let - version = "38.5.0"; + version = "38.5.1"; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-j+VFPS4obKdbbFPj3HZnpe5bzIMgOGaCeaKAiRuc0Gk="; + hash = "sha256-MJcWTUg072EmG5j4fFTCuWI0ABqITLSINwp2nxVnj4A="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix index 55ffe9b74ff8..bfbc31ad4f6d 100644 --- a/pkgs/development/python-modules/semgrep/common.nix +++ b/pkgs/development/python-modules/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.140.0"; + version = "1.143.0"; - srcHash = "sha256-RLcES0kamYMlLo1L4Y+mSJDB91SP84h75oLQxX9eCjQ="; + srcHash = "sha256-macw+LuC24sT1xM1F8ovuZlBmm2lYbRifaDbSIpfmkQ="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "semgrep"; repo = "semgrep-interfaces"; - rev = "8baadf6b8604b59c9a660dbb371726c12a3666b8"; - hash = "sha256-37sEprdR8I45tRYsXNNFz0okoTH32MJU9EvMogEMtMw="; + rev = "b13a50d6524bf4fc1ae395792188d5cd9396146d"; + hash = "sha256-amsLr8kpxs6xPIh2E0/ae8KDQEjK5WiG9Hvi8ajj+Bo="; }; }; @@ -25,19 +25,19 @@ rec { core = { x86_64-linux = { platform = "musllinux_1_0_x86_64.manylinux2014_x86_64"; - hash = "sha256-/aZnv5a7ifSk1l98Qf+HKQhnrHKi88SKTuJZwQ7Ons4="; + hash = "sha256-M7Sn5vkk9a7xs+MbtfE+0iWHbKt8fDrDANTLkgf2kh4="; }; aarch64-linux = { platform = "musllinux_1_0_aarch64.manylinux2014_aarch64"; - hash = "sha256-f0k/sNME/0JGrvV7/H47jWLY3OadslzljfA7Kpp0STo="; + hash = "sha256-zmWdOcLloisg2SNn9RHPmTe81ktMPeNF28S8dGmSXXE="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-HldS8Rcx+OkFYfBr/5+rMXVg8prrAuBCDTbkgb8DVsQ="; + hash = "sha256-l2rtdXZmvnHLJeFBAckVDaN+APkrbKMARUbu1oYiorU="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-LiIO4Smomx6tHTtg8ewwXaKXdJDpcmE+auJ5FjWi990="; + hash = "sha256-vMJH9P2ZfHQ0FapwhSSbk/l0v+s1bDooVpBM8ILlAv4="; }; }; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index a2436d745d52..71b24c7d4d87 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -116,7 +116,7 @@ grpcio, }: let - version = "0.18.18"; + version = "0.18.20"; in buildPythonPackage rec { pname = "unstructured"; @@ -127,7 +127,7 @@ buildPythonPackage rec { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-v6g3melJAegYNJPtiDMob0VwgCu91iG0hdebmuya7Jw="; + hash = "sha256-BeoIjFhLu/EM0iAErW3eST5/D+TBuAOZ4lDPTXEqpzc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index 619d8cab2b4c..8f27ce63a5ed 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-N5vw03KI3+P2DKs2G1aU09lBc1OEumJj/vytscNixsw="; + hash = "sha256-Y6unR33yv5GSxRNOG6aakDD218Lo3EM0YJ/a+nvRbK8="; }; - vendorHash = "sha256-rggekhypYsbZovoOKCF+3RWcsSFEWtLSdi8/QTwk8t4="; + vendorHash = "sha256-Nd6JJtwCr5R+PRN1nrzOEJj1UgiyaIgjykqdvt0KnZs="; postPatch = '' # some automation for creating new releases on GitHub, which we don't need diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index c8a15981ff85..613ccd32269f 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -10,7 +10,7 @@ openal, pkg-config, yaml-cpp, - fmt, + fmt_11, xorg, }: let @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { libzip openal yaml-cpp - fmt + fmt_11 xorg.libX11 ]; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index ce5dd347c49c..41fcd5091d87 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -938,6 +938,24 @@ in }; }; + tmux-session-manager = mkTmuxPlugin rec { + pluginName = "tmux-session-manager"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "PhilVoel"; + repo = "tmux-session-manager"; + tag = "v${version}"; + hash = "sha256-WzzqfMRAF8vxrnYnudD6CZVn52bZyCSRaByQRRRK9X8="; + }; + rtpFilePath = "session_manager.tmux"; + meta = { + homepage = "https://github.com/PhilVoel/tmux-session-manager"; + description = "Save and restore your tmux sessions, one by one"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ PhilVoel ]; + }; + }; + tmux-sessionx = mkTmuxPlugin { pluginName = "sessionx"; version = "0-unstable-2024-09-22"; diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 9956d0e6530c..949c5acff28d 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { homepage = "https://github.com/aircrack-ng/rtl8188eus"; license = licenses.gpl2Only; maintainers = with maintainers; [ moni ]; - broken = (lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened; + broken = + ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened) + || kernel.kernelAtLeast "6.17"; }; } diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index dca9dd5c7c11..8e9675eaacfd 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = stdenv.hostPlatform.isAarch64; + broken = stdenv.hostPlatform.isAarch64 || kernel.kernelAtLeast "6.17"; maintainers = with maintainers; [ troydm ]; }; } diff --git a/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix index aec2c7a4ee38..4b385f69b261 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ chuangzhu ]; + broken = kernel.kernelAtLeast "6.17"; }; } diff --git a/pkgs/os-specific/linux/rtl8852au/default.nix b/pkgs/os-specific/linux/rtl8852au/default.nix index 558e62927ec0..dc4e8e3f5518 100644 --- a/pkgs/os-specific/linux/rtl8852au/default.nix +++ b/pkgs/os-specific/linux/rtl8852au/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; # FIX: error: invalid initializer - broken = kernel.kernelOlder "6" && kernel.isHardened; + broken = (kernel.kernelOlder "6" && kernel.isHardened) || kernel.kernelAtLeast "6.17"; maintainers = with maintainers; [ lonyelon ]; }; }) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 5940e90a3abc..83966fdc19d0 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2024-06-09"; + version = "${kernel.version}-unstable-2025-05-29"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "62f3a86a2687fe98bd441e0aff5adf87d95c238a"; - hash = "sha256-gQWk1nhtT0W2dY5uQitWabBGEDfZpmJAoJg+j2ndO00="; + rev = "fe48647496798cac77976e310ee95da000b436c9"; + hash = "sha256-h20vwCgLOiNh0LN3MGwPl3F/PSWGc2XS4t1sdeFAOko="; }; hardeningDisable = [ "pic" ]; @@ -42,5 +42,6 @@ stdenv.mkDerivation { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ otavio ]; + broken = kernel.kernelAtLeast "6.17"; }; } diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index b69d1ce60849..30b1c71c0960 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation { "i686-linux" "aarch64-linux" ]; + broken = kernel.kernelAtLeast "6.17"; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f01d93292b4c..8c5aa4097a4b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -108,10 +108,10 @@ withFido2 ? true, withFirstboot ? true, withGcrypt ? true, - withHomed ? !stdenv.hostPlatform.isMusl, + withHomed ? true, withHostnamed ? true, withHwdb ? true, - withImportd ? !stdenv.hostPlatform.isMusl, + withImportd ? true, withKmod ? true, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" @@ -143,9 +143,9 @@ withPasswordQuality ? true, withPCRE2 ? true, withPolkit ? true, - withPortabled ? !stdenv.hostPlatform.isMusl, + withPortabled ? true, withQrencode ? true, - withRemote ? !stdenv.hostPlatform.isMusl, + withRemote ? true, withResolved ? true, withShellCompletions ? true, withSysusers ? true, @@ -156,7 +156,7 @@ # adds python to closure which is too much by default withUkify ? false, withUserDb ? true, - withUtmp ? !stdenv.hostPlatform.isMusl, + withUtmp ? true, withVmspawn ? true, # kernel-install shouldn't usually be used on NixOS, but can be useful, e.g. for # building disk images for non-NixOS systems. To save users from trying to use it diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index 224070a720d1..95ffd61de20b 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -13,10 +13,10 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_2_3"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.16"; + kernelMaxSupportedMajorMinor = "6.17"; # this package should point to the latest release. - version = "2.3.4"; + version = "2.3.5"; extraPatches = [ (fetchpatch { @@ -38,5 +38,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-8BSuDRDyqPGAiyGGxFyEZIcXB+cKsKk25jcFPrSK3GI="; + hash = "sha256-zTDdoQWbguKeWjQH5+FOTDhxfs3e7UPFnUX8ZugHQy4="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index d54f41119b36..18feb98705db 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -16,14 +16,14 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.4.0-rc3"; + version = "2.4.0-rc4"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-VfCeQqgahNNQA4jsiFHTdUjgXIH26k5r3q/Rpo2JrCc="; + hash = "sha256-PEKIGE6pB+Vs034wDa20s3aMmIIWmOD8yWizseO3fq0="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 9faa3d020832..32920197ce27 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -19,7 +19,6 @@ rrtypes ? false, zoneStats ? false, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, - configFile ? "/etc/nsd/nsd.conf", }: @@ -36,13 +35,16 @@ stdenv.mkDerivation rec { substituteInPlace nsd-control-setup.sh.in --replace openssl ${openssl}/bin/openssl ''; + nativeBuildInputs = lib.optionals withSystemd [ + pkg-config + ]; + buildInputs = [ libevent openssl ] ++ lib.optionals withSystemd [ systemdMinimal - pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix index bff0bd6f61ff..81a30f8438b2 100644 --- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "cdnninja"; domain = "yoto"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_ha"; tag = "v${version}"; - hash = "sha256-2h9lrs6vl4JVYbwaMkQKq2Sq/Iu1Sn1HmMJuso46SSE="; + hash = "sha256-8DyL9TQiGT5BMEgZgs7nXGv04HN0slCWIA14OivnzvY="; }; dependencies = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b5d0314bd2d7..0096d2f8dffc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -180,14 +180,14 @@ lib.makeExtensible ( nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.32.3"; + version = "2.32.4"; inherit (self.nix_2_31.meta) maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; tag = version; - hash = "sha256-DrYVpBbff2zwtyrhll3fAHUYplJ8AEnd0aZa2VAY88I="; + hash = "sha256-8QYnRyGOTm3h/Dp8I6HCmQzlO7C009Odqyp28pTWgcY="; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24c58fc39df5..e9d3a1646008 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1568,6 +1568,7 @@ mapAliases { transmission_3-qt = throw "transmission_3-qt has been removed in favour of transmission_4-qt. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26 transmission_3_noSystemd = throw "transmission_3_noSystemd has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26 treefmt2 = throw "'treefmt2' has been renamed to/replaced by 'treefmt'"; # Converted to throw 2025-10-27 + tremor-language-server = throw "'tremor-language-server' has been removed because it is unmaintained"; # Added 2025-11-17 trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-27 trilium-next-desktop = trilium-desktop; # Added 2025-08-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6e86008719d..03b3215d4c8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13391,6 +13391,7 @@ with pkgs; nwchem = callPackage ../applications/science/chemistry/nwchem { blas = blas-ilp64; lapack = lapack-ilp64; + scalapack = scalapack-ilp64; }; autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { }; @@ -13497,6 +13498,11 @@ with pkgs; p4est-dbg = p4est.override { debug = true; }; + scalapack-ilp64 = scalapack.override { + blas = blas-ilp64; + lapack = lapack-ilp64; + }; + suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse { inherit (llvmPackages) openmp; };