diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 0e6f48b9d97d..b8fe1e754205 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -204,6 +204,11 @@ - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. +- `secretspec-ffi` has been renamed to `libsecretspec` and updated to 0.21.0. + The old package attribute remains an alias, but native consumers must rebuild + against the new `libsecretspec` library and pkg-config module. The separate + `libsecretspec-resolver` package provides a C client for `secretspec serve`. + - `luaPackages.lrexlib-pcre` has been removed as part of the process to fully migrate from the end-of-life PRCE library to PCRE2. `luaPackages.lrexlib-pcre2` and multiple other versions of lrexlib can be used instead. - `hostapd` was upgraded to version 2.12+, which moves move supported, basic, and beacon transmission rate configuration to be at BSS level instead of per-radio for all BSSs. Refer to the [upstream example config](https://git.w1.fi/cgit/hostap/plain/hostapd/hostapd.conf) for details. diff --git a/nixos/modules/services/monitoring/beszel-agent.nix b/nixos/modules/services/monitoring/beszel-agent.nix index 756d729f8cef..dda4e96306c1 100644 --- a/nixos/modules/services/monitoring/beszel-agent.nix +++ b/nixos/modules/services/monitoring/beszel-agent.nix @@ -6,6 +6,76 @@ }: let cfg = config.services.beszel.agent; + + hasVideoDriver = driver: builtins.elem driver config.services.xserver.videoDrivers; + + # Collector names must match `isValidCollectorSource` in upstream's agent/gpu.go. + # macmon and powermetrics are macOS-only and omitted here. + gpuCollectors = { + # read sysfs directly, need no package or device access + "amd_sysfs" = { }; + "intel_sysfs" = { }; + "intel_gpu_top" = { + package = lib.getBin pkgs.intel-gpu-tools; + deviceAllow = [ "char-drm rw" ]; + capabilities = [ "CAP_PERFMON" ]; + # perf_event_open is in @debug, not @system-service + systemCalls = [ "perf_event_open" ]; + }; + "nvidia-smi" = { + package = lib.getBin config.hardware.nvidia.package; + deviceAllow = [ "char-nvidia* rw" ]; + }; + "nvml" = { + deviceAllow = [ "char-nvidia* rw" ]; + }; + "nvtop" = { + package = lib.getBin pkgs.nvtopPackages.full; + deviceAllow = [ + "char-nvidia* rw" + "char-drm rw" + ]; + }; + "rocm-smi" = { + package = lib.getBin pkgs.rocmPackages.rocm-smi; + deviceAllow = [ + "char-drm rw" + "char-kfd rw" + ]; + }; + }; + + activeCollectors = lib.optionals (!cfg.environment.SKIP_GPU) cfg.environment.GPU_COLLECTOR; + + collectorAttrs = + attr: lib.unique (lib.concatMap (name: gpuCollectors.${name}.${attr} or [ ]) activeCollectors); + + gpuPackages = map (name: gpuCollectors.${name}.package) ( + lib.filter (name: gpuCollectors.${name} ? package) activeCollectors + ); + + gpuNeedsDevices = collectorAttrs "deviceAllow" != [ ]; + + # capabilities granted under PrivateUsers are void on the host, see + # systemd.exec(5), so these collectors also need the user namespace disabled + gpuNeedsCapabilities = collectorAttrs "capabilities" != [ ]; + + # Any explicit DeviceAllow turns DevicePolicy=auto into an allow-list, so the GPU + # devices are omitted when smartmon relies on full /dev access. + deviceAllowList = + lib.optionals (cfg.smartmon.enable && cfg.smartmon.deviceAllow != [ ]) ( + map (device: "${device} r") cfg.smartmon.deviceAllow + ) + ++ lib.optionals (!cfg.smartmon.enable || cfg.smartmon.deviceAllow != [ ]) ( + collectorAttrs "deviceAllow" ++ lib.optionals config.boot.zfs.enabled [ "/dev/zfs rw" ] + ); + + serviceCapabilities = + lib.optionals cfg.smartmon.enable [ + "CAP_SYS_RAWIO" + "CAP_SYS_ADMIN" + ] + ++ collectorAttrs "capabilities"; in { meta.maintainers = with lib.maintainers; [ @@ -60,6 +130,45 @@ in Enabling this option will skip systemd tracking and its setup in NixOS. ''; }; + SKIP_GPU = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to disable GPU monitoring. + Enabling this option will skip GPU tracking. + ''; + }; + GPU_COLLECTOR = lib.mkOption { + # upstream takes a comma-separated string, which used to be passed through as is + type = + with lib.types; + coercedTo str (value: map lib.trim (lib.splitString "," value)) ( + listOf (enum (lib.attrNames gpuCollectors)) + ); + default = + lib.optionals (hasVideoDriver "nvidia") [ "nvidia-smi" ] + ++ lib.optionals (hasVideoDriver "amdgpu") [ "amd_sysfs" ] + ++ lib.optionals (hasVideoDriver "intel") [ "intel_sysfs" ]; + defaultText = lib.literalMD '' + derived from {option}`services.xserver.videoDrivers` + ''; + example = [ + "nvidia-smi" + "intel_gpu_top" + ]; + description = '' + GPU collectors to use, in priority order. Overrides the agent's + auto-detection; the packages needed by the selected collectors are added + to the service path. If empty, the agent auto-detects available + collectors. `rocm-smi` is deprecated upstream in favour of `amd_sysfs`, + and `intel_gpu_top` is not used on the xe driver, where `intel_sysfs` is + preferred. + + Access to GPU device nodes is only granted for the collectors listed + here, so a collector provided through + {option}`services.beszel.agent.extraPath` has to be listed as well. + ''; + }; }; }; default = { }; @@ -129,23 +238,22 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; + # drop empty lists so an unset GPU_COLLECTOR keeps upstream auto-detection environment = lib.mapAttrs ( - _: value: if lib.isBool value then (lib.boolToString value) else value - ) (cfg.environment // { DATA_DIR = cfg.dataDir; }); + _: value: + if lib.isBool value then + (lib.boolToString value) + else if lib.isList value then + lib.concatStringsSep "," value + else + value + ) (lib.filterAttrs (_: value: value != [ ]) (cfg.environment // { DATA_DIR = cfg.dataDir; })); path = cfg.extraPath ++ lib.optionals cfg.smartmon.enable [ cfg.smartmon.package ] ++ lib.optionals config.boot.zfs.enabled [ config.boot.zfs.package ] - ++ lib.optionals (builtins.elem "nvidia" config.services.xserver.videoDrivers) [ - (lib.getBin config.hardware.nvidia.package) - ] - ++ lib.optionals (builtins.elem "amdgpu" config.services.xserver.videoDrivers) [ - (lib.getBin pkgs.rocmPackages.rocm-smi) - ] - ++ lib.optionals (builtins.elem "intel" config.services.xserver.videoDrivers) [ - (lib.getBin pkgs.intel-gpu-tools) - ]; + ++ gpuPackages; serviceConfig = { ExecStart = '' @@ -166,26 +274,22 @@ in DynamicUser = true; User = "beszel-agent"; - # Capabilities needed for SMART monitoring - AmbientCapabilities = lib.mkIf cfg.smartmon.enable [ - "CAP_SYS_RAWIO" - "CAP_SYS_ADMIN" - ]; - CapabilityBoundingSet = lib.mkIf cfg.smartmon.enable [ - "CAP_SYS_RAWIO" - "CAP_SYS_ADMIN" - ]; + # Capabilities needed for SMART monitoring and GPU performance counters + AmbientCapabilities = serviceCapabilities; + CapabilityBoundingSet = serviceCapabilities; - # Device access for SMART monitoring - DeviceAllow = lib.mkIf (cfg.smartmon.enable && cfg.smartmon.deviceAllow != [ ]) ( - map (device: "${device} r") cfg.smartmon.deviceAllow - ); + DeviceAllow = lib.mkIf (deviceAllowList != [ ]) deviceAllowList; LockPersonality = true; NoNewPrivileges = !cfg.smartmon.enable; - PrivateDevices = !cfg.smartmon.enable && !config.boot.zfs.enabled; + PrivateDevices = !cfg.smartmon.enable && !gpuNeedsDevices; PrivateTmp = true; - PrivateUsers = !cfg.smartmon.enable && !config.boot.zfs.enabled && !cfg.environment.SKIP_SYSTEMD; + # zfs commands fail inside a user namespace since zfs 2.2, see syncoid.nix + PrivateUsers = + !cfg.smartmon.enable + && !config.boot.zfs.enabled + && !cfg.environment.SKIP_SYSTEMD + && !gpuNeedsCapabilities; ProtectClock = true; ProtectControlGroups = "strict"; ProtectHome = "read-only"; @@ -200,7 +304,7 @@ in RestrictSUIDSGID = true; SystemCallArchitectures = "native"; SystemCallErrorNumber = "EPERM"; - SystemCallFilter = [ "@system-service" ]; + SystemCallFilter = [ "@system-service" ] ++ collectorAttrs "systemCalls"; Type = "simple"; UMask = 27; }; diff --git a/nixos/modules/services/monitoring/glpi-agent.nix b/nixos/modules/services/monitoring/glpi-agent.nix index 4d0407e1a5f8..17845506b910 100644 --- a/nixos/modules/services/monitoring/glpi-agent.nix +++ b/nixos/modules/services/monitoring/glpi-agent.nix @@ -95,8 +95,8 @@ in DynamicUser = true; StateDirectory = "glpi-agent"; - CapabilityBoundingSet = [ "CAP_SYS_ADMIN" ]; - AmbientCapabilities = [ "CAP_SYS_ADMIN" ]; + CapabilityBoundingSet = [ "CAP_DAC_READ_SEARCH" ]; + AmbientCapabilities = [ "CAP_DAC_READ_SEARCH" ]; LimitCORE = 0; LimitNOFILE = 65535; @@ -104,7 +104,7 @@ in MemorySwapMax = 0; MemoryZSwapMax = 0; PrivateTmp = true; - ProcSubset = "pid"; + ProcSubset = "all"; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index 1c8f2e76818b..2bfaccff7377 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -32,10 +32,14 @@ let inherit (package) phpPackage; phpOptions = toKeyValue cfg.phpOptions; preferLocalBuild = true; - passAsFile = [ "phpOptions" ]; + strictDeps = true; + __structuredAttrs = true; } '' - cat $phpPackage/etc/php.ini $phpOptionsPath > $out + ( + cat $phpPackage/etc/php.ini + printf "%s" "$phpOptions" + ) > $out ''; artisanWrapper = pkgs.writeShellScriptBin "librenms-artisan" '' diff --git a/nixos/modules/services/web-apps/rundeck.nix b/nixos/modules/services/web-apps/rundeck.nix index 71526d651a82..385315381df5 100644 --- a/nixos/modules/services/web-apps/rundeck.nix +++ b/nixos/modules/services/web-apps/rundeck.nix @@ -12,6 +12,13 @@ let scheme = if cfg.ssl.enable then "https" else "http"; configFile = settingsFormat.generate "rundeck-config.properties" cfg.settings; + + jaasLoginModuleClass = + if lib.versionAtLeast cfg.package.version "6" then + "org.rundeck.jaas.PropertyFileLoginModule" + else + "org.eclipse.jetty.jaas.spi.PropertyFileLoginModule"; + frameworkFile = settingsFormat.generate "framework.properties" cfg.frameworkSettings; realmFile = pkgs.writeText "realm.properties" '' @@ -133,7 +140,43 @@ in aclPolicies = lib.mkOption { type = lib.types.attrsOf lib.types.str; - default = { }; + default = { + "admin.aclpolicy" = '' + description: Admin, all access. + context: + project: '.*' + for: + resource: + - allow: '*' + adhoc: + - allow: '*' + job: + - allow: '*' + node: + - allow: '*' + runner: + - allow: '*' + by: + group: admin + + --- + + description: Admin, all access. + context: + application: 'rundeck' + for: + resource: + - allow: '*' + project: + - allow: '*' + project_acl: + - allow: '*' + storage: + - allow: '*' + by: + group: admin + ''; + }; description = "ACL policies for Rundeck, where the attribute name is the filename and the value is the policy content"; example = lib.literalExpression '' { @@ -493,9 +536,9 @@ in group = cfg.group; text = '' RDpropertyfilelogin { - org.eclipse.jetty.jaas.spi.PropertyFileLoginModule required + ${jaasLoginModuleClass} required debug="true" - file="/etc/rundeck/realm.properties"; + file="${cfg.configDir}/realm.properties"; }; ''; }; @@ -631,9 +674,7 @@ in replaceSecret "@SERVER_UUID@" "${cfg.dataDir}/.uuid" "${cfg.configDir}/framework.properties" )} - if [ -f ${cfg.dataDir}/etc/framework.properties ]; then - install -m 0640 ${cfg.configDir}/framework.properties ${cfg.dataDir}/etc/framework.properties - fi + install -C -m 0640 ${cfg.configDir}/framework.properties ${cfg.dataDir}/etc/framework.properties ${lib.concatStringsSep "\n" ( lib.mapAttrsToList ( diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 67148b7e497a..b4b0bffb3d7e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -647,10 +647,6 @@ in imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox; }; - firefox-beta = runTest { - imports = [ ./firefox.nix ]; - _module.args.firefoxPackage = pkgs.firefox-beta; - }; firefox-devedition = runTest { imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox-devedition; @@ -1270,6 +1266,7 @@ in nginx-modsecurity = runTest ./nginx-modsecurity.nix; nginx-moreheaders = runTest ./nginx-moreheaders.nix; nginx-njs = runTest ./nginx-njs.nix; + nginx-otel = runTest ./nginx-otel.nix; nginx-proxyprotocol = runTest ./nginx-proxyprotocol/default.nix; nginx-pubhtml = runTest ./nginx-pubhtml.nix; nginx-redirectcode = runTest ./nginx-redirectcode.nix; diff --git a/nixos/tests/beszel.nix b/nixos/tests/beszel.nix index fbc6418c985a..d39c5c6042a8 100644 --- a/nixos/tests/beszel.nix +++ b/nixos/tests/beszel.nix @@ -59,6 +59,50 @@ openFirewall = true; }; }; + + # Only inspected by the test script, never activated: the VM has no GPU, + # but the generated units can still be checked. + specialisation."gpu-sysfs".configuration = { + services.beszel.agent = { + enable = true; + environment.GPU_COLLECTOR = [ "amd_sysfs" ]; + }; + }; + + specialisation."gpu-devices".configuration = { + services.beszel.agent = { + enable = true; + environment.GPU_COLLECTOR = [ "intel_gpu_top" ]; + }; + }; + + specialisation."gpu-smartmon".configuration = { + services.beszel.agent = { + enable = true; + # upstream's comma-separated form is accepted as well + environment.GPU_COLLECTOR = "intel_gpu_top"; + smartmon = { + enable = true; + deviceAllow = [ "/dev/nvme0" ]; + }; + }; + }; + + specialisation."zfs".configuration = { + networking.hostId = "8425e349"; + boot.supportedFilesystems = [ "zfs" ]; + services.beszel.agent.enable = true; + }; + + specialisation."gpu-skipped".configuration = { + services.beszel.agent = { + enable = true; + environment = { + SKIP_GPU = true; + GPU_COLLECTOR = [ "intel_gpu_top" ]; + }; + }; + }; }; }; @@ -67,6 +111,13 @@ let hubCfg = nodes.hubHost.services.beszel.hub; agentCfg = nodes.agentHost.specialisation."agent".configuration.services.beszel.agent; + # /run/current-system points at the "agent" specialisation after the switch, + # so the units are read from the store directly. + gpuUnit = + name: + "${ + nodes.agentHost.specialisation.${name}.configuration.system.build.toplevel + }/etc/systemd/system/beszel-agent.service"; in '' import json @@ -115,5 +166,41 @@ agentHost.wait_for_unit("beszel-agent.service") agentHost.wait_until_succeeds("journalctl -eu beszel-agent --grep 'SSH connection established'") agentHost.wait_until_succeeds(f'curl -H \'Authorization: {user["token"]}\' -f ${agentCfg.environment.HUB_URL}/api/collections/systems/records | jq -e \'.items[].status == "up"\' ') + + with subtest("Agent stays sandboxed without a GPU"): + agentHost.succeed("systemctl show beszel-agent -p PrivateDevices --value | grep -qx yes") + agentHost.succeed("systemctl show beszel-agent -p PrivateUsers --value | grep -qx yes") + + with subtest("GPU collectors shape the unit"): + # sysfs-only collector keeps the sandbox + sysfs = agentHost.succeed("cat ${gpuUnit "gpu-sysfs"}") + assert "PrivateDevices=true" in sysfs, sysfs + assert "PrivateUsers=true" in sysfs, sysfs + assert "intel-gpu-tools" not in sysfs, sysfs + + # device-based collector gets its devices as an allow-list, and + # CAP_PERFMON/perf_event_open with the user namespace disabled + devices = agentHost.succeed("cat ${gpuUnit "gpu-devices"}") + assert "PrivateDevices=false" in devices, devices + assert "PrivateUsers=false" in devices, devices + assert "DeviceAllow=char-drm rw" in devices, devices + assert "CAP_PERFMON" in devices, devices + assert "perf_event_open" in devices, devices + + # GPU devices must survive smartmon's DeviceAllow list + smartmon = agentHost.succeed("cat ${gpuUnit "gpu-smartmon"}") + assert "DeviceAllow=/dev/nvme0 r" in smartmon, smartmon + assert "DeviceAllow=char-drm rw" in smartmon, smartmon + + # zfs only gets /dev/zfs, but needs the host user namespace + zfs = agentHost.succeed("cat ${gpuUnit "zfs"}") + assert "PrivateDevices=true" in zfs, zfs + assert "DeviceAllow=/dev/zfs rw" in zfs, zfs + assert "PrivateUsers=false" in zfs, zfs + + # SKIP_GPU wins over an explicitly configured collector + skipped = agentHost.succeed("cat ${gpuUnit "gpu-skipped"}") + assert "PrivateDevices=true" in skipped, skipped + assert "intel-gpu-tools" not in skipped, skipped ''; } diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix index 19b95565bcb8..2b24951d5ed3 100644 --- a/nixos/tests/flaresolverr.nix +++ b/nixos/tests/flaresolverr.nix @@ -10,11 +10,30 @@ enable = true; port = 8888; }; + + services.nginx = { + enable = true; + virtualHosts.localhost = { + locations."/" = { + return = "200 'hello world'"; + extraConfig = '' + default_type text/plain; + ''; + }; + }; + }; }; - testScript = '' + testScript = /* python */ '' + import json + machine.wait_for_unit("flaresolverr.service") machine.wait_for_open_port(8888) machine.succeed("curl --fail http://localhost:8888/") + + res = machine.succeed("""curl --fail http://localhost:8888/v1 -X POST --json '{ "cmd": "request.get", "url": "http://localhost/", "maxTimeout": 10000 }'""") + res = json.loads(res) + response = res["solution"]["response"] + assert "hello world" in response, f"Could not find 'hello world' in response: {response}" ''; } diff --git a/nixos/tests/music-assistant.nix b/nixos/tests/music-assistant.nix index b307e97d6db2..775768355842 100644 --- a/nixos/tests/music-assistant.nix +++ b/nixos/tests/music-assistant.nix @@ -1,11 +1,11 @@ { - lib, + pkgs, ... }: { name = "music-assistant"; - meta.maintainers = with lib.maintainers; [ hexa ]; + meta = { inherit (pkgs.music-assistant.meta) maintainers; }; containers.machine = { services.music-assistant = { diff --git a/nixos/tests/nginx-otel.nix b/nixos/tests/nginx-otel.nix new file mode 100644 index 000000000000..7aa37d532cca --- /dev/null +++ b/nixos/tests/nginx-otel.nix @@ -0,0 +1,56 @@ +{ + name = "nginx-otel"; + + nodes.machine = + { pkgs, ... }: + { + services.opentelemetry-collector = { + enable = true; + settings = { + receivers.otlp.protocols.grpc.endpoint = "127.0.0.1:4317"; + exporters.debug.verbosity = "detailed"; + service.pipelines.traces = { + receivers = [ "otlp" ]; + exporters = [ "debug" ]; + }; + }; + }; + services.nginx = { + enable = true; + additionalModules = [ pkgs.nginxModules.otel ]; + commonHttpConfig = '' + otel_exporter { + endpoint localhost:4317; + } + otel_service_name "nginx-test"; + otel_trace on; + ''; + virtualHosts."localhost".locations."/".extraConfig = '' + otel_trace_context propagate; + otel_span_name "handle"; + return 200 "otel-ok"; + ''; + }; + }; + + testScript = + { nodes, ... }: + let + cfg = nodes.machine.services.nginx; + in + '' + machine.wait_for_unit("opentelemetry-collector") + machine.wait_for_open_port(4317) + machine.wait_for_unit("nginx") + machine.wait_for_open_port(80) + + machine.succeed("test -e ${cfg.package}/modules/ngx_otel_module.so") + machine.succeed("grep -F ngx_otel_module.so ${cfg.package}/etc/nginx/dynamic-modules.conf") + + response = machine.wait_until_succeeds("curl -fsS http://127.0.0.1/") + t.assertIn("otel-ok", response) + + machine.wait_until_succeeds("journalctl -u opentelemetry-collector --grep 'service.name: Str\\(nginx-test\\)'") + machine.wait_until_succeeds("journalctl -u opentelemetry-collector --grep 'Name +: handle'") + ''; +} diff --git a/nixos/tests/rundeck.nix b/nixos/tests/rundeck.nix index 8bfd209816f3..2d5af3db0377 100644 --- a/nixos/tests/rundeck.nix +++ b/nixos/tests/rundeck.nix @@ -12,6 +12,13 @@ group = "rundeck"; }; + environment.etc."rundeck-tokens.properties" = { + text = "testadmin: nixostesttoken,admin"; + mode = "0400"; + user = "rundeck"; + group = "rundeck"; + }; + services.rundeck = { enable = true; serverHostname = "rundeck"; @@ -20,6 +27,7 @@ serverPort = 4441; database.type = "h2"; openFirewall = true; + frameworkSettings."rundeck.tokens.file" = "/etc/rundeck-tokens.properties"; }; environment.systemPackages = with pkgs; [ @@ -32,17 +40,8 @@ testScript = '' start_all() - def login_and_verify_api(machine, host, port, user, password, timeout=300): - """Authenticate via Rundeck form login and verify API access.""" - machine.wait_until_succeeds( - f"curl -s -c /tmp/cookies -L" - f" -d 'j_username={user}&j_password={password}'" - f" http://{host}:{port}/j_security_check -o /dev/null" - f" && curl -s -b /tmp/cookies -H 'Accept: application/json'" - f" http://{host}:{port}/api/26/system/info" - f" | jq -e '.system.rundeck.version'", - timeout=timeout, - ) + api = "http://rundeck:4441/api/26" + token = "-H 'X-Rundeck-Auth-Token: nixostesttoken' -H 'Accept: application/json'" def properties(machine, path): return machine.succeed(f"cat {path}").replace("\\", "").replace(" = ", "=") @@ -90,21 +89,32 @@ "[ \"$(stat -c %U /etc/rundeck/realm.properties)\" = rundeck ]" ) - with subtest("API authentication via form login"): - login_and_verify_api(rundeck, "rundeck", 4441, "testadmin", "testpassword") + with subtest("Form login accepts realm credentials"): + rundeck.wait_until_succeeds( + "curl -s -o /dev/null -w '%{url_effective}' -c /tmp/login-cookies -L" + " -d 'j_username=testadmin&j_password=testpassword'" + " http://rundeck:4441/j_security_check" + " | grep -qvE 'error|login'", + timeout=300, + ) + + with subtest("API authentication via static token"): + rundeck.wait_until_succeeds( + f"curl -s {token} {api}/system/info" + " | jq -e '.system.rundeck.version'", + timeout=300, + ) rundeck.succeed( - "curl -s -b /tmp/cookies -X POST" - " -H 'Accept: application/json'" + f"curl -s {token} -X POST" " -H 'Content-Type: application/json'" " -d '{\"name\":\"test-project\",\"config\":{}}'" - " http://rundeck:4441/api/26/projects" + f" {api}/projects" " | jq -e '.name == \"test-project\"'" ) rundeck.succeed( - "curl -s -b /tmp/cookies -H 'Accept: application/json'" - " http://rundeck:4441/api/26/projects" + f"curl -s {token} {api}/projects" " | jq -e 'any(.[]; .name == \"test-project\")'" ) ''; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index e6422c8f370c..5aa5e248eff9 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -33,7 +33,7 @@ let packageAttribute = "sublime4${lib.optionalString dev "-dev"}"; binaries = [ "sublime_text" - "plugin_host-3.${if lib.versionAtLeast buildVersion "4205" then "14" else "8"}" + "plugin_host-3.14" crashHandlerBinary ]; primaryBinary = "sublime_text"; @@ -42,8 +42,7 @@ let "sublime" "sublime4" ]; - crashHandlerBinary = - if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter"; + crashHandlerBinary = "crash_handler"; downloadUrl = arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; @@ -58,8 +57,6 @@ let cairo pango curl - ] - ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ sqlite ]; @@ -88,7 +85,6 @@ let # Remove old plugin host because it depends on EOL openssl 1.1 rm plugin_host-3.3 - echo '{"disable_plugin_host_3.3": true}' > Packages/Preferences.sublime-settings for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ @@ -98,15 +94,12 @@ let done # Unable to get plugin_host-3.14 not crash with Python from Nixpkgs - ${lib.optionalString (lib.versionAtLeast buildVersion "4205") "patchelf --set-rpath ${ + patchelf --set-rpath ${ lib.makeLibraryPath [ sqlite openssl_3_5 ] - } libpython3.14.so.1.0"} - - # Rewrite pkexec argument. Note that we cannot delete bytes in binary. - ${lib.optionalString (lib.versionOlder buildVersion "4205") "sed -i -e 's,/bin/cp\\x00,cp\\x00\\x00\\x00\\x00\\x00\\x00,g' ${primaryBinary}"} + } libpython3.14.so.1.0 runHook postBuild ''; @@ -116,8 +109,8 @@ let # No need to patch these libraries, it works well with our own rm libcrypto.so.1.1 libssl.so.1.1 - ${lib.optionalString (lib.versionAtLeast buildVersion "4145") "rm libsqlite3.so"} - ${lib.optionalString (lib.versionAtLeast buildVersion "4205") "rm libcrypto.so.3 libssl.so.3"} + rm libsqlite3.so + rm libcrypto.so.3 libssl.so.3 mkdir -p $out cp -r * $out/ @@ -128,8 +121,6 @@ let dontWrapGApps = true; # non-standard location, need to wrap the executables manually postFixup = '' - ${lib.optionalString (lib.versionOlder buildVersion "4205") "sed -i 's#/usr/bin/pkexec#pkexec\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00#g' \"$out/${primaryBinary}\""} - wrapProgram $out/${primaryBinary} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ "''${gappsWrapperArgs[@]}" @@ -230,11 +221,5 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" ]; - problems = { - removal.message = "We have removed Python 3.3 package support ahead of upstream schedule but if you do not use any old packages, this should just work."; - } - // lib.optionalAttrs (lib.versionOlder buildVersion "4205") { - broken.message = "Packages, including core ones, do not run without plug-in host depending on insecure OpenSSL."; - }; }; }) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix deleted file mode 100644 index 2a307f172274..000000000000 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - stdenv, - lib, - callPackage, - fetchurl, - nixosTests, - buildMozillaMach, -}: - -buildMozillaMach rec { - pname = "firefox-beta"; - binaryName = "firefox-beta"; - version = "156.0b4"; - applicationName = "Firefox Beta"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2aa751d66854145bf260dd04fe1473ca20275c02e51c07efdda769d7980cdaee6dc393cac32fe3bb4ed131249fde81e150c284ee38af5fc560da7704947a6453"; - }; - - meta = { - changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/"; - description = "Web browser built from Firefox Beta Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ jopejoe1 ]; - platforms = lib.platforms.unix; - broken = stdenv.buildPlatform.is32bit; - # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) - license = lib.licenses.mpl20; - mainProgram = binaryName; - identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "mozilla" version // { - product = "firefox"; - sw_edition = "beta"; - }; - }; - tests = { - inherit (nixosTests) firefox-beta; - }; - updateScript = callPackage ../update.nix { - attrPath = "firefox-beta-unwrapped"; - versionSuffix = "b[0-9]*"; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 81770b4ef3c5..6c108c475094 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -32,7 +32,6 @@ description = "Web browser built from Firefox Developer Edition source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ - jopejoe1 rhendric ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index d11d1aac0d1a..a9ce4543c262 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,797 +1,797 @@ { - version = "153.3.0esr"; + version = "153.3.1esr"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/af/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/af/thunderbird-153.3.1esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c76c4e550db9fff87a383a08759fe1a5e0aef66b532e7f4aef56cffd49e3f050"; + sha256 = "0ba17466519bbeb80bcaaeb8f8917325a9846be3724d16add9a857abbd251a6a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ar/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ar/thunderbird-153.3.1esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "75d765713deef498778b381515b7e4f9476927c91bfb85d619cccecfb96d7077"; + sha256 = "e18efda3287cc8c23f4185b641339f39b16d2d799cd7528a75275bff2fbdba41"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ast/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ast/thunderbird-153.3.1esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "70f4bcca83df8132591d1b8818075574fcf722e300a3e3fd3b79b64daaebc6d2"; + sha256 = "a5c73e11e6481e3f9e94a9bf246eb853c20b35cbe855ca484d8c231090cbf4d8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/be/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/be/thunderbird-153.3.1esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "cdcd37ddb50a3667b7510140fdf1f508cb380ef28875e11f9d9ab3d712b07e63"; + sha256 = "e040056fbd124ecb8e7c680a553c6e889a05b1851aed8ed3aa1875bd12f6505d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/bg/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/bg/thunderbird-153.3.1esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fc56e1257d1c466336cc55b4909267a0188038bf3c02aabe244854242731f0d1"; + sha256 = "686a136657cec10ca86f571cd256331d87092326e1b0bd99a62d63daebf4c1ac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/br/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/br/thunderbird-153.3.1esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9fad678e6ccf9cdba693107cc85eb75826348e3726788a7e7f5ffba434c62a23"; + sha256 = "962847fb5f740703504d1e7579951f45d74a1294c6f64c743309a307785f609c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ca/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ca/thunderbird-153.3.1esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c1d40097b4ee7b549ca386f2a9865cf66f70d62cec4e88e80c4cbe96a293f51e"; + sha256 = "dba9e3f3ebc501a30ea25f4af7c562783829fc1413b2f49b9747cae5d51a01ed"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/cak/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/cak/thunderbird-153.3.1esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e4545033f5ef92c3a79e70c08ba85d720ad441bf14fdeba159a0695005e62bc9"; + sha256 = "17fb574e9320b948557bdeb42926fe3bd92b7e0fb568a50da7937e4c96a31951"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/cs/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/cs/thunderbird-153.3.1esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f0bd0233804437111af028425a3daa4e79903f3ceb7eb999526f0606b667d5ea"; + sha256 = "80674a5616f3caf6853baf93c6ebf7584abb42ffb604b097c9cb541d981df2cf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/cy/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/cy/thunderbird-153.3.1esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b9c53df16c44dbaa463556bd57918633aff4d6db9da6246062ccd86f9289614a"; + sha256 = "dbc0b2834efa8d2c181a5331ea497a512dae2318847bdf5793b2e157f69cc800"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/da/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/da/thunderbird-153.3.1esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b2791ef456d9ffca4a0ce78ad6b682980c86a07990efc4c2c88f6ced5afc8659"; + sha256 = "a6711b5143a96be08a40f2a6a4dece5e5c7966948665375923cbb026fb0941a3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/de/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/de/thunderbird-153.3.1esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ce2628e1ebd534e270ec7840c0f21fe3eee2707716fec308a8979bc0c15675d1"; + sha256 = "c6811385502d0e9c3e820326b218939d6267b5c90970f0ef2ace6b61da343bbd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/dsb/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/dsb/thunderbird-153.3.1esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2195d7d32f0f21b7cd3af3b5b300ba2b7faa7b99f3573cea6f00e1ecc2e4f4d4"; + sha256 = "bc80abb9eca193db6957acb1affe141a7a6476b1558eda786b60b14d76a43786"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/el/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/el/thunderbird-153.3.1esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0f452b8daef21b7f3129845d71dc6ae0423900550fb40a56a8851573f09a63d1"; + sha256 = "87cfcec68ffbe360fdfdba27540733424852790c2b37ef020ccf36b9f133fad6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/en-CA/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/en-CA/thunderbird-153.3.1esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8b47350b4a98be047a386f1237bab301cc7f25cfb4f7a6b54f2e7ef963614c5a"; + sha256 = "55bd0d1ba368a62d89b7b1b7b896989e8f015955b8dca12e99f51f915f065c96"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/en-GB/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/en-GB/thunderbird-153.3.1esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a8ae3049232e171a21d5a2167d07d5b1cc007d2b2b46f0aae81dd7366e7e2615"; + sha256 = "6a9f2ca4b50399831bd97dff22707d9b0e8c26f435226dc04f5d4ae10d95d831"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/en-US/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/en-US/thunderbird-153.3.1esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "8222fe9b539a4f411f589ba60c5053396b6a9628569f14e078858a18b4bcdc48"; + sha256 = "40ec746c0807aad268d513b8465ea30fcd7a123c7ab444b30dd083baa43a8308"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/es-AR/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/es-AR/thunderbird-153.3.1esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "829f89e932bd0c6d302e5e39ed202a242bc04743986715fc5c0feaa99052a003"; + sha256 = "14fea989e0ed1e3a838e2d0f540d129b733bda5094482cc887b9fb80734052c8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/es-ES/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/es-ES/thunderbird-153.3.1esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a9e1bb514112a35d9c76e22f66563c337c8618f626351d5d11fa2579b5fc482c"; + sha256 = "7f3bf4e4640f13037211a092431e358f405208957e05e3114171900c55a2d57b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/es-MX/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/es-MX/thunderbird-153.3.1esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e4ff35518f74e72d07e560e89d1287ed5767f6348745b6f7c1851e0e43929f85"; + sha256 = "fc3f010d93a59a2c022aac309b0124e58d37f4730bf626162960068bed51d860"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/et/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/et/thunderbird-153.3.1esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5a574eff3aebdda0c1b1b8ce9f593cc30b3b68c41c00e6d9524c5bba3a2d012d"; + sha256 = "9a072ca88570c02d94b91da9a3b7c119b74331e8168d90228db2c1b77ac76a5e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/eu/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/eu/thunderbird-153.3.1esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "99b0720be306cde6b033573717631195b60e57a8a1e9eb7769bc3453aa8a147d"; + sha256 = "e8cca1ed3ee95925a6e2bee150f942116ebbc03a9b3ab42bad4984b900d6ff54"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/fi/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/fi/thunderbird-153.3.1esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "584a19bed2f1e98708e42cfd265eb3dc95e9273326f5c03fdf185dbb2c7ab6e4"; + sha256 = "cb1322d764a74031ba09e0592ede2ace1c4649e73952f247ba262bed1645d255"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/fr/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/fr/thunderbird-153.3.1esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "efc55e513b89b1ddf188e3217c0f8198e3e6880b287cd3ae44815885df46cef3"; + sha256 = "b5983aeb00c0aa76cb16eec3f470b4f907fbeea0d685d14d0fc7f9c3ad64739a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/fy-NL/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/fy-NL/thunderbird-153.3.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9c6e9d321029556eb553cd0adf4c23ec772813b6b0a2242fa6cd735b8decd8ac"; + sha256 = "16287db768fa5925480ce0ad68129799a0784ed11e602baae43932628cea869e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ga-IE/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ga-IE/thunderbird-153.3.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e392d39c8213def72666f37b654a26ae0537f3601f00dc1328ec61d4bac6c8e3"; + sha256 = "662d2ba00232ffb2f9a5aaeda9927fbd2ca3f5ab519fd973008bb4d8866cc163"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/gd/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/gd/thunderbird-153.3.1esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "808ee3d0dfca17b16ac3cd7f5b565ede3496f5939c248c8f0a84b6c7ac742ad4"; + sha256 = "c724a09f62fb9e7368c80f4c4e7a0e5043372896f7753940018a0a2618c9f26a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/gl/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/gl/thunderbird-153.3.1esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3084151272af2e7b6d070340225bbb329ac82c49c9475bc7da342415e04d01dd"; + sha256 = "9c3f51b25c329cc58963ffdd2d4067955da6c8cc3c9c6565ab12e4a59e5b51b5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/he/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/he/thunderbird-153.3.1esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "3379f056f3e4c769a641aaaecd0fa9e53f9fe6434769b1e8c3aa92eee9aaacdd"; + sha256 = "2b45a9fbf53295a73ea9b2af386cf0950939657b34bdaeb14bf1bee6eb3129f8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/hr/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/hr/thunderbird-153.3.1esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ec99371e22af0e678d7b886ed34df382836bf3b5d1edd78a84669af690fb0971"; + sha256 = "a0be8e4dc8c2faf7d72d4becefa903272d9a8fdc9e83facf65213cadf9b80e7a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/hsb/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/hsb/thunderbird-153.3.1esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1c37999f505924f23065d3795d3f30c3147d18d11c2d63f992998cc7e03aa16c"; + sha256 = "a44d7948453e83ca6d5b47bb395ab6caaaee64322f5b31d65a2862126d30a293"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/hu/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/hu/thunderbird-153.3.1esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7c1c267d9dd35610a3655e9569978e13a30d1611baf2332cca7e105f7301ae5a"; + sha256 = "b9e6ebed3377cf41884adb49ae87dbd8f570245024abe0ac58a3a1829c9ea8a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/hy-AM/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/hy-AM/thunderbird-153.3.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "efdd09c80bc13b4a6edec23fe46eff6f7edce2780fa69022b2a1b1dccca7338f"; + sha256 = "1de1282621835f321179b669b5b0e3178d0ab6762c49c3a6873e5b409e226156"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/id/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/id/thunderbird-153.3.1esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "aed54c9994e6014ed417d9f836c214c743cb6a546d8fedd7e4342eb5d3b316a4"; + sha256 = "01a5a7037adfe473a7a19d4dd193052eb2b3c4618d349481475451f445994832"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/is/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/is/thunderbird-153.3.1esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8cee1ee026bafd820fc2a96474fe82d8ad4ddcc61d956b8e1b585a893ca0336a"; + sha256 = "4acec24013d13185006ec52a091423f0da26b578472bbe9c252ece59f2b395b2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/it/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/it/thunderbird-153.3.1esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c6af0ab3a814dfd2438cb18f9b347123b4611e11c3a9056f8bbd0be07d58d5f8"; + sha256 = "18effe4d0fc98d66362af3e6601b39294388825aeafc3e3a48bc96f96cb8d7b6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ja/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ja/thunderbird-153.3.1esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d436e31b8fa5b122fff1f8b8388fdaa83e84c1032ed57ba9795d027c6d8d7e1c"; + sha256 = "fe8858ddc33661fa10d14d3d5003439382274f4cb09573b35af5741b5d961fd9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ka/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ka/thunderbird-153.3.1esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "23789dcb2afe329ca0a7906bc84a45aea48a021eb570b87f51177725cfb3667b"; + sha256 = "d45281f9fb31b13710388bb5e25278692be491c3a9cef96ede8e962a74eea6a8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/kab/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/kab/thunderbird-153.3.1esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "cd065e4b9ce378a783a21ba60ec16d547f6136b0c81923f60b4e9058ded1eb37"; + sha256 = "1e8365b4d24f06feee0e7605988c7f1f71f1db3a04a6fd4e24ebb4ae148f05ec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/kk/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/kk/thunderbird-153.3.1esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6f2dc798c8814c610e40857d34304ace6ced06562d9710488af36bc514c6ebbf"; + sha256 = "2efb96beeaef17d5a89180b6599521e92751b5dc8c4b793e0245a6ebee24974f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ko/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ko/thunderbird-153.3.1esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6baa3681ae99efa0aed13cb61e61127ad02db123bf8558173909aacc10812342"; + sha256 = "83efe73626573603f8479f99bb37fa8bd547cd5a5d40b77f22b9a69b01ac7f0c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/lt/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/lt/thunderbird-153.3.1esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "088722881d12e16a9efe1c9091e2fa6d29fe76e866b0203f748910456c1d6eba"; + sha256 = "e1d3b2c0366db7c7607cc57b9daa9706ad7a4c3ea04cdec52ab9c9cd72c5b905"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/lv/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/lv/thunderbird-153.3.1esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b84e429b0b592198105d9cae5c992d74f30b3e889810d9fd1d3449be1b7b4d69"; + sha256 = "19663ef35df40cc5213fb21e2ea19dc4f608047c062446e9bef335a4e0199d3d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ms/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ms/thunderbird-153.3.1esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "983c5cdabf14117698d0d472bd5182b9c2ebd126fddb1e24370afe344df70e3e"; + sha256 = "000a57598558eb926aedc5bf5a5cffd7de54cf719edc9c25c7d75cb538ac0455"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/nb-NO/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/nb-NO/thunderbird-153.3.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "050777f57c0587ff190233b959081e710ab40c33957ccfd571978c815cf22b3d"; + sha256 = "17b9d765032a51220c199466a62ccf9de62435e47089eb43bccf49302035df99"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/nl/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/nl/thunderbird-153.3.1esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ba0c1339a1f982724330699b48982d7f5a9984ab8b7e0e245ee9f64565bb2fa4"; + sha256 = "78b5068c847eb5b7764eef0d0ce2e4451b60a30afb7f8315a62b6d2cb6623b14"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/nn-NO/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/nn-NO/thunderbird-153.3.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b057d22992187cc0e9eb5a3813e54c852103933c847aaf6f26c7c97684892090"; + sha256 = "5f9ea1098217622205a7e7cb23dc8536576f666d98c1fc0fa12e8552a5413f89"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/pa-IN/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/pa-IN/thunderbird-153.3.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2f4f08fcf157a12efd51d3ac95cfc80fc8ac1022729c72285656c010e56af9a9"; + sha256 = "ca8877662889893882bbd8f75567e7efb682f9f015f0af32036f8b125a148881"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/pl/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/pl/thunderbird-153.3.1esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e6ef796d7a7cd960e581f1e1e74427d3d128b99e13e2d5a1b95bda4b9041dfdc"; + sha256 = "cb4b54a2ded8bb0e1fbcb16d743c5e000cfc748016a298223e77ce35f4967757"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/pt-BR/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/pt-BR/thunderbird-153.3.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a67e352882cc79662193a7c6a8b801282c08589ac4e7893d0512b91e36db52d1"; + sha256 = "79f56bb355d110037e6f41327b1af2d4d98d53de283f16df18fa2695c58a65d0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/pt-PT/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/pt-PT/thunderbird-153.3.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e1d97a16194ca0923e494fa0abb46a58e7493ef495f2a168517d75662bdf9047"; + sha256 = "7bc98a80914672f671e76ae33125de425c5961530d6f1e1713a9a73b3756a59d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/rm/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/rm/thunderbird-153.3.1esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cb8b0e1ad97815b73e68b217f2bbb721ed6a84caeb7c507fc1661b0c9f2a67fb"; + sha256 = "14f128e4f6138386c83ab2b4fbb504213eac4b7d15fa60363dad534ceb670d56"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ro/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ro/thunderbird-153.3.1esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "193782b3d1e4ddb1a0dacb81d06af7acb28b8b858bacd9fda9a6954e31a5f640"; + sha256 = "2f99a661b6d41943a9a3d4085ca76ab21c15790882b0f4632e8e44d0cdedfcd4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/ru/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/ru/thunderbird-153.3.1esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "10df482c4820290343c8d777a0182383a7dabe85cc1fda90cd1c1bfd62c52744"; + sha256 = "963b56e0dcff589fd55e605cf0dfdf223bc1b9e33e7ca3fcb3969a382fefae2d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/sk/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/sk/thunderbird-153.3.1esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "694b9ed23b06bd9a590a1ac2a9b22206929c3eec159484d0d47260f16e2da289"; + sha256 = "8d81ea0f2fb3983f45c7af8115dd95e94ab8f7dfd865de7fb1016cf1ec7f68cb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/sl/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/sl/thunderbird-153.3.1esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0c4b208282953c74339afaf3579bf8a23bc47a20fcdd50d1b6ab6eab51a5f089"; + sha256 = "88d4d2b08790a1a1d5b253a949050e47a11af8b56664b6d2621fb05e2358548b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/sq/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/sq/thunderbird-153.3.1esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8f4771944fe2cfa9b93fabc538f8ad532865ef924fb95e38f43b8c7f178a9772"; + sha256 = "8bd8ec17dc454604d8f7c4ea81bb46842603eac33c58cac346095d9739b0f7ff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/sr/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/sr/thunderbird-153.3.1esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e0c375fcacaa25e689067d015490a138b536b28203e687cf47dfa6e2bf603f06"; + sha256 = "c15f8ba6b9c175c1c8d1d0b46c658b54af1d05323d16f54810a7b18b0be94878"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/sv-SE/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/sv-SE/thunderbird-153.3.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0e0edfe94a24906021d28df77d443f87cbc114ec604a9e615d09e127eb554dee"; + sha256 = "1b503333ca60b60e84dd6bfb14d3cb689fef259c3fe72d1f60fc84a3a947f8c9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/th/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/th/thunderbird-153.3.1esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d811ba324b4be1e1038845c723ad8375c2fbd285419e48fef6997f7246ecf11c"; + sha256 = "d0c136dea2f7a7f745ee3de7b6a1d7044bb36b6695a5ee999a894a80c79a6496"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/tr/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/tr/thunderbird-153.3.1esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "17a35d1940e76985c5df047a1eebf3956f47ab4cbc10e41636780155766b581f"; + sha256 = "1473665827602439e9acb5528718849533aec55ffd06eebbacdbd9fc83d854a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/uk/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/uk/thunderbird-153.3.1esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6ec9cccd1c9f98bd5f8cdb67e6db34457caa986fdfdcdd3b76db65c4fb84ebe5"; + sha256 = "76770948cb2fea81a85d80099344f1b77fef4a182aeffdc8588623467cfb2821"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/uz/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/uz/thunderbird-153.3.1esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "10853b03fd69689a0c5384fc7347192016ca9598fa81098436015f9732834d03"; + sha256 = "fd668dc64a5d8603e229945ec8cf66aac1d19d41fd520b46fe0aed0b351aebdd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/vi/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/vi/thunderbird-153.3.1esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6be32bc2b4683775ead6b1dc53a63ba477f4044cb618f3c1370f5e64a7fc4091"; + sha256 = "2f00f55674e891c43e335aa56e1934da5b540f14c70f71dd9c57ced72f310b26"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/zh-CN/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/zh-CN/thunderbird-153.3.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b9d8a0bd63ba4e7b2f2994e485e297a8d08b395f1da4d5e2b6c971ec23f58bdb"; + sha256 = "e497d07dcd1923d7c9e7ef441d71c88be89ee56506ae07bd061ae9718c6bb391"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/linux-x86_64/zh-TW/thunderbird-153.3.0esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/linux-x86_64/zh-TW/thunderbird-153.3.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1e86f3b193e2fa77a22a7365bc77cfdeaefe2d5a6b19aeb715e3dc6683fead52"; + sha256 = "6aae23f4a6a23abe086b6a9572f38266b6929646cea98883d971ec52a8fa228e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/af/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/af/Thunderbird%20153.3.1esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "ddc93c59ef12200b76c7d05c45c2e9bfd3b064088d76821d6d143d1722d33089"; + sha256 = "a9b16d77f7bd47b5a2e28ec3bb56f6653cc7e873cdf3989b3bde710d7c92f62d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ar/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ar/Thunderbird%20153.3.1esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "59a3094173f46922c4078dde271ffbcc9d42f70933ecff23d0d4ecfb45451962"; + sha256 = "2d3c50b66ba3986af9c2d3c5eeb3bbd8d23df8690b4853b7c76739b0b3764f41"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ast/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ast/Thunderbird%20153.3.1esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "ea5242e7ec0ff36e056c39f9fb22a43c6748c4840474ac61070c2b8c2215acb6"; + sha256 = "a900ab973ce7f1c55492d8be58e081e78a2d210fe4751467f6db79476020c800"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/be/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/be/Thunderbird%20153.3.1esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "532793ca5b1f73e03474d9bec61970f1de921315d2298a5729b756e9eecc839e"; + sha256 = "51194380532d78eb266bf49ea8d754cbb03eae671f08eb87d5d9bd46ad980e04"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/bg/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/bg/Thunderbird%20153.3.1esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "ee549f9b488dedc85f435ae683c8f2362d1ac6ec11536e8a35dea17483285019"; + sha256 = "132ef9361e30939ddeba199f8e4949e9260192f77d27c70d32fbd7b7e9fa3cad"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/br/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/br/Thunderbird%20153.3.1esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "ebc0d45ebd91820835ff323144a52a02b2dfb2f7e2cf8938bb8365b643da212a"; + sha256 = "ba34d326fcdf1a1dc0bec8a7648851542c4a5bf9a2d0af42089efd8a53916623"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ca/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ca/Thunderbird%20153.3.1esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "a52bbfcc71e824fa0dec7b9c4b696d61d6bdc7bc2b9d49b7f97f1805063289bc"; + sha256 = "f81959cf329f87ba0c4977d5b07a22150471040fd91c7eb976b4ad2bfb1eacec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/cak/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/cak/Thunderbird%20153.3.1esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "523792172ec6a727aa584351494baf38318eff47376374e51592ee54d7c7c96f"; + sha256 = "9f1cb9f87af91fd44c51a020b371c7e188789683ee9bf3fc520c8449a75d23db"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/cs/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/cs/Thunderbird%20153.3.1esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "ac73ef25c5aedad87648597eb4a82a10766ee91e3d7956b97ce63e51462ca4e5"; + sha256 = "928bfd33a4cdf61896dad7c7a6e9a405a94e8c14bda9083cc53485f7d613bada"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/cy/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/cy/Thunderbird%20153.3.1esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "fde9084bb1de6c9e5dc966e498f620771a280b68f26dea6d7264ded361d5ed8f"; + sha256 = "a599cd06edf70eb54657e3b161f09a80752518c63a1c731bb7f827e02e9f29f3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/da/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/da/Thunderbird%20153.3.1esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "2d20af0366f19c8dbacd56189ef59e4a64602034b4d6d892835efaf9c2b8a4ed"; + sha256 = "73c511845e615b004cd037c6f36f2f1c7bc374846d0149ffb967b545d337eec4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/de/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/de/Thunderbird%20153.3.1esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "6d5513e529cba4f95f795909ef0790229cebb7700704b1dae0c0188a9a404c6d"; + sha256 = "8213811562b09c6238de8d138867c0d61a2ace729d35b47ee66f60aad2b96cac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/dsb/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/dsb/Thunderbird%20153.3.1esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "dccee659fa255ef7911236ec017cb49119f74d136f9266d5ec1d3c29a8ace6c1"; + sha256 = "e6cec7cfcbfb6c4d9c6bce9f8d800b03dc0b7c04bf0ec8c93644a54c04485bfa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/el/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/el/Thunderbird%20153.3.1esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "b03b3fb9ef370e786c912a5423fbcb4d4666668248e27fc88b3173d4f6d182af"; + sha256 = "b0d656905ce6276de6ad435cfeb35ae0751e032509166c96a8ffdc4bee29ae6b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/en-CA/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/en-CA/Thunderbird%20153.3.1esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "f259a6c9ca70b7b71a44492f428316e42686fd801fc5def65fc57433dacc612c"; + sha256 = "459ec737448a7ac951688aa980ffe1a2621c88e94bdaaa085e0e52a87ead10aa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/en-GB/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/en-GB/Thunderbird%20153.3.1esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "731d4e9072d6996e30e46c4c96b6889a3d6d81d1ce68a2f7422085655d0dabab"; + sha256 = "6c2e773d1ddb8f92c2f95804c1ccb2069e4811073056f3cb4c6b6f4111f761a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/en-US/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/en-US/Thunderbird%20153.3.1esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "b37604ef9f8b11c58785e218887f6af015857592636658a78b02d93f9174ce8c"; + sha256 = "0b4fb91a0e211eb5d98672c7986ebe80c5ee9eadcec0f392ba85e4b862afb138"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/es-AR/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/es-AR/Thunderbird%20153.3.1esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "41fc09195dfb583c769632da3b32e15807ead4bdfd5a7428b3b6a7e064bc00a3"; + sha256 = "b9a27f76404aa1056066aac7df50cbe424ad6b78c12e384ef4e00285e47fb9df"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/es-ES/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/es-ES/Thunderbird%20153.3.1esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "aed7bd29c5690047a80e934fd359babdfc4280c019ae58f92873950a90e6a01a"; + sha256 = "04bee554ffa6812e3edbb6ffaf7873fb396cf9083aeb810087c7323910c06750"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/es-MX/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/es-MX/Thunderbird%20153.3.1esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "f1e80862833e082d29e32c445cf8fd952ff4062a59bf8810ccbb260b936a7e26"; + sha256 = "9a9c0a81bed74ed09447f010112318359d9ce8909aa5982dde37fa6485ba2e2e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/et/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/et/Thunderbird%20153.3.1esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "45d8c64f683ac2d3c0a1abde0848393e2a1b665db740041964cbab2098ea8ac6"; + sha256 = "cb90c39b9ca17986e04728e939c7a442d9c3f27a9a1ef78f37863720a5807e70"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/eu/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/eu/Thunderbird%20153.3.1esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "1b2d83f7655763a00d9bb04136c00d996396113e8c219be36da5b0ccaedeff93"; + sha256 = "573e1d7713959aec57325a1785fb8f2a36b4591703f94061d6f8c371d03db693"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/fi/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/fi/Thunderbird%20153.3.1esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "30529dbf80b606f924493e8820db6635275d248016a20f059432a2e1b45875a3"; + sha256 = "0292812d2183de362edfb8357c034486ac341537bb2984aecba8911151d3a1b6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/fr/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/fr/Thunderbird%20153.3.1esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "9948176d61c90431015d0479bda3c8507efca4156504fefb845eda665750cca7"; + sha256 = "85420550347fffe0de9f1f00cec34c7979ae5294348b783c636b35264b1edf98"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/fy-NL/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/fy-NL/Thunderbird%20153.3.1esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "d5580f6ad01388d63c5c550b558f592ff37705d10ad8e4192ea2dfae922a5c8e"; + sha256 = "3bd87d34e03b33c7fe9e585b4997578b0f0149babbcfc7a52874be2ea449bad1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ga-IE/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ga-IE/Thunderbird%20153.3.1esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "819936f5a20f7e65bd682accb95e7d64f5aac2b410d5a9ae35b8a300634c07e6"; + sha256 = "ec58f12b7675cd16412cc92de5a6337943d4ad4c0faf324c4cd0bc2569508495"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/gd/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/gd/Thunderbird%20153.3.1esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "e601c50bb265b12fd7e0084c2af2b1d358d9716905554c4e9dbcc9e05cdd0dc3"; + sha256 = "f90cccbb91b4adb549939179e8860a56311a2d4021b9dbf05484ce9df10f79e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/gl/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/gl/Thunderbird%20153.3.1esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "1810393bfc91d9d690396e949f11c1c66ce9a562fe6dac8b9832622e4305f666"; + sha256 = "240c4aa71d08be83aa8a2b8870ca5ee0f639b07f2fd3f5fe218e085433339742"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/he/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/he/Thunderbird%20153.3.1esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "380857d8e353776215e9fd23ac22886853f51412394d63fb71ffe5ed853354e2"; + sha256 = "f4310f026d31fc7e6319f19ca2673e92a6e5f77834d001f3a0c8a2e720927fc8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/hr/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/hr/Thunderbird%20153.3.1esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "c37730187a8a76b7242828a197ea74c0404a42706a010a359a197c62f7997aa8"; + sha256 = "e89829ec2fa09c7ed063c7d7cb1d04b7b7a6d6e8a9cecd2ee97400c286219533"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/hsb/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/hsb/Thunderbird%20153.3.1esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "b2de0f7b73041e185a4ed43a0cb75b7ab9f303fd798b3a1696c49392efede9a4"; + sha256 = "4f9d06a106e039b996e86d2bbb3dea5c51798d18cf7997fb82b8aa74c8fdf0e4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/hu/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/hu/Thunderbird%20153.3.1esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "d2cc481fba0facec7c2e59311440db7075f9b5db208c866a52e17056313454cd"; + sha256 = "17316d11fe0128185123ca39f372faad921c99851d2be8cb10e9129c18213838"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/hy-AM/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/hy-AM/Thunderbird%20153.3.1esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "b8178458e732a3ba218f9c34b73a582b6fea58418c43ebd7b747da016ebeb594"; + sha256 = "40fa3a591fd2ab96277dd8d28cc5e2bafc50aa0d3e8fd29a8c57c7f8bdd1d76f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/id/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/id/Thunderbird%20153.3.1esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "7561cfefad65f0a118ec54ce9e092227037ab4d0e01d7050c220d49fa93c264b"; + sha256 = "6513219aba37e6fb6ff6b4fe01748c7bc53901f04b5adea8b8fac61342e0e67a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/is/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/is/Thunderbird%20153.3.1esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "5e26139cce634a7ab3afb79120b2c9e3371dcaf2d66b4dabd761ead36aa45a89"; + sha256 = "b68745de8c666a687a0fd49f19bfa620c6f9d5d2f973500896f0efa3e2f74430"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/it/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/it/Thunderbird%20153.3.1esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "461f1f372f0b95a702e5d1226600594b31e43ebf9aa88614f51986dbfe0a4a64"; + sha256 = "3d8f0824f6055257b1f9b9584fc5e50fceb8e6074a406b2f4407a05f53bc012c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ja-JP-mac/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ja-JP-mac/Thunderbird%20153.3.1esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "ee7fded813fd8a1b16e3ee6a5b4b2b8451f555b8a2fb0658aee59a18bdd2d54b"; + sha256 = "14b16dcdb21a7d791fdaad469b56f52fa1fae7526c30ea6a5ce70240a82ee404"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ka/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ka/Thunderbird%20153.3.1esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "de08e3b12b8ea06e30377877c4070bca5139ecdb87d12d338bd172184f96b09e"; + sha256 = "74c60a6f5d0839c5034fcdc525981541706f1d4ba9a9b0e6ad6c03f0d3bfa07f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/kab/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/kab/Thunderbird%20153.3.1esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "1e6f2655bcce6cfe58ab4064e7b35e3130f5b38e550504ae2424f518ea67990a"; + sha256 = "15b41bb6acc0478a718ae9d7a10afa2a09cebbf0ef623bf7b475f3334927d480"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/kk/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/kk/Thunderbird%20153.3.1esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "8e1aa01ab183f159f7c940a98e86861b87c65c402dad0ff679cdd4c14d14e2ec"; + sha256 = "fa79d0768e021c673072a8eeb15940d90a3f205fcd0365d163cde8942e458cdf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ko/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ko/Thunderbird%20153.3.1esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "00a29c4c9d56f6f8184266ff54f08c778d9e1dccc3630e7895e2470f0b996b83"; + sha256 = "baee7b135dce0e1673a257043c92ee81ca8461e6ccc906b8d5baff236426800f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/lt/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/lt/Thunderbird%20153.3.1esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "aaf1bc60d2696cc8c22915c7efa9028dd08d86508b87a4717abc418a59378af3"; + sha256 = "d891bfe70a3f70b3cb3613658333da439fc3b50bd2d6d15ee11833f177df0435"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/lv/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/lv/Thunderbird%20153.3.1esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "34a3de59f921f09f9efe11f5c4ef86255792349ae55968348ed5ab0e87d15e9a"; + sha256 = "48721164c419251b5cf92edbcae7dadbfbdc2feb087c4e5bc4f4696bd6a270cf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ms/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ms/Thunderbird%20153.3.1esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "6ab5a39aa008a69ea2ee4c2ac224f0485567926c0d1e95de44ef63371cdb496b"; + sha256 = "36964908867888893528a50f2fa67a0ffc762ff489ba8bbf7569cad3d8bfd288"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/nb-NO/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/nb-NO/Thunderbird%20153.3.1esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "4ffe53595dca94aa8cd988d4f9c725c921d21e36f689904531bd90e99b59078d"; + sha256 = "16ed6be405d4ed6ac28c2ddd3cc11cac7dced7e5688b82645f1bdbc82b08932e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/nl/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/nl/Thunderbird%20153.3.1esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "2f463b7dee857f50b97233bb691496e831e7668c6bb6674e7709c5a8e4e7832b"; + sha256 = "d75ef1764e9619ec7c3181433383b59611c017fdbb69e1c5852c5e58d1847931"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/nn-NO/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/nn-NO/Thunderbird%20153.3.1esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "13244ca8f3dd54529ad7369a5888ca9a275f2e3b5dcdbb57b22f492c4d9642ba"; + sha256 = "9a9bd1df6749c0bf941c64c02f215b46762ac0d6066b7b1d75f67d5a169f0b8a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/pa-IN/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/pa-IN/Thunderbird%20153.3.1esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "abe4764c06f2dcc4df87d26350a582c9e8bfa764f3b7779a1b08a45ba7140086"; + sha256 = "1e53f73f0ca60710fc269331ebe99845cec1d0ffe901d054067c8e0671a31e43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/pl/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/pl/Thunderbird%20153.3.1esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "d316cfb771899756fa255ea8f2811c1d55a827fcb899b3e74f9ac0e4a18499e6"; + sha256 = "9a49bc25ba7e416b9482d31d7408682c0da2d92dc05b8fe6c04f106a4f6e6263"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/pt-BR/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/pt-BR/Thunderbird%20153.3.1esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "67065b8f0ff6c60b1786f689e61f95bdbd4221dfec86f406ddd2159a69354e9d"; + sha256 = "abdcf9901ed03bb889062863fc10de4b07d64770eb79b393516bf3c370460917"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/pt-PT/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/pt-PT/Thunderbird%20153.3.1esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "39284c4e43271ad1e844d667c306fef0553dcc5e5ada9775c60325a4856335c5"; + sha256 = "8007488b88cd7915740c235759f064a0ff17261fe8dbdb6fdd82680283f0d2ba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/rm/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/rm/Thunderbird%20153.3.1esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "3e3c02bd5ffbe215047cba40af67f7d754755e6fd5607a4ce937475eb3455ec1"; + sha256 = "688928e522880fc087457dad04dcb8d6a875a199fa8c0ac54f20080c5b5cceff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ro/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ro/Thunderbird%20153.3.1esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "cfd66f5b67f998046e016d2eb7f0b6d3c4345dab8805346d500a7e9ad739abdb"; + sha256 = "71934b7d36714587bfdaa2e2cda8f7e8c615dd567ed81846219bd56e5dbbb52c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/ru/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/ru/Thunderbird%20153.3.1esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "40b81589364fa9c6a4d617f8a4bf82cdac6d334ce9c4ff1da2b2bb42ad6a16f5"; + sha256 = "e8393f853fd25788042987a653a4cbb9fe6a633acadb672d5fca4044f0fd6cb4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/sk/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/sk/Thunderbird%20153.3.1esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "0e868b5677afa7cbc0ec4f98e22bfaf046d0f3eec62a5c6427c9df74e4db281b"; + sha256 = "0e2ce863b16b2f7fec930f7b07d413fc63ab29d14cfc418df0c2a3a6b344c01e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/sl/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/sl/Thunderbird%20153.3.1esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "dfeaebd41e67739edb3ac3eb47a1ac96de71011ec6fbbf08921333579a9396f4"; + sha256 = "df6a469f426c032349418d3251df1ac21b3d54a8156557087c18bb2380537541"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/sq/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/sq/Thunderbird%20153.3.1esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "668b44a69adb21dcd9db067a96d96dfed1a2d014e22ed3f98d43bb17e630fdfd"; + sha256 = "72fc01dc1c83b202a676d741e73618c201b2642d1cd9a6ad38f3ed1ee6177fc7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/sr/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/sr/Thunderbird%20153.3.1esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "d1a950dd0f7639f38d036444b3518bd7fae6dc7f869e96f4a9928e6313139faf"; + sha256 = "d19d6c22fff14b7f62d0845217fa54067db92ba7bc3476a3d93ee06a72f576c9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/sv-SE/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/sv-SE/Thunderbird%20153.3.1esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "722cda6d6f1dc7834d90e765f3c25b42d1f1550836e9c987a3664fb3d2fcb55a"; + sha256 = "ef703b4a34bb0894ace264d0864b88cf6e4f9fc0a038cd0a39a8e61e42e4f5e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/th/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/th/Thunderbird%20153.3.1esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "bbaf0a1a53541a9a02696e56f8798d0b3161bfc9e93c0ecda11d8f546ca01f32"; + sha256 = "7b24d672bbca9ee062b719c7fe9f3469b9bbcb805c63fa0def93af3389835bf2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/tr/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/tr/Thunderbird%20153.3.1esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "4ccfc8ad37bbd8d15741acdbcc6c6650aca156b02f3418ab40dd04cace8cd814"; + sha256 = "4b93c5dceb634c04c51493f84725c20f01d44c688af2f6b40d2643afa61d787c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/uk/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/uk/Thunderbird%20153.3.1esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "5f3d5e1dd9c48e7021bf2cd57ed54a91fcbef5a7ca2a4f30e9061fac386c89df"; + sha256 = "740dd61de4bd9de79a75b0545bf4b7e67fc18fe5874905bf66884eee3cde3d0b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/uz/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/uz/Thunderbird%20153.3.1esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "6d3cea1ba85af1acdefccce84aa3f3bbb3776f6cbf9a27c25b8765fe0e9c704a"; + sha256 = "0af098366ff4e3f8441c919452cc8f7b2bf6b42e9a2e4a28b5fec43cdc337185"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/vi/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/vi/Thunderbird%20153.3.1esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "6a9f1257eac536d26978daf5b5ecfa0453f70d6b304d758cad9ffad6cca56ed8"; + sha256 = "d4aa8a54562e1e762d1936779b8366c0aaa349c7eac389e1ee76cf924dc566f4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/zh-CN/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/zh-CN/Thunderbird%20153.3.1esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "b0f5f81289373f711b13a9c97d0907a28206d9a77d80ff54419bbca5894b90f9"; + sha256 = "64047385dad1a8553c9b9da21c4b111ef8ab3ec57b990dbc5fa89ffe60fac5ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.0esr/mac/zh-TW/Thunderbird%20153.3.0esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/153.3.1esr/mac/zh-TW/Thunderbird%20153.3.1esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "c2e838bf8721eaaccd3e05d9a71e47bd4a392bab6db26a835d33c356f1c25d10"; + sha256 = "79bdaa79aca20521176bc32a75ab175e97c4e88ec5e5174a253bdb679fba49ef"; } ]; } diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 7ccf7b01888e..0dacd8b93c53 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -370,7 +370,15 @@ let # Aarch64 uses TLSDESC by default and the option is completely ignored (at least on LLVM). # TODO: Enable by default in GCC via --with-tls since https://gcc.gnu.org/cgit/gcc/commit/?id=96a291c4bb0b8a00b0a125e6a60f60072ffe53a7 (GCC 16). # No equivalent build-time option for LLVM yet. - ++ optional (tlsDialect != null) "-mtls-dialect=${tlsDialect}"; + ++ optional (tlsDialect != null) "-mtls-dialect=${tlsDialect}" + # LLVM default-enables AltiVec for powerpc64, and for many CPU targets that didn't actually have it. + # https://github.com/llvm/llvm-project/blob/40977001fcb190a509897aee592819cdd7e83740/llvm/lib/Target/PowerPC/PPC.td#L791-L796 + # GCC is more conservative: Requires selecting POWER7 or higher for auto-enable, or opting into it on older ones. + # If no CPU is specified, disable AltiVec like GCC does. + # TODO: Specify CPU + AltiVec preference? + ++ optional ( + (targetPlatform.isPower64 && targetPlatform.isBigEndian) && isClang && !(targetPlatform ? gcc.cpu) + ) "-mno-altivec"; defaultHardeningFlags = bintools.defaultHardeningFlags or [ ]; diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix index 58031c66fc51..daf6746a2fc2 100644 --- a/pkgs/by-name/_3/_3proxy/package.nix +++ b/pkgs/by-name/_3/_3proxy/package.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ misuzu ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "3proxy" finalAttrs.version; }; }) diff --git a/pkgs/by-name/a2/a2ps/package.nix b/pkgs/by-name/a2/a2ps/package.nix index 9a8383ac4132..3932dd0b1821 100644 --- a/pkgs/by-name/a2/a2ps/package.nix +++ b/pkgs/by-name/a2/a2ps/package.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ bennofs ]; platforms = lib.platforms.unix; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version; }; }) diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index e9fbecd9eed8..74d1945fe61f 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -4,15 +4,12 @@ fetchurl, }: -let - version = "6.2.4"; -in -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "activemq"; - inherit version; + version = "6.2.4"; src = fetchurl { - url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; + url = "mirror://apache/activemq/${finalAttrs.version}/apache-activemq-${finalAttrs.version}-bin.tar.gz"; hash = "sha256-/jvyO8cDQ666i8J53SXPS5WyBmN5GZwK6TVaDxXxJhM="; }; @@ -37,5 +34,6 @@ stdenvNoCC.mkDerivation { mainProgram = "activemq"; maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "apache" finalAttrs.version; }; -} +}) diff --git a/pkgs/by-name/an/anarchism/package.nix b/pkgs/by-name/an/anarchism/package.nix index c4b12ca509f5..63b7e8138933 100644 --- a/pkgs/by-name/an/anarchism/package.nix +++ b/pkgs/by-name/an/anarchism/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "anarchism"; - version = "15.3-1"; + version = "15.3-4"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "anarchism"; rev = "debian/${finalAttrs.version}"; - sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; + hash = "sha256-F3Mb/ulZQ4pRicqpilAhGwboDE9uAMdqzj7ziUhE1ik="; }; postPatch = '' diff --git a/pkgs/by-name/aw/awscurl/package.nix b/pkgs/by-name/aw/awscurl/package.nix new file mode 100644 index 000000000000..353cc5b693b3 --- /dev/null +++ b/pkgs/by-name/aw/awscurl/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "awscurl"; + version = "0.44"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "okigan"; + repo = "awscurl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XMPvAQ7O42HCdVHABe9GENNLIKrYzrpCdfh7dcym2Y8="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + awscrt + boto3 + botocore + configargparse + configparser + requests + urllib3 + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires internet + "tests/integration_test.py" + "tests/tls_test.py" + ]; + + meta = { + description = "Curl like tool with AWS request signing"; + homepage = "https://github.com/okigan/awscurl"; + changelog = "https://github.com/okigan/awscurl/releases/tag/${finalAttrs.src.tag}"; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + }; +}) diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 7281f56c231c..6540240cb62f 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -16,6 +16,7 @@ nixosTests, python3Packages, readline, + removeReferencesTo, replaceVars, zip, }: @@ -55,6 +56,7 @@ python3Packages.buildPythonApplication rec { flex llvmPackages.llvm makeWrapper + removeReferencesTo zip ]; @@ -112,8 +114,17 @@ python3Packages.buildPythonApplication rec { postFixup = '' wrapPythonProgramsIn "$out/share/bcc/tools" "$out ''${pythonPath[*]}" + '' + # Remove string refs to LLVM static libs that are unused at runtime and bloat closure by 2G + + '' + remove-references-to -t ${lib.getLib llvmPackages.llvm} -t ${lib.getLib llvmPackages.libclang} $out/lib/libbcc.so.* ''; + disallowedReferences = [ + (lib.getLib llvmPackages.llvm) + (lib.getLib llvmPackages.libclang) + ]; + outputs = [ "out" "man" diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index 1458d85511b8..929b4059573e 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -14,7 +14,7 @@ lzo, lzop, lz4, - openssl_3, + openssl_3_5, pkg-config, python3, rustPlatform, @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { dtc fontconfig lzo - openssl_3 + openssl_3_5 python3.pkgs.python-lzo ucl unzip diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix index c3be75ef4236..977950733ebc 100644 --- a/pkgs/by-name/ch/checkip/package.nix +++ b/pkgs/by-name/ch/checkip/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "checkip"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = "checkip"; tag = "v${finalAttrs.version}"; - hash = "sha256-O9+YR1EjTSABQdPJHPVTPnD4MAxFpa00Uq0fHV2OsE4="; + hash = "sha256-UPumm2ma+kiQkw8SKApreo415oJx2mkIT6/oUpj0s1A="; }; vendorHash = "sha256-pQCftl9hmTRUNzGssWmUqIkL6WfJXE30BVzDAPmDxPY="; diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix index b2ce705bf89f..110d2ce1e534 100644 --- a/pkgs/by-name/cl/claude-agent-acp/package.nix +++ b/pkgs/by-name/cl/claude-agent-acp/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "claude-agent-acp"; - version = "0.79.0"; + version = "0.81.2"; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "claude-agent-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xezx6CM44czWrfJ/1LyJkMXV33ufIfYKtNL7qeQCths="; + hash = "sha256-5c4WTVtG628EwQq7WXDbFLu1u8wSAjlI7HbXsTH5xDg="; }; - npmDepsHash = "sha256-d0UpoVGVC3q0jhgOAvGLqxul1J8ZO1bTwXprWg+FKc4="; + npmDepsHash = "sha256-0Zjla0bbKrRKMT7SfBOKYmnbMw6zq27ddD2wxnbqg/Y="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/cl/clinfo/package.nix b/pkgs/by-name/cl/clinfo/package.nix index 93e26b017066..3b34689387d8 100644 --- a/pkgs/by-name/cl/clinfo/package.nix +++ b/pkgs/by-name/cl/clinfo/package.nix @@ -4,17 +4,21 @@ fetchFromGitHub, ocl-icd, opencl-headers, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "clinfo"; - version = "3.0.25.02.14"; + version = "3.1.26.09.26"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; - rev = finalAttrs.version; - sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow="; + tag = finalAttrs.version; + hash = "sha256-5lM/6ULfw0xwXOZU2Kvc2h1oY7JBCvbAFuVn8mRvRX8="; }; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -24,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Print all known information about all available OpenCL platforms and devices in the system"; homepage = "https://github.com/Oblomov/clinfo"; diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index a57aecab1feb..06998cd9229f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -29,18 +29,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.157.0"; + version = "0.158.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-/f/k77vnFjPfnnf+X2E7rY2FxUR1xAcJZiPTv9Q8JVI="; + hash = "sha256-6ogqs75pG4+hxG6RqwBwJPWd3wGks2wBID/epha9+Ds="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-Mp4chq9QuQB19FrOZBhmUtPrDoEpZZna79+MZs9rGUo="; + cargoHash = "sha256-D8+caV6Q9H2JnZNhazV1kqgV0dePh3qQyXnRMgeSYak="; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index b306516db78d..22f5711b58a5 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-pmKJueAMGI4VYGSovf64IFNPClptCsQMJlXd9P4EkUE="; + hash = "sha256-jQPPb1ueUAJRnNtl1H37fRlEBkvXXcWlUoAxZbzvzbo="; }; - vendorHash = "sha256-1B6Vt9WIEGOM3wAj3YsWATiwkAmFa120y1pNFpNoTko="; + vendorHash = "sha256-tNeZj28CxOnb6qVGtGLIw2m3AB9Tczq8xbuAwnvz+qU="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/di/discord/sources.json b/pkgs/by-name/di/discord/sources.json index b698cd14b1ce..e9c55f32e6c2 100644 --- a/pkgs/by-name/di/discord/sources.json +++ b/pkgs/by-name/di/discord/sources.json @@ -1,662 +1,662 @@ { "linux-canary": { "distro": { - "hash": "sha256-kkLYr9nVUr5CMQyNBEX2cANF/wiRz/kKYJJ5gI79v+U=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/full.distro" + "hash": "sha256-u4BDfFut8koEMRENcSWUiXNO4A5VEXbP7Yau3Nkh4eA=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-4Y50lTC48Ur8fENeNeMu+8tr/kHMBNOI7pDpyFcXHuc=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_cloudsync/1/full.distro", + "hash": "sha256-OtdXA6Gb/K0SNf/hVorTvcdlKruWCyHmWeKtyXGvFYs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-jnWQzLb6Q6qIlSc0sw6SbfiY5KosNOH35W3Drqjvyn4=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_desktop_core/1/full.distro", + "hash": "sha256-oSCSTY/S3jHbSzb9EYtsqmCbrKQvCTbB7Wd+qvbDOF4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-dSbUUBn4lyIODirfv9GYn5V+/PAktHLmJYkkvOi0tXc=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_dispatch/1/full.distro", + "hash": "sha256-JwtutjBjBUCpwm3HeJEC65pSsRKadRMX8TG/BVWexx0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-vciMCkRNEwJhU4FHRMA+enbyboClfJSXUBcBU2IWXVQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_erlpack/1/full.distro", + "hash": "sha256-uiTu+4kbRvxfS5fGBx8I3RNDAfA8u+y3TIDdcCJ8xVs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-et6V5zOZ+5N1fUjnUN2z04WD5zheS8kf18i0d+SqqLA=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_game_utils/1/full.distro", + "hash": "sha256-3g5+GZUeS0rSMRwzxntegECqVo4b8mYgdingByAms3o=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-yawbABjydlAzI1e4mra91ECGFu0hQNFIq3eqa6y/H+o=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_krisp/1/full.distro", + "hash": "sha256-YoWde/uWpzhnO3JC4WKGBStQkAk9DwOqk1i+hYu/QLo=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-FyGW+WMvLHVm9mdl1Y96/ht5FqErjsJEntsYsROjjaU=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_modules/1/full.distro", + "hash": "sha256-RgwpoI1XCuQv3zc7dR+Ra1PeYF6utSyy/gWs8fQRn5g=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-bqAUXEeLn1cJWfcMzMiJg8sGuKwyw/XOhVrKTbuO8uc=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_rpc/1/full.distro", + "hash": "sha256-kgTEQS2xhZ89KRLbYF7GLU5L4WSxSP5J4Fj333TKaEs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-k/bXZskJaWm47sDMutkMEv8ogiTwoUBRaJ7xY621PAg=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_spellcheck/1/full.distro", + "hash": "sha256-Vcjti+8lmVru3OwcSlI6DmP2FPOCbo2NsYeilPQZuUw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-c3NS4fdPKAMwpvWUyUsQc3LlFlRHFVIzZFzd3T2Al4Y=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_sysimg/1/full.distro", + "hash": "sha256-Nx1+SXMmBFbOL2SIsUUhjo9U4yVLgVapMXUdht12PMU=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-bYdk3NO0AGGh2LORXrsDmw040jEElIBLIvve3AKicic=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_utils/1/full.distro", + "hash": "sha256-38Yw5bmhATZuncVELXANGmFa3L9XjaYRJnuF+P/8MdE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-KiVizr58o3jPMzWvCMkP4zl/9qMI+e4YpYLW3VWqU2o=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_voice/1/full.distro", + "hash": "sha256-68QTGzpm+JwhjaNaCAQbUgqQEPywK9eJNC9ukueTUiM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-zW2C8kSAPnKZrMIOKmxMomQAdRzVf13maYiZF071tmg=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1950/discord_zstd/1/full.distro", + "hash": "sha256-u3CMlGZn/AazRvVmC40Mc+OiDEdokoFkjdlOb2PLI70=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.2010/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1950" + "version": "1.0.2010" }, "linux-development": { "distro": { - "hash": "sha256-PzXNs3sUU9nNU/Bmk3o2RFOgmhvxLXo4wAlbNZ7PU/c=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/full.distro" + "hash": "sha256-4zKXGW0GsTgPI8zADOErg5YqZICWWJO4ND5/TOD1iak=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-w+6AmsWizltkFp1XsPP35wEDSjhwrIzfde+c/ij1N/c=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_cloudsync/1/full.distro", + "hash": "sha256-7WmL3OGf1KN5cA2vFk2QRPeNQsvwSZHBQSmK3sKB39Q=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-//2NLutNXbqUV0klfnyjz0uTEsAdkb4YZ/1u1zWQSwY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_desktop_core/1/full.distro", + "hash": "sha256-BQyAlQM9ccx0O9gq5dyox+qwY8GDJyaIGpX24OQLqqI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-bEH15s1h9X4t9TOdKjTFz1S1vqq7ncg6ubpEq3eZACc=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_dispatch/1/full.distro", + "hash": "sha256-RiiIbawRV6E185x+vyXlWyMaX5Kby0ezNDkPuAuGCLc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-PBcT0oahosqfiAuTcvlyf+aMPiqKbUay7+kwQ7ZTMYA=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_erlpack/1/full.distro", + "hash": "sha256-z4zmcxI0bwu1e2RrqJgyETqeofs4zvErFcIusxh9dBU=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-LxxAlpAtcBlPgQQBUpHlnLfFnS1i4yotH7nlUEYzAwo=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_game_utils/1/full.distro", + "hash": "sha256-rIfLBAJfgK5lA2M3KAe2iVeTPSf6JtoJB8bQOY3LKIk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-odG6EiRX445SnPA0/Rc4RHBf5oPQkT8o7UnnFT6DY70=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_krisp/1/full.distro", + "hash": "sha256-czwuwablQoZwNYmGDYSg7/QBv8BYvHqNZPZt1B0koNs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-Mz+mmwx/YOSTdJI6E4CLP6M7kgI59E2q3s9OMJaWSKE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_modules/1/full.distro", + "hash": "sha256-abUJ7DO8FXMpjL59OIRZPZW9ceIWSWaui6Gpe+gjkd4=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-YJBHH90EvW1vCvpV2eqzD+SYsS673nR/tu9LJ3wMIog=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_rpc/1/full.distro", + "hash": "sha256-RnoA44FbQpvG8RkaTici9BUgsFlCqEbBMBOdrBSGB08=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-StPxBI90qDECCcFjkKRtjTbXkV2LGkaKCfCT4nvs8WY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_spellcheck/1/full.distro", + "hash": "sha256-3Gp+TINtiO8FYzGWU+FQh5cmRrRIn21nBN6DSXr9kzI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-VKrAV3W/PuO0BJJHXLBnJgtNPA//uz5iBnhYDVQTP6U=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_sysimg/1/full.distro", + "hash": "sha256-mcUuZe5UTheBZFn+Us2KRFlTbzeea3Uq6P450mLmRHA=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-Yhl72RvngtDnEk9DYbFJlAURvnp4fZ4tut9abh1T/rE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_utils/1/full.distro", + "hash": "sha256-dUcITYjNytwjMCJpCxqG+phnMInXaespTTYZx4foWF8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-fHWUblRrEfUPAw5Mzf3PapUy1VuJbw5fltEUC35UV1g=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_voice/1/full.distro", + "hash": "sha256-4xuxMvgYlwel+uQbQs4oSXrv7mteqVCngfvEc5HA+s0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-5+5GC3MzL0KtKoUTLgyJNQ76/6TF6h2qFP78Upjo2NY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1011/discord_zstd/1/full.distro", + "hash": "sha256-DFtMCneWPEkEBSqi4ioZd8JS//yayU6bl5C1Mf8NYms=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1012/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1011" + "version": "1.0.1012" }, "linux-ptb": { "distro": { - "hash": "sha256-s/RwSM7DPqZxDMYuMHmo22jljfbx5KerOcHJuljulYc=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/full.distro" + "hash": "sha256-N3ArF9Tav7Q5wR72X0VscMek3ni53FZLYw2FYzZlbu8=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-/TeyYNGkhZCc48vdilbnj6mtNF8qPR358nqNzW9Axp4=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_cloudsync/1/full.distro", + "hash": "sha256-gtfZnvblu/W+RPTuGMFI2np1/l9HtANX2S8hCwEpv0E=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-L0Xd7LAjJPZviSqz7PtLyokexErsftLRFGASZZEeSPc=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_desktop_core/1/full.distro", + "hash": "sha256-YG5ky9Tjh72D5Fn13RxBC9OMssrC2I1pby9uu8VpRGo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-Jdey2Q+Z18FuVXiftkwlReWn/vhagc1VAUUKIEByuEo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_dispatch/1/full.distro", + "hash": "sha256-cMmC0SJrE85rzP9hlSacDqQDbcaY4cpxDh3LJXZ8JSY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-eQJSWb7QxD0+VTjwpTVoNRK9cexYoaT03PtjWHo6mqY=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_erlpack/1/full.distro", + "hash": "sha256-2gDYw4GtHTtQYJ0QAdxZL7VFvsXH8Dr0zibt1HjGakM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-M/WY0CFO+oJwCaZXZCMElQzyqXKHIYO6KYHa+eXMX3U=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_game_utils/1/full.distro", + "hash": "sha256-/QTEnfUo11386weXQRwuOHdd6y170moKrzXNX38W6cg=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-6iQ5Uc0fhbitrA3bqGDg/QGwhg1eRxmozICjdLp7ew4=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_krisp/1/full.distro", + "hash": "sha256-c8dePIzRa5rPYgiJp+GD2I3iQe3WKWxWzi6nYfmT/CE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-ixDayM+6WPNby4uA0PaY7Zfh2mDcVfVLIL4UOkQ00EU=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_modules/1/full.distro", + "hash": "sha256-4pN7046YFEsJWfSDXIe96XZu/Tp47/VofkFy+5ePB2g=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-Z7G0a86scg/Xv+gsBySePa/mqFTsorYMaEG5CzfdiUo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_rpc/1/full.distro", + "hash": "sha256-aKZAxcQVMlkd7S7cTQZmyMiaV9FXBAxVQlHZ+ZqPM3c=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-7l7WjfUpYZqNJH+UKK6VFIiwJel2lBUvFXP3fAIWS+I=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_spellcheck/1/full.distro", + "hash": "sha256-59xXGroYnNUB5KVu3bI2al9GwTyGVtQosf2+mCr8R1c=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-9didf/bVjeVwzcVou067Y0Ldz0wqOGn3LbebxscHSbU=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_sysimg/1/full.distro", + "hash": "sha256-VYoUWlrqMijuF2KkkcGQgiSZv1j5Dg+8AAAhAI4Xi1I=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-Oa41cb4ke9dzZDITG57Ve9ImUEqy1/1ZQzxtfQ0Fpt4=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_utils/1/full.distro", + "hash": "sha256-wovdHQ/7dxxBS7Tx8a1OVg8QEvNwFqWKG1fxQrUPmS8=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-furPy3bExrPIeQ1O2ADdsD9do9t9uTvcTH04YRvLAwY=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_voice/1/full.distro", + "hash": "sha256-Yt1IXIrvI3iJZIWSQQ63P0A80HTF0pKFlSICXEIlBSQ=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-wCf2oacXVQD6FhyjFEukAz4+AW82abGSanBIpJHNSBA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.215/discord_zstd/1/full.distro", + "hash": "sha256-n4Lt2O1C2igBtQNB6wORrxNDKp7jKF0yodc6uQtZ/+o=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.216/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.215" + "version": "1.0.216" }, "linux-stable": { "distro": { - "hash": "sha256-c+nKdZnTtTwc9aafZm2jW1sEAtlVRi8uh0iNWUQOlm0=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/full.distro" + "hash": "sha256-SS+fRoAZv/8V3YIPX4Ng/xukej6I1j2Jt1mru/TOGKk=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-RmuyIeOlDBLfzDjJ2jUB3c5ZVSErcvHCW2unLUHg0ns=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_cloudsync/1/full.distro", + "hash": "sha256-Flg1s5h1b4wO2Fa1jyxntXZAKsQjfGrwAp3f9qqv568=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-uzPT1BLb0NzGDJWKXwLHO8RThGOtY8NFCKnG0EJ/4Xw=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_desktop_core/1/full.distro", + "hash": "sha256-gCanHeTYXtRwRtM3qZIUeevUnn7/yUd2PqGtsz7FySY=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-6zH5+89RLni0Li0sdJIaIjLn5CogDr73P32D5B1F3wQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_dispatch/1/full.distro", + "hash": "sha256-Hf3z6mWRIPajBapg0zE6g/VIiq5wvDXv9bearVHW5JE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-+arjlg73Tx51zHLivza9q/+WJyht4zejAE+w2yzEAbc=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_erlpack/1/full.distro", + "hash": "sha256-ctkRMFtr4fteOEnSWBEUW7MjEkLtnQ0tn7upvjzmixg=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-K0Y7ab7BF6G3AfA3ANe9oc8I5mCQdEztmrygpLxPfJY=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_game_utils/1/full.distro", + "hash": "sha256-HmCDr5/AK/zuqFZkxbktxL6+WByFrSElXaHqriK70ek=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-O8X2GPqT2gJhEJUYsER70LbF+jiBCvDmRCNlEC5nkmo=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_krisp/1/full.distro", + "hash": "sha256-ySGOnM7ZVPWieeqvVcwv8Z007rJbnzNB27ww4cucVXY=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-tcUy0Ii3QmhJPueMVnaCl57Tej0e5669Uf2cRXVbsQQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_modules/1/full.distro", + "hash": "sha256-pJ1tYeVcS2/m7m8Ck3KNgHoUjjgclG3LNRCXRUhQT7I=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-wyuarTe5JtAcw8UmmtZekg5YD3V0raUAUr8j/AzH13Q=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_rpc/1/full.distro", + "hash": "sha256-0IX32PJf2oIvt9S7QakfdChgiW913WEpLCeU1vsKiCM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-isopidcTyr58OljFu/w7GiB/2i04Gdlh126p8b0/QxQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_spellcheck/1/full.distro", + "hash": "sha256-3wQlG3RzJOdvYDwSG87rB+l35T0w7L0JkVuHquAZvyE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-5kRFWLgOCGcw+ZJIkmPL2wkeT09lBolUAZpdKTZdJZk=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_sysimg/1/full.distro", + "hash": "sha256-xNqj+tpoupPzjTRQ/g8HrNcEEofEIdaqe8x5qlnOzec=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-X+bOVYfdRmKpU1K8/xIgzEpHrO/Vsj3DsRhG+jaAkwM=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_utils/1/full.distro", + "hash": "sha256-IQ3wyUNKkDqSHXnDya298I6ZTAmOQ+xqh7S/BTO0el8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-816qNKzW1rFlUrjZaA9GpgbG0WSlUI9Eer7xNFRfSVY=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_voice/1/full.distro", + "hash": "sha256-l9hesjeBC1gz3d24dzCruv0XyVoUTawaRSXihbni6mI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-qAaUpZStaaHtE+kIOm9k1T8i4V73ZFNrEXhL9OOwMdk=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.158/discord_zstd/1/full.distro", + "hash": "sha256-8ISi8oaI2XuhnHDs1z7AkG+W5wEG8uXAQAH1E1nYTv0=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.159/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.158" + "version": "1.0.159" }, "osx-canary": { "distro": { - "hash": "sha256-foYlo0SDly9prFFjJJdECzaiCvHk6aR22IqoQu9K5Es=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/full.distro" + "hash": "sha256-+hWiUN5Zg0Q1V+4kiJZ+Oy/jS5VrI7vqfxhBEPsY7Ik=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-QAT5NGm3fWRJ4I+H4oTb/TXZK0utQ/+7w4wxllrgyFA=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_cloudsync/1/full.distro", + "hash": "sha256-CkHf7h643AODJpf9WUg+V50SLDDm66iWa89IxJMGjUs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-pQqZ44EKceroUYXSYQA2t5JVeNa20aHnJhaNrDpnZb8=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_desktop_core/1/full.distro", + "hash": "sha256-45/Ql70030WSutoDXqwJXz+ceF37m//r1wg7mDpR0DQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-Ipm68HLNg4e1ps1AUV3iwBtIXIKURkLYfxT+AaAbK/Y=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_dispatch/1/full.distro", + "hash": "sha256-hL0Ok+Vot0Bx/0Zz9e/Y2iRvH8UBYRIuBpmTH4VZ870=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-Y1OaOVnTeHlsLhjsSup2yuEBQt95Xv9pwSlhHkJDeVQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_erlpack/1/full.distro", + "hash": "sha256-xM2LcBT7JGBX0+WKZpYcRjaxs91HdGWMc0H/TDh1440=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-VP1zfFW2tP41ZWNnG/jtOZH1rAybda8hhEDMMunxv50=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_game_utils/1/full.distro", + "hash": "sha256-ynQsKTEX1QZ28Xwvq4J6EpktRZQk6iLeAU8pjry3260=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-1up0zpSvJ2oUCixvB9D2P0R3qRq/Y5YGIPPTJYp7biE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_intents/1/full.distro", + "hash": "sha256-n/DsoWO8nYHEl4BPckeUny85xnAcJHRYqajRS8R9uLg=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-rom+cfEZGVra0HKBrE1FDwNJeEO2yDa4B5eLcGEorFE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_krisp/1/full.distro", + "hash": "sha256-ZtkZG1MRsOPESHsVtuDkfCobFe9sq06w4CFLBmLEt6M=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-50nldalt4w3OA7qVN+vIwnv7oSfLiTI1zBBRsQnXiwc=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_modules/1/full.distro", + "hash": "sha256-E2qC69Ff6ijiPvstZ7tRfBolQRvd4NUfUO4hR9rPvs0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-ULSWptb272NIKJQWECT31U5DbFldCEZ6B5DWQ3t2k7k=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_notifications/1/full.distro", + "hash": "sha256-0cObBRuHfAcO1iu9HmE03yoFzzQCSMUtHKBEi+VJoMw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-urT/XNnYijHiHsgxkqPldEljPUDIpCTFehOT990zPxE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_rpc/1/full.distro", + "hash": "sha256-+GUlU0TIP0BYpesGwwUCx8mTNNP9BczQnVJIjZTqp0w=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-CiQxFSF+cablkvAnyTKKA/kZN+lggFYyxA7QvxtB6+U=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_spellcheck/1/full.distro", + "hash": "sha256-/U3hEDhI0tE6ay34Fpav4XtGMsLRFfvqoZYb2qg++PE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-FHEs5c2Y+o1uzpVZyl2pbkevEq09vP3/WrkWejgvJsA=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_sysimg/1/full.distro", + "hash": "sha256-QDdz1K+MdWexh8EmUSHwHjwaTeDtNfZdTnj56N/M7yY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-GEep8dayYl1iTbT4WmTRGuxiNB+5efQQMUXyKIgsLcg=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_utils/2/full.distro", - "version": 2 + "hash": "sha256-N4OfoOgb+5wk+Xy+G5KVUmCLfTVp0Sh+XG0SpgAwdMk=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_utils/1/full.distro", + "version": 1 }, "discord_voice": { - "hash": "sha256-c2sOj115tQ+ExsNO6bx0MLnppM9nLZvPKlwNH0kbsPE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_voice/1/full.distro", + "hash": "sha256-aNncuumXBFu28I/1SqcwFtesbUR0i73eogXGS0K6rSI=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-mba9MCehjjmXCsX7yQiuE+D3e1yGk5ySHZ1ywhCGIVY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_webauthn/1/full.distro", + "hash": "sha256-SjOgWEuqWrTSiYf3IFNLR4O7UhUJpKBF7ehm6N8/Hn8=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-yceRyI1mwFIqqC4pFyDUdxG+2xHSpvN1G0kZFUbboFM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1338/discord_zstd/1/full.distro", + "hash": "sha256-UUwwShc/uQXafcqqrRIDQGpmkck9zcAVs/NxNn4Oiiw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1345/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.1338" + "version": "0.0.1345" }, "osx-development": { "distro": { - "hash": "sha256-j34jBIpe+8sAGXbtUG+73s4IIdJw4i4bPc/bOMJSUnI=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/full.distro" + "hash": "sha256-8BXfjTOpyU9KkhR9U/adsPChGFyfr4t0JUqnvW7aTkw=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-P99Th2hWHeA/MaRrJd/INdNcHt6eQTFuPL1JXaxQFOs=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_cloudsync/1/full.distro", + "hash": "sha256-L8fU45CnFo5OGKJY08hFtOIMJg3LZ7m6Dmn+lbaYYtY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-EuGvKSJs2XUKSGvpTB0CBjF7nBamPIbc2Ot7lwGRIf8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_desktop_core/1/full.distro", + "hash": "sha256-gw2S79nPa0eMTePiC4Vw1dKtGbZSLLYWpRljQaUqmQ8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-8q+c93ybDQyyXj/DyLYALzcH0RUh5cZzmGYbYIhX+vc=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_dispatch/1/full.distro", + "hash": "sha256-sAAT1Hk0qBJMe1liNh4KOv9kQSRbXmFy9iwZ42mR6TM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-srsr/YJsjAFODPGOCWoFjcm9y5p5HC9G3TT9lNFB/0c=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_erlpack/1/full.distro", + "hash": "sha256-10kIZjyAvpQsMDL/F6f72t9Edv+fQ0BlhT0BwTQPRM0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-GseqXKbcq1UjnkB3D3Aq87BH0bFczkJMINace14wVm4=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_game_utils/1/full.distro", + "hash": "sha256-caUv9DGk7Zgkeploix92aiVrJLwFHzzeWZsgbRQetkI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-HruFcXXVp+/hRIzrM/GxJ5o6J181cjRSiQOJmdGsKIo=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_intents/1/full.distro", + "hash": "sha256-4FaAvVLC6LNn3OGK7o6WOw/acx+pJYi7JxorgLUv8ro=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-QyQv3WU+49NNRa4FUH0N1DtwqA3aJc+GKVbC6GIJWxY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_krisp/1/full.distro", + "hash": "sha256-njAKEa5Txqxua0/TLLjXzM9o9LvYhmi+d2AW2L50IZ8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-UzO3gvaJEmcFLy5B9EkaogFYmq5wV3xf60tTsi8suqc=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_modules/1/full.distro", + "hash": "sha256-ybg2tgjH0A2Eh1vID8IX6yOeMqCN1nJ0WdB7FEHHX34=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-M8UZL4ttNHwDwkOUKS9MCMSG2DHevAP9EVq3aEM2l2Q=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_notifications/1/full.distro", + "hash": "sha256-pAiZqFb4weJK9PYHhAOyEokl9WXHtkIZDYg7LD7jw2s=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-xldghWB6kW2ycwpW2LsavqEUB+5GMQurwSQbE8d5nbU=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_rpc/1/full.distro", + "hash": "sha256-KyAKFjcAHzsSkD0b675ZZ2/JNotzUAcZSuLv2eq8jC4=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-vsbPbniKME4Pz9URegsdRVMYXYk5hju44IXHZhyIVXk=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_spellcheck/1/full.distro", + "hash": "sha256-W5vNRWPT9WCh4Sj4RsDlHSMYOumVUoNgegI6vdjJeJw=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-BmEwRieo8nmKwb8687Z0e+7cjNfVupPfEEIRnX7m8W0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_sysimg/1/full.distro", + "hash": "sha256-/l7hCtsk8uSla7PZrDl+SodJbPnbW8Jk1JdTRMCXAis=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-cl6QoHl69OypKQOTo0az8iIUu26yurTw0IJBpX9VJaQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_utils/1/full.distro", + "hash": "sha256-XB97VEE81GS3BJjhepLLtKc2pHYSetv3xvjDLHisYAw=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-4O+R1DTT2OT6ipuFnTXke6dDx9X0UH5r1PoxockklB0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_voice/1/full.distro", + "hash": "sha256-8YSoF8v72J+cZqKVLl4RwRHkLt4+M6K3/dmwiXCjh9E=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-6hs6uqleddLpbMwQjcALtpTfwKwwH2y5Jmb2zGVcnYE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_webauthn/1/full.distro", + "hash": "sha256-kA/gLGrv3fYmV4s+FLfeDuiAzTO0k6rWZLsglcNAhtM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-P59XFUV9TplXEadmlpkG4VFsJv2rHkPlDhT0zuq/ueE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1022/discord_zstd/1/full.distro", + "hash": "sha256-zQvjzYCROq80S7nxvh7ZB+7UzjI4cKEvMjwFm5WOQsA=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1023/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1022" + "version": "1.0.1023" }, "osx-ptb": { "distro": { - "hash": "sha256-mSNlj8rnIGyCy6NzG8/ewKuxNDCGcQ8Dz72UE6ismTA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/full.distro" + "hash": "sha256-MAGLes5B+aPzBymSTQeAHdxnlTnq4sJtx2sjcaJ6MJo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-OQppRBSrY+quwjufWNWTF1cu4FUcbUqdBK1sPBqgEMY=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_cloudsync/1/full.distro", + "hash": "sha256-iHFSgXOMM2DXe9mjMKO9fMYcDfEEp51azFtakjkEuVI=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-e0Un6UPUBwmYLT2keVp1Np0tjSQGudPjv+Qel294Opo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_desktop_core/1/full.distro", + "hash": "sha256-MJzmVMqAN84tdg6agPEAwhHchSld88gJ/PIIp7Q6EGw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-JvbOc6GVoNkoTEcTtyX14O8kEWPlYaGlc2U11swHGBo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_dispatch/1/full.distro", + "hash": "sha256-Y71+yng3J27Afm5UuEw2bjEmCT0mmT+6XiHqKykpOek=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-Rw1oi8mhXhdVLtKpOXEE6Fo9wBX1leaI8Bk7vAZJwM4=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_erlpack/1/full.distro", + "hash": "sha256-928dvTZ+PWeab1lFdm4xFlRlXAie7JhVxdwJlodqRLM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-v7XVUcicXSIBa15SF1MbsORS86DAdd4U/TukqVpeX44=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_game_utils/1/full.distro", + "hash": "sha256-diDb/GvLDV4CvfYd3/BzKvDAVDPqi8dtYP45k+yXUPw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-5uGUR3uibStXOFyEQbAdGNI1wmpKnpW3OkMG2KkA84c=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_intents/1/full.distro", + "hash": "sha256-+9MyDfY4Jn0eti8SyV+L/hdzvIPklPv9ti/K2y43aqc=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-QgPvd5gIGBxsNeMLIN2Cw112R6bzue5mqSpMFbSKWIQ=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_krisp/1/full.distro", + "hash": "sha256-Vi6vySAS8DX3uhuPYo3d7iwYysr9tCiWMcgCJhw5O7o=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-K2HCgoFeu3akrZu5fw7bVe24V/GRDaX+gC93w+8w1Gg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_modules/1/full.distro", + "hash": "sha256-+0CMAiLrNztUkWWpkYSr2iGyVN3U0SHyo7NMwCQ1jiw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-mlDAsASbOegs0jTNYFU7YgbTo76VH1H5bvuZsXpyKm8=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_notifications/1/full.distro", + "hash": "sha256-Xv+yEEDjx4LhuqeZBFYilpCRPjNZcFmJ67oC5pdOW5M=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-HJhesB23kp2n+XljXh/wfe71Clmu5q3rZ3s9siw34yA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_rpc/1/full.distro", + "hash": "sha256-SyoCN5Y9+bHtTDN/DURAbQwqbYdESKfT96rac1hEphI=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-5a95uPstZGhIe2+xRFbTvBShiRFb9Uvj+o673/oU11M=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_spellcheck/1/full.distro", + "hash": "sha256-LBt8BiDrWW3PhngSHuehz/ifKtsU8kNqqqgdcNUeydI=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-7RvJu3RarEcngf1hathR0GYnHWv76e/80Eh3SNs+avg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_sysimg/1/full.distro", + "hash": "sha256-ZSX0FBoZubctmDKoPdJzuuyWvy9HUKIsjoLYup2BmHk=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-7iufgt1WAjvbD7N4h0FJpbSmku3HKJDFCe2Fu+EkJIE=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_utils/1/full.distro", + "hash": "sha256-X9gcfeoLDCKZ4fF6BTpHnNtg0fEm2ocm/hGTjepFb+k=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-3GCJe2uZC8KHXoXC0oE4lazcIC2O4X4fWvOdgQyWwIo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_voice/1/full.distro", + "hash": "sha256-lKqhPHwWaE1lkiOuQUkTUdcT3GBgFZlyPu8f3uHDTOY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-Unq+9M0qGSTqfgRPF7SvOGJNNXeRTy2CdKiwaLxQMgo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_webauthn/1/full.distro", + "hash": "sha256-/qyheQ24l+D5kuzv08qx+3kJzce3ebwOj/ROqnMdKpE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-5HuLzGYlyGCvLYMkYDQES6pZZ031aDUykE6wS7Ji4fg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.261/discord_zstd/1/full.distro", + "hash": "sha256-dkw8xkHA6IkMbKjsZdoZrW4KUxRwZnyshJI+wwG1+JY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.262/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.261" + "version": "0.0.262" }, "osx-stable": { "distro": { - "hash": "sha256-y1EFe/iKsQi5AE7hrdGfAtu5rETSVx+WCXTt7dzqkGM=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/full.distro" + "hash": "sha256-QLObkBgCHPEytuT4mnBZrCyQgSvcU3mvPCrhYuJpt6w=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-XdlBxBeRhK2/sOs2KkkQzQeQI47Ufn7VvBiRoPhPbTY=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_cloudsync/1/full.distro", + "hash": "sha256-EW+QQr887OgQh4QhJBfq5d+n29Qkye0icm7Tpv0mCiM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-WLDGVinV5ov5rcjqLgi9I8v8ECtelg28XNpoHZbzgdg=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_desktop_core/1/full.distro", + "hash": "sha256-vOwayV7KcAV9VMsAJNjQd4Oc5SJIleUney5uji8+j5E=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-kGdXcmaQum45R53NcLjpcAjP2YIM0umj/SD+6Am9mfw=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_dispatch/1/full.distro", + "hash": "sha256-gGaIOeljjC88z4UKkBvgxOsiDhYyWKVh4rZCn8O4XIk=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-oQAfEjBLEvrNl4UVMOPOtmPTGpKuiP4IZr0uQcb6VqE=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_erlpack/1/full.distro", + "hash": "sha256-k44L+5yLKtx3jtUGddhtus6FU/2QeJLG3tpfvIPQv/g=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-qBUjYOKKXja2FjsGT9nxeET9mGk0ssoRUhR/c2IlDpI=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_game_utils/1/full.distro", + "hash": "sha256-CQHLfLekzrbFyaWIwAYXHXtTpkED4l6eX/2eTWlIh1M=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-0aovMmpJ45hkYU1FU+aNyz3NfGlPWtWxruVJZHvYqx0=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_intents/1/full.distro", + "hash": "sha256-FHbCbqG32t4slAI1pxl6BzghtKNz62qyeWHi075/zKY=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-Ey1rjgmnrYyMm78AqYNX7Vsj7paMwEhf9yR71C+hBgA=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_krisp/1/full.distro", + "hash": "sha256-KroterrE5sGmyCCJqHQUjupz0aPVBayQ+7bKUt+F/cQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-gkBXdLV1BhDL1bHBW8EE4aB2XcZGO/6fPsSnP566OLA=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_modules/1/full.distro", + "hash": "sha256-7LGp7cvRbtB3Ur0cV98gBmZLVLsJWQEuCXFLpG1OyeY=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-/V1z2UltdswJDlqthNebbC0XrEA7eqUdM2Qs7oN2wOY=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_notifications/1/full.distro", + "hash": "sha256-n98wITVAtU7LaH0OftU32Gk/fkyTszYf5Ofr5uqABw8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-m1O1hstTeyNX+rzIsM93csaLKMc7EA0NlRhJhlEmOgw=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_rpc/1/full.distro", + "hash": "sha256-DxjBxnhaHWopkN5tV1bnW034mC+u+UIY0ZWgwBpW15M=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-DlyHt6YM+2MYBthVCYmuXZ6iiEqtiiGU0BrigGyp4qM=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_spellcheck/1/full.distro", + "hash": "sha256-DhMB8KMC2AGDYK+iuD/qFgW8ZXnaxkB1+wkThRJ/Qyc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_spellcheck/1/full.distro", "version": 1 }, "discord_sysimg": { - "hash": "sha256-mTg8BsmYhn5F61OJ/LMl7l5Z5Rk5WdohwaWcPzrMpnM=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_sysimg/1/full.distro", + "hash": "sha256-nRAXBgDOe2rD233V/1oD4A48QYvxNsLDBXQkk6zs1W8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_sysimg/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-YyQnP2SEAdsEEVaSCzrzZOXkjMAW/mO+jInfsK8DgJQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_utils/1/full.distro", + "hash": "sha256-YC/2ClGXm7ASRk3S/KkdwtMvKeQUEwfvTrB90vw6F58=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-iuqRprvXPPCC3O3dYCdgp4DwR+BTeSYBo5iT4Fg24ck=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_voice/1/full.distro", + "hash": "sha256-dVweX8sFoI6CBysvSsq/yge2eYSBCTT9jcLRGplpH1E=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-pbtn1SwjadnCB22CcUtMWEVdCjPEsc4GgrtynWM2F9o=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_webauthn/1/full.distro", + "hash": "sha256-K3ngxy1FoozdYzd/8aihBcAuZXEHQaGCpeocBI81dPM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-ssFN8p8JGHqgGMNH+NzfXIBce+3w7ti2Mo4WPLHKMUc=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.412/discord_zstd/1/full.distro", + "hash": "sha256-yC8e6EGzHr7f8TpVVCE5yBB8J+p/3mQ8wuvajdY6mfM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.413/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.412" + "version": "0.0.413" } } diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index c63c7b213f3a..cd53c3ea4198 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-2WjzjBgM2GP2UlRT603X5825Iro41XL1roDJ0kbswd4="; + hash = "sha256-UuwE4ptOdrh00Rec7CjPPJoA9Qo4S19GwSbLNQn+Uac="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ei/eilmeldung/package.nix b/pkgs/by-name/ei/eilmeldung/package.nix index 0029b97024b2..57d1d99fcbdc 100644 --- a/pkgs/by-name/ei/eilmeldung/package.nix +++ b/pkgs/by-name/ei/eilmeldung/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eilmeldung"; - version = "1.8.1"; + version = "1.9.0"; __structuredAttrs = true; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "christo-auer"; repo = "eilmeldung"; tag = finalAttrs.version; - hash = "sha256-uU79OhQAGDEv+DWhQxOvYHRMBqG7CQ2Sor1cl6q/H30="; + hash = "sha256-Hq+MEeyJpsDCAHOavT6RWBUMe0SsS0OC8FoEfkqIM7s="; }; - cargoHash = "sha256-cv09uVsADTdnuTF5ZVPwNtwNIh2nM9QxfOilq1a7b7A="; + cargoHash = "sha256-fhiH215ZpwK89zm0cCFCzKcZjvs49LJZhRMmhK5ftkc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 304397931dc5..981004d5fdfa 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -58,20 +58,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; tag = "v${finalAttrs.version}"; - hash = "sha256-QAgYeWV37VtEnvoDvqEAqXoR1mRVVpyA4XqCPEXGSGk="; + hash = "sha256-S47A3l5IEKia06iUqgVo6gWkBLR8ncckNHKvlf591g4="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-0ZBSIIfZwxgtEGvedEEc7bbod2UUeFGGqquJna7cr8s="; + hash = "sha256-akLaHs+ERvsTsb8zCIS7vMNJo9h5cjn+60O/TatOxzE="; }; inherit matrix-js-sdk; diff --git a/pkgs/by-name/eu/eudev/package.nix b/pkgs/by-name/eu/eudev/package.nix index c28c7a9676fa..dd3a2e16b1a1 100644 --- a/pkgs/by-name/eu/eudev/package.nix +++ b/pkgs/by-name/eu/eudev/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eudev"; - version = "3.2.14"; + version = "3.2.15"; src = fetchFromGitHub { owner = "eudev-project"; repo = "eudev"; rev = "v${finalAttrs.version}"; - hash = "sha256-v/szzqrBedQPRGYkZ0lV9rslCH//uqGp4PHEF0/51Lg="; + hash = "sha256-dhMfdC/AOUsrd+QlhEnxTWDnt4jQRTtU/muTjY9F12M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix index 1283f597381f..1a8534f365e6 100644 --- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix +++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix @@ -3,7 +3,7 @@ fetchCrate, rustPlatform, pkg-config, - openssl_3, + openssl_3_5, protobuf, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config protobuf ]; - buildInputs = [ openssl_3 ]; + buildInputs = [ openssl_3_5 ]; src = fetchCrate { inherit (finalAttrs) pname version; hash = "sha256-IVkmZs3imzj8uN8kqEzN/Oio3H+Nqzu8ORjARNx1TpQ="; diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index 6930a21fdb62..79f4b42941fe 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -72,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.32.0"; + version = "3.32.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; tag = finalAttrs.version; - hash = "sha256-7VA1ZQxqt/bIjGh5YGNHfuSXXcWZB7F9Iy1d/iAlRVA="; + hash = "sha256-7Bk0Gh09/friNKqs9D7sNfVIZuYjXSs9fbnPD5MiLiE="; }; postPatch = '' diff --git a/pkgs/by-name/gi/github-copilot-app/package.nix b/pkgs/by-name/gi/github-copilot-app/package.nix index 7bada09a2a88..097a48f3282e 100644 --- a/pkgs/by-name/gi/github-copilot-app/package.nix +++ b/pkgs/by-name/gi/github-copilot-app/package.nix @@ -17,7 +17,7 @@ webkitgtk_4_1, atk, libsoup_3, - openssl_3, + openssl_3_5, libayatana-appindicator, }: @@ -69,7 +69,7 @@ stdenv.mkDerivation { webkitgtk_4_1 atk libsoup_3 - openssl_3 + openssl_3_5 libayatana-appindicator stdenv.cc.cc.lib ]; diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 1d5fc8812991..dfafb5fb6c85 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -2,6 +2,7 @@ lib, python314, fetchFromGitLab, + fetchpatch, callPackage, stdenv, makeWrapper, @@ -88,6 +89,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RGYD6HAFZZTSNJWd8n7/gMy9FkjZno9LO1jGxav5d9M="; }; + patches = [ + # support django-async-backend>=6.1 + (fetchpatch { + url = "https://gitlab.com/glitchtip/glitchtip-backend/-/commit/4cf8c9d1518f5835b71c0692a72b63d8a62bea4a.patch"; + includes = [ + "glitchtip/ingest_asgi.py" + "glitchtip/settings.py" + ]; + hash = "sha256-FwOJYSsJcJoqUwuHwHPWkzQqVB81Chex4RFTIhl82XM="; + }) + ]; + postPatch = '' echo 'import os ALLAUTH_TRUSTED_CLIENT_IP_HEADER = os.getenv( diff --git a/pkgs/by-name/go/go-librespot/package.nix b/pkgs/by-name/go/go-librespot/package.nix index bf87402a161d..8af2bdf9730c 100644 --- a/pkgs/by-name/go/go-librespot/package.nix +++ b/pkgs/by-name/go/go-librespot/package.nix @@ -56,7 +56,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ sweenu - emilylange ]; }; }) diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 2b6cee4cc1e3..ea1fcbcdf66d 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "gollama"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-LjgQSV7Z2apcdIaxk9NU7AdlPJPlt7CQ/q9nID9Px5w="; + hash = "sha256-Dms7RlZAEEuO07Ayir7RoCThxzj6+odhqhCAF4+BFWQ="; }; vendorHash = "sha256-xpAAtJIJtETbDYwieLBI7L79SedeAOmYnHL9zq6l7Rs="; diff --git a/pkgs/by-name/gr/gradm/package.nix b/pkgs/by-name/gr/gradm/package.nix index 72a72ec0afe7..eca591c5d42a 100644 --- a/pkgs/by-name/gr/gradm/package.nix +++ b/pkgs/by-name/gr/gradm/package.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = "rmdir $out/dev"; meta = { + # last successful hydra build on aarch64-linux was in 2018 + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; description = "grsecurity RBAC administration and policy analysis utility"; homepage = "https://grsecurity.net"; license = lib.licenses.gpl2Only; diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix index 967c9f753468..015fc55316b6 100644 --- a/pkgs/by-name/gr/grok-build/package.nix +++ b/pkgs/by-name/gr/grok-build/package.nix @@ -10,7 +10,7 @@ grok-build, }: let - version = "1.0.34"; + version = "1.0.41"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; @@ -26,9 +26,9 @@ let url = "https://x.ai/cli/grok-${version}-${upstreamPlatform}"; hash = { - x86_64-linux = "sha256-vlkF4QfSuLXzwULSHs/kyP0yqRPS/VUbeIcHkwxNyA0="; - aarch64-linux = "sha256-OauHZmh31k7zpAqmD74MO2pqzXABt4/mDix2u2z8SpQ="; - aarch64-darwin = "sha256-nNJrV5hA8PXJFIqAWa1lGQTAi0G38u8LTsBLm6iYhE4="; + x86_64-linux = "sha256-nOA+0j4W6gEHK0SWJj1iE6J4meHj4QfwCNNu34LnBAc="; + aarch64-linux = "sha256-fAuMlzr2p44gN/Ge2TAzRxuMXnIvn/BLhrCS4GbmDXQ="; + aarch64-darwin = "sha256-nIROsTNlGAeH2a0isrN0igJL6OHthFJTzBFHgbMcWR0="; } .${system}; } diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 5d20223d4676..49cc6b0d9784 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -6,7 +6,7 @@ libuuid, libx11, curlMinimal, - openssl_3, + openssl_3_5, libsecret, webkitgtk_4_1, libsoup_3, @@ -22,18 +22,13 @@ dbus, nixosTests, }: -let - curlMinimal_openssl_3 = curlMinimal.override { - openssl = openssl_3; - }; -in stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2607.4-noble"; + version = "1.2607.4-resolute"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb"; - hash = "sha256-bBhWI8U+QCynHaXJBtEGsZH7leW2AdavRJE7r5EcG9M="; + url = "https://packages.microsoft.com/ubuntu/26.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb"; + hash = "sha256-WXgzLH7umvB75obzTGYW+EZ3eE1zxdIJNFNKcaNY04s="; }; nativeBuildInputs = [ dpkg ]; @@ -45,8 +40,8 @@ stdenv.mkDerivation rec { stdenv.cc.cc libuuid libx11 - curlMinimal_openssl_3 - openssl_3 + curlMinimal + openssl_3_5 libsecret webkitgtk_4_1 libsoup_3 diff --git a/pkgs/by-name/in/intune-portal/update.sh b/pkgs/by-name/in/intune-portal/update.sh index fcb4312f2994..664974708870 100755 --- a/pkgs/by-name/in/intune-portal/update.sh +++ b/pkgs/by-name/in/intune-portal/update.sh @@ -1,7 +1,7 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl gzip dpkg common-updater-scripts -index_file=$(curl -sL https://packages.microsoft.com/ubuntu/24.04/prod/dists/noble/main/binary-amd64/Packages.gz | gzip -dc) +index_file=$(curl -sL https://packages.microsoft.com/ubuntu/26.04/prod/dists/resolute/main/binary-amd64/Packages.gz | gzip -dc) latest_version="0" diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix index 00bd58b27c0b..d3d49b8a1ff7 100644 --- a/pkgs/by-name/ku/kubernix/package.nix +++ b/pkgs/by-name/ku/kubernix/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kubernix"; - version = "0.3.7"; + version = "0.4.1"; src = fetchFromGitHub { owner = "saschagrunert"; repo = "kubernix"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-d+W7V/9TiEqG4q0MIq3Tan5XH/w7vJl5vpCax5Qf7r0="; + sha256 = "sha256-LO6WXXNkUf1rkjRuSHRWtfHtCL9oj+36cewrRc/KLdw="; }; - cargoHash = "sha256-83dfQnZ3/6k8fJIr5jyleX2ztevhttnSSfaHLJEWwks="; + cargoHash = "sha256-l1LMqGh7DGZAJdSRsbCqr1/5pA9rZYN8nJ3cMRuSR+Q="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix index c91b2123442e..e32af676d0b0 100644 --- a/pkgs/by-name/ky/kyverno/package.nix +++ b/pkgs/by-name/ky/kyverno/package.nix @@ -60,5 +60,6 @@ buildGoModule (finalAttrs: { LorenzBischof Scrumplex ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "kyverno" finalAttrs.version; }; }) diff --git a/pkgs/by-name/li/librespot-ma/package.nix b/pkgs/by-name/li/librespot-ma/package.nix index 83f0c936bff8..cae15d4ce400 100644 --- a/pkgs/by-name/li/librespot-ma/package.nix +++ b/pkgs/by-name/li/librespot-ma/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sweenu - emilylange ]; mainProgram = "librespot"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/li/libsecretspec-resolver/package.nix b/pkgs/by-name/li/libsecretspec-resolver/package.nix new file mode 100644 index 000000000000..58096b372347 --- /dev/null +++ b/pkgs/by-name/li/libsecretspec-resolver/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + yyjson, + nix-update-script, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libsecretspec-resolver"; + version = "0.21.0"; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "cachix"; + repo = "secretspec"; + tag = "v${finalAttrs.version}"; + hash = "sha256-12jIhLZhtyQwkt2vKHqjGOuKSwwevcxzp8Ii02RTMLY="; + }; + + cmakeDir = "../libsecretspec-resolver"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + propagatedBuildInputs = [ yyjson ]; + + doCheck = true; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + version = "1.0.0"; + versionCheck = true; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "C client for SecretSpec's local resolver protocol"; + homepage = "https://secretspec.dev"; + changelog = "https://github.com/cachix/secretspec/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + domenkozar + sandydoo + ]; + pkgConfigModules = [ "secretspec-resolver" ]; + }; +}) diff --git a/pkgs/by-name/se/secretspec-ffi/package.nix b/pkgs/by-name/li/libsecretspec/package.nix similarity index 73% rename from pkgs/by-name/se/secretspec-ffi/package.nix rename to pkgs/by-name/li/libsecretspec/package.nix index 6ba1be090952..bd9c639e718d 100644 --- a/pkgs/by-name/se/secretspec-ffi/package.nix +++ b/pkgs/by-name/li/libsecretspec/package.nix @@ -12,28 +12,28 @@ }: rustPlatform.buildRustPackage (finalAttrs: { - pname = "secretspec-ffi"; - version = "0.19.0"; + pname = "libsecretspec"; + version = "0.21.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "cachix"; repo = "secretspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-u6zfPsyLoktLQTE8OEDhK0GtiogOw/3ML4zpDVhSrX0="; + hash = "sha256-12jIhLZhtyQwkt2vKHqjGOuKSwwevcxzp8Ii02RTMLY="; }; - cargoHash = "sha256-ogeNTp94FJv7p+eZgrLUK1i63VCHiqHd7BsP+jDMHVc="; + cargoHash = "sha256-yqBAhnHBwKbSyH8sEDo6y0xGUdKJgHd3Gsr1sTS/bRc="; nativeBuildInputs = [ cargo-c ]; # Keep the static archive intact while removing non-exported symbols from the shared library. stripDebugFlags = if stdenv.hostPlatform.isDarwin then [ "-x" ] else [ "--strip-unneeded" ]; - stripExclude = [ "lib/libsecretspec_ffi.a" ]; + stripExclude = [ "lib/libsecretspec.a" ]; buildPhase = '' runHook preBuild - ${buildPackages.rust.envVars.setEnv} cargo cbuild -p secretspec-ffi -j $NIX_BUILD_CORES \ + ${buildPackages.rust.envVars.setEnv} cargo cbuild -p libsecretspec -j $NIX_BUILD_CORES \ --profile dist --frozen --prefix=${placeholder "out"} \ --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installPhase = '' runHook preInstall - ${buildPackages.rust.envVars.setEnv} cargo cinstall -p secretspec-ffi -j $NIX_BUILD_CORES \ + ${buildPackages.rust.envVars.setEnv} cargo cinstall -p libsecretspec -j $NIX_BUILD_CORES \ --profile dist --frozen --prefix=${placeholder "out"} \ --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkPhase = '' runHook preCheck - ${buildPackages.rust.envVars.setEnv} cargo ctest -p secretspec-ffi -j $NIX_BUILD_CORES \ + ${buildPackages.rust.envVars.setEnv} cargo ctest -p libsecretspec -j $NIX_BUILD_CORES \ --profile dist --frozen --prefix=${placeholder "out"} \ --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck @@ -68,8 +68,8 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ finalAttrs.finalPackage ]; } '' - $CC ${finalAttrs.src}/secretspec-ffi/tests/smoke.c \ - $(pkg-config --cflags --libs secretspec_ffi) \ + $CC ${finalAttrs.src}/libsecretspec/tests/smoke.c \ + $(pkg-config --cflags --libs libsecretspec) \ -o smoke ./smoke touch $out @@ -86,6 +86,6 @@ rustPlatform.buildRustPackage (finalAttrs: { domenkozar sandydoo ]; - pkgConfigModules = [ "secretspec_ffi" ]; + pkgConfigModules = [ "libsecretspec" ]; }; }) diff --git a/pkgs/by-name/lo/localsend/linux.nix b/pkgs/by-name/lo/localsend/linux.nix index 60aa62fd9aa5..82e96e534d25 100644 --- a/pkgs/by-name/lo/localsend/linux.nix +++ b/pkgs/by-name/lo/localsend/linux.nix @@ -93,7 +93,7 @@ flutter341.buildFlutterApplication (finalAttrs: { exec = "localsend_app %U"; icon = "localsend"; desktopName = "LocalSend"; - startupWMClass = "localsend_app"; + startupWMClass = "org.localsend.localsend_app"; comment = meta.description; genericName = "File Transfer"; categories = [ diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index d86b6763e5c0..3787237e4289 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.49.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-1DTVDv87OBtOEU6U53IWrTw7i2JN8TZJYAQepwc2ek8="; + hash = "sha256-Dk92uB9+y/E0l9Et2RbxH/u7rk5owyEYJbIFUWnko8I="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-yhMghVhY7TxFUYwbGVC5QwFyTAqakbYMq7jPSk88PIM="; + cargoHash = "sha256-oIxNpmw3q1DvBlaURUl8+AKud+gbGk8jD9Vw8utVRO4="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix index fa926431b0e1..d99af012fe54 100644 --- a/pkgs/by-name/ma/masterpdfeditor/package.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -21,11 +21,15 @@ stdenv.mkDerivation (finalAttrs: { src = let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; + makeUrls = url: [ + url + "https://web.archive.org/web/${url}" + ]; in fetchurl { - url = selectSystem { - x86_64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.x86_64-qt_include.tar.gz"; - aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz"; + urls = selectSystem { + x86_64-linux = makeUrls "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.x86_64-qt_include.tar.gz"; + aarch64-linux = makeUrls "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz"; }; hash = selectSystem { x86_64-linux = "sha256-ksVuJyuImstESVwHUmOUv6aERosg6g5bSsRvPSf5EVM="; diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index f2fe65c4dd78..ddc9e789ae92 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -15,10 +15,10 @@ mattermost.override ( # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.10.2"; - srcHash = "sha256-d4sOH9L2vawyiRLXIhZLzEqExiYbrdy/h0v4GZW7DNc="; - vendorHash = "sha256-k3JPDzrZzLeKb20o2aLZR/TX7dN7nhpQs6UZ5olvV94="; - npmDepsHash = "sha256-jDGUbBwxjZ50bbbnUJVMCzKJMlHYhUKy7Be9zsWjMqg="; + version = "11.11.0"; + srcHash = "sha256-QB7C3TCmrUgTUST6hUEIM143cUfiORyaYnP6I2t37b8="; + vendorHash = "sha256-FNZ6030d8Tro06ZlycN9lU9gd+7oxfuFciJOeLv+enQ="; + npmDepsHash = "sha256-5Bl+enzE3i8GBPjTtudvrOM9DjfNHL3CkMbNMXSH4AU="; autoUpdate = ./package.nix; }; } diff --git a/pkgs/by-name/mb/mbuffer/package.nix b/pkgs/by-name/mb/mbuffer/package.nix index 3f97cd83f925..a2d6aa42d45f 100644 --- a/pkgs/by-name/mb/mbuffer/package.nix +++ b/pkgs/by-name/mb/mbuffer/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mbuffer"; - version = "20260511"; + version = "20260926"; outputs = [ "out" "man" @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz"; - sha256 = "sha256-E7qzbzlAj3oI+zaJEykK0PEXyTS6tgIJThj8wSPsV4M="; + sha256 = "sha256-85kfZQJ51gsIpluJsc2SXy4xJGToT8YIeeBUtLsdXO4="; }; buildInputs = [ diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 57e4a45f3c25..b45fbe8285eb 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -37,30 +37,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-htFgvXYgxQXV2U3F+tXEoaTb0udc2H1aHsIg5E8nRL8="; + hash = "sha256-XYU2I3hFjtQJgHqwS6EyW5PDjPap7TG/92e1v/IXKQA="; }; - patches = [ - # Mir 2.29 compat, remove when version > 0.10.1 - (fetchpatch { - name = "0001-miracle-wm-remove-legacy-mir-optional-usage.patch"; - url = "https://github.com/miracle-wm-org/miracle-wm/commit/a4d7b21e0d25667cd270d7ff52f8dccc2a217796.patch"; - hash = "sha256-XBbYSuXUOS9Gbs/LwxbbTAVsFuH8xLj8VhoCAjmCDfQ="; - }) - ]; - - # Mir 2.29 compat, remove when version > 0.10.1 (97a40cd8879898062b2cf7b5d1f5252ffc3b8dce is more than just a compat change) postPatch = '' - substituteInPlace src/policy.{cpp,h} \ - --replace-fail 'handle_raise_window' 'handle_activate_window' - '' - + '' substituteInPlace CMakeLists.txt \ --replace-fail 'DESTINATION lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ --replace-fail '-march=native' '# -march=native' diff --git a/pkgs/by-name/mo/mobilizon/package.nix b/pkgs/by-name/mo/mobilizon/package.nix index 83c82c4bc4db..5df63c96cbc9 100644 --- a/pkgs/by-name/mo/mobilizon/package.nix +++ b/pkgs/by-name/mo/mobilizon/package.nix @@ -28,7 +28,6 @@ beamPackages.mixRelease rec { nativeBuildInputs = [ git - cmake ]; mixNixDeps = import ./mix.nix { diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 5ec0e8f640b1..3eb8225d6609 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -347,10 +347,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { ''; homepage = "https://github.com/music-assistant/server"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - hexa - emilylange - ]; + maintainers = [ ]; mainProgram = "mass"; }; }) diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index afd3ed653c1d..9b794b967296 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.92.0"; + version = "2.94.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-ZE+Flbtb9/opOIbjoFsNdl2oWx9yBOUxgA+Iu6zJC/E="; + hash = "sha256-kcGGqCFZtGog4BaKLHTTxz+90JlqUx5zt0TolwInaAo="; }; - npmDepsHash = "sha256-75Sc4MMW2HOCqfIngQbigVyzjHwNMeOhZumrm28K1o8="; + npmDepsHash = "sha256-oP01EmLkPK8EuAEc/Bh181uRoycmO2yvhCEII+FQdWM="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/nw/nwjs/package.nix b/pkgs/by-name/nw/nwjs/package.nix index 6a194eb08635..a1261e82f52a 100644 --- a/pkgs/by-name/nw/nwjs/package.nix +++ b/pkgs/by-name/nw/nwjs/package.nix @@ -1,50 +1,62 @@ { + lib, + stdenv, + fetchurl, + + # build-time + autoPatchelfHook, + buildPackages, + + # run-time alsa-lib, at-spi2-core, atk, - autoPatchelfHook, buildEnv, - buildPackages, cairo, cups, dbus, expat, - fetchurl, ffmpeg, fontconfig, freetype, gdk-pixbuf, glib, gtk3, - lib, + libGL, libcap, libdrm, - libGL, + libgbm, libnotify, libuuid, + libx11, libxcb, + libxcomposite, + libxcursor, + libxdamage, + libxext, + libxfixes, + libxi, libxkbcommon, - libgbm, + libxrandr, + libxrender, + libxscrnsaver, + libxshmfence, + libxtst, nspr, nss, pango, - sdk ? false, sqlite, - stdenv, systemd, udev, - libxtst, - libxscrnsaver, - libxrender, - libxrandr, - libxi, - libxfixes, - libxext, - libxdamage, - libxcursor, - libxcomposite, - libx11, - libxshmfence, + + # update script + writeShellApplication, + common-updater-scripts, + curl, + jq, + + # options + sdk ? false, }: let @@ -63,27 +75,27 @@ let gdk-pixbuf glib gtk3 + libGL libcap libdrm - libGL - libnotify - libxkbcommon libgbm - nspr - nss - pango + libnotify libx11 - libxscrnsaver libxcomposite libxcursor libxdamage libxext libxfixes libxi + libxkbcommon libxrandr libxrender - libxtst + libxscrnsaver libxshmfence + libxtst + nspr + nss + pango # libnw-specific (not chromium dependencies) ffmpeg libxcb @@ -98,16 +110,15 @@ let "out" ]; }; - - version = "0.115.0"; in -stdenv.mkDerivation { + +stdenv.mkDerivation (finalAttrs: { pname = "nwjs"; - inherit version; + version = "0.117.0"; src = let - flavor = if sdk then "sdk-" else ""; + flavor = if sdk then "sdk" else "normal"; arch = if stdenv.hostPlatform.is64bit then @@ -116,20 +127,8 @@ stdenv.mkDerivation { "arm64" else throw "nwjs: unsupported architecture."; - - # TODO: Write an update script to update all 4 hashes. - # nixpkgs-update: no auto update - hashes = { - "sdk-arm64" = "sha256-yhAQNZ4eMAZIouD+twxfWPgL91b8pRR7YzVODwu0npg="; - "sdk-x64" = "sha256-H1yRI+xR/7+TDQ6xaswrvqhJcObO9ZVm6qXIDT5FTQc="; - "arm64" = "sha256-RF2QCVIRKd00heZKyzirCr7ePLjlGza19u8CN4fcxT0="; - "x64" = "sha256-XlGTxRWd7jwmCXrgSG8q/0tciW21p8f1wr8a4n8rmNk="; - }; in - fetchurl { - url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${arch}.tar.gz"; - hash = hashes."${flavor + arch}"; - }; + finalAttrs.passthru.srcs."${flavor}-${arch}"; nativeBuildInputs = [ autoPatchelfHook @@ -138,11 +137,14 @@ stdenv.mkDerivation { (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; - buildInputs = [ nwEnv ]; + buildInputs = [ + nwEnv + ]; + appendRunpaths = map (pkg: (lib.getLib pkg) + "/lib") [ nwEnv - stdenv.cc.libc stdenv.cc.cc + stdenv.cc.libc ]; preFixup = '' @@ -169,6 +171,55 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru = { + srcs = + let + mkUrl = + flavor: arch: + "https://dl.nwjs.io/v${finalAttrs.version}/nwjs-${ + lib.optionalString (flavor == "sdk") "sdk-" + }v${finalAttrs.version}-linux-${arch}.tar.gz"; + in + { + normal-arm64 = fetchurl { + url = mkUrl "normal" "arm64"; + hash = "sha256-fYzBiRradqodDhIeI3rXYnGC/W/VrpKsLiuvtwiWL5w="; + }; + normal-x64 = fetchurl { + url = mkUrl "normal" "x64"; + hash = "sha256-KIHtHzqQMdWNj6DwcU0L2se0XVK97Alc1yqk8x4I3r8="; + }; + sdk-arm64 = fetchurl { + url = mkUrl "sdk" "arm64"; + hash = "sha256-2BHtclshr1mEovMTbyW0g0BNPgpsO2PcGSlpHxncvKQ="; + }; + sdk-x64 = fetchurl { + url = mkUrl "sdk" "x64"; + hash = "sha256-ZkQ7WgnrtDpW8xHpX8F4wBhTUG17cgM2BeqmsaFwTuw="; + }; + }; + + updateScript = lib.getExe (writeShellApplication { + name = "update-nwjs"; + runtimeInputs = [ + common-updater-scripts + curl + jq + ]; + text = '' + LATEST_VERSION="$(curl -sL https://nwjs.io/versions.json | jq -r '.stable' | sed 's/^v//')" + ARCHIVE_NAMES="${toString (lib.attrNames finalAttrs.passthru.srcs)}" + + for name in $ARCHIVE_NAMES; do + update-source-version nwjs "$LATEST_VERSION" \ + --source-key="passthru.srcs.$name" \ + --ignore-same-version \ + --print-changes + done + ''; + }); + }; + meta = { description = "App runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; @@ -176,7 +227,7 @@ stdenv.mkDerivation { "aarch64-linux" "x86_64-linux" ]; - changelog = "https://github.com/nwjs/nw.js/blob/nw-v${version}/CHANGELOG.md"; + changelog = "https://github.com/nwjs/nw.js/blob/nw-v${finalAttrs.version}/CHANGELOG.md"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ mikaelfangel @@ -185,4 +236,4 @@ stdenv.mkDerivation { mainProgram = "nw"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/ol/ollaya/package.nix b/pkgs/by-name/ol/ollaya/package.nix new file mode 100644 index 000000000000..15afe5bc07c6 --- /dev/null +++ b/pkgs/by-name/ol/ollaya/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cacert, + onnxruntime, + llama-cpp, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ollaya"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "ollaya-dev"; + repo = "ollaya"; + tag = "v${finalAttrs.version}"; + hash = "sha256-T4uY31ONSPsHdTtE6u89UCKDGIVX/cdyWTt+kEB0/cM="; + }; + + cargoHash = "sha256-IFFDMauewq3JOerPOEZy9a/HCBvYT+VbKOLXl+TPqfU="; + + buildInputs = [ onnxruntime ]; + + __structuredAttrs = true; + + env = { + ORT_STRATEGY = "system"; + ORT_LIB_LOCATION = "${lib.getLib onnxruntime}/lib"; + ORT_PREFER_DYNAMIC_LINK = "true"; + }; + + # The client tests hit local mock servers, but reqwest refuses to build a client without a trust store. + nativeCheckInputs = [ cacert ]; + + # GGUF runners dlopen llama.cpp from here and refuse any version but the one pinned in + # scripts/llama-cpp.sh, so llama-cpp must match it. + postInstall = '' + # ort's copy-dylibs duplicates onnxruntime next to the binary. + rm $out/lib/libonnxruntime* + mkdir -p $out/lib/ollaya + ln -s ${lib.getLib llama-cpp}/lib $out/lib/ollaya/llama + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Run open decision models locally behind a TypeSafe-compatible API"; + homepage = "https://ollaya.dev"; + changelog = "https://github.com/ollaya-dev/ollaya/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + mainProgram = "ollaya"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/om/omp/package.nix b/pkgs/by-name/om/omp/package.nix index 0dbc26ef5ff0..6f4f51e9dd0b 100644 --- a/pkgs/by-name/om/omp/package.nix +++ b/pkgs/by-name/om/omp/package.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "omp"; - version = "18.3.3"; + version = "18.4.2"; strictDeps = true; __structuredAttrs = true; @@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "can1357"; repo = "oh-my-pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-wyLc5yebo3EswxilJBxYVoXBon58to3OlaxIllq4ZQA="; + hash = "sha256-ULo5rPVhEFfOnIlkv61UzzPt3LBKqIki+G0xoYLcY1A="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-NquckJxx4Ibfy3PjUtxL+vfTceavMLRAaEgbqqneFsM="; + hash = "sha256-esJIhawsgBmJPCV2yiM5S1pamOPHSK0xaszYaBMikCw="; }; postPatch = '' @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # Prevents breaking symlinks in node_modules dontFixup = true; - outputHash = "sha256-0SpMVoWelw3FVNaDfM8yndXRrXb6K03xxoC7mym6hec="; + outputHash = "sha256-w9p8e0KlfTiqcxz0jMnIcnJI3zQiE8qIDAjjLRDodWo="; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index dc5a5a5c5ccc..f6fd8e3d1603 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,16 +14,16 @@ assert buildGoModule (finalAttrs: { pname = "opa-envoy-plugin"; - version = "1.20.2-envoy"; + version = "1.21.0-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZYLIlDXEDyQVSEHVRtlD0Pr57d/xMcTjHnPTIPMYreM="; + hash = "sha256-pMEr+kH5Z6j+nCz8gsqNqxbqDfVlVjJXfXJP/uZN4+I="; }; - vendorHash = "sha256-aBkqZpNY/4NS7wEgRrQ7SsPJ8ueTLRfILQHkFO1JUFE="; + vendorHash = "sha256-fFQPkUth2fCmLOIQbOhLy86/XXI8sw0qwTIkDuirh6I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 619927712215..9731d1834b20 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -101,6 +101,9 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; + # For dependents that compile the protos themselves. + passthru.opentelemetry-proto = opentelemetry-proto; + passthru.tests = { # Unfortunately there is no such thing as finalAttrs.finalPackage.override, # so we have to resort to this. diff --git a/pkgs/by-name/pl/plasticscm-client-core/package.nix b/pkgs/by-name/pl/plasticscm-client-core/package.nix index cc319f2cfaac..3c90b179b2f2 100644 --- a/pkgs/by-name/pl/plasticscm-client-core/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-core/package.nix @@ -29,7 +29,7 @@ buildFHSEnv { libz krb5.lib lttng-ust.out - openssl_3.out + openssl_3_5.out icu76 # Transitive dependencies from the Debian package diff --git a/pkgs/by-name/pl/plasticscm-client-gui/package.nix b/pkgs/by-name/pl/plasticscm-client-gui/package.nix index b52a27a4394b..b0b185b04df8 100644 --- a/pkgs/by-name/pl/plasticscm-client-gui/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-gui/package.nix @@ -36,7 +36,7 @@ buildFHSEnv { libgcc krb5.lib lttng-ust.out - openssl_3.out + openssl_3_5.out icu76 plasticscm-theme diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 326dcb9a630f..3b1fe9480eae 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -109,5 +109,8 @@ stdenv.mkDerivation (finalAttrs: { ]; mainProgram = "prismlauncher"; platforms = lib.platforms.linux ++ lib.platforms.darwin; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "prismlauncher" finalAttrs.version // { + product = "prism_launcher"; + }; }; }) diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index bc8ac03846f4..4b1143b8dccc 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -144,5 +144,6 @@ symlinkJoin { mainProgram platforms ; + identifiers = { inherit (prismlauncher'.meta.identifiers) cpeParts; }; }; } diff --git a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix index c3b457d3061a..5f408a0fd7cd 100644 --- a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { pname = "redis_exporter"; - version = "1.91.1"; + version = "1.92.1"; __structuredAttrs = true; @@ -20,10 +20,10 @@ buildGoModule (finalAttrs: { owner = "oliver006"; repo = "redis_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-0rX46q2tTobrE+TnecT4j0WenkwMOyrhmxkINL+4hxA="; + hash = "sha256-uMx8oArJHCA/bl+hbHeAe6xlb1dJspMevE29fQYicLQ="; }; - vendorHash = "sha256-N6GqUzrThX4uQ0S5RSNMya1WROGR7/kTFQJT0YNsf2Q="; + vendorHash = "sha256-CDnPvaXttKvNK2gMM5/pYJRCiZya9CzQC7UTwGOg2iw="; ldflags = [ "-X main.BuildVersion=${finalAttrs.version}" diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix index ede15a64791e..a46be88668db 100644 --- a/pkgs/by-name/rc/rclone-ui/package.nix +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -20,26 +20,26 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rclone-ui"; - version = "3.7.2"; + version = "3.7.5"; src = fetchFromGitHub { owner = "rclone-ui"; repo = "rclone-ui"; tag = "v${finalAttrs.version}"; - hash = "sha256-H/4qU1FJ+EHSdXB0DH8YrfUa8sKfXOGnwOZrQeQfLYI="; + hash = "sha256-7rNFJDx1Gsr9EywnRaToOdbZOhL4Yyz6Xpv+0Qhh638="; }; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; forceGitDeps = true; - hash = "sha256-i1czFB8EvS1KE8ukWp+02/K51FK/M9pabcNcbhtGWnM="; + hash = "sha256-fROZloUIz0Lqtu2oNSjhWtySAJO8ayp+6bLIVkYy/Ko="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-KVrHpJsB8yMknWPxXE3F/SdIlMoRhqFWmxdKe/HIIxE="; + cargoHash = "sha256-Mr+CMJ00a75J2bXGxoz9cj5cKgRG2pN45NnaIDbYA7g="; # Disable tauri bundle updater, can be removed when #389107 is merged patches = [ ./remove_updater.patch ]; diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix index e80dbf630a52..22f2c960908d 100644 --- a/pkgs/by-name/sg/sgxs-tools/package.nix +++ b/pkgs/by-name/sg/sgxs-tools/package.nix @@ -3,7 +3,7 @@ fetchCrate, rustPlatform, pkg-config, - openssl_3, + openssl_3_5, protobuf, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config protobuf ]; - buildInputs = [ openssl_3 ]; + buildInputs = [ openssl_3_5 ]; src = fetchCrate { inherit (finalAttrs) pname version; hash = "sha256-vLbSjDULrYL8emQTha4fhEbr00OlhXNa00QhCKCnWDc="; diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix index ea69348dc705..c739ca2cafb5 100644 --- a/pkgs/by-name/sn/snyk/package.nix +++ b/pkgs/by-name/sn/snyk/package.nix @@ -10,13 +10,13 @@ buildNpmPackage (finalAttrs: { pname = "snyk"; - version = "1.1307.1"; + version = "1.1307.4"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-VhbtP1aHIkYaPbptkJMT/cMAhqFeAwTwSZioIAUbO8k="; + hash = "sha256-DgTi2SYS+3S8C3PQap89N/M8m7u7Uya429ii6mxpofw="; # TODO: Remove once https://github.com/snyk/cli/pull/6924 is released. postFetch = '' @@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: { npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-mTP5Tyi41BhSaDjCallH6r+PAFd/UCqNLxUkk2DzcLE="; + npmDepsHash = "sha256-EcZ/JhTHwoqnkBQ1HrP9HjYS0pVoDybvDvs97X+sALw="; nodejs = nodejs_24; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index ee4d81fac1ec..b93e4c4d5d77 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-cli"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pf/Nriu0uRWNHHhWebrAlv+TRQgzUHDDrXhaWY6lz9M="; + hash = "sha256-8HiFxJT5mGZp/9al1y8Ycm5im+E0PMDhw2+XeJAabTY="; }; - cargoHash = "sha256-CesZQ/rDcQS1hxgUAwTzAKsuKq4MuIqUpGlEHcIdx5o="; + cargoHash = "sha256-Lj7wBLMqN4xP2GXicFGgIxkPrGi7F8i9KBSfFSn+KNk="; __structuredAttrs = true; # `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") }) nativeCheckInputs = [ cacert ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index c17d108fe8bb..be97984afdbb 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.115"; + version = "3.16.118"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-zukXKnH0Eb0FbXU9+Q3EWqIm+BCMrpGqwjC5so7JUAo="; + hash = "sha256-WGl+RRNR4daLTxSqzaJFdyned6jEOwGIy26Pk9ZUtFc="; }; outputs = [ diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 5d3177541bcd..c465d02ff8b2 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -26,6 +28,17 @@ rustPlatform.buildRustPackage (finalAttrs: { # Requires a running substrate node doCheck = false; + __structuredAttrs = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + # subxt exposes its version through a subcommand, not a --version flag + versionCheckProgramArg = "version"; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/paritytech/subxt"; description = "Subxt is a CLI tool for interacting with chains in the Polkadot network"; diff --git a/pkgs/by-name/to/tonearm/package.nix b/pkgs/by-name/to/tonearm/package.nix index 2efd58d4aa58..342e5a40b13c 100644 --- a/pkgs/by-name/to/tonearm/package.nix +++ b/pkgs/by-name/to/tonearm/package.nix @@ -42,12 +42,12 @@ in buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "tonearm"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromCodeberg { owner = "dergs"; repo = "Tonearm"; tag = "v${finalAttrs.version}"; - hash = "sha256-OUqKM9VFoQ732xL9d36QKHZlrH5dXH3xtxI3epZXbIM="; + hash = "sha256-+QSm4NSGJX+BoAPjyssCvItE8cRnVQJ9dmu06QAlzR0="; }; vendorHash = "sha256-pa0C0zMaKIa1wK49JIxHyfE1rbzzBB3yn44swlrR4HY="; diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 35add0725258..dcc65cfcfdc6 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -250,5 +250,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ Scrumplex ]; mainProgram = "unbound"; platforms = with lib.platforms; unix ++ windows; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "nlnetlabs" finalAttrs.version; }; }) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 647399a8cad2..4bbb48639808 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGo127Module (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.152.0"; + version = "1.153.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-3PDFQbVJhwyMUvA/ToXJKBOIN9xKoBGp/YjHntjwKr4="; + hash = "sha256-mp6BEoTsG0MJMOEUOVX0NcNlQRYNBKdGADTIlkWfexw="; }; vendorHash = null; diff --git a/pkgs/by-name/we/webkitgtk_6_0/package.nix b/pkgs/by-name/we/webkitgtk_6_0/package.nix index f42a5b9d32c3..925c2df29d72 100644 --- a/pkgs/by-name/we/webkitgtk_6_0/package.nix +++ b/pkgs/by-name/we/webkitgtk_6_0/package.nix @@ -28,7 +28,6 @@ libepoxy, libjxl, at-spi2-core, - cairo, expat, libxml2, libsoup_3, @@ -83,7 +82,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.52.6"; + version = "2.54.0"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -98,7 +97,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-F5ouo/j27dS+fzH9xVr8V70HKfH7pkjGHUGBU5rBFvw="; + hash = "sha256-hG/RnM7brh2/6QTybb8taKgAozpQyvKtUiLI3LPyVoI="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -115,6 +114,15 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; name = "fix_ftbfs_riscv64.patch"; }) + + # Fix https://bugs.webkit.org/show_bug.cgi?id=322394 + # Upstream PR: https://github.com/WebKit/WebKit/pull/74512 + # Fetching the patch vendored by gnome-build-meta because the upstream + # patch doesn't apply. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-build-meta/-/raw/7e4afe649fa1acbe9203004ad8fe1749c26e619d/patches/webkitgtk/main-thread.patch"; + hash = "sha256-Dm6Yytt4mQy7qxSWiudGBqfQUVJRhNAc1n+o/NMR1cg="; + }) ]; nativeBuildInputs = [ @@ -139,7 +147,6 @@ clangStdenv.mkDerivation (finalAttrs: { buildInputs = [ at-spi2-core - cairo # required even when using skia enchant expat flite diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index 4ec43d2f9c31..007882710ac1 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -111,7 +111,7 @@ effectiveBuildPythonApplication rec { owner = "Xpra-org"; repo = "xpra"; tag = "v${version}"; - hash = "sha256-OXcZs2bt+ub59buDkw56A3gfOnDHSYP7RBAFOBvwrKY="; + hash = "sha256-TXqnheJjq3WZZffbEPjS5/u/02OlJkDJ9IqyCabYr1E="; }; patches = [ diff --git a/pkgs/by-name/ya/yacreader/package.nix b/pkgs/by-name/ya/yacreader/package.nix index b678a634fa0d..60f758f726c2 100644 --- a/pkgs/by-name/ya/yacreader/package.nix +++ b/pkgs/by-name/ya/yacreader/package.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yacreader"; - version = "10.0.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "YACReader"; repo = "yacreader"; tag = finalAttrs.version; - hash = "sha256-nJ4S4ej/I+ifDNa3CPpusFpDsEwZwYDt0JLaebptjuU="; + hash = "sha256-ZNS6tRALPDrY322kE4+xXkxuMRV0+Yxw9aZ2RPy5HiU="; }; patches = [ @@ -42,9 +42,14 @@ stdenv.mkDerivation (finalAttrs: { ''; # Pipewire is dlopen'd, so we must tell it where to look - preConfigure = '' - qtWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ pipewire ]}") - ''; + # So is qtwebapp on macOS + preConfigure = + lib.optionalString stdenv.hostPlatform.isLinux '' + qtWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ pipewire ]}") + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + qtWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ qtwebapp ]}") + ''; strictDeps = true; __structuredAttrs = true; @@ -52,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # force unarr backend on all platforms (lib.cmakeBool "BUILD_SERVER_STANDALONE" onlyServer) - (lib.cmakeFeature "PDF_BACKEND" "poppler") (lib.cmakeFeature "DECOMPRESSION_BACKEND" "unarr") ]; @@ -89,20 +93,17 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$out"/Applications + mkdir -p "$out/Applications/YACReader.app/Contents/MacOS/languages" + mkdir -p "$out/Applications/YACReaderLibrary.app/Contents/MacOS/languages" + mkdir -p "$out/Applications/YACReaderLibraryServer.app/Contents/MacOS/languages" - cp -r YACReader/YACReader.app "$out"/Applications/ - cp -r YACReaderLibrary/YACReaderLibrary.app "$out"/Applications/ - cp -r YACReaderLibraryServer/YACReaderLibraryServer.app "$out"/Applications/ + cp -r bin/YACReader.app "$out"/Applications/ + cp -r bin/YACReaderLibrary.app "$out"/Applications/ + cp -r bin/YACReaderLibraryServer.app "$out"/Applications/ - cp -r release/server "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/ - cp -r release/server "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/ - cp -r release/languages "$out"/Applications/YACReader.app/Contents/MacOS/ - cp -r release/languages "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/ - cp -r release/languages "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/ - - makeWrapper "$out"/Applications/YACReader.app/Contents/MacOS/YACReader "$out/bin/YACReader" - makeWrapper "$out"/Applications/YACReaderLibrary.app/Contents/MacOS/YACReaderLibrary "$out/bin/YACReaderLibrary" - makeWrapper "$out"/Applications/YACReaderLibraryServer.app/Contents/MacOS/YACReaderLibraryServer "$out/bin/YACReaderLibraryServer" + find . -name "*.qm" ! -name "*_source.qm" -exec cp {} "$out/Applications/YACReader.app/Contents/MacOS/languages/" \; + find . -name "*.qm" ! -name "*_source.qm" -exec cp {} "$out/Applications/YACReaderLibrary.app/Contents/MacOS/languages/" \; + find . -name "*.qm" ! -name "*_source.qm" -exec cp {} "$out/Applications/YACReaderLibraryServer.app/Contents/MacOS/languages/" \; runHook postInstall ''; diff --git a/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch b/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch index 0de92f2311ce..7f8dd16eae0b 100644 --- a/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch +++ b/pkgs/by-name/ya/yacreader/qtwebapp-devendor.patch @@ -12,7 +12,7 @@ index 839072efe4..8b8a2a5dd4 100644 common_all comic_backend db_helper -+ PRIVATE ++ PUBLIC + PkgConfig::QtWebApp ) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index ac2536a46c92..686fedb24d6d 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -82,9 +82,14 @@ makeScopeWithSplicing' { inherit (pkgs.callPackages ./hooks { }) beamCopySourceHook beamModuleInstallHook + mixAppConfigPatchHook mixBuildDirHook mixCompileHook - mixAppConfigPatchHook + mixDepsCompileHook + mixEscriptSetupHook + mixFodDepsSetupHook + mixNixDepsSetupHook + mixReleaseSetupHook rebar3CompileHook rebarDevendorPatchHook ; diff --git a/pkgs/development/beam-modules/hooks/beam-copy-source-hook.sh b/pkgs/development/beam-modules/hooks/beam-copy-source-hook.sh index a4ffa9fd1413..bdc5056f553c 100755 --- a/pkgs/development/beam-modules/hooks/beam-copy-source-hook.sh +++ b/pkgs/development/beam-modules/hooks/beam-copy-source-hook.sh @@ -13,4 +13,6 @@ beamCopySourceHook() { echo "Finished beamCopySourceHook" } -postPatchHooks+=(beamCopySourceHook) +if [ -z "${dontBeamCopySource-}" ]; then + postPatchHooks+=(beamCopySourceHook) +fi diff --git a/pkgs/development/beam-modules/hooks/default.nix b/pkgs/development/beam-modules/hooks/default.nix index cb567537f628..495b9532cc5a 100644 --- a/pkgs/development/beam-modules/hooks/default.nix +++ b/pkgs/development/beam-modules/hooks/default.nix @@ -13,6 +13,11 @@ meta.license = lib.licenses.mit; } ./beam-module-install-hook.sh; + mixAppConfigPatchHook = makeSetupHook { + name = "mix-config-patch-hook.sh"; + meta.license = lib.licenses.mit; + } ./mix-app-config-patch-hook.sh; + mixBuildDirHook = makeSetupHook { name = "mix-configure-hook.sh"; meta.license = lib.licenses.mit; @@ -23,10 +28,30 @@ meta.license = lib.licenses.mit; } ./mix-compile-hook.sh; - mixAppConfigPatchHook = makeSetupHook { - name = "mix-config-patch-hook.sh"; + mixDepsCompileHook = makeSetupHook { + name = "mix-deps-compile-hook.sh"; meta.license = lib.licenses.mit; - } ./mix-app-config-patch-hook.sh; + } ./mix-deps-compile-hook.sh; + + mixEscriptSetupHook = makeSetupHook { + name = "mix-escript-setup-hook.sh"; + meta.license = lib.licenses.mit; + } ./mix-escript-setup-hook.sh; + + mixFodDepsSetupHook = makeSetupHook { + name = "mix-fod-deps-setup-hook"; + meta.license = lib.licenses.mit; + } ./mix-fod-deps-setup-hook.sh; + + mixNixDepsSetupHook = makeSetupHook { + name = "mix-nix-deps-setup-hook"; + meta.license = lib.licenses.mit; + } ./mix-nix-deps-setup-hook.sh; + + mixReleaseSetupHook = makeSetupHook { + name = "mix-release-setup-hook.sh"; + meta.license = lib.licenses.mit; + } ./mix-release-setup-hook.sh; rebar3CompileHook = makeSetupHook { name = "rebar3-compile-hook.sh"; diff --git a/pkgs/development/beam-modules/hooks/mix-app-config-patch-hook.sh b/pkgs/development/beam-modules/hooks/mix-app-config-patch-hook.sh index 1dd80c5e3e76..0537736c5a9e 100644 --- a/pkgs/development/beam-modules/hooks/mix-app-config-patch-hook.sh +++ b/pkgs/development/beam-modules/hooks/mix-app-config-patch-hook.sh @@ -16,4 +16,6 @@ mixAppConfigPatchHook() { echo "Finished mixAppConfigPatchHook" } -prePatchHooks+=(mixAppConfigPatchHook) +if [ -z "${dontMixAppConfigPatch-}" ]; then + prePatchHooks+=(mixAppConfigPatchHook) +fi diff --git a/pkgs/development/beam-modules/hooks/mix-build-dir-hook.sh b/pkgs/development/beam-modules/hooks/mix-build-dir-hook.sh index c353aaeabc4d..46af5755640e 100755 --- a/pkgs/development/beam-modules/hooks/mix-build-dir-hook.sh +++ b/pkgs/development/beam-modules/hooks/mix-build-dir-hook.sh @@ -5,9 +5,13 @@ mixBuildDirHook() { echo "Executing mixBuildDirHook" + local lib dir dest build_dir + mkdir -p _build/"$MIX_BUILD_PREFIX"/lib - while read -r -d ':' lib; do + while IFS= read -r -d ':' lib; do + [ -n "$lib" ] || continue for dir in "$lib"/*; do + [ -d "$dir" ] || continue # Strip version number for directory name if it exists, so naming of # all libs matches what mix's expectation. dest=$(basename "$dir" | cut -d '-' -f1) diff --git a/pkgs/development/beam-modules/hooks/mix-deps-compile-hook.sh b/pkgs/development/beam-modules/hooks/mix-deps-compile-hook.sh new file mode 100755 index 000000000000..aec8a9e39127 --- /dev/null +++ b/pkgs/development/beam-modules/hooks/mix-deps-compile-hook.sh @@ -0,0 +1,19 @@ +# shellcheck shell=bash +# +# This is needed for projects that have a specific compile step +# the dependency needs to be compiled in order for the task +# to be available. +# +# Phoenix projects for example will need compile.phoenix. + +mixDepsCompileHook() { + echo "Executing mixDepsCompileHook" + + mix deps.compile --no-deps-check --skip-umbrella-children + + echo "Finished mixDepsCompileHook" +} + +if [ -z "${dontMixDepsCompile-}" ]; then + postConfigureHooks+=(mixDepsCompileHook) +fi diff --git a/pkgs/development/beam-modules/hooks/mix-escript-setup-hook.sh b/pkgs/development/beam-modules/hooks/mix-escript-setup-hook.sh new file mode 100644 index 000000000000..f83f483ae93b --- /dev/null +++ b/pkgs/development/beam-modules/hooks/mix-escript-setup-hook.sh @@ -0,0 +1,30 @@ +# shellcheck shell=bash + +mixEscriptBuild() { + echo "Executing mixEscriptBuild" + + mix escript.build --no-deps-check + + echo "Finished mixEscriptBuild" +} + +mixEscriptInstall() { + echo "Executing mixEscriptInstall" + + runHook preInstall + + mkdir -p "$out/bin" + cp "$escriptBinName" "$out/bin" + + runHook postInstall + + echo "Finished mixEscriptInstall" +} + +if [ -z "${dontMixEscriptBuild-}" ]; then + postBuildHooks+=(mixEscriptBuild) +fi + +if [ -z "${dontMixEscriptInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=mixEscriptInstall +fi diff --git a/pkgs/development/beam-modules/hooks/mix-fod-deps-setup-hook.sh b/pkgs/development/beam-modules/hooks/mix-fod-deps-setup-hook.sh new file mode 100755 index 000000000000..2c5235050b58 --- /dev/null +++ b/pkgs/development/beam-modules/hooks/mix-fod-deps-setup-hook.sh @@ -0,0 +1,29 @@ +# shellcheck shell=bash + +mixFodDepsPostUnpack() { + echo "Executing mixFodDepsPostUnpack" + + if [ -n "${mixFodDeps-}" ]; then + # Compilation of the dependencies will require that the dependency path is + # writable, thus a copy to the $TEMPDIR is inevitable here. + export MIX_DEPS_PATH="$TEMPDIR/deps" + cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" + fi + + echo "Finished mixFodDepsPostUnpack" +} + +mixFodDepsPostConfigure() { + echo "Executing mixFodDepsPostConfigure" + + if [ -n "${mixFodDeps-}" ]; then + # Symlink deps to build root. Allows for mixFodDeps Phoenix projects to + # find javascript assets. + ln -s "$MIX_DEPS_PATH" ./deps + fi + + echo "Finished mixFodDepsPostConfigure" +} + +postUnpackHooks+=(mixFodDepsPostUnpack) +postConfigureHooks+=(mixFodDepsPostConfigure) diff --git a/pkgs/development/beam-modules/hooks/mix-nix-deps-setup-hook.sh b/pkgs/development/beam-modules/hooks/mix-nix-deps-setup-hook.sh new file mode 100755 index 000000000000..18edca00e514 --- /dev/null +++ b/pkgs/development/beam-modules/hooks/mix-nix-deps-setup-hook.sh @@ -0,0 +1,21 @@ +# shellcheck shell=bash +# +# Symlink dependency sources. This is needed for projects that require +# access to the source of their dependencies. For example, Phoenix +# projects need javascript assets to build asset bundles. + +mixNixDepsPostConfigure() { + echo "Executing mixNixDepsPostConfigure" + + local name + for name in "${!mixNixDeps[@]}"; do + if [ -d "${mixNixDeps[$name]}/src" ]; then + mkdir -p deps + ln -sv "${mixNixDeps[$name]}/src" "deps/$name" + fi + done + + echo "Finished mixNixDepsPostConfigure" +} + +postConfigureHooks+=(mixNixDepsPostConfigure) diff --git a/pkgs/development/beam-modules/hooks/mix-release-setup-hook.sh b/pkgs/development/beam-modules/hooks/mix-release-setup-hook.sh new file mode 100644 index 000000000000..81bd142fcc70 --- /dev/null +++ b/pkgs/development/beam-modules/hooks/mix-release-setup-hook.sh @@ -0,0 +1,91 @@ +# shellcheck shell=bash + +mixReleaseInstallHook() { + echo "Executing mixReleaseInstallHook" + + runHook preInstall + + mix release ${mixReleaseName:+"$mixReleaseName"} --no-deps-check --path "$out" + + runHook postInstall + + echo "Finished mixReleaseInstallHook" +} + +mixReleaseFixupHook() { + echo "Executing mixReleaseFixupHook" + + echo "Removing files for Microsoft Windows" + rm -f "$out"/bin/*.bat + + echo "Wrapping programs in $out/bin with their runtime deps" + find "$out/bin/" -type f -executable | while read f; do + wrapProgram "$f" --prefix PATH : "$mixReleaseRuntimePath" + done + + # shellcheck disable=SC2144 # this will only work for a single erts + if [ -e "$out"/erts-* ]; then + mixReleaseRemoveErlangReferences + fi + + echo "Finished mixReleaseFixupHook" +} + +mixReleaseRemoveErlangReferences() { + # ERTS is included in the release, then erlang is not required as a runtime dependency. + # But, erlang is still referenced in some places. To removed references to erlang, + # following steps are required. + + echo "Removing references to erlang" + + # 1. remove references to erlang from plain text files + for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do + substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" + done + + # 2. remove references to erlang from .beam files + # + # No need to do anything, because it has been handled by "deterministic" option specified + # by ERL_COMPILER_OPTIONS. + + # 3. remove references to erlang from normal binary files + for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do + echo "removing references to erlang in $file" + # use bbe to substitute strings in binary files, because using substituteInPlace + # on binaries will raise errors + bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file" + rm -f "$file" + mv "$file".tmp "$file" + done + + # References to erlang should be removed from output after above processing. +} + +mixReleaseRemoveCookieHook() { + if [ -e "$out/releases/COOKIE" ]; then + echo "Removing $out/releases/COOKIE" + rm "$out/releases/COOKIE" + fi +} + +mixReleaseStripDebugHook() { + # Strip debug symbols to avoid hardreferences to "foreign" closures actually + # not needed at runtime, while at the same time reduce size of BEAM files. + erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop +} + +if [ -z "${dontMixReleaseFixup-}" ]; then + preFixupHooks+=(mixReleaseFixupHook) +fi + +if [ -n "${removeCookie-1}" ]; then + preFixupHooks+=(mixReleaseRemoveCookieHook) +fi + +if [ -n "${stripDebug-}" ]; then + postFixupHooks+=(mixReleaseStripDebugHook) +fi + +if [ -z "${dontMixReleaseInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=mixReleaseInstallHook +fi diff --git a/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh b/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh index 032bf9b986fe..e0d1a45cfb84 100644 --- a/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh +++ b/pkgs/development/beam-modules/hooks/rebar-devendor-patch-hook.sh @@ -10,4 +10,6 @@ rebarDevendorPatchHook() { echo "Finished rebarDevendorPatchHook" } -prePatchHooks+=(rebarDevendorPatchHook) +if [ -z "${dontRebarDevendorPatch-}" ]; then + prePatchHooks+=(rebarDevendorPatchHook) +fi diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index fcb383936249..dd04c592d30b 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -12,11 +12,18 @@ ripgrep, bbe, makeWrapper, + writableTmpDirAsHomeHook, coreutils, gnused, gnugrep, gawk, mixBuildDirHook, + mixCompileHook, + mixDepsCompileHook, + mixEscriptSetupHook, + mixFodDepsSetupHook, + mixNixDepsSetupHook, + mixReleaseSetupHook, }@inputs: lib.extendMkDerivation { @@ -25,7 +32,6 @@ lib.extendMkDerivation { excludeDrvArgNames = [ "compileFlags" "erlangCompilerOptions" - "mixNixDeps" ]; extendDrvArgs = @@ -41,6 +47,7 @@ lib.extendMkDerivation { mixEnv ? "prod", mixTarget ? "host", compileFlags ? [ ], + mixCompileFlags ? compileFlags, # Build a particular named release. # see https://hexdocs.pm/mix/1.12/Mix.Tasks.Release.html#content mixReleaseName ? "", @@ -106,20 +113,22 @@ lib.extendMkDerivation { erlang elixir hex - git - mixBuildDirHook - ] - ++ - # Mix deps - (builtins.attrValues mixNixDeps) - ++ - # other compile-time deps - [ - findutils - ripgrep + bbe + findutils + git makeWrapper - ]; + ripgrep + writableTmpDirAsHomeHook + + mixBuildDirHook + mixCompileHook + mixDepsCompileHook + ] + ++ lib.optionals (escriptBinName != null) [ mixEscriptSetupHook ] + ++ lib.optionals (escriptBinName == null) [ mixReleaseSetupHook ] + ++ lib.optionals (mixFodDeps != null) [ mixFodDepsSetupHook ] + ++ lib.optionals (mixNixDeps != { }) ([ mixNixDepsSetupHook ] ++ (builtins.attrValues mixNixDeps)); buildInputs = [ bashNonInteractive @@ -158,147 +167,13 @@ lib.extendMkDerivation { } // (attrs.env or { }); - postUnpack = '' - # Mix and Hex - export MIX_HOME="$TEMPDIR/mix" - export HEX_HOME="$TEMPDIR/hex" + inherit erlang; - # Rebar - export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" - export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" - - ${lib.optionalString (mixFodDeps != null) '' - # Compilation of the dependencies will require that the dependency path is - # writable, thus a copy to the $TEMPDIR is inevitable here. - export MIX_DEPS_PATH="$TEMPDIR/deps" - cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" - ''} - '' - + (attrs.postUnpack or ""); - - configurePhase = - attrs.configurePhase or '' - runHook preConfigure - - # This is needed for projects that have a specific compile step - # the dependency needs to be compiled in order for the task - # to be available. - # - # Phoenix projects for example will need compile.phoenix. - mix deps.compile --no-deps-check --skip-umbrella-children - - # Symlink dependency sources. This is needed for projects that require - # access to the source of their dependencies. For example, Phoenix - # projects need javascript assets to build asset bundles. - ${lib.optionalString (mixNixDeps != { }) '' - mkdir -p deps - - ${lib.concatMapAttrsStringSep "\n" (name: dep: '' - dep_path="deps/${name}" - if [ -d "${dep}/src" ]; then - ln -sv ${dep}/src $dep_path - fi - '') mixNixDeps} - ''} - - # Symlink deps to build root. Similar to above, but allows for mixFodDeps - # Phoenix projects to find javascript assets. - ${lib.optionalString (mixFodDeps != null) '' - ln -s "$MIX_DEPS_PATH" ./deps - ''} - - runHook postConfigure - ''; - - buildPhase = - attrs.buildPhase or '' - runHook preBuild - - mix compile --no-deps-check ${lib.concatStringsSep " " compileFlags} - - ${lib.optionalString (escriptBinName != null) '' - mix escript.build --no-deps-check - ''} - - runHook postBuild - ''; - - installPhase = - attrs.installPhase or '' - runHook preInstall - - ${ - if (escriptBinName != null) then - '' - mkdir -p $out/bin - cp ${escriptBinName} $out/bin - '' - else - '' - mix release ${mixReleaseName} --no-deps-check --path "$out" - '' - } - - runHook postInstall - ''; - - postFixup = '' - echo "removing files for Microsoft Windows" - rm -f "$out"/bin/*.bat - - echo "wrapping programs in $out/bin with their runtime deps" - for f in $(find $out/bin/ -type f -executable); do - wrapProgram "$f" \ - --prefix PATH : ${ - lib.makeBinPath [ - coreutils - gnused - gnugrep - gawk - ] - } - done - '' - + lib.optionalString removeCookie '' - if [ -e $out/releases/COOKIE ]; then - echo "removing $out/releases/COOKIE" - rm $out/releases/COOKIE - fi - '' - + '' - if [ -e $out/erts-* ]; then - # ERTS is included in the release, then erlang is not required as a runtime dependency. - # But, erlang is still referenced in some places. To removed references to erlang, - # following steps are required. - - # 1. remove references to erlang from plain text files - for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do - echo "removing references to erlang in $file" - substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" - done - - # 2. remove references to erlang from .beam files - # - # No need to do anything, because it has been handled by "deterministic" option specified - # by ERL_COMPILER_OPTIONS. - - # 3. remove references to erlang from normal binary files - for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do - echo "removing references to erlang in $file" - # use bbe to substitute strings in binary files, because using substituteInPlace - # on binaries will raise errors - bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file" - rm -f "$file" - mv "$file".tmp "$file" - done - - # References to erlang should be removed from output after above processing. - fi - '' - + lib.optionalString stripDebug '' - # Strip debug symbols to avoid hardreferences to "foreign" closures actually - # not needed at runtime, while at the same time reduce size of BEAM files. - erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop - ''; + mixReleaseRuntimePath = lib.makeBinPath [ + coreutils + gnused + gnugrep + gawk + ]; }; } diff --git a/pkgs/development/libraries/openssl/3.0/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/3.5/nix-ssl-cert-file.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.0/nix-ssl-cert-file.patch rename to pkgs/development/libraries/openssl/3.5/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/openssl/3.0/openssl-disable-kernel-detection.patch b/pkgs/development/libraries/openssl/3.5/openssl-disable-kernel-detection.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.0/openssl-disable-kernel-detection.patch rename to pkgs/development/libraries/openssl/3.5/openssl-disable-kernel-detection.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 63e8a0d7899a..1fba67364174 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -54,14 +54,7 @@ let inherit version; src = fetchurl { - url = - if lib.versionOlder version "3.0" then - let - versionFixed = builtins.replaceStrings [ "." ] [ "_" ] version; - in - "https://github.com/openssl/openssl/releases/download/OpenSSL_${versionFixed}/openssl-${version}.tar.gz" - else - "https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz"; + url = "https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz"; inherit hash; }; @@ -419,36 +412,6 @@ in # - other versions in between only when reasonable need is stated for some package # - backport every security critical fix release e.g. 3.0.y -> 3.0.y+1 but no new version, e.g. 3.1 -> 3.2 - openssl_3 = common { - version = "3.0.22"; - hash = "sha256-Z+vKflDRc4MCgEVIZlNJIZW4PblfhVhwlwG7R7XB74E="; - - patches = [ - # Support for NIX_SSL_CERT_FILE, motivation: - # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e - ./3.0/nix-ssl-cert-file.patch - - # openssl will only compile in KTLS if the current kernel supports it. - # This patch disables build-time detection. - ./3.0/openssl-disable-kernel-detection.patch - - # Look up SSL certificates in /etc rather than the immutable installation directory - ( - if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch - ) - ] - ++ - # https://cygwin.com/cgit/cygwin-packages/openssl/plain/openssl-3.0.18-skip-dllmain-detach.patch?id=219272d762128451822755e80a61db5557428598 - # and also https://github.com/openssl/openssl/pull/29321 - lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch; - - withDocs = true; - - extraMeta = { - license = lib.licenses.asl20; - }; - }; - openssl_3_5 = common { version = "3.5.8"; hash = "sha256-qPhKOZGOxkFc52XZtCnTE7qXuBQxacFy5zS5UURk9bI="; @@ -456,11 +419,11 @@ in patches = [ # Support for NIX_SSL_CERT_FILE, motivation: # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e - ./3.0/nix-ssl-cert-file.patch + ./3.5/nix-ssl-cert-file.patch # openssl will only compile in KTLS if the current kernel supports it. # This patch disables build-time detection. - ./3.0/openssl-disable-kernel-detection.patch + ./3.5/openssl-disable-kernel-detection.patch # Look up SSL certificates in /etc rather than the immutable installation directory ( @@ -488,11 +451,11 @@ in patches = [ # Support for NIX_SSL_CERT_FILE, motivation: # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e - ./3.0/nix-ssl-cert-file.patch + ./3.5/nix-ssl-cert-file.patch # openssl will only compile in KTLS if the current kernel supports it. # This patch disables build-time detection. - ./3.0/openssl-disable-kernel-detection.patch + ./3.5/openssl-disable-kernel-detection.patch # Look up SSL certificates in /etc rather than the immutable installation directory ( @@ -517,11 +480,11 @@ in patches = [ # Support for NIX_SSL_CERT_FILE, motivation: # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e - ./3.0/nix-ssl-cert-file.patch + ./3.5/nix-ssl-cert-file.patch # openssl will only compile in KTLS if the current kernel supports it. # This patch disables build-time detection. - ./3.0/openssl-disable-kernel-detection.patch + ./3.5/openssl-disable-kernel-detection.patch # Look up SSL certificates in /etc rather than the immutable installation directory ( diff --git a/pkgs/development/libraries/openssl/openssl-3.0.18-skip-dllmain-detach.patch b/pkgs/development/libraries/openssl/openssl-3.0.18-skip-dllmain-detach.patch deleted file mode 100644 index 254fb1b30d44..000000000000 --- a/pkgs/development/libraries/openssl/openssl-3.0.18-skip-dllmain-detach.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- origsrc/crypto/dllmain.c -+++ src/crypto/dllmain.c -@@ -35,7 +35,9 @@ - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: -+# ifndef __CYGWIN__ - OPENSSL_thread_stop(); -+# endif - break; - case DLL_PROCESS_DETACH: - break; ---- origsrc/providers/fips/self_test.c -+++ src/providers/fips/self_test.c -@@ -95,7 +95,9 @@ - init(); - break; - case DLL_PROCESS_DETACH: -+# ifndef __CYGWIN__ - cleanup(); -+# endif - break; - default: - break; diff --git a/pkgs/development/libraries/openssl/3.0/legacy.cnf b/pkgs/development/libraries/openssl/openssl_legacy.cnf similarity index 100% rename from pkgs/development/libraries/openssl/3.0/legacy.cnf rename to pkgs/development/libraries/openssl/openssl_legacy.cnf diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch deleted file mode 100644 index 1699cbfb20e5..000000000000 --- a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h -index 329ef62..9a8df64 100644 ---- a/include/internal/cryptlib.h -+++ b/include/internal/cryptlib.h -@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); - #ifndef OPENSSL_SYS_VMS - #define X509_CERT_AREA OPENSSLDIR - #define X509_CERT_DIR OPENSSLDIR "/certs" --#define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+#define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" - #define X509_PRIVATE_DIR OPENSSLDIR "/private" - #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - #else diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch deleted file mode 100644 index 7750efbe0083..000000000000 --- a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h -index 329ef62..9a8df64 100644 ---- a/include/internal/cryptlib.h -+++ b/include/internal/cryptlib.h -@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); - #ifndef OPENSSL_SYS_VMS - #define X509_CERT_AREA OPENSSLDIR - #define X509_CERT_DIR OPENSSLDIR "/certs" --#define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" - #define X509_PRIVATE_DIR OPENSSLDIR "/private" - #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - #else diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix index 1642706cccdc..3539e21d24da 100644 --- a/pkgs/development/python-modules/aiojellyfin/default.nix +++ b/pkgs/development/python-modules/aiojellyfin/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/Jc2k/aiojellyfin"; changelog = "https://github.com/Jc2k/aiojellyfin/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bandcamp-async-api/default.nix b/pkgs/development/python-modules/bandcamp-async-api/default.nix index cc4f6f8e76e8..65f4b4796726 100644 --- a/pkgs/development/python-modules/bandcamp-async-api/default.nix +++ b/pkgs/development/python-modules/bandcamp-async-api/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "bandcamp-async-api"; - version = "0.2.4"; + version = "0.2.6"; pyproject = true; src = fetchFromGitHub { owner = "ALERTua"; repo = "bandcamp_async_api"; tag = finalAttrs.version; - hash = "sha256-Ui72fKzsDbDPISP4jDnkU7xZ8QhvrA0v2lhx6WNx87Y="; + hash = "sha256-JXW0pnIYIy+TmhmgRAk/arWC3RMTV23n1DTOwqyDPmY="; }; build-system = [ diff --git a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix index 1f08f03a4cbf..4096dbcadf3e 100644 --- a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix +++ b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { description = "Proof-of-origin token provider plugin for yt-dlp"; homepage = "https://github.com/Brainicism/bgutil-ytdlp-pot-provider"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = [ ]; mainProgram = "bgutil-ytdlp-pot-provider"; }; } diff --git a/pkgs/development/python-modules/django-async-backend/default.nix b/pkgs/development/python-modules/django-async-backend/default.nix index 63d8fd4ee26f..88dde3cc1d6e 100644 --- a/pkgs/development/python-modules/django-async-backend/default.nix +++ b/pkgs/development/python-modules/django-async-backend/default.nix @@ -9,8 +9,6 @@ postgresqlTestHook, psycopg, psycopg-pool, - pytest-django, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/duration-parser/default.nix b/pkgs/development/python-modules/duration-parser/default.nix index 506c3581df11..ca8790bc1694 100644 --- a/pkgs/development/python-modules/duration-parser/default.nix +++ b/pkgs/development/python-modules/duration-parser/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Minimal duration parser written in python"; homepage = "https://github.com/adriansahlman/duration-parser"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index 14c3bfe0c596..bb479117b88b 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -5,7 +5,7 @@ buildPythonPackage, }: let - version = "17.17.0"; + version = "17.19.0"; format = "wheel"; inherit (stdenvNoCC.hostPlatform) system; @@ -13,15 +13,15 @@ let pypiMeta = { x86_64-linux = { - hash = "sha256-0+Qjkxjvi0xUV8Wc3NaEsq+iwPLKIFnfZ/MMlrvhx5w="; + hash = "sha256-owM+l9+L3BgfhJaTPoTVcVjJ34ot3MakuAPKCl9dhLc="; platform = "manylinux1_x86_64"; }; aarch64-linux = { - hash = "sha256-VRuhYdwjGhN8MA7Ya3n+gF+PtZvAtmWCixUWCXLBWtQ="; + hash = "sha256-EoHA1lQQUdJyA/wFcNfBb/oZk3PM+sKMPcOfxFJcP28="; platform = "manylinux2014_aarch64"; }; aarch64-darwin = { - hash = "sha256-PzgClRZVAPbQ3Z41kidWNqYBKioYE+YrOuFYqwep7tM="; + hash = "sha256-nNmLnZx98FEBcVibRFtorpiElvY9ws54R0nfZcYHO34="; platform = "macosx_11_0_arm64"; }; } diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index ac16a1a462d0..fab95b36d054 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.14"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "dermotduffy"; repo = "motioneye-client"; rev = "v${version}"; - hash = "sha256-kgFSd5RjO+OtnPeAOimPTDVEfJ47rXh2Ku5xEYStHv8="; + hash = "sha256-YNeq0rmJWrOOW5zWAY+mshfB4EDXAXBHsC27O2EluGw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index e725257dd9f7..16487cc42e4b 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/khers/py-opensonic"; changelog = "https://github.com/khers/py-opensonic/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index 07a20eb33c29..4156ae9f5ce7 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -50,6 +50,10 @@ buildPythonPackage (finalAttrs: { disabledTests = [ # Asserts a specific exiv2 version "test_version" + # Broken with exiv2 0.28.9, remove on next version bump + "test_read_raw_xmp" + "test_modify_raw_xmp" + "test_memory_leak_when_reading" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index b1c6b0991f64..a04918d94678 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -7,16 +7,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysigma-pipeline-windows"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; - tag = "v${version}"; - hash = "sha256-2S4vWneBNKq/FwhDs4Iref9hvEbcqvG/MOSTMYd7crU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Hd4Gk8b5IAHaOdBVNLNYGXhuuT8oXVC/r/VyuH8vD2U="; }; build-system = [ poetry-core ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Library to support Windows service pipeline for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-pipeline-windows"; - changelog = "https://github.com/SigmaHQ/pySigma-pipeline-windows/releases/tag/${src.tag}"; + changelog = "https://github.com/SigmaHQ/pySigma-pipeline-windows/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 145a04d48aaa..407a64b2036a 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,12 +12,12 @@ buildPythonPackage (finalAttrs: { pname = "pytapo"; - version = "3.4.18"; + version = "3.4.19"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-N8s4L8quSWlChU4BSKnLDqY6WboJbcuYLNaFwPEeNnI="; + hash = "sha256-iwF7f5pwcYFBw6mPQw2YgRIcElqrcTMpzGCNJsttJY8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-mpd2/default.nix b/pkgs/development/python-modules/python-mpd2/default.nix index 09bd308fd74c..463f5729155d 100644 --- a/pkgs/development/python-modules/python-mpd2/default.nix +++ b/pkgs/development/python-modules/python-mpd2/default.nix @@ -34,7 +34,6 @@ buildPythonPackage (finalAttrs: { license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ mic92 - hexa ]; }; }) diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index d4343e3bfa5a..bdcacac983df 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { description = "High quality, one-dimensional sample-rate conversion library"; homepage = "https://github.com/dofuuz/python-soxr/tree/main"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tomlrt/default.nix b/pkgs/development/python-modules/tomlrt/default.nix index 336324a556b0..19a427687c73 100644 --- a/pkgs/development/python-modules/tomlrt/default.nix +++ b/pkgs/development/python-modules/tomlrt/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "tomlrt"; - version = "2.2.7"; + version = "2.2.14"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-tfZZ0Jq/YNIAONrLNH5yC85PmX8iiteruoCMUvBriBU="; + hash = "sha256-VUTZvyKeum3Ic3wY3iiwayIsbwmS8OXNBCyLLp45fsI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/types-mysqlclient/default.nix b/pkgs/development/python-modules/types-mysqlclient/default.nix index ca26a39e0f25..a381ac7d02f3 100644 --- a/pkgs/development/python-modules/types-mysqlclient/default.nix +++ b/pkgs/development/python-modules/types-mysqlclient/default.nix @@ -5,7 +5,7 @@ setuptools, }: let - version = "2.2.0.20260508"; + version = "2.3.0.20260923"; in buildPythonPackage { inherit version; @@ -15,7 +15,7 @@ buildPythonPackage { src = fetchPypi { inherit version; pname = "types_mysqlclient"; - hash = "sha256-DrNMz7yF4vf9V3JyNlGtKGPjayeHADO+/ka+crqfz+I="; + hash = "sha256-+Fy8ikS2wUDiqARUb0bKPUezU3z/fDPId5iKI/cP/6Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/untokenize/default.nix b/pkgs/development/python-modules/untokenize/default.nix index b12a9f382db7..d20b84fd01de 100644 --- a/pkgs/development/python-modules/untokenize/default.nix +++ b/pkgs/development/python-modules/untokenize/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, unittestCheckHook, }: @@ -11,14 +10,18 @@ buildPythonPackage rec { version = "0.1.1"; format = "setuptools"; - # https://github.com/myint/untokenize/issues/4 - disabled = pythonAtLeast "3.14"; - src = fetchPypi { inherit pname version; sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2"; }; + # the deprecated ast.Constant.s alias was removed in Python 3.14 + # https://github.com/myint/untokenize/pull/6 + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "body[0].value.s" "body[0].value.value" + ''; + nativeCheckInputs = [ unittestCheckHook ]; meta = { diff --git a/pkgs/development/python-modules/xml-marshaller/default.nix b/pkgs/development/python-modules/xml-marshaller/default.nix index cd96138b2341..d1e069e63c8f 100644 --- a/pkgs/development/python-modules/xml-marshaller/default.nix +++ b/pkgs/development/python-modules/xml-marshaller/default.nix @@ -9,7 +9,7 @@ buildPythonPackage (finalAttrs: { pname = "xml-marshaller"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; __structuredAttrs = true; @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "xml_marshaller"; inherit (finalAttrs) version; - hash = "sha256-QvBALLDD8o5nZQ5Z4bembhadK6jcydWKQpJaSmGqqJM="; + hash = "sha256-xbi9HAURxUD/7gHVhwR/ibejHGCqdbv/TE76mCPemU4="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index b0503a45e9c0..0f0b6a032c62 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -73,12 +73,19 @@ let throw "Module ${mod.name} does not support nginx version ${nginxVersion}!" ); + # Modules can adjust the nginx derivation through passthru.forNginx. + mkDerivation = + args: + lib.foldl (drv: mod: drv.overrideAttrs mod.forNginx) (stdenv.mkDerivation args) ( + lib.filter (mod: mod ? forNginx) modules + ); + in assert lib.assertMsg (lib.unique moduleNames == moduleNames) "nginx: duplicate modules: ${lib.concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; -stdenv.mkDerivation { +mkDerivation { inherit pname version nginxVersion; outputs = [ @@ -98,7 +105,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ installShellFiles ] - ++ nativeBuildInputs; + ++ nativeBuildInputs + ++ mapModules "nativeBuildInputs"; buildInputs = [ openssl diff --git a/pkgs/servers/http/nginx/modules/otel/package.nix b/pkgs/servers/http/nginx/modules/otel/package.nix new file mode 100644 index 000000000000..436074995cce --- /dev/null +++ b/pkgs/servers/http/nginx/modules/otel/package.nix @@ -0,0 +1,71 @@ +{ + abseil-cpp, + c-ares, + cmake, + fetchFromGitHub, + grpc, + lib, + mkNginxPlugin, + nixosTests, + nlohmann_json, + openssl, + opentelemetry-cpp, + pkg-config, + protobuf, + re2, + zlib, +}: + +mkNginxPlugin (finalAttrs: { + pname = "otel"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "nginxinc"; + repo = "nginx-otel"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pGe+1nPH8zUQhcyVxH5/nxwNFMsoOYCUecuDVs1rS4o="; + }; + + # nginx-otel can only be loaded dynamically. + dynamic = true; + + nativeBuildInputs = [ + cmake + pkg-config + protobuf + grpc + ]; + + buildInputs = [ + grpc + protobuf + opentelemetry-cpp + c-ares + re2 + abseil-cpp + nlohmann_json + openssl + zlib + ]; + + # Read by the module's config script. nginx's install step does not know + # about the cmake-built .so, so cmake writes it into the modules dir itself. + preConfigure = '' + export NGX_OTEL_CMAKE_OPTS="-DNGX_OTEL_GRPC=package -DNGX_OTEL_SDK=package -DNGX_OTEL_PROTO_DIR=${opentelemetry-cpp.opentelemetry-proto} -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$out/modules" + ''; + + passthru = { + # cmake's setup hook would replace nginx's configurePhase. + forNginx.dontUseCmakeConfigure = true; + + tests = { inherit (nixosTests) nginx-otel; }; + }; + + meta = { + description = "OpenTelemetry support for nginx"; + homepage = "https://github.com/nginxinc/nginx-otel"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kranzes ]; + }; +}) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 560193b68883..2266704cae0b 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,19 +1,19 @@ generic: { v74 = generic { - version = "7.4.14"; - hash = "sha256-795fbxmJbwIAu1JF44ZgNWZyccex6EYm0mCV8kpvu0I="; - emberPlusHash = "sha256-riwnpB9ziZhIy9Lqt+JBEfdMR89ZRDmaGC1ibKu6fcU="; - mongodbHash = "sha256-zW4wmh422+BlMgtR8+zrrOgTMMtWJbXPRu9MgZwNUt8="; - mssqlHash = "sha256-wygP7Li39+MfX+b3h5YJmYhDQKd/ta/sMuLtZI6UgiE="; - postgresqlHash = "sha256-H+WwJ9RrITeWKErMW+vcEG/Z2rAjbznVg/dK3ZM7j0I="; + version = "7.4.15"; + hash = "sha256-Xh2bN0fr+bgdXWLYzgDvmz9/TAgTlK0Rot0YiXok85Q="; + emberPlusHash = "sha256-/uTOwNFhAvYM1dsB3SblA72B9il0DLiDdk5lZNBwYTs="; + mongodbHash = "sha256-JZ9GyDHd1bhsJcqhjsWKJdLjmjzTIs+l+JV1XTDycko="; + mssqlHash = "sha256-P1bcG/uXnl+viFhWGTTcYV/VpMIxKPXWWqqHplKyJ68="; + postgresqlHash = "sha256-xofvvAc1Mn3r+KvziF6gWecGz5Ctalgb3THQNpSSMiA="; }; v70 = generic { - version = "7.0.30"; - hash = "sha256-wMpAeRGa3uxBNeM1HRuEkVet4HbDUsAGco5zLxcHIyw="; - emberPlusHash = "sha256-BXFaELxPrUSIF8+/Jpv+WfGYpJA4VK8wdL4oDFPn+/A="; - mongodbHash = "sha256-DhDqLXjGAQXBn9U5fVhZgxsP0MHMKgz35YI8K74mWxo="; - mssqlHash = "sha256-Ow15PXUq+kKyeM7j/TNZe/LKKDcmdpB04XE3SkagdRI="; - postgresqlHash = "sha256-7BFLstJRAh+rdDW9G7kspMYqRubdfXS9AimMDuMB8UM="; + version = "7.0.31"; + hash = "sha256-nfEGmqHP32e3Ex6T8vX+bQrQBeQWyZAgFv2Mto8zDow="; + emberPlusHash = "sha256-qPewZCfDbDFkX+So26d91fC41gsdnLidynJQVTSKd9M="; + mongodbHash = "sha256-JiWL9zg+EZFwc9OjnjcUIUF75bDgeiswsTT7mY7SOrM="; + mssqlHash = "sha256-5Er0oKgIPFs/NE4XrQjqBkZ6w5iIDaQgq9z4RbiPU+0="; + postgresqlHash = "sha256-FgqUGgRADSlYzlZSuYmE7DUZWXR1lKozwHtVdbRIbyw="; }; v60 = generic { version = "6.0.48"; diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 934e7b87d14d..052e01834986 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -118,16 +118,16 @@ let pkgsBuildBuild = prevStage.buildPackages; pkgsBuildHost = prevStage; pkgsBuildTarget = - if args.stdenv.targetPlatform == args.stdenv.hostPlatform then + if lib.systems.equals args.stdenv.targetPlatform args.stdenv.hostPlatform then pkgsBuildHost else - assert args.stdenv.hostPlatform == args.stdenv.buildPlatform; + assert lib.systems.equals args.stdenv.hostPlatform args.stdenv.buildPlatform; thisStage; pkgsHostHost = - if args.stdenv.hostPlatform == args.stdenv.targetPlatform then + if lib.systems.equals args.stdenv.hostPlatform args.stdenv.targetPlatform then thisStage else - assert args.stdenv.buildPlatform == args.stdenv.hostPlatform; + assert lib.systems.equals args.stdenv.buildPlatform args.stdenv.hostPlatform; pkgsBuildHost; pkgsTargetTarget = nextStage; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 56ae4538ea6a..724e3beb99b9 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -16,7 +16,7 @@ }: let - useCrossStdenv = crossSystem != localSystem || crossOverlays != [ ]; + useCrossStdenv = !(lib.systems.equals crossSystem localSystem) || crossOverlays != [ ]; useCustomStdenv = !useCrossStdenv && (config.replaceStdenv or null) != null; # Cross and custom stdenvs extend the local bootstrap stages. Keep diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b78381d5496b..9f42e126081e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -850,7 +850,9 @@ mapAliases { fingerd_bsd = throw "'fingerd_bsd' has been renamed to/replaced by 'bsd-fingerd'"; # Converted to throw 2025-10-27 fira-code-nerdfont = throw "'fira-code-nerdfont' has been renamed to/replaced by 'nerd-fonts.fira-code'"; # Converted to throw 2025-10-27 firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10 + firefox-beta = warnAlias "'firefox-beta' has been removed as it has a too large maintaince overhead while not providing enough benefits. Please use 'firefox'" firefox; # Added 2026-09-28 firefox-beta-bin = warnAlias "`firefox-beta-bin` is removed. Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06 + firefox-beta-unwrapped = warnAlias "'firefox-beta-unwrapped' has been removed as it has a too large maintaince overhead while not providing enough benefits. Please use 'firefox-unwrapped'" firefox-unwrapped; # Added 2026-09-28 firefox-devedition-bin = warnAlias "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06 firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21 firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; # Added 2025-08-21 @@ -1975,7 +1977,8 @@ mapAliases { openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30 openslp = throw "'openslp' has been removed because upstream has not released since 2013 and the package has an unfixable UDP reflection vulnerability (CVE-2023-29552)."; # Added 2026-09-02 openssl_1_1 = throw "'openssl_1_1' has been removed, because it was end of life'"; # Added 2026-07-24 - openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27 + openssl_3 = throw "'openssl_3' has been removed, because it was end of life"; # Added 2026-09-17 + openssl_3_0 = throw "'openssl_3_0' has been removed, because it was end of life"; # Converted to throw 2025-10-27 opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27 opensyclWithRocm = throw "'opensyclWithRocm' has been renamed to/replaced by 'adaptivecppWithRocm'"; # Converted to throw 2025-10-27 opentofu-ls = warnAlias "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10 @@ -2340,6 +2343,7 @@ mapAliases { sdnotify-wrapper = skawarePackages.sdnotify-wrapper; seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21 seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21 + secretspec-ffi = libsecretspec; # Added 2026-09-23 securefs = throw "'securefs' has been removed as it depends on fuse2"; # Added 2026-05-05 semantik = throw "'semantik' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17 semiphemeral = throw "'semiphemeral' has been removed as it is archived upstream"; # Added 2025-11-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69d7e22e7985..95347665390a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6320,11 +6320,10 @@ with pkgs; }; openssl_legacy = openssl.override { - conf = ../development/libraries/openssl/3.0/legacy.cnf; + conf = ../development/libraries/openssl/openssl_legacy.cnf; }; inherit (callPackages ../development/libraries/openssl { }) - openssl_3 openssl_3_5 openssl_3_6 openssl_4_0 @@ -8473,18 +8472,6 @@ with pkgs; buildMozillaMach ; }; - firefox-beta-unwrapped = - import ../applications/networking/browsers/firefox/packages/firefox-beta.nix - { - inherit - stdenv - lib - callPackage - fetchurl - nixosTests - buildMozillaMach - ; - }; firefox-devedition-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { @@ -8522,7 +8509,6 @@ with pkgs; firefox-esr-unwrapped = firefox-esr-153-unwrapped; firefox = wrapFirefox firefox-unwrapped { }; - firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36090ef05833..3b8326b59696 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3591,7 +3591,7 @@ with self; ]; meta = { description = "Catalyst Development Tools"; - homepage = "http://dev.catalyst.perl.org"; + homepage = "https://metacpan.org/pod/Catalyst"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -3700,7 +3700,7 @@ with self; ]; meta = { description = "Catalyst Framework Runtime"; - homepage = "http://dev.catalyst.perl.org"; + homepage = "https://metacpan.org/pod/Catalyst"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -12709,7 +12709,7 @@ with self; ]; meta = { description = "Exporting done right"; - homepage = "http://open-exodus.net/projects/Exporter-Declare"; + homepage = "https://metacpan.org/pod/Export::Declare"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -13418,7 +13418,7 @@ with self; }; meta = { description = "Minimalist Fennec, the commonly used bits"; - homepage = "http://open-exodus.net/projects/Fennec-Lite"; + homepage = "https://metacpan.org/pod/Fennec::Lite"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -17391,7 +17391,7 @@ with self; meta = { changelog = "https://metacpan.org/release/TONYC/Imager-${version}/source/Changes"; description = "Perl extension for Generating 24 bit Images"; - homepage = "http://imager.perl.org"; + homepage = "https://metacpan.org/pod/Imager"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -23414,7 +23414,7 @@ with self; ]; meta = { description = "Postmodern object system for Perl 5"; - homepage = "http://moose.perl.org"; + homepage = "https://metacpan.org/pod/Moose"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -28114,7 +28114,7 @@ with self; ''; meta = { description = "Critique Perl source code for best-practices"; - homepage = "http://perlcritic.com"; + homepage = "https://metacpan.org/pod/perlcritic"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -28404,7 +28404,7 @@ with self; propagatedBuildInputs = [ ConvertASN1 ]; meta = { description = "LDAP client library"; - homepage = "https://ldap.perl.org"; + homepage = "https://github.com/perl-ldap/perl-ldap"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -31772,7 +31772,7 @@ with self; }; meta = { description = "Turn on strict and make most warnings fatal"; - homepage = "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git"; + homepage = "https://metacpan.org/pod/strictures"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -33230,7 +33230,7 @@ with self; ]; meta = { description = "Comprehensive template processing system"; - homepage = "http://www.template-toolkit.org"; + homepage = "http://template-toolkit.org"; license = with lib.licenses; [ artistic1 gpl1Plus @@ -35431,7 +35431,7 @@ with self; doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "Analyze tests from the command line using Test::Run"; - homepage = "http://web-cpan.berlios.de/modules/Test-Run"; + homepage = "https://metacpan.org/pod/Test::Run::CmdLine"; license = lib.licenses.mit; mainProgram = "runprove"; }; @@ -39620,7 +39620,7 @@ with self; rm t/plugin/auth/github.t t/plugin/form/bootstrap4.t ''; meta = { - homepage = "http://preaction.me/yancy/"; + homepage = "https://github.com/preaction/Yancy"; description = "Best Web Framework Deserves the Best CMS"; license = with lib.licenses; [ artistic1