diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md index 8c27aea15ffc..8e95580522b2 100644 --- a/doc/module-system/module-system.chapter.md +++ b/doc/module-system/module-system.chapter.md @@ -116,6 +116,16 @@ A nominal type marker, always `"configuration"`. The [`class` argument](#module-system-lib-evalModules-param-class). +#### `graph` {#module-system-lib-evalModules-return-value-graph} + +Represents all the modules that took part in the evaluation. +It is a list of `ModuleGraph` where `ModuleGraph` is defined as an attribute set with the following attributes: + +- `key`: `string` for the purpose of module deduplication and `disabledModules` +- `file`: `string` for the purpose of error messages and warnings +- `imports`: `[ ModuleGraph ]` +- `disabled`: `bool` + ## Module arguments {#module-system-module-arguments} Module arguments are the attribute values passed to modules when they are evaluated. diff --git a/doc/redirects.json b/doc/redirects.json index 8f7810698bbc..8210470b5bcb 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -487,6 +487,9 @@ "module-system-lib-evalModules-return-value-_configurationClass": [ "index.html#module-system-lib-evalModules-return-value-_configurationClass" ], + "module-system-lib-evalModules-return-value-graph": [ + "index.html#module-system-lib-evalModules-return-value-graph" + ], "part-stdenv": [ "index.html#part-stdenv" ], diff --git a/lib/modules.nix b/lib/modules.nix index c55d276d4970..cc3148b0eea7 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -245,25 +245,26 @@ let }; }; - merged = - let - collected = - collectModules class (specialArgs.modulesPath or "") (regularModules ++ [ internalModule ]) - ( - { - inherit - lib - options - specialArgs - ; - _class = class; - _prefix = prefix; - config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config; - } - // specialArgs - ); - in - mergeModules prefix (reverseList collected); + # This function takes an empty attrset as an argument. + # It could theoretically be replaced with its body, + # but such a binding is avoided to allow for earlier grabage collection. + doCollect = + { }: + collectModules class (specialArgs.modulesPath or "") (regularModules ++ [ internalModule ]) ( + { + inherit + lib + options + specialArgs + ; + _class = class; + _prefix = prefix; + config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config; + } + // specialArgs + ); + + merged = mergeModules prefix (reverseList (doCollect { }).modules); options = merged.matchedOptions; @@ -359,12 +360,13 @@ let options = checked options; config = checked (removeAttrs config [ "_module" ]); _module = checked (config._module); + inherit (doCollect { }) graph; inherit extendModules type class; }; in result; - # collectModules :: (class: String) -> (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> [ Module ] + # collectModules :: (class: String) -> (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> ModulesTree # # Collects all modules recursively through `import` statements, filtering out # all modules in disabledModules. @@ -424,8 +426,37 @@ let else m: m; + # isDisabled :: String -> [ { disabled, file } ] -> StructuredModule -> bool + # + # Figures out whether a `StructuredModule` is disabled. + isDisabled = + modulesPath: disabledList: + let + moduleKey = + file: m: + if isString m then + if substring 0 1 m == "/" then m else toString modulesPath + "/" + m + + else if isConvertibleWithToString m then + if m ? key && m.key != toString m then + throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled." + else + toString m + + else if m ? key then + m.key + + else if isAttrs m then + throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute." + else + throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}."; + + disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabledList; + in + structuredModule: elem structuredModule.key disabledKeys; + /** - Collects all modules recursively into the form + Collects all modules recursively into a `[ StructuredModule ]` and a list of disabled modules: { disabled = [ ]; @@ -493,36 +524,32 @@ let modulesPath: { disabled, modules }: let - moduleKey = - file: m: - if isString m then - if substring 0 1 m == "/" then m else toString modulesPath + "/" + m - - else if isConvertibleWithToString m then - if m ? key && m.key != toString m then - throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled." - else - toString m - - else if m ? key then - m.key - - else if isAttrs m then - throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute." - else - throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}."; - - disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled; - keyFilter = filter (attrs: !elem attrs.key disabledKeys); + keyFilter = filter (attrs: !isDisabled modulesPath disabled attrs); in map (attrs: attrs.module) (genericClosure { startSet = keyFilter modules; operator = attrs: keyFilter attrs.modules; }); + toGraph = + modulesPath: + { disabled, modules }: + let + isDisabledModule = isDisabled modulesPath disabled; + + toModuleGraph = structuredModule: { + disabled = isDisabledModule structuredModule; + inherit (structuredModule) key; + file = structuredModule.module._file; + imports = map toModuleGraph structuredModule.modules; + }; + in + map toModuleGraph (filter (x: x.key != "lib/modules.nix") modules); in - modulesPath: initialModules: args: - filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + modulesPath: initialModules: args: { + modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args); + }; /** Wrap a module with a default location for reporting errors. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index a4aa5201715c..301808ae6651 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -20,6 +20,10 @@ cd "$DIR"/modules pass=0 fail=0 +local-nix-instantiate() { + nix-instantiate --timeout 1 --eval-only --show-trace --read-write-mode --json "$@" +} + # loc # prints the location of the call of to the function that calls it # loc n @@ -55,7 +59,7 @@ evalConfig() { local attr=$1 shift local script="import ./default.nix { modules = [ $* ];}" - nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode --json + local-nix-instantiate -E "$script" -A "$attr" } reportFailure() { @@ -106,6 +110,20 @@ globalErrorLogCheck() { } } +checkExpression() { + local path=$1 + local output + { + output="$(local-nix-instantiate --strict "$path" 2>&1)" && ((++pass)) + } || { + logStartFailure + echo "$output" + ((++fail)) + logFailure + logEndFailure + } +} + checkConfigError() { local errorContains=$1 local err="" @@ -337,6 +355,9 @@ checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix +# Check `graph` attribute +checkExpression './graph/test.nix' + # Check mkAliasOptionModule. checkConfigOutput '^true$' config.enable ./alias-with-priority.nix checkConfigOutput '^true$' config.enableAlias ./alias-with-priority.nix diff --git a/lib/tests/modules/graph/a.nix b/lib/tests/modules/graph/a.nix new file mode 100644 index 000000000000..e3c72afbe672 --- /dev/null +++ b/lib/tests/modules/graph/a.nix @@ -0,0 +1,8 @@ +{ + imports = [ + { + imports = [ { } ]; + } + ]; + disabledModules = [ ./b.nix ]; +} diff --git a/lib/tests/modules/graph/b.nix b/lib/tests/modules/graph/b.nix new file mode 100644 index 000000000000..a890d3138a18 --- /dev/null +++ b/lib/tests/modules/graph/b.nix @@ -0,0 +1,3 @@ +args: { + imports = [ { key = "explicit-key"; } ]; +} diff --git a/lib/tests/modules/graph/test.nix b/lib/tests/modules/graph/test.nix new file mode 100644 index 000000000000..748fb8db5f4d --- /dev/null +++ b/lib/tests/modules/graph/test.nix @@ -0,0 +1,64 @@ +let + lib = import ../../..; + + evaluation = lib.evalModules { + modules = [ + { } + (args: { }) + ./a.nix + ./b.nix + ]; + }; + + actual = evaluation.graph; + + expected = [ + { + key = ":anon-1"; + file = ""; + imports = [ ]; + disabled = false; + } + { + key = ":anon-2"; + file = ""; + imports = [ ]; + disabled = false; + } + { + key = toString ./a.nix; + file = toString ./a.nix; + imports = [ + { + key = "${toString ./a.nix}:anon-1"; + file = toString ./a.nix; + imports = [ + { + key = "${toString ./a.nix}:anon-1:anon-1"; + file = toString ./a.nix; + imports = [ ]; + disabled = false; + } + ]; + disabled = false; + } + ]; + disabled = false; + } + { + key = toString ./b.nix; + file = toString ./b.nix; + imports = [ + { + key = "explicit-key"; + file = toString ./b.nix; + imports = [ ]; + disabled = false; + } + ]; + disabled = true; + } + ]; +in +assert actual == expected; +null diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e266c71b9ff8..221d6fc58e82 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6602,6 +6602,12 @@ githubId = 129093; name = "Desmond O. Chang"; }; + DoctorDalek1963 = { + email = "dyson.dyson@icloud.com"; + github = "DoctorDalek1963"; + githubId = 69600500; + name = "Dyson Dyson"; + }; dod-101 = { email = "david.thievon@proton.me"; github = "DOD-101"; diff --git a/nixos/lib/test-driver/src/test_driver/machine/ocr.py b/nixos/lib/test-driver/src/test_driver/machine/ocr.py index 5f74b2ccfbc1..9f56f9c901e4 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/ocr.py +++ b/nixos/lib/test-driver/src/test_driver/machine/ocr.py @@ -12,10 +12,7 @@ def perform_ocr_on_screenshot(screenshot_path: Path) -> str: Perform OCR on a screenshot that contains text. Returns a string with all words that could be found. """ - variants = perform_ocr_variants_on_screenshot(screenshot_path, False)[0] - if len(variants) != 1: - raise MachineError(f"Received wrong number of OCR results: {len(variants)}") - return variants[0] + return perform_ocr_variants_on_screenshot(screenshot_path, False)[0] def perform_ocr_variants_on_screenshot( diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index 3ec0654dfc02..e5831c0a71db 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -174,8 +174,6 @@ in networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ]; - networking.resolvconf.package = pkgs.openresolv; - environment.systemPackages = [ cfg.package ]; systemd.services.resolvconf = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 38881059011b..77e96c2d85a8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1683,6 +1683,7 @@ ./services/web-apps/simplesamlphp.nix ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix + ./services/web-apps/snips-sh.nix ./services/web-apps/sogo.nix ./services/web-apps/stash.nix ./services/web-apps/stirling-pdf.nix diff --git a/nixos/modules/services/web-apps/snips-sh.nix b/nixos/modules/services/web-apps/snips-sh.nix new file mode 100644 index 000000000000..c11cfa6588f5 --- /dev/null +++ b/nixos/modules/services/web-apps/snips-sh.nix @@ -0,0 +1,159 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + mkOption + mkEnableOption + mkPackageOption + mapAttrs + optional + boolToString + isBool + mkIf + getExe + types + ; + + cfg = config.services.snips-sh; +in +{ + meta.maintainers = with lib.maintainers; [ + isabelroses + NotAShelf + ]; + + options.services.snips-sh = { + enable = mkEnableOption "snips.sh"; + + package = mkPackageOption pkgs "snips-sh" { + example = "pkgs.snips-sh.override {withTensorflow = true;}"; + }; + + stateDir = mkOption { + type = types.path; + default = "/var/lib/snips-sh"; + description = "The state directory of the service."; + }; + + settings = mkOption { + type = types.submodule { + freeformType = types.attrsOf ( + types.nullOr ( + types.oneOf [ + types.str + types.int + types.bool + ] + ) + ); + + options = { + SNIPS_HTTP_INTERNAL = mkOption { + type = types.str; + description = "The internal HTTP address of the service"; + }; + + SNIPS_SSH_INTERNAL = mkOption { + type = types.str; + description = "The internal SSH address of the service"; + }; + }; + }; + + default = { }; + example = { + SNIPS_HTTP_INTERNAL = "http://0.0.0.0:8080"; + SNIPS_SSH_INTERNAL = "ssh://0.0.0.0:2222"; + }; + + description = '' + The configuration of snips-sh is done through environment variables, + therefore you must use upper snake case (e.g. {env}`SNIPS_HTTP_INTERNAL`). + + Based on the attributes passed to this config option an environment file will be generated + that is passed to snips-sh's systemd service. + + The available configuration options can be found in + [self-hosting guide](https://github.com/robherley/snips.sh/blob/main/docs/self-hosting.md#configuration) to + find about the environment variables you can use. + ''; + }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/snips-sh.env"; + description = '' + Additional environment file as defined in {manpage}`systemd.exec(5)`. + + Sensitive secrets such as {env}`SNIPS_SSH_HOSTKEYPATH` and {env}`SNIPS_METRICS_STATSD` + may be passed to the service while avoiding potentially making them world-readable in the nix store or + to convert an existing non-nix installation with minimum hassle. + + Note that this file needs to be available on the host on which + `snips-sh` is running. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + tmpfiles.settings."10-snips-sh" = { + "${cfg.stateDir}/data".D = { + mode = "0755"; + }; + }; + + services.snips-sh = { + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings; + + serviceConfig = { + EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = getExe cfg.package; + LimitNOFILE = "1048576"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + WorkingDirectory = cfg.stateDir; + RuntimeDirectory = "snips-sh"; + StateDirectory = "snips-sh"; + StateDirectoryMode = "0700"; + Restart = "always"; + + # hardening + DynamicUser = true; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + SystemCallFilter = "@system-service"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + RemoveIPC = true; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index f9c50bca7210..73da17d5a050 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -30,9 +30,11 @@ let ${optionalString ( hostOpts.useACMEHost != null ) "tls ${sslCertDir}/cert.pem ${sslCertDir}/key.pem"} - log { - ${hostOpts.logFormat} - } + ${optionalString (hostOpts.logFormat != null) '' + log { + ${hostOpts.logFormat} + } + ''} ${hostOpts.extraConfig} } diff --git a/nixos/modules/services/web-servers/caddy/vhost-options.nix b/nixos/modules/services/web-servers/caddy/vhost-options.nix index 73ef4b87ee52..9afa699ad037 100644 --- a/nixos/modules/services/web-servers/caddy/vhost-options.nix +++ b/nixos/modules/services/web-servers/caddy/vhost-options.nix @@ -56,7 +56,7 @@ in }; logFormat = mkOption { - type = types.lines; + type = types.nullOr types.lines; default = '' output file ${cfg.logDir}/access-${lib.replaceStrings [ "/" " " ] [ "_" "_" ] config.hostName}.log ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 503ec07d6234..4ce282532ef7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1353,6 +1353,7 @@ in snapcast = runTest ./snapcast.nix; snapper = runTest ./snapper.nix; snipe-it = runTest ./web-apps/snipe-it.nix; + snips-sh = runTest ./snips-sh.nix; soapui = runTest ./soapui.nix; soft-serve = runTest ./soft-serve.nix; sogo = runTest ./sogo.nix; diff --git a/nixos/tests/snips-sh.nix b/nixos/tests/snips-sh.nix new file mode 100644 index 000000000000..04e40472e412 --- /dev/null +++ b/nixos/tests/snips-sh.nix @@ -0,0 +1,27 @@ +{ lib, ... }: +{ + name = "snips-sh"; + + nodes.machine = { + services.snips-sh = { + enable = true; + settings = { + SNIPS_HTTP_INTERNAL = "http://0.0.0.0:8080"; + SNIPS_SSH_INTERNAL = "ssh://0.0.0.0:2222"; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("snips-sh.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://localhost:8080") + ''; + + meta.maintainers = with lib.maintainers; [ + isabelroses + NotAShelf + ]; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a96fc9899e58..569a1c91b124 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -15103,6 +15103,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + tiny-glimmer-nvim = buildVimPlugin { + pname = "tiny-glimmer.nvim"; + version = "2025-07-01"; + src = fetchFromGitHub { + owner = "rachartier"; + repo = "tiny-glimmer.nvim"; + rev = "60a632536e0741c9cecb892f89fbe65a270dc7c7"; + sha256 = "0xa3ma6ps1q5766ib2iksc7bw8rpqn96llynb75njwj2kpadfcis"; + }; + meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; + meta.hydraPlatforms = [ ]; + }; + tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; version = "2025-07-16"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 81c757a90c11..bd3bb2a47c2e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1159,6 +1159,7 @@ https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tinted-theming/tinted-nvim/,HEAD, https://github.com/tinted-theming/tinted-vim/,HEAD, https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD, +https://github.com/rachartier/tiny-glimmer.nvim/,HEAD, https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD, https://github.com/tomtom/tinykeymap_vim/,,tinykeymap https://github.com/tomtom/tlib_vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bccdce35177f..89eee2f6a96b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1614,8 +1614,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.28.0"; - hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38="; + version = "0.29.2"; + hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index b1c7c2915d3c..0a1d06a656c0 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -61,17 +61,19 @@ fi cd "${NIXPKGS_K3S_PATH}/${MAJOR_VERSION}_${MINOR_VERSION}" CHARTS_URL=https://k3s.io/k3s-charts/assets +TRAEFIK_CRD_CHART_SHA256=$(nix-hash --type sha256 --base32 --flat <(curl -o - "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")) +TRAEFIK_CHART_SHA256=$(nix-hash --type sha256 --base32 --flat <(curl -o - "${CHARTS_URL}/traefik/${CHART_FILES[1]}")) # Get metadata for both files rm -f chart-versions.nix.update cat > chart-versions.nix.update < -Date: Thu, 9 Jan 2025 17:46:25 +0100 -Subject: [PATCH] Fix usage of NEON intrinsics - ---- - src/common/gsvector_neon.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h -index e4991af5e..61b8dc09b 100644 ---- a/src/common/gsvector_neon.h -+++ b/src/common/gsvector_neon.h -@@ -867,7 +867,7 @@ public: - - ALWAYS_INLINE int mask() const - { -- const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_s32(v2s), 31); -+ const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_f32(v2s), 31); - return (vget_lane_u32(masks, 0) | (vget_lane_u32(masks, 1) << 1)); - } - -@@ -2882,7 +2882,7 @@ public: - ALWAYS_INLINE GSVector4 gt64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] > v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2894,7 +2894,7 @@ public: - ALWAYS_INLINE GSVector4 eq64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] == v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2906,7 +2906,7 @@ public: - ALWAYS_INLINE GSVector4 lt64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] < v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2918,7 +2918,7 @@ public: - ALWAYS_INLINE GSVector4 ge64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] >= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2930,7 +2930,7 @@ public: - ALWAYS_INLINE GSVector4 le64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] <= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; --- -2.47.0 - diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix deleted file mode 100644 index c84a3cdf5a0f..000000000000 --- a/pkgs/by-name/du/duckstation/package.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - lib, - stdenv, - llvmPackages, - SDL2, - callPackage, - cmake, - cpuinfo, - cubeb, - curl, - extra-cmake-modules, - libXrandr, - libbacktrace, - libwebp, - makeWrapper, - ninja, - pkg-config, - qt6, - vulkan-loader, - wayland, - wayland-scanner, -}: - -let - sources = callPackage ./sources.nix { }; - inherit (qt6) - qtbase - qtsvg - qttools - qtwayland - wrapQtAppsHook - ; -in -llvmPackages.stdenv.mkDerivation (finalAttrs: { - inherit (sources.duckstation) pname version src; - - patches = [ - # Tests are not built by default - ./001-fix-test-inclusion.diff - # Patching yet another script that fills data based on git commands . . . - ./002-hardcode-vars.diff - # Fix NEON intrinsics usage - ./003-fix-NEON-intrinsics.patch - ./remove-cubeb-vendor.patch - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ninja - pkg-config - qttools - wayland-scanner - wrapQtAppsHook - ]; - - buildInputs = [ - SDL2 - cpuinfo - cubeb - curl - libXrandr - libbacktrace - libwebp - qtbase - qtsvg - qtwayland - sources.discord-rpc-patched - sources.lunasvg - sources.shaderc-patched - sources.soundtouch-patched - sources.spirv-cross-patched - wayland - ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" true) - ]; - - strictDeps = true; - - doInstallCheck = true; - - postPatch = '' - gitHash=$(cat .nixpkgs-auxfiles/git_hash) \ - gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \ - gitTag=$(cat .nixpkgs-auxfiles/git_tag) \ - gitDate=$(cat .nixpkgs-auxfiles/git_date) \ - substituteAllInPlace src/scmversion/gen_scmversion.sh - ''; - - # error: cannot convert 'int16x8_t' to '__Int32x4_t' - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions"; - - installCheckPhase = '' - runHook preInstallCheck - - $out/share/duckstation/common-tests - - runHook postInstallCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - - cp -r bin $out/share/duckstation - ln -s $out/share/duckstation/duckstation-qt $out/bin/ - - install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop - install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png - - runHook postInstall - ''; - - qtWrapperArgs = - let - libPath = lib.makeLibraryPath ([ - sources.shaderc-patched - sources.spirv-cross-patched - vulkan-loader - ]); - in - [ - "--prefix LD_LIBRARY_PATH : ${libPath}" - ]; - - # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh - # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run - postFixup = '' - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/duckstation-qt \ - --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' - ''; - - meta = { - homepage = "https://github.com/stenzek/duckstation"; - description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; - license = lib.licenses.gpl3Only; - mainProgram = "duckstation-qt"; - maintainers = with lib.maintainers; [ - guibou - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch deleted file mode 100644 index e740b0619338..000000000000 --- a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt -index af35687..8347825 100644 ---- a/dep/CMakeLists.txt -+++ b/dep/CMakeLists.txt -@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(rcheevos) - add_subdirectory(rapidyaml EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(rapidyaml) --add_subdirectory(cubeb EXCLUDE_FROM_ALL) --disable_compiler_warnings_for_target(cubeb) --disable_compiler_warnings_for_target(speex) -+find_package(cubeb REQUIRED GLOBAL) -+add_library(cubeb ALIAS cubeb::cubeb) - add_subdirectory(kissfft EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(kissfft) - -diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp -index 85579c4..339190a 100644 ---- a/src/util/cubeb_audio_stream.cpp -+++ b/src/util/cubeb_audio_stream.cpp -@@ -261,9 +261,9 @@ std::vector> AudioStream::GetCubebDriverName - std::vector> names; - names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); - -- const char** cubeb_names = cubeb_get_backend_names(); -- for (u32 i = 0; cubeb_names[i] != nullptr; i++) -- names.emplace_back(cubeb_names[i], cubeb_names[i]); -+ cubeb_backend_names backends = cubeb_get_backend_names(); -+ for (u32 i = 0; i < backends.count; i++) -+ names.emplace_back(backends.names[i], backends.names[i]); - return names; - } - diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix deleted file mode 100644 index 3211925699e1..000000000000 --- a/pkgs/by-name/du/duckstation/shaderc-patched.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - fetchpatch, - duckstation, - shaderc, -}: - -shaderc.overrideAttrs (old: { - pname = "shaderc-patched-for-duckstation"; - patches = (old.patches or [ ]) ++ [ - (fetchpatch { - url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; - hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; - excludes = [ - "CHANGES" - "CMakeLists.txt" - "libshaderc/CMakeLists.txt" - ]; - }) - ]; -}) diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix deleted file mode 100644 index 8261f08de9be..000000000000 --- a/pkgs/by-name/du/duckstation/sources.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ - lib, - duckstation, - fetchFromGitHub, - fetchpatch, - shaderc, - spirv-cross, - discord-rpc, - stdenv, - cmake, - ninja, -}: - -{ - duckstation = - let - self = { - pname = "duckstation"; - version = "0.1-7465"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "duckstation"; - rev = "aa955b8ae28314ae061613f0ddf13183a98aca03"; - # - # Some files are filled by using Git commands; it requires deepClone. - # More info at `checkout_ref` function in nix-prefetch-git. - # However, `.git` is a bit nondeterministic (and Git itself makes no - # guarantees whatsoever). - # Then, in order to enhance reproducibility, what we will do here is: - # - # - Execute the desired Git commands; - # - Save the obtained info into files; - # - Remove `.git` afterwards. - # - deepClone = true; - postFetch = '' - cd $out - mkdir -p .nixpkgs-auxfiles/ - git rev-parse HEAD > .nixpkgs-auxfiles/git_hash - git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch - git describe --dirty | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag - git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date - find $out -name .git -print0 | xargs -0 rm -fr - ''; - hash = "sha256-ixrlr7Rm6GZAn/kh2sSeCCiK/qdmQ5+5jbbhAKjTx/E="; - }; - }; - in - self; - - shaderc-patched = shaderc.overrideAttrs ( - old: - let - version = "2024.3-unstable-2024-08-24"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "shaderc"; - rev = "f60bb80e255144e71776e2ad570d89b78ea2ab4f"; - hash = "sha256-puZxkrEVhhUT4UcCtEDmtOMX4ugkB6ooMhKRBlb++lE="; - }; - in - { - pname = "shaderc-patched-for-duckstation"; - inherit version src; - patches = (old.patches or [ ]); - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true) - (lib.cmakeBool "SHADERC_SKIP_TESTS" true) - ]; - outputs = [ - "out" - "lib" - "dev" - ]; - postFixup = ''''; - } - ); - spirv-cross-patched = spirv-cross.overrideAttrs ( - old: - let - version = "1.3.290.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Cross"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8="; - }; - in - { - pname = "spirv-cross-patched-for-duckstation"; - inherit version src; - patches = (old.patches or [ ]); - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - (lib.cmakeBool "SPIRV_CROSS_CLI" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_CPP" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_C_API" true) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_GLSL" true) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_HLSL" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_MSL" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_REFLECT" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_TESTS" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_UTIL" true) - (lib.cmakeBool "SPIRV_CROSS_SHARED" true) - (lib.cmakeBool "SPIRV_CROSS_STATIC" false) - ]; - } - ); - discord-rpc-patched = discord-rpc.overrideAttrs (old: { - pname = "discord-rpc-patched-for-duckstation"; - version = "3.4.0-unstable-2024-08-02"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "discord-rpc"; - rev = "144f3a3f1209994d8d9e8a87964a989cb9911c1e"; - hash = "sha256-VyL8bEjY001eHWcEoUPIAFDAmaAbwcNb1hqlV2a3cWs="; - }; - patches = (old.patches or [ ]); - }); - - soundtouch-patched = stdenv.mkDerivation (finalAttrs: { - pname = "soundtouch-patched-for-duckstation"; - version = "2.2.3-unstable-2024-08-02"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "soundtouch"; - rev = "463ade388f3a51da078dc9ed062bf28e4ba29da7"; - hash = "sha256-hvBW/z+fmh/itNsJnlDBtiI1DZmUMO9TpHEztjo2pA0="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - meta = { - homepage = "https://github.com/stenzek/soundtouch"; - description = "SoundTouch Audio Processing Library (forked from https://codeberg.org/soundtouch/soundtouch)"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.linux; - }; - - }); - - lunasvg = stdenv.mkDerivation (finalAttrs: { - pname = "lunasvg-patched-for-duckstation"; - version = "2.4.1-unstable-2024-08-24"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "lunasvg"; - rev = "9af1ac7b90658a279b372add52d6f77a4ebb482c"; - hash = "sha256-ZzOe84ZF5JRrJ9Lev2lwYOccqtEGcf76dyCDBDTvI2o="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - meta = { - homepage = "https://github.com/stenzek/lunasvg"; - description = "Standalone SVG rendering library in C++"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; - }); -} diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index d31cead97136..13fb5bff4816 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ethercat"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-11Y4qGJlbZYnFZ3pI18kjE2aIht30ZtN4eTsYhWqg+g="; + hash = "sha256-UNd8PLdudI5TMdKKNH6BQP2VQ0LSPvsA/sEYnIuZRRA="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/li/linkchecker/package.nix b/pkgs/by-name/li/linkchecker/package.nix index 12f5b5d6fef3..e94747d4eaa3 100644 --- a/pkgs/by-name/li/linkchecker/package.nix +++ b/pkgs/by-name/li/linkchecker/package.nix @@ -1,54 +1,55 @@ { + python3Packages, lib, fetchFromGitHub, - python3, gettext, + pdfSupport ? true, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "linkchecker"; - version = "10.2.1"; + version = "10.6.0"; pyproject = true; src = fetchFromGitHub { owner = "linkchecker"; repo = "linkchecker"; tag = "v${version}"; - hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo="; + hash = "sha256-CzDShtqcGO2TP5qNVf2zkI3Yyh80I+pSVIFzmi3AaGQ="; }; nativeBuildInputs = [ gettext ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ hatchling hatch-vcs polib # translations ]; - dependencies = with python3.pkgs; [ - argcomplete - beautifulsoup4 - dnspython - requests - ]; + dependencies = + with python3Packages; + [ + argcomplete + beautifulsoup4 + dnspython + requests + ] + ++ lib.optional pdfSupport pdfminer-six; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pyopenssl parameterized pytestCheckHook + pyftpdlib ]; + # Needed for tests to be able to create a ~/.local/share/linkchecker/plugins directory + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ - "TestLoginUrl" "test_timeit2" # flakey, and depends sleep being precise to the milisecond - "test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux) - "test_markdown" # uses sys.version_info for conditional testing - "test_itms_services" # uses sys.version_info for conditional testing - ]; - - disabledTestPaths = [ - "tests/checker/telnetserver.py" - "tests/checker/test_telnet.py" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ma/mantra/package.nix b/pkgs/by-name/ma/mantra/package.nix index fb4716103863..23ccad5f42c6 100644 --- a/pkgs/by-name/ma/mantra/package.nix +++ b/pkgs/by-name/ma/mantra/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mantra"; - version = "2.0"; + version = "3.1"; src = fetchFromGitHub { owner = "MrEmpy"; repo = "Mantra"; tag = "v${version}"; - hash = "sha256-fBcoKoTBGCyJS8+mzKXLGxcxmRsCcZFZEyMTnA5Rkbw="; + hash = "sha256-DnErXuMbCRK3WxhdyPj0dOUtGnCcmynPk/hYmOsOKVU="; }; vendorHash = null; diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 68b987678fb3..7c9f91a7456f 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-FSgB2h52dpfO3GdBoCKlb8jl8eR2pQ1vWuQZdXoS0jo="; + hash = "sha256-xSgwCKjYuF6nUo4P7NrGocyhqBbBV/sx2BGKjWCEtB0="; }; - cargoHash = "sha256-GFrhTbW+o18VmB+wyokpPXIV9XlcjSdHwckZEHNX+KY="; + cargoHash = "sha256-dwaW69Mxn4GVFqOI+UUGkJG9yc3SWob0FcC1oMGsHg8="; # require running database doCheck = false; diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index aa441fec1e73..20c1ea19c5c7 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.22"; + version = "11.30"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-O60fNcz3/CsinL7NbEprtMhEcFK0NNZIuIG3hfqOW3Y="; + hash = "sha256-GnC2w1hhQlvpxa254M15xOVsqKUuIjXfgUxwgA7zcxc="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 3d56ed07fd4f..1376064f9ac1 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,14 +12,14 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "3.3.3"; + version = "3.4.0"; pyproject = true; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-ET0cygX/r/YXGWpPU01FnBoLRtjo1ddXEiVIva71aE8="; + hash = "sha256-EchbebFSSOBrgk9nilDgzp5jAeEa0tHlJZ5l4wYpw0g="; }; sourceRoot = "${src.name}/source"; diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix index e35f59a6d09a..0a437fd65e31 100644 --- a/pkgs/by-name/nt/ntfy-sh/package.nix +++ b/pkgs/by-name/nt/ntfy-sh/package.nix @@ -17,7 +17,7 @@ buildGoModule ( ui = buildNpmPackage { inherit (finalAttrs) src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-oiOv4d+Gxk43gUAZXrTpcsfuEEpGyJMYS19ZRHf9oF8="; + npmDepsHash = "sha256-LmEJ7JuaAdjB816VspVXAQC+I46lpNAjwfLTxeNeLPc="; prePatch = '' cd web/ @@ -37,16 +37,16 @@ buildGoModule ( in { pname = "ntfy-sh"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; tag = "v${finalAttrs.version}"; - hash = "sha256-D4wLIGVItH5lZlfmgd2+QsqB4PHlyX4ORpwT1NGdV60="; + hash = "sha256-8BqJ2/u+g5P68ekYu/ztzjdQ91c8dIazeNdLRFpqVy0="; }; - vendorHash = "sha256-7+nvkyLcdQZ/B4Lly4ygcOGxSLkXXqCqu7xvCB4+8Wo="; + vendorHash = "sha256-3adQNZ2G0wKW3aV+gsGo/il6NsrIhGPbI7P4elWrKZQ="; doCheck = false; diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 9d14d111067c..b0cac4c2e54f 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phel"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; tag = "v${finalAttrs.version}"; - hash = "sha256-YwmDTj1uc71rpp5Iq/7cDq0gLLy8Bh96bu0RaYqi5J0="; + hash = "sha256-uJnxCReo/GR/zAwQEV1Gp9Hv6ydGbf4EiVNL7q0cRRw="; }; - vendorHash = "sha256-zZK4v9IncoOurf2yUeFqwmAkqsMBlLfuZTUm9cWQBCA="; + vendorHash = "sha256-/7A71XQdMfirqfN9VIKFZxJ1HNBva5c2NOsbo6NMRzQ="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix index f7eed9ab1c33..14d9cce6540a 100644 --- a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4="; + sha256 = "sha256-kI+/qbWvOxcHKee7jEFBs5Bb+5MPGunAsB6d1j9fhp8="; }; - vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw="; + vendorHash = "sha256-tOt6Uxo4Z2zJrTjyTPoqHGfUgxFmtB+xP+kB+S6ez84="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 6af30e42da25..63327480a74c 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-mBFxR3Sl89TVE+G/+pr5KlMl2oWUmQr41VfZpOyNU6k="; + hash = "sha256-rdoq+Zx+NVJZrVon/OfJIAvEyCWEawSHRLxLBUFR9uY="; }; subPackages = "cmd/esc"; diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 3f64f88924bb..af344a2e1608 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250801git3f8169b88"; + version = "1.16.0+20250805git769469683"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-1GtLD69h0oYLXqs5n+0Vzc00WtK6mdPR9BkP4tjOmW8="; + hash = "sha256-UZSfdJ14igoqaFCwCZmy29MfKZcxr7j8RtI/epHs2WI="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 1a4c4d79f987..edf34d337346 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renode"; - version = "1.15.3"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-0CZWIwIG85nT7uSHhmBkH21S5mTx2womYWV0HG+g8Mk="; + hash = "sha256-oNlTz5LBggPkjKM4TJO2UDKQdt2Ga7rBTdgyGjN8/zA="; }; nativeBuildInputs = [ @@ -102,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Virtual development framework for complex embedded systems"; homepage = "https://renode.io"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ otavio ]; + maintainers = with lib.maintainers; [ + otavio + znaniye + ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix index 4058628c9a54..cfbe3ffc2068 100644 --- a/pkgs/by-name/sn/snips-sh/package.nix +++ b/pkgs/by-name/sn/snips-sh/package.nix @@ -5,6 +5,7 @@ sqlite, libtensorflow, withTensorflow ? false, + nixosTests, }: buildGoModule rec { pname = "snips-sh"; @@ -22,6 +23,8 @@ buildGoModule rec { buildInputs = [ sqlite ] ++ (lib.optional withTensorflow libtensorflow); + passthru.tests = nixosTests.snips-sh; + meta = { description = "Passwordless, anonymous SSH-powered pastebin with a human-friendly TUI and web UI"; license = lib.licenses.mit; diff --git a/pkgs/development/tools/database/sqlitebrowser/macos.patch b/pkgs/by-name/sq/sqlitebrowser/macos.patch similarity index 100% rename from pkgs/development/tools/database/sqlitebrowser/macos.patch rename to pkgs/by-name/sq/sqlitebrowser/macos.patch diff --git a/pkgs/by-name/sq/sqlitebrowser/package.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix new file mode 100644 index 000000000000..4318bc279d81 --- /dev/null +++ b/pkgs/by-name/sq/sqlitebrowser/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libsForQt5, + sqlcipher, +}: + +let + qt' = libsForQt5; # upstream has adopted qt6, but no released version supports it + +in +stdenv.mkDerivation (finalAttrs: { + pname = "sqlitebrowser"; + version = "3.13.1"; + + src = fetchFromGitHub { + owner = "sqlitebrowser"; + repo = "sqlitebrowser"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg="; + }; + + patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"' + ''; + + buildInputs = [ + qt'.qtbase + qt'.qcustomplot + qt'.qscintilla + sqlcipher + ] + ++ lib.optional stdenv.hostPlatform.isDarwin qt'.qtmacextras; + + nativeBuildInputs = [ + cmake + pkg-config + qt'.qttools + qt'.wrapQtAppsHook + ]; + + cmakeFlags = [ + "-Wno-dev" + (lib.cmakeBool "sqlcipher" true) + (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.finalPackage.doCheck or false)) + (lib.cmakeBool "FORCE_INTERNAL_QSCINTILLA" false) + (lib.cmakeBool "FORCE_INTERNAL_QCUSTOMPLOT" false) + (lib.cmakeBool "FORCE_INTERNAL_QHEXEDIT" true) # TODO: package qhexedit + (lib.cmakeFeature "QSCINTILLA_INCLUDE_DIR" "${lib.getDev qt'.qscintilla}/include") + ]; + + env.LANG = "C.UTF-8"; + + doCheck = true; + + meta = { + description = "DB Browser for SQLite"; + mainProgram = "sqlitebrowser"; + homepage = "https://sqlitebrowser.org/"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/su/sunsetr/Cargo.lock b/pkgs/by-name/su/sunsetr/Cargo.lock new file mode 100644 index 000000000000..8266aa015faa --- /dev/null +++ b/pkgs/by-name/su/sunsetr/Cargo.lock @@ -0,0 +1,1818 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "cc" +version = "1.2.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "chrono-tz" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3" +dependencies = [ + "chrono", + "phf", +] + +[[package]] +name = "cities" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8bec2115436fa4c2d3fb2e7286482c16e812fd781f2e40ffb8d1f66186e4c2" + +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "convert_case" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crossterm" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" +dependencies = [ + "bitflags", + "crossterm_winapi", + "derive_more", + "document-features", + "mio", + "parking_lot", + "rustix 1.0.8", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.60.2", +] + +[[package]] +name = "document-features" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +dependencies = [ + "litrs", +] + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "env_filter" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fragile" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "geometry-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fe577bea4aec9757361ef0ea2e38ff05aa65b887858229e998b2cdfe16ee65" +dependencies = [ + "float_next_after", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "hashbrown" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indexmap" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.174" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" + +[[package]] +name = "libredox" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litrs" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "mio" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +dependencies = [ + "libc", + "log", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", +] + +[[package]] +name = "mockall" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "multimap" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" + +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "petgraph" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "predicates" +version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" + +[[package]] +name = "predicates-tree" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prettyplease" +version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "prost" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" +dependencies = [ + "heck", + "itertools", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" +dependencies = [ + "prost", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.37.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.3", +] + +[[package]] +name = "rand_xorshift" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +dependencies = [ + "rand_core", +] + +[[package]] +name = "redox_syscall" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.60.2", +] + +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "scc" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4" +dependencies = [ + "sdd", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sdd" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serial_test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "slab" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "sunrise" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0733c9f1eaa06ed6d103d88e21f784449d08a6733c2ca2b39381cbcbcfe89272" +dependencies = [ + "chrono", +] + +[[package]] +name = "sunsetr" +version = "0.6.1" +dependencies = [ + "anyhow", + "chrono", + "chrono-tz", + "cities", + "crossterm", + "dirs", + "env_logger", + "fs2", + "mockall", + "nix", + "proptest", + "regex", + "serde", + "serial_test", + "signal-hook", + "sunrise", + "sunsetr", + "tempfile", + "termios", + "toml", + "tzf-rs", + "wayland-client", + "wayland-protocols-wlr", +] + +[[package]] +name = "syn" +version = "2.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +dependencies = [ + "fastrand", + "getrandom 0.3.3", + "once_cell", + "rustix 1.0.8", + "windows-sys 0.59.0", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] +name = "termtree" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "toml_write", + "winnow", +] + +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + +[[package]] +name = "tzf-rel" +version = "0.0.2025-b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb5c10d0e0d00ad6552ae5feab676ba03858ba9ccf4494743b7f242984419d4" + +[[package]] +name = "tzf-rs" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb74389502c5223e56831ef510cd85b961659d1518deca5be257ce6f5301c4f" +dependencies = [ + "anyhow", + "bytes", + "geometry-rs", + "prost", + "prost-build", + "tzf-rel", +] + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "wait-timeout" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wayland-backend" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.44", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" +dependencies = [ + "bitflags", + "log", + "rustix 0.38.44", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a" +dependencies = [ + "bitflags", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf" +dependencies = [ + "bitflags", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winnow" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix new file mode 100644 index 000000000000..22480bf81898 --- /dev/null +++ b/pkgs/by-name/su/sunsetr/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sunsetr"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "psi4j"; + repo = "sunsetr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kFIfNVA1UJrle/5udi8+9uDgq9fArUdudM/v8QpGuaM="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + checkFlags = [ + "--skip=config::tests::test_geo_toml_exists_before_config_creation" + ]; + + meta = { + mainProgram = "sunsetr"; + description = "Automatic blue light filter for Hyprland, Niri, and everything Wayland"; + homepage = "https://github.com/psi4j/sunsetr"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DoctorDalek1963 ]; + }; +}) diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix index 07e1e9bb5c73..5ae9f1caa877 100644 --- a/pkgs/by-name/uh/uhd/package.nix +++ b/pkgs/by-name/uh/uhd/package.nix @@ -27,6 +27,7 @@ enableUsrp1 ? true, enableUsrp2 ? true, enableX300 ? true, + enableX400 ? true, enableN300 ? true, enableN320 ? true, enableE300 ? true, @@ -138,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_USRP1" enableUsrp1) (cmakeBool "ENABLE_USRP2" enableUsrp2) (cmakeBool "ENABLE_X300" enableX300) + (cmakeBool "ENABLE_X400" enableX400) (cmakeBool "ENABLE_N300" enableN300) (cmakeBool "ENABLE_N320" enableN320) (cmakeBool "ENABLE_E300" enableE300) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index fe4fae664deb..e1501138ee2b 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.11.2", + "version": "1.11.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-arm64-1.11.2.zip", - "sha256": "d0deea25454cef4fda962436980dcf9a7d374e30e681933e1b036258179e8cd1" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-darwin-arm64-1.11.3.zip", + "sha256": "83df03ffe0ef8e03301355f101192e81734841e8c658b2bc2fb238e7a83679d4" }, "x86_64-darwin": { - "version": "1.11.2", + "version": "1.11.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-x64-1.11.2.zip", - "sha256": "e874198d263dbbfcc46283151d50a20187460d7c42c1988b6165016b17a33351" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-darwin-x64-1.11.3.zip", + "sha256": "e5bda964d69f52bf49d92bd0f2e0a824c2c45dc708f2dcfd93b9797d5fecb80c" }, "x86_64-linux": { - "version": "1.11.2", + "version": "1.11.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-linux-x64-1.11.2.tar.gz", - "sha256": "b0b5439245ca9c05ac4a600da2835757641820005c219c971a294acb91f3f114" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-linux-x64-1.11.3.tar.gz", + "sha256": "d4f5848f152c5c185c9aa7c89a34700455d41d7388592fa90e05c0329f1943bd" } } diff --git a/pkgs/by-name/ya/yaralyzer/package.nix b/pkgs/by-name/ya/yaralyzer/package.nix index 53f45a74cfc0..c6e488308fea 100644 --- a/pkgs/by-name/ya/yaralyzer/package.nix +++ b/pkgs/by-name/ya/yaralyzer/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "yaralyzer"; - version = "1.0.0"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; tag = "v${version}"; - hash = "sha256-HrYO7Fz9aLabx7nsilo/b/xe6OOzIq0P2PzVFtAPNEU="; + hash = "sha256-zaC33dlwjMNvvXnxqrEJvk3Umh+4hYsbDWoW6n6KmCk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 7777d9da57f1..4931643a5c1d 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.11"; + version = "1.23.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-KWOBYHpIOoqGZ9dpUzF1L5Sh8jHCBOJSfS8i4ePRJH0="; + hash = "sha256-4czpN5ok6JVxSkEsfd0VfSYU2e2+g6hESbbhhAtPEiY="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index e16420b80e38..5ca1b35dcebf 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25rc2"; + version = "1.25rc3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-5jFKMjTEwDuNAGvNHRRZTZKBcNGES23/3V+lojM0SeE="; + hash = "sha256-Rw4LjnCmjyhV59AJ8TXsgLPRgIXSxOU323Xmrkliv3Q="; }; strictDeps = true; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 4911f8b004cd..eb6375367297 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - + python, + makeWrapper, # dependencies - R, biopython, matplotlib, numpy, @@ -13,15 +13,15 @@ pomegranate, pyfaidx, pysam, - rPackages, reportlab, + rPackages, scikit-learn, scipy, - + R, # tests pytestCheckHook, -}: +}: buildPythonPackage rec { pname = "cnvkit"; version = "0.9.12"; @@ -47,11 +47,38 @@ buildPythonPackage rec { "pomegranate" ]; - # Numpy 2 compatibility - postPatch = '' - substituteInPlace skgenome/intersect.py \ - --replace-fail "np.string_" "np.bytes_" - ''; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + R + ]; + + postPatch = + let + rscript = lib.getExe' R "Rscript"; + in + # Numpy 2 compatibility + '' + substituteInPlace skgenome/intersect.py \ + --replace-fail "np.string_" "np.bytes_" + '' + # Patch shebang lines in R scripts + + '' + substituteInPlace cnvlib/segmentation/flasso.py \ + --replace-fail "#!/usr/bin/env Rscript" "#!${rscript}" + + substituteInPlace cnvlib/segmentation/cbs.py \ + --replace-fail "#!/usr/bin/env Rscript" "#!${rscript}" + + substituteInPlace cnvlib/segmentation/__init__.py \ + --replace-fail 'rscript_path="Rscript"' 'rscript_path="${rscript}"' + + substituteInPlace cnvlib/commands.py \ + --replace-fail 'default="Rscript"' 'default="${rscript}"' + + ''; dependencies = [ biopython @@ -61,12 +88,42 @@ buildPythonPackage rec { pomegranate pyfaidx pysam - rPackages.DNAcopy reportlab + rPackages.DNAcopy scikit-learn scipy ]; + # Make sure R can find the DNAcopy package + postInstall = '' + wrapProgram $out/bin/cnvkit.py \ + --set R_LIBS_SITE "${rPackages.DNAcopy}/library" \ + --set MPLCONFIGDIR "/tmp/matplotlib-config" + ''; + + installCheckPhase = '' + runHook preInstallCheck + + ${python.executable} -m pytest --deselect=test/test_commands.py::CommandTests::test_batch \ + --deselect=test/test_commands.py::CommandTests::test_segment_hmm + + cd test + # Set matplotlib config directory for the tests + export MPLCONFIGDIR="/tmp/matplotlib-config" + export HOME="/tmp" + mkdir -p "$MPLCONFIGDIR" + + # Use the installed binary - it's already wrapped with R_LIBS_SITE + make cnvkit="$out/bin/cnvkit.py" || { + echo "Make tests failed" + exit 1 + } + + runHook postInstallCheck + ''; + + doInstallCheck = true; + pythonImportsCheck = [ "cnvlib" ]; nativeCheckInputs = [ @@ -74,13 +131,6 @@ buildPythonPackage rec { R ]; - disabledTests = [ - # AttributeError: module 'pomegranate' has no attribute 'NormalDistribution' - # https://github.com/etal/cnvkit/issues/815 - "test_batch" - "test_segment_hmm" - ]; - meta = { homepage = "https://cnvkit.readthedocs.io"; description = "Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 43668b02ce9f..6d2a10f875a1 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "13.5.0"; + version = "13.6.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-sQCUxctFTa3olNxXdSbFh/xo5ISOAivQ6XvvOmLysB4="; + hash = "sha256-/8IBXPqDHgAa7v5+c1co9cABXXaZJZhZy5N2TzVKG7Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Uk9JIrN1w+bwFSG04I3EQGbBV5SArb7G7jcKpVA+ME4="; + hash = "sha256-pJSbNgDLq+c3KLVXXZGr7jc7crrbZLcyO//sXJK/bA4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index f7ff5abfac28..b2a31ed4c13c 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "inkbird-ble"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "inkbird-ble"; tag = "v${version}"; - hash = "sha256-J3BT4KZ5Kzoc8vwbsXbhZJ+qkeggYomGE0JedxNTPaQ="; + hash = "sha256-Dwp65FKtqJbgux+T3Ql09sDy6m8CCeK26aDKM3I3eJo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index e3480e9fe5d3..71ba14b499a1 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -42,14 +42,17 @@ buildPythonPackage rec { "test_hashandlers" ]; - disabledTestPaths = - lib.optionals (stdenv.hostPlatform.isDarwin) [ - # Exception: unable to connect to Redis server - "tests/test_redis.py" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - "tests/test_dictconfig.py" - ]; + disabledTestPaths = [ + # Disable redis tests on all systems for now + "tests/test_redis.py" + ] + # lib.optionals (stdenv.hostPlatform.isDarwin) [ + # # Exception: unable to connect to Redis server + # "tests/test_redis.py" + # ] + ++ lib.optionals (pythonAtLeast "3.13") [ + "tests/test_dictconfig.py" + ]; pythonImportsCheck = [ "logutils" ]; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index f674461d928c..5c2fab375a15 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -3,20 +3,15 @@ stdenv, buildPythonPackage, fetchFromGitHub, - - # build-system + fetchpatch, + pytestCheckHook, setuptools, - - # dependencies apricot-select, networkx, numpy, scikit-learn, scipy, torch, - - # tests - pytestCheckHook, }: buildPythonPackage rec { @@ -27,34 +22,10 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pomegranate"; owner = "jmschrei"; - # tag = "v${version}"; - # No tag for 1.1.2 - rev = "e9162731f4f109b7b17ecffde768734cacdb839b"; - hash = "sha256-vVoAoZ+mph11ZfINT+yxRyk9rXv6FBDgxBz56P2K95Y="; + tag = "v${version}"; + hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs="; }; - # _pickle.UnpicklingError: Weights only load failed. - # https://pytorch.org/docs/stable/generated/torch.load.html - postPatch = '' - substituteInPlace \ - tests/distributions/test_bernoulli.py \ - tests/distributions/test_categorical.py \ - tests/distributions/test_exponential.py \ - tests/distributions/test_gamma.py \ - tests/distributions/test_independent_component.py \ - tests/distributions/test_normal_diagonal.py \ - tests/distributions/test_normal_full.py \ - tests/distributions/test_poisson.py \ - tests/distributions/test_student_t.py \ - tests/distributions/test_uniform.py \ - tests/test_bayes_classifier.py \ - tests/test_gmm.py \ - tests/test_kmeans.py \ - --replace-fail \ - 'torch.load(".pytest.torch")' \ - 'torch.load(".pytest.torch", weights_only=False)' - ''; - build-system = [ setuptools ]; dependencies = [ @@ -72,11 +43,20 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + patches = [ + # Fix tests for pytorch 2.6 + (fetchpatch { + name = "python-2.6.patch"; + url = "https://github.com/jmschrei/pomegranate/pull/1142/commits/9ff5d5e2c959b44e569937e777b26184d1752a7b.patch"; + hash = "sha256-BXsVhkuL27QqK/n6Fa9oJCzrzNcL3EF6FblBeKXXSts="; + }) + ]; + + pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: Arrays are not almost equal to 6 decimals - "=tests/distributions/test_normal_full.py::test_fit" - "=tests/distributions/test_normal_full.py::test_from_summaries" - "=tests/distributions/test_normal_full.py::test_serialization" + "--deselect=tests/distributions/test_normal_full.py::test_fit" + "--deselect=tests/distributions/test_normal_full.py::test_from_summaries" + "--deselect=tests/distributions/test_normal_full.py::test_serialization" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 1e1adb006e79..0680cd1e6b16 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.14.5"; + version = "0.14.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-i1/1Z8JngoGQ/VwjMAHJ7RJhS3dfpXApE1DdfTfIz8E="; + hash = "sha256-7RCE1E1pWUdb7hW9N7nX9+e5dXX49nn+rTnkoS+ghJE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 4a79c6daf465..4872c23b0d31 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; tag = "v${version}"; - hash = "sha256-7HdeNyB3hMJEwHenN2hUEGG2MdQ++nF3nyAYJv7jhyA="; + hash = "sha256-snowpTdHelcFjo1+hvqpoVt5ROB0f91yt0GsIvA5cso="; }; build-system = [ setuptools ]; @@ -122,6 +122,7 @@ buildPythonPackage rec { "tests/test_pretrained_stsb.py" "tests/test_sentence_transformer.py" "tests/test_train_stsb.py" + "tests/util/test_hard_negatives.py" ]; # Sentence-transformer needs a writable hf_home cache diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix index 3a7d0926ba26..8001f6822c03 100644 --- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.7.1" = { + "2.8.0" = { x86_64-linux-39 = { - name = "torch-2.7.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-c4rJs6155iohJW49JQzuhY3pVfk/ifqxFNqNGRk0fQY="; + name = "torch-2.8.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-uTV6h1laPXsqVlumArlzkqN8VvC4VpjwzPCixY++9ew="; }; x86_64-linux-310 = { - name = "torch-2.7.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-1sPLoZjck/k0IqhUX0imaXiQNm5LlwH1Q1H8J+IwS9M="; + name = "torch-2.8.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-DJaZnRXPHxPdfJE+CyGpo1VTjmz8EIYaFxWDICkvWVQ="; }; x86_64-linux-311 = { - name = "torch-2.7.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-wwHcKARYr9lUUK95SSTJj+B1It0Uj/OEc5uBDj4xefI="; + name = "torch-2.8.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-A5udzda9uqEKilzWviLEyz41iaNB5fkEy7Vxyij1W+0="; }; x86_64-linux-312 = { - name = "torch-2.7.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-C2T30KbypzntBSupWfe2fGdwKMlWbOUZl/n5D+Vz3ao="; + name = "torch-2.8.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-Q1T8Bbt5sgjWmVoEyhzu9qlUexxDNENVdDU9OBxVCHw="; }; x86_64-linux-313 = { - name = "torch-2.7.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-lWBCX56hrxeRUH6Mpw1bns9i/tfKImqV/NWNDrLMp48="; + name = "torch-2.8.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-OoUjaaON7DQ9RezQvDZg95uIoj4Mh40YcH98E79JU48="; }; aarch64-darwin-39 = { - name = "torch-2.7.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-NRvpBdG6aT8xe+YDRB5O2VgO2ajX7hez2uYPov9Jv/c="; + name = "torch-2.8.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-a+wfJAlodJ4ju7fqj2YXoI/D2xtMdmtczq34ootBl9k="; }; aarch64-darwin-310 = { - name = "torch-2.7.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-+MO+4mGwyOCQ9jR0kNxu4q6/1mHrDz9q6uBtmS2O1W8="; + name = "torch-2.8.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-pGe0n+iTpqbM6J467lVu39xkpyLXGV/f3XXOyd6hN3k="; }; aarch64-darwin-311 = { - name = "torch-2.7.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-aKNSx/Q1q7XLR+LAMtzRASdyriustvyLg7DBsRh0qzo="; + name = "torch-2.8.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-PQUBfRm8mXQSiORYiIKDpEsO6IHVPwX3L4sc/qiZgSI="; }; aarch64-darwin-312 = { - name = "torch-2.7.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-e0+LK4O9CPfTmQJamnsyO9u1PSBWbx4NWEaJu5LYL5o="; + name = "torch-2.8.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-pHt5hr7j9hrSF9ioziRgWAmrQluvNJ+X3nWIFe3S71Q="; }; aarch64-darwin-313 = { - name = "torch-2.7.1-cp313-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp313-none-macosx_11_0_arm64.whl"; - hash = "sha256-fs2GighkaOG890uR20JcHClRqc/NBZLExzN3t+Qkha4="; + name = "torch-2.8.0-cp313-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp313-none-macosx_11_0_arm64.whl"; + hash = "sha256-BX79MKZ3jS7l4jdM1jpj9jMRqm8zMh5ifGVd9gq905A="; }; aarch64-linux-39 = { - name = "torch-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-pFUcuXuD31+T/A11ODMlNYKFgeHbLxea/ChwJ6+91ug="; + name = "torch-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-6si371x8oQba7F6CnfqMpWykdgHbE7QC0mCIYa06uSY="; }; aarch64-linux-310 = { - name = "torch-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-wN8Xzul2U9CaToRIijPSEhf5skIIWDxVzyjwBFqrB2Y="; + name = "torch-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-shSYWLg0Cu6x8wVuC/9bgrluQ7WW/kmp26MYRSImEhM="; }; aarch64-linux-311 = { - name = "torch-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-X+YEW49Ca/LQQm5P4AnxZnqVTsKuuC8b0L9gxteoVEU="; + name = "torch-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-aAEp797uw9tdo/iO5dKMGx4QO3dK70D51jjizOj42Ng="; }; aarch64-linux-312 = { - name = "torch-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-O/LbWt93tDOETwgIh63gScRwXd+f4aMgI/+E/3Napa0="; + name = "torch-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-YQ9gDBAjhuWBMn1e/BjA1u3suYILQUDSYWM1SpnNgA0="; }; aarch64-linux-313 = { - name = "torch-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-6xdkZ5KsQ3T/yH5CNp9F0h7/F8eQholjuQSD7wtttO8="; + name = "torch-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-pQZLXiN3LI0WQGjMfBLgGnX697lI7NlaDUAH10h+XyU="; }; }; } diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 315094905b60..eb03276cf909 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -34,7 +34,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.7.1"; + version = "2.8.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 67ca7358dfbb..5334f94ffd81 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.7.1"; + version = "2.8.0"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index da82062146cb..f0bb5feaa82b 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.7.1" = { + "2.8.0" = { x86_64-linux-39 = { - name = "torchaudio-2.7.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-DBRNX/tO7IbHn/ETar2RvT+DfzBCcTeV4QdYrtxC3Og="; + name = "torchaudio-2.8.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-2QZsae7B8pPC/wqAW/UEc3OQzL9rd8jmfa+DTbhv2kU="; }; x86_64-linux-310 = { - name = "torchaudio-2.7.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-K6CBbu5lnjQ4UanF3GDI4euBmjlpspJo+rJ9MUMnPXg="; + name = "torchaudio-2.8.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-oBYelShaC3Ft4hD+4DkhUdYB59o8yGWVAI2Car/0iow="; }; x86_64-linux-311 = { - name = "torchaudio-2.7.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-hOxyfx/a/fhd0cAYptO/q+tWZbEOC18nOmdetzD1nOU="; + name = "torchaudio-2.8.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-9ECd9WfQcjp6OonTLHVSoX4P9vE36iag0mjGZSWbKZU="; }; x86_64-linux-312 = { - name = "torchaudio-2.7.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-DB1Af5NNRPh5NbE5mR2IcvgfiPimvpt70lkYv3ROK+Y="; + name = "torchaudio-2.8.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-FFuKDCHPyqFwXGcXPF1DkIfg4SDV2pvDRHRvk3kB0kM="; }; x86_64-linux-313 = { - name = "torchaudio-2.7.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-fpfqil1eVhCNHAcUFmE7xhoONTHC5rpqm2RiMtbkEIg="; + name = "torchaudio-2.8.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-QQu46kYiXv5ljl0no4AsGBoiVZEwA2IaXSWlGsqAGNk="; }; aarch64-darwin-39 = { - name = "torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-oHEA/iz3r0+mnYywRqK3QEZhJiGhpUivpa8caeAur4E="; + name = "torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-UiKJ4s1X55QB/VzK6bG8D/LkfzUpCSrfWs9XQn6gxqk="; }; aarch64-darwin-310 = { - name = "torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-RzmvV9DrlDR9HGobVmi+eKc4Ov6Cbd4YoEiDufnyY7E="; + name = "torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-wvRM8nn2c8/N2PV2w0nu6L7fjKqzUaXdeLMpcMw0ohI="; }; aarch64-darwin-311 = { - name = "torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-1aYviMYpA1kT9QbfA/cQxI/Iu5Y3GRkz8nxnCI1coTY="; + name = "torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-ySdoV9JBxt4levdlwPUfwBGvOMtyVAFJUSGygJEwB88="; }; aarch64-darwin-312 = { - name = "torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-kwbc/EWGzr12R6k/6aRI55HE+Dk02mFrlDO3VZeh+Xg="; + name = "torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-3e+UvxgeZEfLsF84vqyo9sW7jSud3O0ao0UgJbn8cNM="; }; aarch64-darwin-313 = { - name = "torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl"; - hash = "sha256-5fBZmlB/RoNUaHjtlmfhsy18o8ipV+TBXGswI3jvTe4="; + name = "torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl"; + hash = "sha256-+FHTLpTKBeRw8MYOJXJuweDrccsspaAga3/QMnLMw8g="; }; aarch64-linux-39 = { - name = "torchaudio-2.7.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-6LLaEaf3eCsAuCPJnoEusA7os0Va1HT4/UKg2gvE9Go="; + name = "torchaudio-2.8.0-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-739/+oKLjYul06VpuCX8BGlojh6JYr9ld9U4vYrxOH0="; }; aarch64-linux-310 = { - name = "torchaudio-2.7.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-wInb/BTF9HCRt78/a/K7rJO4ZhkpnQTZwQL0rVN1iZA="; + name = "torchaudio-2.8.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-08G4WyagmDLROfbW2mtmyutR0uFuCPhYdmXESp4aqPk="; }; aarch64-linux-311 = { - name = "torchaudio-2.7.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-U7xLoS50aL40p8ou6DfuXIvVdVslwS9mWvkznK434mU="; + name = "torchaudio-2.8.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-RXPGBClQwgJ442CKmjgFC6C8cuAEnhu/0knK+FmoAps="; }; aarch64-linux-312 = { - name = "torchaudio-2.7.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-1mvXayJv3UE1yXZQ4bfrY/t2WbTtDjp3iJjkHbuiG2E="; + name = "torchaudio-2.8.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-hi4uQL8J2GXl3wgKhMGjm7zvQOQxQPSxc36zo4nTs48="; }; aarch64-linux-313 = { - name = "torchaudio-2.7.1-cp313-cp313-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Jx9xeETlx/ngXIMo3oF7+Q9G2DKBx5HpT1TU7eovWBc="; + name = "torchaudio-2.8.0-cp313-cp313-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-CVNam3J8B5PNB8Gs6Z8/NTYmKBvMPjDC8jFOPrydP5Y="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 1e2d08b4b36c..8626ead3ac02 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.22.1"; + version = "0.23.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 6457b1621cd8..545ff5bac535 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.22.1" = { + "0.23.0" = { x86_64-linux-39 = { - name = "torchvision-0.22.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-UfJbwdKLA32YoUFckXRBcmJE2KAJcZB+bfsA7MwxNl8="; + name = "torchvision-0.23.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-eE/JDLlw5aKbJLZEHkYfW/YWhGMFuXk/o4cKnyltTA4="; }; x86_64-linux-310 = { - name = "torchvision-0.22.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-U49NtmcobZObTu4KZtMe0htRGGZoAGsOD/4gM47MfgA="; + name = "torchvision-0.23.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-RgvI1w9jvbQzpzUd7MLBrhkD9/N45KdhT8joyXpcNqo="; }; x86_64-linux-311 = { - name = "torchvision-0.22.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-klaKxGsTqMiLYViYALG5xGKb4JHqfOCA/G/GIuEeCRU="; + name = "torchvision-0.23.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-k/G19WsgzWhpvKQJQ95P08qczFbhtX9HxnHeHNqznNs="; }; x86_64-linux-312 = { - name = "torchvision-0.22.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-9k75u5HXGrNdg4SRKhn3QZ41koaFvGdUTVj0UUgzQ3M="; + name = "torchvision-0.23.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-nLPBOZevy0QFfKENlDxsTLowaK/eDzcJZavOnIn8/6k="; }; x86_64-linux-313 = { - name = "torchvision-0.22.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-vE/vGTkXtR22tAms0//eyShth3uqwK7l3Pu3JZLQC/w="; + name = "torchvision-0.23.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-xjmC8Zc7pnezfmZj3w4Hy1OBRZtvBXLCypXuvY3+t0I="; }; aarch64-darwin-39 = { - name = "torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-i+lBtNNcCrqBm+cP27vtjOtgQBzmmWuM+quhMAzmImM="; + name = "torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-sZDbIF+QIGwjD8L5HL39VzMzS6vA4NGb3bkKQLjPJsI="; }; aarch64-darwin-310 = { - name = "torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-O0fYNp7laMBneVwNoLQHjzmp3+pvO8HzrIdTDf2h3VY="; + name = "torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-cmaHHaygCtRtHAc+VdlyF50SpY+lya3smj25u+1xKEo="; }; aarch64-darwin-311 = { - name = "torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-St32JuK1f8Iv1tMpzxNG1HRJdnLmr4ODt7W2NvupSlM="; + name = "torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-Saog4h8MK9RYxx17RJd2y9XxZpPdWAcZWoIGEriiKbc="; }; aarch64-darwin-312 = { - name = "torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-FT8XkOUFvW2hI+Ie7m6D4uFV3wXA/n1WNHMDBn2FQ8U="; + name = "torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-4OLASpFAPo3Tr5dWxqAkodnA7ZwNWSqDFN7Y9P4w1EA="; }; aarch64-darwin-313 = { - name = "torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl"; - hash = "sha256-nDrjMZYkxDzIEnAg9GwUqoeEBngfCJm7YoOuR0r+r78="; + name = "torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl"; + hash = "sha256-HDfjJeCaGEtzDD71FCTzg+xXRTeNwOyiRFIKyilyJgA="; }; aarch64-linux-39 = { - name = "torchvision-0.22.1-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-FUor3DehYSLCAk8vd+ZfWYYCC0DAE1FcaUtdNX+smaE="; + name = "torchvision-0.23.0-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-bHTLwcvuJt1PNfmJzYDczEBBHyWN7kdrKYcd7ktIOvA="; }; aarch64-linux-310 = { - name = "torchvision-0.22.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-mQ3k1lekHtcWgM2L4umOvKtVNx8wmT3JvS5nZEH3GA4="; + name = "torchvision-0.23.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-McWDuidCajoE7KjAVFBSQQXBVk20G+ZjL3U270BabeI="; }; aarch64-linux-311 = { - name = "torchvision-0.22.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-i0pTpgZ9Y626DFLyuN0ikNtknWQgIWdO5DwMki8Mamk="; + name = "torchvision-0.23.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-Adwz7iTHkUiu582880roo8naFnSlkeeBV3txbSM7H6Y="; }; aarch64-linux-312 = { - name = "torchvision-0.22.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-lkQU7vGUWdVaEOiG4vylBndVDiQ1htFnj2Xj9va6xHo="; + name = "torchvision-0.23.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-bdfE0ymg4DFXgDAxvIViIMYVXvCMJtT1u6yTis7PCUg="; }; aarch64-linux-313 = { - name = "torchvision-0.22.1-cp313-cp313-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-SmFKakCNLtdCCNDqbCii+7aCkOmn3yBsX+8/C2hl0wc="; + name = "torchvision-0.23.0-cp313-cp313-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-L3/WwV82l+gGJ7d5NPd3BfO8Dpgni5ibJlXeAfaQPh0="; }; }; } diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 869dd0f9ff63..992b8e7496ac 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20250516"; + version = "1.1.11.20250708"; pyproject = true; src = fetchPypi { pname = "types_html5lib"; inherit version; - hash = "sha256-ZQQ6ZxjJf31SVnzAzfQe+/wzsfksbAxeGfYKfsaa5yA="; + hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix index add20789e5b9..8532e94d4742 100644 --- a/pkgs/development/python-modules/wavinsentio/default.nix +++ b/pkgs/development/python-modules/wavinsentio/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wavinsentio"; - version = "0.5.0"; + version = "0.5.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-YSofEjDehuNlenkAsQzLkX67Um4pkMSeZmVZgNA06vw="; + hash = "sha256-FlxeOaqQkJBWQtEUudbwlCzkK6HWmWTIxjgaI80BlxQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index d4de5f0333f5..4287b66a5f06 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.12"; + version = "0.1.13"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pogzyb"; repo = "whodap"; - tag = "v${version}"; - hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE="; + tag = version; + hash = "sha256-VSFtHjdG9pJAryGUgwI0NxxaW0JiXEHU7aVvXYxymtc="; }; propagatedBuildInputs = [ httpx ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python RDAP utility for querying and parsing information about domain names"; homepage = "https://github.com/pogzyb/whodap"; - changelog = "https://github.com/pogzyb/whodap/releases/tag/v${version}"; + changelog = "https://github.com/pogzyb/whodap/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 8c9d734b5dc5..749bca4f0e89 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.10.3"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; tag = version; - hash = "sha256-0JTuTGHAWG4lMKMvvtuNTRiYlfPsbhCNoGS0TJBZdCc="; + hash = "sha256-7GaxWLGmyxy5RlLoqXXmTM67eoIDf9IB3qjohZcNupU="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix deleted file mode 100644 index 5a39d5126526..000000000000 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - qtbase, - qttools, - sqlcipher, - wrapQtAppsHook, - qtmacextras, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sqlitebrowser"; - version = "3.13.1"; - - src = fetchFromGitHub { - owner = "sqlitebrowser"; - repo = "sqlitebrowser"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg="; - }; - - patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; - - # We should be using qscintilla from nixpkgs instead of the vendored version, - # but qscintilla is currently in a bit of a mess as some consumers expect a - # -qt4 or -qt5 prefix while others do not. - # We *really* should get that cleaned up. - buildInputs = [ - qtbase - sqlcipher - ] - ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - nativeBuildInputs = [ - cmake - qttools - wrapQtAppsHook - ]; - - cmakeFlags = [ - "-Dsqlcipher=1" - (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.finalPackage.doCheck or false)) - ]; - - doCheck = true; - - meta = with lib; { - description = "DB Browser for SQLite"; - mainProgram = "sqlitebrowser"; - homepage = "https://sqlitebrowser.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index f453e61510c3..aed866aa454b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -202,17 +202,15 @@ let # to be built eventually, we would still like to get the error early and without # having to wait while nix builds a derivation that might not be used. # See also https://github.com/NixOS/nix/issues/4629 - optionalAttrs (attrs ? disallowedReferences) { - disallowedReferences = map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; - } - // optionalAttrs (attrs ? disallowedRequisites) { - disallowedRequisites = map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; - } - // optionalAttrs (attrs ? allowedReferences) { - allowedReferences = mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; - } - // optionalAttrs (attrs ? allowedRequisites) { - allowedRequisites = mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; + { + ${if (attrs ? disallowedReferences) then "disallowedReferences" else null} = + map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; + ${if (attrs ? disallowedRequisites) then "disallowedRequisites" else null} = + map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; + ${if (attrs ? allowedReferences) then "allowedReferences" else null} = + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; + ${if (attrs ? allowedRequisites) then "allowedRequisites" else null} = + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; }; makeDerivationArgument = @@ -478,8 +476,8 @@ let derivationArg = removeAttrs attrs removedOrReplacedAttrNames - // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { - name = + // { + ${if (attrs ? name || (attrs ? pname && attrs ? version)) then "name" else null} = let # Indicate the host platform of the derivation if cross compiling. # Fixed-output derivations like source tarballs shouldn't get a host @@ -507,8 +505,7 @@ let ) "The `version` attribute cannot be null."; "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}" ); - }) - // { + builder = attrs.realBuilder or stdenv.shell; args = attrs.args or [ @@ -556,28 +553,33 @@ let inherit doCheck doInstallCheck; inherit outputs; - } - // optionalAttrs (__contentAddressed) { - inherit __contentAddressed; - # Provide default values for outputHashMode and outputHashAlgo because - # most people won't care about these anyways - outputHashAlgo = attrs.outputHashAlgo or "sha256"; - outputHashMode = attrs.outputHashMode or "recursive"; - } - // optionalAttrs (enableParallelBuilding) { - inherit enableParallelBuilding; - enableParallelChecking = attrs.enableParallelChecking or true; - enableParallelInstalling = attrs.enableParallelInstalling or true; - } - // optionalAttrs (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) { - NIX_HARDENING_ENABLE = builtins.concatStringsSep " " enabledHardeningOptions; - } - // + + # When the derivations is content addressed provide default values + # for outputHashMode and outputHashAlgo because most people won't + # care about these anyways + ${if __contentAddressed then "__contentAddressed" else null} = __contentAddressed; + ${if __contentAddressed then "outputHashAlgo" else null} = attrs.outputHashAlgo or "sha256"; + ${if __contentAddressed then "outputHashMode" else null} = attrs.outputHashMode or "recursive"; + + ${if enableParallelBuilding then "enableParallelBuilding" else null} = enableParallelBuilding; + ${if enableParallelBuilding then "enableParallelChecking" else null} = + attrs.enableParallelChecking or true; + ${if enableParallelBuilding then "enableParallelInstalling" else null} = + attrs.enableParallelInstalling or true; + + ${ + if (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) then + "NIX_HARDENING_ENABLE" + else + null + } = + builtins.concatStringsSep " " enabledHardeningOptions; + # TODO: remove platform condition # Enabling this check could be a breaking change as it requires to edit nix.conf # NixOS module already sets gccarch, unsure of nix installers and other distributions - optionalAttrs - ( + ${ + if stdenv.buildPlatform ? gcc.arch && !( stdenv.buildPlatform.isAarch64 @@ -589,12 +591,15 @@ let stdenv.buildPlatform.gcc.arch == "armv8-a" ) ) - ) - { - requiredSystemFeatures = attrs.requiredSystemFeatures or [ ] ++ [ - "gccarch-${stdenv.buildPlatform.gcc.arch}" - ]; - } + then + "requiredSystemFeatures" + else + null + } = + attrs.requiredSystemFeatures or [ ] ++ [ + "gccarch-${stdenv.buildPlatform.gcc.arch}" + ]; + } // optionalAttrs (stdenv.buildPlatform.isDarwin) ( let allDependencies = concatLists (concatLists dependencies); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6e468e2593ac..73a8edc870a6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -588,6 +588,8 @@ mapAliases { dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 + duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03 + duckstation-bin = throw "'duckstation-bin' has been removed due to being unmaintained"; # Added 2025-08-03 dump1090 = dump1090-fa; # Added 2024-02-12 dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0108c1c3d4af..4a6e76744170 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7486,8 +7486,6 @@ with pkgs; protobuf = protobuf_21; }; - sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; - sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; sqlmap = with python3Packages; toPythonApplication sqlmap;