diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cfc83d387f28..c5ed5ba62c40 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10579,6 +10579,11 @@ githubId = 982322; name = "Henrik Olsson"; }; + henrikvtcodes = { + github = "henrikvtcodes"; + githubId = 22358337; + name = "Henrik VT"; + }; henrirosten = { email = "henri.rosten@unikie.com"; github = "henrirosten"; @@ -11985,6 +11990,11 @@ github = "jaredmontoya"; githubId = 49511278; }; + jasanfarah = { + github = "jasanfarah"; + githubId = 69898185; + name = "Jasan Farah"; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9201540632cb..fcae71655603 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1780,6 +1780,7 @@ ./services/web-apps/vikunja.nix ./services/web-apps/wakapi.nix ./services/web-apps/weblate.nix + ./services/web-apps/websurfx.nix ./services/web-apps/whitebophir.nix ./services/web-apps/whoami.nix ./services/web-apps/wiki-js.nix diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 493668b22173..d05aa14f0045 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -11,20 +12,17 @@ let documentationLink = "https://manual.calibre-ebook.com"; generatedDocumentationLink = documentationLink + "/generated/en/calibre-server.html"; - execFlags = ( - lib.concatStringsSep " " ( - lib.mapAttrsToList (k: v: "${k} ${toString v}") ( - lib.filterAttrs (name: value: value != null) { - "--listen-on" = cfg.host; - "--port" = cfg.port; - "--auth-mode" = cfg.auth.mode; - "--userdb" = cfg.auth.userDb; - } - ) - ++ [ (lib.optionalString (cfg.auth.enable == true) "--enable-auth") ] - ++ cfg.extraFlags + execFlags = + lib.mapAttrsToList (k: v: "--${k}=${toString v}") ( + lib.filterAttrs (name: value: value != null) { + listen-on = cfg.host; + port = cfg.port; + auth-mode = cfg.auth.mode; + userdb = cfg.auth.userDb; + } ) - ); + ++ lib.optional cfg.auth.enable "--enable-auth" + ++ cfg.extraFlags; in { @@ -150,7 +148,9 @@ in serviceConfig = { User = cfg.user; Restart = "always"; - ExecStart = "${cfg.package}/bin/calibre-server ${lib.concatStringsSep " " cfg.libraries} ${execFlags}"; + ExecStart = utils.escapeSystemdExecArgs ( + [ "${cfg.package}/bin/calibre-server" ] ++ execFlags ++ [ "--" ] ++ cfg.libraries + ); }; }; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 38a77f7aaace..9df4e99ff9a5 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -485,6 +485,7 @@ in PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs }; environment = env; + unitConfig.RequiresMountsFor = defaultServiceConfig.ReadWritePaths; preStart = '' # remove old papaerless-manage symlink diff --git a/nixos/modules/services/web-apps/websurfx.nix b/nixos/modules/services/web-apps/websurfx.nix new file mode 100644 index 000000000000..fc43c8d33e8d --- /dev/null +++ b/nixos/modules/services/web-apps/websurfx.nix @@ -0,0 +1,115 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.websurfx; + settingsFormat = pkgs.formats.lua { asBindings = true; }; + settingsFile = settingsFormat.generate "config.lua" cfg.settings; +in +{ + options = { + services.websurfx = { + enable = lib.mkEnableOption "Websurfx, a metasearch engine"; + package = lib.mkPackageOption pkgs "websurfx" { }; + openFirewall = lib.mkEnableOption "Whether to open the used port in the firewall"; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.binding_ip = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "IP address on which the server should be launched"; + }; + options.port = lib.mkOption { + type = lib.types.port; + default = 4567; + description = "Port on which the server should be launched"; + }; + }; + default = { }; + description = '' + Configuration options for Websurfx, see + [websurfx/config.lua](https://github.com/neon-mmd/websurfx/blob/rolling/websurfx/config.lua) + for supported values. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.websurfx.settings = { + # General + logging = lib.mkDefault true; + debug = lib.mkDefault false; + threads = lib.mkDefault 10; + + # Server + production_use = lib.mkDefault false; + request_timeout = lib.mkDefault 30; + tcp_connection_keep_alive = lib.mkDefault 30; + pool_idle_connection_timeout = lib.mkDefault 30; + rate_limiter = { + number_of_requests = lib.mkDefault 20; + time_limit = lib.mkDefault 3; + }; + https_adaptive_window_size = lib.mkDefault true; + + operating_system_tls_certificates = lib.mkDefault true; + + number_of_https_connections = lib.mkDefault 10; + client_connection_keep_alive = lib.mkDefault 120; + + # Search + safe_search = lib.mkDefault 2; + + # Website + colorscheme = lib.mkDefault "catppuccin-mocha"; + theme = lib.mkDefault "simple"; + animation = lib.mkDefault "simple-frosted-glow"; + + # Caching + #redis_url = "redis://127.0.0.1:8082"; # The nixpkgs build doesn't have the redis-cache feature enabled + cache_expiry_time = lib.mkDefault 600; + + # Search Engines + upstream_search_engines = { + DuckDuckGo = lib.mkDefault true; + Searx = lib.mkDefault false; + Brave = lib.mkDefault false; + Startpage = lib.mkDefault false; + LibreX = lib.mkDefault false; + Mojeek = lib.mkDefault false; + Bing = lib.mkDefault false; + Wikipedia = lib.mkDefault true; + Yahoo = lib.mkDefault false; + }; + + proxy = lib.mkDefault null; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.port ]; + + systemd.services.websurfx = { + description = "Websurfx, a metasearch engine"; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + DynamicUser = true; + RuntimeDirectory = "websurfx"; + Environment = [ "HOME=%t/websurfx" ]; + BindReadOnlyPaths = [ "${settingsFile}:%t/websurfx/.config/websurfx/config.lua" ]; + }; + + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = [ lib.maintainers.SchweGELBin ]; +} diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 49c475a2649a..45befe869524 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2026-03-10"; + version = "0-unstable-2026-03-18"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "ab1ee21996b78aaac1f82baa390990c8ce9a9936"; - hash = "sha256-mzK+ADPTFCxiPxQDw8CtwJEW0nrX+ozUosV0N/jeMHk="; + rev = "5f6b4daf61ed8f005f759236ea363fa8ee7a1d08"; + hash = "sha256-DNsNmtse35Bv3QxhJlYAFe3D0VRhSn2svwfiF+bgxxA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 3a326c5c9eba..98fbc15dd0d8 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "146.0.7680.80", + "version": "146.0.7680.153", "chromedriver": { - "version": "146.0.7680.80", - "hash_darwin": "sha256-sjCEvFWV07GNhXJ9CfGVtZ6nCeqsqtNtY4sPj/gq13w=", - "hash_darwin_aarch64": "sha256-kTxZJiF7mJlVbkDDFP4ZUB2htBn45se1Wuz28RP8pr8=" + "version": "146.0.7680.154", + "hash_darwin": "sha256-jSAe8mkJ0mDqKJyzsaAuGwyG5lwdOHkYDUgxR2G+vJE=", + "hash_darwin_aarch64": "sha256-tCMADPY/Q2sjyHUvZPO9o+ZkLaZ7iTCLrTiPVUYVQr0=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f08938029c887ea624da7a1717059788ed95034d", - "hash": "sha256-PCQeTdc6Fl74TLyvxjli4scIUIm0GgZ3e9wbC18Tclw=", + "rev": "85fd829a1b2049479ead5ed578f5ed105a094fe4", + "hash": "sha256-PshNuKAZBXohix711YGjE4X24ixVW29wxgeePNE9Xzs=", "recompress": true }, "src/third_party/clang-format/script": { @@ -92,8 +92,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "1d3190bf5633327395d694d621258978d989dffd", - "hash": "sha256-QVtTxBBox8fiqTj0gjqvYx6HoBSlvuWIe5ki4iCQl08=" + "rev": "e05753c6d05b17b23d514038957469c70b75475c", + "hash": "sha256-SMym7PN2acfw84Z95xWSbN/QV5UIDIOztWxFeTCfBsk=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -132,8 +132,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "c46c81b25577c40de6e7e510743ae0454e0c8351", - "hash": "sha256-Duv3kNulPtVxCLPa3bFIev64O9Y4ObJP/IZz31oPJ0E=" + "rev": "3d52cfc8dd0bc2cdbbecd9803cc08102de7e4597", + "hash": "sha256-lyAG9tKBWQ2yy/morStUd0ZKDPT58t8516NDCQG/jZs=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -422,8 +422,8 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "4018d3b63456eb657475e66c352bfa86f321e0f5", - "hash": "sha256-RuCmzPIR6hW8znjQH4kQqSJmIIJWtMkUQjYEVn3B9AE=" + "rev": "446588f90da2e3372a9352d3b2ba8ab3f342c8ce", + "hash": "sha256-hLddZzWBQZ/MEF5fcCiju5ibNPSb+zhahlxdLaczdsE=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", @@ -602,8 +602,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "67cf48602b0c8aaa9807cd185212ee078eb30b21", - "hash": "sha256-jMoYwf63C0IHx/QcOT+LKCCYN3dJVUhC5COukkhwqx0=" + "rev": "bccc616f83aaed08f65d4a707dfe00e24133772b", + "hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", @@ -652,8 +652,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "248acd90d9a35ac46b2ec30201ae50f301b8a173", - "hash": "sha256-zOL5j9X72ZvYmS8MzQ+pqSkT8AWBz2IwmaH7I3LN1IE=" + "rev": "3c7c530c115124b415c1f4e0e35694fbaefd2177", + "hash": "sha256-ObLypxiOKH/YoLw6uUA4MmHM44vA8iPhNCEfFcwip0Q=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -787,8 +787,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "d1972add2a63b2a528a6471d447f82e0010b5215", - "hash": "sha256-evtOzxwWgKUaJl9zwpQDqPp1wM7w3DzjRcLg29z9ELQ=" + "rev": "b2a90ac0037ee7187102ce2c40e5007216ca9a58", + "hash": "sha256-rX6NEN0RbfHPRqJqkGhypwWt/NcREvPaanL+CDxwhA8=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -817,8 +817,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "70253f966a7c3936f5a5ff57c6a4a4face1f16ad", - "hash": "sha256-8tA9nWXsiQ2Qt7pbALrhsnNFHOFLw/wlcz5OrFjYEI8=" + "rev": "abb5d7b829d60a5dae46fbcee0e9d0d554d3a946", + "hash": "sha256-hnwiRarq+69BECxJ9FQD0XGqqA/OF66RxZUPWTzDaFE=" } } }, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b93a9d67df6c..c84be0cd77a6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -310,11 +310,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-CNHGuChMDqSFz8YXETfQzgyQw8p8Ua6u3gevFFr69RI=", + "hash": "sha256-QUx+pSj9FyY0+IOUcmBS32qEOgDAGxeQRcio6lQOGN4=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.79.0", + "rev": "v2.80.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 79ae0a37fc20..176dd895335b 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -106,5 +106,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; license = lib.licenses.mit; homepage = "https://fmv.jku.at/cadical/"; + mainProgram = "cadical"; }; }) diff --git a/pkgs/by-name/co/codd/generated.nix b/pkgs/by-name/co/codd/generated.nix index 142bb4f2baf0..a1c30784a9ef 100644 --- a/pkgs/by-name/co/codd/generated.nix +++ b/pkgs/by-name/co/codd/generated.nix @@ -41,7 +41,7 @@ }: mkDerivation { pname = "codd"; - version = "0.1.6"; + version = "0.1.8"; src = ./.; isLibrary = true; isExecutable = true; @@ -72,6 +72,7 @@ mkDerivation { unliftio unliftio-core unordered-containers + uuid vector ]; executableHaskellDepends = [ diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix index a46f90429f8d..6550090382b8 100644 --- a/pkgs/by-name/co/codd/package.nix +++ b/pkgs/by-name/co/codd/package.nix @@ -14,18 +14,18 @@ ############## let - # Haxl has relatively tight version requirements and is thus often marked as broken. + # Haxl has relatively tight version requirements and is often marked as broken. haxlJailbroken = haskell.lib.markUnbroken (haskell.lib.doJailbreak haskellPackages.haxl); generated = haskellPackages.callPackage ./generated.nix { haxl = haxlJailbroken; }; derivationWithVersion = haskell.lib.compose.overrideCabal rec { - version = "0.1.6"; + version = "0.1.8"; src = fetchFromGitHub { owner = "mzabani"; repo = "codd"; tag = "v${version}"; - hash = "sha256-KdZCL09TERy/PolQyYYykEbPtG5yhxrLZSSo9n6p2WE="; + hash = "sha256-7MKlR3oepOwlBwiEpzz3NFepEYGqROT5RrYoe/vvBKM="; }; # We only run codd's tests that don't require postgresql nor strace. We need to support unix sockets in codd's test suite diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index ce507fd9def1..1abb6a50004d 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -184,11 +184,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "146.0.7680.80"; + version = "146.0.7680.153"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-Lam/V3YtHyph4RDlz+vGbXESQuRNg+53wqgZoYFcwxU="; + hash = "sha256-b/DLXbvHbjUWFyJTXLoL0I6a/3r1YaVowNqr3oQ0imA="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -302,11 +302,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "146.0.7680.80"; + version = "146.0.7680.154"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/dzyizse52hr7lfzvs5c2ypryzq_146.0.7680.80/GoogleChrome-146.0.7680.80.dmg"; - hash = "sha256-vKt8bQLAsiwjX2tdrkPjq6uC5wXSk8Jb3dr43ofbEt4="; + url = "http://dl.google.com/release2/chrome/aduhru4wjcwjo2cuql7gnsdev6hq_146.0.7680.154/GoogleChrome-146.0.7680.154.dmg"; + hash = "sha256-u/i8fYn53BbQGFlBFTEayNpSQoeNPBJEBXr2KFArgW8="; }; dontPatch = true; diff --git a/pkgs/by-name/ka/kamal-proxy/package.nix b/pkgs/by-name/ka/kamal-proxy/package.nix new file mode 100644 index 000000000000..8a929ff30c8b --- /dev/null +++ b/pkgs/by-name/ka/kamal-proxy/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "kamal-proxy"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "basecamp"; + repo = "kamal-proxy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oY1XwhoZx/GMg46nQAOK6tx9VzQoXTNdxE26FjBvbsg="; + }; + + vendorHash = "sha256-EDPHqVGkZeaV/9p3EywUkQTNbIdBkAjre9oxRi4c+WY="; + + subPackages = [ "cmd/kamal-proxy" ]; + + env.CGO_ENABLED = 0; + + ldflags = [ "-s" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Lightweight proxy server for Kamal"; + homepage = "https://github.com/basecamp/kamal-proxy"; + changelog = "https://github.com/basecamp/kamal-proxy/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "kamal-proxy"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jasanfarah ]; + }; +}) diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index f44c7147758c..19a21ebc968f 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -17,6 +17,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0="; }; + # Temporary fix to get build to pass until https://github.com/moghtech/komodo/pull/1122 + patches = [ + ./rustc-1_9_2-fixes.patch + ]; + cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ="; # disable for check. document generation is fail diff --git a/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch b/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch new file mode 100644 index 000000000000..4021c35ba17e --- /dev/null +++ b/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch @@ -0,0 +1,52 @@ +diff --git a/bin/core/src/alert/discord.rs b/bin/core/src/alert/discord.rs +index 427227d..6d19678 100644 +--- a/bin/core/src/alert/discord.rs ++++ b/bin/core/src/alert/discord.rs +@@ -230,14 +230,13 @@ pub async fn send_alert( + ) + } + AlertData::Custom { message, details } => { +- format!( +- "{level} | {message}{}", +- if details.is_empty() { +- format_args!("") +- } else { +- format_args!("\n{details}") +- } +- ) ++ let details_str = if details.is_empty() { ++ String::new() ++ } else { ++ format!("\n{details} f") ++ }; ++ ++ format!("{level} | {message}{details_str}") + } + AlertData::None {} => Default::default(), + }; +diff --git a/bin/core/src/alert/mod.rs b/bin/core/src/alert/mod.rs +index 9eba5da..1f51ac2 100644 +--- a/bin/core/src/alert/mod.rs ++++ b/bin/core/src/alert/mod.rs +@@ -474,14 +474,13 @@ fn standard_alert_content(alert: &Alert) -> String { + ) + } + AlertData::Custom { message, details } => { +- format!( +- "{level} | {message}{}", +- if details.is_empty() { +- format_args!("") +- } else { +- format_args!("\n{details}") +- } +- ) ++ let details_str = if details.is_empty() { ++ String::new() ++ } else { ++ format!("\n{details}") ++ }; ++ ++ format!("{level} | {message}{details_str}") + } + AlertData::None {} => Default::default(), + } diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index eb31bd752453..147c814dab10 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; - version = "4.4.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cm/Ch7dBKInQYPFGfSlSMLgj8uQR6E3S+6gCFUyvFSU="; + hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY="; }; - sourceRoot = "source/src/frontend"; + sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-JacPecJvdyATea8o1jQOxY9Gzx4kH+HLqE0eq03dzjg="; + hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 6d5137df41f0..9047413c1fd3 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; - version = "4.4.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cm/Ch7dBKInQYPFGfSlSMLgj8uQR6E3S+6gCFUyvFSU="; + hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY="; }; - sourceRoot = "source/src/frontend"; + sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-JacPecJvdyATea8o1jQOxY9Gzx4kH+HLqE0eq03dzjg="; + hash = "sha256-F8VXjGY6Ct2Y8btqOmxZevCkxBvqg6xWZLYTZA2uUnM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 47e7e5759664..e38e23cd5c02 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -11,12 +11,12 @@ yarnConfigHook, }: let - version = "4.5.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-/mI11ldbYa051WA2hkV7fnc8CJOb0jHra0FJ+eVCqVs="; + hash = "sha256-R8DO7hsWt8+aKnHFEoZ06f1f+r8dNmNoPZRVBfr9VCY="; }; mail-templates = stdenv.mkDerivation { @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; - hash = "sha256-g71OGg0PAo60h0bC+oOyvLvPOCg0pYXuYD8vsR5X9/k="; + hash = "sha256-ag9+g48dWl5Ww/78qqgtcKwiyPVlpNiJ7w7+DPaar2U="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyproject = true; inherit version src; - sourceRoot = "source/src/backend"; + sourceRoot = "${finalAttrs.src.name}/src/backend"; patches = [ # Support configuration throught environment variables for SECURE_* @@ -104,12 +104,14 @@ python3Packages.buildPythonApplication (finalAttrs: { openai psycopg pycrdt + pydantic-ai-slim pyjwt pyopenssl python-magic redis requests sentry-sdk + uvicorn whitenoise ] ++ celery.optional-dependencies.redis diff --git a/pkgs/by-name/le/lepton-jpeg-util/package.nix b/pkgs/by-name/le/lepton-jpeg-util/package.nix new file mode 100644 index 000000000000..212aeff6362d --- /dev/null +++ b/pkgs/by-name/le/lepton-jpeg-util/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "lepton-jpeg-util"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "lepton_jpeg_rust"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DfVgQGGnrOOa/UdkYHSENbtxkbR0cTe08uglUM2hfGI="; + }; + + cargoHash = "sha256-AryHUFB6EWSUvKs+lBI16+A27VfRsr6aUtrwsiZxT28="; + + buildAndTestSubdir = "util"; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Port of DropBox Lepton compression to Rust"; + changelog = "https://github.com/microsoft/lepton_jpeg_rust/releases/tag/v${finalAttrs.version}"; + mainProgram = "lepton_jpeg_util"; + homepage = "https://github.com/microsoft/lepton_jpeg_rust"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ skohtv ]; + }; +}) diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix index bfde4639426b..3f79fd9f2722 100644 --- a/pkgs/by-name/li/libredwg/package.nix +++ b/pkgs/by-name/li/libredwg/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libredwg"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "LibreDWG"; repo = "libredwg"; tag = finalAttrs.version; - hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc="; + hash = "sha256-FeDQCByFGKfHJDOPQA92GslXZ33nhGfB6/63t2TeugE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/mautrix-telegram/package.nix b/pkgs/by-name/ma/mautrix-telegram/package.nix index 6a5664a311b3..4a80fc9c9b36 100644 --- a/pkgs/by-name/ma/mautrix-telegram/package.nix +++ b/pkgs/by-name/ma/mautrix-telegram/package.nix @@ -1,31 +1,31 @@ { lib, - python3, fetchPypi, fetchFromGitHub, + python3, + withE2BE ? true, }: let - python = python3.override { - self = python; - packageOverrides = self: super: { - tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.99.0a6"; - pname = "tulir_telethon"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ewqc6s5xXquZJTZVBsFmHeamBLDw6PnTSNcmTNKD0sk="; - }; - patches = [ ]; - doCheck = false; - }); - }; - }; + tulir-telethon = python3.pkgs.telethon.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "1.99.0a6"; + pname = "tulir_telethon"; + src = fetchFromGitHub { + owner = "tulir"; + repo = "Telethon"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w="; + }; + dontUsePytestCheck = true; + } + ); in -python.pkgs.buildPythonPackage (finalAttrs: { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "mautrix-telegram"; version = "0.15.3"; + pyproject = true; src = fetchFromGitHub { owner = "mautrix"; @@ -34,47 +34,50 @@ python.pkgs.buildPythonPackage (finalAttrs: { hash = "sha256-w3BqWyAJV/lZPoOFDzxhootpw451lYruwM9efwS6cEc="; }; - format = "setuptools"; + build-system = with python3.pkgs; [ setuptools ]; patches = [ ./0001-Re-add-entrypoint.patch ]; - propagatedBuildInputs = - with python.pkgs; - ( - [ - ruamel-yaml - python-magic - commonmark - aiohttp - yarl - (mautrix.override { withOlm = withE2BE; }) - tulir-telethon - asyncpg - mako - setuptools - # speedups - cryptg - aiodns - brotli - # qr_login - pillow - qrcode - # formattednumbers - phonenumbers - # metrics - prometheus-client - # sqlite - aiosqlite - # proxy support - pysocks - ] - ++ lib.optionals withE2BE [ - # e2be - python-olm - pycryptodome - unpaddedbase64 - ] - ); + pythonRelaxDeps = [ + "mautrix" + "ruamel.yaml" + ]; + + dependencies = + with python3.pkgs; + [ + ruamel-yaml + python-magic + commonmark + aiohttp + yarl + (mautrix.override { withOlm = withE2BE; }) + tulir-telethon + asyncpg + mako + setuptools + # speedups + cryptg + aiodns + brotli + # qr_login + pillow + qrcode + # formattednumbers + phonenumbers + # metrics + prometheus-client + # sqlite + aiosqlite + # proxy support + pysocks + ] + ++ lib.optionals withE2BE [ + # e2be + python-olm + pycryptodome + unpaddedbase64 + ]; # has no tests doCheck = false; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index db5e51302f0b..c9f5a562d11b 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-r/9kMhkoLfj9oEifFun/bpIQYEouqm9YEiWZVk07+S8="; + hash = "sha256-5su0Qfg3M+Yq4pkptDOJhvM8VFGCaOLeeDijeFeywP4="; }; build-system = with python3Packages; [ @@ -58,12 +58,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pyyaml requests rich + sounddevice textual textual-speedups tomli-w tree-sitter tree-sitter-bash watchfiles + websockets zstandard ]; @@ -81,7 +83,29 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; versionCheckKeepEnvironment = [ "HOME" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # Fail in the sandbox + # vibe.core.audio_recorder.audio_recorder_port.NoAudioInputDeviceError: No audio input device available + "test_audio_stream_yields_chunks" + "test_auto_stops_after_max_duration" + "test_buffer_mode_audio_stream_yields_nothing" + "test_can_record_multiple_times" + "test_cancel_discards_audio" + "test_manual_stop_prevents_on_expire" + "test_on_expire_receives_audio" + "test_peak_clamps_to_one" + "test_peak_updates_from_callback" + "test_silent_audio_has_zero_peak" + "test_start_sets_recording_state" + "test_start_when_already_recording_raises" + "test_stop_from_event_loop_does_not_block" + "test_stop_returns_empty_data_in_stream_mode" + "test_stop_returns_positive_duration" + "test_stop_returns_valid_wav" + "test_stop_without_drain_returns_promptly" + "test_stream_audio_does_not_leak_into_buffer_recording" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError "test_rebuilds_index_when_mass_change_threshold_is_exceeded" "test_updates_index_incrementally_by_default" diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix index 0bcb665ea532..36eeafd5ae8d 100644 --- a/pkgs/by-name/mo/moosefs/package.nix +++ b/pkgs/by-name/mo/moosefs/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "moosefs"; - version = "4.58.3"; + version = "4.58.4"; src = fetchFromGitHub { owner = "moosefs"; repo = "moosefs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lEnCP+ORWdW52SVO7K3WxcjlFMrQFR9VT8fjquI/fZg="; + sha256 = "sha256-AvY1TOoxxpiqrMqngZe3BTgMuxwltQk1unr/IEfOLt4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index 8d42cd38b305..85c631d0aed7 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "mtPaint"; - version = "3.50.12"; + version = "3.50.14"; src = fetchFromGitHub { owner = "wjaguar"; repo = "mtPaint"; - rev = "7cae5d663ed835a365d89a535536c39e18862a83"; - hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U="; + rev = "8304376e8861a8a603371b0f188db30f9cafdc17"; + hash = "sha256-dyBbzEjdgMPlPnjFlJoZOh5qjx/qY94F28jEr2ihLQE="; }; strictDeps = true; diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index f3509e816370..92d0d2c4b80d 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -71,27 +71,34 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' - # Run both shell completion and manpage generation tasks. Unlike the - # fine-grained variants, the 'dist' command doesn't allow specifying the - # path but that's fine, because we can simply install them from the implicit - # output directories. - $out/bin/xtask dist + postInstall = + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + # Run both shell completion and manpage generation tasks. Unlike the + # fine-grained variants, the 'dist' command doesn't allow specifying the + # path but that's fine, because we can simply install them from the implicit + # output directories. + ${emulator} $out/bin/xtask dist - # The dist task above should've created - # 1. Shell completions in comp/ - # 2. The NH manpage (nh.1) in man/ - # Let's install those. - # The important thing to note here is that installShellCompletion cannot - # actually load *all* shell completions we generate with 'xtask dist'. - # Elvish, for example isn't supported. So we have to be very explicit - # about what we're installing, or this will fail. - installShellCompletion --cmd ${finalAttrs.meta.mainProgram} ./comp/*.{bash,fish,zsh,nu} - installManPage ./man/nh.1 - - # Avoid populating PATH with an 'xtask' cmd - rm $out/bin/xtask - ''; + # The dist task above should've created + # 1. Shell completions in comp/ + # 2. The NH manpage (nh.1) in man/ + # Let's install those. + # The important thing to note here is that installShellCompletion cannot + # actually load *all* shell completions we generate with 'xtask dist'. + # Elvish, for example isn't supported. So we have to be very explicit + # about what we're installing, or this will fail. + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} ./comp/*.{bash,fish,zsh,nu} + installManPage ./man/nh.1 + '' + ) + + '' + # Avoid populating PATH with an 'xtask' cmd + rm $out/bin/xtask + ''; cargoHash = "sha256-BLv69rL5L84wNTMiKHbSumFU4jVQqAiI1pS5oNLY9yE="; diff --git a/pkgs/by-name/op/openimagedenoise/cuda.patch b/pkgs/by-name/op/openimagedenoise/cuda.patch index 4bc5172d8830..d1b59d9f186b 100644 --- a/pkgs/by-name/op/openimagedenoise/cuda.patch +++ b/pkgs/by-name/op/openimagedenoise/cuda.patch @@ -1,21 +1,16 @@ -Remove upstream workarounds for CMake "limitations" that do not appear to exist -in nixpkgs build environment, but rather break the build, presumably because -CMAKE_INSTALL_{BIN,LIB}DIR is an absolute path in our build so -CMAKE_INSTALL_PREFIX has no effect. - diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt -index d5111cd..43986ad 100644 +index a0ea112..4d03b4f 100644 --- a/devices/CMakeLists.txt +++ b/devices/CMakeLists.txt -@@ -53,7 +53,6 @@ if(OIDN_DEVICE_CUDA) - -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler} - -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall - -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} - -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} - -DCUDAToolkit_ROOT:PATH=${CUDAToolkit_ROOT} -@@ -69,14 +68,6 @@ if(OIDN_DEVICE_CUDA) +@@ -47,7 +47,6 @@ if(OIDN_DEVICE_CUDA) + -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler} + -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DOIDN_ROOT_BINARY_DIR:PATH=${OIDN_ROOT_BINARY_DIR} +@@ -78,14 +77,6 @@ if(OIDN_DEVICE_CUDA) DEPENDS OpenImageDenoise_core ) @@ -30,3 +25,10 @@ index d5111cd..43986ad 100644 endif() if(OIDN_DEVICE_HIP) +@@ -186,4 +177,4 @@ endif() + + if(OIDN_DEVICE_METAL) + add_subdirectory(metal) +-endif() +\ No newline at end of file ++endif() diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index 2982de88dea1..1a94fc54f52b 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -19,10 +19,14 @@ stdenv.mkDerivation (finalAttrs: { # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; + hash = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; }; - patches = lib.optional cudaSupport ./cuda.patch; + strictDeps = true; + + patches = lib.optionals cudaSupport [ + ./cuda.patch + ]; postPatch = '' # fix build failure with GCC14 @@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { python3 ispc ] - ++ lib.optional cudaSupport cudaPackages.cuda_nvcc + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ @@ -49,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) - (lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include") + (lib.cmakeFeature "TBB_INCLUDE_DIR" "${lib.getDev onetbb}/include") (lib.cmakeFeature "TBB_ROOT" "${onetbb}") ]; diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index ac3a4efa04b8..fdbacb66033c 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -94,8 +94,9 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "JavaScript formatter with Prettier integration"; - homepage = "https://github.com/oxc-project/oxc"; + description = "High-performance formatter for the JavaScript ecosystem"; + homepage = "https://oxc.rs/docs/guide/usage/formatter"; + downloadPage = "https://github.com/oxc-project/oxc"; changelog = "https://github.com/oxc-project/oxc/blob/${finalAttrs.src.tag}/apps/oxfmt/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; diff --git a/pkgs/by-name/sh/shira/package.nix b/pkgs/by-name/sh/shira/package.nix index 4fd7651f10de..9d43604560f7 100644 --- a/pkgs/by-name/sh/shira/package.nix +++ b/pkgs/by-name/sh/shira/package.nix @@ -5,20 +5,20 @@ ffmpeg, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication (finalAttrs: { pname = "shira"; - version = "1.7.1-unstable-2025-08-31"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "KraXen72"; repo = "shira"; - rev = "a7478efa434597324458441f328c1b2f84c04dbc"; - hash = "sha256-k15GaOmS0rlQBQldnLo1SzIyCkNQux6P5b7ZG2BIa90="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SgxEvIpjRfc0saoarqw8KySwhbk1UYCGjMcbhhWMhZg="; }; build-system = [ - python3Packages.flit-core + python3Packages.hatchling ]; dependencies = with python3Packages; [ @@ -46,4 +46,4 @@ python3Packages.buildPythonApplication { maintainers = with lib.maintainers; [ thegu5 ]; mainProgram = "shiradl"; }; -} +}) diff --git a/pkgs/by-name/st/stax/package.nix b/pkgs/by-name/st/stax/package.nix new file mode 100644 index 000000000000..b77bd71e3590 --- /dev/null +++ b/pkgs/by-name/st/stax/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + perl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "stax"; + version = "0.25.1"; + + src = fetchFromGitHub { + owner = "cesarferreira"; + repo = "stax"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HHunRVDoijBOcIzj0xknj2O+m+A1nmkkxu97XZcvmJw="; + }; + + nativeBuildInputs = [ perl ]; + + cargoHash = "sha256-cJmK5uX3HCz4own2UtXFkHdGFETjina2/UW18f/g/bA="; + + doInstallCheck = true; + doCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + description = "Stacked-branch workflow for Git with an interactive TUI, smart PRs, and safe undo"; + homepage = "https://github.com/cesarferreira/stax"; + license = lib.licenses.mit; + mainProgram = "stax"; + maintainers = with lib.maintainers; [ + henrikvtcodes + ]; + }; +}) diff --git a/pkgs/by-name/st/style50/package.nix b/pkgs/by-name/st/style50/package.nix index 6f9bc3d3191b..f9397b5b806b 100644 --- a/pkgs/by-name/st/style50/package.nix +++ b/pkgs/by-name/st/style50/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "style50"; - version = "2.10.4"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "cs50"; repo = "style50"; tag = "v${finalAttrs.version}"; - hash = "sha256-59V3QZMYH5edBXv1GNdoaQxerDfKmLKUZ7VL3cvDvuE="; + hash = "sha256-THmxq69peJwT3XQKEpT+ooBYaDDkn1HHGVH5rvM/FF8="; }; build-system = [ diff --git a/pkgs/by-name/sy/syspower/package.nix b/pkgs/by-name/sy/syspower/package.nix index 918cf4d9a830..20cd7c65e302 100644 --- a/pkgs/by-name/sy/syspower/package.nix +++ b/pkgs/by-name/sy/syspower/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation { pname = "syspower"; - version = "0-unstable-2024-12-10"; + version = "0-unstable-2025-12-31"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syspower"; - rev = "323332b4d97a30360455682194ed35868fcbaf71"; - hash = "sha256-obL9XUf8kONBWZoyrPvN1PWmEyQx8vMsl6KIneSjkGM="; + rev = "1a74a7895a02363dfcc23bb43cd3f7d7d8ad3320"; + hash = "sha256-gLkjyhLA0QDG/89uTp32VEoOlTGaDjqZm1aLy+X36qw="; }; buildInputs = [ diff --git a/pkgs/development/libraries/intel-oneapi/default.nix b/pkgs/development/libraries/intel-oneapi/default.nix index 505543fca47f..7aa5ba13bb16 100644 --- a/pkgs/development/libraries/intel-oneapi/default.nix +++ b/pkgs/development/libraries/intel-oneapi/default.nix @@ -76,10 +76,7 @@ depsByComponent.${shortName comp} or [ ] ) components; - phases = [ - "installPhase" - "fixupPhase" - ]; + dontUnpack = true; # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html installPhase = '' diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix new file mode 100644 index 000000000000..777e35e4edf9 --- /dev/null +++ b/pkgs/development/python-modules/genai-prices/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + uv-build, + + # dependencies + httpx, + pydantic, +}: + +buildPythonPackage (finalAttrs: { + pname = "genai-prices"; + version = "0.0.55"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "genai-prices"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FxHBVroKC9tgYJ+a429cnv7UVWMBoeTX+BEah7eD9Us="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/python"; + + build-system = [ + uv-build + ]; + + dependencies = [ + httpx + pydantic + ]; + + pythonImportsCheck = [ + "genai_prices" + ]; + + doCheck = false; # no tests + + meta = { + description = "Calculate prices for calling LLM inference APIs"; + homepage = "https://github.com/pydantic/genai-prices"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/griffelib/default.nix b/pkgs/development/python-modules/griffelib/default.nix new file mode 100644 index 000000000000..5e01d59bc861 --- /dev/null +++ b/pkgs/development/python-modules/griffelib/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + pdm-backend, + uv-dynamic-versioning, + + # optional-dependencies + pip, + platformdirs, + wheel, +}: + +buildPythonPackage (finalAttrs: { + pname = "griffelib"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mkdocstrings"; + repo = "griffe"; + tag = finalAttrs.version; + hash = "sha256-SiUkgkaHtq2aWraL5BJvItOExTGUQ+e6pQVXEwTM0mk="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/griffelib"; + + build-system = [ + hatchling + pdm-backend + uv-dynamic-versioning + ]; + + optional-dependencies.pypi = [ + pip + platformdirs + wheel + ]; + + pythonImportsCheck = [ + "griffe" + ]; + + meta = { + description = "Signatures for entire Python programs. Extract the structure, the frame, the skeleton of your project, to generate API documentation or find breaking changes in your API"; + homepage = "https://github.com/mkdocstrings/griffe"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/lmstudio/default.nix b/pkgs/development/python-modules/lmstudio/default.nix new file mode 100644 index 000000000000..10fce8805d42 --- /dev/null +++ b/pkgs/development/python-modules/lmstudio/default.nix @@ -0,0 +1,94 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + pdm-backend, + + # dependencies + anyio, + httpx, + httpx-ws, + msgspec, + typing-extensions, + + # tests + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "lmstudio"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lmstudio-ai"; + repo = "lmstudio-python"; + tag = finalAttrs.version; + hash = "sha256-3LOoCWoQ7eXRPXHRio9Rtle07HcV3ZrWkrtVVY6mvfI="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + anyio + httpx + httpx-ws + msgspec + typing-extensions + ]; + + pythonImportsCheck = [ "lmstudio" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # lmstudio.LMStudioRuntimeError: Local API host port is not yet resolved. + "test_session_disconnected_async" + ]; + + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'pytest_subtests' + "tests/async/test_model_catalog_async.py" + "tests/sync/test_model_catalog_sync.py" + "tests/test_inference.py" + + # lmstudio.LMStudioRuntimeError: Local API host port is not yet resolved. + "tests/async/test_embedding_async.py" + "tests/async/test_images_async.py" + "tests/async/test_inference_async.py" + "tests/async/test_llm_async.py" + "tests/async/test_model_handles_async.py" + "tests/async/test_repository_async.py" + "tests/async/test_sdk_bypass_async.py" + "tests/sync/test_embedding_sync.py" + "tests/sync/test_images_sync.py" + "tests/sync/test_inference_sync.py" + "tests/sync/test_llm_sync.py" + "tests/sync/test_model_handles_sync.py" + "tests/sync/test_repository_sync.py" + "tests/sync/test_sdk_bypass_sync.py" + "tests/test_convenience_api.py" + "tests/test_logging.py" + "tests/test_plugin_examples.py" + "tests/test_sessions.py" + "tests/test_timeouts.py" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "LM Studio Python SDK"; + homepage = "https://github.com/lmstudio-ai/lmstudio-python"; + changelog = "https://github.com/lmstudio-ai/lmstudio-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix index e2870952868c..7c7e0e75e04e 100644 --- a/pkgs/development/python-modules/mistralai/default.nix +++ b/pkgs/development/python-modules/mistralai/default.nix @@ -9,13 +9,10 @@ # dependencies eval-type-backport, httpx, - invoke, opentelemetry-api, - opentelemetry-exporter-otlp-proto-http, - opentelemetry-sdk, + opentelemetry-semantic-conventions, pydantic, python-dateutil, - pyyaml, typing-inspection, # optional-dependencies @@ -26,19 +23,20 @@ requests, # tests + opentelemetry-sdk, pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "mistralai"; - version = "1.12.3"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "client-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-DaCAO4/DoskFuRgNcoLWBuRdnxXfYhsgY/WZu/s1wk0="; + hash = "sha256-SLPLj9rp8TTOSE3ldobBFU1+MpffzH1Bpshw+7LLUvU="; }; preBuild = '' @@ -50,18 +48,15 @@ buildPythonPackage (finalAttrs: { ]; pythonRelaxDeps = [ - "opentelemetry-exporter-otlp-proto-http" + "opentelemetry-semantic-conventions" ]; dependencies = [ eval-type-backport httpx - invoke opentelemetry-api - opentelemetry-exporter-otlp-proto-http - opentelemetry-sdk + opentelemetry-semantic-conventions pydantic python-dateutil - pyyaml typing-inspection ]; @@ -80,7 +75,15 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "mistralai" ]; nativeCheckInputs = [ + opentelemetry-sdk pytestCheckHook + ] + ++ finalAttrs.passthru.optional-dependencies.agents + ++ finalAttrs.passthru.optional-dependencies.gcp; + + disabledTests = [ + # AssertionError: is not an instance of + "TestOtelTracing" ]; meta = { diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock index fb6bba097780..854803a365f5 100644 --- a/pkgs/development/python-modules/outlines-core/Cargo.lock +++ b/pkgs/development/python-modules/outlines-core/Cargo.lock @@ -8,6 +8,20 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.4", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.4" @@ -31,9 +45,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5932a7d9d28b0d2ea34c6b3779d35e3dd6f6345317c34e73438c4f1f29144151" +checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf" dependencies = [ "aws-lc-sys", "zeroize", @@ -41,11 +55,10 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.33.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1826f2e4cfc2cd19ee53c42fbf68e2f81ec21108e0b7ecf6a71cf062137360fc" +checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e" dependencies = [ - "bindgen", "cc", "cmake", "dunce", @@ -84,37 +97,17 @@ dependencies = [ "virtue", ] -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "byteorder" @@ -124,15 +117,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" + +[[package]] +name = "castaway" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" +dependencies = [ + "rustversion", +] [[package]] name = "cc" -version = "1.2.45" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "jobserver", @@ -140,15 +142,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -162,23 +155,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "clang-sys" -version = "1.8.1" +name = "cmake" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" dependencies = [ - "glob", - "libc", - "libloading", + "cc", ] [[package]] -name = "cmake" -version = "0.1.54" +name = "compact_str" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" dependencies = [ - "cc", + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "serde", + "static_assertions", ] [[package]] @@ -263,6 +260,15 @@ dependencies = [ "syn", ] +[[package]] +name = "dary_heap" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06d2e3287df1c007e74221c49ca10a95d557349e54b3a75dc2fb14712c751f04" +dependencies = [ + "serde", +] + [[package]] name = "derive_builder" version = "0.20.2" @@ -358,15 +364,15 @@ checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "flate2" -version = "1.1.5" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", @@ -395,30 +401,30 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", @@ -427,21 +433,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", "futures-io", @@ -450,15 +456,14 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -481,17 +486,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "glob" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" - [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -514,18 +513,17 @@ dependencies = [ "rustls", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "ureq", ] [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -560,9 +558,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -593,19 +591,18 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.4", + "webpki-roots 1.0.6", ] [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", @@ -668,9 +665,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -682,9 +679,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -730,9 +727,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown", @@ -762,15 +759,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "iri-string" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -778,27 +775,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jobserver" @@ -812,43 +800,26 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" 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.177" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" - -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link", -] +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a" dependencies = [ - "bitflags", "libc", ] @@ -860,9 +831,9 @@ checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru-slab" @@ -888,9 +859,9 @@ checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30" [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memoffset" @@ -919,9 +890,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", @@ -968,9 +939,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "onig" @@ -1014,7 +985,7 @@ dependencies = [ "serde", "serde-pyobject", "serde_json", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokenizers", ] @@ -1032,9 +1003,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -1050,9 +1021,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "potential_utf" @@ -1072,32 +1043,21 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" +checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -1111,20 +1071,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" +checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6" dependencies = [ - "once_cell", "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" +checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089" dependencies = [ "libc", "pyo3-build-config", @@ -1132,9 +1091,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" +checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1144,9 +1103,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" +checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9" dependencies = [ "heck", "proc-macro2", @@ -1178,7 +1137,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.17", + "thiserror 2.0.18", "tokio", "tracing", "web-time", @@ -1186,9 +1145,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ "bytes", "getrandom 0.3.4", @@ -1199,7 +1158,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.17", + "thiserror 2.0.18", "tinyvec", "tracing", "web-time", @@ -1221,9 +1180,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.42" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -1252,7 +1211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1272,7 +1231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1281,14 +1240,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", ] @@ -1305,12 +1264,12 @@ dependencies = [ [[package]] name = "rayon-cond" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +checksum = "2964d0cf57a3e7a06e8183d14a8b527195c706b7983549cd5462d5aa3747438f" dependencies = [ "either", - "itertools 0.11.0", + "itertools", "rayon", ] @@ -1330,16 +1289,16 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "libredox", "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -1349,9 +1308,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -1360,15 +1319,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", @@ -1402,7 +1361,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.4", + "webpki-roots 1.0.6", ] [[package]] @@ -1413,7 +1372,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -1427,9 +1386,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "aws-lc-rs", "log", @@ -1443,9 +1402,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "web-time", "zeroize", @@ -1453,9 +1412,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.8" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ "aws-lc-rs", "ring", @@ -1471,9 +1430,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "serde" @@ -1487,10 +1446,11 @@ dependencies = [ [[package]] name = "serde-pyobject" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c485853a65e1a5f2db72e818ec4c7548a39614fabdd988f5e3504071453b7d7" +checksum = "5614e792b7c36d3feeb45b8287ea2dc615f063896e59258d11ef5015c18bdf6a" dependencies = [ + "log", "pyo3", "serde", ] @@ -1517,16 +1477,16 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "indexmap", "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -1549,15 +1509,15 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "slab" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" @@ -1567,12 +1527,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1604,6 +1564,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.11.1" @@ -1618,9 +1584,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.110" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -1649,9 +1615,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "thiserror" @@ -1664,11 +1630,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -1684,9 +1650,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -1705,9 +1671,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" dependencies = [ "tinyvec_macros", ] @@ -1720,23 +1686,25 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenizers" -version = "0.21.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3169b3195f925496c895caee7978a335d49218488ef22375267fba5a46a40bd7" +checksum = "b238e22d44a15349529690fb07bd645cf58149a1b1e44d6cb5bd1641ff1a6223" dependencies = [ + "ahash", "aho-corasick", + "compact_str", + "dary_heap", "derive_builder", "esaxx-rs", - "getrandom 0.2.16", + "getrandom 0.3.4", "hf-hub", - "itertools 0.13.0", - "lazy_static", + "itertools", "log", "macro_rules_attribute", "monostate", "onig", "paste", - "rand 0.8.5", + "rand 0.9.2", "rayon", "rayon-cond", "regex", @@ -1744,7 +1712,7 @@ dependencies = [ "serde", "serde_json", "spm_precompiled", - "thiserror 2.0.17", + "thiserror 2.0.18", "unicode-normalization-alignments", "unicode-segmentation", "unicode_categories", @@ -1752,9 +1720,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.48.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -1776,9 +1744,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -1789,9 +1757,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", @@ -1804,9 +1772,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", @@ -1834,9 +1802,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-core", @@ -1844,9 +1812,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", ] @@ -1859,9 +1827,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-normalization-alignments" @@ -1929,9 +1897,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", @@ -1945,6 +1913,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "virtue" version = "0.0.18" @@ -1968,18 +1942,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", @@ -1990,11 +1964,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -2003,9 +1978,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2013,9 +1988,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ "bumpalo", "proc-macro2", @@ -2026,9 +2001,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] @@ -2048,9 +2023,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" dependencies = [ "js-sys", "wasm-bindgen", @@ -2072,14 +2047,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.4", + "webpki-roots 1.0.6", ] [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" dependencies = [ "rustls-pki-types", ] @@ -2345,9 +2320,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "writeable" @@ -2380,18 +2355,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" dependencies = [ "proc-macro2", "quote", @@ -2457,3 +2432,9 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix index 24811b5bc9ba..79f1c7c127da 100644 --- a/pkgs/development/python-modules/outlines-core/default.nix +++ b/pkgs/development/python-modules/outlines-core/default.nix @@ -32,17 +32,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "outlines-core"; - version = "0.2.13"; - + version = "0.2.14"; pyproject = true; src = fetchFromGitHub { owner = "dottxt-ai"; repo = "outlines-core"; - tag = version; - hash = "sha256-mfw/cOLZPRcL3HWmrm/SyA0zDCPWr5F19EWIUdNu9jM="; + tag = finalAttrs.version; + hash = "sha256-XmXD2tWG2277bC318Bn9RqeEE7j9VdauvWnBmFS8Lsk="; }; cargoDeps = rustPlatform.importCargoLock { @@ -53,7 +52,7 @@ buildPythonPackage rec { substituteInPlace Cargo.toml \ --replace-fail \ 'version = "0.0.0"' \ - 'version = "${version}"' + 'version = "${finalAttrs.version}"' cp --no-preserve=mode ${./Cargo.lock} Cargo.lock ''; @@ -67,7 +66,7 @@ buildPythonPackage rec { ]; buildInputs = [ - openssl.dev + openssl ]; build-system = [ @@ -97,7 +96,10 @@ buildPythonPackage rec { rm -rf outlines_core ''; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; disabledTests = [ # Tests that need to download from Hugging Face Hub. @@ -116,8 +118,8 @@ buildPythonPackage rec { meta = { description = "Structured text generation (core)"; homepage = "https://github.com/outlines-dev/outlines-core"; - changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${version}"; + changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danieldk ]; }; -} +}) diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index c954547e11ec..3b30f9a8e0ab 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -31,6 +31,7 @@ google-genai, iso3166, jax, + lmstudio, llama-cpp-python, mistralai, ollama, @@ -41,26 +42,41 @@ tensorflow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "outlines"; - version = "1.2.9"; + version = "1.2.12"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = "outlines"; - tag = version; - hash = "sha256-QuS8IokiOPJeh59+W4FLoE9dvBCChf2li70+Ex3aIwg="; + tag = finalAttrs.version; + hash = "sha256-DPxtvaEbPv3go2WD9lqXB6AfTSmIA+MsqZwxXVcpyXk="; }; + # Fix mistralai>=2.0 compatibility + postPatch = '' + substituteInPlace tests/models/test_mistral_type_adapter.py \ + --replace-fail \ + "from mistralai import (" \ + "from mistralai.client.models import (" + + substituteInPlace outlines/models/mistral.py \ + --replace-fail \ + "from mistralai import UserMessage" \ + "from mistralai.client.models import UserMessage" + + substituteInPlace outlines/models/mistral.py tests/models/test_mistral.py \ + --replace-fail \ + "from mistralai import Mistral" \ + "from mistralai.client import Mistral" + ''; + build-system = [ setuptools setuptools-scm ]; - pythonRelaxDeps = [ - "outlines_core" - ]; dependencies = [ cloudpickle datasets @@ -94,6 +110,7 @@ buildPythonPackage rec { iso3166 jax llama-cpp-python + lmstudio mistralai ollama openai @@ -109,11 +126,17 @@ buildPythonPackage rec { ]; disabledTests = [ + # Incompatible with latest mistralai (AssertionError: assert False) + "test_mistral_type_adapter_input_chat" + "test_mistral_type_adapter_input_list" + "test_mistral_type_adapter_input_text" + # Try to dowload models from Hugging Face Hub "test_application_callable_call" "test_application_generator_reuse" "test_application_template_call" "test_application_template_error" + "test_check_hf_chat_template" "test_generator_black_box_async_processor" "test_generator_black_box_sync_processor" "test_generator_init_multiple_output_type" @@ -226,8 +249,8 @@ buildPythonPackage rec { meta = { description = "Structured text generation"; homepage = "https://github.com/outlines-dev/outlines"; - changelog = "https://github.com/dottxt-ai/outlines/releases/tag/${version}"; + changelog = "https://github.com/dottxt-ai/outlines/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lach ]; }; -} +}) diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix new file mode 100644 index 000000000000..c001a34f2069 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + uv-dynamic-versioning, + + # dependencies + genai-prices, + griffelib, + httpx, + opentelemetry-api, + pydantic-graph, + pydantic, + typing-inspection, + +}: + +buildPythonPackage (finalAttrs: { + pname = "pydantic-ai-slim"; + version = "1.70.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-ai"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo="; + }; + + sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim"; + + build-system = [ + hatchling + uv-dynamic-versioning + ]; + + dependencies = [ + genai-prices + griffelib + httpx + opentelemetry-api + pydantic-graph + pydantic + typing-inspection + ]; + + pythonImportsCheck = [ + "pydantic_ai" + ]; + + doCheck = false; + + meta = { + description = "GenAI Agent Framework, the Pydantic way"; + homepage = "https://github.com/pydantic/pydantic-ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix new file mode 100644 index 000000000000..5e169ea7ad97 --- /dev/null +++ b/pkgs/development/python-modules/pydantic-graph/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + uv-dynamic-versioning, + + # dependencies + httpx, + logfire-api, + pydantic, + typing-inspection, +}: + +buildPythonPackage (finalAttrs: { + pname = "pydantic-graph"; + version = "1.70.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-ai"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eG+v5/v8PxGjTVdUcrwhWfIWHFXwNOLMFHsNK9zH7Wo="; + }; + + sourceRoot = "${finalAttrs.src.name}/pydantic_graph"; + + build-system = [ + hatchling + uv-dynamic-versioning + ]; + + dependencies = [ + httpx + logfire-api + pydantic + typing-inspection + ]; + + pythonImportsCheck = [ + "pydantic_graph" + ]; + + doCheck = false; # no tests + + meta = { + description = "GenAI Agent Framework, the Pydantic way"; + homepage = "https://github.com/pydantic/pydantic-ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix index 568e140c7a56..a514ef9aef33 100644 --- a/pkgs/development/python-modules/python-pooldose/default.nix +++ b/pkgs/development/python-modules/python-pooldose/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-pooldose"; - version = "0.8.2"; + version = "0.8.6"; pyproject = true; src = fetchFromGitHub { owner = "lmaertin"; repo = "python-pooldose"; tag = version; - hash = "sha256-zhEUsbHIe31PQt4p0VhrZN3Y2ifE94br/D2ksRSh6Pg="; + hash = "sha256-MbfFCE88xWGGRkRPqZ9oftaydxs5R2cgIcdU0YqWQi4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index aa0faee17031..17f46719c69e 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -12,6 +12,7 @@ psutil, pydantic, pytestCheckHook, + pyyaml, rich, setuptools-scm, setuptools, @@ -22,8 +23,8 @@ let owner = "emeryberger"; repo = "heap-layers"; name = "Heap-Layers"; - rev = "a2048eae91b531dc5d72be7a194e0b333c06bd4c"; - sha256 = "sha256-vl3z30CBX7hav/DM/UE0EQ9lLxZF48tMJrYMXuSulyA="; + tag = "v1.0.0"; + hash = "sha256-p+8aUC124Digv3c9fZ7lLHg6H8FXoAcAQxlYzf9TYbM="; }; printf-src = fetchFromGitHub { @@ -31,20 +32,20 @@ let repo = "printf"; name = "printf"; tag = "v4.0.0"; - sha256 = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI="; + hash = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scalene"; - version = "1.5.55"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "plasma-umass"; repo = "scalene"; - tag = "v${version}"; - hash = "sha256-aO7l/paYqbneDArAbXxptIlMGfvc1dAaFLucEj/7xbk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ISXD7QegTL0OvAGS7KYZAk9MAKTr0hMFe/9ws02Ykgk="; }; patches = [ @@ -52,6 +53,7 @@ buildPythonPackage rec { ]; prePatch = '' + mkdir vendor cp -r ${heap-layers-src} vendor/Heap-Layers mkdir vendor/printf cp ${printf-src}/printf.c vendor/printf/printf.cpp @@ -60,18 +62,19 @@ buildPythonPackage rec { sed -i 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h ''; - nativeBuildInputs = [ + build-system = [ cython setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle jinja2 numpy psutil pydantic + pyyaml rich ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ]; @@ -97,6 +100,14 @@ buildPythonPackage rec { "test_nested_package_relative_import" ]; + disabledTestPaths = [ + # Broken pipe + # https://github.com/plasma-umass/scalene/issues/1017 + "tests/test_coverup_50.py" + "tests/test_multiprocessing_spawn.py::TestReplacementSemLockPickling" + "tests/test_multiprocessing_spawn.py::TestSpawnModeIntegration" + ]; + # remove scalene directory to prevent pytest import confusion preCheck = '' rm -rf scalene @@ -107,7 +118,7 @@ buildPythonPackage rec { meta = { description = "High-resolution, low-overhead CPU, GPU, and memory profiler for Python with AI-powered optimization suggestions"; homepage = "https://github.com/plasma-umass/scalene"; - changelog = "https://github.com/plasma-umass/scalene/releases/tag/v${version}"; + changelog = "https://github.com/plasma-umass/scalene/releases/tag/${finalAttrs.src.tag}"; mainProgram = "scalene"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sarahec ]; @@ -122,4 +133,4 @@ buildPythonPackage rec { "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 56e716ababde..b33247ebf0bb 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchFromGitHub, - fetchpatch, + fetchFromCodeberg, + pythonAtLeast, openssl, rsa, pyaes, @@ -12,33 +12,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "telethon"; version = "1.42.0"; pyproject = true; - src = fetchFromGitHub { - owner = "LonamiWebs"; + src = fetchFromCodeberg { + owner = "Lonami"; repo = "Telethon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NMHJkSTGR3/tck0k97EfVN9f85PAWst+EZ6G7Tgrt5s="; }; - patches = [ - # https://github.com/LonamiWebs/Telethon/pull/4670 - (fetchpatch { - url = "https://github.com/LonamiWebs/Telethon/commit/8e2a46568ef9193f5887aea1abf919ac4ca6d31e.patch"; - name = "fix_async_test.patch"; - hash = "sha256-oVpLnO4OxNam/mq945OskVEHkbS5TDSUXk/0xPHVv3I="; - }) - ] - ++ lib.optionals (lib.versionOlder version "1.40.1") [ - (fetchpatch { - url = "https://github.com/LonamiWebs/Telethon/commit/ae9c798e2c3648ff40dee1b3f371f5d66851642e.patch"; - name = "fix_test_messages_test.patch"; - hash = "sha256-8SJm8EE6w7zRQxt1NuTX6KP1MTYPiYO/maJ5tOA2I9w="; - }) - ]; + disabled = pythonAtLeast "3.14"; postPatch = '' substituteInPlace telethon/crypto/libssl.py --replace-fail \ @@ -61,13 +47,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ]; + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; meta = { - homepage = "https://github.com/LonamiWebs/Telethon"; + homepage = "https://codeberg.org/Lonami/Telethon"; description = "Full-featured Telegram client library for Python 3"; license = lib.licenses.mit; - changelog = "https://github.com/LonamiWebs/Telethon/blob/${src.tag}/readthedocs/misc/changelog.rst"; + changelog = "https://codeberg.org/Lonami/Telethon/blob/${finalAttrs.src.tag}/readthedocs/misc/changelog.rst"; maintainers = with lib.maintainers; [ nyanloutre ]; }; -} +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 426268b1a572..c13dc795c296 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6088,6 +6088,8 @@ self: super: with self; { } ); + genai-prices = callPackage ../development/python-modules/genai-prices { }; + genanki = callPackage ../development/python-modules/genanki { }; general-sam = callPackage ../development/python-modules/general-sam { }; @@ -6706,6 +6708,8 @@ self: super: with self; { griffe = callPackage ../development/python-modules/griffe { }; + griffelib = callPackage ../development/python-modules/griffelib { }; + grip = callPackage ../development/python-modules/grip { }; groestlcoin-hash = callPackage ../development/python-modules/groestlcoin-hash { }; @@ -9209,6 +9213,8 @@ self: super: with self; { lmnotify = callPackage ../development/python-modules/lmnotify { }; + lmstudio = callPackage ../development/python-modules/lmstudio { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; lnkparse3 = callPackage ../development/python-modules/lnkparse3 { }; @@ -13489,6 +13495,8 @@ self: super: with self; { pydantic = callPackage ../development/python-modules/pydantic { }; + pydantic-ai-slim = callPackage ../development/python-modules/pydantic-ai-slim { }; + pydantic-argparse-extensible = callPackage ../development/python-modules/pydantic-argparse-extensible { }; @@ -13499,6 +13507,8 @@ self: super: with self; { pydantic-extra-types = callPackage ../development/python-modules/pydantic-extra-types { }; + pydantic-graph = callPackage ../development/python-modules/pydantic-graph { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; pydantic-settings = callPackage ../development/python-modules/pydantic-settings { };