diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 3ad93703b9b7..4a8db80289fa 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -656,7 +656,7 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function). - `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder. - `setuptoolsBuildHook` to build a wheel using `setuptools`. - `sphinxHook` to build documentation and manpages using Sphinx. -- `stestrCheckHook` to run tests with `stestr`. +- `stestrCheckHook` to run tests with `stestr`. See [example usage](#using-stestrcheckhook). - `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A `venv` is created if it does not yet exist. `postVenvCreation` can be used to to run commands only after venv is first created. @@ -1633,6 +1633,35 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or `pytest` is compatible with `unittest`, so in most cases you can use `pytestCheckHook` instead. +#### Using stestrCheckHook {#using-stestrcheckhook} + +`stestrCheckHook` is a hook which will set up (or configure) a [`checkPhase`](#ssec-check-phase) to run `python -m stestr run`: + +```nix +{ + nativeCheckInputs = [ stestrCheckHook ]; + + stestrFlags = [ + "--test-path" + "tests" + ]; +} +``` + +`stestrCheckHook` recognizes the following attributes: + +`disabledTests` + +: To specify test IDs to exclude, matched exactly (each entry is anchored as `^$`). + +`disabledTestsRegex` + +: To specify regular expressions of test IDs to exclude, matched unanchored. + +`stestrFlags` + +: To append additional command-line arguments to `python -m stestr run`. + #### Using sphinxHook {#using-sphinxhook} The `sphinxHook` is a helpful tool to build documentation and manpages diff --git a/doc/redirects.json b/doc/redirects.json index f349a294f71c..0bf223e00414 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -4369,6 +4369,9 @@ "using-unittestcheckhook": [ "index.html#using-unittestcheckhook" ], + "using-stestrcheckhook": [ + "index.html#using-stestrcheckhook" + ], "using-sphinxhook": [ "index.html#using-sphinxhook" ], diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index dbbeee9e7f41..4cb16cd654be 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -75,6 +75,8 @@ Callers that verify messages must now set `allowed_signature_methods` per message or configure `@Net::OAuth::ALLOWED_SIGNATURE_METHODS`; `verify` otherwise throws an exception. See the [upstream changelog](https://metacpan.org/dist/Net-OAuth/changes) for details. +- `geeqie` has been updated to 3.3, which ports it from GTK3 to GTK4. All `--action` command-line parameters have changed and some default shortcuts now follow GNOME conventions. On first start, shortcuts and `geeqierc.xml` are converted one way, and the old file is kept as a backup. Standalone collection windows were removed in 3.2. See the [upstream NEWS](https://github.com/BestImageViewer/geeqie/blob/v3.3/NEWS). + - []{#x86_64-darwin-26.11} Support for `x86_64-darwin` has been dropped, due to Apple’s deprecation of the platform and limited build infrastructure and developer time. @@ -209,6 +211,8 @@ - `tcl.mkTclDerivation` now enables `strictDeps` and `__structuredAttrs`. +- `rssguard` 5.x uses a new database layer. Regenerate your database after upgrading, following the [RSS Guard migration notes](https://rssguard.readthedocs.io/en/stable/contrib/migrate.html). + - `pdns` has been updated from `5.0.x` to `5.1.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-5-1-0) before upgrading. Namely LUA record updates are no longer allowed by default, and the embedded webserver no longer includes a `access-control-allow-origin: *` header by default. - LibreOffice upstream switched from Fresh/Still stable branches to a single Stable branch; `libreoffice` and `libreoffice-qt` work as before, but more specific aliases like `libreoffice-fresh` should be replaced. @@ -364,7 +368,7 @@ - All databases of the MySQL family – `mysql`, `mariadb` and `percona` – now provide a client-only package `client` sub-attribute. Use the `.client` package if the server components are not needed. The main package continues to ship the client binaries as well. -- Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi` and `fetchFromGithub` fetchers. +- Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi`, `fetchFromGithub` fetchers and to `buildPerlPackage`. `mkDerivation` has been adjusted to reuse this information. Package-URLs allow reliably identifying and locating software packages. Maintainers of derivations using the adapted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 1c88e1245258..b6a6d34e9f83 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -193,11 +193,12 @@ "description": "Maintain core platform support and packages for macOS and other Apple platforms", "id": 11265438, "maintainers": { - "emilazy": 18535642 + "emilazy": 18535642, + "reckenrode": 7413633 }, "members": { "Samasaur1": 30577766, - "reckenrode": 7413633, + "booxter": 90200, "toonn": 1486805 }, "name": "darwin-core" @@ -229,7 +230,6 @@ "afh": 16507, "azuwis": 9315, "booxter": 90200, - "carlossless": 498906, "cideM": 4246921, "cidkidnix": 67574902, "copumpkin": 2623, @@ -252,6 +252,7 @@ "jonhermansen": 660911, "juliusrickert": 5007494, "jwiegley": 8460, + "karstx": 498906, "kashw2": 15855440, "kevingriffin": 209729, "khaneliman": 1778670, @@ -312,6 +313,7 @@ }, "members": { "friedow": 17351844, + "trespaul": 7453891, "wamirez": 24505474 }, "name": "Documentation Team" @@ -426,7 +428,7 @@ "Mistyttm": 51770769, "PaulGrandperrin": 1748936, "RoGreat": 64620440, - "carlossless": 498906, + "karstx": 498906, "liamthexpl0rer": 119797945, "liberodark": 4238928, "qubitnano": 146656568, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 88c1b62eb16f..e0522839d331 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1030,6 +1030,11 @@ githubId = 44871469; name = "Etienne Wodey"; }; + aisk = { + github = "aisk"; + githubId = 699636; + name = "An Long"; + }; aither64 = { email = "aither@havefun.cz"; github = "aither64"; @@ -18252,6 +18257,12 @@ githubId = 73405010; name = "Mart-Mihkel Aun"; }; + MartenBE = { + email = "martijn.saelens@protonmail.com"; + github = "MartenBE"; + githubId = 1958780; + name = "Martijn Saelens"; + }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; @@ -30465,6 +30476,12 @@ githubId = 48321566; name = "Mira Chacku Purakal"; }; + twstagg = { + email = "tristinstagg@gmail.com"; + github = "twstagg"; + githubId = 2766946; + name = "Tristin Stagg"; + }; twz123 = { name = "Tom Wieczorek"; email = "tom@bibbu.net"; @@ -31180,6 +31197,14 @@ githubId = 1771332; name = "László Vaskó"; }; + VlaDexa = { + name = "Vladislav Grechannik"; + email = "nixpkgs@vladexa.xyz"; + keys = [ { fingerprint = "1E21 85DA D156 B08C 2740 D301 D58B FE42 A558 7A72"; } ]; + github = "VlaDexa"; + githubId = 52157081; + matrix = "@vladexa:vladexa.xyz"; + }; vlinkz = { email = "vmfuentes64@gmail.com"; github = "vlinkz"; @@ -31455,6 +31480,11 @@ githubId = 158211; keys = [ { fingerprint = "82CB 91F4 F3E4 04A5 DAB2 78E8 8B99 1293 8FF2 1020"; } ]; }; + wangl-cc = { + name = "Loong"; + github = "wangl-cc"; + githubId = 40141251; + }; wariuccio = { name = "Wariuccio"; github = "wariuccio"; @@ -32323,6 +32353,12 @@ githubId = 47603387; name = "Mihók Martin"; }; + xsteadfastx = { + email = "marvin@xsteadfastx.org"; + github = "xsteadfastx"; + githubId = 168397; + name = "Marvin Preuss"; + }; xtrayambak = { github = "xTrayambak"; githubId = 59499552; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index be7352ab3625..25d312b17660 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -26,10 +26,19 @@ - [openbao-agent](https://openbao.org/docs/agent-and-proxy/agent/), a client daemon that authenticates to OpenBao and renders secrets to files via templates. Available as [services.openbao-agent](#opt-services.openbao-agent.instances). +- [Atlantis](https://github.com/runatlantis/atlantis), a tool for automating Terraform pull requests. Available as [services.atlantis](#opt-services.atlantis.enable). + +- [Gradient](https://github.com/wavelens/gradient), a Nix-based continuous integration system. Available as [services.gradient](#opt-services.gradient.enable). + - [Portmaster](https://safing.io/portmaster/), a privacy-focused application firewall, is available through [services.portmaster](#opt-services.portmaster.enable). +- [tlsrouter](https://github.com/inetaf/tcpproxy), a TLS proxy that routes + connections to backends based on the TLS SNI (Server Name Indication) of the + TLS handshake, is available through + [services.tlsrouter](#opt-services.tlsrouter.enable). + - [dufs](https://github.com/sigoden/dufs), a file server with WebDAV support, is available through [services.dufs](#opt-services.dufs.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7f29f1b2d5b8..3014fe4973ea 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -538,6 +538,8 @@ ./services/continuous-integration/gitlab-runner/runner.nix ./services/continuous-integration/gocd-agent/default.nix ./services/continuous-integration/gocd-server/default.nix + ./services/continuous-integration/gradient/default.nix + ./services/continuous-integration/gradient/worker.nix ./services/continuous-integration/hercules-ci-agent/default.nix ./services/continuous-integration/hydra/builder.nix ./services/continuous-integration/hydra/default.nix @@ -1492,6 +1494,7 @@ ./services/networking/tinc.nix ./services/networking/tinydns.nix ./services/networking/tinyproxy.nix + ./services/networking/tlsrouter.nix ./services/networking/tmate-ssh-server.nix ./services/networking/tox-bootstrapd.nix ./services/networking/tox-node.nix @@ -1679,6 +1682,7 @@ ./services/web-apps/alps.nix ./services/web-apps/anuko-time-tracker.nix ./services/web-apps/artalk.nix + ./services/web-apps/atlantis.nix ./services/web-apps/audiobookshelf.nix ./services/web-apps/baikal.nix ./services/web-apps/bentopdf.nix diff --git a/nixos/modules/programs/upki.nix b/nixos/modules/programs/upki.nix index 9cad4913dffa..7c5c0bd777bc 100644 --- a/nixos/modules/programs/upki.nix +++ b/nixos/modules/programs/upki.nix @@ -101,6 +101,9 @@ in }; meta = { - maintainers = [ lib.maintainers.skyesoss ]; + maintainers = [ + lib.maintainers.skyesoss + lib.maintainers.cpu + ]; }; } diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index f634b9766961..1741e30c7e86 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -8,7 +8,10 @@ let cfg = config.security.pki; cacertPackage = pkgs.cacert.override { - blacklist = cfg.caCertificateBlacklist; + blacklist = cfg.caCertificateBlacklist ++ [ + # CVE-2026-111943 + "Comodo AAA Services root" + ]; extraCertificateFiles = cfg.certificateFiles; extraCertificateStrings = cfg.certificates; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index fb3be94e3b1f..fa1ec93a5f73 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -375,12 +375,18 @@ let }; fprintAuth = lib.mkOption { - default = config.services.fprintd.enable; - defaultText = lib.literalExpression "config.services.fprintd.enable"; + default = config.services.fprintd.enablePam; + defaultText = lib.literalExpression "config.services.fprintd.enablePam"; type = lib.types.bool; description = '' If set, fingerprint reader will be used (if exists and your fingerprints are enrolled). + + ::: {.note} + This setting should only be enabled for clients that can ensure + user attention, such as lockscreens. + See https://github.com/NixOS/nixpkgs/issues/442117 + ::: ''; }; diff --git a/nixos/modules/services/audio/pulseaudio.nix b/nixos/modules/services/audio/pulseaudio.nix index 214fb0e56139..604c486b91b4 100644 --- a/nixos/modules/services/audio/pulseaudio.nix +++ b/nixos/modules/services/audio/pulseaudio.nix @@ -295,8 +295,11 @@ in services.avahi.enable = true; }) (lib.mkIf cfg.zeroconf.publish.enable { - services.avahi.publish.enable = true; - services.avahi.publish.userServices = true; + services.avahi.settings.publish = { + disable-publishing = false; + disable-user-service-publishing = false; + publish-addresses = true; + }; }) (lib.mkIf cfg.tcp.openFirewall { networking.firewall.allowedTCPPorts = [ cfg.tcp.port ]; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 6f46f9c3e242..ad50b6c12e1f 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -435,7 +435,7 @@ in BindPaths = [ "/dev/zfs" # Required if outside of /var - config.users.users.syncoid.home + config.users.users.${cfg.user}.home ]; BindReadOnlyPaths = [ builtins.storeDir diff --git a/nixos/modules/services/continuous-integration/gradient/default.nix b/nixos/modules/services/continuous-integration/gradient/default.nix new file mode 100644 index 000000000000..af8f06b49194 --- /dev/null +++ b/nixos/modules/services/continuous-integration/gradient/default.nix @@ -0,0 +1,538 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.services.gradient; + env = cfg.environmentVariables; + workerEnv = cfg.worker.environmentVariables; + serverAddress = "http://${env.GRADIENT_LISTEN_ADDR}:${toString env.GRADIENT_PORT}"; + traceDir = env.GRADIENT_LOG_TRACE_DIR or null; + isTrue = + value: + lib.elem value [ + true + "true" + ]; + + jsonFormat = pkgs.formats.json { }; + + stateKeyDefaults = { + users = key: { + username = key; + name = key; + }; + + projects = key: { + name = key; + display_name = key; + public = false; + }; + + tasks = key: { + name = key; + display_name = key; + }; + + integrations = key: { name = key; }; + + caches = key: { + name = key; + display_name = key; + public = false; + }; + + roles = key: { name = key; }; + + api_keys = key: { name = key; }; + + teams = key: { + name = key; + display_name = key; + }; + + workers = key: { display_name = key; }; + }; + + state = + builtins.removeAttrs cfg.state [ "validate" ] + // lib.mapAttrs ( + collection: keyDefaults: + lib.mapAttrs (key: entry: keyDefaults key // entry) (cfg.state.${collection} or { }) + ) stateKeyDefaults; + + stateJsonFile = jsonFormat.generate "gradient-state.json" state; + + validatedStateJsonFile = + if cfg.state.validate then + pkgs.runCommand "gradient-state-validated.json" { __structuredAttrs = true; } '' + ${lib.getExe cfg.packages.server} --state-file ${stateJsonFile} --state-validate + cp ${stateJsonFile} $out + '' + else + stateJsonFile; + + secretVariables = { + jwtFile = "GRADIENT_SECRETS_JWT_FILE"; + cryptFile = "GRADIENT_SECRETS_CRYPT_FILE"; + databaseUrlFile = "GRADIENT_DATABASE_URL_FILE"; + oidcClientSecretFile = "GRADIENT_OIDC_CLIENT_SECRET_FILE"; + scimTokenFile = "GRADIENT_SCIM_TOKEN_FILE"; + smtpPasswordFile = "GRADIENT_EMAIL_SMTP_PASSWORD_FILE"; + s3SecretAccessKeyFile = "GRADIENT_S3_SECRET_ACCESS_KEY_FILE"; + githubAppPrivateKeyFile = "GRADIENT_GITHUB_APP_PRIVATE_KEY_FILE"; + githubAppWebhookSecretFile = "GRADIENT_GITHUB_APP_WEBHOOK_SECRET_FILE"; + sshHostKeyFile = "GRADIENT_SSH_HOST_KEY_FILE"; + metricsTokenFile = "GRADIENT_METRICS_TOKEN_FILE"; + }; + + secretFiles = lib.filterAttrs (_: file: file != null) cfg.secrets; + + actionSecretFields = { + send_web_request = "token"; + send_matrix_message = "access_token"; + send_slack_message = "webhook_url"; + }; + + stateCredentials = lib.concatLists ( + lib.mapAttrsToList ( + _: user: + lib.optional ( + user.password_file or null != null + ) "gradient_user_${user.username}_password:${user.password_file}" + ) state.users + ++ lib.mapAttrsToList (_: project: [ + "gradient_project_${project.name}_private_key:${project.private_key_file}" + ]) state.projects + ++ lib.mapAttrsToList (_: cache: [ + "gradient_cache_${cache.name}_signing_key:${cache.signing_key_file}" + ]) state.caches + ++ lib.mapAttrsToList (_: apiKey: [ + "gradient_api_${apiKey.name}_key:${apiKey.key_file}" + ]) state.api_keys + ++ lib.mapAttrsToList (_: worker: [ + "gradient_worker_${worker.worker_id}_token:${worker.token_file}" + ]) state.workers + ++ lib.mapAttrsToList ( + _: int: + lib.optional ( + int.secret_file or null != null + ) "gradient_integration_${int.name}_secret:${int.secret_file}" + ++ lib.optional ( + int.access_token_file or null != null + ) "gradient_integration_${int.name}_token:${int.access_token_file}" + ) state.integrations + ++ lib.mapAttrsToList ( + _: task: + lib.concatMap ( + action: + let + field = actionSecretFields.${action.type} or null; + file = if field == null then null else action.config."${field}_file" or null; + in + lib.optional (file != null) "gradient_action_${action.name}_${field}:${file}" + ) (task.actions or [ ]) + ) state.tasks + ); + + localWorker = cfg.worker.enable && cfg.localWorker; + + identityHash = builtins.hashString "sha256" "gradient-local-worker:${config.networking.hostName}"; + localIdentity = lib.concatStringsSep "-" [ + (builtins.substring 0 8 identityHash) + (builtins.substring 8 4 identityHash) + (builtins.substring 12 4 identityHash) + (builtins.substring 16 4 identityHash) + (builtins.substring 20 12 identityHash) + ]; + + localTokenFile = "${workerEnv.GRADIENT_WORKER_BASE_DIR}/local-token"; + localPeersFile = "${workerEnv.GRADIENT_WORKER_BASE_DIR}/local-peers"; +in +{ + meta.maintainers = pkgs.gradient.meta.maintainers; + + options.services.gradient = { + enable = lib.mkEnableOption "Gradient, a Nix-CI for Teams"; + + packages = { + server = lib.mkPackageOption pkgs "gradient" { }; + frontend = lib.mkPackageOption pkgs [ "gradient" "frontend" ] { }; + }; + + domain = lib.mkOption { + type = lib.types.str; + example = "gradient.example.com"; + description = "Domain under which Gradient is reachable."; + }; + + environmentVariables = lib.mkOption { + type = + with lib.types; + lazyAttrsOf ( + nullOr (oneOf [ + bool + int + str + path + ]) + ); + + default = { }; + + example = { + GRADIENT_OIDC_ENABLE = true; + GRADIENT_OIDC_CLIENT_ID = "gradient"; + GRADIENT_OIDC_DISCOVERY_URL = "https://id.example.com/.well-known/openid-configuration"; + GRADIENT_GC_INTERVAL_SECS = 600; + }; + + description = '' + Environment variables of the Gradient server. + The [configuration reference](https://wavelens.github.io/gradient/reference/configuration) lists every variable and its default. + Set a variable to `null` to unset it. + Secrets belong into {option}`services.gradient.secrets`. + ''; + }; + + secrets = + lib.mapAttrs ( + _: variable: + lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File containing the secret behind {env}`${variable}`, loaded as a systemd credential. + ''; + } + ) secretVariables + // { + jwtFile = lib.mkOption { + type = lib.types.path; + description = "File containing the secret used to sign JWTs."; + }; + + cryptFile = lib.mkOption { + type = lib.types.path; + description = "File containing the key used to encrypt secrets in the database."; + }; + }; + + state = lib.mkOption { + type = lib.types.submodule { + freeformType = jsonFormat.type; + options.validate = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to check the state option with the server's `--state-validate` flag at + build time. Schema and reference errors then fail at build time instead of at + runtime. + ''; + }; + }; + default = { }; + example = lib.literalExpression '' + { + users.alice = { + email = "alice@example.com"; + password_file = "/etc/gradient/secrets/alice_password"; + superuser = true; + }; + projects.acme-corp = { + private_key_file = "/etc/gradient/secrets/acme_ssh_key"; + created_by = "alice"; + }; + tasks.web-app = { + project = "acme-corp"; + repository = "https://github.com/acme-corp/web-app.git"; + wildcard = "nixosConfigurations.*.config.system.build.toplevel"; + created_by = "alice"; + triggers = [ + { + type = "polling"; + config.interval_secs = 300; + } + ]; + }; + caches.main-cache = { + signing_key_file = "/etc/gradient/secrets/main_cache_key"; + projects = [ "acme-corp" ]; + created_by = "alice"; + }; + } + ''; + description = '' + Declarative Gradient state, written as JSON to the server's state file. + The [state reference](https://wavelens.github.io/gradient/reference/state) documents the available fields. + Fields naming an entry, such as `name`, `username` and `display_name`, default to its attribute name. + Files in `password_file`, `private_key_file`, `signing_key_file`, `key_file`, + `token_file`, `secret_file`, `access_token_file` and the secret files of task + actions become systemd credentials of the server. + ''; + }; + + localWorker = lib.mkOption { + type = lib.types.bool; + default = cfg.worker.enable; + defaultText = lib.literalExpression "config.services.gradient.worker.enable"; + description = '' + Whether to register the {option}`services.gradient.worker` on this host automatically, + with an ID from the hostname and a token and peers file from the first start. + The state-declared team `server` is part of every new project. + ''; + }; + + nginx = { + enable = lib.mkEnableOption "an nginx virtual host for Gradient" // { + default = true; + }; + + frontend = lib.mkEnableOption "serving the Gradient web frontend" // { + default = true; + }; + + exposeProto = lib.mkEnableOption "`/proto` for remote workers and federation"; + }; + + postgres.enable = lib.mkEnableOption "a local PostgreSQL database for Gradient"; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.localWorker -> cfg.worker.enable; + message = "Enable services.gradient.worker for services.gradient.localWorker."; + } + ]; + + services = { + gradient = { + environmentVariables = lib.mapAttrs (_: lib.mkDefault) { + GRADIENT_LISTEN_ADDR = "127.0.0.1"; + GRADIENT_PORT = 3000; + GRADIENT_USE_TLS = true; + GRADIENT_BASE_DIR = "/var/lib/gradient"; + GRADIENT_SERVE_URL = "http${lib.optionalString (isTrue env.GRADIENT_USE_TLS) "s"}://${cfg.domain}"; + GRADIENT_FRONTEND_URL = env.GRADIENT_SERVE_URL; + GRADIENT_DATABASE_URL = "postgresql://gradient@localhost/gradient?host=/run/postgresql"; + }; + + state = lib.mkIf localWorker { + teams.server = { + display_name = "Server"; + new_projects.workers = true; + }; + + workers.local = { + display_name = "Local Worker"; + worker_id = localIdentity; + token_file = localTokenFile; + team = "server"; + }; + }; + + worker = lib.mkIf localWorker { + peersFile = lib.mkDefault localPeersFile; + serverUrl = lib.mkDefault "ws://127.0.0.1:${toString env.GRADIENT_PORT}/proto"; + id = lib.mkDefault localIdentity; + }; + }; + + nginx = lib.mkIf cfg.nginx.enable { + enable = true; + virtualHosts.${cfg.domain} = { + enableACME = lib.mkDefault (isTrue env.GRADIENT_USE_TLS); + forceSSL = lib.mkDefault (isTrue env.GRADIENT_USE_TLS); + http2 = true; + http3 = lib.mkDefault (isTrue (env.GRADIENT_USE_QUIC or false)); + locations = { + "/" = lib.mkIf cfg.nginx.frontend { + root = "${cfg.packages.frontend}/share/gradient-frontend"; + tryFiles = "$uri $uri/ /index.html"; + }; + + "/api/" = { + proxyPass = serverAddress; + proxyWebsockets = true; + extraConfig = '' + client_max_body_size 0; + proxy_buffering off; + proxy_request_buffering off; + proxy_connect_timeout 1h; + proxy_send_timeout 1h; + proxy_read_timeout 1h; + ''; + }; + + "/proto" = lib.mkIf cfg.nginx.exposeProto { + proxyPass = serverAddress; + proxyWebsockets = true; + extraConfig = '' + proxy_buffer_size 256k; + proxy_buffers 4 256k; + proxy_connect_timeout 90d; + proxy_send_timeout 90d; + proxy_read_timeout 90d; + ''; + }; + + "~ ^/cache/[^/]+/proto$" = { + proxyPass = serverAddress; + proxyWebsockets = true; + extraConfig = '' + proxy_buffer_size 256k; + proxy_buffers 4 256k; + proxy_connect_timeout 1d; + proxy_send_timeout 1d; + proxy_read_timeout 1d; + ''; + }; + + "/cache/" = { + proxyPass = serverAddress; + proxyWebsockets = true; + extraConfig = '' + client_max_body_size 0; + proxy_buffering off; + proxy_request_buffering off; + proxy_connect_timeout 1h; + proxy_send_timeout 1h; + proxy_read_timeout 1h; + ''; + }; + }; + }; + }; + + postgresql = lib.mkIf cfg.postgres.enable { + enable = true; + ensureDatabases = [ "gradient" ]; + ensureUsers = [ + { + name = "gradient"; + ensureDBOwnership = true; + } + ]; + + settings = { + max_connections = lib.mkDefault 200; + max_locks_per_transaction = lib.mkDefault 1024; + }; + }; + }; + + systemd = { + services.gradient-local-worker-token = lib.mkIf localWorker { + description = "Gradient local worker credentials"; + requiredBy = [ "gradient-worker.service" ]; + before = [ "gradient-worker.service" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "gradient-worker"; + Group = "gradient-worker"; + StateDirectory = "gradient-worker"; + UMask = "0277"; + }; + + script = '' + rm -f ${localTokenFile}.new ${localPeersFile}.new + if [ ! -s ${localTokenFile} ]; then + ${lib.getExe pkgs.openssl} rand -base64 48 > ${localTokenFile}.new + mv ${localTokenFile}.new ${localTokenFile} + fi + printf '*:%s\n' "$(cat ${localTokenFile})" > ${localPeersFile}.new + mv ${localPeersFile}.new ${localPeersFile} + ''; + }; + + tmpfiles.settings."10-gradient-trace" = lib.mkIf (traceDir != null) { + ${traceDir}.d = { + user = "gradient"; + group = "gradient"; + mode = "0750"; + }; + }; + + services.gradient-server = { + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "systemd-tmpfiles-setup.service" + ] + ++ lib.optional cfg.postgres.enable "postgresql.target" + ++ lib.optional localWorker "gradient-local-worker-token.service"; + requires = lib.optional localWorker "gradient-local-worker-token.service"; + + serviceConfig = { + Type = "notify"; + ExecStart = lib.getExe cfg.packages.server; + TimeoutStartSec = "infinity"; + StateDirectory = "gradient"; + User = "gradient"; + Group = "gradient"; + PrivateTmp = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = [ env.GRADIENT_BASE_DIR ] ++ lib.optional (traceDir != null) traceDir; + Restart = "on-failure"; + RestartSec = 10; + LimitNOFILE = 65535; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + WorkingDirectory = env.GRADIENT_BASE_DIR; + LoadCredential = [ + "gradient_state:${validatedStateJsonFile}" + ] + ++ lib.mapAttrsToList (name: file: "gradient_${name}:${file}") secretFiles + ++ stateCredentials; + }; + + unitConfig = { + StartLimitIntervalSec = 60; + StartLimitBurst = 5; + }; + + environment = + lib.mapAttrs ( + _: value: if lib.isBool value then lib.boolToString value else lib.mapNullable toString value + ) env + // lib.mapAttrs' ( + name: _: lib.nameValuePair secretVariables.${name} "%d/gradient_${name}" + ) secretFiles + // { + NIX_REMOTE = "daemon"; + XDG_CACHE_HOME = "${env.GRADIENT_BASE_DIR}/www/.cache"; + GRADIENT_STATE_FILE = "%d/gradient_state"; + GRADIENT_CREDENTIALS_DIR = "%d"; + }; + }; + }; + + users = { + groups.gradient = { }; + users.gradient = { + description = "Gradient user"; + isSystemUser = true; + home = env.GRADIENT_BASE_DIR; + createHome = true; + group = "gradient"; + }; + }; + }; +} diff --git a/nixos/modules/services/continuous-integration/gradient/worker.nix b/nixos/modules/services/continuous-integration/gradient/worker.nix new file mode 100644 index 000000000000..fe0d3d27d418 --- /dev/null +++ b/nixos/modules/services/continuous-integration/gradient/worker.nix @@ -0,0 +1,226 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.services.gradient.worker; + env = cfg.environmentVariables; + gcrootsDir = env.GRADIENT_WORKER_GCROOTS_DIR or ""; + traceDir = env.GRADIENT_WORKER_LOG_TRACE_DIR or null; +in +{ + options.services.gradient.worker = { + enable = lib.mkEnableOption "the Gradient worker"; + packages = { + gradient = lib.mkPackageOption pkgs "gradient" { }; + nix = lib.mkOption { + type = lib.types.package; + default = cfg.packages.gradient.nix; + defaultText = lib.literalExpression "config.services.gradient.worker.packages.gradient.nix"; + description = '' + Nix package providing the {command}`nix` for system feature detection. + The default is Gradient's Nix fork, matching the worker's embedded evaluator. + ''; + }; + + git = lib.mkOption { + type = lib.types.package; + default = config.programs.git.package; + defaultText = lib.literalExpression "config.programs.git.package"; + description = "Git package available to the worker for cloning repositories."; + }; + + ssh = lib.mkOption { + type = lib.types.package; + default = config.programs.ssh.package; + defaultText = lib.literalExpression "config.programs.ssh.package"; + description = '' + OpenSSH package used as {env}`GIT_SSH_COMMAND` to fetch private flake inputs. + ''; + }; + }; + + environmentVariables = lib.mkOption { + type = + with lib.types; + lazyAttrsOf ( + nullOr (oneOf [ + bool + int + str + path + ]) + ); + + default = { }; + example = { + GRADIENT_WORKER_BUILD_MAX_CONCURRENT = 8; + }; + description = '' + Environment variables of the Gradient worker. + The [configuration reference](https://wavelens.github.io/gradient/reference/configuration) lists every variable and its default. + Set a variable to `null` to unset it. + ''; + }; + + peersFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File of peer tokens for challenge-response authentication with the server, + with `peer_id:token` per line and `#` starting a comment. + + ``` + : + *: + ``` + + Use peer ID `*` to match any UUID in the server's challenge. + Tokens are 48 byte random secrets, for example from {command}`openssl rand -base64 48`. + Register them via the API through `POST /api/v1/projects/{project}/workers`. + Set it to `null` for open mode without authentication; avoid that in a production setup. + ''; + }; + + id = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "00000000-0000-0000-0000-000000000000"; + description = "UUID identifying the worker to the Gradient server."; + }; + + serverUrl = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "wss://gradient.example.com/proto"; + description = "WebSocket URL of the Gradient server the worker connects to."; + }; + }; + + config = lib.mkIf cfg.enable { + services = { + gradient.worker.environmentVariables = lib.mapAttrs (_: lib.mkDefault) { + GRADIENT_WORKER_BASE_DIR = "/var/lib/gradient-worker"; + GRADIENT_WORKER_GCROOTS_DIR = "/nix/var/nix/gcroots/gradient"; + GRADIENT_WORKER_LISTEN_ADDR = "127.0.0.1"; + GRADIENT_WORKER_PORT = 3100; + GRADIENT_WORKER_NIX_BIN = lib.getExe' cfg.packages.nix "nix"; + GRADIENT_WORKER_SSH_BIN = lib.getExe' cfg.packages.ssh "ssh"; + GRADIENT_WORKER_CAPABILITIES_FETCH = true; + GRADIENT_WORKER_CAPABILITIES_EVAL = true; + GRADIENT_WORKER_CAPABILITIES_BUILD = true; + }; + }; + + systemd = { + tmpfiles.settings."10-gradient-worker" = + lib.optionalAttrs (gcrootsDir != "") { + ${gcrootsDir}.d = { + user = "gradient-worker"; + group = "gradient-worker"; + mode = "0755"; + }; + } + // lib.optionalAttrs (traceDir != null) { + ${traceDir}.d = { + user = "gradient-worker"; + group = "gradient-worker"; + mode = "0750"; + }; + }; + + services.gradient-worker = { + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "systemd-tmpfiles-setup.service" + ]; + path = [ + cfg.packages.git + cfg.packages.nix + cfg.packages.ssh + ]; + + serviceConfig = { + Type = "notify"; + ExecStart = lib.getExe' cfg.packages.gradient "gradient-worker"; + StateDirectory = "gradient-worker"; + User = "gradient-worker"; + Group = "gradient-worker"; + PrivateTmp = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = [ + env.GRADIENT_WORKER_BASE_DIR + ] + ++ lib.optional (gcrootsDir != "") gcrootsDir + ++ lib.optional (traceDir != null) traceDir; + Restart = "on-failure"; + RestartSec = 10; + KillMode = "mixed"; + LimitNOFILE = 65535; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + WorkingDirectory = env.GRADIENT_WORKER_BASE_DIR; + LoadCredential = lib.optional (cfg.peersFile != null) "gradient_worker_peers:${cfg.peersFile}"; + }; + + unitConfig = { + StartLimitIntervalSec = 60; + StartLimitBurst = 5; + }; + + environment = + lib.mapAttrs ( + _: value: if lib.isBool value then lib.boolToString value else lib.mapNullable toString value + ) env + // { + NIX_REMOTE = "daemon"; + XDG_CACHE_HOME = "${env.GRADIENT_WORKER_BASE_DIR}/www/.cache"; + } + // lib.optionalAttrs (cfg.peersFile != null) { + GRADIENT_WORKER_PEERS_FILE = "%d/gradient_worker_peers"; + } + // lib.optionalAttrs (cfg.id != null) { + GRADIENT_WORKER_ID = cfg.id; + } + // lib.optionalAttrs (cfg.serverUrl != null) { + GRADIENT_WORKER_SERVER_URL = cfg.serverUrl; + }; + }; + }; + + nix.settings = { + trusted-users = [ "gradient-worker" ]; + experimental-features = [ + "nix-command" + "flakes" + "ca-derivations" + ]; + }; + + users = { + groups.gradient-worker = { }; + users.gradient-worker = { + description = "Gradient Worker user"; + isSystemUser = true; + home = env.GRADIENT_WORKER_BASE_DIR; + createHome = true; + group = "gradient-worker"; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix index 28b4f7fd54bd..7d3129875760 100644 --- a/nixos/modules/services/misc/guix/default.nix +++ b/nixos/modules/services/misc/guix/default.nix @@ -277,8 +277,11 @@ in # Guix uses Avahi (through guile-avahi) both for the auto-discovering and # advertising substitute servers in the local network. services.avahi.enable = lib.mkDefault true; - services.avahi.publish.enable = lib.mkDefault true; - services.avahi.publish.userServices = lib.mkDefault true; + services.avahi.settings.publish = { + disable-publishing = lib.mkDefault false; + disable-user-service-publishing = lib.mkDefault false; + publish-addresses = lib.mkDefault true; + }; # It's similar to Nix daemon so there's no question whether or not this # should be sandboxed. diff --git a/nixos/modules/services/misc/ntfy-sh.nix b/nixos/modules/services/misc/ntfy-sh.nix index 4da025295a2b..1ab23923ff84 100644 --- a/nixos/modules/services/misc/ntfy-sh.nix +++ b/nixos/modules/services/misc/ntfy-sh.nix @@ -109,7 +109,8 @@ in services.ntfy-sh.settings = { auth-file = lib.mkDefault "/var/lib/ntfy-sh/user.db"; - listen-http = if cfg.nginx.enable then "[::1]:${cfg.nginx.port}" else lib.mkDefault "[::1]:2586"; + listen-http = + if cfg.nginx.enable then "[::1]:${toString cfg.nginx.port}" else lib.mkDefault "[::1]:2586"; attachment-cache-dir = lib.mkDefault "/var/lib/ntfy-sh/attachments"; cache-file = lib.mkDefault "/var/lib/ntfy-sh/cache-file.db"; }; @@ -147,12 +148,13 @@ in }; services.nginx = lib.mkIf cfg.nginx.enable { - enable = true; + enable = lib.mkDefault true; + virtualHosts."${cfg.nginx.virtualHost}" = { - forceSSL = true; + forceSSL = lib.mkDefault true; locations."/" = { - proxyPass = "http://[::1]:${cfg.nginx.port}"; + proxyPass = "http://[::1]:${toString cfg.nginx.port}"; proxyWebsockets = true; extraConfig = '' proxy_connect_timeout 3m; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix b/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix index ad70f3e90ccd..12537816ef07 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix @@ -2,27 +2,81 @@ config, lib, pkgs, + utils, ... }: let cfg = config.services.prometheus.exporters.nvidia-gpu; inherit (lib) + cli concatStringsSep + filterAttrs + mkOption + mkPackageOption + types ; in { port = 9835; - serviceOpts = { - serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-nvidia-gpu-exporter}/bin/nvidia_gpu_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --nvidia-smi-command ${config.hardware.nvidia.package.bin}/bin/nvidia-smi \ - ${concatStringsSep " " cfg.extraFlags} - ''; - PrivateDevices = false; + extraOpts = { + package = mkPackageOption pkgs "prometheus-nvidia-gpu-exporter" { }; + settings = mkOption { + type = types.submodule { + freeformType = types.attrsOf ( + types.oneOf [ + types.bool + types.str + (types.listOf types.str) + ] + ); + options = { + "collect.backend" = mkOption { + type = types.enum [ + "exec" + "nvml" + "demo" + ]; + default = "exec"; + description = "How to collect GPU metrics."; + }; + "nvidia-smi-command" = mkOption { + type = types.str; + default = "${config.hardware.nvidia.package.bin}/bin/nvidia-smi"; + defaultText = lib.literalExpression '' + "''${config.hardware.nvidia.package.bin}/bin/nvidia-smi" + ''; + description = "Path or command to be used for the nvidia-smi executable."; + }; + "web.listen-address" = mkOption { + type = types.str; + default = "${cfg.listenAddress}:${toString cfg.port}"; + defaultText = lib.literalExpression '' + "''${config.services.prometheus.exporters.nvidia-gpu.listenAddress}:''${toString config.services.prometheus.exporters.nvidia-gpu.port}" + ''; + description = "Addresses on which to expose metrics and web interface."; + }; + }; + }; + description = "Command line flags from the --help text of the exporter."; }; + }; + serviceOpts = { + serviceConfig = + let + settings = filterAttrs ( + # specifying nvidia-smi-command when collect.backend isn't 'exec' errors + n: v: if n == "nvidia-smi-command" && cfg.settings."collect.backend" != "exec" then false else true + ) cfg.settings; + in + { + ExecStart = '' + ${lib.getExe cfg.package} \ + ${utils.escapeSystemdExecArgs (cli.toCommandLineGNU { explicitBool = false; } settings)} \ + ${concatStringsSep " " cfg.extraFlags} + ''; + PrivateDevices = false; + }; wantedBy = [ "multi-user.target" ]; }; } diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 6d22b752b2e5..e2cf429c860b 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -7,53 +7,183 @@ let cfg = config.services.avahi; - avahiDaemonConf = - with cfg; - pkgs.writeText "avahi-daemon.conf" '' - [server] - ${ - # Users can set `networking.hostName' to the empty string, when getting - # a host name from DHCP. In that case, let Avahi take whatever the - # current host name is; setting `host-name' to the empty string in - # `avahi-daemon.conf' would be invalid. - lib.optionalString (hostName != "") "host-name=${hostName}" - } - browse-domains=${lib.concatStringsSep ", " browseDomains} - use-ipv4=${lib.boolToYesNo ipv4} - use-ipv6=${lib.boolToYesNo ipv6} - ${lib.optionalString ( - allowInterfaces != null - ) "allow-interfaces=${lib.concatStringsSep "," allowInterfaces}"} - ${lib.optionalString ( - denyInterfaces != null - ) "deny-interfaces=${lib.concatStringsSep "," denyInterfaces}"} - ${lib.optionalString (domainName != null) "domain-name=${domainName}"} - allow-point-to-point=${lib.boolToYesNo allowPointToPoint} - ${lib.optionalString (cacheEntriesMax != null) "cache-entries-max=${toString cacheEntriesMax}"} + settingsFormat = pkgs.formats.ini { + mkKeyValue = lib.generators.mkKeyValueDefault { + mkValueString = + v: if lib.isBool v then lib.boolToYesNo v else lib.generators.mkValueStringDefault { } v; + } "="; + listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault { }); + }; - [wide-area] - enable-wide-area=${lib.boolToYesNo wideArea} + settings = + let + filteredSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; + in + filteredSettings + // { + server = lib.removeAttrs (filteredSettings.server or { }) ( + lib.optional ((filteredSettings.server."host-name" or null) == "") "host-name" + ); + }; - [publish] - disable-publishing=${lib.boolToYesNo (!publish.enable)} - disable-user-service-publishing=${lib.boolToYesNo (!publish.userServices)} - publish-addresses=${lib.boolToYesNo (publish.userServices || publish.addresses)} - publish-hinfo=${lib.boolToYesNo publish.hinfo} - publish-workstation=${lib.boolToYesNo publish.workstation} - publish-domain=${lib.boolToYesNo publish.domain} - - [reflector] - enable-reflector=${lib.boolToYesNo reflector} - ${extraConfig} - ''; + avahiDaemonConf = pkgs.concatText "avahi-daemon.conf" [ + (settingsFormat.generate "avahi-daemon.conf" settings) + (pkgs.writeText "avahi-daemon-extra.conf" cfg.extraConfig) + ]; in { imports = [ (lib.mkRenamedOptionModule [ "services" "avahi" "interfaces" ] - [ "services" "avahi" "allowInterfaces" ] + [ + "services" + "avahi" + "settings" + "server" + "allow-interfaces" + ] ) (lib.mkRenamedOptionModule [ "services" "avahi" "nssmdns" ] [ "services" "avahi" "nssmdns4" ]) + (lib.mkRenamedOptionModule + [ "services" "avahi" "hostName" ] + [ + "services" + "avahi" + "settings" + "server" + "host-name" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "domainName" ] + [ + "services" + "avahi" + "settings" + "server" + "domain-name" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "browseDomains" ] + [ + "services" + "avahi" + "settings" + "server" + "browse-domains" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "ipv4" ] + [ + "services" + "avahi" + "settings" + "server" + "use-ipv4" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "ipv6" ] + [ + "services" + "avahi" + "settings" + "server" + "use-ipv6" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "allowInterfaces" ] + [ + "services" + "avahi" + "settings" + "server" + "allow-interfaces" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "denyInterfaces" ] + [ + "services" + "avahi" + "settings" + "server" + "deny-interfaces" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "allowPointToPoint" ] + [ + "services" + "avahi" + "settings" + "server" + "allow-point-to-point" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "reflector" ] + [ + "services" + "avahi" + "settings" + "reflector" + "enable-reflector" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "cacheEntriesMax" ] + [ + "services" + "avahi" + "settings" + "server" + "cache-entries-max" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "publish" "addresses" ] + [ + "services" + "avahi" + "settings" + "publish" + "publish-addresses" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "publish" "hinfo" ] + [ + "services" + "avahi" + "settings" + "publish" + "publish-hinfo" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "publish" "workstation" ] + [ + "services" + "avahi" + "settings" + "publish" + "publish-workstation" + ] + ) + (lib.mkRenamedOptionModule + [ "services" "avahi" "publish" "domain" ] + [ + "services" + "avahi" + "settings" + "publish" + "publish-domain" + ] + ) ]; options.services.avahi = { @@ -70,67 +200,143 @@ in package = lib.mkPackageOption pkgs "avahi" { }; - hostName = lib.mkOption { - type = lib.types.str; - default = config.networking.hostName; - defaultText = lib.literalExpression "config.networking.hostName"; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + server = { + "host-name" = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Host name advertised on the LAN. If unset, Avahi will use the + system host name. + ''; + }; + + domain-name = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = "local"; + description = "Domain name for all advertisements."; + }; + + browse-domains = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "List of non-local DNS domains to be browsed."; + }; + + use-ipv4 = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to use IPv4."; + }; + + use-ipv6 = lib.mkOption { + type = lib.types.bool; + default = config.networking.enableIPv6; + defaultText = lib.literalExpression "config.networking.enableIPv6"; + description = "Whether to use IPv6."; + }; + + allow-interfaces = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); + default = null; + description = '' + List of network interfaces that should be used by the {command}`avahi-daemon`. + Other interfaces will be ignored. If `null`, all local interfaces + except loopback and point-to-point will be used. + ''; + }; + + deny-interfaces = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); + default = null; + description = '' + List of network interfaces that should be ignored by the + {command}`avahi-daemon`. Other unspecified interfaces will be + used, unless `allow-interfaces` is set. This option takes + precedence over `allow-interfaces`. + ''; + }; + + allow-point-to-point = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to use POINTTOPOINT interfaces. Might make mDNS + unreliable due to usually large latencies with such links and + opens a potential security hole by allowing mDNS access from + Internet connections. + ''; + }; + + cache-entries-max = lib.mkOption { + type = lib.types.nullOr lib.types.int; + default = null; + description = '' + Number of resource records to be cached per interface. Use 0 to + disable caching. Avahi daemon defaults to 4096 if not set. + ''; + }; + }; + + publish = { + disable-publishing = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to disable publishing in general."; + }; + + disable-user-service-publishing = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to disable publishing user services."; + }; + + publish-addresses = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to register mDNS address records for all local IP addresses."; + }; + + publish-hinfo = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to register a mDNS HINFO record which contains + information about the local operating system and CPU. + ''; + }; + + publish-workstation = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to register a service of type "_workstation._tcp" on the + local LAN. + ''; + }; + + publish-domain = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to announce the locally used domain name for browsing by other hosts."; + }; + }; + + reflector.enable-reflector = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Reflect incoming mDNS requests to all allowed network interfaces."; + }; + }; + }; + default = { }; description = '' - Host name advertised on the LAN. If not set, avahi will use the value - of {option}`config.networking.hostName`. - ''; - }; - - domainName = lib.mkOption { - type = lib.types.str; - default = "local"; - description = '' - Domain name for all advertisements. - ''; - }; - - browseDomains = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - example = [ - "0pointer.de" - "zeroconf.org" - ]; - description = '' - List of non-local DNS domains to be browsed. - ''; - }; - - ipv4 = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Whether to use IPv4."; - }; - - ipv6 = lib.mkOption { - type = lib.types.bool; - default = config.networking.enableIPv6; - defaultText = lib.literalExpression "config.networking.enableIPv6"; - description = "Whether to use IPv6."; - }; - - allowInterfaces = lib.mkOption { - type = lib.types.nullOr (lib.types.listOf lib.types.str); - default = null; - description = '' - List of network interfaces that should be used by the {command}`avahi-daemon`. - Other interfaces will be ignored. If `null`, all local interfaces - except loopback and point-to-point will be used. - ''; - }; - - denyInterfaces = lib.mkOption { - type = lib.types.nullOr (lib.types.listOf lib.types.str); - default = null; - description = '' - List of network interfaces that should be ignored by the - {command}`avahi-daemon`. Other unspecified interfaces will be used, - unless {option}`allowInterfaces` is set. This option takes precedence - over {option}`allowInterfaces`. + Configuration for {file}`avahi-daemon.conf` as a Nix attribute set. + See {manpage}`avahi-daemon.conf(5)` for available options. ''; }; @@ -143,16 +349,6 @@ in ''; }; - allowPointToPoint = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large - latencies with such links and opens a potential security hole by allowing mDNS access from Internet - connections. - ''; - }; - wideArea = lib.mkOption { type = lib.types.bool; default = false; @@ -163,12 +359,6 @@ in ''; }; - reflector = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Reflect incoming mDNS requests to all allowed network interfaces."; - }; - extraServiceFiles = lib.mkOption { type = with lib.types; attrsOf (either str path); default = { }; @@ -196,45 +386,18 @@ in publish = { enable = lib.mkOption { - type = lib.types.bool; - default = false; + type = lib.types.nullOr lib.types.bool; + default = null; + visible = false; description = "Whether to allow publishing in general."; }; userServices = lib.mkOption { - type = lib.types.bool; - default = false; + type = lib.types.nullOr lib.types.bool; + default = null; + visible = false; description = "Whether to publish user services. Will set `addresses=true`."; }; - - addresses = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether to register mDNS address records for all local IP addresses."; - }; - - hinfo = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to register a mDNS HINFO record which contains information about the - local operating system and CPU. - ''; - }; - - workstation = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to register a service of type "_workstation._tcp" on the local LAN. - ''; - }; - - domain = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether to announce the locally used domain name for browsing by other hosts."; - }; }; nssmdns4 = lib.mkOption { @@ -284,15 +447,6 @@ in ''; }; - cacheEntriesMax = lib.mkOption { - type = lib.types.nullOr lib.types.int; - default = null; - description = '' - Number of resource records to be cached per interface. Use 0 to - disable caching. Avahi daemon defaults to 4096 if not set. - ''; - }; - extraConfig = lib.mkOption { type = lib.types.lines; default = ""; @@ -304,155 +458,186 @@ in debug = lib.mkEnableOption "debug logging"; }; - config = lib.mkIf cfg.enable { - warnings = [ - (lib.mkIf cfg.wideArea "Enabling `services.avahi.wideArea` exposes this system to `CVE-2024-52615`.") - ]; + config = lib.mkMerge [ + { + assertions = [ + { + assertion = cfg.nssmdnsFull -> (cfg.nssmdns4 || cfg.nssmdns6); + message = '' + `services.avahi.nssmdnsFull` requires one or both of `services.avahi.nssmdns4` and/or `services.avahi.nssmdns6` to be enabled. + ''; + } + ]; - assertions = [ - { - assertion = cfg.nssmdnsFull -> (cfg.nssmdns4 || cfg.nssmdns6); - message = '' - `services.avahi.nssmdnsFull` requires one or both of `services.avahi.nssmdns4` and/or `services.avahi.nssmdns6` to be enabled. - ''; - } - ]; + warnings = [ + (lib.mkIf cfg.wideArea "Enabling `services.avahi.wideArea` exposes this system to `CVE-2024-52615`.") + ] + ++ lib.optional (cfg.publish.enable != null) '' + The option `services.avahi.publish.enable` is obsolete. Use + `services.avahi.settings.publish."disable-publishing" = false;` instead. + '' + ++ lib.optional (cfg.publish.userServices != null) '' + The option `services.avahi.publish.userServices` is obsolete. Use + `services.avahi.settings.publish.disable-user-service-publishing = false;` + and `services.avahi.settings.publish.publish-addresses = true;` instead. + ''; - users.users.avahi = { - description = "avahi-daemon privilege separation user"; - home = "/var/empty"; - group = "avahi"; - isSystemUser = true; - }; + services.avahi.settings = lib.mkMerge [ + (lib.mkIf (config.networking.hostName != "") { + server.host-name = lib.mkDefault config.networking.hostName; + }) + (lib.mkIf (cfg.publish.enable != null) { + publish.disable-publishing = lib.mkDefault (!cfg.publish.enable); + }) + (lib.mkIf (cfg.publish.userServices != null) { + publish.disable-user-service-publishing = lib.mkDefault (!cfg.publish.userServices); + }) + (lib.mkIf (cfg.publish.userServices == true) { + publish.publish-addresses = lib.mkDefault true; + }) + (lib.mkIf cfg.wideArea { + wide-area.enable-wide-area = lib.mkDefault true; + }) + ]; + } - users.groups.avahi = { }; + (lib.mkIf cfg.enable { + users.users.avahi = { + description = "avahi-daemon privilege separation user"; + home = "/var/empty"; + group = "avahi"; + isSystemUser = true; + }; - system.nssModules = lib.optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns; - system.nssDatabases.hosts = - let - mdns = - if (cfg.nssmdns4 && cfg.nssmdns6) then - "mdns" - else if (!cfg.nssmdns4 && cfg.nssmdns6) then - "mdns6" - else if (cfg.nssmdns4 && !cfg.nssmdns6) then - "mdns4" - else - ""; - in - lib.optionals (cfg.nssmdns4 || cfg.nssmdns6) ( - lib.mkMerge [ - (lib.mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve - (lib.mkAfter (lib.optional cfg.nssmdnsFull "${mdns}")) # after dns - ] + users.groups.avahi = { }; + + system.nssModules = lib.optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns; + system.nssDatabases.hosts = + let + mdns = + if (cfg.nssmdns4 && cfg.nssmdns6) then + "mdns" + else if (!cfg.nssmdns4 && cfg.nssmdns6) then + "mdns6" + else if (cfg.nssmdns4 && !cfg.nssmdns6) then + "mdns4" + else + ""; + in + lib.optionals (cfg.nssmdns4 || cfg.nssmdns6) ( + lib.mkMerge [ + (lib.mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve + (lib.mkAfter (lib.optional cfg.nssmdnsFull "${mdns}")) # after dns + ] + ); + + environment.systemPackages = [ cfg.package ]; + + environment.etc = ( + lib.mapAttrs' ( + n: v: + lib.nameValuePair "avahi/services/${n}.service" { + ${if lib.types.path.check v then "source" else "text"} = v; + } + ) cfg.extraServiceFiles ); - environment.systemPackages = [ cfg.package ]; - - environment.etc = ( - lib.mapAttrs' ( - n: v: - lib.nameValuePair "avahi/services/${n}.service" { - ${if lib.types.path.check v then "source" else "text"} = v; - } - ) cfg.extraServiceFiles - ); - - systemd.sockets.avahi-daemon = { - description = "Avahi mDNS/DNS-SD Stack Activation Socket"; - listenStreams = [ "/run/avahi-daemon/socket" ]; - wantedBy = [ "sockets.target" ]; - after = [ - # Ensure that `/run/avahi-daemon` owned by `avahi` is created by `systemd.tmpfiles.rules` before the `avahi-daemon.socket`, - # otherwise `avahi-daemon.socket` will automatically create it owned by `root`, which will cause `avahi-daemon.service` to fail. - "systemd-tmpfiles-setup.service" - ]; - }; - - systemd.tmpfiles.rules = [ "d /run/avahi-daemon - avahi avahi -" ]; - - systemd.services.avahi-daemon = { - description = "Avahi mDNS/DNS-SD Stack"; - wantedBy = [ "multi-user.target" ]; - requires = [ "avahi-daemon.socket" ]; - documentation = [ - "man:avahi-daemon(8)" - "man:avahi-daemon.conf(5)" - "man:avahi.hosts(5)" - "man:avahi.service(5)" - ]; - - # Make NSS modules visible so that `avahi_nss_support ()' can - # return a sensible value. - environment.LD_LIBRARY_PATH = config.system.nssModules.path; - - path = [ - pkgs.coreutils - cfg.package - ]; - - serviceConfig = { - NotifyAccess = "main"; - BusName = "org.freedesktop.Avahi"; - Type = "dbus"; - ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}"; - ConfigurationDirectory = "avahi/services"; - - # Hardening - CapabilityBoundingSet = [ - # https://github.com/avahi/avahi/blob/v0.9-rc1/avahi-daemon/caps.c#L38 - "CAP_SYS_CHROOT" - "CAP_SETUID" - "CAP_SETGID" + systemd.sockets.avahi-daemon = { + description = "Avahi mDNS/DNS-SD Stack Activation Socket"; + listenStreams = [ "/run/avahi-daemon/socket" ]; + wantedBy = [ "sockets.target" ]; + after = [ + # Ensure that `/run/avahi-daemon` owned by `avahi` is created by `systemd.tmpfiles.rules` before the `avahi-daemon.socket`, + # otherwise `avahi-daemon.socket` will automatically create it owned by `root`, which will cause `avahi-daemon.service` to fail. + "systemd-tmpfiles-setup.service" ]; - DevicePolicy = "closed"; - LockPersonality = true; - MemoryDenyWriteExecute = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateTmp = true; - PrivateUsers = false; - ProcSubset = "pid"; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_NETLINK" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - "@chown setgroups setresuid" - ] - ++ lib.optionals pkgs.stdenv.hostPlatform.is32bit [ - # glibc's setresuid()/setgroups() invoke the kernel's 32-bit compat - # syscalls (setresuid32/setgroups32) on 32-bit architectures -- - # distinct syscalls from the ones already allowlisted above, so - # without these 2, avahi-daemon is killed with SIGSYS as soon as it - # tries to drop privileges. - "setgroups32" - "setresuid32" - ]; - UMask = "0077"; }; - }; - services.dbus.enable = true; - services.dbus.packages = [ cfg.package ]; + systemd.tmpfiles.rules = [ "d /run/avahi-daemon - avahi avahi -" ]; - networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 5353 ]; - }; + systemd.services.avahi-daemon = { + description = "Avahi mDNS/DNS-SD Stack"; + wantedBy = [ "multi-user.target" ]; + requires = [ "avahi-daemon.socket" ]; + documentation = [ + "man:avahi-daemon(8)" + "man:avahi-daemon.conf(5)" + "man:avahi.hosts(5)" + "man:avahi.service(5)" + ]; + + # Make NSS modules visible so that `avahi_nss_support ()' can + # return a sensible value. + environment.LD_LIBRARY_PATH = config.system.nssModules.path; + + path = [ + pkgs.coreutils + cfg.package + ]; + + serviceConfig = { + NotifyAccess = "main"; + BusName = "org.freedesktop.Avahi"; + Type = "dbus"; + ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}"; + ConfigurationDirectory = "avahi/services"; + + # Hardening + CapabilityBoundingSet = [ + # https://github.com/avahi/avahi/blob/v0.9-rc1/avahi-daemon/caps.c#L38 + "CAP_SYS_CHROOT" + "CAP_SETUID" + "CAP_SETGID" + ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "@chown setgroups setresuid" + ] + ++ lib.optionals pkgs.stdenv.hostPlatform.is32bit [ + # glibc's setresuid()/setgroups() invoke the kernel's 32-bit compat + # syscalls (setresuid32/setgroups32) on 32-bit architectures -- + # distinct syscalls from the ones already allowlisted above, so + # without these 2, avahi-daemon is killed with SIGSYS as soon as it + # tries to drop privileges. + "setgroups32" + "setresuid32" + ]; + UMask = "0077"; + }; + }; + + services.dbus.enable = true; + services.dbus.packages = [ cfg.package ]; + + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 5353 ]; + }) + ]; } diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index d2fe3de9db97..1142a216ed4f 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -14,7 +14,6 @@ let getExe listToAttrs literalExpression - maintainers makeBinPath mapAttrs' mapAttrsToList @@ -73,9 +72,7 @@ let nixosConfig = config; in { - meta.maintainers = with maintainers; [ - nazarewk - ]; + meta.maintainers = [ ]; meta.doc = ./netbird.md; imports = [ diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index f4296396967c..8511bb1e0a1a 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -124,8 +124,11 @@ in ]; services.avahi.enable = true; - services.avahi.publish.enable = true; - services.avahi.publish.userServices = true; + services.avahi.settings.publish = { + disable-publishing = false; + disable-user-service-publishing = false; + publish-addresses = true; + }; services.shairport-sync.settings = { general.output_backend = lib.mkDefault "pulseaudio"; diff --git a/nixos/modules/services/networking/tlsrouter.nix b/nixos/modules/services/networking/tlsrouter.nix new file mode 100644 index 000000000000..8868cca942b6 --- /dev/null +++ b/nixos/modules/services/networking/tlsrouter.nix @@ -0,0 +1,108 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + concatStringsSep + getExe + literalExpression + maintainers + mapAttrsToList + mkIf + mkOption + mkPackageOption + optionalString + types + ; + + cfg = config.services.tlsrouter; + + configFile = pkgs.writeText "tlsrouter.conf" ( + concatStringsSep "\n" ( + mapAttrsToList (src: opts: "${src} ${opts.backend}${optionalString opts.proxy " PROXY"}") cfg.routes + ) + ); +in +{ + options.services.tlsrouter = { + enable = lib.mkEnableOption "TLS SNI router"; + + routes = mkOption { + type = types.attrsOf ( + types.submodule { + options.proxy = mkOption { + type = types.bool; + default = false; + description = "If your backend supports HAProxy's PROXY protocol, you can enable it to receive the real client ip:port"; + }; + options.backend = mkOption { + type = types.nonEmptyStr; + description = "Backend address"; + example = "localhost:1234"; + }; + } + ); + description = "TLSRouter requires a configuration that tells it what backend to use for a given hostname"; + example = literalExpression '' + { + # Basic hostname -> backend mapping + "go.universe.tf".backend = "localhost:1234"; + + # DNS wildcards are understood as well. + "*.go.universe.tf".backend = "1.2.3.4:8080"; + + # DNS wildcards can go anywhere in name. + "google.*".backend = "10.20.30.40:443"; + + # RE2 regexes are also available + "/(alpha|beta|gamma)\\.mon(itoring)?\\.dave\\.tf/".backend = "100.200.100.200:443"; + + # If your backend supports HAProxy's PROXY protocol, you can enable + # it to receive the real client ip:port. + "fancy.backend" = { + backend = "2.3.4.5:443"; + proxy = true; + }; + } + ''; + }; + + listen = mkOption { + default = ":443"; + type = types.str; + description = "Set the listen address."; + }; + + helloTimeout = mkOption { + default = "3s"; + type = types.str; + description = "How long to wait for the start of the TLS handshake."; + }; + + package = mkPackageOption pkgs "tlsrouter" { }; + }; + + config = mkIf cfg.enable { + systemd.services.tlsrouter = { + description = "TLS SNI router"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + PermissionsStartOnly = true; + LimitNPROC = 512; + LimitNOFILE = 1048576; + CapabilityBoundingSet = "cap_net_bind_service"; + AmbientCapabilities = "cap_net_bind_service"; + NoNewPrivileges = true; + DynamicUser = true; + ExecStart = "${getExe cfg.package} -conf ${configFile} -listen ${cfg.listen} -hello-timeout ${cfg.helloTimeout}"; + Restart = "on-failure"; + }; + }; + }; + + meta.maintainers = [ maintainers.xsteadfastx ]; +} diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 0ecada4edc2e..5df45f0a3f0a 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -21,6 +21,23 @@ in enable = lib.mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling"; + enablePam = lib.mkOption { + type = lib.types.bool; + default = cfg.enable; + defaultText = lib.literalExpression "config.services.fprintd.enable"; + description = '' + When enabled, PAM services will be configured to use fprintd for authorization. + + :::{.note} + Enabling this option will add fingerprint-based authorization to all + PAM services, including those which can authorize users in the background. + If this is undesired, you can override this setting on a per-service + basis through `config.security.pam.services..fprintAuth`. + See https://github.com/NixOS/nixpkgs/issues/442117 + ::: + ''; + }; + package = lib.mkOption { type = lib.types.package; default = fprintdPkg; @@ -49,6 +66,13 @@ in config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.enablePam -> cfg.enable; + message = "fprintd.enablePam depends on fprintd.enable"; + } + ]; + services.dbus.packages = [ cfg.package ]; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/web-apps/atlantis.nix b/nixos/modules/services/web-apps/atlantis.nix new file mode 100644 index 000000000000..e1fd9ab56eb3 --- /dev/null +++ b/nixos/modules/services/web-apps/atlantis.nix @@ -0,0 +1,195 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.atlantis; + settingsFormat = pkgs.formats.yaml { }; +in +{ + options.services.atlantis = { + enable = lib.mkEnableOption "Atlantis service"; + + package = lib.mkPackageOption pkgs "atlantis" { }; + + user = lib.mkOption { + type = lib.types.str; + default = "atlantis"; + description = "User account under which Atlantis runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "atlantis"; + description = "Group account under which Atlantis runs."; + }; + + extraPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; + example = lib.literalExpression "[ pkgs.opentofu pkgs.nix ]"; + description = '' + Extra packages to add to the Atlantis service PATH. + ''; + }; + + settings = lib.mkOption { + description = '' + Settings written to the Atlantis server YAML configuration file. + The generated file is stored in the Nix store and readable by other + users. Keep secrets out of this option. Use + {option}`services.atlantis.environmentFile` to provide secret values + as environment variables, or {option}`services.atlantis.credentials` + to provide secret files whose paths are exposed as environment + variables. + + See the docs for details: + + ''; + example = lib.literalExpression '' + { + atlantis-url = "https://atlantis.example.com"; + gh-user = "github_user"; + repo-allowlist = "github.com/yourorg/yourrepo"; + default-tf-version = "1.12.2"; + } + ''; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options.port = lib.mkOption { + type = lib.types.port; + default = 4141; + description = "Port on which Atlantis listens."; + }; + }; + default = { }; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "--verbose" ]; + description = '' + Extra command-line arguments to pass to `atlantis server`. + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to open the firewall port for Atlantis. + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/secrets/atlantis"; + description = '' + Environment file containing secrets. + Restart Atlantis to load changes to the file. + ''; + }; + + environment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + description = '' + Environment variables to pass to Atlantis and its Terraform subprocesses. + ''; + example = lib.literalExpression '' + { + ATLANTIS_GH_USER = "atlantis-bot"; + } + ''; + }; + + credentials = lib.mkOption { + type = lib.types.attrsOf lib.types.path; + default = { }; + description = '' + Secret files to pass to Atlantis and its Terraform subprocesses. Each + attribute name is exported with the systemd credential path as its + value. For example, a `TF_VAR_` attribute lets Terraform consume the + file with `file(var.)`. Values are loaded with systemd + `LoadCredential`. Restart Atlantis to load changes to the files. + ''; + example = lib.literalExpression '' + { + TF_VAR_example_secret_file = "/run/secrets/example"; + } + ''; + }; + + dataDir = lib.mkOption { + description = "Data directory for Atlantis."; + default = "/var/lib/atlantis"; + type = lib.types.path; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = builtins.intersectAttrs cfg.credentials cfg.environment == { }; + message = "services.atlantis.credentials and services.atlantis.environment must not define the same environment variable names."; + } + ]; + + networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.settings.port; + + systemd = { + services.atlantis = { + description = "Atlantis Terraform Pull Request Automation Service"; + after = [ "network.target" ]; + wants = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ + pkgs.git + pkgs.bash + pkgs.conftest + ] + ++ cfg.extraPackages; + environment = (lib.mapAttrs (name: _: "%d/${name}") cfg.credentials) // cfg.environment; + serviceConfig = { + StateDirectory = lib.mkIf (cfg.dataDir == "/var/lib/atlantis") "atlantis"; + StateDirectoryMode = "0700"; + WorkingDirectory = cfg.dataDir; + User = cfg.user; + Group = cfg.group; + PrivateTmp = true; + RestartSec = "5s"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + LoadCredential = lib.mapAttrsToList (name: path: "${name}:${path}") cfg.credentials; + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe cfg.package) + "server" + "--config" + (settingsFormat.generate "atlantis-config.yaml" cfg.settings) + ] + ++ cfg.extraArgs + ); + Restart = "on-failure"; + }; + }; + }; + + users.users = lib.optionalAttrs (cfg.user == "atlantis") { + atlantis = { + description = "Atlantis user"; + home = cfg.dataDir; + createHome = true; + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = lib.optionalAttrs (cfg.group == "atlantis") { + atlantis = { }; + }; + }; +} diff --git a/nixos/modules/system/boot/zswap.nix b/nixos/modules/system/boot/zswap.nix index bc5c3d97159a..f628fa20897d 100644 --- a/nixos/modules/system/boot/zswap.nix +++ b/nixos/modules/system/boot/zswap.nix @@ -20,6 +20,12 @@ let # Check if kernel supports zsmalloc as zswap backend (>= 6.3) zsmallocSupported = versionAtLeast kernelVersion "6.3"; + + # Check if kernel supports zbud and z3fold backends (< 6.15) + zbudSupported = versionOlder kernelVersion "6.15"; + + # Check if kernel supports zpool abstraction and configuration (< 6.18) + zpoolSupported = versionOlder kernelVersion "6.18"; in { options.boot.zswap = { @@ -54,6 +60,7 @@ in type = types.enum [ "zsmalloc" "zbud" + "z3fold" ]; default = if zsmallocSupported then "zsmalloc" else "zbud"; defaultText = literalExpression "if kernel >= 6.3 then \"zsmalloc\" else \"zbud\""; @@ -62,7 +69,7 @@ in 'zsmalloc' is strongly recommended for kernels >= 6.3 as it offers the best density. For older kernels, 'zbud' is the fallback. - Note: 'z3fold' was removed from Linux kernel 6.8 and later. + Note: 'zbud' and 'z3fold' were removed from Linux kernel 6.15 and later. ''; }; @@ -108,6 +115,22 @@ in on systems with limited memory. ''; }; + + dynamicSwap = mkOption { + type = types.bool; + default = config.services.swapspace.enable; + defaultText = literalExpression "config.services.swapspace.enable"; + visible = false; + description = '' + Zswap requires a swap device to work properly. By default, the zswap + module checks for an entry in 'swapDevices' to ensure this condition + is met. However, some setups add swap devices dynamically, such as with + GPT partition auto discovery or 'services.swapspace'. + + Set this value to true to assert that a swap device will be added + dynamically, and bypass the check for a 'swapDevices' entry. + ''; + }; }; config = mkIf cfg.enable { @@ -115,11 +138,11 @@ in boot.kernelParams = [ "zswap.enabled=1" "zswap.compressor=${cfg.compressor}" - "zswap.zpool=${cfg.zpool}" "zswap.max_pool_percent=${toString cfg.maxPoolPercent}" "zswap.accept_threshold_percent=${toString cfg.acceptThresholdPercent}" "zswap.shrinker_enabled=${if cfg.shrinkerEnabled then "1" else "0"}" - ]; + ] + ++ optional zpoolSupported "zswap.zpool=${cfg.zpool}"; # 2. Dependency management: ensure required modules are included in initrd or kernel # This ensures Zswap is ready early in the boot process (before swap is mounted) @@ -133,11 +156,11 @@ in boot.kernel.sysfs.module.zswap.parameters = { enabled = true; compressor = cfg.compressor; - zpool = cfg.zpool; max_pool_percent = cfg.maxPoolPercent; accept_threshold_percent = cfg.acceptThresholdPercent; - shrinker_enabled = true; - }; + shrinker_enabled = cfg.shrinkerEnabled; + } + // optionalAttrs zpoolSupported { zpool = cfg.zpool; }; assertions = [ { @@ -154,7 +177,7 @@ in ''; } { - assertion = config.swapDevices != [ ]; + assertion = config.swapDevices != [ ] || cfg.dynamicSwap; message = '' Zswap requires at least one physical swap device to function as a backing store. @@ -164,6 +187,9 @@ in device = "/var/lib/swapfile"; size = 16 * 1024; # 16GB } ]; + + If swap devices will be added dynamically (eg. by GPT partition auto discovery), + set 'boot.zswap.dynamicSwap = true' to bypass this check. ''; } { @@ -175,6 +201,15 @@ in Please use 'zbud' instead: boot.zswap.zpool = "zbud"; ''; } + { + assertion = (cfg.zpool != "zsmalloc") -> zbudSupported; + message = '' + Zswap allocators 'zbud' and 'z3fold' are not supported on kernel version ${kernelVersion}. + Support for zbud and z3fold in Zswap was removed in Linux 6.15 in favor of zsmalloc. + + Please use 'zsmalloc' instead: boot.zswap.zpool = "zsmalloc"; + ''; + } ]; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5ea9e2a0665a..887f86b0162a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -296,6 +296,7 @@ in artalk = runTest ./artalk.nix; asynch = runTest ./asynch.nix; atd = runTest ./atd.nix; + atlantis = runTest ./atlantis.nix; atop = import ./atop.nix { inherit pkgs runTest; }; atticd = runTest ./atticd.nix; attr = pkgs.callPackage ./attr.nix { }; @@ -1954,6 +1955,7 @@ in tinyproxy = runTest ./tinyproxy.nix; tinywl = runTest ./tinywl.nix; tlshd = runTest ./tlshd.nix; + tlsrouter = runTest ./tlsrouter.nix; tlsrpt = runTest ./tlsrpt.nix; tmate-ssh-server = runTest ./tmate-ssh-server.nix; tomcat = runTest ./tomcat.nix; diff --git a/nixos/tests/atlantis.nix b/nixos/tests/atlantis.nix new file mode 100644 index 000000000000..ac9b1a50420d --- /dev/null +++ b/nixos/tests/atlantis.nix @@ -0,0 +1,197 @@ +{ pkgs, ... }: +let + inherit (pkgs) lib; + mainTf = pkgs.writeText "main.tf" '' + terraform { + required_version = ">= 1.0.0" + } + + resource "terraform_data" "example" { + input = "hello-atlantis" + } + ''; +in +{ + name = "atlantis"; + meta.maintainers = pkgs.atlantis.meta.maintainers ++ [ lib.maintainers.jwygoda ]; + + nodes.machine = + { lib, pkgs, ... }: + { + virtualisation.memorySize = 2048; + + services.gitea = { + enable = true; + database.type = "sqlite3"; + settings = { + server.ROOT_URL = "http://127.0.0.1:3000/"; + service.DISABLE_REGISTRATION = true; + security.ALLOWED_HOST_LIST = "loopback"; + }; + }; + + services.atlantis = { + enable = true; + openFirewall = true; + extraPackages = [ pkgs.opentofu ]; + environmentFile = "/run/secrets/atlantis.env"; + credentials.TF_VAR_example_secret_file = "/run/secrets/example"; + settings = { + atlantis-url = "http://127.0.0.1:4141"; + gitea-base-url = "http://127.0.0.1:3000"; + gitea-user = "test"; + gitea-webhook-secret = "webhooksecret"; + repo-allowlist = "*"; + write-git-creds = true; + default-tf-distribution = "opentofu"; + default-tf-version = pkgs.opentofu.version; + tf-download = false; + }; + }; + + # Start Atlantis after Gitea user & API token are initialized + systemd.services.atlantis.wantedBy = lib.mkForce [ ]; + + environment.systemPackages = with pkgs; [ + curl + git + gitea + jq + opentofu + ]; + }; + + testScript = '' + import json + + start_all() + + machine.wait_for_unit("gitea.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://127.0.0.1:3000/") + + with subtest("Initialize Gitea admin user and API token"): + machine.succeed( + "su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea ${lib.getExe pkgs.gitea} admin user create " + "--username test --password totallysafe --email test@localhost --admin'" + ) + + api_token = machine.succeed( + "curl --fail -s -X POST http://test:totallysafe@127.0.0.1:3000/api/v1/users/test/tokens " + "-H 'Accept: application/json' -H 'Content-Type: application/json' " + "-d '{\"name\":\"atlantis\",\"scopes\":[\"all\"]}' | jq -r '.sha1'" + ).strip() + + with subtest("Create repository and webhook for Atlantis"): + machine.succeed( + "curl --fail -s -X POST http://127.0.0.1:3000/api/v1/user/repos " + f"-H 'Authorization: token {api_token}' -H 'Content-Type: application/json' " + "-d '{\"name\":\"infra\",\"auto_init\":true,\"default_branch\":\"main\"}'" + ) + + webhook_payload = json.dumps({ + "type": "gitea", + "config": { + "url": "http://127.0.0.1:4141/events", + "content_type": "json", + "secret": "webhooksecret", + }, + "events": ["push", "pull_request", "issue_comment"], + "active": True, + }) + machine.succeed( + f"curl --fail -s -X POST http://127.0.0.1:3000/api/v1/repos/test/infra/hooks " + f"-H 'Authorization: token {api_token}' -H 'Content-Type: application/json' " + f"-d '{webhook_payload}'" + ) + + with subtest("Start Atlantis service"): + machine.succeed("mkdir -p /run/secrets /run/secret-targets") + machine.succeed(f"echo ATLANTIS_GITEA_TOKEN={api_token} > /run/secret-targets/atlantis.env.1") + machine.succeed("ln -s /run/secret-targets/atlantis.env.1 /run/secrets/atlantis.env") + machine.succeed("echo original > /run/secret-targets/example.1") + machine.succeed("ln -s /run/secret-targets/example.1 /run/secrets/example") + machine.succeed("systemctl start atlantis.service") + machine.wait_for_unit("atlantis.service") + machine.wait_for_open_port(4141) + machine.succeed("curl --fail http://127.0.0.1:4141/healthz") + + with subtest("Push branch with Terraform configuration and open Pull Request"): + machine.succeed("git config --global user.email test@localhost") + machine.succeed("git config --global user.name test") + machine.succeed( + f"git clone http://test:{api_token}@127.0.0.1:3000/test/infra.git /tmp/infra" + ) + machine.succeed("git -C /tmp/infra checkout -b add-tf") + machine.succeed("cp ${mainTf} /tmp/infra/main.tf") + machine.succeed("git -C /tmp/infra add main.tf") + machine.succeed("git -C /tmp/infra commit -m 'Add terraform resource'") + machine.succeed("git -C /tmp/infra push origin add-tf") + + pr_payload = json.dumps({ + "base": "main", + "head": "add-tf", + "title": "Add Terraform resource", + }) + machine.succeed( + f"curl --fail -s -X POST http://127.0.0.1:3000/api/v1/repos/test/infra/pulls " + f"-H 'Authorization: token {api_token}' -H 'Content-Type: application/json' " + f"-d '{pr_payload}'" + ) + + with subtest("Verify Atlantis automatically runs plan on PR"): + machine.wait_until_succeeds( + f"curl --fail -s http://127.0.0.1:3000/api/v1/repos/test/infra/issues/1/comments " + f"-H 'Authorization: token {api_token}' | jq -r '.[].body' | grep -i 'Plan: 1 to add'" + ) + + with subtest("Verify Atlantis executes apply on comment"): + apply_comment = json.dumps({"body": "atlantis apply"}) + machine.succeed( + f"curl --fail -s -X POST http://127.0.0.1:3000/api/v1/repos/test/infra/issues/1/comments " + f"-H 'Authorization: token {api_token}' -H 'Content-Type: application/json' " + f"-d '{apply_comment}'" + ) + machine.wait_until_succeeds( + f"curl --fail -s http://127.0.0.1:3000/api/v1/repos/test/infra/issues/1/comments " + f"-H 'Authorization: token {api_token}' | jq -r '.[].body' | grep -i 'Apply complete'" + ) + + def main_pid(): + return machine.succeed("systemctl show atlantis.service --property=MainPID --value").strip() + + def restart_atlantis(previous_pid): + machine.succeed("systemctl restart atlantis.service") + machine.wait_until_succeeds( + "pid=$(systemctl show atlantis.service --property=MainPID --value); " + f"test $pid -gt 0 && test $pid -ne {previous_pid} && " + "curl --fail http://127.0.0.1:4141/healthz" + ) + + def credential_value(): + return machine.succeed( + f"cat /proc/{main_pid()}/root/run/credentials/atlantis.service/TF_VAR_example_secret_file" + ).strip() + + with subtest("Credentials are exposed through their systemd credential paths"): + machine.succeed( + "grep -zFxq TF_VAR_example_secret_file=/run/credentials/atlantis.service/TF_VAR_example_secret_file " + f"/proc/{main_pid()}/environ" + ) + assert credential_value() == "original" + + with subtest("Restarting Atlantis loads updated credential contents through a symlink"): + previous_pid = main_pid() + machine.succeed("echo updated > /run/secret-targets/example.1") + restart_atlantis(previous_pid) + assert credential_value() == "updated" + + with subtest("Restarting Atlantis loads updated environment file contents through a symlink"): + previous_pid = main_pid() + machine.succeed( + f"printf 'ATLANTIS_GITEA_TOKEN={api_token}\\nROTATION_TEST=rotated\\n' > /run/secret-targets/atlantis.env.1" + ) + restart_atlantis(previous_pid) + machine.succeed(f"grep -zFxq ROTATION_TEST=rotated /proc/{main_pid()}/environ") + ''; +} diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 5fe004698c0b..ea081eb6f074 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -19,11 +19,13 @@ services.avahi = { enable = true; nssmdns4 = true; - publish.addresses = true; - publish.domain = true; - publish.enable = true; - publish.userServices = true; - publish.workstation = true; + settings.publish = { + disable-publishing = false; + disable-user-service-publishing = false; + publish-addresses = true; + publish-domain = true; + publish-workstation = true; + }; extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; debug = true; }; diff --git a/nixos/tests/taskchampion-sync-server.nix b/nixos/tests/taskchampion-sync-server.nix index 8e73fe4ea12a..fd311c3d3291 100644 --- a/nixos/tests/taskchampion-sync-server.nix +++ b/nixos/tests/taskchampion-sync-server.nix @@ -2,7 +2,7 @@ { name = "taskchampion-sync-server"; - nodes = { + containers = { server = { services.taskchampion-sync-server.enable = true; services.taskchampion-sync-server.host = "0.0.0.0"; @@ -15,9 +15,9 @@ }; }; testScript = - { nodes, ... }: + { containers, ... }: let - cfg = nodes.server.services.taskchampion-sync-server; + cfg = containers.server.services.taskchampion-sync-server; port = toString cfg.port; # Generated with uuidgen uuid = "bf01376e-04a4-435a-9263-608567531af3"; diff --git a/nixos/tests/tlsrouter.nix b/nixos/tests/tlsrouter.nix new file mode 100644 index 000000000000..aad50d3cded8 --- /dev/null +++ b/nixos/tests/tlsrouter.nix @@ -0,0 +1,42 @@ +{ lib, pkgs, ... }: + +{ + name = "tlsrouter"; + + meta.maintainers = with lib.maintainers; [ xsteadfastx ]; + + nodes.node = { + services = { + caddy = { + enable = true; + configFile = pkgs.writeText "Caddyfile" '' + { + https_port 3000 + } + + foo.bar.tld { + tls internal + + respond "hello world" + } + ''; + }; + + tlsrouter = { + enable = true; + routes."foo.bar.tld".backend = "127.0.0.1:3000"; + }; + }; + }; + + testScript = '' + start_all() + node.wait_for_unit("caddy") + node.wait_for_open_port(3000) + + node.wait_for_unit("tlsrouter") + node.wait_for_open_port(443) + + node.succeed("curl --fail -k --resolve foo.bar.tld:443:127.0.0.1 https://foo.bar.tld | grep hello") + ''; +} diff --git a/pkgs/applications/editors/emacs/build-support/tests/with-packages.el b/pkgs/applications/editors/emacs/build-support/tests/with-packages.el index ae97562e15b0..3de65cb4ab62 100644 --- a/pkgs/applications/editors/emacs/build-support/tests/with-packages.el +++ b/pkgs/applications/editors/emacs/build-support/tests/with-packages.el @@ -276,15 +276,16 @@ This is a regression test for URL `https://github.com/NixOS/nixpkgs/pull/538964' (file-exists-p (file-name-parent-directory eln-dir))))))) (defun with-packages-fonts-of-requested-packages-are-available () - (let ((font "Hack")) - (append - (let ((graphical-frame (make-frame-on-display (getenv "DISPLAY")))) - (unwind-protect - (list (display-graphic-p graphical-frame) - (member font (font-family-list graphical-frame))) - (delete-frame graphical-frame))) - ;; Subprocess does not see wrapper-added fonts. - (list (equal 1 (call-process "fc-list" nil nil nil "--quiet" font)))))) + (cl-loop + for font in '("Hack" ; Directly added by the wrapper. + "all-the-icons") ; Indirectly added by the wrapper. + append (let ((graphical-frame (make-frame-on-display (getenv "DISPLAY")))) + (unwind-protect + (list (display-graphic-p graphical-frame) + (member font (font-family-list graphical-frame))) + (delete-frame graphical-frame))) + ;; Subprocess does not see wrapper-added fonts. + collect (equal 1 (call-process "fc-list" nil nil nil "--quiet" font)))) (define-with-packages-non-batch-ert-tests with-packages-early-default-is-loaded diff --git a/pkgs/applications/editors/emacs/build-support/tests/with-packages.nix b/pkgs/applications/editors/emacs/build-support/tests/with-packages.nix index 81d19a0b11c8..ee34c37825fa 100644 --- a/pkgs/applications/editors/emacs/build-support/tests/with-packages.nix +++ b/pkgs/applications/editors/emacs/build-support/tests/with-packages.nix @@ -19,6 +19,7 @@ let runtimeInputs = [ (emacs.pkgs.withPackages (epkgs: [ hack-font + epkgs.all-the-icons epkgs.dash epkgs.flx-ido (epkgs.callPackage (mkEpkg { diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 2c66d7250aa2..41c82ca37859 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -776,6 +776,8 @@ let # https://github.com/gergelypolonkai/alert-termux/issues/2 alert-termux = addPackageRequires super.alert-termux [ self.alert ]; + all-the-icons = addPackageRequires super.all-the-icons [ pkgs.emacs-all-the-icons-fonts ]; + # https://github.com/magnars/angular-snippets.el/issues/7 angular-snippets = addPackageRequires super.angular-snippets [ self.yasnippet ]; @@ -1463,6 +1465,8 @@ let # empty tools/ncl-mode-keywords.el causing native-compiler-error-empty-byte ncl-mode = ignoreCompilationError super.ncl-mode; + nerd-icons = addPackageRequires super.nerd-icons [ pkgs.nerd-fonts.symbols-only ]; + # missing optional dependencies netease-cloud-music = addPackageRequires super.netease-cloud-music [ self.async ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7a921d2de1f2..9ba12ed733b5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -461,12 +461,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-10-12"; + version = "0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "9ec57eeac6e2e14b7b9b9e74dc8b0ca4954a684b"; - hash = "sha256-BBnr1dlLiaWNShjbAUF3I3EhusQ0fNbca7mstyrNhNI="; + rev = "7fca30f2890a6acf9d21d194876c6ac960d92070"; + hash = "sha256-MAm4hVrZRYXNSBeUKlVr3GuDOkSXrvxYzGzJ0dQ9Vrs="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -1079,12 +1079,12 @@ final: prev: { astrocore = buildVimPlugin { pname = "astrocore"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrocore"; - tag = "v3.1.1"; - hash = "sha256-EBCcsVcdZtrHY7QO+/qc0Yf9tXR1HpOYF+txAv6kbSM="; + tag = "v3.1.2"; + hash = "sha256-rdn45y1i9YgqwoyGyzLS+fy7gh83XUSfSf8L5ek/hLo="; }; meta.homepage = "https://github.com/AstroNvim/astrocore/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -1289,12 +1289,12 @@ final: prev: { atlas-nvim = buildVimPlugin { pname = "atlas.nvim"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "emrearmagan"; repo = "atlas.nvim"; - tag = "0.8.0"; - hash = "sha256-Hjl8SsHNtiZ3lqbg1ZVMeipzHBW0/HX7Q3o8OZ8/zOc="; + tag = "0.8.2"; + hash = "sha256-qjVbG6lTJdkMIpRMZqWbuBsITD671ZW+w8gzcpRKe9Q="; }; meta.homepage = "https://github.com/emrearmagan/atlas.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5336,12 +5336,12 @@ final: prev: { diffview-plus-nvim = buildVimPlugin { pname = "diffview-plus.nvim"; - version = "0.38"; + version = "0.39"; src = fetchFromGitHub { owner = "dlyongemallo"; repo = "diffview-plus.nvim"; - tag = "v0.38"; - hash = "sha256-g9pzU0BmW4TapywQj344PzvKWWSiybt1tUZL1oIoTLI="; + tag = "v0.39"; + hash = "sha256-0Zu2HPU9rzsyIOVLPWB9ABmfu5UffYkJtkIQUtBLVOs="; }; meta.homepage = "https://github.com/dlyongemallo/diffview-plus.nvim/"; meta.license = unfree; @@ -6837,11 +6837,11 @@ final: prev: { gitlab-vim = buildVimPlugin { pname = "gitlab.vim"; - version = "1.1.0-unstable-2026-10-09"; + version = "1.1.0-unstable-2026-10-14"; src = fetchgit { url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - rev = "e36c687410733b9a8318b98bd01561f9482cf43b"; - hash = "sha256-e0IRUo02QhEZOX9NMhsN7ixV7lMn9rhXduN0ORcmKBA="; + rev = "a867a65a65d9d236164ed009fb534813d2e2c60b"; + hash = "sha256-gv3sQkHA5J07J2qfuB6Hw/9LdC+vG9r58j4UT5t2U1s="; }; meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; meta.license = unfree; @@ -7761,12 +7761,12 @@ final: prev: { hunk-nvim = buildVimPlugin { pname = "hunk.nvim"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "julienvincent"; repo = "hunk.nvim"; - tag = "v1.10.0"; - hash = "sha256-HcQNn1qsY9seuyLjX1Z9FCSRs3cdoxYDL3lZIOjwwog="; + tag = "v1.11.0"; + hash = "sha256-zbjwCqgokAlYM2zADhotSr/XDpgcF9O/NFeH/bCyxFs="; }; meta.homepage = "https://github.com/julienvincent/hunk.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8490,12 +8490,12 @@ final: prev: { kanagawa-paper-nvim = buildVimPlugin { pname = "kanagawa-paper.nvim"; - version = "4.0.0-unstable-2026-05-26"; + version = "4.1.0"; src = fetchFromGitHub { owner = "thesimonho"; repo = "kanagawa-paper.nvim"; - rev = "ecf19801a2673054c19421d82b766f7641688320"; - hash = "sha256-yzu0EvZseFlLB1Flho6WigMnuLL3inLIflxPU3LUPv0="; + tag = "v4.1.0"; + hash = "sha256-Xvbmnnpns/mkOgjeWHxf7yC8BPKNsdIS0U4+7LbIZf4="; }; meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10883,12 +10883,12 @@ final: prev: { multicursor-nvim = buildVimPlugin { pname = "multicursor.nvim"; - version = "0-unstable-2026-03-24"; + version = "0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "jake-stewart"; repo = "multicursor.nvim"; - rev = "704b99f10a72cc05d370cfeb294ff83412a8ab55"; - hash = "sha256-JHl8Z7ESrWus2I6Pe+6gmdgCAZOzAKX7kimy71sAoe4="; + rev = "c574bfc1f7e63dfea3e64b8453c9f7c660127238"; + hash = "sha256-tVaV4upuRCWOlRroVq6U8RM6apgDigWdQ0b/0xtnaZ0="; }; meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11275,12 +11275,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-10-13"; + version = "1.4.0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f64f69999d545e5474ce71401140053e4d47d94f"; - hash = "sha256-EMQWZOAF84kqhL/wn4EYA46mU2XSvosGKjKAHXRDVsY="; + rev = "7bef87a16e161b3311b76ec5aa4ad8581935788e"; + hash = "sha256-AyD3bmf+3qlwC77ViC5+KUn4DI/dmQnAzkgLwUS0J3Q="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11359,12 +11359,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "3.0.0-unstable-2026-10-13"; + version = "3.0.0-unstable-2026-10-14"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "fb6a56256174e28d8bb1c05a3172712d5c7b0ec5"; - hash = "sha256-KZYhfu1aTRs3k0bFhMDoLtxjeIo3mRilcDiCF4KtDbY="; + rev = "a6549816e62cec7037f1549d8f1659d45635370c"; + hash = "sha256-B2phtEz/UfqooGgIy2RGmKgTiYOOwMP1nIr1qKp9Uy0="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14042,12 +14042,12 @@ final: prev: { nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "0.10.0-unstable-2026-10-10"; + version = "0.10.0-unstable-2026-10-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "1a4f47b03dfe92d28de7d5654c67327ef008c9e6"; - hash = "sha256-lqltLeAEVJLXOhmhcKEDPTZYWYcjOHWaILZyMM3rZx4="; + rev = "ca581c3436fc2b236847f5b739ebc263739e5ca6"; + hash = "sha256-2KMktps3gP0nkQDxbsWACbBQRhToEFbdIAeXyEirxAY="; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -14504,12 +14504,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "0-unstable-2026-10-09"; + version = "0-unstable-2026-10-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "4da45270d8d50df74719b1886270419337ee7005"; - hash = "sha256-0QlHlo7EoXkcUunqtcurusOS3x/PSxp0gGrTOdFtiGo="; + rev = "8461d99d13cca243f89848bf4d9fadee096f0a48"; + hash = "sha256-HZOX3QIZ6XZVuiSnr9rbdmd7yNk+uDznC98GcEb9qBE="; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15121,12 +15121,12 @@ final: prev: { persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - tag = "v3.1.0"; - hash = "sha256-DCO1ztkXaS2QJF/nrUB3DQg838MepjiJ+zGUY7z6VFo="; + tag = "v3.1.1"; + hash = "sha256-60EEsubE0DiRpnoTslpvj4pMKK/TjubLA5UxEytuJUI="; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18319,12 +18319,12 @@ final: prev: { tiny-glimmer-nvim = buildVimPlugin { pname = "tiny-glimmer.nvim"; - version = "0-unstable-2026-07-05"; + version = "0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-glimmer.nvim"; - rev = "9a48d8a7436231cb16d47c88f924702e5602870a"; - hash = "sha256-ONv/NE4D5vWNV56oJc/h5/nniOWjH5eUG0Q80dMVSxg="; + rev = "b35d4f7b0eaedb75ff99fa694f4d1ea2ce8ce6c8"; + hash = "sha256-J6DZcSDLhHLvMya/P5ylbHltfP7cdifMX4SFWbJyidg="; }; meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -20609,8 +20609,8 @@ final: prev: { src = fetchFromGitHub { owner = "sergioia-dev"; repo = "vim-dadbod-manager-ui"; - rev = "ab5ea7b71cec9a753b90a0f8e8b2c9267b8c83bf"; - hash = "sha256-9x3RkiL9rLhJ1dhLlNdnGd9BqXY3mZGjEzqWWr89R0Q="; + rev = "af428003c97f733be565aa0c8a1e9ce66de415bc"; + hash = "sha256-B6E3stJIDaEFCAU4QkgvL7WMCElwHfKdtzkcspibboE="; }; meta.homepage = "https://github.com/sergioia-dev/vim-dadbod-manager-ui/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22553,12 +22553,12 @@ final: prev: { vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "0.1.4-unstable-2026-10-04"; + version = "0.1.4-unstable-2026-10-15"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "81481196aa69036d6cdf96cd9374d4827a708ba4"; - hash = "sha256-vT82SU78WM95c9DfGQcQ4vhCdJl9yOCMoeLMYQprO/A="; + rev = "977e704cdbbbbc89a54f8f226d3468b0aa0405c9"; + hash = "sha256-cOsDjV3g8Qa3wrPS61hyVbNYk8I+GMZX5u64mFMzBBY="; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22595,12 +22595,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "0.0.1-unstable-2026-10-01"; + version = "0.0.1-unstable-2026-10-15"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "adbd9698b7cd417d76038487fc9158208c1e8566"; - hash = "sha256-X8Yo3XYFodgpp9R1KFzsyj292iIbY/QPwU4jn/LU7LM="; + rev = "d33977aad57dffe813219ab6dff8e3dbc15a7ba4"; + hash = "sha256-mRDfOjMITxyQmHeXFg7NCaB3RA4KIGQa2QFYItfzvpI="; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -23491,12 +23491,12 @@ final: prev: { vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "0.14.0-unstable-2026-10-05"; + version = "0.14.0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "4da42e9a5c948fb82970d522bd14cbab3d122ff1"; - hash = "sha256-7HFv5WPSaEGe//d0iddCO5SL4j5IlnY3UTKL7RoEtKY="; + rev = "7e5aae5e1187842cb0b1d8def986e48d481c4410"; + hash = "sha256-b2AMS15l1j/5v8IYdhz8JDGW+UvmbqUN3YS4uO4CYsE="; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -26038,12 +26038,12 @@ final: prev: { windsurf-vim = buildVimPlugin { pname = "windsurf.vim"; - version = "1.20.8-unstable-2026-01-22"; + version = "1.20.8-unstable-2026-03-31"; src = fetchFromGitHub { owner = "Exafunction"; repo = "windsurf.vim"; - rev = "3c0a4f8a7be75113a6e19be13b7cc37210d6e26a"; - hash = "sha256-wjpdX37kdgIKHS39LPKYcWTawQ4rc8KYf3ezt+5WL94="; + rev = "c5c027c31ba8afd38a718c650f363437fbaeb4bc"; + hash = "sha256-1TVly5tNSRYuJ1e/wzO0vOTOQBR8YE8yLtQChhl56no="; }; meta.homepage = "https://github.com/Exafunction/windsurf.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -26178,12 +26178,12 @@ final: prev: { xmake-nvim = buildVimPlugin { pname = "xmake.nvim"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "Mythos-404"; repo = "xmake.nvim"; - tag = "v3.1.5"; - hash = "sha256-MkChUCntWqgmAKnaYGT38dSgQaLLyc7liXdZWx4061Q="; + tag = "v3.1.6"; + hash = "sha256-R5NrYIuNJi5j2AsS+U2rDktOxa85haFJJ3m1lwCAxpw="; }; meta.homepage = "https://github.com/Mythos-404/xmake.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index fa48d6500e41..14364e3b27f5 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -25,6 +25,8 @@ let "lze" "lzextras" "lzn-auto-require" + "mega-cmdparse" + "mega-logging" "middleclass" "mini-test" "neorg" diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 7ee0a16efbe4..02d6b7fc9e74 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,18 +12,18 @@ perl, }: let - version = "0.2.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-VJN2ero5ndLqfmMImUF9fqbUKku6Q1CypjK5Q+SB0ck="; + hash = "sha256-Xh/Y9dDur5oXJRavAxQIwRNg9/3ofAREkAxmM/0Tyks="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-F0SJ4iv/oL2560KmqH7Sun3F+yXR44daYFbOQRsYlDg="; + cargoHash = "sha256-Mtku+MLkDdBYN5xj2x4XbyFXFZ+qTfl1eX2g9VcfpFU="; nativeBuildInputs = [ pkg-config @@ -56,6 +56,8 @@ vimUtils.buildVimPlugin { dependencies = with vimPlugins; [ dressing-nvim img-clip-nvim + mega-cmdparse + mega-logging nui-nvim nvim-treesitter plenary-nvim diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index 82ff9db40a82..222613e5787e 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -5,7 +5,7 @@ nix-update-script, openssl, perl, - zig, + zig_0_16, gitMinimal, pkg-config, stdenv, @@ -45,7 +45,7 @@ let perl rustPlatform.bindgenHook writableTmpDirAsHomeHook - zig + zig_0_16 ]; dontUseZigConfigure = true; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hermes-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hermes-nvim/default.nix index b153557b6500..95717451eefa 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/hermes-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/hermes-nvim/default.nix @@ -17,11 +17,11 @@ }: let - version = "0.14.0"; + version = "0.17.0"; src = fetchzip { url = "https://github.com/Ruddickmg/hermes.nvim/archive/refs/tags/v${version}.tar.gz"; - hash = "sha256-YUe+Mg1StwcxpcIcWr9T/32nkH921UranMM0bE+7lu8="; + hash = "sha256-QFrf8xe9beUznRCnClVLGTdMw9buFQk0QOAWED2+PQE="; }; dejavuFont = fetchzip { @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit version src; __structuredAttrs = true; - cargoHash = "sha256-X1YI0iT3/5hncU0M5qJY+12nO6Et4B/xqwvjaq8AV1Q="; + cargoHash = "sha256-5dd/Z8GyXgR50LydWKz+8y4BWpR6bOoYu+5K9lRF4yc="; cargoBuildFeatures = [ "with-icons" ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/jupynvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/jupynvim/default.nix index bc528d160b39..8469d37d2a54 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/jupynvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/jupynvim/default.nix @@ -6,12 +6,12 @@ vimUtils, }: let - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "sheng-tse"; repo = "jupynvim"; tag = "v${version}"; - hash = "sha256-G8vyhsTfHtbE7foqj1HNJNMg3TYeO/Nd4ofRS+SVPUo="; + hash = "sha256-EQMjMlYd6x6E59JQ1EUFSXK5CYv8I87TqMWsNKanE/c="; }; jupynvim-core = rustPlatform.buildRustPackage { pname = "jupynvim-core"; @@ -19,7 +19,7 @@ let sourceRoot = "${src.name}/core"; - cargoHash = "sha256-7zMuo7evZrer8CXAwbrZtLv/LdOuoZK95sMgyqs5P0I="; + cargoHash = "sha256-oYUd62xmJ/MwRwGpfRmsnRgW6ggllOHzoczeVXV5hNE="; meta.mainProgram = "jupynvim-core"; }; @@ -33,7 +33,7 @@ vimUtils.buildVimPlugin { postInstall = '' rm -rf $out/core substituteInPlace $out/lua/jupynvim/backend/connect.lua \ - --replace-fail 'M._plugin_root() .. "/core/target/release/jupynvim-core"' \ + --replace-fail 'root .. "/core/target/release/jupynvim-core"' \ '"${lib.getExe jupynvim-core}"' ''; diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 44bb7cd860a8..aee3010a9e15 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-CxcRJM0kr9GWqHDqklgwnfv7l+a42NUl19uzIl/sxQA="; + hash = "sha256-JMT/DMsOWe1H0TY3RZ+46S2Yy8MLF2n/JQpzLgRJMj0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-g26KjS0tAj5aN+8WLwnEMTE6aiyNPJLRPvtD6rQklos="; + hash = "sha256-e0aTYtb4U3qvlG90jEbiLD6SGouw8T54wUrlp3lYeO0="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-a9rAHqk4oYcM3FG/ghMci72SxHMuS3EzNVpsC56OP3g="; + hash = "sha256-V4bwOucx9C5t+nVhiKfJtW6mTP46mS4l41KJ+M3lN6k="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.301"; + version = "2.1.304"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index 0a9e16f16363..1ed4e876c16f 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -12,22 +12,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-rcF2hINVWsnGkOoGz/pCbUngaK9p/Wan03qSTnxB/Xs="; + hash = "sha256-nFumCRoZZe2Qyq6XvFMbtMslndCkWzC0MSHTQlZ6MyY="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-j7pv4MICFzqfFCI+dmgB7xtnMRIXkgRYyEBzIZaJwNI="; + hash = "sha256-KVyK1nbpyjl2PhOIktR99GkyJkWwzlLNdUT5neVCvCw="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-ef52k2aBnFnTdrUWyw5n4tIaMHXaOpWTW+3DWIai1+o="; + hash = "sha256-+rgs3o4FPEQheU5NZxjnihZsGqcq4gJh45RzfQlGLRA="; }; }; in { name = "ruff"; publisher = "charliermarsh"; - version = "2026.84.0"; + version = "2026.88.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 82efe9b84ff6..cc9346e4d214 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -365,8 +365,8 @@ let mktplcRef = { publisher = "arktypeio"; name = "arkdark"; - version = "6.6.0"; - hash = "sha256-9QsHaH8mXM7D7QE5+xTFrGyxh6MShPF9Wk0hFHpxk8A="; + version = "6.6.1"; + hash = "sha256-+jTZeGkJkWeOQONXup9Bbfe6FGHQwDD4Cn6POLddUPE="; }; meta = { description = "Syntax highlighting and inline errors for ArkType"; @@ -499,8 +499,8 @@ let mktplcRef = { publisher = "ban"; name = "spellright"; - version = "3.0.154"; - hash = "sha256-vGzmzY78FOS8ZsrT1YpTNOUJprW4rZHVuM83cZz6V+Q="; + version = "3.0.156"; + hash = "sha256-UHtSqdQ19RT9deshH7F7lZSAgXse/lBFd3xWWcDuGuY="; }; meta = { description = "Visual Studio Code extension for Spellchecker"; @@ -1131,8 +1131,8 @@ let mktplcRef = { name = "vscode-cue"; publisher = "cuelangorg"; - version = "0.0.21"; - hash = "sha256-aSyTgGZt9AMZopmPLHb3Mc2RxUGZH87eMtOPX8DlgWQ="; + version = "0.0.23"; + hash = "sha256-iu5oHsnTXPa+xzDse2Ei9hVn4THSkiNJvBkGp1vfEwA="; }; meta = { description = "The official CUE extension for VS Code, providing syntax highlighting and language server integration (LSP)"; @@ -1364,8 +1364,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.29.14"; - hash = "sha256-u/Up1H2yaRLq6LtNnth9E8+gTy+Gdh2O8Bh1FEu/JtY="; + version = "2.30.0"; + hash = "sha256-z3ZMVLjH2TEEKqcXCicsi+ErGlmPlYykHitiWRGWCjM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; @@ -2598,8 +2598,8 @@ let mktplcRef = { publisher = "jellyedwards"; name = "gitsweep"; - version = "1.0.0"; - hash = "sha256-XBD8rN6E/0GjZ3zXgR45MN9v4PYrEXBSzN7+CcLrRsg="; + version = "1.0.2"; + hash = "sha256-UIYtBNNtvJYMw9JoZlRoeso9fjDCT9uYERy7c9bMKyw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jellyedwards.gitsweep/changelog"; @@ -4911,8 +4911,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.111.3"; - hash = "sha256-yMiEvC7zCVnBSSo+HvK9m7RbD6Bmv7zwKabOtlsEXjE="; + version = "0.111.5"; + hash = "sha256-Giq1ueINXsx1V4wSNRGGNej5r5njTXHEdpPI/l13JpY="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -5234,8 +5234,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.31.1"; - hash = "sha256-SfrsL27uQyrtsNyqZe0q5Fv5sHMwRvBZ+iS6/JIpFVo="; + version = "0.31.2"; + hash = "sha256-CNq8jhhVgc3doJNRGkvggwDgdATUzZsS08SAfk7qzto="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index e954e85ab27a..3d697c188b5f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "1.6.15"; - hash = "sha256-MKx4yZGSXW/+0+zuYbLPWyAqVV+BD53XRGTztm6NSIo="; + version = "1.6.16"; + hash = "sha256-sH21cTA04CUCKcW1vDtnihGDiVJXyGHy2wa0yHjHZ1w="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 90db70bfeb3e..d50ed73dae20 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-mTcTEvBsycCL2BW9EnmKJfyZN3aL6B/G8l8lnBTBojo="; + hash = "sha256-ajD967fS5Y7c9uDJHPteBW5AfhUmFVQgdbi+mCy/jMk="; }; __structuredAttrs = true; diff --git a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix index da41aa65683d..88b07af6e8b2 100644 --- a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix +++ b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker-german"; publisher = "streetsidesoftware"; - version = "2.3.4"; - hash = "sha256-zc0cv4AOswvYcC4xJOq2JEPMQ5qTj9Dad5HhxtNETEs="; + version = "3.0.0"; + hash = "sha256-ajuyJXBmJARxxhnr6Hd1oy/IPElY1pfzxYr27SoWS9I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-german/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix index 2c4e64b441e9..3814c9982599 100644 --- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix @@ -7,15 +7,15 @@ let supported = { x86_64-linux = { - hash = "sha256-fGcPMeJKJE3QRy85xUWbYemjtKMQ6Tlx181qyBXfGd8="; + hash = "sha256-pIecZPe2514vlaliUkPL6dzbZmSzApJqkUjRvDVGplc="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-rXpGVuOtCTvuHQQVVB+KMMrGsKEJz9pBpzu6VWLm4M8="; + hash = "sha256-dqF+KY6Nzr4SUfp3ToYN6uNFpA1xXhJAnv0jIgOFnjs="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-tS1kyYLg8+tIE+eFhSUzQWymYDX8aw9oOB0chsIrp+M="; + hash = "sha256-PH4PEjhFS9wzvF2iq1E9OrslYrtag5x6NrBMdALhA4c="; arch = "darwin-arm64"; }; }; @@ -30,7 +30,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "tombi"; publisher = "tombi-toml"; - version = "1.7.3"; + version = "1.8.9"; }; meta = { description = "TOML Language Server"; diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 222c71a4af00..a922817c493e 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -13,22 +13,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-41D15WSCK67DK1ArIOgbApndYYq6X0Br1cDajjkhHsE="; + hash = "sha256-YS/fX1utdHoPR2OgtQpvLA/gSePlfPieOGqgVrLiqQs="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-gWBEMWsootSivCnPI0q0VqMvw3vaQUS+AYTrGd9mV20="; + hash = "sha256-Z4sbBQ/wB/FlBh1K65AA2z9IWce11o2CSO12IJqTyZg="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-Qs3+dRfHs3iZ+mS1uj6o4vPrMF66NgH/8Xmpyo6vTeE="; + hash = "sha256-ovVwNVSHP0LNHOY8oGsV3JZ3N6wS0ZSpJfd6aPHpoS4="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.35.4"; + version = "0.36.1"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 6281768f7781..07c8a6ce2bd8 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "2026.07.18"; + version = "2026.10.4"; strictDeps = true; __structuredAttrs = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pwmt"; repo = "zathura"; tag = finalAttrs.version; - hash = "sha256-LngYOW1dNR+x/4Yh1W07dTxidqK0FOvJOl2RRecchvE="; + hash = "sha256-g3FWbuPI2fhBHIHRynDiRjB0eZOf4nAcVfg/OA2EEPw="; }; outputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3e9b05299859..8e625c6df766 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1859 +1,1859 @@ { - version = "158.0"; + version = "158.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ach/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ach/firefox-158.0.1.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a91e9618d93236e6c3d7b6e13eee0bcdf7eca455e2f27f62816a0f44c52301d6"; + sha256 = "e5dc12b192e1a166d418b498cb158377b8441c673c5d86f3810d7d8d42c14283"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/af/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/af/firefox-158.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "23dcb13c26c2fa1e4608fdfc2815a89992cb98478e96ec0ce928f47ceccf14f3"; + sha256 = "a8ea6c93793167ec99fa8d853847b5b85ce694d0bd043fce5508d26bc5effb58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/an/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/an/firefox-158.0.1.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "06785de192a8f9e703ac565f5ea28f67c2e1748a9baa243da7d47479a50babc0"; + sha256 = "b52f326897a99edb09825bb8e397754e96fc2a2755fe2ba16d079f187bc985e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ar/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ar/firefox-158.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3821a4959dd9f21ee065873dc66a5dd6742314941d88c5f3ab24cdc5b37bca7a"; + sha256 = "84f742243d5cb1e298d515edb60052b11713c0e2e3c03c097431356d7af7cfbc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ast/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ast/firefox-158.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "fce54ece5d447db7a9562f89c3e7ad0fd6a1dd1835a03860ad170ecbbd54ee88"; + sha256 = "df7b82b074cea045e31ada51e5669ce68e9062d241f9993d35f323067c65a8d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/az/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/az/firefox-158.0.1.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "92c0925e2a8c2a77fbb4ddb3144234571b48a2368c9445bd65f37aeaabdea9d0"; + sha256 = "dc23840d00fc44730be0acbcb79365c4f53e1393329866e717ccd5a85316c549"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/be/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/be/firefox-158.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7e256fccb3e17fa29cba000a08a494abdf2a320b07633f8fc4a8f4ecd63f7b31"; + sha256 = "5e969d7fa6b0960bcf4bd1da87ba43ceb0db3b6eeafd74dc8c5201d034b0c659"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/bg/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/bg/firefox-158.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "75c356629ec827cc148f42e67fc4aa396b914489efb639ade9c7260483159900"; + sha256 = "208610e6fa94bb8c4299122f1304a28af68f54591a7d81fb191860c968a61e9f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/bn/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/bn/firefox-158.0.1.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e8b8e11b5bf5196edd6d08fe95103d49b9fd369b8789a3426b644363037b7fbc"; + sha256 = "3f35b68454169a2f72769b3d85b39ed552ae3d96b9cd05f0ebf8a58ea9f6c191"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/br/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/br/firefox-158.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3f37d7383abed97adc8bbf3d594d06d91193276613ca9a378969256546f46e5e"; + sha256 = "0fb10f99f53d63931546facb555e2aff4c0686c2b85ce48b9d39028bceb09ea7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/bs/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/bs/firefox-158.0.1.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9b198446cf521495780310d5c70ac573fc48f20d1e71fe10a65cadc4c74e88d2"; + sha256 = "cbcc322d1e5a29f93acb3019508a0b4a6b62abea98ed651c0528f7b1b2e96975"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ca-valencia/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ca-valencia/firefox-158.0.1.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "726c47e51206a38979ff2d54ddb6202f7be5ebbdd2e454e74ff92bc56f27d0eb"; + sha256 = "265e645d95a00cc0b2a1d1b3f24e50b246b8dbbab2f3c7297b8d4af1429cb49c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ca/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ca/firefox-158.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e0106498df2d67d9706373de33e6c00e5ef33a95e5cd7b56268c051ff9e9c9ba"; + sha256 = "1532b4d9fe80a378fef5907c501710d801f580b9ceee71e32bab204f31f174d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/cak/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/cak/firefox-158.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c214daba15ec5bd74182888a24330def8dfcb8b829f1581a335e4434be5465e7"; + sha256 = "af5be04d4712f84a9f318265d6b5db4f74279bc01d1b53e40ebef009b6e67f9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/cs/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/cs/firefox-158.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4d88065a60cbce7907b824c5a71e4c2c2025b3a5efb7d3064f16ce58bc586fab"; + sha256 = "2f4adb401cc91b194757b76f06d347669d05da78a9672d0cd89b02279dae6fa1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/cy/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/cy/firefox-158.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4509cf4ba602fadce4bd082a80dd99c5f46a883760a2a7388c0d746c4e66a197"; + sha256 = "0e71d04f3bf3357b998dee3f56192e14380a6e385bee512a521a585c6cfa26e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/da/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/da/firefox-158.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e015aa0254ea8b33c77e9bdf494fcfcd597c1c00f9c064cd184af174e9eaf485"; + sha256 = "157ea92b916f1c9ac312858dccaab139341d41bc138e81b8edf54a6135c06cf7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/de/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/de/firefox-158.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0befd9f8bed4c7ccb3796d38b37f6b735283bc291c455345d55de7e9e7f1a1c1"; + sha256 = "643b9333828c07240c3cca9df4a136997ca6d5e204abbc83584a2bbd421dd397"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/dsb/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/dsb/firefox-158.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8ee7062e3781e9c9e097b1db5fd24589692736ab25cc7c511faa9a4bd98405a7"; + sha256 = "116bae254a8bf6c3d084ddf97ac62ef4d8811a13a9e7dee85710490abc85f196"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/el/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/el/firefox-158.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "eb2ae27e89a03bca05746f39c4f8e924c97e4870c2e84cf6703c9c87dea55409"; + sha256 = "771d0e4e916f3cfe87ff5a759f5d6bc3211ff9e9574c2e643d093de12a99bdfd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/en-CA/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/en-CA/firefox-158.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3dbc42324bbfe0a4b3b8e1e06610c121fe91d68ee1f1476b03ad2056c74523a2"; + sha256 = "92da2a8e739a674666a53facedc0cc5c66cd7415888810e11add118ee0a40dba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/en-GB/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/en-GB/firefox-158.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d9d229f636abba3bb09c369ccf5d3d1bef643a1eed3b36c10992649113a817a3"; + sha256 = "39abeb3c9ae789fe9299ae2595c377428162d8a52f5e29eda6c06aac92ab6720"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/en-US/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/en-US/firefox-158.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9549b054ec4cf85f50f6a19d8c6fb79580312e71ebc4ec2cb217ec9af09dc12a"; + sha256 = "dce45470139242cf294eb6ada3d192a9bb334696842b02b71ade448a139eb41a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/eo/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/eo/firefox-158.0.1.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "eea5983c343ea9d8c3dbfe5b2420b17426f0584ae682bb34c8901b7edabf7ae0"; + sha256 = "37dbd5ba11805b60a7a453893af1f71ba63d7017c7ab148436e2a4ca7c77ed9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/es-AR/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/es-AR/firefox-158.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5b92201a1b85ea8b5ac8e1775186aa1111f726f49be2e3e13b90ed804f0deea4"; + sha256 = "120d54d9d354f4d9138741e133077e6fe23387353bfd8c548e8d9304e0a72eb5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/es-CL/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/es-CL/firefox-158.0.1.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "906aed69aeed503c623e458179ee8bc01ec0c1a8c7100b64ca98bd9702921cfb"; + sha256 = "7b4eb790c79857d7a02fdb03cfa3518a383fb1a48a00644ff460174667c2a5ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/es-ES/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/es-ES/firefox-158.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f173b416cb2e69db3e3f4d90c5c50ec688fd6de265d3061438d0b193a77ddcb6"; + sha256 = "bbff16bfcb75cfaedeeddcb079f5586b543306c63712f8691a28c9d52284a299"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/es-MX/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/es-MX/firefox-158.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0c673a694c7319ced948c3dddb8da7749af89c8546ee5452ad4abef95f4d6c70"; + sha256 = "6efc2a3d438b53f378f07c6995858833ac277153ef71744646211570dbb73b51"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/et/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/et/firefox-158.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "46e8d1e61b06542311678723c1b1426fc38b5478f9fd498d506abd05f44e64f2"; + sha256 = "aeb639b920ed2930747dbd315dc791cb10799ed495a8e20c31abc35f1dcbfdf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/eu/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/eu/firefox-158.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "46214cb3760ff06e9cffabef59c0b448090cea81345e846ed8b027e8084dd158"; + sha256 = "edd92ac527c909b4bdd73207ba82bfe5ee765daa09238b3819c66a2cb4c17079"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/fa/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/fa/firefox-158.0.1.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "55f8858566654f3bc71f163af379977274643d035b2841ea545f6a5a47306aed"; + sha256 = "ea961c1e8fd3b2e0b4d165560913f09c31859400a245c60a69a7e62c831edcc1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ff/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ff/firefox-158.0.1.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "bd50c106476d53b2544553e72384d60ca6c276704d5a8353108eb6ea92e0fc67"; + sha256 = "76a0bab3ac71e548374a81cf77cb09a23d5f5c626348ac93d2cf38a56d9da2f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/fi/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/fi/firefox-158.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "310000299663460f1e205f8265085245d520a777dbb909d0e493463f84ac31a7"; + sha256 = "95d2ad075a7e18c3bbbb1edb02710abf90b2463df555e6800fecdaabff8c145f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/fr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/fr/firefox-158.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9d0faedf5f8d5f834bcd5201fb293297060a46bc8ecaed1452608744fb1e1422"; + sha256 = "17085ade05bc446d0e32e9058869cb03c1fc2fe92f5faab9e5ef93f51d1d13bf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/fur/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/fur/firefox-158.0.1.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "b6f304315e11fc44cf7e4c181ff35b59fc58a1813b58e812fed6ca2e60c34e93"; + sha256 = "ad2114c05571fff958125eaf0dc178b4795ac401aa43b91569522c2b2e3ad56f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/fy-NL/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/fy-NL/firefox-158.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1ceab81331492e3e962b593065aca697e0e6381ecaf4e30c79170e9d78ed41d5"; + sha256 = "d16c2ca7cf8f37b70b7bf39fd9654f4fa6a42249dca15a1487496db8ec7a59f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ga-IE/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ga-IE/firefox-158.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "42502cf7b90bc1d30cdc5da8b04e8e96e4639b79cda6a529252ba935c54cd2db"; + sha256 = "a0754f9aa00f3ceb885ddfd04eb333e0d59a45970159daeb11bc9bb2d62200a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/gd/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/gd/firefox-158.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9ef213d3c48c73a04dafa5b16d6a72a2deff1ee1b263d4a5a9cdc365e216bb49"; + sha256 = "6549516172c97d60675c53da7b5ec2786954efdb49882174264aee57fbaa1495"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/gl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/gl/firefox-158.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "1b41ea37ed5fafbe4b0e90e57a2fbe16fc1ab5ac9cf09c71a4440314b66d17e0"; + sha256 = "fd2bb33c9ba3e72d68b71dad502b5b836da86ee684d6f50b23c5ed89a0375c00"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/gn/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/gn/firefox-158.0.1.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "e0d60fbf8f67dc9648ab6028bc89b51ed2c9bfa8c8cd3723fe9a99cc3150c076"; + sha256 = "97aa57b1604a19e99277b7556940d676333ddf94e7c966578c76942bd3d19fad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/gu-IN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/gu-IN/firefox-158.0.1.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "349f53a3f22e3b9ae7550104062f84c90ee0980eeacee630ff834a8752f7a402"; + sha256 = "cbca4a06fe9775c6a2154e339ab466c2be74453e3ef76c7ae40c44257e5c30c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/he/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/he/firefox-158.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "43eba81495839f6e4d5cdfaa3fecd218f8240f578a05a1c52b37a12cc4f6df34"; + sha256 = "b29e2704df0cb3eb80105b2158a4b1409007aa172b720995c53a959d27193fa7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/hi-IN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/hi-IN/firefox-158.0.1.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "c950d35a86a7d344fa8a31e45b299d16ed5b9d1f3fe4f80f97b5a512b80dc293"; + sha256 = "bfc28aac045c4195bff549868747e6a5606ab6b193bd36f38d02b195cf6172ea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/hr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/hr/firefox-158.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9c6e41801b32147279a07b7b0c0bc0840036c1b3a94c3ffcae6120009bd8d2b4"; + sha256 = "bea19fbb2ab55b53203fde20b382238362845a1ef34998e4934efffc8352c67e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/hsb/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/hsb/firefox-158.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "62a32bc6a5ff66e7fdb0e8740bf04f107e5c44c5028dcdbbf593ef3c460050ab"; + sha256 = "7351dd2ce34ceaa1a62bb2c6e3852741a25e606ad0c86fc359f850b55c908e5a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/hu/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/hu/firefox-158.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8e3bd71581094b3c2106fc1d3aa5286c9e2da1f841f1dc7bab6ddd4a18b3a9c4"; + sha256 = "613d0becc659ba0f117731334778a68c542e6d21917104308a472cfcabea549a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/hy-AM/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/hy-AM/firefox-158.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3b07d6b34c5ca8d78ee29c41698eff0a89d0a781847f1a2cf447b93640d82270"; + sha256 = "687cd6aced4602bd34bfdeba0a0245828d11b3038f487298f7f9562b5ccee189"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ia/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ia/firefox-158.0.1.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "46d5e33ae28fc46bb57ca44d14470f1d9ff9374428c02eb172ce3a0aaf961d1b"; + sha256 = "8bef3e0e77abbd5161af15f10e8bb097db291a093aca2ecbe71bbb2f8fb5bc15"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/id/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/id/firefox-158.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "99a9d6dcd0a1fd118c7ad3af73eeb1583dbe2d003dd51cf1a2d504af5351c14f"; + sha256 = "8c8561b2b4e7f68f02e97bd67b1c5e3fa11e7cd4f20a8bc5b4155af71b311b63"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/is/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/is/firefox-158.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c26934c3d9f2a387f5f0a1aba22ed208b4756761f6c18b4e98008b0ccb22dd95"; + sha256 = "156cc74cf921608c3c9915faf580e2e3019ecee02d71e73f0db8e9e6a37051f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/it/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/it/firefox-158.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "10c9cf654b4a3d873d73c6a8aeecbec6835e1f8cea6a0e7bac7c274281af30da"; + sha256 = "378034a6787cd6d9f8d126371c7a222daea827f7ed508109101f7f7f7589dbbf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ja/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ja/firefox-158.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3e219c82f764876a40bd93f269c4ce2e747c09c4ea02cbc00525cea4bc791e34"; + sha256 = "0a2be4da0b0ffb8d5e0072bd9b5e75fc44f0c989b48b73a35ff8061ef911b804"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ka/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ka/firefox-158.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e29e2aabaa5c9a3669f24dc796a8b7186f1b85546bc95ba361054015c73454a8"; + sha256 = "889adcf259dbf6703538d1186d43fbcc2c11486e9df61867be00e146c5e3fc18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/kab/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/kab/firefox-158.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c019146a3e82c733818b0fd24c3b3d61090cabebf8cecb12584b0a100020ee92"; + sha256 = "5bcd20606630fec490fcb45c053e57e2bb253284c9a674a4c9cae6632a234954"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/kk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/kk/firefox-158.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "39c494777038a43a5ae0f7e53a5572f0f31603224ea2c5498215874e6f599c1f"; + sha256 = "2d9c9e97bd1abf5e3abac93f5bdae6c7be9bd681622130386b0369c129e648f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/km/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/km/firefox-158.0.1.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "83f6d08d7b9d661e08ae9e26ab80ac182264b0a35784351e8a103e516c004175"; + sha256 = "4906edd324aa864bd6b20c035b63d83ec29357ffcc7c8e4ed5f4dfd9e579e615"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/kn/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/kn/firefox-158.0.1.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9318e9af688e4cba347596fb237b997385bbb68eae2a7ba583cb887ca38a3ff5"; + sha256 = "8370b5bdeed325bb623af792fd9365364d037753135ae1ba5099edb49cfc26f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ko/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ko/firefox-158.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8328897c65c7a9b6cb7ac61f18a916e187e82b6f7a5520416d450cbda8300650"; + sha256 = "6617918eab3e43b6b4247e53fc1757ba61cbaf769fee65a18d17229c0ec784fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/lij/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/lij/firefox-158.0.1.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "5550d0f59e37dc9dac3231c57aa1014be1d1037df4780bed6ac47d62430afcdd"; + sha256 = "fc2148c91b7065ca3ec8b2cd1a13cf5d5d17cdfc4206ec5a399a7d05019b3452"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/lt/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/lt/firefox-158.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f25746b796a60b9cd81bdf68494a9456ec4ee4a5282ab32ff24634944f4989dc"; + sha256 = "29ba2be1441eae44373e3a0de3536a9baac61fbf34327a1fa9fed56502d57a2b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/lv/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/lv/firefox-158.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "86c241f8857e1b59f21bc4989b0988771ef9871409bf41711bcb5186dfab3309"; + sha256 = "f64be81bf69e3bec8f726f91d6db278d807fbef8e6f68cec07748321e892001d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/mk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/mk/firefox-158.0.1.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "de58f9c4cf672509c57926d61f324111c8d05d7145cbeea26a9279208da83522"; + sha256 = "ee17419a8b3876eef23bbb4e70b52cfa442174cc5cca957ba64e0793a10ac3c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/mr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/mr/firefox-158.0.1.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b59686d4c9eb630559efbd28dec9298a77598e8255cdf45e2bac226fbbd8b89f"; + sha256 = "e22a06a9f7bd960f330e05dff6a5b3a258984f8b1b2c0aaa5ea4f8bc9e4023d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ms/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ms/firefox-158.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "5ccad9e4f13c5a07cad6031804ff17850f9e3559fb4ed4b08672810396d56add"; + sha256 = "1d1dbd564334799c75bf3a4784346d83219ce0de985e66ad786c1aeaf239af65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/my/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/my/firefox-158.0.1.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "78e7d05f34d2be2637bd7fc5ba455a3016ef3a919b3f7b0964b169e17f7b69c8"; + sha256 = "9c353ef153526d0b2eccc4f8f928d317a5efafa9efe7ded03180db02e46f12d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/nb-NO/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/nb-NO/firefox-158.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e4e4e5333bf4a5e7aeecb57c5ff3d599b52b2004489507ce94a027bc0181ae34"; + sha256 = "b05251d36518ce068c859292097d7f1e25a47274c2be70ad87ccd81588288c2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ne-NP/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ne-NP/firefox-158.0.1.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "c654b9848f391b2e89f00960ef87a288e4c37bc7afd618d4e933e6aa5c2c382f"; + sha256 = "17a37403c4a0cb85d3698ceec51030e324a629358fc62a4f0d088b94574d16d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/nl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/nl/firefox-158.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "305bb7fd702d43aa7e806716aa69ce678026f75cb82684a304e12c8320183528"; + sha256 = "a58aaad60110efb1ac30e404260fec53cf8a04e430c8b1e0b7db61d61e092182"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/nn-NO/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/nn-NO/firefox-158.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2cccc0b4cc6b0600bc2d5558fd027a1c1fcc9e896c22bcf38fcf378fee5a73bb"; + sha256 = "4e50a859e2002f201e5d4794a5e8ede0c282f501838d054270de62bf84c239b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/oc/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/oc/firefox-158.0.1.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "1f7fdbc060ca86fa6a5f70d1d81e694d476b2976036b94aef23ed53cb143d657"; + sha256 = "5a5435ba459d8cb14267aea91a7056b8a41fa68b0cf20d4682cd86702d425818"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/pa-IN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/pa-IN/firefox-158.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "18f35ecae27802a0426ec889823d4e106af11d87d5afa9d993d778bd017adc10"; + sha256 = "cd7ac183e870e8174bb6ed2272fb376a06cd806e53f265f9614d45c114d46f0c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/pl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/pl/firefox-158.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "36d740d530c9857a92ce2ca9bc3d0eaa78ec22202227cab9d805a46d77bab4d4"; + sha256 = "7aa6d03dbf6d17dda73950d310b1eb98e654a907d9f4fb5f1739bd0ce89119e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/pt-BR/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/pt-BR/firefox-158.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5934594cd6bfa0892fb17e1367fd7d1c6d34bb4adfe14399539df4a43d32aa80"; + sha256 = "e87c1a263d5e8e521edb1bdb11ce0c78ee069c71a94b78c4b1e6000131bd9192"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/pt-PT/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/pt-PT/firefox-158.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "69c42b1ca0331c33634bdf45a623132203c9de28f3c1f69f897b807716f2d6ee"; + sha256 = "8a2da897b77e6706751da89f38b97e59e06e76855ec2ab84cd6d81ebb5807606"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/rm/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/rm/firefox-158.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f4dc48a91f0c260b1c4edba37fd3bb276c7f95cc99b247793d97fc65bdc3bb0a"; + sha256 = "2f671c6f698913182f2603ec93c8f3051747c1d908b50a0e4142ca412898738a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ro/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ro/firefox-158.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "43a7574391290b30626a275c7c19f6beeb6d86e4c3a378f6fc4bf2fb36ab7fb4"; + sha256 = "c2cbda3dbecc17903c335c50d2f441551d41e3df68aefbaee2c7c59b258d85b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ru/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ru/firefox-158.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e5f3c87576c8770b34d328ef282f91f3325d5a16f54ccd3e89d89b05472dcbb8"; + sha256 = "0e0e500d1b3e54dc9873d68a08690ffdb391eec0eff8dcf45819f6e08ac5e2a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sat/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sat/firefox-158.0.1.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "505e1d1019fd36120b42ec34b72a5069e77ce09635293c8ffb456f212dd75c2f"; + sha256 = "beb1bc2d95b63bd955220150528faf7bdaec8667b97f3952a61c996ec87dd71f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sc/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sc/firefox-158.0.1.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "f93441670198a01b3ee17238e7a0717bbc1b947737aed3513989fa3dc4300564"; + sha256 = "a71f29b3298fe2241be38a591c37c55d64f6cc663c46f52a6e150b9d22269b40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sco/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sco/firefox-158.0.1.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "25ffc4456eadb5c843e305131eb6ad4292719e733032c7db923b184f026f07b8"; + sha256 = "2ff78388a1091e0259d55ceaba069912cf345e53a0201502b50acb403a76cfa1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/si/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/si/firefox-158.0.1.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9de19f3b40f64d1b9d8b96b2b38255f6cb01a74b449c65caf9a128940b239273"; + sha256 = "65e3cb1cc900feb842764ee1eae6800f6870ed1b43e41ea0f0ef0c0cf8b03324"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sk/firefox-158.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d14d8e88650bfe02a6e82ad1eda56ec270e1f4b00413ea6233373509577064ed"; + sha256 = "22487fa701a2737a56b6d3f305384e5acc4d47344edc1b1386dd96bceafc5c6c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/skr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/skr/firefox-158.0.1.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "486219f64cb1e493f745547351f13afd69bc5982141f2609957cbc43d09a61ec"; + sha256 = "de7d0727537ccecc0709f1256edf54169e2aac743f783cc0a5f90dd15b3c968c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sl/firefox-158.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0507d9152ae085eb8599772900be265faa53321535d3e715dba86bddcaa6d574"; + sha256 = "9ef20d1baa99476b2cf36290f4c97276bb11a80fe698845f1bca8b068845d03c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/son/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/son/firefox-158.0.1.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "59068ddb4be9d6c11a7ddd1bbe74fddc14af894f0a1a479e5ac07ecf94f22ef8"; + sha256 = "37868a1ddb4ceb87daba2e4c89c9ee1278516b69924994efbd9543343fef703b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sq/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sq/firefox-158.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a84f4c8f54ddbf5f700e8fb0c1761386a8914b913cb8acf36e4b6d952fd5ea07"; + sha256 = "1c1950dc156c2a495b92a03b709746d0063391577c4e692e57efd8a30bc0b0c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sr/firefox-158.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "03a7b67d302b4aeb95fd6e45ec1b5e2ab95e11c8ce906ca33e0e9d6d72c54b98"; + sha256 = "0beeade0e9919d8204d997fc85a7d21dcb9b4f3e6aa700c6b953a489252889cc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/sv-SE/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/sv-SE/firefox-158.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "59cdb99a24b8e9613e4ffd7b93954a83f0e10ca5b34f90ef03c77e4bb5195377"; + sha256 = "1aa87ff3373d94f0157a53c6efc20ccd55be05d176e3e78d21e52abf878ae141"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/szl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/szl/firefox-158.0.1.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "19a46ed37d5803d57b8fc627314d8b8c8d29bde029c85310fd24f855ae33fe03"; + sha256 = "46d572f6c6759d50a35e5fd90cd014a2f363abb6b4fcbfc926d41aee5249bc43"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ta/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ta/firefox-158.0.1.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ac7a4ecae8aacca387153291e76b48c6565508939d0cb8d83d165153969a6326"; + sha256 = "25927d799d1b84d6020cc2933a638bbf9924fa88288ba2ffe5f5fc742a963277"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/te/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/te/firefox-158.0.1.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "86bcd3ded111c487558622d64997dd42bf8c88f0833a71896adb6134ae3f55d5"; + sha256 = "8d8397c3b76167a614a5de9d039e462a306a2caf2c004d8e540d225f7137bc8c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/tg/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/tg/firefox-158.0.1.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "8ae4440623b1f6c1f584b740f81512e7b197f2d429a48560421c90674d17079a"; + sha256 = "f34941fd616c2bd6bc7bffd3d4ed607e52805c90e9730751ed339541e84b586a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/th/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/th/firefox-158.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "25a8ae4d0eca216cfed0a42472ab28b8701be16dfbc11128a6da3d21cd417bbd"; + sha256 = "c4cbafcee81eade3eff805706bba6866589cee79af0d8454eeb2ac44ed3e9a35"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/tl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/tl/firefox-158.0.1.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6f11830a678b490aa77c99e9b10a5d84370ec5a47b931ee853af918fc78d7c56"; + sha256 = "dab27c9eb8a78bcb44f5851cca9ed3f9f6cf9b6693c4ad38a54ad7531a2fa284"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/tr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/tr/firefox-158.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fd4d23fddee7ff18910fcf123d110b4848c0077daddfad7b088cce2da8124fae"; + sha256 = "3de87bf6ad8b2b12371f79a61301eb7cc1a14072de96eff787c1fd01f220d305"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/trs/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/trs/firefox-158.0.1.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "67fad9a1ba3ffc51fbf1142f64606599cbe01c545ceb331fed01ee0fd3c4164c"; + sha256 = "1833e5b0328d6b7fe5b87aed341382219420ce197a1a9c0d0885e896ac64231c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/uk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/uk/firefox-158.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a44739bbf5e49d7b5eb618e9eec0963db7ec2c374736f99feeedc6b7ef667866"; + sha256 = "c7d19d63dd288ff012e17af8822202cd1e9e702d34c853307eade980023be493"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/ur/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/ur/firefox-158.0.1.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "c3d1c3263579110ab193a78647471583a80fa04c0b865f051ee8037a37d2d548"; + sha256 = "8592b04251fffe890c27135f3d73397e24cfe74991fcf76b4f28b7180dfca370"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/uz/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/uz/firefox-158.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7fe624b7d809553bf450012759cdee703e907ec4567b617289be550c789693e2"; + sha256 = "fbd06d48cb843cb33af267289a0afa9cafa41cbf5c663ce11c9dfa2f751768ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/vi/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/vi/firefox-158.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4e7be1775f9b80bad7ccee7dcf37f257d5f4aa41ce173bf201802e5a5f179313"; + sha256 = "231ec68d1136588ab2e2267d8c5d664fadb5a800534435aaf1ad22e80ed727c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/xh/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/xh/firefox-158.0.1.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a0efbcf97a4366ed726b9245d239c2ca60303f859bce3a854d5444b1113b247d"; + sha256 = "68e02d5696f3de1a0e36eb1f9b13e33e3f7591c8535f0eb6fd598d1623cb3608"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/zh-CN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/zh-CN/firefox-158.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f299e914cde3290de0fd1740e6471a28ba50fafb4f09526a85138a7dad97a867"; + sha256 = "513b2a69870cafc16d43d035dcbe2ca1b2f384a59c25424f002e0e3b72663b4b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-x86_64/zh-TW/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-x86_64/zh-TW/firefox-158.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b9a77289c22da50dd5e0b72e41e0377d237e7d22d3444d4e39eba23950b06627"; + sha256 = "c3d8bd0995aba998c34a29d0ee77a46d8d286f639ea06ff3358486092117a5b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ach/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ach/firefox-158.0.1.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "b5069cd47a057f683d760041b462fd5bc9b8994df87815d448614e35819aa198"; + sha256 = "a5b548fd934805c8ef1265e75edd36e616f8ac828e41c9576596cbd5d16cade1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/af/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/af/firefox-158.0.1.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "74cfe47102bddcc8fbeb5bda1de26e03add881cd50ebb5595db63259501c7fb9"; + sha256 = "bc47247a8122d6f94113452a81041aba7aa7a14465a339597e8a5a9064768d25"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/an/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/an/firefox-158.0.1.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "dc2ca3747d3c6bb3102cbd3ea2e38c96f43ca5f858c30ba0e5883660c1e3628d"; + sha256 = "5d104191037b6cd1cfbf6b96da2ac72a8adb1c2948f38d61d706b3296d1d777d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ar/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ar/firefox-158.0.1.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "e0249575a00fa85fdc2c08627caa18342ea1f8e2f487aa9dfd153d21f3ecd25b"; + sha256 = "95fe416a0549b3461b1e72e3fd625e11bbc0b20abff689373487713c3819aac8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ast/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ast/firefox-158.0.1.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "c560b05d982eb9775668a7c35c9aed626af73e507303d6042375031f56b202ca"; + sha256 = "15c0fa50fa82e1cc83c3efda290db07f8268cd35f5b0d023bdf96826259772ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/az/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/az/firefox-158.0.1.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "c9f2ee1954b0c264754633cf4a7f77586db82ac0602263d60510e8f8027b2c17"; + sha256 = "bd7526f7f1a17b52c38a178882944522a81eaa43b563e71c2c87099d4f39762b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/be/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/be/firefox-158.0.1.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "53062d78083ea3ce9678125cb6e72e77504de31ce60aaf853800d4eb73601d1b"; + sha256 = "7046fbe6af0172dd693b969129e3f8889c791e66a36fbbcd7d6c13cb75f69bdb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/bg/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/bg/firefox-158.0.1.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "2fceb230a178387df71d7e8f3756b23c3a07cb9166b2c0199b12e96174355ec2"; + sha256 = "6f6a4ff6038eaac02113acec5d7ab29c039d19fba4be0ccaaec2702e7f6a95c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/bn/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/bn/firefox-158.0.1.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "55477333f671e55c416bf4d1993f5ea9f62ab49fa0af21c248ce43180b367711"; + sha256 = "9830d0688b460f958b36b58a4d56a573d64a91b74a06414b33090914a8d675ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/br/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/br/firefox-158.0.1.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "05d65b22414a5acb7fa3ea494863ecc91c32304ebe3acbb4fa1f9e383c047515"; + sha256 = "725b3edbb50a8bc87734e945fb7ffc3ae836dd265b535599e3e758e59a7ef4a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/bs/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/bs/firefox-158.0.1.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "537a678bfb11e35ec8c02e513b95f3bd638b37927a5dc3586ebdd841a25d3efd"; + sha256 = "2d7a6ba552648c6948bb2faf829dde3ddbbe1c381e43241fdb7c586cdfaac9c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ca-valencia/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ca-valencia/firefox-158.0.1.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "15bd846a1f56437a05d0ba9346b76f1de27b6b98a66ff9f7a44aa486cdb56da4"; + sha256 = "1f280d8e4341cb94aa87618153d091cef95fbf5f7e3661e65061b8d6d4a7b56e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ca/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ca/firefox-158.0.1.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "4ae4f921905870868bf4222692069f49daef478612fa0ac88fe329ab500e6ef3"; + sha256 = "cfcbad0db6b9f56f74cb8d72d3c33b6c27fee32adb3a5c4450dad796596b080e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/cak/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/cak/firefox-158.0.1.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "0701e7fadb962e11e4f4831a6e66b3c3848578ad1e4744b5f593a8907da6395c"; + sha256 = "ff3f3c0a5dadd5908b74c8656632384813347d0c8e118fb4ed8d3dda2c1d647a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/cs/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/cs/firefox-158.0.1.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "66d0ea98dd23f86ae3cb9624d622ab1013e3703932fac6515469f8809c351d0f"; + sha256 = "cb4155ca946dba38a02cba3eaeade71a195fe4f3c203428b1c714a0b102f3087"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/cy/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/cy/firefox-158.0.1.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "2fcb4ec80408292c3a1e94dbc8a051e930af126cf5f4f094fd222ccdb2f1c1eb"; + sha256 = "355e7ff278dc8bf4dce116b9e9963baeb68ea50c99896c6c5657acf284a4f67b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/da/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/da/firefox-158.0.1.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "822463307a3d2fe3072a8285e969282382406e4a867238c760a9275780dabd7f"; + sha256 = "18988b902514037d497e6163ecda86d6c310601103c5ca452fd0310aadc4fac9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/de/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/de/firefox-158.0.1.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "b228139d7e475190e4b868c3c54b74aff2c3f9f4f254ae14d904b17aed878130"; + sha256 = "78d4eb710ea521f53fb07481cffe7294aa3f08073e5c7a9a93df9c4dc5980e23"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/dsb/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/dsb/firefox-158.0.1.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "f85c06314ad32de635c8185916a8dfff8c604de613e9820251434c069e371f49"; + sha256 = "41dc784b4404661a8c083a5b26525f54beb55d7604613d2e47b4ce11c7695470"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/el/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/el/firefox-158.0.1.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "43aa92efe8e208bda9c6403912fa0f791dc401aa85229bed09f9e07152f80357"; + sha256 = "2eb01aea66f1607276087dc330254eb48415d39e9957cb05d673e940973acf19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/en-CA/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/en-CA/firefox-158.0.1.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "1fdc7f33ae9fd32f3db1b3fb147c587f6599b064361cf0071cbe0a071cf5fc31"; + sha256 = "f4fc230ea976450abd57bf11a42414f58433940fb3ce1ca56d86ed4aa1f961cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/en-GB/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/en-GB/firefox-158.0.1.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "e11e2cc09ac90d32543e207f6b87a9d8331373068c7648625f3550d9675e3219"; + sha256 = "3b0407b1a9a7af63940539ed13a4e4e236a62c5644082069911e6397415915f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/en-US/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/en-US/firefox-158.0.1.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "ad647ee920828da7495de7a5f3eb5ddad457b107e4932b3fac49ce700bbbb2b2"; + sha256 = "7f880a6607b9608fc35f8814f7fbe7163c71e9680a8d3c0b27f35ff2fcfcb653"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/eo/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/eo/firefox-158.0.1.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "dc1e2e78cc0ac81e2de1d6a3aea06d4d7cba92534c4cdcdc62374a9c5c0b47c0"; + sha256 = "2a4722bbb625c01d8684caf856bdb264e88ae147667892a1036ded42233e3cdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/es-AR/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/es-AR/firefox-158.0.1.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "26ba6dc0792a039d3bb742a8f14efcf4b7c299fb0d2b394c787c3c5512405bd3"; + sha256 = "41742b5110de27029a6f4b3364a4c722c807636a4f59160a7009a50cdf3119d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/es-CL/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/es-CL/firefox-158.0.1.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "897ef1c7fe2d413450aa8f6003dbd32ed0bdf172da6460d7546c472a27775ed9"; + sha256 = "7c8c7467cf8673850cad742c63dc4e10935408f5969f14e44a58b047d9512099"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/es-ES/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/es-ES/firefox-158.0.1.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "cc59cfb0be5daf2ad296c03b0ec218fc6f55fff33d4cdb8681368e3d311e920a"; + sha256 = "c72252cbdc595c3c9d394dfe298135040d6eff0353fe3adb0fd2c24527b6b4b4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/es-MX/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/es-MX/firefox-158.0.1.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "503b5cd7deb50238d620ec09c1b38f8b2b6dc440086d9201fd1254eb8b5ed35b"; + sha256 = "4dfc9b90fdbe9073ba638e00cf59462d9c0e2341a9495a2bd134689cb8198ca2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/et/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/et/firefox-158.0.1.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "081fce01bc484ba3ae5dde147879faaf453ca523dedeba06ba6b1af080da5fc6"; + sha256 = "132bd8fbe9d48f2ec14f9ff0e6eb926246c710ca9fd2fc9c6aa4a3a48e92338a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/eu/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/eu/firefox-158.0.1.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "222ffa445d8783a4a0f25a52f2e87815d7b389a757d71f26823fbe8901abe54b"; + sha256 = "88b2de6ad5eb357e0ea88de975f67244e96d13ba8155456fef29e6cb2e65ba31"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/fa/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/fa/firefox-158.0.1.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "783b335ace15bd348f1a95f10bf33f70f07e3091f2a99dd04d021762e1d532bb"; + sha256 = "95e37200e7da8f6a1d0310e620da211def68f65fcdaa1891c3006e88982232f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ff/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ff/firefox-158.0.1.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "5ad720bd4f592ea533ca1a67ff1cce3e6daaf3d64dd7d5918f3f2ad2ffc0250c"; + sha256 = "8eac247fd1e7fa9534c698fdfcbac039862ae5eb6531da34cba9352b462c3817"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/fi/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/fi/firefox-158.0.1.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "434366dc806cd334662b2499464c488ea17b70e02ce9b513c7c040605751dad1"; + sha256 = "e5708c82498e35559813e1a5825073ae53f04b7a470364810a9efeb17b239cc9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/fr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/fr/firefox-158.0.1.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "ba231c000779f371c8d0081eff896d26dd0ba1669f4dbd697fefd5fed02e9a48"; + sha256 = "160a7d656b5d9a1d6c9dbe0e776104fcffdd9668b81b653e20b42b62dd853160"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/fur/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/fur/firefox-158.0.1.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "55968bee5e58c624cad04f0212be76e9d97ee0a23d33dbc309ab6dd67b34e1cc"; + sha256 = "ade8e941bc39c8778181383bef851830437662ddfb77fbf972de200b82234eae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/fy-NL/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/fy-NL/firefox-158.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "bde62c6099003eba0202a54adace1446cfbad97da67ad0c68d816fd9ce2e555f"; + sha256 = "eef8ec5990f29d9acb0f7d1342bd95782917a8e620fcdb4631afc0f5cb7ab544"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ga-IE/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ga-IE/firefox-158.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "5465df8c0bbb1c2777f4bacfbdb484a5623beb1996ec26c1d28cf10988c7b9ce"; + sha256 = "3e9864e2b6f8970f0790319bccf8cf155c3b84bb001715a82b1ad8cdf0aa3f51"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/gd/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/gd/firefox-158.0.1.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "74f94d9f88ab08cef069a63f355653554ecb05b82db8b65da69715f003322af6"; + sha256 = "044f6bc92420910474334291b5295f1fcff4920c4416da94e4498f7874abe329"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/gl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/gl/firefox-158.0.1.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "8e98289da63305d80393a379767c8894dd6463f92079676e5fac226922e7a459"; + sha256 = "581e0219ca30012f0c83e9ce5765a1aeed57f2b1f9bc24fb44ff0754aac6cdb8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/gn/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/gn/firefox-158.0.1.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "3fe23342fec384c1c135380d008cbde0ffe77582d695a7585e70a2f3b210ed54"; + sha256 = "be5faa729e9e908c3aeac6886ac38424751f37c044751dfdd203949f9ee7c076"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/gu-IN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/gu-IN/firefox-158.0.1.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "3a8ae08f72a75bdbb2a361eba91591d8f8715319e06b12efe1a2e6faeff801fd"; + sha256 = "d85109bac4a3ac579153a947f3d54ef93f463474abcaf02741afb405bc8d855c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/he/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/he/firefox-158.0.1.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "aba3e1458e79e8c101efa0cb6dd121e79680823d8049459d79b981736eab313b"; + sha256 = "c9208bcf72221c6f639fa5fbde5554d480c33f62e2ff26792a6dec2f19466aa9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/hi-IN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/hi-IN/firefox-158.0.1.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "6d900463d8ad5d999c30ca98ad19c31371266a1e77284611d1675230b5c41604"; + sha256 = "b92dbb1062f758b6f5439f951fb03f2b4e059ef73b4fbc55f086458228753402"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/hr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/hr/firefox-158.0.1.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "44a41eac2eaa5a34ecae27dbdb6f14c6ad49e2aae10c83cdc369d21fc9dbb38d"; + sha256 = "77c6a0c43e0e8d0bc00e90bf9f93509f3d564146be7a703fe4ac774539a87062"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/hsb/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/hsb/firefox-158.0.1.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "70e816d5a61499e71b7cb7b7999e455511c866ffe9b849a5c7c659d7c93b186a"; + sha256 = "634d3474b87c253e0320a55492d9c9e5675ef7958f1000e23dbb9b39e958b7a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/hu/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/hu/firefox-158.0.1.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "e0dacabce04a8230fb64c2c8907129f63db34c627d06aa80d421951d25894fa8"; + sha256 = "e0a44962aac3740d760a02d551df7ac741f9bd0221b0f623fe29601cdaebaf68"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/hy-AM/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/hy-AM/firefox-158.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "0074a22d0f86ee1286eed3562932fe6289386a349fd44c8408d844539db5b8f7"; + sha256 = "374634b2c9cf1c07ce3c3bbde673abd6406789d5c48f900db9c4ed8f5d0ac342"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ia/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ia/firefox-158.0.1.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "3b304443e1a13ce2b24309db8647dcff478286c9dad482c3cd7214f4f110ca3c"; + sha256 = "acef8ccb5380f8567baeb91b9eac27685464f18490b66116b867d9f8dedc5e57"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/id/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/id/firefox-158.0.1.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "7982fcbd806cb9759a22a2ac6bf9deaa6064ca5044c2f1b658e263412f609ce9"; + sha256 = "dbd491d5ecdd289dfbcd2da66a64214814ec722122ae212325a3c38ebc9527d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/is/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/is/firefox-158.0.1.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "f6de9e7dc4f9aed50494bbb92796939fbdfb2c63cb7c39aa4b9ce55c619ad1a9"; + sha256 = "e8fa452ca95d301ddaf9f13e0e3d74e6713a2212b207d29763e2b2d89858553d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/it/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/it/firefox-158.0.1.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "fa990dcd031374d9c97b2d8a31ab351bde14140831748a6a12d551a447a955e5"; + sha256 = "fc549685be37a015a607a90e75f7ce8cee5134a412d3cf498b684c0dddfc584a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ja/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ja/firefox-158.0.1.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "69297b013f992c58dd1960c6c161b9a8e5c991bd33e0327f38640a1052cbd545"; + sha256 = "343d6011b52a3a604d1dba851a15a3ca22acc47be69ec90313052571bf1833a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ka/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ka/firefox-158.0.1.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "10aff50011a71f8c71893aeb34558b77be5b512052a67db27228a9ec700841f9"; + sha256 = "7b39c1c2d28b4f0e8d4d2f13dcf1179697a95597a2f1e90796e30413ef1e8d45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/kab/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/kab/firefox-158.0.1.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "924d6488651f73d269fd69e7fc7617734021be3f01d81d30189421a6713575ed"; + sha256 = "53c03429f58530524800b409cd19f86d1f8688ad2db7e40309164dc303ef0d63"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/kk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/kk/firefox-158.0.1.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "704105acca72453b5d898f50bab40b911ea54e285144a3ee6f2449b9d132d873"; + sha256 = "01045f191eabd7b03b7e9e53eeb23385823bff324e2eac3c8451f5804288d018"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/km/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/km/firefox-158.0.1.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "12c81fefa22b52f2512495793e077ea2b9278852cec15bf07343b13d0e8226a2"; + sha256 = "3596cf57c38062773f794811a271afbf536d9b1125d764e182086f677ccc66cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/kn/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/kn/firefox-158.0.1.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "096c5099a072285c06249147585ff753ed46e38ccee1af0adc00ee852c66d00b"; + sha256 = "f50d0e27188e8b78fa073547213edd6d948cc506b20186843d02ecf952a91e45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ko/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ko/firefox-158.0.1.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "0e11f2deb2a293cf5a03a12d1217527001540b4a903ec4835179d9731df26915"; + sha256 = "6b189c77601f4d9f5979fd12f6200110e6543a172ce501fd8fd56b0242791974"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/lij/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/lij/firefox-158.0.1.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "463f32e58ae738beff19d6120acd1af5e5231207cae6eeccfcee8f05b84c7ca2"; + sha256 = "f0e7dce277ba1017f7a93538769388ed5d5f86e3dd4189511bfff24ac7527bbd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/lt/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/lt/firefox-158.0.1.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "9c841fe5f5720ce1f9308e7a7038a67af876d3052a5122aee962dd146858a17e"; + sha256 = "bc58e2505bc3cae6dffc7271dc95bec04b9a224d5e5200cb6588c22096171bcb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/lv/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/lv/firefox-158.0.1.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "9b63b53fb8b812ee699cf3a31b618cce83cea163e59cd5c549f51d48c8a91f6c"; + sha256 = "66b6c99cbb17b1784d181548e1586ee384ebac207602562da685ac0f390df604"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/mk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/mk/firefox-158.0.1.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "0efa9bb19e3f0a4be439e720988cf4e9e1acc6960fee03fd5d1ed3823b4a5950"; + sha256 = "9af4bdd6f551efd294c525a3dc0c6efab5f23495e2b1656518339c78eeb0af42"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/mr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/mr/firefox-158.0.1.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "b20a9a337568beedcb431d7c6a83906f233e2eac32edf8a832d537e1760b2884"; + sha256 = "c956859936b8437102f7655b3f4291fc02cb6b86456b75faf2bce84cdca40afa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ms/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ms/firefox-158.0.1.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "e471dd7110ce7e0d45abbdad519d2655ec19209b58ba2f8e9e4f238ee9e58240"; + sha256 = "9372995044dbe930dfe5f5c8815053d3391aab639c5cd521a99bba9b066c1981"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/my/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/my/firefox-158.0.1.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "770d18b5ce605b0fb643366f302d21d195d94a7e3762484819e1776fef3f9e31"; + sha256 = "f4d5f319ebd5416c3be6a2cd27952571ab7d9bf273c8eb7392346ee4b406b5af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/nb-NO/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/nb-NO/firefox-158.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "0916b31423eee42c8edffe9584c6a7fd71060ef31bd6b6ba213f7c7de4107cbf"; + sha256 = "92e9a61d47dedd73b14fa95ccc165e78aee032abef24f75ec0d7fe3a6b5421f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ne-NP/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ne-NP/firefox-158.0.1.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "22dde29f3c42ffa8cf38d5d916dc597119bc02e18ce3130c5afc5497ea559194"; + sha256 = "8f3a22bb1e5f227c369d0bc3b1c2f5184f95538482a2699395596284ff310c44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/nl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/nl/firefox-158.0.1.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "8036f955d2b4b614cd48e405ebd5c46ad18d84b2764c9d59ef0a5c9065f4e6cb"; + sha256 = "dda2a1686d7442fb5ae05389dad18199ed07eb8646dfcf0e443cf4168cf247ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/nn-NO/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/nn-NO/firefox-158.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "3d5f4575a5f65a03e7af61fa5244995dd724a7822ad2400504ce6557aba229d9"; + sha256 = "e2ece2e44d742f2783a84ad6102bfcc0b1ae4b537349c46d587c8cafe3416dcb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/oc/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/oc/firefox-158.0.1.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "a195cf0bac93dc8a14e5cf201a72cb573100e12e973e0863d3fde435edba2066"; + sha256 = "3146d5d366931241a00d4420c719c31c5042d69ac0da74741b9e7fe9a532d3de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/pa-IN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/pa-IN/firefox-158.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "98d45704abee8eee208729ab6e71e07f890596341639527ddd41bf2320678f27"; + sha256 = "adb84bace63af5195ab8b23107e48de189a722f4848e47348e2c1ed6e83742cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/pl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/pl/firefox-158.0.1.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "62cd0c5843336af93a744dd7c1306164366dec9451dee1e7d4561feead1432f2"; + sha256 = "254f1a3f6cc3a12b8006a95447e19e2238f6e7d18bc25b0145c3fa5d87756bed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/pt-BR/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/pt-BR/firefox-158.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "5f896ebefa5d67339e562a0786e9395b9b9ce0372a272d6fee41b7890ff7ce10"; + sha256 = "5a8a409049db0563dcca279e2134e64d346b437ce71bd3bf92b6edf40c969325"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/pt-PT/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/pt-PT/firefox-158.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "d4b7545f88d641bae1791a05444156abb0671919db013f1aa613d28741e25a83"; + sha256 = "8431c8a7fb0b3057b0d018ffa77510d6a973fbdec14e2c65968952651c42682b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/rm/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/rm/firefox-158.0.1.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "a41637e655c687ccf54e3169b95b519f381cdc9acbfc05c314b55275aa85822a"; + sha256 = "f9c22f9e19a7d7f2ab091e06665b546ec990f90bcb11bced3ed701be2a1685a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ro/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ro/firefox-158.0.1.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "83ad239bb3f10939dc193d7c0334efbfb3708a2c55e67778f9239674ecfcd5e4"; + sha256 = "8a539d9da2c071536b8b5d33dab6203af9ff380ad387dd85b9737b7976c6c961"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ru/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ru/firefox-158.0.1.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "c4f19a3096efc6f720c27b17dd2f1bfadbd57a6a8493646d6c746c4ce68a220e"; + sha256 = "1e394117d36dc9e38607402421bbc635af9bdb1ae34172259837fc14eb189357"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sat/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sat/firefox-158.0.1.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "ed4b1e80836e224533e0748e17b06682fbf606c73a281fb42dc3598bfee7d9e0"; + sha256 = "9739cbe109569dd51d736dc15722c66bc04860b783317c18fca968b4c2e3a86a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sc/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sc/firefox-158.0.1.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "259a08348107b7d32170b5ea43f134d1bd1fa9aafeacd6b5d0a5606f61364626"; + sha256 = "bb9a1fb842d426c5c5d0a12722881757bff873979f5e26f3d267ef44c36d884e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sco/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sco/firefox-158.0.1.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "10b227429851157bd381c84dde5fef156b6d830e2862b95a3afa7e54084ea3f9"; + sha256 = "427a1a142b2be2329a30f62d2a875dfd741cc4ae047675bd8f0569da64b5289c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/si/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/si/firefox-158.0.1.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "3de18060603aff200bdaed5344691085e80f9b0a4f0d976b87d43e977fa24c74"; + sha256 = "d3e54467c158069ccc26946e65c03e5a671edbf8189080b31ce418d034f7432b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sk/firefox-158.0.1.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "b925511dc8a3f43b8904747cfabb86b9c7902eb3030283c523500390a6a8799d"; + sha256 = "35fc118037b3477cc756a053f0a922e766a785c978469549054891f051bacc60"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/skr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/skr/firefox-158.0.1.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "ef0efe00388c30d71ad8bdec6709b19445ca3056c806cc3d4dff2df3ef994be7"; + sha256 = "d3265a9a8c6d2c0e5a010e01a9a7141406404f2a1686d652e91b9ef59b310976"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sl/firefox-158.0.1.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "d15fdebb17bef6a6ed36ef6300a19891080531da9f4f63a039cdd902213ee5c6"; + sha256 = "40c640dd2de282d041a50af3d2420674ce1dec4b6f23a278cba9e9c96b4d7095"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/son/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/son/firefox-158.0.1.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "cb6c20791b57d66001049a9379c549265d49d5118e40e19d33d2a591aae16fc6"; + sha256 = "93b0d5adfd5a07c932881593b78fba267101dfcb83cc3b87d91fadaa1816b3d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sq/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sq/firefox-158.0.1.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "65222b89339a96f9655cc0a65488d87f41f0ff1e6856a87d06ca9a30f830612b"; + sha256 = "478e15a2d081a8d0ca620485df0afb5b62bc7b680ca362c60d49b19c656f5621"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sr/firefox-158.0.1.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "e70b23ee78f4fc6b26aff9ea4c3cf31c090fa06c28eb384d0433b325eed04d30"; + sha256 = "7a8544c28ae4c54d399c9e3cfb77171fcbeb4ac16cd28b4ba0dad1440a40df1f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/sv-SE/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/sv-SE/firefox-158.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "4dbb8ec39edf650161693dc81ff21e5bee034ee8665219ce6ca218216b461710"; + sha256 = "46b79444ad13c8473227768e77bdc64c22268f637362e0c71b05080c17a04aaf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/szl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/szl/firefox-158.0.1.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "8e60a0a85d9bc9062552643c3d2c43572fc362b48b62b1b4d2525a242eef5851"; + sha256 = "fd95bbb6b8a7bf6919cba8fabcca9050119ed4217bc07506d0fb67cd754c2c20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ta/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ta/firefox-158.0.1.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "d162669c81e89ec3b0ed67ec7d8b53d779020aca819ba7defbcfb8f0aad05c87"; + sha256 = "21f782e990040e96dc275bf12f8d11fa144b822ede6866bc305dd5d5097676bd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/te/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/te/firefox-158.0.1.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "ab6da4099d427843cef54a302bb306e1688907d068e1d542cea34f0a2c404924"; + sha256 = "bd450b31a72bc9d2eb1b3f467ee5b73201357cf3075531de9de64cca5c9407c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/tg/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/tg/firefox-158.0.1.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "c5568b64e288abdeb6412e0e7d5e71a05ec7c428430b068d668d531f3c8f03e2"; + sha256 = "f6c5989c1c23b749a37e664ddcc4133cf000c840e422cc9fd44e5f30e9ab3e27"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/th/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/th/firefox-158.0.1.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "f50fb65020ae543b5592eb9189ca6a1a3ef96ebd4df7cafddb055f744e2d2e1f"; + sha256 = "53f2d56ed3016f76d978e910b2063fbfdd130b389447578e798648a9b27a57d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/tl/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/tl/firefox-158.0.1.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "90f4cf3dc1af1734665d7e7ad1269e8d08ec88452a4d3384081e924907664186"; + sha256 = "4472f7abd7f5af9731d339043b106562123abb491f39a2851110f6cb283f8040"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/tr/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/tr/firefox-158.0.1.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "8514714c034e53ef928782224f9955f596e602de9ad38f3dbc6d679c8ce703d3"; + sha256 = "847a51c9f9af5f6c85e69d1fec494551c67e9f85186cb5da4ee58509da3c4015"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/trs/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/trs/firefox-158.0.1.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "c85367e8dc389369487064bf052648b2005c6cecae644e4f2c00642161988fcf"; + sha256 = "9f407a278346483c305c8c76810e0d09b7f5d859d197f99539872fb40b211ae5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/uk/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/uk/firefox-158.0.1.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "3e5272c1f8ecb5defe668db4e3ac00c1ab0a3d3ed29922e16e7b5ff2ce83b9b3"; + sha256 = "61eac2c9cec061d852e45e9ad64628a06674305dbb316e357db8835c77c8524c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/ur/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/ur/firefox-158.0.1.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "fc62a23696b6a13d5b6fc87540833ca1b0f78563bb09c99ae896bfe98bd9dfdc"; + sha256 = "d34128c6c663a5f5c5f9620819af107d528be80333130512a1de360438f7f5fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/uz/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/uz/firefox-158.0.1.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "452b567924280ebb11b87231b5136a0cf045ad5693885239aaa9531aff5e2211"; + sha256 = "58a254f50645c7d71775c9d55d18ce08df93aeca1f9242581af389ecda5c77a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/vi/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/vi/firefox-158.0.1.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "a06b71b358b8ae54cb1aab72bce4cd5ce947de8efae62ba3afc2a5e71b82b2e3"; + sha256 = "2f0ae9e63969d896e338279d34d69e88375242830370c30db275e9d85842e111"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/xh/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/xh/firefox-158.0.1.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "b31c8c53774b7835f0757854186520f2507b5966f09220c6ca316e27a60ce0b7"; + sha256 = "786f078215f0fb1965c2b74f17f1b4cd918874d5fa6df2dee2b7c7af871b4339"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/zh-CN/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/zh-CN/firefox-158.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "5fd179b6b3e7bf9e41b8569e33a151cbae0df74bc1fe0ab4cea8a301bd0cca17"; + sha256 = "aa7efc6a8da78e067359427aade61fcae812d2848adad8b95018100cf55840b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/linux-aarch64/zh-TW/firefox-158.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/linux-aarch64/zh-TW/firefox-158.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "afc625a2171acc0822e4f75e79f20524bc267a776540a1127ab7a1a1bc948384"; + sha256 = "fbaed69c2fa7641ead4a1f529ffd401aef8395f3d85ca28cfd0aa4ff9b70d03d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ach/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ach/Firefox%20158.0.1.dmg"; locale = "ach"; arch = "mac"; - sha256 = "56804f6cd6642f8a843288c948ed8085d1227fe815a59db82937124993ff1eef"; + sha256 = "29fa253eff41f02757c7ae559b7222df97febc391d73f14413406a5e15f472cc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/af/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/af/Firefox%20158.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "04c1dc9913cc24402b18ce6605fca80dc731b0064f79c3530fe63b664fe629f9"; + sha256 = "4758decf5c497f1c1c7c9b14669e4df29a8c630113e1402f23dec89774ca4776"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/an/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/an/Firefox%20158.0.1.dmg"; locale = "an"; arch = "mac"; - sha256 = "044985a9b2138b14805e6b1553ef0c52fa742cad2e5d4eb62d2d7cb3e81e2430"; + sha256 = "ae5ac653f5ac5c789fb094ce7b583b245f231b4418c6b684f9d6c8d48d5e6960"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ar/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ar/Firefox%20158.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "baf8fe382d70db54d64ddf62ba96ab480f867a90de0187d2b3b4dfaf457ad2ea"; + sha256 = "5d3c6cbb22203bc53006823a01af62b16cf63cc147ffa07c256a078eb54b7cc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ast/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ast/Firefox%20158.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "e69d380d12158b6445b4384768eda19cb6f6f899814eea283059ad31895a21b7"; + sha256 = "9e62fa844d36f2f7d27df0fb5569a20d3a8feba84dc9cdf2191521348b296eb0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/az/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/az/Firefox%20158.0.1.dmg"; locale = "az"; arch = "mac"; - sha256 = "524147a2a54d2a1c632a181b19e060a38c612ec427d516bba66394c08fbccdb0"; + sha256 = "296d1c44978592736f36a1e711f9a5e120cb13b9d3d02d9b87b99ac34ae8c073"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/be/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/be/Firefox%20158.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "7ef413316bbe91541751c4e80d451a3e8ea7e97b68bc6a03f4e4e9010b17cfb6"; + sha256 = "ee5b92f01b1af3b3ff71c78c764377331496202eb25743932410a3ea7eb19c19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/bg/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/bg/Firefox%20158.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "bf678cc420384546fa7e4b4df1366449900159cb1ce86d8786f31803e2a97399"; + sha256 = "646ea1fd542ef74690d3d79b826799b101fba2a5f340a84a8a8258258aeebe66"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/bn/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/bn/Firefox%20158.0.1.dmg"; locale = "bn"; arch = "mac"; - sha256 = "804a97015cafe40932713a33e0ab9683ba57bc40c5df42d92862e0f33c95b12c"; + sha256 = "33a2c41d0fa134a00f33301475a022fa3cdb3092d2f1e16a1bf9986efabd1ea6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/br/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/br/Firefox%20158.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "04f4da4694a7061f5404b7c146d266cadc25dc1a516f93398f64c560f2c57a3c"; + sha256 = "12fddd13748611e20f5eb1d63dafb5a3e1bb664cd22ec22f9863cc00a66bde41"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/bs/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/bs/Firefox%20158.0.1.dmg"; locale = "bs"; arch = "mac"; - sha256 = "2e1bca3f5280b8b3142bf2ad28a32530a0fa15d0302213c1e93a0ed42e0899f1"; + sha256 = "3e32700df3a54774dbc7f3e2286ef33cb237bef2624ad9fbbef91542a26c1fd5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ca-valencia/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ca-valencia/Firefox%20158.0.1.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "c81cced79393a34c63729c4ee748adf6e9bba90021dc6f5c61726f997fe45010"; + sha256 = "37e8536d4a1c862799156e7c360bd4804267a12e738634911de769ebd36c81bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ca/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ca/Firefox%20158.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "d24c263a52c32280b8f44927f5c8167bb9cfdb9f30461e9497f1d2848dcd2e02"; + sha256 = "159bb6a33e03aa839fca83774d6083d6dd2fd42c2b1e30301adf5f8fe1a0fbf8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/cak/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/cak/Firefox%20158.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "fd4e2723fe766bac8c8767ad106705e76b46e78be0095579b2fdcc92cfba473b"; + sha256 = "9acc93762e54fa17c50980cc5567c92b62c79f9800f81b27cd84593875f8d5af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/cs/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/cs/Firefox%20158.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "618583e2ad0f971cc114113ad7f1e4a7c3b6e7ddf7d6fb7a0963febec7090dad"; + sha256 = "12e2a3bc5e7cf824f3cec30afaaa92de6c7ac8421bf8d4f96e7b8760dbe83371"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/cy/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/cy/Firefox%20158.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "a9388183ad786928763d38005382338ae4035bf7d83f94973bcd2b0e5e964217"; + sha256 = "5a684a77dff8e52e655c7c3df505cefe7e0e3126a43a11a881662c52f73b3a79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/da/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/da/Firefox%20158.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "87fe7c2bcb36256a6d23ecfd509110bc5642a2f1f2bc5204879c5a6a99354353"; + sha256 = "7103ab730afac69ad38eb176ff809a6c0c5902335e5aa885bceea632bf6f46f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/de/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/de/Firefox%20158.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "6ac5a77d9e67a3d98f3c456d712ea0a2de782a309f85177813a76e7a693164eb"; + sha256 = "1d9fa957d282c0865c4c21e58f5ae935a65e9dbd3235a8f90e0cc8abc44b267d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/dsb/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/dsb/Firefox%20158.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "9dc4b8004a45592449aef4bbe01c2670d57a531edfc9c146e5c796308bcc63ca"; + sha256 = "3d3e49f8cd96446c5e2d032151dcc33348e51baa6b1225f5058b02095ca6d883"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/el/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/el/Firefox%20158.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "3fe871d177d9bb1b068059fb0a3c9b3faa03b6460a1bcf8799367ec3f7f814ba"; + sha256 = "da66558f033b58156e08bd9956ba119154ecd5f9337386e1bc6ec0c28e293615"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/en-CA/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/en-CA/Firefox%20158.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "fa3a058f162e55d8aab872e1897194fd28e9d1b1d75eb2f9a09ecc6941e42761"; + sha256 = "afde30369ede12db7da6cc425a6ddbd8ee4b4804046cc96a6bf2b549c1f73274"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/en-GB/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/en-GB/Firefox%20158.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "ebb115594317b3b5b3abf9b2dfe3e6056b0c0e58e187b883ea8904bf38b9cc1b"; + sha256 = "17c84fb80ab62f33daa94f2e605e265636614f2c3530c77534f724b4702a7674"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/en-US/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/en-US/Firefox%20158.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "dfe8508ee8880cec1578253eb02b9154b5971a55e832d97396f463cd07b5ef67"; + sha256 = "1d7aa96b51fc9110185047de18228ac87238fba5e42bba53c9d696f88878cba6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/eo/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/eo/Firefox%20158.0.1.dmg"; locale = "eo"; arch = "mac"; - sha256 = "7740a06744737a6249643434395e7390e76c124d8243acc312ea1e6905a0aab9"; + sha256 = "1604cc1bcdaa6f1bb156f28a4b2edede32616c3f9f4078fadeb5ef8adfe74cc6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/es-AR/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/es-AR/Firefox%20158.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "06b3e19c6e75014729e98214e44b62e1c4d16241976d7c78eec6831bbbf86685"; + sha256 = "5615149551c7d84fea99a7a6a3d477b1b635c03a3f1ba86c4be2a459730ac371"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/es-CL/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/es-CL/Firefox%20158.0.1.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "e6254ff6c45dd8a487ae401b3d19e4ddc85449385ab9e129d672c5907bd54884"; + sha256 = "5312599e1f04c2d69c7d3d22de964a168e1f6d06bbdacf7cccdd56899328421e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/es-ES/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/es-ES/Firefox%20158.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "04802f3e183d57271402c40332bc4156ef33eba284d59b933b60a9573b222e00"; + sha256 = "4d9f638eb714b4c1e64748c982617e53b4b9620f7b3156666e5a4dd685c35298"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/es-MX/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/es-MX/Firefox%20158.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "968ceb31b55a81edda7c48c58eee5741590b3e037d6e7733b607e77758a6bcff"; + sha256 = "67b3c74831deb82380a5b15f8a549a15dc26514b3a2986f7cad69314275fe0bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/et/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/et/Firefox%20158.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "b5ee4e9fb2e62c46b5644e1845e5699a9d1f8fbc4948c9f74f9318255ef4c729"; + sha256 = "840e21b7fe4b254617f9b24c1f88c6debca8eab5958745a65705ac9ec2f8e2eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/eu/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/eu/Firefox%20158.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "01a6152b89dbfa566637c815126e63c4ed17b62c3880d8e9b0e91064d1fd5156"; + sha256 = "b798c1f5a1767d2352d7d951c8ab7ae8d81db2f94492a4f9def5ebfa82681662"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/fa/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/fa/Firefox%20158.0.1.dmg"; locale = "fa"; arch = "mac"; - sha256 = "bdbf104e0cc485b38e0dd1245e7c1d31397e563066d0d3cfdc2f3b2664064960"; + sha256 = "1f34dfaa2fa06ec88fe228797de5b59b1b62b8323338253284a96ded2b9506f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ff/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ff/Firefox%20158.0.1.dmg"; locale = "ff"; arch = "mac"; - sha256 = "04b64062ee41b6c255fb0dada03a74a82c2b1317335741b54e598fcd1db229f5"; + sha256 = "123f52fbdb07482782e6384cda5914b3842b5a15f58445f43a756dd6bb4bd1f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/fi/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/fi/Firefox%20158.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "1105f56d3291130564b1e5181e8e1cbac25a8d72cecdb0c2988d3d59a1b35e13"; + sha256 = "b994ba7265890931d6e6055eeffad02d08c826cc697532a7a241e41201fb2cdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/fr/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/fr/Firefox%20158.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "83c6645f81689786e16b508b051c36107edf0089181ff33231f0b0446327e11a"; + sha256 = "3c5547d4116e0795c700aaf10f3402bbc5aab2ff5cf043eb8ea2b7a0ad5e1240"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/fur/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/fur/Firefox%20158.0.1.dmg"; locale = "fur"; arch = "mac"; - sha256 = "7006e99260b24efeabf2ce2203e895b3186717387c88721d4811b9f31cd97bc7"; + sha256 = "c389adfc0852219d75ae33e6230060f5311997ba52ad87009f4d5e3e55f348b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/fy-NL/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/fy-NL/Firefox%20158.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "845bcb774e2fc0e7a248c4383e21a09532da5e5f9fa2daa851d4ce75ae639173"; + sha256 = "ef8e793ee9109553a6bb1f8af3c70abf6dad2b7ca41a93f5565fcbac161eda2f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ga-IE/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ga-IE/Firefox%20158.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "bd3a8e940ead4c41b9a8e2130f3bb906bea0a4238c32cd9729a75a3548fd447d"; + sha256 = "2c8a095d2dcc0b7797e8a113c776fb179b534d38ebfbde77c3f2cdb82e05c85f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/gd/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/gd/Firefox%20158.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "756da17e7bcbde2b4c205e2b30cc39038bd565f6aee6b9c6bda0fe8d7796154b"; + sha256 = "6aa82a3d724d510d1791eae28165cceb81c8c19bd1aa854db6cf85b39a83ac10"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/gl/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/gl/Firefox%20158.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "4e46d24a118fb268b33ca68558c75370f503755354b4325670e90cdedb050004"; + sha256 = "2a5393153b0e797e6ecf955b4adfb122c556fb0fa3f36e4ae0c4d175eaaf7781"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/gn/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/gn/Firefox%20158.0.1.dmg"; locale = "gn"; arch = "mac"; - sha256 = "53e3071a24115d1d09e3e2cb7ad01772847fa7be67423bab1176921a547c4cac"; + sha256 = "cbfca3d97d2176593a80d08e883e4db9ad621ac6b8b0b5bfaadd0c1238314549"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/gu-IN/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/gu-IN/Firefox%20158.0.1.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "08bcf4819ddbae434b6a67695f1c057ed8e079e787043302e949f07588c16704"; + sha256 = "2e776eeaadbd9ad2cf055afc633d09e0be551832cbeca568a1202256a98246dc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/he/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/he/Firefox%20158.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "0a6c4860f9ded2bf3559066004f649f710366ec2e9f2e2b3efee211b42877e3a"; + sha256 = "5688b8a94d9761324b542b8604dd54495363bda7493962f1d109990bc0db92d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/hi-IN/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/hi-IN/Firefox%20158.0.1.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "5aff5d006a57e4f88a0b6133a29861d94e6dd51c095964c823f4fd42e91be03e"; + sha256 = "c268df79fcaef9cb5b8e5292b7cb5ad8b6938d1b94384a3ae1ee9a356c6a90c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/hr/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/hr/Firefox%20158.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "b6b2df1eb98c2bc0024d2a8038d6c6d7d43f8b0ce88c271a60757fcfd733a2b2"; + sha256 = "bf576962f5ffeea1f94311a9945f08d2e54993f1946de8080b292edf5614321d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/hsb/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/hsb/Firefox%20158.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "fd50ca39671854d72c42010e2d4aa8730c609649c9a13b6fae11f8fa05f43c24"; + sha256 = "7e34d389299e3efc589de5cf94c2b9ea029212499d208b2d7cab5144d4b177f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/hu/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/hu/Firefox%20158.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "f2e92941d9e994b0a9320dd7b96f670e0d3a7ccc14429c2c5860de07ec2de271"; + sha256 = "f11aad78d2cee8afc38c8bc47e817239f9ad78e1a3c267820d19fef4af7ccaa6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/hy-AM/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/hy-AM/Firefox%20158.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "1bcda79f1388c657573a48196e9b090fe8ede25d6fb8b7af23fb1f0fe023840c"; + sha256 = "0457fca157d251fa56faf340b2377a4d88e8f4bc22e62d49890aa535416c8ec5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ia/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ia/Firefox%20158.0.1.dmg"; locale = "ia"; arch = "mac"; - sha256 = "18bffccfd0db5939051c7a173182573edf98b171df71b24c46a4ec1d937c4692"; + sha256 = "95315f6d439b7a060fe8723ebc8cb8837bc3fa2f469d056436d1a99fcf2cfb65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/id/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/id/Firefox%20158.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "569790d8350c56bdcce952b270b46c0ec415155fd12b2128984fb6c281851416"; + sha256 = "f39b7e6af728ca2156b29647421afcd19c1835b2abdcceb03990f6d0c73dc17e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/is/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/is/Firefox%20158.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "3aa6e954487d8a422ccfc1899c766d74fbace5346a3d785f9f77074b6ee60663"; + sha256 = "f54b5b70b23d120f71439e7843f192b1cb0c54998c541e6024eb64aba0228b77"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/it/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/it/Firefox%20158.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "b1318209e0118f55993f253ffb8cc3e345b0d509f63a5426eb4d363ef719adba"; + sha256 = "7d3521a2c3715275f500f4ed9f87717d76b194c3ea5a78622ec4a7a0bb7d6da1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ja-JP-mac/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ja-JP-mac/Firefox%20158.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "3e6c25f7a2d6c39d518305112aa675e5a22986dcf0e9a4bf3a678b53f51b1cf9"; + sha256 = "e41b2f2110da86a31d4ec7da8e5215019194815c9e102dfdf0865c44847224e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ka/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ka/Firefox%20158.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "12ab20edd2ae7054678e35f84fecfd6d7793191635951c9039f234319e89c458"; + sha256 = "a16c65b8b29dea4ff1f7265e5e4f597072765b7ae67175a8bd861b6fe1dd235b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/kab/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/kab/Firefox%20158.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "68fcb29fb7f248ac154c8cadd25e4442b5214bd35ba70d94e1e0b36906469568"; + sha256 = "9aec93e8cd53ffbbec7c805b751bab24074d5fc1958b9d796d261bc53afcfa45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/kk/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/kk/Firefox%20158.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "74559a50e30824d2f585fb8199cb238c209054663a0e47aaa0497787554d45f0"; + sha256 = "e2b2b3621a0594f9c6277035b2c4ddfeedf8c3c34d4b87d4939d854e6183ccdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/km/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/km/Firefox%20158.0.1.dmg"; locale = "km"; arch = "mac"; - sha256 = "fa266189817f374a60fcc12170fd7802e1fb2f2521ebbc0ca0f2399ec3da3706"; + sha256 = "85507438319695421b63f381c0c21db11105b3c4eb987dad936e16d428218033"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/kn/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/kn/Firefox%20158.0.1.dmg"; locale = "kn"; arch = "mac"; - sha256 = "0d60ed1058be75b3d748a60ca33ed260841cdffdd4d9fd457595aca96ae1facb"; + sha256 = "e4ebe9d1dcf5ca605fde1095b5965e195ca0b899f4199adb8476eaef9eb6e5f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ko/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ko/Firefox%20158.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "6ba7f3bd953f49832cd40066eea9aa5e30c872421e48bc8ba8c104dc01c45ba9"; + sha256 = "26289c607103c60fec3ebbe7179e1097735db7aa7335d8811f11f9732391bf4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/lij/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/lij/Firefox%20158.0.1.dmg"; locale = "lij"; arch = "mac"; - sha256 = "ba13435b3c17dba941a565b59fc7d5bc0276c55b58829ec16423e2d8efc9f9f6"; + sha256 = "450865cb6fc2d45ea8ae397b96383b6bd2bb6405710778f4ede8d2bb9dd1ca58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/lt/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/lt/Firefox%20158.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "1ddab372834fc1882dfc21952e74209a1a319ee8029a6528aba950eeff88af83"; + sha256 = "ee2b9564fdd0a30eaf7595854e3b3aeff8519a0d04ca54d3554cc1a1680abe26"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/lv/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/lv/Firefox%20158.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "a475635be28cb049b16b95c041d2b06c643037d87beb843131e3537d36e61672"; + sha256 = "10ee006231b18fd44c90d301d0c2ce8eecad2e63c19784471d1248ed1daea4fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/mk/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/mk/Firefox%20158.0.1.dmg"; locale = "mk"; arch = "mac"; - sha256 = "1536f710877ed6135440a3994f50b096d60af10c8380253ecc7807c9f22a381a"; + sha256 = "1a87391f04ba80d25d7672b9a11d6f2244e4a4208128099e1b0686db499e6435"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/mr/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/mr/Firefox%20158.0.1.dmg"; locale = "mr"; arch = "mac"; - sha256 = "84636ca77cc82476fa04d7a2093172d5c4b089a8d9949450ddfaa5dedaca487f"; + sha256 = "ca3f1ee21976b1f4081e6043471f2052170112e9016e18f2082670965c1a8237"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ms/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ms/Firefox%20158.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "c8c906648b45156c9819e9a773bc2b85d6871bc2311ee3ac10c24cd4dda1d095"; + sha256 = "6a3661a7740f611e8c674bcc6a6ddc7af53a0f435da2389b88f833018e66421a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/my/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/my/Firefox%20158.0.1.dmg"; locale = "my"; arch = "mac"; - sha256 = "d5a1de404a3d5138cb98dbb2dab97029138165ff911109377864c3c43f36cc7a"; + sha256 = "52b23e342837034086396f6865cf00f551c5b0ff964f95fe4fd40120f26874a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/nb-NO/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/nb-NO/Firefox%20158.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "47c79753cba9b4ec908c10a00418479a7b56d10cb8be9a03c22107c9b39c0069"; + sha256 = "b0bcd46655cff70d41aedc6c571da27a3bbeaf4ff0827a6b5f01c2e892b246d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ne-NP/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ne-NP/Firefox%20158.0.1.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "2ffead904eca3b90428bcf35c73a3076225c73729dbd3008e1ca8cd4a64ed946"; + sha256 = "1254192ffb8be691fb72ee4ca27cf2ea120bd8473f6e3783c1b59ba33ae1dfef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/nl/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/nl/Firefox%20158.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "8cf7d2d1aff352585897a9e889422cd120012602905a7b9c6cd831d6f01dbc3a"; + sha256 = "2f5dad37ed4ce29be8fedfed66700ebdc982a34595839b227d328d4ca0b16985"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/nn-NO/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/nn-NO/Firefox%20158.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "a223cbbce45df823e26fab68672883699c63b197e192a765a75d7af8563645bb"; + sha256 = "eb09302b17128e337371e059ed78d5813dfff4a4fc26f9dbe445b887e5027a97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/oc/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/oc/Firefox%20158.0.1.dmg"; locale = "oc"; arch = "mac"; - sha256 = "e5ac92a69d6da50374968cc1c916bca47dc8b29a7bd1205db258d91281978427"; + sha256 = "b74c8014bc8bfb221f04385b11a37d43004bdb82020affb2767e33ee65bb9ef8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/pa-IN/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/pa-IN/Firefox%20158.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "91017969925815d62fb164c592872beee91790acda1e887944c83baa7494cb9a"; + sha256 = "c715fd64d4d28399a6b91c2f13819f8f2977688bf637d17de41b1a52f2ddb8f8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/pl/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/pl/Firefox%20158.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "6314c6cac92fa7596f98bcd5dddce4c634be36b2d82d9ffcf57a9dd84a7e756b"; + sha256 = "b1d99678e3fb87fe64efe16f8c6ef45f1f40f62860fff1b728252764d012e8ea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/pt-BR/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/pt-BR/Firefox%20158.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "f987f456285814929b2ffa67be3aac5bcf4bfb604fe2991059e82b626d6fec1b"; + sha256 = "d920b0fd8a374ba6adb4fb92d1f5cb7dfe3a6e720d5d3df1f7ea9c41540bcb7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/pt-PT/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/pt-PT/Firefox%20158.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "abb804588a7a7011324cea7ac74e7fdc8b386d0b96ce9f1b1062841e71804b48"; + sha256 = "132ba15f7d76d006dcdcb989226be34e2331d2852c5ee14915b525c0e5c587d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/rm/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/rm/Firefox%20158.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "9c2a6b9dd4a5dcbd50e84f752341460e609308399e770d8dd60a19f58f457fe5"; + sha256 = "97e241cc0744035f082224282a11261d15bc01a05bdc6655c039f066c4d2b553"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ro/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ro/Firefox%20158.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "1313695531e0aeb1718380cf012a00df9cdd17d2ba8a1d84b987ffb95a1666aa"; + sha256 = "7b0928bf48e8889cc8a7ad068da5709fad5dbbcd7b10c783d27fddf65854e03a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ru/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ru/Firefox%20158.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "1996aee2eb443f97368d1feb8aa2cdc75e9418264554648cc6adbb4b0bd16740"; + sha256 = "e9459509193842d478ec5fcccdd08e74953107e7d851249aeeb5c712a020a506"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sat/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sat/Firefox%20158.0.1.dmg"; locale = "sat"; arch = "mac"; - sha256 = "17b5f4a5ca8dbab2c8e52a3bba1dc0ef1ddd75220379cf0da5b4bd2b1ecc938c"; + sha256 = "b41686cf90e8da88d51c7e37f134667a0d530496a45f8a8a9fd1b0617ba8ebd0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sc/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sc/Firefox%20158.0.1.dmg"; locale = "sc"; arch = "mac"; - sha256 = "dfab72dea4c915b30ad67d5c0f878461835e8994c3baaf431f8522069d42a6a8"; + sha256 = "c5bab0576d6de645ab41210870702e838f749263e57d803755da154c5cdd3891"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sco/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sco/Firefox%20158.0.1.dmg"; locale = "sco"; arch = "mac"; - sha256 = "f14edf8c1c8b122a8125f2bd0d52b347a4f733a2c482b2cdac879a2c1608c967"; + sha256 = "8e6319ac368a50eef62c529d9c070300002b71673aaa18c136d5d337336d555f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/si/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/si/Firefox%20158.0.1.dmg"; locale = "si"; arch = "mac"; - sha256 = "d387e56f693f8be29ce0e063c993e086d0b946614230c5fed2b310959961adca"; + sha256 = "c5ce8aabc87ad4b23b77c0f017690298b2aca4b5029022f5d128f80124b73541"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sk/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sk/Firefox%20158.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "cab01213ccc18f4f56acbb624b4ac0469c8b6dd9683aa2a3274a8336233a83cc"; + sha256 = "9e5a530ed439aae0641d2b2ef9fd738b8b95bef22a653c567a35b5ffa7d9de5d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/skr/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/skr/Firefox%20158.0.1.dmg"; locale = "skr"; arch = "mac"; - sha256 = "21f2ba41b3c1491695b0a14fc45f57c2302eb28366ba441e31111bda6354d8e5"; + sha256 = "7c1551c0d056be524807b4ca7a148dd4739bec85bf6f541bd028de5f2bbf7e72"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sl/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sl/Firefox%20158.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "f1c36eb26cbb928d8cf98f296b8d87989d83776f54a46d1ef508ff64016133d1"; + sha256 = "edb61d6671397abe5bc7379e5a04f9e07a96bbd0c61bb1f7df84ea5f8f9eed91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/son/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/son/Firefox%20158.0.1.dmg"; locale = "son"; arch = "mac"; - sha256 = "8e7e4560d696a787caca6808f175993c466d33087e818eb1953765583f60a86a"; + sha256 = "da8538b24c25186e8b5cf2d9a983c5dbba9a4921488e901ccdf17e6e16a0b858"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sq/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sq/Firefox%20158.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "c9248bcb3bf6ac7bb8e6fded3948eb9583b4ea92ca07e8701b588ff98974f8c9"; + sha256 = "22b9c9161060575033773758031a3d22a309a7b0198645c53a8b574426a62b9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sr/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sr/Firefox%20158.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "44e481d61226ac3749d046ab8c9d30e85a307a2caeeaed8b7c4e66fb8354a748"; + sha256 = "f6ac3327cd009db384641d8dde7f4e7cfaac2b85a74fbee4da156480e805229e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/sv-SE/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/sv-SE/Firefox%20158.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "050722bd559c64b7c152f2689d7937f338917383df292b679eabf49a39382a88"; + sha256 = "b0df7cc97d491e26aea1e0ea36e2ee55ad40f1c9fa33b1f11e9d3f81ceb4af7a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/szl/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/szl/Firefox%20158.0.1.dmg"; locale = "szl"; arch = "mac"; - sha256 = "dfa90760037e8a5da1227e8fcbe988b18b839f5c1ab958f854d7ed80c4504803"; + sha256 = "b4dc4440a037dd877116d793f91b96e82484c5cbe719d63053c08b16457a2bc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ta/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ta/Firefox%20158.0.1.dmg"; locale = "ta"; arch = "mac"; - sha256 = "e6e41066c65c1f91bd75f444828f16509089a6925bcdaecaba0244d3bf4369a1"; + sha256 = "8d46c0120dd4a2a6f069e718b50f87c3f85ad9fb340e0e305bf964316cf470f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/te/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/te/Firefox%20158.0.1.dmg"; locale = "te"; arch = "mac"; - sha256 = "cc00a43203ebf28ebce7b9232065195b1dc72f9f6ed961fd5da1a6490212113c"; + sha256 = "03f82d5c9c8eb3d4adb7a39dac10e4f5da82aad215314d8911d7a96d71bf0b2f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/tg/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/tg/Firefox%20158.0.1.dmg"; locale = "tg"; arch = "mac"; - sha256 = "f9daf84202991c302bc1adb1941abed47936c22a851992c4386e415d2f1ea25a"; + sha256 = "b3a3be5b30394f5364356628bb9be9720ed445dd6370ac716bf5d04d73acac4f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/th/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/th/Firefox%20158.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "0ce43ade50f1e03da0019e9dbed173b2b26af69b185de965e5b74b934efde821"; + sha256 = "6a005da60e9f321734a89ad8b9247f6596f9221c2c9c216272d5e88592e98df7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/tl/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/tl/Firefox%20158.0.1.dmg"; locale = "tl"; arch = "mac"; - sha256 = "70e9a7dc835453a4f614a7dee7cc733fbd231e9e658929ef9a290903c5cd4c9e"; + sha256 = "a48c6379a57319f0b569750e12d7644f615b63b9007b859127de8b184996038f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/tr/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/tr/Firefox%20158.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "87ffefbfd2bd94f3e9a546e7fdbcfeaae43776073322bfadd5501f42ccda1825"; + sha256 = "2116fda7b8cb5f448bb7cc0ed5778387f7eaf34ed46666088383e9b414d4fe51"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/trs/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/trs/Firefox%20158.0.1.dmg"; locale = "trs"; arch = "mac"; - sha256 = "97cbe0cf65e5f0890742c8d2de208d902162dbd13b73b95fb5b1e73be75c465a"; + sha256 = "8e3076255743216b12cb469a348df9ec898ef1b979c24eb3beea072716369f50"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/uk/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/uk/Firefox%20158.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "9a8713551109484399b99b0d1177f442be4c326a971634d1631382705f3a0941"; + sha256 = "7f73075c172284e6cf61c9b4fd60443cbfcb49f0acbc132d3b4c7a16fc2c983b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/ur/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/ur/Firefox%20158.0.1.dmg"; locale = "ur"; arch = "mac"; - sha256 = "db783ebb08187f61adbb0f6bcdda787c6f47ff63728f55b5d3ef93e54f36f321"; + sha256 = "7938a8ef2837c68f968df81e85375cfa45bf858a51d3e10fa271774045ccd086"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/uz/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/uz/Firefox%20158.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "3ed3b37b77147a46e8215e045d88d3746d7dfb42c7c717bded7b9a4162eb7090"; + sha256 = "552898a6b3f57156b4b625409fc602eca9b9b2f1f41207c4f328a942c5a42d16"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/vi/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/vi/Firefox%20158.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "b5833bc015cfe4ef27e2d756771f6d8bb2df9db894154909f0215011ce733d1c"; + sha256 = "ba7870beab34eb0e7cfc1dc1b788d3a96576f0b2486dd38d094beeaeccd7d9ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/xh/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/xh/Firefox%20158.0.1.dmg"; locale = "xh"; arch = "mac"; - sha256 = "63c1dbfe651d946ebcdd18fd7c697e23d7d62ab07979a61d47f744e234f4e489"; + sha256 = "a719e46790a76a8f212f6dca6863f5725ca6bf0c5674ad280e36d50169441600"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/zh-CN/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/zh-CN/Firefox%20158.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "d0daa923ac5962e1ef0f3f94700e52f2d4ccbba79ae42faa3d76e5bfe5b74370"; + sha256 = "d5ed99b9830cccb81a4ed7e8e89866dcc86da1be8123a6bebd71ecf12edf5a1f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/158.0/mac/zh-TW/Firefox%20158.0.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/158.0.1/mac/zh-TW/Firefox%20158.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "a21df0a6ed5182a8be29cf4ffaae88503791bd952cb7270f8c1934b3a6ca06b4"; + sha256 = "223087e1e3ecb6be4cc1571dd1a3cbfe0a5f003c99f53a04872a15389e0da6dd"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix index 9fbd26af50ac..14f898b53849 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix @@ -8,11 +8,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "153.5.0esr"; + version = "153.5.1esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9acb8d1a4b241767e39da36d6f520d4edaae0f237f311496beeed10e2383cf399b0af11cac6984d425b620af0ecba3e67808637ec74733c7d23186d0dd2bd5d4"; + sha512 = "9dccf8c5383653ddcf807b500889a91f9b9d56a512dab88a2683755ae6cb0c4b5d0788faa9541e5709a2b783002ee9f434020a43c8a43653038a2c3decd9f2c1"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 279775af096a..8246a53a041d 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -9,10 +9,10 @@ buildMozillaMach rec { pname = "firefox"; - version = "158.0"; + version = "158.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "14b8ffdc325a234061db14dea9bd144786dc2c84468a5dfe2bb70bb9558f63f73427cf244eaf461010ee01dfdf04f2cae68bae9f07b4820603a4bcd4462f7960"; + sha512 = "a5cc16a63f4b43f01bc26e2feb12e54e5281aebdc81775cbc0e8d77dd5ceefa5055e78d2a6ad54895c397d414d1fac13d49ddf28099f534269a6a166dedafa5e"; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d5da35c2db77..612f34de19e8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,20 +54,20 @@ "vendorHash": "sha256-GIKSIlWD+TTm0EsUu9ga3emENwGLXMDYqp//BmjNwDA=" }, "aminueza_minio": { - "hash": "sha256-Qyj7913SxoGFWT+0j34sm99e609BxmvQEifVTVMM1AM=", + "hash": "sha256-57IhDRu6YrJgXl2bkCeIeRIs4702wb0z/52eJoTAp70=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.44.0", + "rev": "v3.45.0", "spdx": "AGPL-3.0", - "vendorHash": "sha256-wpPKseArd+TbQq03QZZuUHQ/l9ttYFE5o2X1HNmxaNI=" + "vendorHash": "sha256-hKSqgc+Gf0vzQuXKlErWVC/EbHatu/9oTW25PnRMyxQ=" }, "archessmn_powerdns": { - "hash": "sha256-1bjQFu3k0ERBga94pQ8HZjbfu3qlxnMQLjSkDU6Vp/I=", + "hash": "sha256-gQRB8tnFHhXNId9J8947ffizIWTKEetOnc+QMnjaB48=", "homepage": "https://registry.terraform.io/providers/archessmn/powerdns", "owner": "archessmn", "repo": "terraform-provider-powerdns", - "rev": "v1.0.6", + "rev": "v1.0.7", "spdx": "MPL-2.0", "vendorHash": null }, @@ -218,11 +218,11 @@ "vendorHash": "sha256-KS76AlIyquah/b/uwM4qotBgEbpGwF54gx2u6mQpJ4E=" }, "cloudamqp_cloudamqp": { - "hash": "sha256-Ob9Drm63Kwss4qaYCxymjNqtWuKQi+OV26BUE1dcJ90=", + "hash": "sha256-adpGr2j0jBFW+0QxtSgTiEyxlKoBp/fw6oINxefhCl4=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.50.1", + "rev": "v1.51.0", "spdx": "MPL-2.0", "vendorHash": "sha256-scHNFyHn4VYm8wtuBdVCpgKCzwPhzrC3KBs1YHXPwos=" }, @@ -301,13 +301,13 @@ "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI=" }, "datadog_datadog": { - "hash": "sha256-wN+0i8O3lv5Fq2aUTcK/JEipYZptSP8An+9qzqYEyDQ=", + "hash": "sha256-Sv/mzOMSerwMFiBFFcj+4bVaJvpAbHVj/MXXclhYpHA=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v4.25.0", + "rev": "v4.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ak3IV9d5G9oB5Pxi6kMwFKxBxzkdPTZ/iHehnAeAk+c=" + "vendorHash": "sha256-dTbDKR03Inol1G4okCNDso5tZ45BEiUmkXOAmIrRcX0=" }, "datadrivers_nexus": { "hash": "sha256-+MTyr7voagijpqTb7vswO8PAFZpxz3UWAQLEs0os4+s=", @@ -526,13 +526,13 @@ "vendorHash": "sha256-nfGvGaNcP6S//nOnXKVsjJrezKxVX+iTiGyN5q4ve78=" }, "hashicorp_aws": { - "hash": "sha256-VOy7rIj2VYF5oBp4LMbMjc7s6jaFF3MbWLFu5r3Tk0Y=", + "hash": "sha256-AAKr8ntbywmxV5UEdlF8gO/SOkPL0pSbcgDK87RF9/0=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.68.0", + "rev": "v6.69.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-lzMQDtkxt84rQXiiVoj20fnTMGb7S+lR5Igx8RD/X5s=" + "vendorHash": "sha256-nv6V/pQ3zGRbSahmy1B8WNxmS/uTcriQ8NBm/KPUNwg=" }, "hashicorp_awscc": { "hash": "sha256-b4fSBncrRLPhMtt50U3IRzW5Gcpfg1XiRiqa6j4yJO4=", @@ -1364,11 +1364,11 @@ "vendorHash": "sha256-t799EW0oXtzzHVjbOv5dPQ5V070wg7Y8MZohQ1O70Pk=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-s8eSxjf3RXxw3n2xPgcMyBpz0ewoB0IdziZYwjDvVuc=", + "hash": "sha256-ZnauhdsC4e640mkLWi0+UiTt65ISL3nAcjoTdQaLbVk=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.83.34", + "rev": "v1.83.36", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1427,13 +1427,13 @@ "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "topicusonderwijs_octodns": { - "hash": "sha256-ewCWuQlmyrP0mrIz0k+YYUzheeFBPh1bEyRueFC8b3w=", + "hash": "sha256-VqjoDyo9AAxrVPW7uP0ccXy4oZSm6YSLoo/6eqTT9hU=", "homepage": "https://registry.terraform.io/providers/topicusonderwijs/octodns", "owner": "topicusonderwijs", "repo": "terraform-provider-octodns", - "rev": "v1.3.0", + "rev": "v1.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YDTR4twyHhBqOEPbzMtkO2DWj41VhJ1PAVU3nNVh3l8=" + "vendorHash": "sha256-6ivj3olSo9t75jVnow2GvzVGE5JeVtTjWxYDirvSyFc=" }, "trozz_pocketid": { "hash": "sha256-jRjM8uMpa5FBRqAJY8eM+Sjo72E1et/HyIGEIoK/rXg=", diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 10d214e37a4e..32265a9b47bf 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -20,7 +20,7 @@ avahi, lame, gettext, - pcre-cpp, + pcre2, yajl, fribidi, which, @@ -263,6 +263,15 @@ stdenv.mkDerivation ( url = "https://github.com/xbmc/xbmc/commit/29492cbd20d4c90a9c00a30ab525d4d0e81a968b.patch"; hash = "sha256-WNaODPCtRfn30jVU5HbBnAO2Vl/MQp2CYmKOTTyDGZI="; }) + + # Upstream only support pcre-cpp which is deprecated and to be removed + # from nixpkgs. This patch moves all usages to pcre2 + # See https://github.com/xbmc/xbmc/issues/23184 + (fetchpatch { + name = "kodi-21.3-pcre2.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/kodi/-/raw/9fdc116256e7c610e2045d5bc6fb3c234234a88d/kodi-21.3-pcre2.patch"; + hash = "sha256-PJXfuZl8f4WfTjtL5CFMDEQuB40tlTWu7LvkBUeX5DE="; + }) ]; # make derivations declared in the let binding available here, so @@ -287,7 +296,7 @@ stdenv.mkDerivation ( boost libmicrohttpd gettext - pcre-cpp + pcre2 yajl fribidi libva diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 09a245f9fe1d..b704be5025de 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -43,6 +43,7 @@ xz, yasm, glslang, + wrapGAppsHook3, nixosTests, # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). @@ -133,10 +134,14 @@ stdenv.mkDerivation (finalAttrs: { yasm glslang ] - ++ optional (!headless) wrapQtAppsHook; + ++ optionals (!headless) [ + wrapQtAppsHook + wrapGAppsHook3 + ]; # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; + dontWrapGApps = true; buildInputs = [ acpica-tools @@ -385,6 +390,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = optionalString (!headless) '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapQtApp $out/bin/VirtualBox '' # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 8e43bfa98173..c05eda18e983 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -227,6 +227,7 @@ }; libsqlite3-sys = attrs: { + LIBSQLITE3_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; }; diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix index 35a53efdaa13..c10060a01fdd 100644 --- a/pkgs/by-name/_3/_3proxy/package.nix +++ b/pkgs/by-name/_3/_3proxy/package.nix @@ -4,6 +4,9 @@ fetchFromGitHub, pcre2, python3, + openssl, + cmake, + pkg-config, nixosTests, }: @@ -18,7 +21,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-hLxafFU6nJ3I3NT3R24LPD7PBmQ1IZEbrVqvfmMZHIM="; }; - buildInputs = [ pcre2 ]; + buildInputs = [ + pcre2 + openssl + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; nativeCheckInputs = [ python3 ]; @@ -26,32 +37,18 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck - python3 tests/run.py -v + python3 ../tests/run.py -v runHook postCheck ''; - # They use 'install -s', that calls the native strip instead of the cross. - # Don't strip binary on install, we strip it on fixup phase anyway. postPatch = '' - substituteInPlace Makefile.Linux \ - --replace-fail "(INSTALL_BIN) -s" "(INSTALL_BIN)" \ - --replace-fail "/usr" "" + substituteInPlace CMakeLists.txt \ + --replace-fail " /Library" " Library" \ + --replace-fail " /etc" " etc" \ + --replace-fail " /opt" " opt" \ + --replace-fail "/usr" "usr" ''; - makeFlags = [ - "-f Makefile.Linux" - "INSTALL=install" - "DESTDIR=${placeholder "out"}" - "CC:=$(CC)" - ]; - - postInstall = '' - rm -fr $out/var - ''; - - # common.c:208:9: error: initialization of 'int (*)(struct pollfd *, unsigned int, int)' from incompatible pointer type 'int (*)(struct pollfd *, nfds_t, int)' {aka 'int (*)(struct pollfd *, long unsigned int, int)'} - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - passthru.tests = { smoke-test = nixosTests._3proxy; }; @@ -60,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tiny free proxy server"; homepage = "https://github.com/3proxy/3proxy"; license = lib.licenses.bsd2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ misuzu ]; identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "3proxy" finalAttrs.version; }; diff --git a/pkgs/by-name/_7/_7zip-zstd/package.nix b/pkgs/by-name/_7/_7zip-zstd/package.nix index e84cc739cc27..c4af95b5d3b3 100644 --- a/pkgs/by-name/_7/_7zip-zstd/package.nix +++ b/pkgs/by-name/_7/_7zip-zstd/package.nix @@ -12,11 +12,13 @@ && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isWindows), _experimental-update-script-combinators, nix-update-script, + _7zz, enableUnfree ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "7zip-zstd"; version = "26.02-v1.5.7-R2"; + inherit (_7zz) setupHook; src = fetchFromGitHub { owner = "mcmilk"; @@ -141,7 +143,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - setupHook = ./setup-hook.sh; passthru.updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { attrPath = "_7zip-zstd"; diff --git a/pkgs/by-name/_7/_7zip-zstd/setup-hook.sh b/pkgs/by-name/_7/_7zip-zstd/setup-hook.sh deleted file mode 100644 index e1cf7538966b..000000000000 --- a/pkgs/by-name/_7/_7zip-zstd/setup-hook.sh +++ /dev/null @@ -1,12 +0,0 @@ -unpackCmdHooks+=(_try7zip) -unpackCmdHooks+=(_tryUnpackDmg) - -_try7zip() { - if ! [[ $curSrc =~ \.7z$ ]]; then return 1; fi - 7z x -snld "$curSrc" -} - -_tryUnpackDmg() { - if ! [[ $curSrc =~ \.dmg$ ]]; then return 1; fi - 7z x -sns- -snld "$curSrc" -} diff --git a/pkgs/by-name/ac/ace-of-penguins/package.nix b/pkgs/by-name/ac/ace-of-penguins/package.nix index 1f552e78cf05..8c8bee96de61 100644 --- a/pkgs/by-name/ac/ace-of-penguins/package.nix +++ b/pkgs/by-name/ac/ace-of-penguins/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { let generateItem = gameName: { name = "ace-of-penguins-${gameName}"; - exec = "${placeholder "out"}/bin/${gameName}"; + exec = gameName; comment = "Ace of Penguins ${gameName} Card Game"; desktopName = gameName; genericName = gameName; diff --git a/pkgs/by-name/ac/acme-client/package.nix b/pkgs/by-name/ac/acme-client/package.nix index 01903febec36..0e33e0c728b6 100644 --- a/pkgs/by-name/ac/acme-client/package.nix +++ b/pkgs/by-name/ac/acme-client/package.nix @@ -9,11 +9,11 @@ gccStdenv.mkDerivation (finalAttrs: { pname = "acme-client"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "https://files.wolfsden.cz/releases/acme-client/acme-client-${finalAttrs.version}.tar.gz"; - hash = "sha256-Mq+6epLcgEnlQ0JAPYCxGQu7EM0VS0Y32PYuvEuliAE="; + hash = "sha256-P+Gp5R4lNIFlwYvfw91pPCtejFBnx51x2/2dWx8v9Ag="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/advent-of-code-data/package.nix b/pkgs/by-name/ad/advent-of-code-data/package.nix new file mode 100644 index 000000000000..94000ebf9461 --- /dev/null +++ b/pkgs/by-name/ad/advent-of-code-data/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.advent-of-code-data diff --git a/pkgs/by-name/ag/agentaps/package.nix b/pkgs/by-name/ag/agentaps/package.nix index 36b5b5cd728a..860ef3ab7267 100644 --- a/pkgs/by-name/ag/agentaps/package.nix +++ b/pkgs/by-name/ag/agentaps/package.nix @@ -7,51 +7,78 @@ makeWrapper, wrapGAppsHook4, versionCheckHook, + alsa-lib, fontconfig, freetype, gtk4, libGL, libxcb, libxkbcommon, + libxml2, + llvmPackages, qt6, vulkan-loader, wayland, + zig_0_16, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "agentaps"; - version = "0.5.0"; + version = "0.6.0"; __structuredAttrs = true; src = fetchFromGitHub { - owner = "domenkozar"; + owner = "cachix"; repo = "agentaps"; tag = "v${finalAttrs.version}"; - hash = "sha256-nPA3kRbWyWWUa8L/dVGXaHCQ9onKL0Loe5mxE+mIfQM="; + hash = "sha256-JBAIr21yk81+pSQnnNXv4hdZEUY9HngYGJP+5/Wqa2I="; }; - cargoHash = "sha256-wg56HjRsGm0noQRD5hdHQkmbe56h3JHfZunuPzko66I="; + cargoHash = "sha256-K3c1FZWUE5bX56OcdO452qrQ4St0HXWZiWFBKWoyjX4="; + + zigDeps = zig_0_16.fetchDeps { + inherit (finalAttrs) pname version; + src = "${finalAttrs.cargoDeps}/source-registry-0/gpui-libghostty-0.3.1/vendor/ghostty"; + fetchAll = true; + hash = "sha256-l6BjpfE7S/q4D0BIx5p6EfdawgovZ2PtOUWH3eWEuc8="; + }; nativeBuildInputs = [ makeWrapper pkg-config qt6.wrapQtAppsHook wrapGAppsHook4 + zig_0_16 ]; buildInputs = [ + alsa-lib fontconfig freetype gtk4 libGL libxcb libxkbcommon + libxml2 + llvmPackages.libcxx qt6.qtbase vulkan-loader wayland ]; + # Cargo drives the embedded Ghostty build. + dontUseZigBuild = true; + dontUseZigCheck = true; + dontUseZigInstall = true; + + postConfigure = '' + export GHOSTTY_ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + cp -r ${finalAttrs.zigDeps} "$GHOSTTY_ZIG_GLOBAL_CACHE_DIR/p" + chmod -R u+w "$GHOSTTY_ZIG_GLOBAL_CACHE_DIR/p" + mkdir -p "$GHOSTTY_ZIG_GLOBAL_CACHE_DIR/tmp" + ''; + nativeCheckInputs = [ git ]; # The login shell test requires /bin/sh and /usr/bin/env, which are absent in the sandbox. @@ -81,8 +108,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Desktop client for Agent Client Protocol agents"; - homepage = "https://github.com/domenkozar/agentaps"; - changelog = "https://github.com/domenkozar/agentaps/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/cachix/agentaps"; + changelog = "https://github.com/cachix/agentaps/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.asl20; mainProgram = "agentaps"; maintainers = with lib.maintainers; [ domenkozar ]; diff --git a/pkgs/by-name/al/alibuild/package.nix b/pkgs/by-name/al/alibuild/package.nix index 50194296a710..75a73ca3875d 100644 --- a/pkgs/by-name/al/alibuild/package.nix +++ b/pkgs/by-name/al/alibuild/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "alibuild"; - version = "1.17.46"; + version = "1.17.48"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-fF1G5ec6DE1ktcKhGc6U5KGzf8S3jlsMpWjD2hUgrk4="; + hash = "sha256-uxATZVPvdk5TICoSc2yRwRxBNRRd5UC888YWyHv/4tA="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ar/arcdps-log-manager/package.nix b/pkgs/by-name/ar/arcdps-log-manager/package.nix index 9dad83b757e0..8781d3158382 100644 --- a/pkgs/by-name/ar/arcdps-log-manager/package.nix +++ b/pkgs/by-name/ar/arcdps-log-manager/package.nix @@ -13,13 +13,13 @@ }: buildDotnetModule (finalAttrs: { pname = "arcdps-log-manager"; - version = "1.17"; + version = "1.17.1"; src = fetchFromGitHub { owner = "gw2scratch"; repo = "evtc"; tag = "manager-v${finalAttrs.version}"; - hash = "sha256-tIR8t19mcAN70Hi5TZcxsx+5WFZZZB8LaadD2HWsGOU="; + hash = "sha256-ZCQr/98KsCI/X9SIbXw4rupNhccOaLMLut07N7bvmwo="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/as/asn1scc/deps.json b/pkgs/by-name/as/asn1scc/deps.json new file mode 100644 index 000000000000..10f145b15bde --- /dev/null +++ b/pkgs/by-name/as/asn1scc/deps.json @@ -0,0 +1,372 @@ +[ + { + "pname": "Argu", + "version": "6.2.5", + "hash": "sha256-5HcZcvco4e8+hgLhzlxk7ZmFVLtZL9LVr7LbmXsLmNU=" + }, + { + "pname": "coverlet.collector", + "version": "3.2.0", + "hash": "sha256-2aM3pKX5toQQRLKpH5ArzND2Rgq1fSpMsLxcEDbat+M=" + }, + { + "pname": "FSharp.Collections.ParallelSeq", + "version": "1.2.0", + "hash": "sha256-2/3Bs9shlzkNGvR+m0R9Izb8UUb8VKO60dAlBDiIUls=" + }, + { + "pname": "FSharp.Core", + "version": "4.6.2", + "hash": "sha256-17QZc+S6FPSiHnrWOEuIxL1Aw1UZiXX0v58KeTuk2Sw=" + }, + { + "pname": "FSharp.Core", + "version": "6.0.0", + "hash": "sha256-aQDRgiGC7iTyzNEmvyd2RBCDcLG0I1dbfncHlkbeUMI=" + }, + { + "pname": "FSharp.Core", + "version": "9.0.300-beta.25079.4", + "hash": "sha256-GoHmLWad7fOC4XEVoUWg900H0V29wKxJm0ybEYOnfWU=" + }, + { + "pname": "FsToolkit.ErrorHandling", + "version": "2.7.0", + "hash": "sha256-J5Mf5ManlsEMcy/DZoIlWAii6lFVJotUBFTwY6G1LUk=" + }, + { + "pname": "MediatR", + "version": "8.1.0", + "hash": "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "1.0.0", + "hash": "sha256-cC29sl84h4uVyJq2IPiRNk1G27Zx/Ebn7hLPXbMqvQE=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "1.1.1", + "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" + }, + { + "pname": "Microsoft.Build", + "version": "17.7.2", + "hash": "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.7.2", + "hash": "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.7.2", + "hash": "sha256-FfKMhyVEAiRd3VDkotnFHnSmlYGQTh4ZqkEF2+8sriY=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "2.0.0", + "hash": "sha256-SSemrjaokMnzOF8ynrgEV6xEh4TlesUE7waW2BLuWns=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "3.0.0", + "hash": "sha256-lpP5mBEYnDZIS/ceg8U35Tq/Ve20q8WoGzOw9+6wIJc=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "2.0.0", + "hash": "sha256-jveXZPNvx30uWT3q80OA1YaSb4K/KGOhlyun97IXn8Y=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "3.0.0", + "hash": "sha256-GJDvt3qFAif5ToFjHgs8imCaUER7yvYJghnlYXiHrHU=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "2.0.0", + "hash": "sha256-7GVLiJupIL3BS5XgB44M95TxzF4KwvVUsShko+pqO98=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "3.0.0", + "hash": "sha256-fyepoZ8UhC9qbFt1eD0crVWoeVYL5l/Skz5Qs4WBJZA=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "2.0.0", + "hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "3.0.0", + "hash": "sha256-RyT+m4OsHb1csXt5OYtjdx8LIsRlOKEWzSbAm4jfCzM=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "2.0.0", + "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "3.0.0", + "hash": "sha256-dGTb6sHsjZ86fiLnwbauGf9CQdN7G96lCM4ADjaSSBs=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "3.0.0", + "hash": "sha256-GfRf11n3wZj92l6e0n5uTMY4KdPZCMWQHWraeyhWNKk=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "3.0.0", + "hash": "sha256-p70uTENWQc0J7ibLHlRHWk3RYZg0DMP3g2m4kAUaoxA=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "2.0.0", + "hash": "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "3.0.0", + "hash": "sha256-43Unnj57IA5OzebT6XMAXylzDDBuk8KNFaR4chRE/e8=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "2.0.0", + "hash": "sha256-lD4xwvlLRLdJ2WdaHWGpEIRWOtWcvbr4ccD8v2QeTMc=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "2.0.0", + "hash": "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "3.0.0", + "hash": "sha256-cwlj0X19gngcOB7kpODhF/h96/L6psMLBIOd2pf3CbU=" + }, + { + "pname": "Microsoft.NET.StringTools", + "version": "17.7.2", + "hash": "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.7.2", + "hash": "sha256-EMtV5zcucAcJMGIb/KSqIQnK7PA6aJCgZSobc+5t6SE=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.7.2", + "hash": "sha256-uOe3ELE7iAusTBgxhsx78d4lBw28eDTew13ZnW2bsnU=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.7.2", + "hash": "sha256-pox8kez5tgXX4mAiu9qybrlI7oURzPm7YsCd42N4+us=" + }, + { + "pname": "Microsoft.VisualStudio.Threading", + "version": "16.7.56", + "hash": "sha256-V2HB/0j+I/3iUT7mEVyeF11P/61cSpYcZQa1LnXuoI8=" + }, + { + "pname": "Microsoft.VisualStudio.Threading.Analyzers", + "version": "16.7.56", + "hash": "sha256-4lsL6hg1mposZ62buQWBud1B4raV8Pl+BkyvM4FraRM=" + }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "15.5.31", + "hash": "sha256-/NWbGyad7wejY8QyxK8YWTgiRiUGjimaBgoLkWxOCao=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "7.0.0", + "hash": "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "3.1.1", + "hash": "sha256-TLysbO9bgiztIap44o875ZPpuVAOC6ueaRTKsiVicXg=" + }, + { + "pname": "MSTest.TestFramework", + "version": "3.1.1", + "hash": "sha256-Vqu+IDuYjiR39QOJW7GHiH7CeF2cBfNIYYTXmVeeb9E=" + }, + { + "pname": "Nerdbank.Streams", + "version": "2.6.81", + "hash": "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs=" + }, + { + "pname": "Newtonsoft.Json", + "version": "11.0.2", + "hash": "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "NuGet.Frameworks", + "version": "6.5.0", + "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" + }, + { + "pname": "OmniSharp.Extensions.JsonRpc", + "version": "0.19.5", + "hash": "sha256-iwluvSBBemilT9iW3TDMB1D6bzKx+fgsalNu1tnYjEY=" + }, + { + "pname": "OmniSharp.Extensions.JsonRpc.Generators", + "version": "0.19.5", + "hash": "sha256-aAvS2DLVWtgLTxRwRDPb7cOALN7Anpejd6jRJLonTNU=" + }, + { + "pname": "OmniSharp.Extensions.LanguageProtocol", + "version": "0.19.5", + "hash": "sha256-Mcxq+aAYWUpyWVWU8VUgWeFeAuRbQRxjNATSZvjKj7I=" + }, + { + "pname": "OmniSharp.Extensions.LanguageServer", + "version": "0.19.5", + "hash": "sha256-lWL4Y+zKMCMV5pK4BuLBk0UczIz3anqgUlYqkgGrfTM=" + }, + { + "pname": "OmniSharp.Extensions.LanguageServer.Shared", + "version": "0.19.5", + "hash": "sha256-cBhiB/69T2b3xu+/D5o+AanglYTuaXU5OfIOW3WtnzE=" + }, + { + "pname": "Serilog", + "version": "2.10.0", + "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE=" + }, + { + "pname": "Serilog", + "version": "2.5.0", + "hash": "sha256-oOf6KDVOq/uf/I18N0N/u5q7DPlQ/5T/TLsOtOqdA1M=" + }, + { + "pname": "Serilog", + "version": "2.8.0", + "hash": "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To=" + }, + { + "pname": "Serilog.Extensions.Logging", + "version": "3.0.1", + "hash": "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk=" + }, + { + "pname": "Serilog.Sinks.Debug", + "version": "2.0.0", + "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" + }, + { + "pname": "Serilog.Sinks.File", + "version": "4.1.0", + "hash": "sha256-ir1quhEV0eLu65sZfJd+SlTcyJVQ/iJDVJb+4GC6x+c=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "4.4.0", + "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "7.0.0", + "hash": "sha256-SgBexTTjRn23uuXvkzO0mz0qOfA23MiS4Wv+qepMLZE=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "7.0.0", + "hash": "sha256-aSK1lQN9a/guffT8jUW+zKc5bOIvKRcds/XbVk766Jo=" + }, + { + "pname": "System.Drawing.Common", + "version": "7.0.0", + "hash": "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "4.7.3", + "hash": "sha256-nis1vH2bdwxvbKm00PYvGzIbmCwX9U5AbJFOU3oqVzY=" + }, + { + "pname": "System.Reactive", + "version": "4.4.1", + "hash": "sha256-inA6nw9CX0g/AeygMwJoARGOY79pli/jLF54CweUqD8=" + }, + { + "pname": "System.Reflection.MetadataLoadContext", + "version": "7.0.0", + "hash": "sha256-VYl6SFD130K9Aw4eJH16ApJ9Sau4Xu0dcxEip2veuTI=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.4.0", + "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "7.0.0", + "hash": "sha256-aS5fVYrujUCkAnth2QQPp8knG169BsK/BX8lqaHRSZc=" + }, + { + "pname": "System.Security.Permissions", + "version": "7.0.0", + "hash": "sha256-DOFoX+AKRmrkllykHheR8FfUXYx/Ph+I/HYuReQydXI=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Windows.Extensions", + "version": "7.0.0", + "hash": "sha256-yRivIiENFKMxbSh8SZ/fmKjshwBdFXzbKmZcfDZwKYc=" + } +] diff --git a/pkgs/by-name/as/asn1scc/package.nix b/pkgs/by-name/as/asn1scc/package.nix new file mode 100644 index 000000000000..4fd962ead922 --- /dev/null +++ b/pkgs/by-name/as/asn1scc/package.nix @@ -0,0 +1,49 @@ +{ + lib, + pkgs, + buildDotnetModule, + callPackage, + dotnetCorePackages, + fetchFromGitHub, + nix-update-script, + testers, +}: +buildDotnetModule (finalAttrs: { + pname = "asn1scc"; + version = "4.9.28.0"; + + src = fetchFromGitHub { + owner = "esa"; + repo = "asn1scc"; + tag = finalAttrs.version; + hash = "sha256-0hyyeUIK3oAx16DvV4CqCrW131de0f7QLN5/EyU9Qf0="; + }; + + nativeBuildInputs = with pkgs; [ jre ]; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; + + executables = [ "asn1scc" ]; + + passthru = { + updateScript = nix-update-script { }; + tests = { + run = callPackage ./test.nix { asn1scc = finalAttrs.finalPackage; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + }; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + mainProgram = "asn1scc"; + homepage = "https://www.thanassis.space/asn1.html"; + description = "Open Source ASN.1 Compiler"; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ cve ]; + }; +}) diff --git a/pkgs/by-name/as/asn1scc/test.nix b/pkgs/by-name/as/asn1scc/test.nix new file mode 100644 index 000000000000..d586210f237b --- /dev/null +++ b/pkgs/by-name/as/asn1scc/test.nix @@ -0,0 +1,36 @@ +# Compiles a simple ASN.1 file and checks whether the output is valid C. +{ + runCommand, + gcc, + asn1scc, + writeText, +}: +let + asn1File = writeText "foo.asn1" '' + FooProtocol DEFINITIONS ::= BEGIN + FooQuestion ::= SEQUENCE { + id INTEGER, + ack BOOLEAN + } + + FooAnswer ::= SEQUENCE { + id INTEGER, + ack BOOLEAN + } + + END + ''; +in +runCommand "asn1scc-test-run" + { + nativeBuildInputs = [ + asn1scc + gcc + ]; + } + '' + asn1scc --c-lang ${asn1File} + gcc -c asn1crt.c + gcc -c *-foo.c + touch $out + '' diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 1f26bd323862..ea750bb45ec7 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.50.0"; + version = "0.51.0"; __structuredAttrs = true; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-qrLcPFA6r/p4Tc7s3sVbt/w5RuCfYLLmA+fn9ZKHIk4="; + hash = "sha256-Rij1sHo0Z8dl4a2fyQO05ct242fi3wfWyXEpmL6B40o="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm .cargo/config.toml ''; - cargoHash = "sha256-TrWwhraCQ8saRpASRJi2wmflOA6YD7eCULeRURwHmko="; + cargoHash = "sha256-FRhFfzhf3ycs+3cBBRVE1eMoTu6+Q7kIGR+Dz7JHPzQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index 2e52aa8e57c8..3bdb16109a64 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -2,6 +2,7 @@ lib, buildGo127Module, fetchFromGitHub, + nixosTests, versionCheckHook, }: @@ -30,6 +31,10 @@ buildGo127Module (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/atlantis"; versionCheckProgramArg = "version"; + passthru.tests = { + inherit (nixosTests) atlantis; + }; + meta = { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; diff --git a/pkgs/by-name/au/audacious-bare/package.nix b/pkgs/by-name/au/audacious-bare/package.nix index 5d7a2a6d7d77..f0930416216d 100644 --- a/pkgs/by-name/au/audacious-bare/package.nix +++ b/pkgs/by-name/au/audacious-bare/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "audacious"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "audacious-media-player"; repo = "audacious"; rev = "${pname}-${version}"; - hash = "sha256-f1ugxM57dYDDq/G+16bXs6++KXnaLwT+mcPY0R371tY="; + hash = "sha256-+WzKbPtY9LuuT8INH4A6fiCoK0Z4RG1drmintQ7Lh5A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/audiobookshelf/client.nix b/pkgs/by-name/au/audiobookshelf/client.nix index b7f526624bff..a72cc50e62bc 100644 --- a/pkgs/by-name/au/audiobookshelf/client.nix +++ b/pkgs/by-name/au/audiobookshelf/client.nix @@ -1,23 +1,28 @@ { src, version, + routerBasePath, buildNpmPackage, nodejs, }: buildNpmPackage { pname = "audiobookshelf-client"; - inherit version nodejs; + inherit src version nodejs; - src = "${src}/client"; + sourceRoot = "${src.name}/client"; npmDepsHash = "sha256-Rvy/bULWyVkGthfpIGkTMO8Lv1miywwea7jLODfm54Y="; - env = { - # don't download the Cypress binary - CYPRESS_INSTALL_BINARY = 0; - NODE_OPTIONS = "--openssl-legacy-provider"; - }; + env.ROUTER_BASE_PATH = routerBasePath; + + npmRebuildFlags = [ "--ignore-scripts" ]; npmBuildScript = "generate"; + + installPhase = '' + runHook preInstall + cp -r dist "$out" + runHook postInstall + ''; } diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index aa50dfb8fbcc..9562f7ecd51e 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -1,32 +1,18 @@ { lib, - stdenv, fetchFromGitHub, buildNpmPackage, callPackage, nodejs_24, ffmpeg_8-full, nunicode, - util-linux, - python3, - getopt, + typescript_5, + jq, nixosTests, nix-update-script, + routerBasePath ? "/audiobookshelf", }: -let - ffmpeg-full = ffmpeg_8-full; - nodejs = nodejs_24; - - wrapper = import ./wrapper.nix { - inherit - stdenv - ffmpeg-full - nunicode - getopt - ; - }; -in buildNpmPackage (finalAttrs: { pname = "audiobookshelf"; version = "2.37.1"; @@ -40,33 +26,60 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-xHjZ3E1DGeb5NueP67hEX3vHH0Qlk4LTeZkMEFBhGyE="; - inherit nodejs; + nodejs = nodejs_24; - buildInputs = [ util-linux ]; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ + typescript_5 + jq + ]; - dontNpmBuild = true; - npmInstallFlags = [ "--only-production" ]; + npmBuildScript = "build:server"; + npmInstallFlags = [ "--omit=dev" ]; - client = callPackage ./client.nix { inherit (finalAttrs) src version nodejs; }; + makeWrapperArgs = [ + "--set" + "FFMPEG_PATH" + (lib.getExe ffmpeg_8-full) + "--set" + "FFPROBE_PATH" + (lib.getExe' ffmpeg_8-full "ffprobe") + "--set" + "NODE_ENV" + "production" + "--set" + "NUSQLITE3_PATH" + "${nunicode.sqlite}/lib/libnusqlite3" + "--set" + "ROUTER_BASE_PATH" + (lib.escapeShellArg routerBasePath) + "--set" + "SKIP_BINARIES_CHECK" + "1" + "--set" + "SOURCE" + "nixpkgs" + ]; installPhase = '' runHook preInstall - mkdir -p $out/opt/client - cp -r index.js server package* node_modules $out/opt/ - cp -r ${finalAttrs.client}/lib/node_modules/audiobookshelf-client/dist $out/opt/client/dist - mkdir $out/bin + packageOut="$out/lib/node_modules/$(jq --raw-output '.name' package.json)" - echo '${wrapper}' > $out/bin/audiobookshelf - echo " exec ${finalAttrs.nodejs}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf + mkdir -p "$packageOut"/{client,dist-server} + cp -r dist-server/{index.js,package.json,server} "$packageOut"/dist-server/ + cp -r node_modules package.json "$packageOut"/ + cp -r ${finalAttrs.passthru.client} "$packageOut"/client/dist - chmod +x $out/bin/audiobookshelf + nodejsInstallExecutables runHook postInstall ''; passthru = { + client = callPackage ./client.nix { + inherit (finalAttrs) src version nodejs; + inherit routerBasePath; + }; tests.basic = nixosTests.audiobookshelf; updateScript = nix-update-script { extraArgs = [ "--subpackage=client" ]; }; }; @@ -74,14 +87,19 @@ buildNpmPackage (finalAttrs: { meta = { homepage = "https://www.audiobookshelf.org/"; description = "Self-hosted audiobook and podcast server"; - changelog = "https://github.com/advplyr/audiobookshelf/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3; + changelog = "https://github.com/advplyr/audiobookshelf/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ jvanbruegge adamcstephens tebriel + connor-grady ]; platforms = lib.platforms.linux; mainProgram = "audiobookshelf"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; }; }) diff --git a/pkgs/by-name/au/audiobookshelf/wrapper.nix b/pkgs/by-name/au/audiobookshelf/wrapper.nix deleted file mode 100644 index 32d2705b6c62..000000000000 --- a/pkgs/by-name/au/audiobookshelf/wrapper.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - stdenv, - ffmpeg-full, - nunicode, - getopt, -}: -'' - #!${stdenv.shell} - - port=8000 - host=0.0.0.0 - config=$(pwd)/config - metadata=$(pwd)/metadata - - LONGOPTS=host:,port:,config:,metadata:,help - args=$(${getopt}/bin/getopt -l "$LONGOPTS" -o h -- "$@") - - eval set -- "$args" - - while [ $# -ge 1 ]; do - case "$1" in - --) - # No more options left. - shift - break - ;; - --host) - host="$2" - shift - ;; - --port) - port="$2" - shift - ;; - --config) - if [[ "''${2:0:1}" = "/" ]]; then - config="$2" - else - config="$(pwd)/$2" - fi - shift - ;; - --metadata) - if [[ "''${2:0:1}" = "/" ]]; then - metadata="$2" - else - metadata="$(pwd)/$2" - fi - shift - ;; - --help|-h) - echo "Usage: audiobookshelf [--host ] [--port ] [--metadata ] [--config ]" - exit 0 - ;; - esac - shift - done - - NODE_ENV=production \ - SOURCE=nixpkgs \ - SKIP_BINARIES_CHECK=1 \ - FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \ - FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \ - NUSQLITE3_PATH=${nunicode.sqlite}/lib/libnusqlite3 \ - CONFIG_PATH="$config" \ - METADATA_PATH="$metadata" \ - PORT="$port" \ - HOST="$host" \'' diff --git a/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch b/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch index 7f560d00ee26..d46173717a31 100644 --- a/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch +++ b/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch @@ -1,51 +1,45 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,7 +75,7 @@ - set(DLIB_USE_MKL_FFT OFF) - set(DLIB_USE_FFMPEG OFF) - set(CMAKE_CXX_STANDARD 17) # dlib must be compiled with C++17 -- FetchContent_MakeAvailable(dlib) -+ add_subdirectory(dlib) - set(CMAKE_CXX_STANDARD 20) # continue with C++20 +@@ -48,12 +48,7 @@ + message(FATAL_ERROR "BS.thread_pool headers not found") endif() - add_compile_definitions("DLIB_AVAILABLE") -@@ -106,7 +106,6 @@ - thread_pool - GIT_REPOSITORY https://github.com/bshoshany/thread-pool - ) + else() +- FetchContent_Declare( +- thread_pool +- GIT_REPOSITORY https://github.com/bshoshany/thread-pool +- ) - FetchContent_MakeAvailable(thread_pool) - set(BS_THREAD_POOL_INCLUDE_DIR ${thread_pool_SOURCE_DIR}/include) +- set(BS_THREAD_POOL_INCLUDE_DIR ${thread_pool_SOURCE_DIR}/include) ++ set(BS_THREAD_POOL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thread_pool/include) endif() -@@ -121,7 +120,6 @@ - gcem - GIT_REPOSITORY https://github.com/klytje/gcem - ) + if (POCKETFFT) +@@ -63,13 +58,7 @@ + message(FATAL_ERROR "pocketfft headers not found") + endif() + else() +- FetchContent_Declare( +- pocketfft +- GIT_REPOSITORY https://github.com/mreineck/pocketfft +- GIT_TAG c90e55b3d529f8efa40ed01a20de22405f45fc65 # the header-only C++ version lives on the "cpp" branch, which carries no tags +- ) +- FetchContent_MakeAvailable(pocketfft) +- set(POCKETFFT_INCLUDE_DIR ${pocketfft_SOURCE_DIR}) ++ set(POCKETFFT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/pocketfft) + endif() + add_compile_definitions("POCKETFFT_AVAILABLE") + endif() +@@ -81,12 +70,7 @@ + message(FATAL_ERROR "GCEM headers not found") + endif() + else() +- FetchContent_Declare( +- gcem +- GIT_REPOSITORY https://github.com/klytje/gcem +- ) - FetchContent_MakeAvailable(GCEM) - set(GCEM_INCLUDE_DIR ${gcem_SOURCE_DIR}/include) +- set(GCEM_INCLUDE_DIR ${gcem_SOURCE_DIR}/include) ++ set(GCEM_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/gcem/include) endif() -@@ -131,7 +129,9 @@ - ) - unset(compile_options) - --include_directories(${BS_THREAD_POOL_INCLUDE_DIR} ${GCEM_INCLUDE_DIR} ${BACKWARD_INCLUDE_DIR}) -+include_directories(${BACKWARD_INCLUDE_DIR}) -+add_subdirectory(gcem) -+include_directories(thread_pool/include gcem/include) - - ############################################ - ## Find and link CURL ## ---- a/executable/gui/CMakeLists.txt -+++ b/executable/gui/CMakeLists.txt -@@ -6,7 +6,9 @@ - nfd - GIT_REPOSITORY https://github.com/btzy/nativefiledialog-extended.git - ) --FetchContent_MakeAvailable(elements CLI11 nfd) -+find_package(CLI11 CONFIG REQUIRED) -+add_subdirectory(${CMAKE_SOURCE_DIR}/elements elements_build) -+add_subdirectory(${CMAKE_SOURCE_DIR}/nfd nfd_build) - - # set the path to the elements root & module path - set(ELEMENTS_ROOT "${elements_SOURCE_DIR}") + set_property( diff --git a/pkgs/by-name/au/ausaxs/elements-cmake-no-fetchcontent.patch b/pkgs/by-name/au/ausaxs/elements-cmake-no-fetchcontent.patch deleted file mode 100644 index 7cf1f798e092..000000000000 --- a/pkgs/by-name/au/ausaxs/elements-cmake-no-fetchcontent.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -229,7 +229,7 @@ - GIT_SUBMODULES_RECURSE ON - ) - --FetchContent_MakeAvailable(cycfi_infra) -+add_subdirectory(${CMAKE_SOURCE_DIR}/cycfi_infra cycfi_infra_build) - target_link_libraries(elements PUBLIC cycfi::infra) - - ############################################################################### -@@ -270,9 +270,7 @@ - - FetchContent_Declare( - asio -- GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git -- GIT_TAG asio-1-29-0 -- GIT_SHALLOW TRUE -+ SOURCE_DIR ${CMAKE_SOURCE_DIR}/asio - ) - FetchContent_MakeAvailable(asio) diff --git a/pkgs/by-name/au/ausaxs/package.nix b/pkgs/by-name/au/ausaxs/package.nix index 92a3f52dcfa0..e895ff23fb75 100644 --- a/pkgs/by-name/au/ausaxs/package.nix +++ b/pkgs/by-name/au/ausaxs/package.nix @@ -4,25 +4,14 @@ fetchFromGitHub, cmake, doxygen, - libwebp, curl, cli11, python3, pkg-config, - cairo, - gtk3, catch2_3, - backward-cpp, }: let - dlib = fetchFromGitHub { - owner = "davisking"; - repo = "dlib"; - tag = "v20.0"; - hash = "sha256-VTX7s0p2AzlvPUsSMXwZiij+UY9g2y+a1YIge9bi0sw="; - }; - thread-pool = fetchFromGitHub { owner = "bshoshany"; repo = "thread-pool"; @@ -37,57 +26,30 @@ let hash = "sha256-bnWakLHl/afpeFm6S32ku0IkniyIs8X+LE1NmV6p0ho="; }; - elements = fetchFromGitHub { - owner = "cycfi"; - repo = "elements"; - rev = "71ecd1f4ebc76967c6812b1872db639784e40a2d"; - hash = "sha256-F3Dv+QboXfOSaXpbdOeWPtOC8orWGZc8ZBFho/X8Ky8="; - }; - - nfd = fetchFromGitHub { - owner = "btzy"; - repo = "nativefiledialog-extended"; - tag = "v1.2.1"; - hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY="; - }; - - asio = fetchFromGitHub { - owner = "chriskohlhoff"; - repo = "asio"; - tag = "asio-1-29-0"; - hash = "sha256-5WSrMe9n+8i/ZyvCsa4MMBguYbSz+7FwH0Z5JfHtRGM="; - }; - - cycfi_infra = fetchFromGitHub { - owner = "cycfi"; - repo = "infra"; - rev = "2dff97a4b107eced78e426152f5001a2331cb1cf"; - hash = "sha256-NmoPYhfsrC5oWFjJ9Ol83sR8aIkyQr6UpaCeZpW58PI="; - fetchSubmodules = true; + pocketfft = fetchFromGitHub { + owner = "mreineck"; + repo = "pocketfft"; + rev = "c90e55b3d529f8efa40ed01a20de22405f45fc65"; + hash = "sha256-K3yvh6i5f9VbAiQPyixgnlDCj4eBWPU8m3BNn+fScdM="; }; in stdenv.mkDerivation (finalAttrs: { pname = "ausaxs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "AUSAXS"; repo = "AUSAXS"; tag = "v${finalAttrs.version}"; - hash = "sha256-H3lozYImLNwQ7FYz3idgBX/o3miSyUxdZ+ZlJQP2Xms="; + hash = "sha256-3w1bTO2qWUic/1Js4VC7YAne20JegPwCWbfChq5lzy0="; }; patches = [ ./cmake-no-fetchcontent.patch ]; postPatch = '' - cp --recursive --no-preserve=mode ${dlib} dlib cp --recursive --no-preserve=mode ${thread-pool} thread_pool cp --recursive --no-preserve=mode ${gcem} gcem - cp --recursive --no-preserve=mode ${nfd} nfd - cp --recursive --no-preserve=mode ${elements} elements - cp --recursive --no-preserve=mode ${asio} asio - cp --recursive --no-preserve=mode ${cycfi_infra} cycfi_infra - patch -p1 -d elements < ${./elements-cmake-no-fetchcontent.patch} + cp --recursive --no-preserve=mode ${pocketfft} pocketfft ''; nativeBuildInputs = [ @@ -98,20 +60,14 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - backward-cpp catch2_3 curl cli11 - cairo - libwebp - gtk3 ]; cmakeFlags = [ - (lib.cmakeBool "GUI" true) (lib.cmakeBool "USE_SYSTEM_CATCH" true) (lib.cmakeBool "USE_SYSTEM_CLI11" true) - (lib.cmakeBool "USE_SYSTEM_BACKWARD" true) ]; postInstall = '' diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index 228f79b38ac1..6f3a1b0b595f 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -19,13 +19,13 @@ buildNimPackage rec { pname = "auto-editor"; - version = "31.6.0"; + version = "31.7.2"; src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; tag = version; - hash = "sha256-N7pQQD6SVl566z3ud3yY/EFiSbIVRFWwNtlJPTPSgsI="; + hash = "sha256-lbVF0PT48cxnm6hR43ULLx7QWV4nIUPeGUkeOuRr2Y0="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix index 32fa2a0413aa..53d40f6ba133 100644 --- a/pkgs/by-name/au/autotiling-rs/package.nix +++ b/pkgs/by-name/au/autotiling-rs/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "autotiling-rs"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ammgws"; repo = "autotiling-rs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-PuWSS2676IGmbjhiMEpHiOPfOoXyqNEQSbb6pd6FUHc="; + sha256 = "sha256-/lJ2lV4gA43Wd49GcDnP5XqJfRZfVX2n7KhlNdA+HtY="; }; cargoHash = "sha256-E+nn6rMbj1FzN0bl5jX3YnSHotSaXZGp3AdZuGlziv0="; diff --git a/pkgs/by-name/ba/badgemagic-rs/package.nix b/pkgs/by-name/ba/badgemagic-rs/package.nix index 028882981ea4..3d02d1e61890 100644 --- a/pkgs/by-name/ba/badgemagic-rs/package.nix +++ b/pkgs/by-name/ba/badgemagic-rs/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage { pname = "badgemagic-rs"; - version = "0.1.0-unstable-2025-07-15"; + version = "0.1.0-unstable-2026-06-28"; src = fetchFromGitHub { owner = "fossasia"; repo = "badgemagic-rs"; - rev = "5d745ab8fda418204425f3df0e969a98bf479f2d"; - hash = "sha256-IyPUPNbXkLNz/cuzVuzrD2iCE1ddeO3xkAOKhbrNU+k="; + rev = "3ac3c13828f8a111ffe0efb35094d9e3c43d6bf8"; + hash = "sha256-aCPvMD1qNoEQHvkIdyLwxyEBe4lWHOoiUpYYq9sHmm0="; }; - cargoHash = "sha256-jT/pJLqdWGTpQFlnhuZo1FLqRQJWXCD2tuDB2AEyNPQ="; + cargoHash = "sha256-BjuGanZRCuFjy23JrHQOI6rPMrfTHcj1uvAHkA4/x8c="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/ba/bashate/package.nix b/pkgs/by-name/ba/bashate/package.nix index d0ee31928130..c77e574787d9 100644 --- a/pkgs/by-name/ba/bashate/package.nix +++ b/pkgs/by-name/ba/bashate/package.nix @@ -2,7 +2,6 @@ lib, fetchPypi, python3Packages, - versionCheckHook, }: python3Packages.buildPythonApplication rec { @@ -25,16 +24,10 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ fixtures mock - stestr + stestrCheckHook testtools ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "bashate" ]; meta = { diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 0198bde29fc3..9d0e98b1c495 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -14,23 +14,23 @@ }: let pname = "beeper"; - version = "4.3.160"; + version = "4.3.209"; inherit (stdenv.hostPlatform) system; sources = { x86_64-linux = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-by07u75l8YjMnuL8VZWkAUjTkGmP/qwJoopIMtJX7Tc="; + hash = "sha256-QdoJguVXOHs8xtSL0wEqPv9zKFub66be5DNaFU6KMMc="; }; aarch64-linux = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-arm64.AppImage"; - hash = "sha256-4mUxNwPrHbJvYQmX4KdYZcEmfV2MuSOEXrQKgl7DIa0="; + hash = "sha256-2jRxSHK8cE4s8U72po9gIMrhm7IiJL5VPp2vidKLYe0="; }; aarch64-darwin = fetchurl { # Zip unpacks cleanly with unzip; the download API redirects to a .dmg. url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-arm64-mac.zip"; - hash = "sha256-XrFxN57uOXIbgL8va/tgWtAaFTDVp9IxDWGJU0Kskbs="; + hash = "sha256-bDXhMdzhtbcD1mEFXhycIG4PX8ep1s1nW7moaEUUXIw="; }; }; diff --git a/pkgs/by-name/bi/bitritter/package.nix b/pkgs/by-name/bi/bitritter/package.nix new file mode 100644 index 000000000000..b76b4806f4a1 --- /dev/null +++ b/pkgs/by-name/bi/bitritter/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromCodeberg, + rustPlatform, + pkg-config, + wrapGAppsHook4, + meson, + ninja, + rustc, + cargo, + desktop-file-utils, + openssl, + libadwaita, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bitritter"; + version = "2026-10"; + + __structuredAttrs = true; + + src = fetchFromCodeberg { + owner = "Chfkch"; + repo = "bitritter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-V3ZpYEAlj+fWbRenNZPyUeLsRCJ0kGp5c05RPmzgz0g="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-HhvErKWQUQD7Y5skokTBsZVoXqRuoOCiDfJ5SY+trTE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + meson + ninja + rustPlatform.cargoSetupHook + rustc + cargo + desktop-file-utils + openssl + ]; + + buildInputs = [ + openssl + libadwaita + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A Bitwarden compatible client designed for mobile Linux "; + homepage = "https://bitritter.dev/"; + changelog = "https://codeberg.org/Chfkch/bitritter/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Cameo007 + ]; + mainProgram = "bitritter"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 907b1663a9d4..60991e04bfaa 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -13,12 +13,12 @@ # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md stdenv.mkDerivation (finalAttrs: { pname = "boringssl"; - version = "0.20260929.0"; + version = "0.20261020.0"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; tag = finalAttrs.version; - hash = "sha256-ccqhnaYFSLp0dkv8PpdFvz+lzV0X9nL23O3rj5RRA0c="; + hash = "sha256-PKIXmxdr8DtYuz54vxxrSNy3qNYakFoGByoTTAHCB08="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index cc190e9ea238..8d473bb53464 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "buildkit"; - version = "0.32.2"; + version = "0.34.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${finalAttrs.version}"; - hash = "sha256-sRSFypb/CZiCISMumVTor9XI4KOCvBhY6UaNUk2Y4t8="; + hash = "sha256-yoZhov85nr9TcpYWPN22PHqr4KGCMjMEa9JRLC5NWAQ="; }; vendorHash = null; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index ac38bb6241d1..dc1ebe5dbbfe 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -17,7 +17,7 @@ assert lib.assertMsg ( let pname = "burpsuite"; - version = "2026.9.1"; + version = "2026.10"; src = fetchurl { name = "burpsuite.jar"; @@ -26,7 +26,7 @@ let "https://portswigger.net/burp/releases/download?product=desktop&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?product=desktop&version=${version}&type=Jar" ]; - hash = "sha256-8FgPLvZuZ5VG9TYyd9jBynLNy7v8PcR5HEbPLAUIEZo="; + hash = "sha256-pDpJmu9LRk/Sdp5QNxIWDa2fTr8Mr3FFqZsSqgNQITo="; }; description = "Integrated platform for performing security testing of web applications"; diff --git a/pkgs/by-name/c-/c-periphery/package.nix b/pkgs/by-name/c-/c-periphery/package.nix index b18ae01f640a..cfaee1a53f8f 100644 --- a/pkgs/by-name/c-/c-periphery/package.nix +++ b/pkgs/by-name/c-/c-periphery/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-periphery"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "vsergeev"; repo = "c-periphery"; tag = "v${finalAttrs.version}"; - hash = "sha256-lGBDf10kolwPrURwUEtiSCJYdyxZqJN/B1SnY08Ytns="; + hash = "sha256-IqQ9gmbh/bkQ6fwYegPPvqpHPTD9TJDQV7sPxuDNw7k="; }; outputs = [ diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index 9ee779721bf0..0c5f16b2ab7a 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -20,7 +20,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - version = "3.126"; + version = "3.131.1"; meta = { homepage = "https://firefox-source-docs.mozilla.org/security/nss/runbooks/rootstore.html#root-store-consumers"; description = "Bundle of X.509 certificates of public Certificate Authorities (CA)"; @@ -52,7 +52,7 @@ stdenv.mkDerivation { "https://hg-edge.mozilla.org/projects/nss/raw-file/${tag}/${file}" "https://raw.githubusercontent.com/nss-dev/nss/refs/tags/${tag}/${file}" ]; - hash = "sha256-gbfyV2MzouNg5nP5Etewt6dl2DbHMQA+NIpGysXTcZg="; + hash = "sha256-PsK00kDcEsdH6vRQBh24SvdXxIO72jAvninOtdcL5RA="; }; unpackPhase = '' diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix index eed7ab693f65..ebf1790c89d6 100644 --- a/pkgs/by-name/ca/cagebreak/package.nix +++ b/pkgs/by-name/ca/cagebreak/package.nix @@ -13,6 +13,7 @@ meson, ninja, nixosTests, + nix-update-script, pango, pixman, pkg-config, @@ -23,18 +24,18 @@ wayland-scanner, withXwayland ? true, xwayland, - wlroots_0_19, + wlroots_0_20, }: stdenv.mkDerivation (finalAttrs: { pname = "cagebreak"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; tag = finalAttrs.version; - hash = "sha256-ADRtfzmn8DmDNbiJO3WbhQZiriJoUAG2TxPmx+RwPXE="; + hash = "sha256-N8FNVZXugRKS+yeU53oAYxE7mm83PCIOLivOHnuB5tI="; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { systemdLibs wayland wayland-protocols - wlroots_0_19 + wlroots_0_20 ]; mesonFlags = [ @@ -93,5 +94,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cagebreak"; }; - passthru.tests.basic = nixosTests.cagebreak; + passthru = { + updateScript = nix-update-script { }; + tests.basic = nixosTests.cagebreak; + }; }) diff --git a/pkgs/by-name/ca/capacities/version.json b/pkgs/by-name/ca/capacities/version.json index 0ba64439ff2f..37709555c43d 100644 --- a/pkgs/by-name/ca/capacities/version.json +++ b/pkgs/by-name/ca/capacities/version.json @@ -1,5 +1,5 @@ { - "url": "https://web.archive.org/web/20261007144947/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.71.19.AppImage", - "sha256": "0v6ra1fxv1h2avwd695mkf9blid4z52pqqacxzma6h10kgwshbgr", - "version": "1.71.19" + "url": "https://web.archive.org/web/20261018115728/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.71.32.AppImage", + "sha256": "0rbaq2bn3w1rci4ipjdhx2ryzq82anpyx6qd3y2cin6kv94zn1jf", + "version": "1.71.32" } diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index cdf8e2571830..5b1198e7d853 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.126"; + version = "1.0.127"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-YiJyh2bti5eA02MvJxBPUs+xmfGerVy8kUhMMB2jwbo="; + hash = "sha256-IRNIWIvNYVB93Q9yEg3QSBgI4o0pH6Lv3CWI70GjJJM="; }; - cargoHash = "sha256-TjZ8GY7WjkTs5Nvi7w26evcHzcwUz+VAjl9y85+Cj5M="; + cargoHash = "sha256-jFgbAtbMmNnyYE1qiNzWL3DKqSTB5fmd5/n2NmchavM="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index baf1af855a42..50e20c453477 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-modules"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "regexident"; repo = "cargo-modules"; tag = "v${finalAttrs.version}"; - hash = "sha256-wwGuf6ev2H19XauDN60T9NS/onY6ZKr99S6nGhK/V98="; + hash = "sha256-tNmzhVaA5RehRxYfhrXKpnk8yh9sbLAKX2R8jrgz6r0="; }; - cargoHash = "sha256-cESCXoETQzy+3Lb/z2jdbPmnyYNEoNUckFsPZWfDF8o="; + cargoHash = "sha256-k+TdO5NNGAWzPpJ7OF5igU4L/Iqt1RAJUObDasAtxEA="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" diff --git a/pkgs/by-name/ca/cargo-preflight/package.nix b/pkgs/by-name/ca/cargo-preflight/package.nix index db61725e9fc7..4b4d8b000071 100644 --- a/pkgs/by-name/ca/cargo-preflight/package.nix +++ b/pkgs/by-name/ca/cargo-preflight/package.nix @@ -4,6 +4,8 @@ rustPlatform, nix-update-script, pkg-config, + libgit2, + libz, openssl, }: @@ -11,6 +13,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-preflight"; version = "0.5.1"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "supinie"; repo = "cargo-preflight"; @@ -20,9 +24,18 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-q/JbaFr1ISe0OiKeGBQQlZ2TaMTJkLABilibcp98svM="; + env = { + LIBGIT2_NO_VENDOR = 1; + LIBZ_SYS_STATIC = 0; + }; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ + libgit2 + libz + openssl + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix index 09b794d61339..c094290847be 100644 --- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix +++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { binary protocol and Cassandra Query Language v3. ''; license = lib.licenses.asl20; - platforms = lib.platforms.x86_64; + platforms = lib.platforms.linux; homepage = "https://docs.datastax.com/en/developer/cpp-driver/"; maintainers = [ lib.maintainers.npatsakula ]; }; diff --git a/pkgs/by-name/ca/cassette/package.nix b/pkgs/by-name/ca/cassette/package.nix index ed808babcf85..2f3a85ca628a 100644 --- a/pkgs/by-name/ca/cassette/package.nix +++ b/pkgs/by-name/ca/cassette/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cassette"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "Rirusha"; repo = "Cassette"; rev = "v${finalAttrs.version}"; - hash = "sha256-ceXEWcSBQMbG9cuhWjtwI0z/gTzI1t5+9qvFcUeKyrQ="; + hash = "sha256-khPigEzhTHPjbXyl6Rye6Vg8JnVEXhOrJ2lAok40K8g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 96d1f591053a..2733fa14f867 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.207.64"; + version = "2.207.68"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-BtaYzxENteC6U7DbbQfebL8e9BWPJl+1w0j4P1702xg="; + hash = "sha256-sEMdJKgkez70avlUmiZEYBURtTTiGnxxl/0elOA22v0="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-6Qiz1/1/OHMiXEAAG2ggt7BJmsTNUSln0SMJs2gFMgM="; + hash = "sha256-2Hpj9yuUoQJjdPrkp2WZ9SjmLPop32O/hpT2aZA6C0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdvd/package.nix b/pkgs/by-name/cd/cdvd/package.nix new file mode 100644 index 000000000000..9d5a34fccaf4 --- /dev/null +++ b/pkgs/by-name/cd/cdvd/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "cdvd"; + version = "0-unstable-2026-09-19"; + + src = fetchFromGitHub { + owner = "Szmelc-INC"; + repo = "cdvd"; + rev = "5a6ff849a58e0923a86045bfd90067f8cb7f8d67"; + hash = "sha256-X3dRhW3/rvHOPD6SYT+7S3zLPC0GjYiru53gJUSq1BY="; + }; + + strictDeps = true; + __structuredAttrs = true; + + buildInputs = [ ncurses ]; + + installFlags = [ "BINDIR=$(out)/bin" ]; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + description = "Eyecandy screensaver"; + longDescription = '' + A tiny C/ncurses eye candy for the command line. It draws a + bouncing DVD logo with a few extra features. + ''; + homepage = "https://github.com/Szmelc-INC/cdvd"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ yiyu ]; + mainProgram = "cdvd"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ce/cef-binary/package.nix b/pkgs/by-name/ce/cef-binary/package.nix index 2d2ef6d5b7bd..233460413970 100644 --- a/pkgs/by-name/ce/cef-binary/package.nix +++ b/pkgs/by-name/ce/cef-binary/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { hash = selectSystem srcHashes; }; - dontStrip = true; + stripDebugList = [ "Release" ]; dontPatchELF = true; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 9581a5122bd7..194ba7c2e383 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -49,6 +49,12 @@ let hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY="; }; }; + + # Cemu's BOSS requests lead to a 403 error with Pretendo when curl negotiates HTTP/2. + # This makes games that rely on it fail to download their data. + # Example is Splatoon with the Rotation Schedules + # Workaround is to build against curl without HTTP/2 support until it's fixed upstream. + curl' = curl.override { http2Support = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; @@ -89,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 boost cubeb - curl + curl' fmt_9 glm glslang diff --git a/pkgs/by-name/cf/cf/package.nix b/pkgs/by-name/cf/cf/package.nix new file mode 100644 index 000000000000..9ea110a6fe7a --- /dev/null +++ b/pkgs/by-name/cf/cf/package.nix @@ -0,0 +1,155 @@ +{ + lib, + stdenv, + fetchFromGitHub, + callPackage, + fetchPnpmDeps, + pnpmConfigHook, + pnpm_12, + nodejs, + makeBinaryWrapper, + installShellFiles, + autoPatchelfHook, + patchelfUnstable, + cacert, + nix-update-script, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cf"; + version = "1.0.0-beta.18"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cf"; + tag = "cf@${finalAttrs.version}"; + hash = "sha256-3AjBiAO5mlEMMyzTrq5n3gnhyI7WL8vSTIHIo0bt9ig="; + }; + + pnpmWorkspaces = [ "cf" ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + pnpm = pnpm_12; + fetcherVersion = 4; + # Avoid pnpm's macOS clone probe leaving v11/links in the dependency archive. + pnpmInstallFlags = [ "--package-import-method=copy" ]; + hash = "sha256-N7S2/X/5k1ae8c35K6If61V0cyFwj4TDmUkp+Ctdpes="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_12 + pnpmConfigHook + makeBinaryWrapper + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + # Older patchelf corrupts libvips's .init section when extending its RPATH. + # https://github.com/NixOS/patchelf/issues/639 + patchelfUnstable + ]; + + # The npm distribution includes native workerd and sharp binaries. + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + + env.NODE_OPTIONS = "--max-old-space-size=4096"; + + buildPhase = '' + runHook preBuild + # Generated commands are committed; the build task regenerates them online. + pnpm --filter cf exec vp pack + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + pnpm config set --location=project injectWorkspacePackages true + pnpm --filter cf --prod deploy $out/lib/cf + # Replace workerd's postinstall copy with a link to its platform package. + for workerd in $out/lib/cf/node_modules/.pnpm/workerd@*/node_modules/workerd; do + ln -sfr "$workerd"/../@cloudflare/workerd-*/bin/workerd "$workerd/bin/workerd" + done + makeWrapper ${lib.getExe nodejs} $out/bin/cf \ + --inherit-argv0 \ + --add-flags $out/lib/cf/bin/cf \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} \ + --set-default SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt + ln -s cf $out/bin/cloudflare + runHook postInstall + ''; + + preFixup = '' + stripExclude+=("*.js" "*.mjs" "*.ts" "*.map" "*.json" "*.md") + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash zsh fish; do + CF_SEND_TELEMETRY=false DO_NOT_TRACK=1 $out/bin/cf complete "$shell" > "cf.$shell" + # Bash's readonly globals would collide when both names are loaded. + if [[ $shell == bash ]]; then + sed -i 's/ShellCompDirective/__cf_ShellCompDirective/g' "cf.$shell" + fi + installShellCompletion --cmd cf --$shell "cf.$shell" + # Upstream generates scripts for cf even when invoked as cloudflare. + sed 's/cf/cloudflare/g' "cf.$shell" > "cloudflare.$shell" + installShellCompletion --cmd cloudflare --$shell "cloudflare.$shell" + done + ''; + + passthru.updateScript = nix-update-script { + # Upstream currently publishes beta releases. + extraArgs = [ + "--version=unstable" + "--version-regex=cf@(.*)" + ]; + }; + + passthru.tests.functional = callPackage ./tests.nix { + inherit nodejs; + cf = finalAttrs.finalPackage; + }; + + meta = { + description = "Command-line interface for the Cloudflare API and Workers"; + homepage = "https://developers.cloudflare.com/cf"; + changelog = "https://github.com/cloudflare/cf/blob/cf@${finalAttrs.version}/packages/cli/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ connornelson ]; + mainProgram = "cf"; + # The CLI is built from source; npm supplies native binaries and WASM. + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode + binaryBytecode + ]; + # Platforms supported by both Nixpkgs and workerd's npm distribution. + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/cf/cf/test.mjs b/pkgs/by-name/cf/cf/test.mjs new file mode 100644 index 000000000000..6471bca70a23 --- /dev/null +++ b/pkgs/by-name/cf/cf/test.mjs @@ -0,0 +1,101 @@ +import assert from "node:assert/strict"; +import { execFile } from "node:child_process"; +import { once } from "node:events"; +import { createServer } from "node:http"; +import { createRequire } from "node:module"; +import { dirname, join, resolve } from "node:path"; +import { promisify } from "node:util"; + +const [binary, version, packagePath] = process.argv.slice(2); +const execFileAsync = promisify(execFile); +const environment = { + ...process.env, + CF_SEND_TELEMETRY: "false", + DO_NOT_TRACK: "1", + XDG_CONFIG_HOME: resolve("config"), + CLOUDFLARE_REGISTRY_PATH: resolve("registry"), +}; + +function run(args, executable = binary, extraEnvironment = {}) { + return execFileAsync(executable, args, { + env: { ...environment, ...extraEnvironment }, + encoding: "utf8", + timeout: 45000, + killSignal: "SIGKILL", + }); +} + +const requireCli = createRequire(join(packagePath, "lib/cf/package.json")); +const requireMiniflare = createRequire(requireCli.resolve("miniflare")); + +// Regression test for libvips corruption during ELF patching. +const sharp = requireMiniflare("sharp"); +const image = await sharp({ + create: { width: 1, height: 1, channels: 3, background: "red" }, +}).png().toBuffer(); +assert.deepEqual([...await sharp(image).raw().toBuffer()], [255, 0, 0]); +console.log("Sharp image conversion works"); + +for (const executable of [binary, join(dirname(binary), "cloudflare")]) { + const result = await run(["--version"], executable); + assert.ok((result.stdout + result.stderr).includes(version)); +} +console.log("Both executable names report the expected version"); + +const matches = JSON.parse((await run(["cli", "search", "create a DNS record"])).stdout); +assert.equal(matches[0].command, "cf dns records create"); +const schema = JSON.parse((await run(["schema", "zones", "create"])).stdout); +assert.equal(schema.httpMethod, "POST"); +assert.equal(schema.path, "/zones"); +const completions = (await run(["complete", "--", "zones", "c"])).stdout.split("\n"); +assert.ok(completions.some((line) => line.split("\t")[0] === "create")); +console.log("Command search, schema metadata, and completion candidates work"); + +const local = ["--local", "--persist-to", resolve("state")]; +const namespace = ["--namespace-id", "nixpkgs-test"]; +await run(["kv", "keys", "put", "greeting", "--body", "hello", ...namespace, ...local]); +assert.equal((await run(["kv", "keys", "get", "greeting", "--text", ...namespace, ...local])).stdout, "hello"); +console.log("Local KV persists across CLI processes, which exit cleanly"); + +const database = "38a2e1b9-3a45-4f6e-9d0c-8b7a6c5d4e3f"; +await run(["d1", "raw", database, "--sql", + "CREATE TABLE test (value TEXT); INSERT INTO test VALUES ('hello');", ...local]); +const query = JSON.parse((await run([ + "d1", "raw", database, "--sql", "SELECT value FROM test;", ...local, +])).stdout); +assert.equal(query[0].success, true); +assert.deepEqual(query[0].results, { columns: ["value"], rows: [["hello"]] }); +console.log("Local D1 persists across CLI processes, which exit cleanly"); + +const requests = []; +const zones = [{ id: "nixpkgs-zone", name: "example.test" }]; +const server = createServer((request, response) => { + requests.push({ method: request.method, url: request.url, headers: request.headers }); + response.writeHead(200, { "Content-Type": "application/json" }); + response.end(JSON.stringify({ + success: true, + errors: [], + messages: [], + result: zones, + result_info: { page: 1, per_page: 20, count: 1, total_count: 1 }, + })); +}); +server.listen(0, "127.0.0.1"); +await once(server, "listening"); +try { + const baseUrl = `http://127.0.0.1:${server.address().port}/client/v4`; + const result = await run(["zones", "list", "--name", "example.test"], binary, { + CLOUDFLARE_API_TOKEN: "nixpkgs-test-token", + CLOUDFLARE_API_BASE_URL: baseUrl, + }); + assert.deepEqual(JSON.parse(result.stdout), zones); + assert.equal(requests.length, 1); + assert.equal(requests[0].method, "GET"); + const url = new URL(requests[0].url, baseUrl); + assert.equal(url.pathname, "/client/v4/zones"); + assert.equal(url.searchParams.get("name"), "example.test"); + assert.equal(requests[0].headers.authorization, "Bearer nixpkgs-test-token"); +} finally { + await promisify(server.close.bind(server))(); +} +console.log("API commands send the expected authenticated request to a local test server"); diff --git a/pkgs/by-name/cf/cf/tests.nix b/pkgs/by-name/cf/cf/tests.nix new file mode 100644 index 000000000000..638431a33d03 --- /dev/null +++ b/pkgs/by-name/cf/cf/tests.nix @@ -0,0 +1,19 @@ +{ + cf, + lib, + runCommand, + nodejs, + writableTmpDirAsHomeHook, +}: + +runCommand "cf-functional-tests" + { + nativeBuildInputs = [ + nodejs + writableTmpDirAsHomeHook + ]; + } + '' + node ${./test.mjs} ${lib.getExe cf} ${cf.version} ${cf} + touch $out + '' diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix index eba997a88934..72b025800520 100644 --- a/pkgs/by-name/ch/chatterino2/package.nix +++ b/pkgs/by-name/ch/chatterino2/package.nix @@ -8,13 +8,13 @@ (callPackage ./common.nix { }).overrideAttrs ( finalAttrs: _: { pname = "chatterino2"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "Chatterino"; repo = "chatterino2"; tag = "v${finalAttrs.version}"; - hash = "sha256-bTf3UECylAdb0l0+tItbhmiyNDSkxY8hgNPJHuOmwtE="; + hash = "sha256-vELs8CblNJ3SItg6UDkeHJYLGuteM7pAd2TALdSwB4M="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 6b58c693e0d5..ff06ded49ba6 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "chezmoi"; - version = "2.73.0"; + version = "2.73.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; tag = "v${finalAttrs.version}"; - hash = "sha256-AqwWZExlbPCSUM5kwzfkf/+dNVC5CRNwUK3flpbrjJw="; + hash = "sha256-YkDiUkezNOULeqi/Nk6K/05Es3kkFA/atSr2JfQ69p0="; }; - vendorHash = "sha256-/y93llHXz/pSA0BgOTmT8s83RR/EJb/wzFqguEEuy/Q="; + vendorHash = "sha256-ukLTgpSIRZQWZriZFCfqh6Z4+48e710BpJvgXfS3dOM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chuckya/gemset.nix b/pkgs/by-name/ch/chuckya/gemset.nix index 08dc19790c9f..1d3546541cce 100644 --- a/pkgs/by-name/ch/chuckya/gemset.nix +++ b/pkgs/by-name/ch/chuckya/gemset.nix @@ -22,10 +22,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06yrlf0a6jnlcigvnhdsdskvf368cwi0ypz2vzps6y68jn154673"; + sha256 = "04bzm9z05dllly0yy6jpgkmd0vmdqpc2lxvdr76irq31r3w75kfg"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; actionmailbox = { dependencies = [ @@ -40,10 +40,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "071b1103h7xsrrx73wbdj8mp7b0x99lr6pj3ivg3m13x15r4jw2z"; + sha256 = "1sq679wp7f18bc88svhfdbjn8kv3ia5sfglgap773dpbfzjjaicw"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; actionmailer = { dependencies = [ @@ -61,10 +61,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g64lm550x0sx2ad5sgwmx19jg9acj98hih6q33a00pz50dl9sl8"; + sha256 = "14zhp9s8cmb7scmhxmanir7syrljcdik6792iyinxr1afvb9abgq"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; actionpack = { dependencies = [ @@ -88,10 +88,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l13fy0y55h5c5ccm7c94mwfhf6bk5xj83qv1d3izs288lavfk4p"; + sha256 = "190fwdv8rx9ixr9y020szwr5nzpsh141iz768mv5l6dya7696m14"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; actiontext = { dependencies = [ @@ -107,10 +107,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wlam4mqrxfsylsyf01yc7907ramis3kisgfn7frr8ni6gc2k9sx"; + sha256 = "0i7nvd06ydm5x4h0pch1m9ifrqd82dqb363xzh8zjsnslyz9kvik"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; actionview = { dependencies = [ @@ -130,10 +130,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dng2b5bbjm4c1bcpak7q9w4zh71mz2nkknipszl6yy42j28p9id"; + sha256 = "0xk0487vhlkklcfcj973nnxgsryb7d12ncl8sax9m5jdgk8fzwgg"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; active_model_serializers = { dependencies = [ @@ -163,10 +163,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jlm75lxj7bjd67jkgclzlrhlm9sj4ywdzngxq6z83ckvxsx538w"; + sha256 = "16a0h9wc6nmf7k3wiq7fhi42l83g6kwgxv4vy3swiiacipnv5maf"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -178,10 +178,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "124gi0hlvkabkl5fzfn90ylj7gbyg22rv5208k8p3hxf5z705k4r"; + sha256 = "1s50ww57lm2qysr2vryfvj1xll7pp09dnmv1y2jql4dx4z0hc2cs"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; activerecord = { dependencies = [ @@ -197,10 +197,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fs0q1c35k2bh079kj1xbx9pvqx7q2z4k9d32fqgcf29iz1bcbqa"; + sha256 = "0kxh03zk69y5nrvpky5a068kmh7a2a9r1akzplqr4v14gzm5fj9v"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; activestorage = { dependencies = [ @@ -214,10 +214,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vv3c41nfsii6j2nl80mbgffld96s4ak3zfjk6jgy73v717jamgm"; + sha256 = "1a67hni2l39ig4i91k7laqmzh9xngj3prd9jnghfaqzfr4z6z5gl"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; activesupport = { dependencies = [ @@ -244,10 +244,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xhkhdx8svhaf439y398yixik0snzarnnsy43688p92yy9jqfic5"; + sha256 = "1pw09rmd9f9x0i0ai11ajcf6c7xvi48pn8sbjf8q7z648gzd67c9"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -293,10 +293,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00265gr8j5jnzkz5jjqyj3l1qqwkji3wvc6rv5syqyz080frpi8g"; + sha256 = "12gdshfrqx0wbrxqjmrgrrjdis9ir2l9wa1i0x3fpqxgsr1lqyhw"; type = "gem"; }; - version = "4.23.0"; + version = "4.25.0"; }; ast = { groups = [ @@ -336,10 +336,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jl9v6vrqgqvic7928z92sq8nwr41zpvpdaxdib56ib524qcgx3n"; + sha256 = "1f64r0isilrlz0hjssj12b8ls7s0616d2pwp9ki143v4g2wfiyy7"; type = "gem"; }; - version = "1.1287.0"; + version = "1.1292.0"; }; aws-sdk-core = { dependencies = [ @@ -385,10 +385,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w28cmiam6x121800wipqfzkd8m2xsp6xv1d7b62ig2glkrl0i0j"; + sha256 = "1s8r5738wic5h77r1a413m9wmklchzikli51jdzawm334r8m1yyd"; type = "gem"; }; - version = "1.232.1"; + version = "1.233.1"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -527,6 +527,17 @@ }; version = "2.0.0"; }; + bloom_fit = { + dependencies = [ "msgpack" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wzxxrypw4lvf3ydyvd7g7x5rvxwllbzvvaryx4s50nhc4cgp7pv"; + type = "gem"; + }; + version = "1.2.0"; + }; blurhash = { groups = [ "default" ]; platforms = [ ]; @@ -554,10 +565,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11p3zrk1rqwl1a5ar19m1rabvfd0963gvdj7rlnnqphi869wd73m"; + sha256 = "01vyq7yn1g5psz4fm67y4l25sv3yi97scjf89cpq89a99qhybafg"; type = "gem"; }; - version = "8.0.6"; + version = "8.1.0"; }; browser = { groups = [ "default" ]; @@ -626,10 +637,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hx2ha4q90am6ncc4zcisvbpa7haps2lkd7s8k34645wf8nmg3p4"; + sha256 = "1p2n155v0725dhb89hnayk22mxmxhs0qwwcxmx1i81z06qgw8dhn"; type = "gem"; }; - version = "0.5.10"; + version = "0.5.12"; }; case_transform = { dependencies = [ "activesupport" ]; @@ -823,16 +834,17 @@ css_parser = { dependencies = [ "addressable" + "base64" "ssrf_filter" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "119q8j23xyb9pifka1n6jjrw04099zpwwdajh5pd10fm7wlfkw7a"; + sha256 = "0rdcx914w5flavh54gpcd19wdqc1yp5jzqln1dflsv94cihxgng2"; type = "gem"; }; - version = "3.0.0"; + version = "3.2.0"; }; csv = { groups = [ "default" ]; @@ -997,10 +1009,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1w346z8q4aw31b7ps3gnlnr1rhmrfvyh1cwk84xdpf93hiksmhd9"; + sha256 = "0vgfimffni6yryk76k7grvixisaikbhc925fs3z07rpsd6gr8ddk"; type = "gem"; }; - version = "0.6.20260829"; + version = "0.6.20260921"; }; doorkeeper = { dependencies = [ "railties" ]; @@ -1008,10 +1020,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04bwngy1f1kj6cb5gwj1ljll7da7qbl2hig5xrv0dvm1him449xa"; + sha256 = "11pchqkzd0jp5alh0554yqybnhr3bj2jdghqal3prsn22mwch7v9"; type = "gem"; }; - version = "5.9.7"; + version = "5.9.9"; }; dotenv = { groups = [ "default" ]; @@ -1138,10 +1150,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hma5q4f2dxr72v2af1w026cv756cy797zcy9x7cxdg1xh78fbfx"; + sha256 = "0sd5i4hra1zf0gfpvbr33qlnfmsx6ayjmicwww6z0d7i41sb2mr5"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; fabrication = { groups = [ @@ -1180,10 +1192,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq"; + sha256 = "0vmb5wpiz7mf2r6vjvhvfp38rrfvqjzmv7m3max0s6v28j641d4v"; type = "gem"; }; - version = "2.14.3"; + version = "2.14.4"; }; faraday-follow_redirects = { dependencies = [ "faraday" ]; @@ -1369,10 +1381,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "065b6jb3k92cfnrfi2fv7ivfm555w90m02kl2vr55nj0wzy97w54"; + sha256 = "0zpkfvasg8vl33j41bgbr3ia30hjf870cifz95vbcjx5hp6aj4g3"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; globalid = { dependencies = [ "activesupport" ]; @@ -1400,10 +1412,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xvamgf5fxrdzkp8lmws15r20bbwpibgh62lv98fmdindgbcjfl9"; + sha256 = "1514wvzq5nz62khyyi644vbp3yk580lczk8cmcvasjp11bssz39g"; type = "gem"; }; - version = "4.36.1"; + version = "4.36.2"; }; googleapis-common-protos-types = { dependencies = [ "google-protobuf" ]; @@ -1699,10 +1711,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "026v93kja19bfslnwi9xfq2dj4r89kkwdprim4whjg6h3n4lz9zg"; + sha256 = "1cgvhm0d4awr8j42b8v1nl1jfgx45ihv8mylargfi3lj697k00x4"; type = "gem"; }; - version = "0.9.2"; + version = "0.9.4"; }; ipaddr = { groups = [ "default" ]; @@ -1847,10 +1859,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rinh4347nvl9jm0r4mk7gi1zh1iz367w3dxn8d2r8j5v1pg9gz8"; + sha256 = "1wxxilfijidxfsv51smfbbif3cgf1fardc4z2pyqnd3jsw9n3gy0"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.1"; }; jsonapi-renderer = { groups = [ "default" ]; @@ -2077,6 +2089,7 @@ dependencies = [ "actionpack" "activesupport" + "logger" "railties" "request_store" ]; @@ -2084,10 +2097,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05nzwq2a5jyhcf0w4mbd3dd9yxd6q7zgadsi33f1jl5ra0gjq1rl"; + sha256 = "0qf7qlw18xcch4hfnx7pvnlkyy3y64ci1q4c0cxmz18mbzab79mq"; type = "gem"; }; - version = "0.15.0"; + version = "0.15.1"; }; loofah = { dependencies = [ @@ -2201,10 +2214,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03vkd9g09jnxsp8mdacvjbplrrqfl5l26n50kd4kdn49zghi326d"; + sha256 = "1p5fjpbdcqz3b9nzfzy4jwmbhrg3rwj5ndl127pk5y3giyhdccin"; type = "gem"; }; - version = "3.2026.0701"; + version = "3.2026.0929"; }; mini_mime = { groups = [ @@ -2261,20 +2274,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yry1bcnbl0c5xwg173n5y647596r8ydmsppa01c5l8d6lnw44a4"; + sha256 = "1fhpfl9fznn6wi39xh05crswigywvyiw3rn0cbjf7prmgfm9whcp"; type = "gem"; }; - version = "1.8.4"; + version = "1.8.5"; }; multi_json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6"; + sha256 = "13pabgwf4qd5qn4sl7ci15g5ql038n5z0psip9xabnsbypm32m94"; type = "gem"; }; - version = "1.21.1"; + version = "1.21.2"; }; mutex_m = { groups = [ "default" ]; @@ -2309,10 +2322,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1px886qvws5zvqphy5cysj8vg01lym0w7vs9wq1h41pk1pjlxaln"; + sha256 = "0q1nq8mx22v9sn1296s45nm6dni42y3m3s1f4pg5dn3mx4xmgjdm"; type = "gem"; }; - version = "0.6.6"; + version = "0.6.7"; }; net-ldap = { dependencies = [ @@ -2351,10 +2364,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wklahcafcib6jwrr3angj7zzcb9csq3c0xj3axldb8w9wyhqcds"; + sha256 = "0ly8x39gr23blbmfwfyy14lb2v9kg8bj5x0b2r2llyb4dy60rygr"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; net-smtp = { dependencies = [ "net-protocol" ]; @@ -2365,10 +2378,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; + sha256 = "0g4gcydr0hza3wiizny0p5q4phl3fkhfsa4r5xir8bbb9p03q41m"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; nio4r = { groups = [ "default" ]; @@ -2526,10 +2539,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qj7j8c9y830g5i68f3xgkh0smw9d4mv6s36fms3jizsf00q9311"; + sha256 = "1xqzls5y2fn2d5080gjmw01y8n1wz5879pfmbvyv6h32xa3rjzyh"; type = "gem"; }; - version = "1.11.0"; + version = "1.11.1"; }; opentelemetry-common = { dependencies = [ "opentelemetry-api" ]; @@ -2540,10 +2553,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cdzcq764p7asp7ax2gdqivdzgkvsr50nad88z6kzqg4a73qgziq"; + sha256 = "07ci5alrvhq0fbn2s0zw9xbffkxl103qgszfizz5d4vqhx4x8df0"; type = "gem"; }; - version = "0.25.1"; + version = "0.25.2"; }; opentelemetry-exporter-otlp = { dependencies = [ @@ -2559,16 +2572,17 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j343wlmdigrc0yry2m3x8y9yl2g77r2k4izs6fd452z98j62gbd"; + sha256 = "0dk1ly510q0jy3iz0vfy4icvnhs0sismywxc4zaz9rfwaykbvj7d"; type = "gem"; }; - version = "0.36.0"; + version = "0.37.0"; }; opentelemetry-exporter-otlp-common = { dependencies = [ "google-protobuf" "googleapis-common-protos-types" "opentelemetry-api" + "opentelemetry-common" ]; groups = [ "default" @@ -2577,10 +2591,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f1b7j868bkjg3gf7j4isqafvh9kfkwhc1hsg7f6bxb5k11dk74n"; + sha256 = "0wb1mz9w1lngi95fz1chyazan6bna0ls5vqlbgz2s9x7i3bi0pc5"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; opentelemetry-helpers-sql = { dependencies = [ "opentelemetry-api" ]; @@ -2636,10 +2650,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10anpln7i3vs5ry5ly02biz32h9ab6c7iwx409yrylqmdf12rflh"; + sha256 = "0bawr2npzmp5dwdhxyqc2fh1gnrc9bxbvwinir2m2ada7dq7v0hb"; type = "gem"; }; - version = "0.18.0"; + version = "0.18.1"; }; opentelemetry-instrumentation-action_view = { dependencies = [ "opentelemetry-instrumentation-active_support" ]; @@ -2798,10 +2812,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rsgz3rx4gs8ng544grm62w2pzaw9nvl68vm2pxqggsbg5mfprgs"; + sha256 = "0bpava096q56c4c2kghd273pkvv29z04ybmvng8a613b7vl208fl"; type = "gem"; }; - version = "0.29.0"; + version = "0.29.1"; }; opentelemetry-instrumentation-pg = { dependencies = [ @@ -2824,10 +2838,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sjk2ngdd8cq40p4gnqzln0vaabwg04l4crhiy9s4gvdrr2w3a99"; + sha256 = "02c3gys5bla8iab4sw6p45i68bv58qzlwxbp1hd72m8425k3062a"; type = "gem"; }; - version = "0.31.1"; + version = "0.31.2"; }; opentelemetry-instrumentation-rails = { dependencies = [ @@ -2897,10 +2911,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zqg5wrq2v2j2vfkr7q2jinx2gw5sii9h14323zfq0drbriap97f"; + sha256 = "0m37xhf6mf8s92pckydx0aykj3fd4y5zzvj96lj31vy7b8qwrjci"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; opentelemetry-semantic_conventions = { dependencies = [ "opentelemetry-api" ]; @@ -3068,10 +3082,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08cc0w8v4zz368743jfbyj5jwh4g8kd4hm8bi9lz664w16jwzxsm"; + sha256 = "0wz2zs47va2h5cz69vmdblw5m3z870lbh9azwpcab080javkyrbr"; type = "gem"; }; - version = "1.30.0"; + version = "1.31.0"; }; premailer-rails = { dependencies = [ @@ -3288,10 +3302,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nw667agzygzmy9xc1wkqgfz9xsh5npdnik6skzc6bp6ddsdlmwz"; + sha256 = "1biqhfhcan9mv06312r27ibw9r25530a7if7aa70wmalfbkq4r0k"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; rack-session = { dependencies = [ @@ -3366,10 +3380,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0an5r7sxc6011kkalh78vp4w14ff1r6d31fmcsfbywf1pwv1mlfc"; + sha256 = "0fx325cnd3p5s23iyqz5fr6jixq09avf7zmq64p9pdx3lbwwsgjz"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; rails-dom-testing = { dependencies = [ @@ -3450,10 +3464,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11s4n3zqd7bry5ndraq02f641hskhmnfcza8lkzcw04sawra5213"; + sha256 = "0g2qzxzxkykghafprg82dhgaw2lnf5wj4qmgd16i2csfk3lairxm"; type = "gem"; }; - version = "8.1.3.1"; + version = "8.1.4"; }; rainbow = { groups = [ @@ -3552,10 +3566,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sf4909q2mr9z0rpygv94z12b0yamg07gz8cba2mi5k3m448rgq3"; + sha256 = "02pn63i2r5z44hcfhxbaag9rvqsyznsliivnn7f3dzaw1a43gz5y"; type = "gem"; }; - version = "8.0.0"; + version = "8.1.0"; }; readline = { dependencies = [ "reline" ]; @@ -3612,10 +3626,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w5pgh8bjy1fqdj9is5395d61y58s2rvybsdj5rlx59q45fxj1fi"; + sha256 = "0jxl6c5cagjz5i5n9jplhdy2izad6wapmwgfhqggb22nqfvvdvas"; type = "gem"; }; - version = "2.13.0"; + version = "2.13.1"; }; reline = { dependencies = [ "io-console" ]; @@ -4064,10 +4078,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15dnb2admqpyw6ipxbaqj4cnfwldwkm11gwrzlf2sa329pa99296"; + sha256 = "08g1sfv1s8vs9yaz27vjpmgihcycx9nm3wq6j29plabmvaa95hb5"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; rufus-scheduler = { dependencies = [ "fugit" ]; @@ -4256,10 +4270,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14klzvf7gzzhv0a91c08i0qq5zgzkf3fvjvxcm3ss7iwhq3n726r"; + sha256 = "118fdpg7h1ny1fz6kmiyz6gccvwmb23h6bhsi1hdpf7ib4byq8ia"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.2"; }; simplecov-lcov = { groups = [ "test" ]; @@ -4276,10 +4290,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xlpb8y555frl82cx4q2i922mps36mmn0ajk21kpy3bks6wwsgg0"; + sha256 = "16grvk48dxx5wljmzfcnpmb6a3mrrg0sj4kgyhqwk183dp15plbq"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; stackprof = { groups = [ @@ -4594,10 +4608,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0171xi2ymczd7cyjf1sac5vh42rgl9q3llbqifmkhjgi10kg1x92"; + sha256 = "0i8nm0ipv5w5g258x7lfdj3abl0br7jrnp3v7bvh85qbaid3rp0b"; type = "gem"; }; - version = "1.2026.4"; + version = "1.2026.5"; }; unf = { dependencies = [ "unf_ext" ]; diff --git a/pkgs/by-name/ch/chuckya/missing-hashes.json b/pkgs/by-name/ch/chuckya/missing-hashes.json index b200c7eb95a8..e12d21fd745c 100644 --- a/pkgs/by-name/ch/chuckya/missing-hashes.json +++ b/pkgs/by-name/ch/chuckya/missing-hashes.json @@ -1,49 +1,88 @@ { - "@esbuild/aix-ppc64@npm:0.27.7": "ff8c15b43770c8df995a7274efdb1df5553a3264bff0a42a66bc96a07fc0733a6825b4a339972d2d49fc9be9bec4ac2f4f3f072730fdedc879ce4f9cbf0b242d", - "@esbuild/android-arm64@npm:0.27.7": "c340fffda73dfcdf3513f900403d582cbcd8a5fc4cf7abd71aa0d4945391b4c0289e4389f51616cebaac63ec652457941e3e2eefe408230521227ae128c35c9f", - "@esbuild/android-arm@npm:0.27.7": "4abbbcb6b0f38d345b530148ebf883d3b1b7321a5c31f9c492bf645813e85afb8984c9d75295d779dbe602807b85995d9ff47ab8e8b22fa1bc67b1cbab9c45db", - "@esbuild/android-x64@npm:0.27.7": "719956b9b7eb922a2bf92cc3df93f7f476ae37ad2976bc2185c97b93d63bd1f17b031aec41e9d9a7c3d75c83d6df8daa68191bdfa0d02f4dc39b6fafa6999fd7", - "@esbuild/darwin-arm64@npm:0.27.7": "aefb157b95bb749ebf0cd70dd39d20c00825565a0fcc248b775b4cce6252adf694bf3e4894b25368652252139bfdc0d08b75d1139a78f197ee58ed8972cdb28d", - "@esbuild/darwin-x64@npm:0.27.7": "898b6b02589dccb0a51655c57c407866bdb2ae5202dacce33e7d9b2f35dd117b3245f6393ffd6726373616147c3d12a462830f51da2a5cfd06e0f60cc252373e", - "@esbuild/freebsd-arm64@npm:0.27.7": "aaf8ebcd359f1228f5dd9d90ceca51eaa06d91570b27fa8be9da858ee124e37d45a5fed2aa4849320eb256215acf39b98623cf770ae87f0a0d50323d1acc7fbc", - "@esbuild/freebsd-x64@npm:0.27.7": "cc7fa741cebc7041643f1fbfe45d99ce870b8ea42e9a67f4d1cf2fddeb991623619d00865427b3d6aa63ae7618f10c5635c4d047859eaba8d5c7f317d7138d44", - "@esbuild/linux-arm64@npm:0.27.7": "b1aea26033d1de82966141b350405e1205ea04fa24707084b50992bfc9d0fbf99e0ad83a31ecd8f8cbc01101f3d92f648ce2cc24273c1e8ced573726393f9c68", - "@esbuild/linux-arm@npm:0.27.7": "0950f67b72af73de69483363f046d6a50fc85f6491adcfeadcb6014bdc8a1731e2575fc58d6c68d6834cd6be45e0b247a23f128162864e7686accda1ada3a9d6", - "@esbuild/linux-ia32@npm:0.27.7": "6247a3b2658de166c69099208c72ba65d8ddc5ce1575f5e8fd05d4570f3a59bfbd6a5570cfbd890e19a24258edd1b7e91cebe75e2acf182c6087297f26bba29c", - "@esbuild/linux-loong64@npm:0.27.7": "0d7f9b60a46e95d09889365b54ea0e2fd6e471e9ceeef27a0cc6b77616b1abe275456b50eae94bed3322dc6ee17fedebc3258dcc88a5522bd5318f6def0d0642", - "@esbuild/linux-mips64el@npm:0.27.7": "f3732fa442590b2219d2ec7de1d5086cd31682831dfc25516f2805326b4bd9f68a9fdbf3cce876ee764bf47765b85fdf22290b6a09f87a29c9d0c2d4af0a83c3", - "@esbuild/linux-ppc64@npm:0.27.7": "df156f801042116c438c9259451e716533adec6b7d7af5c75cf27feec09ee4d941281049bf979dc0bb7a5b73b955d3974ecac4391a97600a4440a4a003b820e4", - "@esbuild/linux-riscv64@npm:0.27.7": "76eccec1c7f047075353ef1f908998a0723f367a39aae39608f7978e5e231ea51ae25fd5258d16345567b94b77e28524cba45bc76afa5eda350adc5bda672142", - "@esbuild/linux-s390x@npm:0.27.7": "788799f3e6e61efe6ec0a4a5e2d413dcfe57b27518d679a3d5f82265672fe53604a348658bc09b958cedaead008b63ef02e700469aed2a725e79361458901808", - "@esbuild/linux-x64@npm:0.27.7": "77c8cc00c2f647f5a04ca6640711c6e83214a8c619aeb3de52fee36c51709d5f44becaff095ffa2d1d40d53d1a792e80a1702193c155614350cc14de23a48e81", - "@esbuild/netbsd-arm64@npm:0.27.7": "cffa469f49165446e82f3031d6601e977131fcf619204370b3fad1b2a4a7dbf57d52e26e146cd1550c80af27470fb016d4b519fb74e3e6947a50391f84b87935", - "@esbuild/netbsd-x64@npm:0.27.7": "123b51f84b61f13ae916c0d7b1fa057181ded0e510f762acca178fe7fb679041a30df4f740db381afe8919d41877630ccef0a16ded46248820da0af4b967c29d", - "@esbuild/openbsd-arm64@npm:0.27.7": "cca5a166f47d125703451c4369bd337f08516e17aa69db17ff6822c229fcd9beb9bd29b2856c0f13d9d441178011e8c081879418f376c002f72c6aeab83576ed", - "@esbuild/openbsd-x64@npm:0.27.7": "d9c2ca562e27331124fcddb230f5b204adfadfd87b746d8369c1c3a72fc6f6e7375684cded7ffadab6f785228d80c4a4ff2c6f593f7ce354f6d57f5b4e43c3c3", - "@esbuild/openharmony-arm64@npm:0.27.7": "6566b08b37e3faee6577ae43253f163ce5af22e872e30a93c08fc41e5b3525d742366b1049ba87de16c75c77abd6fce002b49b52a5a1898efb8be5eb18d8dcf3", - "@esbuild/sunos-x64@npm:0.27.7": "589389cd4be3de5c24bb5820e4fd1f15f665b3be6b0ab6167f435776bb367e32209d6bf477bdba481195fbe515e1999c1e73adf321a8fb8400fe72052a4aef48", - "@esbuild/win32-arm64@npm:0.27.7": "519a2c68186c2cd9f548d89f00f5aa3b5f2fa481fd03908d7b1c922de03bf20236d9fc21a3b4e83915d3611471843b41536c97d74273fb3369b2525767c278be", - "@esbuild/win32-ia32@npm:0.27.7": "76470f36efe5290ac694e675a799a46a364aeba9a734cf10869769094b8b9022adc51fdea5869c45a8fdbfcb60ef8d787ae652c264468cdc0f4afb3869157b9c", - "@esbuild/win32-x64@npm:0.27.7": "b4df3d0c4024f0daf0891075822718dc31d35aeb91c18c4e8ee750be69f35ebd840d184006746dd88eca0e44574e438d5ab81c614605cc707fb79cf45cf76cba", - "@oxc-parser/binding-android-arm-eabi@npm:0.150.0": "73863947453369f2f9b7983986cda8d292dbaaa6881c216a3e2d3c12aa6e8b51df71371f32b81b748eecb31a0c81c513f8fbaacf2a268d143564d931a8b9a777", - "@oxc-parser/binding-android-arm64@npm:0.150.0": "c41de7e4fd68441f538371e624cf753745e69b6e1e3574e761511ff5f4afe41241d75c0cc19a0677ac8bb31ef629b584b21151244a83717c7eef58357964c966", - "@oxc-parser/binding-darwin-arm64@npm:0.150.0": "136b1ce9ff08e613d32442c50d6bd0ee6b45fc2601091664ae70c53539a2a5fac61f12b35a29cc2482e1d98e733fb325f02f6769c7cbc5e51d4a83225644e412", - "@oxc-parser/binding-darwin-x64@npm:0.150.0": "f4fd874c15c9a6f37b4d0acc9a3ffd37813e69ecbc35a33e41db3d24c791c6302860bcce3de6f855c17d3cc7f55e71204b6fa5089fb3305332286171060892fc", - "@oxc-parser/binding-freebsd-x64@npm:0.150.0": "504a549e48e73bc5e054eb4a16c82df38a6f1ba35e33fbf1f676cf3e3b51c1fd11f80ed9fdea9bd6d026426bdda9a962e2afbea9f79e2aa56342d180a7bd9f95", - "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.150.0": "c852755046a4fb78658e1c4d1c3e28b3ffd77fee0aea554807f00a982ca0a06fa4df4518e4719bbe2765b10bc99892e44e83dc4658b0d0261cd561ed1a6699aa", - "@oxc-parser/binding-linux-arm-musleabihf@npm:0.150.0": "470423574411979ec017d5bcef31b8be2e35861ac239ece84c56f2183f1bf2d314f5e6d7744d42ca1257eafd1eec644f23c4d08a2782785774741cbf31ae8d61", - "@oxc-parser/binding-linux-arm64-gnu@npm:0.150.0": "0756f92ff8c7934b21e67d72d8c1216aed04d50fd61b46e762406890550bc3497c021a1f982f9e86b5c36ca766a77361eb435efb8e6db04bb989258a874fecef", - "@oxc-parser/binding-linux-arm64-musl@npm:0.150.0": "a7a2ddd8cf4b875368d1973893fbb44ad1f286236ddd941fadc786647c62cb32a80cfeb40905380ca5e67b33e489307de23446dfc6d87aff349f1c57ad05d184", - "@oxc-parser/binding-linux-ppc64-gnu@npm:0.150.0": "818cd990bac1f8ad807f44ea0b9ea1fc80452633e463d57dc2ddf90177e36c95ed8e563e4bd8cfeff57e5e03ea43f004fb5f25d3fcbaa092852c5b18a643a0cc", - "@oxc-parser/binding-linux-riscv64-gnu@npm:0.150.0": "fdd10a4ddf18b17c890c9dc72357b2a599f65220573d41c766cad5bf98ed8ee73479d2aae213d9b6eafb24792fe7e413f907666629edcc93310e3f3321f85e68", - "@oxc-parser/binding-linux-riscv64-musl@npm:0.150.0": "1ecaa11c67b95a14d7f02275c19999d5fe050fad4604d3a44305b7e65320d5154fb1303e3f5c875fbc9b9e1153175f37d24d8287fc40a1d006d26bd00abe6d58", - "@oxc-parser/binding-linux-s390x-gnu@npm:0.150.0": "580bd97104958737f8aca2da96fac85c4cfdaec11a54ff0a7bcf6f730cf5f166fd1d2d995150aa65de58e02612c5554a58b8b82bdf2a4a17cf902d7fb6849824", - "@oxc-parser/binding-linux-x64-gnu@npm:0.150.0": "7c007911e43953af3a5aa9d90cc3e01e1f4451893095d1ac3f74d333725d33f0a07011de8fad321f0cba1e8be720e22a64ec24ae51bde8ab0a7f65a17f6bc40d", - "@oxc-parser/binding-linux-x64-musl@npm:0.150.0": "01cf7f33997dfa0aa235d4adaed8e3520e5e12dfad10cd1945af7238ef69708653666ffc57358c55b3e7bb5241a64a306370cfbe218918f7b0d44b6e150023b1", - "@oxc-parser/binding-openharmony-arm64@npm:0.150.0": "32123a8ce29efcf1711f55b4241924a3f4bdb55c6e80689a719a30d9a8b3f926e8aa1666a347a1958a5e2c2dcca0e5c672e01001cd1ae3cd5055593a2929d5fa", - "@oxc-parser/binding-win32-arm64-msvc@npm:0.150.0": "8cc96ec818e9723cfc6c7bb485fe1cbdb33e4535fbf7b5154f6bc663a659d0b63fbeece1e1d6e7762db2dea2f69fb5488142ee6823f73410d354c2d513965efe", - "@oxc-parser/binding-win32-ia32-msvc@npm:0.150.0": "02479fb963ebe4343e21b72dcfdf510cc24bd80f3000437a5cc1b3fcfcdd8f143cfce6d69cbe6f68add6d93a1727cd36ecb50a484a4e02625c5a576439bf26cc", - "@oxc-parser/binding-win32-x64-msvc@npm:0.150.0": "9359c4a5c007347c3bb7173ddae628dc3b078dcb96a08bde35433d355185e3dbea154de74e8939fb07910eb5103a4c7993260e311846d98e2782711eb8f69fd6", + "@esbuild/aix-ppc64@npm:0.28.2": "532f5b55262aef55e92cc60014f5dbb016122d84c85a5369d715035f1d18e47d916a292cb63673e52aca3c463b3829ad6adb257d5f7d7228a6fb55ed144fdf00", + "@esbuild/android-arm64@npm:0.28.2": "3cac1f07c479ac5fc35406e208189734c997253a1cbce64112549ce766ae884f10ea5b2bcddf9932c8f8f61f7eb7904c74f49444c4e58d1bf9e76d389227a26c", + "@esbuild/android-arm@npm:0.28.2": "e72d53f09d78b28cff55dbafb5635fa1c9327047cff9218991be2869f2adcfbee9d405109b66411ca2b6501273002ed2c41e2c82c985aec72b4dd6ddc755090f", + "@esbuild/android-x64@npm:0.28.2": "a42c252316c4750d622781e313065bff9da6924a98fba8e9e70aacd043387bc445115bf2d0dfa8176253ab7033e40597114b86c5794135aef9d96bfe2058e799", + "@esbuild/darwin-arm64@npm:0.28.2": "eaddd98934ea667dd0573a87376a77ed38d5256e8976a9f9d2612c22d795b08dc08015fe5b57dccca67b91578a7defd27bad1864a6feb4b39e1773dd837033a6", + "@esbuild/darwin-x64@npm:0.28.2": "7e10c00ebd47ae17987f09f0c95e7a98306f9fff19277d9755e2d808c4a83055a624e9c71b8672dac4373effb0f20f3548e877a2f2b44af4de0af72c036cdb0a", + "@esbuild/freebsd-arm64@npm:0.28.2": "f17cdd3604a23e9dcb486a80fd4f197f57d9870e78d9c2b255a0b74bff3c624b4811dd9b18db0be43543c99d503069b51932c16dc70d001672f8117905f3e514", + "@esbuild/freebsd-x64@npm:0.28.2": "e01ca12c86ff619cd3eae254ace2c8ce49d11cd879a2e77db1cc4e4b1419f84c8f9e887e6607f41349169fa23825c3406559547b95b2fef3f422658f028da4aa", + "@esbuild/linux-arm64@npm:0.28.2": "2a9c1a66a43bfcf36105f7dac5f9c169237b3b18463d822d7278c52b8414483e66f9ea669f8c49dab39af2dd91dfefa8c93943fc7e91c770d44dda09f6824923", + "@esbuild/linux-arm@npm:0.28.2": "5a913524b3b36063d37af3757f8b74f3b8528c82949c6595dd2a951650d5b69f04552362c3e32b546e851e84129df2a311815844efbf37b60dae47f92374c998", + "@esbuild/linux-ia32@npm:0.28.2": "e68de896188c417a0582117919b1bed47b2b235358ed1836fb8c17a214afb178d4f54dbdbe724eed990d8d2d2c1c391088cfd6637cdd0432062d2c3981b49213", + "@esbuild/linux-loong64@npm:0.28.2": "1adac09caf8ba573fa2fd4eaa34e720e439df0d17d2805d5c57fcafc01ab9e94a14d3457eafbe306629cd027028dafacc77e25a4f2730ae0602664ef5ef92695", + "@esbuild/linux-mips64el@npm:0.28.2": "6ce3422c183387a9126138f11d8143cdb94056658e4c007168e7801d5bda1947500fc9b6f671416e68e13afb762033021ec76b16fbdb9d75730593784d5b0229", + "@esbuild/linux-ppc64@npm:0.28.2": "4d772c34b72c5a5f35635204dd630ea560fc5a4ac06c5c0de247472adb8e6cfa170da0de9cc02421608d6c36463826097ea5630c2d66964ef4d49b3e7d918b62", + "@esbuild/linux-riscv64@npm:0.28.2": "3b2c61ec50b9af8079e72ba68cd130aa67113bbb039ae0bd07451ab34ca07cbfdc7175fea4ed3b8918fbce36f5a49056d8c1683f36e66aa3d884f4eb0159c116", + "@esbuild/linux-s390x@npm:0.28.2": "ee2520a6dee59461cd71f94b5ffbf238283e850defdfe4c25cdee3600e8c728f88d886233d92f3cac2371f647cb519a62af30899848ff0a9e4df3525a85d00b5", + "@esbuild/linux-x64@npm:0.28.2": "5e2ebf6534f2eaba70d67906aedc59ae84d763b07af9738a2a45adb44bd51ec2298dc94d2447e9d60dee8f6e2d58e137bd0f7e53435436f123bda1cfcf2fd0ce", + "@esbuild/netbsd-arm64@npm:0.28.2": "f4559f1abcb85732d71b6f123555eec54373cabfc2ed7c4d56ea9c10b6c262d30f1a1867ddb55e1b6f77414ee85594768e3d243f9d57eec09c72b67d6a37cd4c", + "@esbuild/netbsd-x64@npm:0.28.2": "852010db3be0e867a556f156f9fea93f33d9bf2b53164a584d212cbb972fda18b6f094f7886f08b68c66958909dccf3ef33e5f70cfe6cc71cc17ee3a92015ad0", + "@esbuild/openbsd-arm64@npm:0.28.2": "cc528c9b126d8aa3633faf07f796b9e380d85d309f5499d3f075a9da86a60a2a61c73f42dcdb5577442a4d9af07d22ed7f6b844665c1f6373a15730c75b68c90", + "@esbuild/openbsd-x64@npm:0.28.2": "ede88d45016e3dd3c77a49657c5608feb1331bcf1e0b7bfb2bfd87d07b687e5d687ffce962ac7e55a5a29b83e5824c91611406e3cd9317b6efed53b6e8f442bc", + "@esbuild/openharmony-arm64@npm:0.28.2": "7b8b3c8baf73151a473878b9d40fdd87f86bee4a9b28325f4f0ece236a0f98fad7b393d1b5f12268b7c122fbcfb3872c1467cabd4745cf8698a78b60241138cc", + "@esbuild/sunos-x64@npm:0.28.2": "f70b672bb0c8179d92e87077fcfea60b0971f8071830f574c85ef1706a6770deaa31f28adf3c1a08506403e9735d81a4e28e5d2ad1c3cbc15af2433112dceb4b", + "@esbuild/win32-arm64@npm:0.28.2": "9aa6841164e80b4d77fd267a9cd160be46586ea561fcb6d99507989856682dbdc007ab2d3c320787ea50ec0a2c1802395dc6c3cd4b254eb5ddac8a3a7705c319", + "@esbuild/win32-ia32@npm:0.28.2": "51d216d2a9cdc1ae2407ac88c4ea02be5b5cc9c618cfd846946b5691f9513de762e6a718222c3de02b14426b4939e040c98de7d424994837bed6ecbb1347b9ff", + "@esbuild/win32-x64@npm:0.28.2": "b109c1080e6ff5fcd9da0c61a6915d296837702234609b737284c01c38cc3a245caa351702da27114ae9cd17c4a577a5674375c4138269f63a578e46f6686066", + "@oxc-parser/binding-android-arm-eabi@npm:0.127.0": "945e01f64f415992639081a3dc19aa5919f45e69c38298e20cda23c1e8bba26f79bad55e6dd6190a43866f363dd275970b71843ecf8a51a360cc8768f5900da0", + "@oxc-parser/binding-android-arm-eabi@npm:0.152.0": "e5eb46f35e6c0a51e51a42291416bfeac1c9d97038c17b0499e946dfbe99fe29a8a1a89da911c938349ca86f5eeb822f49a68dee03c5441de8a5ecf0bac2c72e", + "@oxc-parser/binding-android-arm64@npm:0.127.0": "f28a90adca64bdabb7e5991941ace223559acaf5ec134fc6fd4f983979a660eafe97b1b03139c6608640e3b37d5a0225684fb49efc38b97486acaac2ebf9f3ef", + "@oxc-parser/binding-android-arm64@npm:0.152.0": "77f293e36aa0302a96ad1636242988fd208505a5c61ba367e8aa8d5ea3e131af0fa465cb3b14475c6c4382ec858b019fcefaa7ecaa34c22500fc2ae5021f2a00", + "@oxc-parser/binding-darwin-arm64@npm:0.127.0": "490d39689bb179a1f21b6e2230fe877fe6d62520e84d5a673f4d7c704c9a95bf63826bce15208ebacba172bdef0d5fd189b87eb5556de1b9fbf12944be183c8a", + "@oxc-parser/binding-darwin-arm64@npm:0.152.0": "64b26bf45de7c52aa8efb5efeaaa6cbd60be26205de880b77750a306e5a92ebf9831737f4a280bd8dd50bfc5f62dd2497e3579a9e5dcd446ecc2b919ac0b960c", + "@oxc-parser/binding-darwin-x64@npm:0.127.0": "8e1ad7af46356aca1d43627e94c9a72d35328a5f66dc184a33bc3e28a086f4ad2b70bd44f097eff6a6b52ab94bafe0e15de396f6eed01d0beee7bd1a45e98541", + "@oxc-parser/binding-darwin-x64@npm:0.152.0": "4a5aafe308635606f824e6f47b3f6a534f8491900fcc2c9239ce9594b5f1bdb51c2458116d38d7433b136013f9b1230c54761a137041b4097b7c5f1e36511077", + "@oxc-parser/binding-freebsd-x64@npm:0.127.0": "7eabf352fd03452bb8f853c7d92581705ddc207a31797b2649f364715b5818d3fb86512bca5a1dd6b3092f0690303f92c240d6ca1738b7a5e27992c08f648cfb", + "@oxc-parser/binding-freebsd-x64@npm:0.152.0": "e048d06ad603e7da128f44172c61b5ab38011e91761b355fe9ba3820c71a29509f47d84373a81bc7896d08d46c601c153a579309c53a3c35f16fc84fc4b8d5d1", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.127.0": "98edb854fd3c30e489237fec6cda7c1e46f0961d1b738369fec357b694989d95ff5ca20b576c835b7af7084ff703888751c877d46862e5745ccaf9e6ac226a0d", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.152.0": "d456a5a8d645d7f4875ae1e5f5db9517f5e29df3f55f7a29aab90e4d18b85ace6f0eb2bd027e257daf14ec6d37a305b7ec48ae2f8f25823bc2f07cc3d1d7f6a1", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.127.0": "d4a19c2d8f943c341e452e7ba8adf844998f87ed4ab501b473a05719fca52282bd133973f26e07fee28812963d39cd199702faf424a42300d4e317149079e84d", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.152.0": "85dde753cf8aa14b8ac3dcaa38dcb8e9dc9d933019afe045429e03ba7009bb2c8aa04b69c6a9791dd8ea364de1dff8d9050d6b5d9ab4f7aa6cf80376ef6887bc", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.127.0": "d818144ea9a661d54474001e750a501cb5e12460e22d4fb3f1c46506282ee9689a682761e07f4b925d2349fcee2734fa50b6655ca7f519c4ad9a055b0c4dac89", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.152.0": "c86389fb12e8d9f59cb05631e6e27c695083c188f43e3f37e3fdd991b27aa73754a09e00758ee0ac308b8e433a24ca39b013ccf954174718dcf88e64be4fc269", + "@oxc-parser/binding-linux-arm64-musl@npm:0.127.0": "f62825639af42d6be5e4c7a16576f1e23f4386b7db222dec59e320c0c2ccfdcb6efe45903a2969024f14c15f173b174d969473af9a0773cf25c07fdd3bfa4e31", + "@oxc-parser/binding-linux-arm64-musl@npm:0.152.0": "06808697564e9889c902bacf9a208210fd47a029d1794e234ae7dd39d5ddf8b3704aa808c1163f257937aaa95ac131b98e0494ac33dd9aa37c8e71bd30808121", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.127.0": "e635b0adb9e26bfce5209a87f2b55137ccb1e0d95208e1fd36bc1f0735fc3df95f8a99e11ad9d9ae621031ce21dffe583aa01c40080a9f57b466945306878e83", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.152.0": "924e4f60b4b65eb2774a0a564465358f7257ce0f4a5f10378bdfc46fa874a3c4c21331f124130ce168dc42d503879f588e8286734e1c907d3ba0e550d4258823", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.127.0": "bd16bb323eaf46ed519a583dba0a4b1a5984f65ba19d3773133476a7bec6985e6490efffcfd4d5f711c5acb7e201ffc5898b56ad7fa619cf884990514264bede", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.152.0": "dcbe7364095e9f8bdb3ad8dc2cad2db0fb51680ae4c289d49391b79e14ab461c8f4741cffb99a8a6f77179a180f37e9abb0b17ae3cc206af3ea56e265a79a52d", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.127.0": "dc38d5b6c6ebe40c2f45ba59c1fa175f9bf148c274c41b0fea39311756e7390fbc25ad1f2399bbb9a2a12f1c2a8d4e284055a12042b6ec90b08d79e579afad33", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.152.0": "edfc5c12f2907de8b25e2e55e0a522e9216e510f3adde5b942e3775e05503798e97c0fa36457a377df6f2aee35b40dc7f37575f82eb987605d4f62434838ee14", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.127.0": "a6e6f9c0de7b62087e3950a16b8c6f74b0995e0599a74eff0044b770dc1509e7f390c837f58ef349812036c2cec145cff5ff29800707123813688cbb632b3565", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.152.0": "f147cddd64916d485986c64d39e7c6ed2b0007b7aba32245f3c052440b1e4129968757aec541681682ae0c1b6df7c95fc5273f50109200252e173a66aa23e038", + "@oxc-parser/binding-linux-x64-gnu@npm:0.127.0": "2eea74fcd38d5c2cfdece401e9e8d2099f660266a2efd01603f85abd464aed1f28f77af8951655b2173bde8446da99a0657e7f531af93c941d6e2c851cef093f", + "@oxc-parser/binding-linux-x64-gnu@npm:0.152.0": "aa603da58b9a082902ea14c8cd9bc6bc1086700c66f1a59c389cc7ee0f37f477c63e2f07e61680a6e312fd36ac94323f6db7110fa8a394fb0c8e162c43c4ad45", + "@oxc-parser/binding-linux-x64-musl@npm:0.127.0": "e746466aaa1f7826130337d83e6b976736d780c59c12c43b5ca4710ad6a24439341e9d5aa58d705d6f6e0618296daf7f422f24e260b3e5c52f7cd0d916bd7ddb", + "@oxc-parser/binding-linux-x64-musl@npm:0.152.0": "e1fb2b2c74dedac484a2237223a163001a3c4df50a36af690a21a93e124a239e7d69ca84bc6653b4bedaac78c8fa24cfb302ef7fe19a0e2e6c731c81a72b4f98", + "@oxc-parser/binding-openharmony-arm64@npm:0.127.0": "5a00e6fcea62d4cfa3993e8d1f4a7f1bc2d70a80f8ac5bcff204eaf820124529194517e94937a3a6d0c28844cf713e7629c0a57cdddd87e0670c786c1890aa74", + "@oxc-parser/binding-openharmony-arm64@npm:0.152.0": "dfae59830aac29e2b93d8f5344ea91988c566f5b0044a435c2d6c99a8bc98a71b6c6902897606cc4c6dc7de54cf12b42ebc4d2465f2224cee788865c5da9ab22", + "@oxc-parser/binding-wasm32-wasi@npm:0.127.0": "0679729f6bb75538acfda31258110ba0c7c60b195ebf8f0461c1f412fe8cf8a423c35eb107f184e67f3160c44efa32c705581a4014be050feac652a814eb9376", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.127.0": "410ccb3fedde21efef8713198be39e7ba6526509d1328801b52c76e911af3412d1f214aea3609aa828bf30ec8a05e811c82e383da8e6cc3d670415cf17497db8", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.152.0": "f33b2a91e2df2eb6baea0d3e39c3a0fd8cc47f9d0169d75e83756742553e1fb3a2ce2b913a59983079285df6b9df2f0d3a0c11ac69d612cdbbf7b905600e3902", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.127.0": "86b35f2feea4b23654bafe27b9bbe77194d4923f73f4254f813bcf14de5f12a09ce67e7fdb93b73944c9b859a0433128f3df2ef3fbc56f4c486e99d393508f0b", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.152.0": "439cddb8b7c0b3e8bfc2f0360bd760be20e92998a9412a0001ab2cdb55aad4e273f989cd5ddef5e1bd8cfb48da68ab8b24663032e00a95c2bda5f8a85d588c7d", + "@oxc-parser/binding-win32-x64-msvc@npm:0.127.0": "6993c90d54ecfca7b5fd5a2a6f07909d53ce553b14e55dda739550e8dbc1a593c49f23792063cce95bf286bcae4f67624d0d9f014e28eaa700a31da185f2127b", + "@oxc-parser/binding-win32-x64-msvc@npm:0.152.0": "34ddf999438af2d21853819e26d404e3a1333c82ada11e952024355ad2924f8027b9a5369974db7165e0c1101f054b9e35e295d945b8385c28b73593e4f28c52", + "@oxc-resolver/binding-android-arm-eabi@npm:11.21.2": "911bb962e081cde609e140d9794bdc45e748b288993c348ec34b8c69d3051ae9be5b15d537b87e4079026210546c9c31e5c3b611232edd6cc42153453f55c107", + "@oxc-resolver/binding-android-arm64@npm:11.21.2": "c381d950c850823791e7f783fc8495078c0ce995fc71d39eddf326251bb8fb842293b38b6f85ef3feabe1d538d4accf762edb4811cf7c87b8073bb23541c9630", + "@oxc-resolver/binding-darwin-arm64@npm:11.21.2": "c102137f6d8bd2f41532c605478033d47ec9c6dcdb749d94308c11aa712f8282813355a96c277cf765de0b3356e15580b387a905bd593667c4077b17e5c1e14b", + "@oxc-resolver/binding-darwin-x64@npm:11.21.2": "d0353f8ea85983629e014cf793da5177155447f9061151e738dbb79056c5d2bc38ceb79dfeb6f7ffdd652de98a3ea9616e09d17d5d3f4b014ea5cdb725158655", + "@oxc-resolver/binding-freebsd-x64@npm:11.21.2": "3a1eb6dc967e8e93f5aff83dd9a96e879b974d60918dc07db73bd8387c44919ce7c4fe6ddd458bbab5d4a01aaa40eb05655b74a37d44b2c58e659800809d5c4a", + "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.21.2": "f767138ec111799c134cb8942193b8c486532f214774f04b9fcaa2ee79648a8c1b8f06e6bd53d31ad8550b9e5ae29b10174f0f67ba5e095bc81b6a017d630f18", + "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.21.2": "531577a9dcbefb946f59f93f2b9cf0213dc0e4dda6c7eea8fb5acc26cef6239819146cb417ed80093ab3010f8075156c303bce8877ce638d490f1d9fbd19bc8e", + "@oxc-resolver/binding-linux-arm64-gnu@npm:11.21.2": "209f5ebe88608fc6a4ec812d2d0be83094101bdf3a4116ce10d2874f74fdecbd21159c1bf39674d68f4e167f42da4dcbc5bc338311988bf36511be4fc103d392", + "@oxc-resolver/binding-linux-arm64-musl@npm:11.21.2": "582512e5966c4f390c34e911e361964d1a68490b588dc94ba2f4ace4e7ece2e363936de4cf810a0295d0c25cad806d8a7b107aa9eaae259b28dc8dd5feb90fd9", + "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.21.2": "80737df8cadfc431c8c0ed0363fb2bcb0f56ccf46e1aadef254ecc1cda5f850c2a748979bdee9126319ad96b195afbe436a2d78f5e1a1afe7771baf80dac78de", + "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.21.2": "7e676297123a5c256e4f093fbefc6065cb11fb30d5261dc938bb6f063da8a27a85d407f3a9529b6c507c324f3f424301add55ad0cf69b2a38cb80417562697f7", + "@oxc-resolver/binding-linux-riscv64-musl@npm:11.21.2": "9978dcf19d7d60ded05dd54e6e41c1b8ae6863bb7285ace2477bfdfaf7bbfb6fb19e22e1ebd3272ec8a17c4c9a29d247970fca1fd39f4553af4bbd393cd02693", + "@oxc-resolver/binding-linux-s390x-gnu@npm:11.21.2": "e347a69c382d9433dc8873de54605e1641ff677d6b5ef93c748d06563b3695d09b83a8f60c8cbf04fec0bc244cc08d350b46d2bcf8fe0570994d08a70352362b", + "@oxc-resolver/binding-linux-x64-gnu@npm:11.21.2": "2d015f7027b4f26892c6bc2c61a9b94ddb4c015a397117acf00d8d4ab9a507c2b87bc415fc182e9c432bdb0c45726328aa15e31506231bd9289a020535f47dc5", + "@oxc-resolver/binding-linux-x64-musl@npm:11.21.2": "0ff44bde36b2dc4e80a340c00673750c3a1f054841e5377fe05744f5c38648df82cc5a7ca83233b67a42a1a2cac206a4c1458abea708103b59b05d6d8582f10e", + "@oxc-resolver/binding-openharmony-arm64@npm:11.21.2": "982f9183fcc5a029e6a731f10c954af0e37eb42b4e7359b5652cac01fd881e97f3398f4632703faa97ba5d00b96c62ed926c4f418185a92502737f0de20e824c", + "@oxc-resolver/binding-wasm32-wasi@npm:11.21.2": "7720df9e102a768d7808095d58ac83aefb80865da98420b4c3ca602314dd15473cc34fb902ffcb18f821eb4312f3c0ef0894944c05128f19e3fee2761bc5bb58", + "@oxc-resolver/binding-win32-arm64-msvc@npm:11.21.2": "19f879349d9b4752ffafa8047da28e348ae674a7076f375f43cc3e31a147f148851cea357ec00fade2cf8dad6d6e0b75652a25e41435dbe38882cb2afa62062b", + "@oxc-resolver/binding-win32-x64-msvc@npm:11.21.2": "a3a42d8b201e21933496d2a0cd7188484261fd7355ca58d8dc0d4904b1fbaa4e943764e74dfbcf04c084847e30b17636fe955ba023e8d4c83e12da369913ead2", "@oxfmt/binding-android-arm-eabi@npm:0.70.0": "f3aae5cb2dfb814af4dd09fbc2efcdbeb60a5d69570fe121871eed5b620f5d5fdedeea9086442835e0598ad3f36670f949c1169d42bcedf0f0fd2775dca72c81", "@oxfmt/binding-android-arm64@npm:0.70.0": "d0b3e1c7930f0d7da8e654a2c19e5ee87d36ea1403522380426527d840992336090d4276eff7cb4dd3f7d4abaae614a35784fe801bfdee938f50a2744eb344fc", "@oxfmt/binding-darwin-arm64@npm:0.70.0": "2955b64f114f31418a59df0f71f56c5251b081e28462f94490e3a1580ba2e12e9d30e2dbc4c5b94ce2c87f0395fa912aa0225831ee2b72b0d55c74edefc67941", @@ -75,21 +114,21 @@ "@parcel/watcher-linux-x64-musl@npm:2.6.0": "9aa3a06af35f81d02936b8d5ed58aa82512e2d9e1883cf45af9948dabc004cc36be8041af6948b6956dff7dded2f82459a18c7ff12e02cbc55ef63df92c96785", "@parcel/watcher-win32-arm64@npm:2.6.0": "36deb76930e491a58781a74ea5e2286926161cceb7087504a9d117488ca0616e70c3061d690d18a7d0b597e8c2f3714063921c1bc4b59678d8b27742e4d51c1f", "@parcel/watcher-win32-x64@npm:2.6.0": "6e6646f910898d13792a02e81beed0e2f09125a4ed3e6545521e9475fd672a163f020d61af4a6d3c936acf773fadeba7d3edc3fd0e75ecd47527cf0c14bc77c1", - "@rolldown/binding-android-arm-eabi@npm:1.2.9": "1ce723761c6f6909e9f7657f3d0c157d11ab0397662679cecc46f87a5493754b05a5eacbbff8c0f21ca9f6bf6f18afb7914999e85dad926852ff6e63f98985ba", - "@rolldown/binding-android-arm64@npm:1.2.9": "1d597c83de815f2cb2375b8c6bb291ba34fdb6cc4fbbe7ad109f0b6a41d7434f5072655b143349ec81c9bd765f130475b0895d6d0fbf5addb51a0016aa8de015", - "@rolldown/binding-darwin-arm64@npm:1.2.9": "9be017bac93b93c0d4211cc87180a6cc00cca2e68b3857677f030fb37ba3cd9530b33f706a523c85625cfcf1121613353d392bb11ca5e841c72f7baec04ab1b7", - "@rolldown/binding-darwin-x64@npm:1.2.9": "2c6af58173c4177145db94fc210e56c32f20255ebe6df782647e39fc4811071d03e7a25b52412ffa24bc67178c800af53fbadce92f3dfd62da901672e46c9c19", - "@rolldown/binding-freebsd-x64@npm:1.2.9": "d6c2a208797defebe61e56b1a462a6bef90200253950f9b24f970b93cf91f7b3b0d591f5cf5f4426079cf5c9a6e5051a20d789ae2b837b1c680c2c47260aec4a", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.2.9": "99a39c7958ef1a7ba6764b288f2d9295a682d38d280ceb401165643c83c659db766ce1185d86646c84396a9acfad25b48c7e11302adc8cd53bf629c106b45a26", - "@rolldown/binding-linux-arm64-gnu@npm:1.2.9": "9e84c6c18dde65e53fa4e8aba5d4855806b423df2453b28bc8dd15f0e48c46b7b1cd3c9992a9b88e173efca5f12283f1650468a327fe5dee968d2b1187ea66aa", - "@rolldown/binding-linux-arm64-musl@npm:1.2.9": "7fedfcaaac962bec943e7b4da51b176aadd02631d1fcaf4880ae72365d4d868f409799cbe3f7025672bb2007a0004dd33729d986404ac1c7cc8b88215716adc2", - "@rolldown/binding-linux-ppc64-gnu@npm:1.2.9": "dcd54975afc4f736e2b736a37158bb8eeadc58801fb40c0f3bf177d504fcea455209dd527151da7ffc818ae83327017cbd8549aee5d1eb07286049a652d79503", - "@rolldown/binding-linux-s390x-gnu@npm:1.2.9": "a3187e4309c9a3765f83e92e099baaf978581351d9e14f9ba6cd087ceb71010c9d807c08649ddfdffc0d93ac4530abdcbfa2611cb00198fa49a1fe16ba706d7e", - "@rolldown/binding-linux-x64-gnu@npm:1.2.9": "9fed0b83539a4e7d9ddc84d2a43194f4d3f697649a0856f342f947291ba21e7730f89f333960f0229e559f75cf752a4ea4632060b448f7a405602dd216d5035d", - "@rolldown/binding-linux-x64-musl@npm:1.2.9": "f8fa1d238157f5c397a8426696d2907f846e3c38e9dc4eadd2d841f84cda5966c3975864cd460c3ce3a0564ab212e329cfe923d911177efe14aef612a8174c26", - "@rolldown/binding-openharmony-arm64@npm:1.2.9": "13ac71327a28246eb9c38b458617d01ed93835ff8e17122606e718fc06e99fba4805e051b8d3786f0674ed95c0a98ec79431144e72d7452942dc17d8af4a14fc", - "@rolldown/binding-win32-arm64-msvc@npm:1.2.9": "a2f65e085ab4c6859361b97120a8298d2edeed0650ea6f3f70cb2a1e81f0b7f4ae7a0cb002af68d68c24f0706a9a3d55fdd8d4d96d4e8f7d5b73711abdf6e5d9", - "@rolldown/binding-win32-x64-msvc@npm:1.2.9": "6a8c186b5b9b9031bb870470f5da7fd4c9272c0e8602ceb77b6a0da78c46f82b4be6e9c34fc3723211d229e13f92d7bb30523f8195715299cee23fcf5dbd18e2", + "@rolldown/binding-android-arm-eabi@npm:1.2.12": "b1391173332a7847efe3fdc556f242b9ee7a627b47c0f03953a6a79a137cfe1cb94ec11dfdc3d366151768bc2d9eb4ff1c9db3b328112c94499b5764bc949527", + "@rolldown/binding-android-arm64@npm:1.2.12": "30b6b5898aaeebf8a81feeb56dad515bebe23be6a3e1ffe563480bd10982c1ccef84ab39d4535bc1c16554000e172ba75be5e6cf7a66f6d6d91bbc1598735a26", + "@rolldown/binding-darwin-arm64@npm:1.2.12": "cd8b268a0fc369ae588034f2d7572bbbe7a9c1ac155e3129110333f225b19818cd5561f0ba33c3b0dfe93ef0bd7cf71bea612b4074d39532d30de73f9e3492f4", + "@rolldown/binding-darwin-x64@npm:1.2.12": "ecc7584b9da0010cb130e10222ea739eec1b25eb6ab0ea90c900a7a84c96af9ae2828273546bd15bd30c753db17b5aad6f9be57be532975af5a2ce3a736be5dd", + "@rolldown/binding-freebsd-x64@npm:1.2.12": "a82a8e176e91feee76d06d15a86b9faf35b7ad783fe1127ec24df4a82d4ad18685c466c2829c64b4ae901cf173cab0670d3d76e37e8abbd4eb3b2a3dee78f612", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.2.12": "5ff02a5a404a7e5d14eee7e7647f899fc4b98f7d8a865fc60d4df9045d0dabe0e87dcb9a9e4ecf042651fa711c164e6b001138b5eeafee05b715915a7132cfa9", + "@rolldown/binding-linux-arm64-gnu@npm:1.2.12": "9bbd29f121852f19a57c3722c18941114dc4a8828dc7fa6be5e2acfed21e0d4f6fba8107ef40e9a71cbdba486c5c05dd918da690fb12dbc2bfa1b02685179369", + "@rolldown/binding-linux-arm64-musl@npm:1.2.12": "458dd37f0990d5bfcdb2cd2e0bb246543e04396c5b1354229e293c4376cd93c6f707588c58f818d9d7e7908146c9557cb0c1a3eeb9d60bf18b11789ec383929e", + "@rolldown/binding-linux-ppc64-gnu@npm:1.2.12": "2a5093d6cb691147d66f9f184113f32407f2829e946b3023f26a3957581346317677d21d5ae00a6b265891100cfbe8f0cbc9af7ef56d451de265a5fe8d3a5c1f", + "@rolldown/binding-linux-s390x-gnu@npm:1.2.12": "e0383702a9dff18cd1d40953182f59459849d230287a9b21ea34afc51f32f83e5b7539ca7b84b69c996ee5fa04a9fa111a77f3eaace48337713cffec1d71adf8", + "@rolldown/binding-linux-x64-gnu@npm:1.2.12": "0232638ad9a170e2fbbfdb4663714028fd4fde7b124a2d0e70afddcea14636e0126d88e001001dc1a244c369b2f5b1e3b41447b364070d9cff786cac9dd3b35a", + "@rolldown/binding-linux-x64-musl@npm:1.2.12": "81450d6a6675f21dbc2ffab22c25648d0fb69258d5868b42243f96b5ebb90dc6a554aa51bc1616adf286d80ec45d727e959511a8297a5ef5f989036fb10de599", + "@rolldown/binding-openharmony-arm64@npm:1.2.12": "01052b1f60eab80a390f5498b24220f4734bfba01a663c8812410f66e360530911dcea1060c424d3fd67350ddd4d783ade5711598d519c91393a354344d79cd9", + "@rolldown/binding-win32-arm64-msvc@npm:1.2.12": "7f9c2c8a534927ee6c4fa1004980f436c8d99a21206bf17e9e9da1a7b3411b4a0dc15ac1c4c180ac32d59bb897858be443f94d0d18cd3e6f5cf87b3981caab52", + "@rolldown/binding-win32-x64-msvc@npm:1.2.12": "fe721630c83e5ad5ad4edeef2b72abb0752bcf8f25c1f86ce16721061bfcc2ff863cfde293af8942edc5caff0d5d268198ca05dd372b863674136c6291734b6b", "@typescript/typescript-aix-ppc64@npm:7.0.2": "6135266f6e9c5928a8efd220b2ec972ecd6fa8c771dea432d2b8ffcec606aedd57b949db98ccb2a216e3fb87d4c6d42fd449258e0ee4cbda3d5994c69c5e84d2", "@typescript/typescript-darwin-arm64@npm:7.0.2": "c859259821baf9d7a8c1811bc1d0c0cb67b0d7fa9f99f1a3b50aa0e656a2df35c6142f77a9d2b1cd200874fd33bc3bf7ffb5cb5491d57be8e0522319ee3453f8", "@typescript/typescript-darwin-x64@npm:7.0.2": "4c689effd4a83b881b993903901f58d13aded3c61b2a9b6a0f8f591eeab595dbfab82930b1b2af3b1595829ead0e86c9278ea7b7f8fad47c8c76dd6b0e7fec4c", diff --git a/pkgs/by-name/ch/chuckya/package.nix b/pkgs/by-name/ch/chuckya/package.nix index 35512badfff0..c4ad7e84728f 100644 --- a/pkgs/by-name/ch/chuckya/package.nix +++ b/pkgs/by-name/ch/chuckya/package.nix @@ -7,26 +7,23 @@ patches ? [ ], gemset ? ./gemset.nix, yarnMissingHashes ? ./missing-hashes.json, - yarnHash ? "sha256-1kdslAHO6goCo6GwU3zPpaN6Zx9nXEXuxF3E35Xzcac=", + yarnHash ? "sha256-9gHfbjasIpXiOr7lbRV7Na7cu2mDXUXvkV6rTljTAvM=", }: let - src = applyPatches { - src = fetchFromGitHub { - owner = "TheEssem"; - repo = "mastodon"; - rev = "a7610aa2b86ffdcabc86008cca4234f135f642bd"; - hash = "sha256-c786uMkC0fEj3h4FKTGzz+GADUOfWCfTziLOCM0xWSI="; - }; - inherit patches; + src = fetchFromGitHub { + owner = "TheEssem"; + repo = "mastodon"; + rev = "63d369283df5c4cffb09d3dc6fd38f5b41a1e2ef"; + hash = "sha256-tr9c9sDO99Mz8uVlx0NsvFPHYDBRq+9BmoXksq5/1fE="; }; in (mastodon.override { pname = "chuckya"; - version = "0-unstable-2026-09-25"; + version = "0-unstable-2026-10-10"; - srcOverride = src; + srcOverride = applyPatches { inherit src patches; }; inherit gemset yarnMissingHashes yarnHash; }).overrideAttrs diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix index b7d701ee1b12..69c82fc7caca 100644 --- a/pkgs/by-name/ci/ciel/package.nix +++ b/pkgs/by-name/ci/ciel/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ciel"; - version = "3.11.0"; + version = "3.11.4"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "ciel-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Axb41MJr59NTT1WruGpYlTOXnCa0cIgC8i4uhDkv6FI="; + hash = "sha256-NdCAshfqGmpGvZsbDb20URSZfzIhp1f+XtVPVVBtiJ4="; }; - cargoHash = "sha256-VLTPcPmdUpa/6A/iaL8Oe8/QmeQMMP40j8J4nEEAeTQ="; + cargoHash = "sha256-c0HjQ3uc5HDh4AKgBKh8OO7fPNflcBPJxXMtqaNUmn0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix index 82dd71f36816..c350f5bdc07b 100644 --- a/pkgs/by-name/cl/claude-agent-acp/package.nix +++ b/pkgs/by-name/cl/claude-agent-acp/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "claude-agent-acp"; - version = "0.88.0"; + version = "0.93.0"; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "claude-agent-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-xLS5aCBOwFEaQgPiRhdUWV7rQFa7H0DQ1vFYtqZRERU="; + hash = "sha256-PWGJYiThOQGqsjm2Sp22wBmIdKcZP16/2fSzifBlb0U="; }; - npmDepsHash = "sha256-4rJRg46lpT5ts4JRQEd7FsyA6OUO5zAU41Ctnv9CjZ4="; + npmDepsHash = "sha256-VwSBDFgejcGT0NmnmPwnvA2HgYxsp4suZ7a5FY8niPw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/cl/claude-code/manifest.zst.json b/pkgs/by-name/cl/claude-code/manifest.zst.json index 5d89af62101c..7c7b5f1e8431 100644 --- a/pkgs/by-name/cl/claude-code/manifest.zst.json +++ b/pkgs/by-name/cl/claude-code/manifest.zst.json @@ -1,61 +1,60 @@ { - "version": "2.1.303", + "version": "2.1.304", "manifestSignatureEnforcement": "flag", - "commit": "07df2aedd2d01d2f60907b8404acbda187b04072", - "buildDate": "2026-10-18T20:41:39Z", + "commit": "17ab70404e5b632fe060207effb0b440788363ba", + "buildDate": "2026-10-19T18:32:13Z", "platforms": { "darwin-arm64": { "binary": "claude.zst", - "checksum": "482aa490dc1e0328bee10a163bef7f59c7c72e14de7535696b5bd3aec0089f7d", - "size": 90574412, + "checksum": "d4d21e296a055068be83a9cd0753817eb5033233d6c471cc60491745766441c5", + "size": 91631244, "bundle": { - "checksum": "717f3621312385ad819e41bbbe799746d20fb11b1131b60bb76f6b6a7ce2213b", - "size": 90574346 + "checksum": "6bbba6adc37fb46d351afb122c7406f4bb3b2ee42818222c310ce57a0594eac8", + "size": 91633634 } }, "darwin-x64": { "binary": "claude.zst", - "checksum": "ee148df1424b5422ad6d348be31f084d467b74cf1fdb564e4f9ec783f6fbe075", - "size": 95935669, + "checksum": "051693ea6644f29bc6d9f3a675d99464a04b46087ef29f5d92b09cd85a7a7f75", + "size": 97010027, "bundle": { - "checksum": "efc534c2a8f942ba4c8465fb30c33dab40df443485585fa7fd6b4d43f1813a16", - "size": 95934536 + "checksum": "3a0ab2425f5f78011ff3bc0e2db9502f80a5b349fd701f9bee5887319334b2a2", + "size": 97018270 } }, "linux-arm64": { "binary": "claude.zst", - "checksum": "4a8c0d2e0ab4f31d2b3e1dc136cec6cd4ef10c1c34897cabdece8570a488d2c4", - "size": 99886710 + "checksum": "3df0f416c511c97d8d87e748eef7f7b479db1b530209e53bebe51e8a3e4a0e6d", + "size": 100907378 }, "linux-x64": { "binary": "claude.zst", - "checksum": "b00b9295b825169975983c9e1cd3eb2dbbc9c95827fa8b377a0bef0bb8b471a8", - "size": 100914179 + "checksum": "0f3468fa285f112650feb3bec2913425b7ba5c83cd4eb411b5c75b4086416bb6", + "size": 101910048 }, "linux-arm64-musl": { "binary": "claude.zst", - "checksum": "6ff844ea7e3ffd18ef40097f1a6bdfcfa4f2b3c77b4133e75e8084ebb08c838c", - "size": 98261979 + "checksum": "b442bc1ecd24dd5de0e60d014c26325c977169ab0e6d1e83931327e047aca0d6", + "size": 99268661 }, "linux-x64-musl": { "binary": "claude.zst", - "checksum": "d77f7bb92a08a9e8c5c84bfe021e415b85a1caaae7b83568b0b4b418c06559fa", - "size": 99329421 + "checksum": "eeafe1d2f76a9ecb2829b7dcc96cb0c14382907ef95200fc5c09071e9f62daed", + "size": 100322776 }, "win32-x64": { "binary": "claude.exe.zst", - "checksum": "45513220216b8e0ba71a6d0be6f6f11538f622460b5c859541bd939ced8e3084", - "size": 103919182 + "checksum": "aed62990b91e94efb35482fd7068cc616c6c2414084c6aa32148ca2a359e4e81", + "size": 104965652 }, "win32-arm64": { "binary": "claude.exe.zst", - "checksum": "58635cd47d379f6ca8a87c0bea5045f883f4d3ecb0a912fa34f4c10ea17da310", - "size": 99162904 + "checksum": "6f2711964649cdfa3832e87c2d46aec76f225f310a451570ace133e1fb70f665", + "size": 100206011 } }, "sdkCompat": { "testedWrapperVersions": [ - "0.3.270", "0.3.271", "0.3.272", "0.3.273", @@ -84,7 +83,8 @@ "0.3.299", "0.3.300", "0.3.301", - "0.3.302" + "0.3.302", + "0.3.303" ], "harnessSchema": 1 } diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index a1c0ac8f9da5..e111e98a5014 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { --set-default FORCE_AUTOUPDATE_PLUGINS 1 \ --set DISABLE_INSTALLATION_CHECKS 1 \ --set USE_BUILTIN_RIPGREP 0 \ + --set-default CLAUDE_CODE_CERT_STORE system \ ${lib.optionalString stdenv.hostPlatform.isLinux '' --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \ ''}--prefix PATH : ${ diff --git a/pkgs/by-name/cl/clboss/package.nix b/pkgs/by-name/cl/clboss/package.nix index 3aa4caf93f76..ddd81f5f0200 100644 --- a/pkgs/by-name/cl/clboss/package.nix +++ b/pkgs/by-name/cl/clboss/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clboss"; - version = "0.17.1"; + version = "0.17.2"; # The release tarball includes the pre-generated file `commit_hash.h` that is required for building src = fetchzip { url = "https://github.com/ZmnSCPxj/clboss/releases/download/v${finalAttrs.version}/clboss-v${finalAttrs.version}.tar.gz"; - hash = "sha256-T5MENKxAPeH0gz9dvnyRb+8/dOzcCg1HO8ZWgwz133M="; + hash = "sha256-o9JZKyrMk9hT9qpnpvTDgmYofL3tEp1bfx1kgxjR6nM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index 8281789e96b7..0321bf287a62 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, gcc15Stdenv, fetchFromGitHub, cmake, @@ -14,7 +15,11 @@ openssl, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +let + # GCC 16 breaks the build; Darwin needs clang for upstream's -fobjc-arc flag. + stdenv' = if stdenv.hostPlatform.isDarwin then stdenv else gcc15Stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "clipboard-jh"; version = "0.10.0"; @@ -38,7 +43,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl ] - ++ lib.optionals gcc15Stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libffi wayland-protocols wayland @@ -53,7 +58,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { "-DINSTALL_PREFIX=${placeholder "out"}" ]; - postFixup = lib.optionalString gcc15Stdenv.hostPlatform.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/cb --add-rpath $out/lib ''; diff --git a/pkgs/by-name/cl/cloudflare-speed-cli/package.nix b/pkgs/by-name/cl/cloudflare-speed-cli/package.nix index 083f56543321..4b57eea74522 100644 --- a/pkgs/by-name/cl/cloudflare-speed-cli/package.nix +++ b/pkgs/by-name/cl/cloudflare-speed-cli/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cloudflare-speed-cli"; - version = "1.0.9"; + version = "1.0.10"; __structuredAttrs = true; src = fetchFromGitHub { owner = "kavehtehrani"; repo = "cloudflare-speed-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-a8iDRuWZ5Stpt/jCZ1tZ5L2N+dju5jKSNRwgCSDnFJU="; + hash = "sha256-rIqHx6W4+vwgzyo5WMy6WZLeSzWlrWVgYWAP8uAaNt0="; }; - cargoHash = "sha256-qEDein5Jn83/qKcNU5jPSVC0+eMmOQqQn6RdfSq56QY="; + cargoHash = "sha256-s5pV1rctmnVTP2+POdh+TknRjoDzYPdwrxW6TG09YUA="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index de98dde676f6..3494472706df 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-files"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-files"; tag = finalAttrs.version; - hash = "sha256-+ubt2tROkxpuWMIwUD81EhBJyGfG1+a5QLf3G5P8G9Y="; + hash = "sha256-sGNHmnly7fVe5rqm7UI0HVVnElBjBKU25Ob0hlCbuMw="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix index 4d0f4df5d400..e9f28eac7895 100644 --- a/pkgs/by-name/co/cockpit-machines/package.nix +++ b/pkgs/by-name/co/cockpit-machines/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-machines"; - version = "357"; + version = "358"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-machines"; tag = finalAttrs.version; - hash = "sha256-RuMmBqx+Fm+qHLxFct5Kc2zW98EBHQpK77zvCkAQ+24="; + hash = "sha256-cUjJV8t1NCMh6X6MyKZhVV+LKPnhcHzROHPjz0TzXBw="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index 1fb6227676ac..c71d44a16d28 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-podman"; - version = "131"; + version = "132"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-podman"; tag = finalAttrs.version; - hash = "sha256-+djsTOaE8tY2pn5O7KWNHdtqEogDEPUETNeWt3bzdhU="; + hash = "sha256-qVndv+FVQxP5NirLPjsz9k9em/r+yakaeUTVpdOJOAI="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index e0ceafe6f5bc..e337d0492a7f 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -47,13 +47,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "368"; + version = "369"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-2bFQwK5L0S84nLSkUeHmbNgBkjBJIxR88t/21h5jmps="; + hash = "sha256-r0nDLUJzGwf8oObCHfC9xGlYwq0mbKuPlPtCTWDP+LE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix index d7a2523dd618..736d67fbac79 100644 --- a/pkgs/by-name/co/cocoon/package.nix +++ b/pkgs/by-name/co/cocoon/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "cocoon"; - version = "0.13"; + version = "0.13.2"; src = fetchFromGitHub { owner = "haileyok"; repo = "cocoon"; tag = "v${finalAttrs.version}"; - hash = "sha256-obDLev5SlM5bV+277ymxXlpP9knf8j4I6FEPGHr2WyE="; + hash = "sha256-lvRqf2BeP/ul6axI6oQ19ucQ+Hn2YUN1swB1o3t909U="; }; ldflags = [ diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 0eb0187c0412..61288f76d591 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,18 +1,18 @@ { - "version": "3.24.9", + "version": "3.25.9", "vscodeVersion": "1.128.0", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/cd6d2a1f2e56e9841f0ed9c7c24542087b4e69be/linux/x64/Cursor-3.24.9-x86_64.AppImage", - "hash": "sha256-btUqLItDHYAMb3kaPO9pMWvY1SjCwLNdynYtczOW3Rg=" + "url": "https://downloads.cursor.com/production/5d4df965746c5d09740842fc0f1331ba1c15783d/linux/x64/Cursor-3.25.9-x86_64.AppImage", + "hash": "sha256-ik73lSFq9UNeXBzsO/HAS2gbnTmsUmVBUpP/kUnQMXk=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/cd6d2a1f2e56e9841f0ed9c7c24542087b4e69be/linux/arm64/Cursor-3.24.9-aarch64.AppImage", - "hash": "sha256-k8KrpFSynSYd7AWkK63LdDCv+y0oX/h4wJloZavImAY=" + "url": "https://downloads.cursor.com/production/5d4df965746c5d09740842fc0f1331ba1c15783d/linux/arm64/Cursor-3.25.9-aarch64.AppImage", + "hash": "sha256-PKbwjz1bZ6tWzWwLNTtLzwJTq+ZMh9dIZ2VQX2D+IxE=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/cd6d2a1f2e56e9841f0ed9c7c24542087b4e69be/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-jTEQczADOwvuZB2VqXj39piBEzCVW+Zbnnamk3vK9bk=" + "url": "https://downloads.cursor.com/production/5d4df965746c5d09740842fc0f1331ba1c15783d/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-lPJ/QE3fxTAcdbIeuikmJOXvPDWQSlvXGKvxAQua3IQ=" } } } diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix index d5e33747a2a8..e2557358e71c 100644 --- a/pkgs/by-name/co/codebase-memory-mcp/package.nix +++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix @@ -6,17 +6,18 @@ nodejs, npmHooks, stdenv, + versionCheckHook, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "codebase-memory-mcp"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "DeusData"; repo = "codebase-memory-mcp"; rev = "v${finalAttrs.version}"; - hash = "sha256-6CrxqkyxfsSENQBAuS7hwZFgQX+4Ocxx0CH6eIeqw3E="; + hash = "sha256-qmLm6jALuPUh6+gSEmWzECWL7AC8HOHAbUHDpYOJlbs="; }; patches = [ @@ -27,13 +28,19 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile.cbm \ --replace-fail "npm ci &&" "" + ${lib.optionalString stdenv.hostPlatform.isLinux '' + # Keep mimalloc available through its direct API, without interposing on libc. + substituteInPlace Makefile.cbm \ + --replace-fail 'ifneq ($(filter yes,$(IS_MINGW) $(IS_LINUX)),)' 'ifneq ($(filter yes,$(IS_MINGW)),)' + ''} + patchShebangs scripts/embed-frontend.sh ''; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-W3cajM1XXy19EgGSJyXsd00KncAm7v4afnnnHXIqlhc="; + hash = "sha256-MKXmiMUofKka1C1jwlm+Mq8X90cTMvipfTC3eX0iv60="; }; npmRoot = "graph-ui"; @@ -43,6 +50,9 @@ stdenv.mkDerivation (finalAttrs: { npmHooks.npmConfigHook ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + buildInputs = [ bash zlib @@ -51,6 +61,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; __structuredAttrs = true; + env = { + # Do not let onnxruntime-node fetch execution providers from NuGet. + ONNXRUNTIME_NODE_INSTALL = "skip"; + }; + enableParallelBuilding = true; makefile = "Makefile.cbm"; @@ -65,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall install -Dm755 build/c/codebase-memory-mcp $out/bin/codebase-memory-mcp + runHook postInstall ''; @@ -75,5 +91,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ gdifolco ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + broken = stdenv.hostPlatform.isMusl; }; }) diff --git a/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff b/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff index 33a1ee498d25..4b2d6f4104c5 100644 --- a/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff +++ b/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff @@ -1,7 +1,7 @@ diff --git a/src/main.c b/src/main.c --- a/src/main.c +++ b/src/main.c -@@ -1077,12 +1077,6 @@ static void print_help(void) { +@@ -1127,12 +1127,6 @@ static void print_help(void) { printf(" codebase-memory-mcp cli [--quiet] [--progress] [--verbose] [--json] " "[args]\n"); printf(" Run one tool locally, then exit\n"); @@ -9,14 +9,14 @@ diff --git a/src/main.c b/src/main.c - "[--dir=] [--skip-config]\n"); - printf(" [--clients=] Run " - "'install --clients' to list tokens\n"); -- printf(" codebase-memory-mcp uninstall [-y|-n] [--dry-run]\n"); +- printf(" codebase-memory-mcp uninstall [-y|-n] [--dry-run] [--delete-indexes]\n"); - printf(" codebase-memory-mcp update [-y|-n]\n"); printf(" codebase-memory-mcp config \n"); printf(" codebase-memory-mcp --version Print version\n"); printf(" codebase-memory-mcp --help Print this help\n"); -@@ -1254,15 +1248,6 @@ static int handle_subcommand(int argc, char **argv, cbm_project_lock_manager_t * +@@ -1308,15 +1302,6 @@ static int handle_subcommand(int argc, char **argv, cbm_project_lock_manager_t * cbm_mem_init(cbm_mem_ram_fraction_for_total(cbm_system_info().total_ram)); - return cbm_cmd_hook_augment(argc - i - SKIP_ONE, argv + i + SKIP_ONE); + return cbm_test_impact_cli(argc - i - SKIP_ONE, argv + i + SKIP_ONE); } - if (strcmp(argv[i], "install") == 0) { - return cbm_cmd_install(argc - i - SKIP_ONE, argv + i + SKIP_ONE); diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 7abab8e37b30..355dd067ea1a 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -2,29 +2,38 @@ fetchFromCodeberg, installShellFiles, lib, + libgit2, openssl, pkg-config, rustPlatform, stdenv, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codeberg-cli"; version = "0.5.5"; + __structuredAttrs = true; + src = fetchFromCodeberg { owner = "Aviac"; repo = "codeberg-cli"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yjWAL4Tu9nuQsy8fDhga5lsxYwooE0fW70zfp7Dqq3Y="; }; + env.LIBGIT2_NO_VENDOR = 1; + cargoHash = "sha256-AD4VLGsxkfl1UwJmZhR183Gk7ltjEyH9tlt+iKNs5J0="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ openssl ]; + buildInputs = [ + libgit2 + openssl + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd berg \ @@ -33,6 +42,9 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/berg completion zsh) ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "CLI Tool for Codeberg similar to gh and glab"; homepage = "https://codeberg.org/Aviac/codeberg-cli"; diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix index 624f7eed45aa..f71a1b08b1c4 100644 --- a/pkgs/by-name/co/conmon-rs/package.nix +++ b/pkgs/by-name/co/conmon-rs/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "conmon-rs"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "conmon-rs"; rev = "v${finalAttrs.version}"; - hash = "sha256-aeicug8d5RKFgq7ZSGBN7qY0PvlZcTeMwYMYXTS3Gvw="; + hash = "sha256-nGBQXgHoDtCqOY8jZKj5j+AgbvnkY3NtJbe3SkUiXRY="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doCheck = false; - cargoHash = "sha256-8GtwbX+FOE+upKJbQFGv+RJDZHPNMcA5SUTPK6qgrIs="; + cargoHash = "sha256-n4DM7jk8kWEJfxPKno60f+umiT+uipsk8Sx0IHzRUos="; meta = { description = "OCI container runtime monitor written in Rust"; diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 7febdcf6e568..3e1046345825 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "coroot"; - version = "1.27.2"; + version = "1.27.4"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q9FFAowwy9wNcSFPeQsZ/dulk0oG3dOzyoh6LTQU1w8="; + hash = "sha256-HBni2LGrEDIhavbAvCtZotDi54+YgpFfbOuW8UR8eyA="; }; vendorHash = "sha256-QB5jz+ks9naRM7KvlxXUkMcTTtmy0SQXkfxGx/vh3W4="; diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix index 6190c7d294a2..0f4533499cb4 100644 --- a/pkgs/by-name/cp/cp2k/package.nix +++ b/pkgs/by-name/cp/cp2k/package.nix @@ -152,6 +152,9 @@ stdenv.mkDerivation (finalAttrs: { # Fix pkg-config path generation ./pkgconfig.patch + + # SIRIUS 7.12 removed the call_fftw_fin argument from sirius_finalize() + ./sirius-7.12-finalize-api.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cp/cp2k/sirius-7.12-finalize-api.patch b/pkgs/by-name/cp/cp2k/sirius-7.12-finalize-api.patch new file mode 100644 index 000000000000..91a0505fab74 --- /dev/null +++ b/pkgs/by-name/cp/cp2k/sirius-7.12-finalize-api.patch @@ -0,0 +1,15 @@ +SIRIUS 7.12 removed the call_fftw_fin argument from sirius_finalize(). +The third argument is now error_code (integer, optional), so drop the +third .FALSE. that was previously passed for call_fftw_fin. + +--- a/src/sirius_interface.F ++++ b/src/sirius_interface.F +@@ -123,7 +123,7 @@ + !> \author JHU + ! ************************************************************************************************** + SUBROUTINE cp_sirius_finalize() +- CALL sirius_finalize(.FALSE., .FALSE., .FALSE.) ++ CALL sirius_finalize(.FALSE., .FALSE.) + END SUBROUTINE cp_sirius_finalize + + !*************************************************************************************************** diff --git a/pkgs/by-name/cp/cpak/package.nix b/pkgs/by-name/cp/cpak/package.nix index 5903f6ec9579..fb157b268e77 100644 --- a/pkgs/by-name/cp/cpak/package.nix +++ b/pkgs/by-name/cp/cpak/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cpak"; - version = "2.14.4"; + version = "2.14.8"; src = fetchFromGitHub { owner = "Containerpak"; repo = "cpak"; tag = "v${finalAttrs.version}"; - hash = "sha256-NbrbvcHLwjOl0LBTMqVq9pio0J0t+Oma4SLuRZGZFWs="; + hash = "sha256-n/uHhOzZvKUE6QSZ6LRBLGOvm9LRibKB2DRFsSwYhEk="; }; - vendorHash = "sha256-Sqakbm9QulHh05lxZ4CGvIdHVTIziCTr4SxfIslwIU0="; + vendorHash = "sha256-+JB2fxN/EAABtzh1o+S/SOxpNa0VQ2LHEEg18Z6KtA8="; subPackages = [ "." diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix index 785ea2a6448d..2596faf0f461 100644 --- a/pkgs/by-name/cr/croaring/package.nix +++ b/pkgs/by-name/cr/croaring/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "croaring"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; tag = "v${finalAttrs.version}"; - hash = "sha256-8xQx+awukfCMjoSxWTbKbjCIIGUHF5VKeVlZiaC1h2g="; + hash = "sha256-ykAF7rX4UnTIPtvZXO3ssTUX7IFOSrBPn1KXp/qNA/o="; }; # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index be659800d032..d20aa69f7585 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,16 +11,16 @@ buildGo127Module (finalAttrs: { pname = "croc"; - version = "11.5.4"; + version = "11.5.5"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-QF++O86FqyTE/s0BiFhFts80/DCXPU1xAqeTMtviE2E="; + hash = "sha256-Y3WgLiMZL4caokULWOV+daNWkXNvzm7MDA3Vu6hUIHo="; }; - vendorHash = "sha256-eiuycihsdYZqdobRsMlryyQOhOeDIUAyM7cUavTPv+o="; + vendorHash = "sha256-s1G2FjKoLp0ork79PVBVas9dUED7pkmZuSVhwEmb0tc="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cr/cryptoscan/package.nix b/pkgs/by-name/cr/cryptoscan/package.nix index f289fbf973cf..5e998862a908 100644 --- a/pkgs/by-name/cr/cryptoscan/package.nix +++ b/pkgs/by-name/cr/cryptoscan/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "cryptoscan"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "csnp"; repo = "cryptoscan"; tag = "v${finalAttrs.version}"; - hash = "sha256-94pVrxjnyZhhYrXFy5XzEpHbo79YIQdLm4T2HsDPJLg="; + hash = "sha256-P+SZAlOHDqNrf+d85wc/WBYBxEKg+j+/7H2014h7Aso="; }; vendorHash = "sha256-komX1AmHt2NoF1x6xsNa2RFkfVzOXfYEMPhT0zwMxjw="; diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json index 7f0253e46747..67c0f90bf56a 100644 --- a/pkgs/by-name/cu/cudatext/deps.json +++ b/pkgs/by-name/cu/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2026.10.03", - "hash": "sha256-bnIOQoaZQxa0B2Zyxy1B0FYbi8IXb4ja2wPtPIoSjdw=" + "rev": "2026.10.05", + "hash": "sha256-am6sT1e7zzO7oUVNEz09I54Ee6J9p0ErJNlTTu/b/YQ=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.6.6", - "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=" + "rev": "v11.6.8", + "hash": "sha256-g6ujLtG1JetOuY/bv3MIL/sDq5RIm8fvWyJBlmUwCDA=" } } diff --git a/pkgs/by-name/cu/cudatext/lazarus48.patch b/pkgs/by-name/cu/cudatext/lazarus48.patch deleted file mode 100644 index 6c709a107473..000000000000 --- a/pkgs/by-name/cu/cudatext/lazarus48.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- i/ATSynEdit/atsynedit/atsynedit_canvasproc_text_gtk3.pas -+++ w/ATSynEdit/atsynedit/atsynedit_canvasproc_text_gtk3.pas -@@ -162,7 +162,7 @@ begin - cairo_get_font_matrix(ct, @LastFontMatrix); - - // Calculate and cache the font baseline. -- cairo_font_extents(ct, @extents); -+ cairo_font_extents(Cairo.Pcairo_t(ct), @extents); - LastBaseline := Ceil(extents.height - extents.descent); - end; - diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix index 2e1456def3b6..5cda38bdde48 100644 --- a/pkgs/by-name/cu/cudatext/package.nix +++ b/pkgs/by-name/cu/cudatext/package.nix @@ -42,19 +42,17 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cudatext"; - version = "1.237.1.0"; + version = "1.237.2.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; tag = finalAttrs.version; - hash = "sha256-7u4mddZO5uT64HjbgRrznPkyp/CvPKqFFBgvEEe6vQ0="; + hash = "sha256-K2GGfgWyXV92s6TEWP4T2qfWFF4QRXmxaaGUoidP8oE="; }; patches = [ ./proc_globdata.patch - # https://github.com/Alexey-T/ATSynEdit/issues/388 - ./lazarus48.patch ]; prePatch = lib.concatStringsSep "\n" ( diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index 2eff210b1256..2459188a6000 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "4.6.14"; + version = "4.8.3"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; tag = finalAttrs.version; - hash = "sha256-/1B4aswxso8dPuu+YjVo8Qbor3dDQBjK943b2ySX74c="; + hash = "sha256-jHO//Ptk2TlaVKSy7D9ibhMpIZHaTcRTGB+aTtH3Pvo="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-FxSGlP12hyF4d0VeSfc3MeJNDTpSDvAStua6Q21Hoag="; + hash = "sha256-yte5IoUhxNX9AamqS1AKCrSGA3Y3Jy0hqDppsuXHpDA="; }; passthru = { diff --git a/pkgs/by-name/da/dawarich/sources.json b/pkgs/by-name/da/dawarich/sources.json index 0f7b2b26a720..6c23c52a12cf 100644 --- a/pkgs/by-name/da/dawarich/sources.json +++ b/pkgs/by-name/da/dawarich/sources.json @@ -1,5 +1,5 @@ { - "version": "1.15.3", - "hash": "sha256-FaPKk6Y9ayPk/cPAxcS1tvfjjJ8KqAYyx21yS/Sdeyo=", + "version": "1.16.0", + "hash": "sha256-2a1JnYhf7uizVcL7KkapAcPdyfefJxgjv6I/ALdxDkA=", "npmHash": "sha256-Xe9FDNDJxx2Vt+ByXz8JX2cAPg+Y/sUeHeWePHEp0/0=" } diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index 95b11bcd5106..5182ed769b6f 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "dbmate"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; tag = "v${finalAttrs.version}"; - hash = "sha256-ctgSULLdKa0yHHroXhfyKVro8iXPnpk47r0N83suuD4="; + hash = "sha256-PlPS6bPfKjVzRxR78etDAPZxBfWcMbTCqPY5S79/XAc="; }; - vendorHash = "sha256-2JZhYLzkblQH+MlacWSxmTvXYcNBxnvR2juC1NQfkVg="; + vendorHash = "sha256-3Sc9nKNX8xWRAQ7Vtz5IEtNTs6MHVN8yoKOy+p2r7XY="; tags = [ "fts5" ]; diff --git a/pkgs/by-name/dc/dcpomatic/leqm-nrt-libsndfile-linking.patch b/pkgs/by-name/dc/dcpomatic/leqm-nrt-libsndfile-linking.patch deleted file mode 100644 index 924eff5fa865..000000000000 --- a/pkgs/by-name/dc/dcpomatic/leqm-nrt-libsndfile-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/wscript b/src/wscript -index cbea215..62b0a06 100644 ---- a/src/wscript -+++ b/src/wscript -@@ -6,6 +6,7 @@ def build(bld): - obj.source = 'leqm_nrt.cc' - - if bld.env.WITH_LIBSNDFILE: -+ obj.uselib = 'SNDFILE' - obj = bld(features='cxx cxxprogram') - obj.name = 'leqm_nrt_cli' - obj.target = 'leqm_nrt' diff --git a/pkgs/by-name/dc/dcpomatic/leqm-nrt.nix b/pkgs/by-name/dc/dcpomatic/leqm-nrt.nix index 801325f05cbe..b0f281edbe90 100644 --- a/pkgs/by-name/dc/dcpomatic/leqm-nrt.nix +++ b/pkgs/by-name/dc/dcpomatic/leqm-nrt.nix @@ -11,18 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "leqm-nrt"; - version = "0.0.2"; + version = "0.0.2-unstable-2026-08-23"; src = fetchgit { url = "https://git.carlh.net/git/leqm-nrt"; - tag = "v${finalAttrs.version}"; - hash = "sha256-rynqxvh2FT03Fs5XOV5ZBLzB6lJlop793cMv0FB3s1g="; + rev = "3913040723f746c0b4a59cb55cd8a23030ea49a2"; + hash = "sha256-TzQyUeGwaWJQtWEGtS8kN7CdbKT3MMpguB9WSvztX8c="; }; - patches = [ - ./leqm-nrt-libsndfile-linking.patch - ]; - nativeBuildInputs = [ wafHook python3 diff --git a/pkgs/by-name/dc/dcpomatic/libdcp.nix b/pkgs/by-name/dc/dcpomatic/libdcp.nix index 3ad357d2fdbf..3b006dd2993a 100644 --- a/pkgs/by-name/dc/dcpomatic/libdcp.nix +++ b/pkgs/by-name/dc/dcpomatic/libdcp.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdcp"; - version = "1.10.63"; + version = "1.10.64"; src = fetchgit { url = "https://git.carlh.net/git/libdcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-nT9wSOY/OPNRxpjnp+wblx7Jbx/S0uP7lL68zBK4NFk="; + hash = "sha256-aqTdMp6mUZF0uGb86WprVlHm7G8QovdH6VIet0YYYH0="; }; # for some reason the version is not set properly upstream diff --git a/pkgs/by-name/dc/dcpomatic/libsub.nix b/pkgs/by-name/dc/dcpomatic/libsub.nix index 76926e08e4d3..a8b9243a9f26 100644 --- a/pkgs/by-name/dc/dcpomatic/libsub.nix +++ b/pkgs/by-name/dc/dcpomatic/libsub.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsub"; - version = "1.6.64"; + version = "1.6.65"; src = fetchgit { url = "https://git.carlh.net/git/libsub"; tag = "v${finalAttrs.version}"; - hash = "sha256-5umGV7qzh0iYkWbnnSVAtENhI9nIk+AE7pZHbDZuArk="; + hash = "sha256-XPpmEruRFTmJfKkAZ42zakuLa2yDsO9sb/OwoB2R6wo="; }; # for some reason the version is not set properly upstream diff --git a/pkgs/by-name/dc/dcpomatic/package.nix b/pkgs/by-name/dc/dcpomatic/package.nix index b10d624172e0..cc7e615b8b1d 100644 --- a/pkgs/by-name/dc/dcpomatic/package.nix +++ b/pkgs/by-name/dc/dcpomatic/package.nix @@ -47,12 +47,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dcpomatic"; - version = "2.18.50"; + version = "2.18.51"; src = fetchgit { url = "https://git.carlh.net/git/dcpomatic"; tag = "v${finalAttrs.version}"; - hash = "sha256-qYzV8tXISGCYAzoJJDhx/xDZAS4HD8VwE3Z0CsCjIZs="; + hash = "sha256-BIUcNYq9m6on1nxPHLGEdjHVZLYN9fu6lqgeLqtdw38="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix index 1d3eb00d4dee..7c4ddb9d5188 100644 --- a/pkgs/by-name/de/deadbeef/package.nix +++ b/pkgs/by-name/de/deadbeef/package.nix @@ -162,6 +162,7 @@ clangStdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "riscv64-linux" + "aarch64-linux" ]; maintainers = [ ]; }; diff --git a/pkgs/by-name/de/demucs-rs/package.nix b/pkgs/by-name/de/demucs-rs/package.nix index c6021386813b..6394efe269b9 100644 --- a/pkgs/by-name/de/demucs-rs/package.nix +++ b/pkgs/by-name/de/demucs-rs/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "demucs-rs"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "nikhilunni"; repo = "demucs-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-IidfPS+/T8aJoW30gdnKhhsgluMt+h9RllAXH9Yrq1g="; + hash = "sha256-M3Lujw2c6dkvjH8kzE1WbWHPCeFaomUlLqFcWA1mLY0="; }; - cargoHash = "sha256-xngHyenlB3sMqzJHNk9utk4TNhdt+awutDuP1JzhhBA="; + cargoHash = "sha256-M0p/RzWjVSSWgSeWYrF5pRuoJRw5XNpj3vnLWLTjlDo="; # Only build the CLI crate, not the DAW plugin or WASM targets buildAndTestSubdir = "demucs-cli"; diff --git a/pkgs/by-name/de/devin-cli/package.nix b/pkgs/by-name/de/devin-cli/package.nix index fc56031f5f58..39a62ee29b9c 100644 --- a/pkgs/by-name/de/devin-cli/package.nix +++ b/pkgs/by-name/de/devin-cli/package.nix @@ -7,24 +7,24 @@ }: let - version = "3000.11.3"; + version = "3000.11.92"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz"; - hash = "sha256-g7OxE8Ab8qPp4QDbCNd+awhoBqd1TwkeIIMb3+IVFX4="; + hash = "sha256-LYKROWguA4zxIlEPEXDu49cGC8x+v5JEXLxdKMn7z6A="; }; aarch64-linux = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz"; - hash = "sha256-IaLXqN6meYcGfN5+s/5xk6SNqo+MPVDUFMYDxKK2fxU="; + hash = "sha256-iB6DsN8G3VejBwBOKZQHwsN0XyiFRuCjOaZ/vr58tsA="; }; aarch64-darwin = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz"; - hash = "sha256-wIzD81B9EDJGuMYBpYT8xxn9d/bMEPJsyQ6fQYZkDfI="; + hash = "sha256-YEc5IhLOBz7eJyTYQkbMBN1HgRodHiCE7uclJwOUCsE="; }; }; in diff --git a/pkgs/by-name/df/dftd4/package.nix b/pkgs/by-name/df/dftd4/package.nix index 3da069cd74a3..2d4b847f16c3 100644 --- a/pkgs/by-name/df/dftd4/package.nix +++ b/pkgs/by-name/df/dftd4/package.nix @@ -108,11 +108,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction"; changelog = "https://github.com/dftd4/dftd4/releases/tag/${finalAttrs.src.tag}"; mainProgram = "dftd4"; - license = with lib.licenses; [ - lgpl3Plus - gpl3Plus - ]; - homepage = "https://github.com/grimme-lab/dftd4"; + license = lib.licenses.lgpl3Plus; + homepage = "https://github.com/dftd4/dftd4"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/di/diffyml/package.nix b/pkgs/by-name/di/diffyml/package.nix index e97ffa3585fd..c9a6b1ff4246 100644 --- a/pkgs/by-name/di/diffyml/package.nix +++ b/pkgs/by-name/di/diffyml/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "diffyml"; - version = "1.8.0"; + version = "1.8.2"; __structuredAttrs = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "szhekpisov"; repo = "diffyml"; tag = "v${finalAttrs.version}"; - hash = "sha256-+S1h//n8k2f8pL4KDGq7KkSeQSXjj+JCPclK4jIj9mE="; + hash = "sha256-ddPpq615/oRE//6CJ1C4UcXgWnfbeEd6aJcEDiPpvoU="; }; - vendorHash = "sha256-QE/EwVzMqUO24ZAl0WBibGx6x0kNo1AUTZtfnQvX50k="; + vendorHash = "sha256-vjGhS7nhjXlms1ZsRG6Qy/7ategUIgwiBwk943cz9Lk="; # bench/compare and doc/gen-cli-ref are internal dev tools, not user-facing. excludedPackages = [ diff --git a/pkgs/by-name/di/diskwatch/package.nix b/pkgs/by-name/di/diskwatch/package.nix index 7a64e2054695..29bf460f11a1 100644 --- a/pkgs/by-name/di/diskwatch/package.nix +++ b/pkgs/by-name/di/diskwatch/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "diskwatch"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "matthart1983"; repo = "diskwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-qSPTnOYiaY1vcFoGaNppgjmwLbl03kQMvNUgbFP5eWw="; + hash = "sha256-n0yTv+RQOKUmhsAx59wPe7Y+wzkBscGFCAvGWoLoF1s="; }; __structuredAttrs = true; - cargoHash = "sha256-Xaq49j2JhrcqCY7bLiIf6yKC99Je5WwSgzV/vk1VsZU="; + cargoHash = "sha256-LsPcEEO1fPdWNUd7ML3wOBc/TiPJAEd6MVPqhQZDFG0="; nativeCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix index 0b87d8d60c72..345e8d2b1a6b 100644 --- a/pkgs/by-name/di/dislocker/package.nix +++ b/pkgs/by-name/di/dislocker/package.nix @@ -5,7 +5,7 @@ cmake, pkg-config, fuse3, - mbedtls, + openssl, nix-update-script, }: @@ -27,9 +27,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fuse3 - mbedtls + openssl ]; + cmakeFlags = [ + (lib.cmakeFeature "CRYPTO_BACKEND" "openssl") + ]; + + doCheck = true; # runs some sanity checks against crypto library bindings + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-DFUSE_DARWIN_ENABLE_EXTENSIONS=0"; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix index bf5b6489bfa9..f138a5d53f08 100644 --- a/pkgs/by-name/dn/dnglab/package.nix +++ b/pkgs/by-name/dn/dnglab/package.nix @@ -1,34 +1,42 @@ { + fetchFromGitHub, lib, rustPlatform, - fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dnglab"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dnglab"; repo = "dnglab"; - rev = "v${finalAttrs.version}"; - # darwin/linux hash mismatch - postFetch = '' - rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"} - ''; - hash = "sha256-uCOdfCeec//5CnkuDEIgCy9B7SsqiXN8oGkoHhJ4N5Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2I7VOJdeJP4NjSosUpRFyPGtbREDkJvJPXbXWImCgpQ="; }; - cargoHash = "sha256-CFtCONFL1qRTg67AxfuEeIqLq/+57xMGbTKKMFPAhuo="; + cargoHash = "sha256-BDhfxsd//SJvkiGjaFlZCPLCHFNV55GlzqAN1LDQQfE="; + + strictDeps = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; postInstall = '' rm $out/bin/benchmark $out/bin/identify ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=v([\\d.]+)" ]; + }; + meta = { description = "Camera RAW to DNG file format converter"; homepage = "https://github.com/dnglab/dnglab"; license = lib.licenses.lgpl21Only; - maintainers = [ ]; + changelog = "https://github.com/dnglab/dnglab/releases/tag/${finalAttrs.src.tag}"; + maintainers = with lib.maintainers; [ VlaDexa ]; mainProgram = "dnglab"; }; }) diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix index dad8b9f33752..8e78ea72ce19 100644 --- a/pkgs/by-name/do/dosbox-x/package.nix +++ b/pkgs/by-name/do/dosbox-x/package.nix @@ -165,7 +165,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ hughobrien - OPNA2608 ]; platforms = lib.platforms.unix; mainProgram = "dosbox-x"; diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index e886582f12bd..21bc18b1419f 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "dotenvx"; - version = "2.33.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${finalAttrs.version}"; - hash = "sha256-78bS6LjSpBdvMzFGvJhN8P6VV3XnJrT1ovO7NZCcXAs="; + hash = "sha256-DhdYEBsBTlxDAOLCFk4FXPh9iUSMCRpA1JJLcWaBL8g="; }; - npmDepsHash = "sha256-1rDI2GxsyZVMmPZ3zeW+TijpY5G6sta+WNUWhXbLzws="; + npmDepsHash = "sha256-toDNCjZEPXyFyHPi3+L1ukEK/1/IR7onmMd+nBUNKl8="; dontNpmBuild = true; diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 7f5ac05ca60d..38bd02455ecb 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dsda-doom"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "dsda-org"; repo = "dsda-doom"; tag = "v${finalAttrs.version}"; - hash = "sha256-n44h2U3Ist8Cr+CMW2SrhMhS+/5ojBp269P4B5Wum7k="; + hash = "sha256-vnjXLYjWZyaBKQxrLdNgSi5ojONYKaF0O+u173/T2ug="; }; sourceRoot = "${finalAttrs.src.name}/prboom2"; diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index 0e5de62bad63..6388bdf74ef3 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dufs"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${finalAttrs.version}"; - hash = "sha256-Be7aJ5Bo5JSMcyyWsZ3ZamQ691TSIO4Ylxzil7UNJxk="; + hash = "sha256-wGRu0E4uAlNtBIZ7C9O0S9VAjQjdn2M0/KV8mqgQWDU="; }; - cargoHash = "sha256-H2ew+sb60UnXe3Dls9MSKwAk4hT/yLSbgZz6pVOkHQQ="; + cargoHash = "sha256-DFJjJ8e3EdNC+4AcSXwNPOvJ6rbb7wZR44gmyZzDI2o="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index 0379ba0eab89..37959532f1f9 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dysk"; - version = "3.7.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; tag = "v${finalAttrs.version}"; - hash = "sha256-23sMS/ioKSmvKb0DznGLO3YMyMTIlbjEwyT6uG/WxZA="; + hash = "sha256-U39Z4C+o4YlIys3RyS0GiKztkE0bhgFpyHvfG2WmuxQ="; }; - cargoHash = "sha256-sJdTR+xIAisTrsZ/It08WWRwZmtVK/btYoqT3MgNrOA="; + cargoHash = "sha256-5fCKEQVA/W72ssLDf1JgF07wpTv9xqkw4VlUoIj6lYs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ef/efitools/package.nix b/pkgs/by-name/ef/efitools/package.nix index f3cc209c7d1f..350ed002072b 100644 --- a/pkgs/by-name/ef/efitools/package.nix +++ b/pkgs/by-name/ef/efitools/package.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation (finalAttrs: { # https://bugs.debian.org/1122408 ./objcopy-output-target.patch ] + ++ lib.optionals stdenv.hostPlatform.isRiscV64 [ + ./riscv64.patch + ] ++ lib.optionals isCross [ # Use builder's efitools to create sig lists for host ./cross.patch diff --git a/pkgs/by-name/ef/efitools/riscv64.patch b/pkgs/by-name/ef/efitools/riscv64.patch new file mode 100644 index 000000000000..c2f7e60b7e4d --- /dev/null +++ b/pkgs/by-name/ef/efitools/riscv64.patch @@ -0,0 +1,12 @@ +diff --git a/Make.rules b/Make.rules +--- a/Make.rules ++++ b/Make.rules +@@ -8,6 +8,8 @@ else ifeq ($(ARCH),x86_64) + ARCH3264 = + else ifeq ($(ARCH),aarch64) + ARCH3264 = ++else ifeq ($(ARCH),riscv64) ++ARCH3264 = + else ifeq ($(ARCH),arm) + ARCH3264 = + else diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix index 2602659d8a3b..baadfe22d6d1 100644 --- a/pkgs/by-name/ej/ejsonkms/package.nix +++ b/pkgs/by-name/ej/ejsonkms/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "ejsonkms"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "envato"; repo = "ejsonkms"; rev = "v${finalAttrs.version}"; - hash = "sha256-uvTIyc3z8rpculfmiV8ojQ5K70R5cwP7IQPrM5teSQQ="; + hash = "sha256-LW471u99QMHQ3r/LooUxEEFgjQq41TIJ/uRd48hSavg="; }; - vendorHash = "sha256-RXzZ+5CqVBcGAYB/IiPG8Mu4fUAgE0xr1UUVMqWTwEw="; + vendorHash = "sha256-wwyyBPSkAqTdpDdI++KMKDiDN+Mz89oMqbO6eokSb6s="; ldflags = [ "-X main.version=v${finalAttrs.version}" diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 981004d5fdfa..53d39720ae1d 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -16,20 +16,20 @@ let # Keep this in sync with upstream locked version (likely a stable release, but not always latest) matrix-js-sdk = stdenv.mkDerivation (finalAttrs: { pname = "matrix-js-sdk"; - version = "42.3.0-rc.0-unstable-2026-08-25"; + version = "43.0.0-unstable-2026-10-01"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-js-sdk"; - rev = "24929be0e741be6a5d0a7226f1c682e245263b8a"; - hash = "sha256-RCGrdF6S+b0uRYFIt2YJ5FjXoyh6zvQyIHovL8SXySE="; + rev = "fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999"; + hash = "sha256-ldquetRKrjgI+YN2zp6mXzqEqSpBFqKCwJw8UEoD+gY="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-X03l+H+GiVsCtUzMxpRZS4B1QeUPyJ/dcj/Arbp/llM="; + hash = "sha256-TPr/z7D9FkvToUE1gQEZwXMMllx5U224s8+O9yNT2BM="; }; nativeBuildInputs = [ @@ -58,20 +58,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.26.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; tag = "v${finalAttrs.version}"; - hash = "sha256-S47A3l5IEKia06iUqgVo6gWkBLR8ncckNHKvlf591g4="; + hash = "sha256-c/Q1xUGYU0odkDsRcEnPJPIo3pWbx/dMcpPBhGF07OQ="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-akLaHs+ERvsTsb8zCIS7vMNJo9h5cjn+60O/TatOxzE="; + hash = "sha256-0PLGOvevYMXvRWmC3ic0+oABuNU3jMGGn2ABHftsnOM="; }; inherit matrix-js-sdk; diff --git a/pkgs/by-name/em/emgucv/package.nix b/pkgs/by-name/em/emgucv/package.nix new file mode 100644 index 000000000000..8770d9ef8673 --- /dev/null +++ b/pkgs/by-name/em/emgucv/package.nix @@ -0,0 +1,232 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + eigen, + libgeotiff, + libjpeg, + libpng, + libtiff, + libwebp, + openjpeg, + zlib, + common-updater-scripts, + coreutils, + gitMinimal, + gnugrep, + writeShellScript, +}: + +let + # Emgu CV builds OpenCV in its own tree: the root CMakeLists.txt pulls the + # opencv submodule in with ADD_SUBDIRECTORY and Emgu.CV.Extern links against + # the targets it defines, so the system opencv cannot be substituted here. + # The submodule points at Emgu's fork, which carries their own patches. It is + # pinned to the revision the tag below records; passthru.updateScript moves + # the two together. + opencv = fetchFromGitHub { + owner = "emgucv"; + repo = "opencv"; + rev = "156f87e379445f631f646ebb26b566114fa5074c"; + hash = "sha256-JftBAzHsnk3U+6PZhk0/Q+5E8KHLNaYx69R+SE+Lr8U="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "emgucv"; + version = "4.13.0"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "emgucv"; + repo = "emgucv"; + tag = finalAttrs.version; + hash = "sha256-SDI+QWAK4bNtto4WkC7ii48MW9qlhJUdlfR50hhuk5Y="; + }; + + postUnpack = '' + cp -rT ${opencv} source/opencv + chmod -R u+w source/opencv + ''; + + postPatch = '' + # Only the native library is built here, so the C# toolchain that the + # managed assemblies need is not a configure-time requirement. + substituteInPlace CMakeLists.txt \ + --replace-fail "FIND_PACKAGE(CSharp REQUIRED)" "FIND_PACKAGE(CSharp)" + + # Don't let the build look at which distribution the host runs. It probes + # /etc/os-release, lsb_release and uname, and on Ubuntu or RHEL hosts + # and moves the output directory somewhere else + substituteInPlace cmake/modules/CheckPlatform.cmake \ + --replace-fail "IF (UNIX AND NOT APPLE)" \ + "IF (FALSE)" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + eigen + libgeotiff + libjpeg + libpng + libtiff + libwebp + openjpeg + zlib + ]; + + # Follows platforms/ubuntu/24.04/cmake_configure's "mini" profile, the one + # upstream publishes as the Emgu.CV.runtime.mini.* NuGet packages. + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" false) + (lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true) + (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17") + (lib.cmakeBool "EMGU_CV_WITH_FREETYPE" false) + (lib.cmakeBool "EMGU_CV_WITH_TESSERACT" false) + # Skip the managed assemblies, which are consumed from NuGet instead + (lib.cmakeBool "EMGU_CV_BUILD" false) + (lib.cmakeBool "EMGU_CV_EXAMPLE_BUILD" false) + + # mini profile + (lib.cmakeBool "BUILD_opencv_dnn" false) + (lib.cmakeBool "BUILD_opencv_features2d" false) + (lib.cmakeBool "BUILD_opencv_flann" false) + (lib.cmakeBool "BUILD_opencv_gapi" false) + (lib.cmakeBool "BUILD_opencv_ml" false) + (lib.cmakeBool "BUILD_opencv_photo" false) + (lib.cmakeBool "BUILD_opencv_video" false) + + (lib.cmakeBool "BUILD_DOCS" false) + (lib.cmakeBool "BUILD_JAVA" false) + (lib.cmakeBool "BUILD_PERF_TESTS" false) + (lib.cmakeBool "BUILD_TESTS" false) + (lib.cmakeBool "BUILD_opencv_apps" false) + (lib.cmakeBool "BUILD_opencv_python2" false) + (lib.cmakeBool "BUILD_opencv_python3" false) + (lib.cmakeBool "BUILD_opencv_ts" false) + + # Link the image codecs from Nixpkgs rather than building OpenCV's vendored copies + (lib.cmakeBool "BUILD_JPEG" false) + (lib.cmakeBool "BUILD_OPENJPEG" false) + (lib.cmakeBool "BUILD_PNG" false) + (lib.cmakeBool "BUILD_TIFF" false) + (lib.cmakeBool "BUILD_WEBP" false) + (lib.cmakeBool "BUILD_ZLIB" false) + (lib.cmakeBool "WITH_JPEG" true) + (lib.cmakeBool "WITH_OPENJPEG" true) + (lib.cmakeBool "WITH_PNG" true) + (lib.cmakeBool "WITH_TIFF" true) + (lib.cmakeBool "WITH_WEBP" true) + (lib.cmakeBool "WITH_EIGEN" true) + + # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled. + (lib.cmakeBool "WITH_JASPER" false) + # Only used by the dnn module, which the mini profile leaves out + (lib.cmakeBool "WITH_PROTOBUF" false) + # Would be fetched during the build. + (lib.cmakeBool "WITH_IPP" false) + # No consumer of libcvextern.so goes through OpenCV's own capture or + # window backends, so none of them are wired up. + (lib.cmakeBool "WITH_1394" false) + (lib.cmakeBool "WITH_FFMPEG" false) + (lib.cmakeBool "WITH_GSTREAMER" false) + (lib.cmakeBool "WITH_GTK" false) + (lib.cmakeBool "WITH_LAPACK" false) + (lib.cmakeBool "WITH_OPENEXR" false) + (lib.cmakeBool "WITH_V4L" false) + (lib.cmakeBool "WITH_CUDA" false) + ]; + + buildFlags = [ "cvextern" ]; + + # The build writes into libs/, under a subdirectory named after the detected + # target on some architectures, so look the artifacts up by name. + doCheck = true; + checkPhase = '' + runHook preCheck + + make -j$NIX_BUILD_CORES cvextern_test + "$(find ../libs -type f -name cvextern_test)" + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + install -Dm555 "$(find ../libs -type f -name libcvextern.so)" -t $out/lib + + runHook postInstall + ''; + + passthru = { + # Exposed so that the update script can rewrite the pinned revision. + opencvSrc = opencv; + + updateScript = writeShellScript "update-emgucv" '' + set -euo pipefail + + export PATH="${ + lib.makeBinPath [ + common-updater-scripts + coreutils + gitMinimal + gnugrep + ] + }:$PATH" + + repo=https://github.com/emgucv/emgucv.git + + # Upstream also carries one tag that is not a version number. + version=$( + git ls-remote --tags --sort v:refname --refs "$repo" | + cut --delimiter=/ --fields=3 | + grep --extended-regexp '^[0-9]+(\.[0-9]+)*$' | + tail --lines=1 + ) + + update-source-version emgucv "$version" + + checkout=$(mktemp --directory) + trap 'rm -rf "$checkout"' EXIT + git clone --quiet --filter=blob:none --no-checkout --depth 1 \ + --branch "$version" "$repo" "$checkout" + + oldRev=$(nix-instantiate --eval --strict -A emgucv.opencvSrc.rev | tr -d '"') + newRev=$(git -C "$checkout" rev-parse HEAD:opencv) + + if [[ "$newRev" != "$oldRev" ]]; then + update-source-version emgucv \ + --ignore-same-version \ + --source-key=opencvSrc \ + --rev="$newRev" + fi + ''; + }; + + meta = { + description = "Cross platform .NET wrapper for OpenCV"; + longDescription = '' + Emgu CV is a .NET wrapper for OpenCV. This package provides only + libcvextern.so, the native half of the wrapper; the managed assemblies + are distributed as NuGet packages. + ''; + homepage = "https://www.emgu.com/"; + changelog = "https://github.com/emgucv/emgucv/releases/tag/${finalAttrs.version}"; + # Dual licensed: GPL-3.0 for open source use, commercial otherwise. + # OpenCV, statically linked in, is Apache-2.0. + license = with lib.licenses; [ + gpl3Only + asl20 + ]; + maintainers = with lib.maintainers; [ kanagawamarcos ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/et/et/package.nix b/pkgs/by-name/et/et/package.nix index e4478f3e3d68..e4e30fbe5749 100644 --- a/pkgs/by-name/et/et/package.nix +++ b/pkgs/by-name/et/et/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "et"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "oxzi"; repo = "et"; rev = finalAttrs.version; - sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq"; + sha256 = "sha256-mJDRhi7osW4hsNVx3soLYqN9crwU7+kQUolCjqehQT4="; }; buildInputs = [ @@ -35,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/oxzi/et"; license = lib.licenses.gpl3; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ lennartmueh ]; }; }) diff --git a/pkgs/by-name/ex/exa-agent-skills/package.nix b/pkgs/by-name/ex/exa-agent-skills/package.nix index 3c3cdcce0126..80678d5169c7 100644 --- a/pkgs/by-name/ex/exa-agent-skills/package.nix +++ b/pkgs/by-name/ex/exa-agent-skills/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "exa-agent-skills"; - version = "2026.10.05-5c3fd25"; + version = "2026.10.19-627da25"; strictDeps = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "exa-labs"; repo = "agent-skills"; tag = "v${finalAttrs.version}"; - hash = "sha256-UqVl3XTALMFSp2Z5IGPtnuqS/ZShVsWCfxif1rZoZAM="; + hash = "sha256-sFYvUOSfu0vCH/BvVX5zmHW2SXiaqmPKOIsiGEL2ruw="; }; nativeBuildInputs = [ installAgentSkills ]; diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 14868d00f680..a25a3a6021bc 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -12,6 +12,7 @@ libgudev, libmanette, lsfg-vk, + lsfgSupport ? false, meson, ninja, nix-update-script, @@ -65,9 +66,12 @@ python3Packages.buildPythonApplication (finalAttrs: { --replace-fail "/usr/bin/python3" "${python3Packages.python.interpreter}" substituteInPlace faugus/path_manager.py \ - --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \ + --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" + '' + + lib.optionalString lsfgSupport '' + substituteInPlace faugus/path_manager.py \ --replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \ - --replace-fail "/usr/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" + --replace-fail "/usr/lib/liblsfg-vk-layer.so" "${lsfg-vk}/lib/liblsfg-vk-layer.so" ''; preFixup = '' diff --git a/pkgs/by-name/fc/fcgiwrap/package.nix b/pkgs/by-name/fc/fcgiwrap/package.nix index a57dc313fe62..e2be9fa2ae5a 100644 --- a/pkgs/by-name/fc/fcgiwrap/package.nix +++ b/pkgs/by-name/fc/fcgiwrap/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, systemd, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, fcgi, autoreconfHook, pkg-config, @@ -20,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; - configureFlags = [ + configureFlags = lib.optionals systemdSupport [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; @@ -29,8 +30,7 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook pkg-config ]; - buildInputs = [ - systemd + buildInputs = lib.optionals systemdSupport [ systemd ] ++ [ fcgi ]; diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 1994ee0b541d..466bbe73f0a8 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fermyon-spin"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "spinframework"; repo = "spin"; tag = "v${finalAttrs.version}"; - hash = "sha256-3FskZe64sWorAm6B4Hqln43HrTDl2os5CcpQIy3FFYg="; + hash = "sha256-qYpmbAVN5DQqsD8sk3aSwzgM2zHWgCgR6qUN3Nv6XU0="; }; - cargoHash = "sha256-eBtHRTIDROM3r2zhyIcp1jaj2TmJ3akYeRRMwZ6B0AM="; + cargoHash = "sha256-6oHdFhTma4Uf+QkWCGptWpGbkPBybWHJ1alrGXble7g="; nativeBuildInputs = [ pkg-config @@ -42,9 +42,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # The update bot handles this automatically. For doing it manually: # curl -s https://api.github.com/repos/spinframework/spin/commits/v${finalAttrs.version} | jq '{ sha: .sha[0:8], date: .commit.committer.date[0:10], ts: .commit.committer.date }' - VERGEN_GIT_SHA = "7ca44bed"; - VERGEN_GIT_COMMIT_DATE = "2026-10-05"; - VERGEN_GIT_COMMIT_TIMESTAMP = "2026-10-05T23:27:44Z"; + VERGEN_GIT_SHA = "6f89ab75"; + VERGEN_GIT_COMMIT_DATE = "2026-10-15"; + VERGEN_GIT_COMMIT_TIMESTAMP = "2026-10-15T12:02:49Z"; VERGEN_GIT_BRANCH = "main"; } // lib.optionalAttrs (stdenv.hostPlatform.isMusl && stdenv.buildPlatform.isLinux) { diff --git a/pkgs/by-name/ff/fff-mcp/package.nix b/pkgs/by-name/ff/fff-mcp/package.nix index 72ce52e5d6f3..816f8c8e4e56 100644 --- a/pkgs/by-name/ff/fff-mcp/package.nix +++ b/pkgs/by-name/ff/fff-mcp/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fff-mcp"; - version = "0.10.6"; + version = "0.11.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff"; tag = "v${finalAttrs.version}"; - hash = "sha256-IR8w57VPiCerh8tEUhzNjd2A7BMY1Dvs0Yl0rIIoj1E="; + hash = "sha256-GSjvvdLkuezFUrHqiSeePa64VRb3tabOKZNqEE5XSAw="; }; - cargoHash = "sha256-mt5T9Cs174pc1CtrPZE6hwYZ3eSaGhCRL94trcoZn4Q="; + cargoHash = "sha256-VKI7MnqCGis78qmYuBkViT96ZhG4Wy9vARdnmGV048A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fi/firefox-gnome-theme/package.nix b/pkgs/by-name/fi/firefox-gnome-theme/package.nix index aa9986076108..15e35c73cbe9 100644 --- a/pkgs/by-name/fi/firefox-gnome-theme/package.nix +++ b/pkgs/by-name/fi/firefox-gnome-theme/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefox-gnome-theme"; - version = "157"; + version = "157.1"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "firefox-gnome-theme"; tag = "v${finalAttrs.version}"; - hash = "sha256-FEr8AziQBAgXGOHkXjbNMZ5zB06AwiOZCrbyoulC1eo="; + hash = "sha256-mg4JrSm2ym4dXyLeBS7/4/G7aLg0bxssTjEaJXymHrE="; }; dontConfigure = true; diff --git a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix index ceec2b951ac8..434f53096e1d 100644 --- a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix +++ b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix @@ -8,6 +8,7 @@ rustPlatform, firefox-unwrapped, + nix-update-script, nixosTests, openssl, pkg-config, @@ -16,13 +17,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "firefoxpwa-unwrapped"; - version = "2.20.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; tag = "v${finalAttrs.version}"; - hash = "sha256-4Gbwfx/Gv21dvCEeS6HE1zHflD7xABRX3rAJdHWIsHU="; + hash = "sha256-kOtdGRW2DN0qQLrtvbsywBdGlM/1cboQGu2NM7cO8E8="; }; sourceRoot = "${finalAttrs.src.name}/native"; @@ -91,6 +92,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; passthru = { + updateScript = nix-update-script { }; tests.firefoxpwa = nixosTests.firefoxpwa; binaryName = "firefoxpwa"; applicationName = "firefoxpwa"; diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 25b5267532b7..ba0583a0aa2c 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.76.2"; + version = "0.78.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-vgbYwMw6/fZ2mB9I10M1QVHHBg9v6OaJcgImaCqAyK4="; + sha256 = "sha256-9qgpeh/iaXUa6mJV3dFUn2TnTYC1xqmawqViAaczCVc="; }; dontUnpack = true; diff --git a/pkgs/by-name/fo/foxglove-studio/update.sh b/pkgs/by-name/fo/foxglove-studio/update.sh index d95bb4f04964..d0edfb4e1647 100755 --- a/pkgs/by-name/fo/foxglove-studio/update.sh +++ b/pkgs/by-name/fo/foxglove-studio/update.sh @@ -9,7 +9,7 @@ changelog_url="https://docs.foxglove.dev/changelog/tags/foxglove" version=$( curl -s "$changelog_url" \ | grep 'Downloads: ' \ - | grep ' \ + node_modules/.pnpm/sass-embedded@*/node_modules/sass-embedded/dist/lib/src/compiler-path.js + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/gradient-frontend + cp -rL dist/gradient-frontend/browser/* $out/share/gradient-frontend/ + install -Dm444 dist/gradient-frontend/3rdpartylicenses.txt \ + $out/share/doc/gradient-frontend/3rdpartylicenses.txt + + runHook postInstall + ''; + + meta = { + description = "Nix-CI for Teams (web frontend)"; + inherit (gradient.meta) + homepage + changelog + license + maintainers + ; + + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/gr/gradient/nix.nix b/pkgs/by-name/gr/gradient/nix.nix new file mode 100644 index 000000000000..79c6f57aad57 --- /dev/null +++ b/pkgs/by-name/gr/gradient/nix.nix @@ -0,0 +1,37 @@ +{ + nixVersions, + src, +}: +let + patches = map (name: "${src}/nix/patches/nix/${name}") [ + "0001-libexpr-c-expose-nix_get_derivation-and-nix_value_au.patch" + "0002-libexpr-c-Add-C-API-function-nix_eval_state_builder_.patch" + "0003-libflake-c-expose-nix_locked_flake_get_fingerprint.patch" + "0004-libstore-c-expose-nix_store_add_temp_root-and-nix_st.patch" + "0005-libexpr-c-expose-nix_eval_state_get_stats_json-via-E.patch" + "0006-libflake-c-expose-eval-cache-AttrCursor-API-openEval.patch" + "0010-feat-libexpr-c-nix_eval_state_get_stats-lean-counter.patch" + "0011-fix-libexpr-c-read-counters-via-public-EvalState-get.patch" + "0012-perf-eval-cache-memoize-rooted-paths-and-batch-conte.patch" + "0013-style-apply-repo-clang-format-and-meson-format.patch" + "0014-fix-eval-cache-share-a-cache-file-between-concurrent-evaluators.patch" + "0015-daemon-delegate-cgroup-controllers-so-builds-expose-.patch" + "0016-libstore-name-build-cgroups-after-the-derivation-has.patch" + "0017-libstore-keep-build-statistics-in-DerivationTrampoli.patch" + "0018-libstore-report-cgroup-memory-io-and-oom-stats-in-Bu.patch" + "0019-libfetchers-check-that-a-source-copied-earlier-is-st.patch" + "0020-perf-libexpr-replay-a-failed-realisation-instead-of-building-it-again.patch" + "0021-feat-libexpr-let-the-embedder-realise-import-from-derivation.patch" + "0022-fix-eval-cache-evaluate-a-failed-attribute-again-ins.patch" + ]; +in +((nixVersions.nixComponents_2_35.appendPatches patches).overrideScope ( + final: prev: { withAWS = false; } +)).nix-everything.overrideAttrs + (prev: { + strictDeps = true; + __structuredAttrs = true; + meta = prev.meta // { + description = "Nix-CI for Teams (patched Nix)"; + }; + }) diff --git a/pkgs/by-name/gr/gradient/package.nix b/pkgs/by-name/gr/gradient/package.nix new file mode 100644 index 000000000000..cb6435c39c39 --- /dev/null +++ b/pkgs/by-name/gr/gradient/package.nix @@ -0,0 +1,93 @@ +{ + lib, + callPackage, + fetchFromGitHub, + gitMinimal, + libgit2, + libssh2, + openssl, + pkg-config, + rustPlatform, + sqlite, + xz, + zlib, + zstd, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gradient"; + version = "2.0.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "wavelens"; + repo = "gradient"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Irz/EXv7qOqXkvNnaxvninWljRX6nM95YN/x6uIudX8="; + }; + + sourceRoot = "${finalAttrs.src.name}/backend"; + + cargoHash = "sha256-new/QW/N6CCRbM48lrpHDNLk8sGjRAKFN6x5AL/3qKY="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + finalAttrs.passthru.nix + gitMinimal + libgit2 + libssh2 + openssl + sqlite + xz + zlib + zstd + ]; + + env = { + LIBGIT2_NO_VENDOR = 1; + LIBSQLITE3_SYS_USE_PKG_CONFIG = 1; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + useNextest = true; + checkFeatures = [ "gradient-daemon/mock" ]; + nativeCheckInputs = [ gitMinimal ]; + + # These tests need a store fixture built from hello's `.drv` closure. + cargoTestFlags = [ + "--filterset" + "not (${ + lib.concatMapStringsSep " | " (test: "test(${test})") [ + "fakes::store_fixture::tests::" + "test_eval_closure_walk_empty_store" + "the_evaluators_are_released_before_the_closure_walk" + "pushes_batch_closure_before_reporting_it" + "a_known_dependency_is_neither_reported_nor_walked" + "test_eval_aborts_when_signal_set_before_start" + "abort_interrupts_a_running_nix_evaluation" + "test_eval_dependencies_match_fixture" + "a_root_is_walked_while_discovery_still_runs" + "the_evaluators_are_released_once_discovery_ends" + "attributes_on_a_derivation_yield_entry_points" + ] + })" + ]; + + passthru = { + frontend = callPackage ./frontend.nix { gradient = finalAttrs.finalPackage; }; + nix = callPackage ./nix.nix { inherit (finalAttrs) src; }; + }; + + meta = { + description = "Nix-CI for Teams"; + homepage = "https://github.com/wavelens/gradient"; + changelog = "https://github.com/wavelens/gradient/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ derdennisop ]; + platforms = lib.platforms.linux; + mainProgram = "gradient-server"; + }; +}) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 734317fcbab8..99a6e84e4ed4 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -55,6 +55,10 @@ buildGoModule (finalAttrs: { patchPhase = '' cp -av ${finalAttrs.frontend}/share internal/web/ui/dist + # Use only the system CA store. The embedded fallback bundle does not get cacert updates. + substituteInPlace flowcmd/flowcmd.go \ + --replace-fail '_ "golang.org/x/crypto/x509roots/fallback"' "" + goSumBeylaVersion="$(grep beyla go.sum | head -1 | cut -d ' ' -f2)" if [[ "$goSumBeylaVersion" != "${beylaVersion}" ]];then echo "beyla version in go.sum ($goSumBeylaVersion) doesn't match the one set in the expression (${beylaVersion}), needs updating." diff --git a/pkgs/by-name/gr/graff/manifest.json b/pkgs/by-name/gr/graff/manifest.json index e8e26d96d1f7..0db99e5fd93c 100644 --- a/pkgs/by-name/gr/graff/manifest.json +++ b/pkgs/by-name/gr/graff/manifest.json @@ -1,21 +1,21 @@ { - "version": "0.0.302.27", + "version": "0.302.46", "assets": { "x86_64-linux": { - "url": "https://github.com/justrach/codegraff/releases/download/v0.0.302.27/graff-x86_64-linux.tar.gz", - "hash": "sha256-790xmN/6j7S1+zi/VUdxbP4tnpR91gpC5hlGNgKP3jE=" + "url": "https://github.com/justrach/codegraff/releases/download/v0.302.46/graff-x86_64-linux.tar.gz", + "hash": "sha256-lSKHrf34hrrRefEHZGH2qhA/5/MqsqHPXe4DyXL3HHs=" }, "aarch64-linux": { - "url": "https://github.com/justrach/codegraff/releases/download/v0.0.302.27/graff-aarch64-linux.tar.gz", - "hash": "sha256-NQHdqcgSZ6psop2cY9AENfmxefne8/HSau1s/CT04bs=" + "url": "https://github.com/justrach/codegraff/releases/download/v0.302.46/graff-aarch64-linux.tar.gz", + "hash": "sha256-aMunRNomOVp3lJEcVJBz+volgeA4cTwz5ia5rDbAVg8=" }, "aarch64-darwin": { - "url": "https://github.com/justrach/codegraff/releases/download/v0.0.302.27/graff-aarch64-macos.tar.gz", - "hash": "sha256-rZuxTmUO7N74QzBMktlL0U9oNIls4P5OygdFjv+Fa0k=" + "url": "https://github.com/justrach/codegraff/releases/download/v0.302.46/graff-aarch64-macos.tar.gz", + "hash": "sha256-ymYwMBRWdXjnOnMJFJ5jX6o53n+FzXLgZe3hEkNFrIw=" }, "x86_64-darwin": { - "url": "https://github.com/justrach/codegraff/releases/download/v0.0.302.27/graff-x86_64-macos.tar.gz", - "hash": "sha256-a0ehLSdcOaMZglzFA7O9tBYFPk5Pi3xMeeEyre73Eew=" + "url": "https://github.com/justrach/codegraff/releases/download/v0.302.46/graff-x86_64-macos.tar.gz", + "hash": "sha256-eMQKtxvt6GJMrU+SLiZCt4zlPsRSeKbH8/IE8cQUqbQ=" } } } diff --git a/pkgs/by-name/gr/gridcraft/package.nix b/pkgs/by-name/gr/gridcraft/package.nix index 693338df340a..2d0a5ef3f0bd 100644 --- a/pkgs/by-name/gr/gridcraft/package.nix +++ b/pkgs/by-name/gr/gridcraft/package.nix @@ -38,7 +38,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gridcraft"; - version = "0.7.0"; + version = "0.8.0"; __structuredAttrs = true; strictDeps = true; @@ -47,10 +47,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "storytold"; repo = "gridcraft"; tag = "v${finalAttrs.version}"; - hash = "sha256-8qlbNJWvONfZ8BvY8fij1QrLwoikFKBgmTiklpu4LOM="; + hash = "sha256-G0xsNWRoNMtA5lTKSZgLCHP6gcq+zOaOPdcColuFr0A="; }; - cargoHash = "sha256-9PJmE7dLeDIEsnczga1WfWaad1e0YLLh04rJcSyzGwE="; + cargoHash = "sha256-EY/41uMNm9hG7LhynI4d/7RSj5tGXsT8/s+Al8mr7pk="; # The mac_menu_appkit test starts a real NSApplication, and AppKit aborts in the build # sandbox ("required built-in appearance SystemAppearance not found"). diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix index 4e7a88f40207..b178c504462e 100644 --- a/pkgs/by-name/gr/grok-build/package.nix +++ b/pkgs/by-name/gr/grok-build/package.nix @@ -10,7 +10,7 @@ grok-build, }: let - version = "1.0.50"; + version = "1.0.62"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; @@ -26,9 +26,9 @@ let url = "https://x.ai/cli/grok-${version}-${upstreamPlatform}"; hash = { - x86_64-linux = "sha256-yA3gFVcG/y2ZViOIexAvLQq9LGKyZD3qOgzrr33XJNU="; - aarch64-linux = "sha256-lH7qY+Ujk+AHeNZR0i4NrSLTDp7lsq95RO/D/UQ47MA="; - aarch64-darwin = "sha256-r0Gx1l1BFv9kmmia2dBw1MKr4lVzfUa6Cz6BYTRWluY="; + x86_64-linux = "sha256-KkbZ5Nfr16nP9/lXFnFLGdrV8h3SpJeCJACx+xKJaao="; + aarch64-linux = "sha256-C4CKIglyh4jS43w06hhG1GC0FSip/H7cdpi5597BL+E="; + aarch64-darwin = "sha256-7ENOgxr9z86HeA8oFf1zKx34pKjelqSRcWrXXRNgWk4="; } .${system}; } diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index f484e58d7eed..60d00c88df8a 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.58"; + version = "0.4.59"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-e1Imczj65fzdUwrRElLTPjbs4U1+kvAkrEGPucQ6GiM="; + hash = "sha256-m/v8aYchGabl69+RJhpSNl5sJdvGqCrlLn6+/1fb7xA="; }; tags = [ @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { "-X main.versionTag=${finalAttrs.version}" ]; - vendorHash = "sha256-XU3zWygDsqx3zKPNVkd2TTnFJv3hv9XnIMEhEatIfkM="; + vendorHash = "sha256-c46rSZDEv+uvaq2vaiyB3sfevyp3mDTQTEceFWcMeJI="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/gu/guetzli/package.nix b/pkgs/by-name/gu/guetzli/package.nix index 2ecb32068b3e..3666fe24c0b4 100644 --- a/pkgs/by-name/gu/guetzli/package.nix +++ b/pkgs/by-name/gu/guetzli/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality."; homepage = "https://github.com/google/guetzli"; license = lib.licenses.asl20; - platforms = lib.platforms.x86_64; + platforms = lib.platforms.linux; maintainers = [ lib.maintainers.seppeljordan ]; mainProgram = "guetzli"; }; diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index 0ef3c933fec8..5b12aacceb53 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -95,6 +95,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # FoundationModels requires macros that are only shipped with Xcode. The 26.x SDK in Nixpkgs does not have them. substituteInPlace src-tauri/build.rs \ --replace-fail 'has_foundation_models = framework_path.exists()' ' has_foundation_models = false' + + # Disable the in-app updater + substituteInPlace src/components/update-checker/UpdateChecker.tsx \ + --replace-fail 'settings?.update_checks_enabled ?? false' 'false' '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace "$cargoDepsCopy"/*/libappindicator-sys-*/src/lib.rs \ diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index cfb35a03ceef..de1f33b25366 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.26"; + version = "0.0.27"; __structuredAttrs = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "goharbor"; repo = "harbor-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-xaON2tgF2WvL2yffNS8VfS7AwmUo8J5uyZEWVmZlBLg="; + hash = "sha256-GlyEYdy6yQJzQVHIyvpmbbWOqPHYkOk5Hn9s1v/Uz14="; }; - vendorHash = "sha256-HVaWa8LH2jlXPB+wDjRA0r20XiFBNUFD2gPJ5A7yPU4="; + vendorHash = "sha256-mvXsMm37Qd1Z77C6ca2UsyFN6PELE3XYf8uFW/HdoFc="; excludedPackages = [ "dagger" diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index acfedcc450a5..0b9402aff0f8 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -13,7 +13,7 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "harlequin"; - version = "2.16.1"; + version = "2.16.2"; pyproject = true; __structuredAttrs = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "tconbeer"; repo = "harlequin"; tag = "v${finalAttrs.version}"; - hash = "sha256-0ZVqA7A8JWpUSx4uABWgaKtNlINwzY4Gld1z2cypJKc="; + hash = "sha256-Y6cIKzq7zl+k2m/3FFkM5C9l19vzXglBmPvYOx2nXZM="; }; postPatch = diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix index 1c096ca91d9e..50e4ee201476 100644 --- a/pkgs/by-name/ha/haveged/package.nix +++ b/pkgs/by-name/ha/haveged/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "haveged"; - version = "1.9.26"; + version = "1.9.27"; src = fetchFromGitHub { owner = "jirka-h"; repo = "haveged"; rev = "v${finalAttrs.version}"; - hash = "sha256-mt3lQYCTiZSDf8toogAxx9VGewSMwyhdalLe0W2C+DQ="; + hash = "sha256-ee/isfM36iYZ1Ivf3Vf/mB4QjpSoQ3on8pC8ZzwspTc="; }; strictDeps = true; diff --git a/pkgs/by-name/he/helixnotes/package.nix b/pkgs/by-name/he/helixnotes/package.nix index 2231538eeb10..84ed3e0edc5e 100644 --- a/pkgs/by-name/he/helixnotes/package.nix +++ b/pkgs/by-name/he/helixnotes/package.nix @@ -5,7 +5,7 @@ fetchPnpmDeps, cargo-tauri, pnpmConfigHook, - pnpm, + pnpm_11, nodejs, pkg-config, jq, @@ -32,14 +32,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-mwM4439o+j8C9XhSHh9QB3nMSVObxmQmbdoTeMs1bVc="; + hash = "sha256-xfzamKcryQIYBm+b3dul0lRK3O8+sLVF4vibVS3NWGU="; }; nativeBuildInputs = [ cargo-tauri.hook pnpmConfigHook - pnpm + pnpm_11 nodejs pkg-config jq diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index 427e11f4d987..62c66ac39e77 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "hermit"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-yhKvRgrX4pN21kXUU0qZGnenVtWlT3tnsKWZ4Iu8wb0="; + hash = "sha256-w4FFHaPDdncmgqSIatfOBZNuy8Pdg/uULfqLjFEug0Y="; }; vendorHash = "sha256-2sj1Tc+3icoOPKq1hcOxSjKarxQ7Vvvvx9iAWWrb3Xo="; diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix deleted file mode 100644 index 903ec69d6243..000000000000 --- a/pkgs/by-name/hi/highlight-assertions/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "highlight-assertions"; - version = "0.1.7"; - - src = fetchFromGitHub { - owner = "thehamsta"; - repo = "highlight-assertions"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg="; - }; - - cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM="; - - # requires nightly features - env.RUSTC_BOOTSTRAP = 1; - - meta = { - description = "Tool for unit testing tree sitter highlights for nvim-treesitter"; - mainProgram = "highlight-assertions"; - homepage = "https://github.com/thehamsta/highlight-assertions"; - license = lib.licenses.asl20; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index b69be1b0a5c8..8b8339d4f2b6 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGo127Module (finalAttrs: { pname = "hugo"; - version = "0.167.0"; + version = "0.168.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-T6dEgvY1Akt+GUWdNvVTjkmtM/MwW9HX/v4Ra+jmZKY="; + hash = "sha256-+uPsZSKwhZhefIid1ODUgPNgOKFg38KdawRfWslmkOg="; }; - vendorHash = "sha256-67v7yJx2q/YrY5yvlDXmNzH1oFnM+9nN18QgjPhT3tg="; + vendorHash = "sha256-euQIrOw7xQpw9DXwn56veoa5ILUIjMGnRQoganvtCgI="; checkFlags = let diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 582182cd874e..58ba1312f087 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-OkJyHiUDRrvyyF/6onGnGJSjQX2qPjRlPtUo685tDQ8="; + hash = "sha256-yX4FsqFS3udMAlokRPk5YbzmmOjnkNIxfCs7en2cv8I="; }; appimageContents = appimageTools.extract { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix index e148ad41ccb0..5c73469158cc 100644 --- a/pkgs/by-name/hy/hyprlauncher/package.nix +++ b/pkgs/by-name/hy/hyprlauncher/package.nix @@ -19,13 +19,13 @@ gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlauncher"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlauncher"; tag = "v${finalAttrs.version}"; - hash = "sha256-FHw6S2rz716ZwuF661aT5HYN1b6qyyBDkwhEL5hzHUk="; + hash = "sha256-Sle245RO67pPNFd7IdvGHluB3bFqoFZlbIgYxrG3AZ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix index cf895607d725..4da8b0fe99c1 100644 --- a/pkgs/by-name/i3/i3status-rust/package.nix +++ b/pkgs/by-name/i3/i3status-rust/package.nix @@ -15,6 +15,8 @@ iproute2, pandoc, pipewire, + gitMinimal, + cmake, withICUCalendar ? false, withPipewire ? true, withNotmuch ? false, @@ -22,22 +24,24 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "i3status-rust"; - version = "0.36.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-tCMoYbsiVBX7GZZVhzAKuMFS1L7DITQZSUfQ6iQMofg="; + hash = "sha256-MdHCf3H4KQFPreaIGDfMByd3u4Tg56rbWd+HhwMhL1o="; }; - cargoHash = "sha256-mnLl+JegA96z95VQqZ5d8bGYCf1PG/ip2LVyPm4HjVI="; + cargoHash = "sha256-3tS3P4CLoi5fUymYBomz4Ltmw6idzjflhfAIKfXIK8U="; nativeBuildInputs = [ pkg-config makeWrapper installShellFiles pandoc + gitMinimal + cmake ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]); @@ -93,6 +97,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "i3status-rs"; maintainers = with lib.maintainers; [ backuitist + kybe236 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ic/iceshelf/package.nix b/pkgs/by-name/ic/iceshelf/package.nix index 67de9f0768ae..a07785049428 100644 --- a/pkgs/by-name/ic/iceshelf/package.nix +++ b/pkgs/by-name/ic/iceshelf/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication { meta = { description = "Simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage"; - license = lib.licenses.lgpl2; + license = lib.licenses.gpl2Plus; homepage = "https://github.com/mrworf/iceshelf"; maintainers = with lib.maintainers; [ mmahut ]; mainProgram = "iceshelf"; diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 9d770a5c8b2f..b6714679c3ff 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -112,7 +112,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "immich"; - version = "3.3.3"; + version = "3.3.4"; __structuredAttrs = true; strictDeps = true; @@ -121,14 +121,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "immich-app"; repo = "immich"; tag = "v${finalAttrs.version}"; - hash = "sha256-GVQgmXpTJ6Aj6LgR7NgsYAQgzY4RZTDZp4dafD4OG5A="; + hash = "sha256-7YaMFj0GbIUEBE8pqNRyccWeC0m9K4L/ZHqJSPWlpZQ="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-/HgmMv+YaWh26FIYiBlIdeObh0R5aacJx59FStxrCP0="; + hash = "sha256-7xUH5b64QfrgWBe32WSFXXNTbjXx6Po6D6L5hbHTHE0="; }; postPatch = '' diff --git a/pkgs/by-name/im/impactor/package.nix b/pkgs/by-name/im/impactor/package.nix new file mode 100644 index 000000000000..211beb32f291 --- /dev/null +++ b/pkgs/by-name/im/impactor/package.nix @@ -0,0 +1,105 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + pkg-config, + gtk3, + libayatana-appindicator, + libappindicator, + glib, + autoPatchelfHook, +}: +let + cargoFlags = [ + "--bin" + "plumeimpactor" + ]; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "impactor"; + version = "2.7.1"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "claration"; + repo = "Impactor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GMMtzbnFue+Qk5wvoJWL6xu4vTG06uuARli7Y2ua1Ms="; + }; + + cargoHash = "sha256-sQbpob8ZXDJMSEI+/6juAj1Uhey7CGAP3Fb8EJr/VU8="; + doCheck = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + autoPatchelfHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib + libappindicator + libayatana-appindicator + gtk3 + ]; + + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ + libappindicator + libayatana-appindicator + ]; + + cargoBuildFlags = cargoFlags; + cargoTestFlags = cargoFlags; + + installPhase = + let + packageId = "dev.khcrysalis.PlumeImpactor"; + targetDir = "target/${stdenv.hostPlatform.rust.rustcTarget}/${finalAttrs.cargoBuildType}/"; + in + lib.concatStringsSep "\n" [ + "runHook preInstall" + (lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p dist + cp -R package/macos/Impactor.app dist/Impactor.app + + cp ${targetDir}/plumeimpactor dist/Impactor.app/Contents/MacOS/Impactor + chmod +x dist/Impactor.app/Contents/MacOS/Impactor + strip dist/Impactor.app/Contents/MacOS/Impactor + + /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${finalAttrs.version}" dist/Impactor.app/Contents/Info.plist + /usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${finalAttrs.version}" dist/Impactor.app/Contents/Info.plist + + mkdir -p $out/Applications + cp -R dist/Impactor.app $out/Applications/Impactor.app + '') + (lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm755 ${targetDir}/plumeimpactor $out/bin/plumeimpactor + + install -Dm644 package/linux/${packageId}.desktop $out/share/applications/${packageId}.desktop + install -Dm644 package/linux/icons/hicolor/16x16/apps/${packageId}.png $out/share/icons/hicolor/16x16/apps/${packageId}.png + install -Dm644 package/linux/icons/hicolor/32x32/apps/${packageId}.png $out/share/icons/hicolor/32x32/apps/${packageId}.png + install -Dm644 package/linux/icons/hicolor/48x48/apps/${packageId}.png $out/share/icons/hicolor/48x48/apps/${packageId}.png + install -Dm644 package/linux/icons/hicolor/64x64/apps/${packageId}.png $out/share/icons/hicolor/64x64/apps/${packageId}.png + install -Dm644 package/linux/icons/hicolor/128x128/apps/${packageId}.png $out/share/icons/hicolor/128x128/apps/${packageId}.png + install -Dm644 package/linux/icons/hicolor/256x256/apps/${packageId}.png $out/share/icons/hicolor/256x256/apps/${packageId}.png + install -Dm644 package/linux/icons/hicolor/512x512/apps/${packageId}.png $out/share/icons/hicolor/512x512/apps/${packageId}.png + '') + "runHook postInstall" + ]; + + meta = { + description = "Cross-platform iOS/iPadOS/tvOS sideloading application"; + homepage = "https://impactor.claration.dev/"; + downloadPage = "https://impactor.claration.dev/download/"; + donationPage = "https://github.com/sponsors/claration"; + mainProgram = "impactor"; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ paige ]; + license = with lib.licenses; [ + mit + bsd3 + ]; + }; +}) diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index 9839d9ae3c2f..aa408676e3d6 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -74,11 +74,14 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/bigbigmdm/IMSProg/releases/tag/v${finalAttrs.version}"; description = "Free I2C, MicroWire and SPI EEPROM/Flash chip programmer tool for CH341A device"; homepage = "https://github.com/bigbigmdm/IMSProg"; - license = with lib.licenses; [ - gpl3Plus - gpl2Plus - lgpl21Only - ]; + license = + with lib.licenses; + AND [ + gpl3Plus + gpl2Plus + lgpl21Only + bsd1 + ]; mainProgram = "IMSProg"; maintainers = with lib.maintainers; [ wucke13 ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/in/interactive-html-bom-inti-cmnb/package.nix b/pkgs/by-name/in/interactive-html-bom-inti-cmnb/package.nix index 96fcc2a244c4..b67b76e188a0 100644 --- a/pkgs/by-name/in/interactive-html-bom-inti-cmnb/package.nix +++ b/pkgs/by-name/in/interactive-html-bom-inti-cmnb/package.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = [ python3Packages.jsonschema - python3Packages.wxpython + python3Packages.wxpython_4_3 python3Packages.kicad ]; diff --git a/pkgs/by-name/in/interactive-html-bom/package.nix b/pkgs/by-name/in/interactive-html-bom/package.nix index bc731e96a825..22621bbdf098 100644 --- a/pkgs/by-name/in/interactive-html-bom/package.nix +++ b/pkgs/by-name/in/interactive-html-bom/package.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = [ python3Packages.jsonschema - python3Packages.wxpython + python3Packages.wxpython_4_3 python3Packages.kicad ]; diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index a395da546820..9e3c9455e45b 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "karakeep"; - version = "0.33.2"; + version = "0.34.0"; src = fetchFromGitHub { owner = "karakeep-app"; repo = "karakeep"; tag = "cli/v${finalAttrs.version}"; - hash = "sha256-NsVe8jyGjXZ4fvQqxwHqHlTpaAD89+76rx0TsyFPTjs="; + hash = "sha256-UgsT5tVB8AmXzpO6KynH3kT38RCX8LEHMTDhQZBii+8="; }; patches = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-BcEhsyRENarAhF9MyHdDjSycchJ0vm/78FbE78Gl19E="; + hash = "sha256-0l84j5g33ngDHYyzefXRkic3mpqZ4cXP1MEZfyWEGt8="; }; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/kd/kddockwidgets/package.nix b/pkgs/by-name/kd/kddockwidgets/package.nix index 493f00ed10a2..3734121536d8 100644 --- a/pkgs/by-name/kd/kddockwidgets/package.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "KDDockWidgets"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDDockWidgets"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Bb9ZQTJ77Brn0XQY2DaBB68xk3Hw1ORuIU0xWIBVmhg="; + sha256 = "sha256-vYbEpP+QZ+vjdBWW2mfSwzzDOa1UfYersyoypbBUZvc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix b/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix index ac52cdd0ef03..19f450199b9a 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-magic-link/default.nix @@ -6,16 +6,16 @@ }: maven.buildMavenPackage (finalAttrs: { pname = "keycloak-magic-link"; - version = "0.89"; + version = "0.92"; src = fetchFromGitHub { owner = "p2-inc"; repo = "keycloak-magic-link"; tag = "v${finalAttrs.version}"; - hash = "sha256-LllzFVmp8SIOaW1pw8Gpn/WA4usGr+RpzeXn6U9ccZw="; + hash = "sha256-X6yi96Fqs72lcZrXsF5FclobUkTzlIOJSvd+V+6+1iY="; }; - mvnHash = "sha256-85GWDJYTMEDOQwBUusjCAjprtiqwpFYfv/j3kCWMZho="; + mvnHash = "sha256-j+Ts9FQHv6Fo9x7Gd1BB682yMDjR2F/4oCok5xh4cR8="; # skip the spotless git check and sandbox-incompatible unit tests mvnParameters = "-DskipTests -Dspotless.check.skip=true"; diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index e9fe9c2ea104..955111787725 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -12,7 +12,7 @@ adwaita-icon-theme, dconf, gtk3, - wxwidgets_3_2, + wxwidgets_3_3, librsvg, cups, gsettings-desktop-schemas, @@ -134,9 +134,9 @@ let else versionsImport.${baseName}.libVersion.version; - wxGTK = wxwidgets_3_2; + wxGTK = wxwidgets_3_3; python = python3; - wxPython = python.pkgs.wxpython; + wxPython = python.pkgs.wxpython_4_3; addonPath = "addon.zip"; addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; diff --git a/pkgs/by-name/ki/kikit/package.nix b/pkgs/by-name/ki/kikit/package.nix index 03a08c31ad8f..11ea62e94df7 100644 --- a/pkgs/by-name/ki/kikit/package.nix +++ b/pkgs/by-name/ki/kikit/package.nix @@ -1 +1 @@ -{ python3 }: (python3.pkgs.callPackage ./default.nix { }) +{ python3 }: (python3.pkgs.callPackage ./default.nix { wxpython = python3.pkgs.wxpython_4_3; }) diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index f3b114f9c005..a66cdcfd44cc 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule (finalAttrs: { pname = "kin-openapi"; - version = "0.150.0"; + version = "0.151.0"; vendorHash = "sha256-SCuvGh6m9lq/tR1vKioh3EWbgJsKbocXzqxPy4uPvaw="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-pbTpgl+RgcctE4lT6QJLdHIr9MH3Q+H81h0gy6HyNm0="; + hash = "sha256-Uw6FdR/q4q48034L3w/rv+5Jcr491FXVelZXAaAi2CM="; }; checkFlags = diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index ee1ea69f2044..3501cd5b31ee 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -3,7 +3,6 @@ stdenv, buildGoModule, fetchFromGitHub, - fetchpatch, installShellFiles, testers, nix-update-script, @@ -12,24 +11,18 @@ buildGoModule (finalAttrs: { pname = "kind"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-ii0VhS1Nib+r2ZFIIkRvkcGY1fLxev6WnhbqvaZW7j8="; + hash = "sha256-exqO/KERw/SOv3dywcrm/DSHY37dfTOhQezg6Nroew0="; }; patches = [ # fix kernel module path used by kind ./kernel-module-path.patch - - # fix apiserver connection loss after envoy lb container restart - (fetchpatch { - url = "https://github.com/kubernetes-sigs/kind/commit/9a24e6c1ae3d59f8de052ee5c3842820450a369a.patch"; - hash = "sha256-BP2Ub8b1GA7V0CGvhcoGuHRm7u+IMRTmN3mDc2rePnY="; - }) ]; vendorHash = "sha256-tRpylYpEGF6XqtBl7ESYlXKEEAt+Jws4x4VlUVW8SNI="; diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index 1a866bbd3d06..50dabdfd61ab 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -15,12 +15,12 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.12.333"; + version = "1.3.11"; pname = "kiro"; # You can find the current VSCode version in the About dialog: # workbench.action.showAboutDialog (Help: About) - vscodeVersion = "1.107.1"; + vscodeVersion = "1.131.0"; executableName = "kiro"; longName = "Kiro"; diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 3bbebcea1ec8..dea31bc8769a 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,10 +1,10 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz", - "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/1.3.11/tar/kiro-ide-1.3.11-stable-linux-x64.tar.gz", + "hash": "sha256-U2oD22314cWMp5vnBT0bJAurC3HXnNiXXi1VY94I048=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg", - "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/1.3.11/kiro-ide-1.3.11-stable-darwin-arm64.dmg", + "hash": "sha256-Ivs8SPFJc3AdsQJYN4IQROA+FGdLc/bPPp0kgxuy774=" } } diff --git a/pkgs/by-name/kn/knope/package.nix b/pkgs/by-name/kn/knope/package.nix index e05c3b7f2339..5d77801d0c93 100644 --- a/pkgs/by-name/kn/knope/package.nix +++ b/pkgs/by-name/kn/knope/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "knope"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "knope-dev"; repo = "knope"; tag = "knope/v${finalAttrs.version}"; - hash = "sha256-Brr/MnJwgyGRjBrY6H2uUnVXFYWdUAHzLolFBgszkp0="; + hash = "sha256-nxWk95WxpUjTZiGczY75eaTeRnr8MmPeThzzb38wgNI="; }; - cargoHash = "sha256-vjjwoBHgmjzMVDyscfde/fRwm7QWFTuD9EX1+OowUm8="; + cargoHash = "sha256-TgPs05Wgb1bODhc1+XDupLzs31T3Oeg6IC7ipmYgipI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ko/kolla/package.nix b/pkgs/by-name/ko/kolla/package.nix index 15c2de812bea..4e491bae313e 100644 --- a/pkgs/by-name/ko/kolla/package.nix +++ b/pkgs/by-name/ko/kolla/package.nix @@ -51,18 +51,13 @@ python3Packages.buildPythonApplication (finalAttrs: { nativeCheckInputs = with python3Packages; [ testtools - stestr + stestrCheckHook oslotest hacking bashate + ddt ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - meta = { description = "Provides production-ready containers and deployment tools for operating OpenStack clouds"; mainProgram = "kolla-build"; diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index 78fb651ea388..9000621c82b1 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.28.1"; + version = "1.29.1"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-ANW+aVNpjeCtlmuqt9YttAlxxRyBDrTNnxExXDbMouY="; + sha256 = "sha256-6cr64extDRF8I3X/+ey3N+04Tu3ir+qXFry1VdluqDQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix index 80fecbc5ed36..a9e3b1200c68 100644 --- a/pkgs/by-name/ku/kubelogin/package.nix +++ b/pkgs/by-name/ku/kubelogin/package.nix @@ -10,20 +10,23 @@ buildGoModule (finalAttrs: { pname = "kubelogin"; - version = "0.2.14"; + version = "0.2.21"; src = fetchFromGitHub { owner = "Azure"; repo = "kubelogin"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-s9W5wvA4L0Qbn5vimLU03oqx10XqCybE3YvC9gV3y7A="; + hash = "sha256-sZMFx8rv3SFEqfETtLm6WCVeGN4ia41egJwXLC8e/fI="; }; patches = [ ./disable-nix-incompatible-test.patch ]; - vendorHash = "sha256-CWgvbN8NnroSVqfKF8UG6kXqVWrQ0TmKwri1f218K+M="; + vendorHash = "sha256-S5seDNIrtjt+MOJ2C8tVCEWy7FpDP8qjb9MTFMrkEJ0="; + + # hack/changelog-generator is a separate Go module since 0.2.15 + subPackages = [ "." ]; ldflags = [ "-X main.gitTag=v${finalAttrs.version}" diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix index 79ae91be1df9..8c423fb34f99 100644 --- a/pkgs/by-name/ku/kubernix/package.nix +++ b/pkgs/by-name/ku/kubernix/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kubernix"; - version = "0.4.2"; + version = "0.4.3"; __structuredAttrs = true; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "saschagrunert"; repo = "kubernix"; tag = "v${finalAttrs.version}"; - hash = "sha256-YetgC89qN3evLyE+J3NOIimps67Grx0ngiRworKH5ow="; + hash = "sha256-dFGxtilivR/131dmbbjsXcnQ9Yw/mXws+JC0jSHKI6M="; }; - cargoHash = "sha256-woJcWjIYc2QXNoW1xUGHBmMh4sWvsljWlEHHYqv+gKM="; + cargoHash = "sha256-WPJ7EvaAbZ6hFXWnkFs8x5nzzcYTkinWRPYB4Fo5gbw="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index 660fd8893edf..9dc06103d4b2 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "kubevirt"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${finalAttrs.version}"; - hash = "sha256-4MQtONb8opLDBLtGr+5oDrOQkkK1q4RlMXDcqyilarM="; + hash = "sha256-PZZzFJF/zJcElI+JYPV6o4R0S4EPGnJEdH1yTTdweok="; }; vendorHash = null; diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index 98e16a022dfe..ecc493114c28 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -8,16 +8,16 @@ let pname = "lens-desktop"; - version = "2026.10.51501"; + version = "2026.10.121159"; sources = { x86_64-linux = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; - hash = "sha512-NSCV9zkwhhpy3P1QB//OqFmZO7cfIMotosSwQyKacQUrOo6hcjPKetbXN1Nr5rIPdbeKdQGphArO5T/vY7NaCg=="; + hash = "sha512-gfyeMP0Zzum+XvvmRpE3SLCp4LJp65YmTdSJRauY9g8aWG7R/3LGH/3a1CmfEgz86GksZzADIY6EuQZctzG9Yw=="; }; aarch64-darwin = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; - hash = "sha512-Rl+rlJXUlgo84MWxBj6p4J/6se/5z9elU+g4iszAqgeJAqb5Onm7ASHUoCqSYdCJLFuttt7gBiVpOWqROCbW5w=="; + hash = "sha512-ZO0CX1QVQ9jtLQtFbQ6qU8fa+eLSCUdWDgK3B8cqr2R5a9QeczJ0Cm/rc5a3RFbkd1EVdAXw/6gP6aN68+xWoA=="; }; }; diff --git a/pkgs/by-name/li/libcec/package.nix b/pkgs/by-name/li/libcec/package.nix index b2888179f74f..7992d9c99fcb 100644 --- a/pkgs/by-name/li/libcec/package.nix +++ b/pkgs/by-name/li/libcec/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, pkg-config, - pythonSupport ? false, + pythonSupport ? true, python3, swig, udev, @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { # 1. Fix dlopen path # 2. Fix include directory for pkg-config: https://github.com/Pulse-Eight/libcec/pull/754 postPatch = '' - substituteInPlace include/cecloader.h --replace-fail "\"libcec." "\"$lib/lib/libcec." + substituteInPlace include/cecloader.h --replace-fail "\"libcec." "\"$out/lib/libcec." substituteInPlace src/libcec/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_PREFIX}/include" "\''${CMAKE_INSTALL_INCLUDEDIR}" ''; @@ -36,7 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config cmake ] - ++ lib.optional pythonSupport swig; + ++ lib.optionals pythonSupport [ + swig + python3.pkgs.wrapPython + ]; + buildInputs = [ libcec_platform ] @@ -51,10 +55,27 @@ stdenv.mkDerivation (finalAttrs: { "-DHAVE_LINUX_API=1" ]; + # pyCecClient uses incorrect import path since: + # https://github.com/Pulse-Eight/libcec/pull/655/changes + # + # Apparently the change was intended to fix ubuntu & windows + # packages, so we manually revert it for our use case + postFixup = lib.optionalString pythonSupport '' + moveToOutput "lib/${python3.libPrefix}" "$python" + moveToOutput "bin/pyCecClient" "$python_bin" + substituteInPlace "$python_bin/bin/pyCecClient" \ + --replace-fail 'from cec import cec' 'import cec' + wrapPythonProgramsIn "$python_bin" "$python" + ''; + outputs = [ "out" + "bin" "dev" - "lib" + ] + ++ lib.optionals pythonSupport [ + "python" + "python_bin" ]; meta = { diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix index 2bf5b5cdf4ca..45f9c529e4bf 100644 --- a/pkgs/by-name/li/libgit2/package.nix +++ b/pkgs/by-name/li/libgit2/package.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: { version = "1.9.7"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib + strictDeps = true; + __structuredAttrs = true; + outputs = [ "lib" "dev" diff --git a/pkgs/by-name/li/libmodsecurity/package.nix b/pkgs/by-name/li/libmodsecurity/package.nix index ef0a023d029f..22fe832b6cce 100644 --- a/pkgs/by-name/li/libmodsecurity/package.nix +++ b/pkgs/by-name/li/libmodsecurity/package.nix @@ -23,13 +23,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "libmodsecurity"; - version = "3.0.16"; + version = "3.0.17"; src = fetchFromGitHub { owner = "owasp-modsecurity"; repo = "ModSecurity"; rev = "v${finalAttrs.version}"; - hash = "sha256-KkUZ52IQ8kZPP4znvNX2kDCbYFBesmvV5i1tVgHFct8="; + hash = "sha256-OebDDhaOQfOf22MoQ1htHwB25O52OnJBSzZlxhnJ0Zo="; fetchSubmodules = true; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.16/build.sh#L6-L25 + # https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.17/build.sh#L6-L25 echo "noinst_HEADERS = \\" > ./src/headers.mk ls -1 ./src/ \ actions/*.h \ diff --git a/pkgs/by-name/li/libremines/package.nix b/pkgs/by-name/li/libremines/package.nix index cd6ae4629834..836ff1c28442 100644 --- a/pkgs/by-name/li/libremines/package.nix +++ b/pkgs/by-name/li/libremines/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libremines"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Bollos00"; repo = "libremines"; tag = "v${finalAttrs.version}"; - hash = "sha256-bV7k0RhOLqyX7kKbISTo8gRiMVGx3Y2EdmihpdtIWz4="; + hash = "sha256-j2hUFC4Io1nRewbqfQl8lGwEGZAyDiUOzbv/HlpBGi0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libretroPackages/cores/fceumm.nix b/pkgs/by-name/li/libretroPackages/cores/fceumm.nix index efd8bf0f8f5e..65e809348113 100644 --- a/pkgs/by-name/li/libretroPackages/cores/fceumm.nix +++ b/pkgs/by-name/li/libretroPackages/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-09-26"; + version = "0-unstable-2026-10-11"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "7a542dab1e87679921962a9f056186eca425c0c2"; - hash = "sha256-hW+6G55jatvPswkJuWvuFcQUwo2mO8bWboUXhZgdz24="; + rev = "ac0d00a7fc01166f84c7bac01d1084ebfd2b865e"; + hash = "sha256-AUffvClAO0/DJdaecrJVAp1rzeoGqkT71jeliykYcAE="; }; meta = { diff --git a/pkgs/by-name/li/libretroPackages/cores/genesis-plus-gx.nix b/pkgs/by-name/li/libretroPackages/cores/genesis-plus-gx.nix index 1882b0ee9d1a..48aec194cdd2 100644 --- a/pkgs/by-name/li/libretroPackages/cores/genesis-plus-gx.nix +++ b/pkgs/by-name/li/libretroPackages/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-10-02"; + version = "0-unstable-2026-10-16"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "58c341487e5bfcf979ea68413c7987633adb0c56"; - hash = "sha256-Jp4Txdt8Zg/GL/qsQunu+X+hB3TXPFlk8+lpLdSqmIg="; + rev = "aa74d79634cd230f65cce4180e92688e53883d2f"; + hash = "sha256-elHKWGxIWq3TMpyugxlGttN9KQcmxpS4vY9IZ+4TdIg="; }; meta = { diff --git a/pkgs/by-name/li/libretroPackages/cores/pcsx2.nix b/pkgs/by-name/li/libretroPackages/cores/pcsx2.nix index 89326df46fdf..ab62aee32497 100644 --- a/pkgs/by-name/li/libretroPackages/cores/pcsx2.nix +++ b/pkgs/by-name/li/libretroPackages/cores/pcsx2.nix @@ -11,13 +11,13 @@ }: mkLibretroCore { core = "pcsx2"; - version = "0-unstable-2026-09-17"; + version = "0-unstable-2026-10-18"; src = fetchFromGitHub { owner = "libretro"; repo = "ps2"; - rev = "20e014fc24f68b6ac2a479316197b5472440988a"; - hash = "sha256-/TWrkMd9thMY5hFC+30JdgQmI8ZqrAcgXtazdQBCQ0Y="; + rev = "6664c60294ee05fe5e8c7645ab7da546dae78ed2"; + hash = "sha256-c/VoDBYPh/8TxSNF3oxhOG9CE9ndVR27OuxaPfDD0Ow="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libretroPackages/cores/ppsspp.nix b/pkgs/by-name/li/libretroPackages/cores/ppsspp.nix index 95b70f681a60..944f8885fa30 100644 --- a/pkgs/by-name/li/libretroPackages/cores/ppsspp.nix +++ b/pkgs/by-name/li/libretroPackages/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2026-09-22"; + version = "0-unstable-2026-10-14"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "7c18ad3d1e2e32b26901d1779bccaee41269bc5a"; - hash = "sha256-fIb0vHTTpunGXdWhVSMqsFZD5m/cMIm1U9yWJ1YvyVQ="; + rev = "4c2bb3563002390ae077f476e17a6b9959512a73"; + hash = "sha256-iHgYHt6t66d9CP9nXMGDVu/J0DSq4JaFDZYnNMCdZfU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libretroPackages/cores/swanstation.nix b/pkgs/by-name/li/libretroPackages/cores/swanstation.nix index 5efab93d0601..32846b13dc26 100644 --- a/pkgs/by-name/li/libretroPackages/cores/swanstation.nix +++ b/pkgs/by-name/li/libretroPackages/cores/swanstation.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "swanstation"; - version = "0-unstable-2026-10-08"; + version = "0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "libretro"; repo = "swanstation"; - rev = "1db8c9b6866d9d22ee79447762e943a1635d2133"; - hash = "sha256-7ynR2+HzaKgoWyVfn/9ep/wbweANvGujhq269pSNyVo="; + rev = "e436e9b85374def58d211df7f78880f0f4a917b4"; + hash = "sha256-4WeqOmsFC3kQYC+3L5aapj/79TRLWZYWmUyDxCfwZl4="; }; extraNativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libretroPackages/cores/vecx.nix b/pkgs/by-name/li/libretroPackages/cores/vecx.nix index 02ac6cb67012..22cd9f852fbf 100644 --- a/pkgs/by-name/li/libretroPackages/cores/vecx.nix +++ b/pkgs/by-name/li/libretroPackages/cores/vecx.nix @@ -7,13 +7,13 @@ }: mkLibretroCore { core = "vecx"; - version = "0-unstable-2026-04-11"; + version = "0-unstable-2026-10-16"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-vecx"; - rev = "8f671cc9d737f2890c3ce19e177e2984dcae121f"; - hash = "sha256-gNHPmoCiqWg7vWapWBPwHPPogiXCvXfkyqsHuudKHDg="; + rev = "dccff5402a16d1ea7c112095a8e42632bf149506"; + hash = "sha256-N6Erh5f3ASHa3cPyrugRb1AGRltF/AwWeEUAraSZ6UM="; }; extraBuildInputs = [ diff --git a/pkgs/by-name/li/librevna/package.nix b/pkgs/by-name/li/librevna/package.nix index f63b3903ac2e..c10e0dd6f1bc 100644 --- a/pkgs/by-name/li/librevna/package.nix +++ b/pkgs/by-name/li/librevna/package.nix @@ -6,6 +6,7 @@ git, pkg-config, qt6, + wrapGAppsHook3, libusb1, udev, }: @@ -40,7 +41,14 @@ stdenv.mkDerivation (finalAttrs: { qt6.qmake qt6.qtsvg qt6.wrapQtAppsHook - ]; + ] + ++ lib.optional stdenv.hostPlatform.isLinux wrapGAppsHook3; + + dontWrapGApps = true; + + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; buildInputs = [ qt6.qtbase diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 152044a25fdd..736b8421de22 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.102.2"; + version = "0.105.0"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-p9qdH56xV6mNECf0SwseQKU87BC4VYTwx3mKf7JnBio="; + hash = "sha256-2eUVHfRO1diz8p5nokppvzS/mIyqPuXJOEmtMyaWBsE="; }; postPatch = @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; }; - cargoHash = "sha256-LVreSerqA0ztg4os7qZzprw97HFl4Uydsmz6k2rO0fc="; + cargoHash = "sha256-+klpfWBHi08UmVceSsd6+ad5uK7CMPOQ1g+6C2ADUwI="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/libvdwxc/package.nix b/pkgs/by-name/li/libvdwxc/package.nix index 31ebc5a0eb37..43026a80d15e 100644 --- a/pkgs/by-name/li/libvdwxc/package.nix +++ b/pkgs/by-name/li/libvdwxc/package.nix @@ -8,16 +8,15 @@ mpi, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libvdwxc"; - # Stable version has non-working MPI detection. - version = "unstable-24.02.2020"; + version = "0.5.0"; src = fetchFromGitLab { owner = "libvdwxc"; repo = "libvdwxc"; - rev = "92f4910c6ac88e111db2fb3a518089d0510c53b0"; - hash = "sha256-RrfojLbCoguhfkhNSwxebPUaCwp7Cf2sb4tZF3eW97A="; + tag = "${finalAttrs.version}"; + hash = "sha256-4qmE8P3hweX3lSmMKdiuCIKDE8jw8smiOO9AEkSXCEM="; }; nativeBuildInputs = [ @@ -61,4 +60,4 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/li/libx11/package.nix b/pkgs/by-name/li/libx11/package.nix index aaf77bf3a701..08e2b297af61 100644 --- a/pkgs/by-name/li/libx11/package.nix +++ b/pkgs/by-name/li/libx11/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libx11"; - version = "1.8.13"; + version = "1.8.14"; outputs = [ "out" @@ -24,17 +24,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libX11-${finalAttrs.version}.tar.xz"; - hash = "sha256-aWBvSFwsB8FO9k91t7sybUhYevM3ldmrPmB8C1+U8Rw="; + hash = "sha256-u8eMRiFxdGVcKzKxOK0RnzrBX1CAi00LOiZ3pLGvyVA="; }; - patches = [ - # fixes CVE-2026-88806 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/6d4432b13c0b3b6a644c13de9c793a14db48d545.patch"; - hash = "sha256-ahsf/DYeaOjkd9TcH9ZkfzB9qAaj4jRNi1AGyjoIycY="; - }) - ]; - strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/li/libxi/package.nix b/pkgs/by-name/li/libxi/package.nix index 0475ba395175..cbde12862a42 100644 --- a/pkgs/by-name/li/libxi/package.nix +++ b/pkgs/by-name/li/libxi/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxi"; - version = "1.8.3"; + version = "1.8.4"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXi-${finalAttrs.version}.tar.xz"; - hash = "sha256-etYAVvAa9PeGz+k7OncHRHcRYm/I2iY3vscakECbq+U="; + hash = "sha256-3dYFe4mpGQO8L4hNVchGdECQaUXkgsNlRyYN/yhmGvw="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxpm/package.nix b/pkgs/by-name/li/libxpm/package.nix index 09336f30f930..53449eb7aeea 100644 --- a/pkgs/by-name/li/libxpm/package.nix +++ b/pkgs/by-name/li/libxpm/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxpm"; - version = "3.5.19"; + version = "3.5.20"; outputs = [ "bin" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXpm-${finalAttrs.version}.tar.xz"; - hash = "sha256-rTV21okiGjncco8ODcAsp7tqDXJMmnf9G/oemvg76QA="; + hash = "sha256-wGTq0D5N3niv3rEh/gtkTSXFUERM+QP73FN/Gnjz73Q="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxrender/package.nix b/pkgs/by-name/li/libxrender/package.nix index c60e5ddc6e30..a58bc442cf75 100644 --- a/pkgs/by-name/li/libxrender/package.nix +++ b/pkgs/by-name/li/libxrender/package.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxrender"; - version = "0.9.12"; + version = "0.9.13"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXrender-${finalAttrs.version}.tar.xz"; - hash = "sha256-uDISjaSLOcjWCCJEgXQ0A60Wkb9OVU5L6cF03xcdG5c="; + hash = "sha256-P+iMYJ32eC4eevLk3jayVj1wzXD/fcsc2lYa1kkSu2Q="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libyafaray/package.nix b/pkgs/by-name/li/libyafaray/package.nix index 0390ed9a7524..fad3667e2319 100644 --- a/pkgs/by-name/li/libyafaray/package.nix +++ b/pkgs/by-name/li/libyafaray/package.nix @@ -18,18 +18,19 @@ stdenv.mkDerivation { pname = "libyafaray"; - version = "unstable-2022-09-17"; + version = "3.5.1-unstable-2024-01-28"; src = fetchFromGitHub { owner = "YafaRay"; repo = "libYafaRay"; - rev = "6e8c45fb150185b3356220e5f99478f20408ee49"; - sha256 = "sha256-UVBA1vXOuLg4RT+BdF4rhbZ6I9ySeZX0N81gh3MH84I="; + rev = "8f4906ae88f8a527bbce37991a95e3e3857cb9ac"; + hash = "sha256-CBigthJWRTeZKbImJGJU/ytRzI+FWOvHLWhU8Qeraj8="; }; + # include/math/math.h:152:3: error: unrecognized instruction mnemonic postPatch = '' - sed '1i#include ' -i \ - include/geometry/poly_double.h include/noise/noise_generator.h # gcc12 + substituteInPlace include/math/math.h \ + --replace-fail "defined (__APPLE__)" "0" ''; nativeBuildInputs = [ @@ -52,14 +53,10 @@ stdenv.mkDerivation { meta = { description = "Free, open source raytracer"; downloadPage = "https://github.com/YafaRay/libYafaRay"; - homepage = "http://www.yafaray.org"; + homepage = "https://github.com/YafaRay/libYafaRay"; maintainers = [ ]; - license = lib.licenses.lgpl21; - platforms = [ - "aarch64-linux" - "riscv64-linux" - "x86_64-linux" - ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix index dfde91c55dfa..44c647fd91cd 100644 --- a/pkgs/by-name/li/libz/package.nix +++ b/pkgs/by-name/li/libz/package.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "libz"; version = "1.2.8.2025.03.07"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitLab { owner = "sortix"; repo = "libz"; diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix index d12b20d060b5..0adca17573ea 100644 --- a/pkgs/by-name/li/liferea/package.nix +++ b/pkgs/by-name/li/liferea/package.nix @@ -4,18 +4,24 @@ fetchurl, pkg-config, intltool, + meson, + ninja, python3Packages, - wrapGAppsHook3, + wrapGAppsHook4, + dbus, + desktop-file-utils, + fribidi, glib, + libadwaita, libxml2, libxslt, sqlite, libsoup_3, - webkitgtk_4_1, + webkitgtk_6_0, json-glib, gst_all_1, libnotify, - gtk3, + gtk4, gsettings-desktop-schemas, libpeas2, libsecret, @@ -26,25 +32,31 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.16.14"; + version = "2.0.2"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-/zux42TNR453/XCep9/BJgObEXwT5Lq0dAVbucET1Og="; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; + hash = "sha256-M7/h326qU4daLW1oYyNz4y+pEWjckLkLGvQlu+805/E="; }; nativeBuildInputs = [ - wrapGAppsHook3 + desktop-file-utils + wrapGAppsHook4 python3Packages.wrapPython intltool + meson + ninja pkg-config gobject-introspection ]; buildInputs = [ + dbus + fribidi glib - gtk3 - webkitgtk_4_1 + gtk4 + webkitgtk_6_0 + libadwaita libxml2 libxslt sqlite @@ -66,9 +78,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postFixup = '' - buildPythonPath ${python3Packages.pycairo} - patchPythonScript $out/lib/liferea/plugins/trayicon.py - buildPythonPath ${python3Packages.requests} patchPythonScript $out/lib/liferea/plugins/download-manager.py ''; diff --git a/pkgs/by-name/li/linearmouse/package.nix b/pkgs/by-name/li/linearmouse/package.nix new file mode 100644 index 000000000000..6def39908c86 --- /dev/null +++ b/pkgs/by-name/li/linearmouse/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchurl, + stdenvNoCC, + _7zz, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + strictDeps = true; + __structuredAttrs = true; + + pname = "linearmouse"; + + version = "0.12.0"; + + src = fetchurl { + url = "https://github.com/linearmouse/linearmouse/releases/download/v${finalAttrs.version}/LinearMouse.dmg"; + hash = "sha256-r/UPPIGM7VpOIqYXTIcuMiN5fUMmP+ZH1/lV+b4Pzzw="; + }; + + # linearmouse is apfs for some reason and undmg doesnt support that lol + nativeBuildInputs = [ _7zz ]; + unpackCmd = "7zz x $curSrc"; + sourceRoot = "LinearMouse.app"; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/LinearMouse.app + cp -R . $out/Applications/LinearMouse.app/ + + runHook postInstall + ''; + + meta = { + description = "Mouse and trackpad utility for Mac"; + downloadPage = "https://github.com/linearmouse/linearmouse/releases"; + homepage = "https://github.com/linearmouse/linearmouse"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ paige ]; + }; +}) diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index 0919d3131dbd..c158a737b16d 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20260916"; + version = "20261019"; src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; tag = version; - hash = "sha256-VbDTRN/i+a1BrKnDtdDFxanp3BQujBhe9CyWay9GTXY="; + hash = "sha256-0LreLm2Syct6IHCZpE9uJorhl1H3l3fBEMZR/Cy1AVI="; }; postUnpack = '' diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 6e944c30aa00..12973940a4ef 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "livekit"; - version = "1.13.8"; + version = "1.13.10"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${finalAttrs.version}"; - hash = "sha256-h8hFRBRpP7RHfZIxTHzfP0F0qq02q0Fiz/Wk8pNHvtM="; + hash = "sha256-+Dg25hhJjzvIf+XHVqfrVJy0F1/MkL8/qwyE0Fzze4E="; }; - vendorHash = "sha256-HdetQI/c3h+Y/bXDM98yoryzqAZQZuDA0bNFEHcPW3U="; + vendorHash = "sha256-lsYM/3UB+SWsIzvbrswx1pLm/ersoeZi+Tf8h2wec10="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index c2e7903996e6..906c891fe090 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "lune-org"; repo = "lune"; tag = "v${version}"; - hash = "sha256-AbviyCy2nn6WHC575JKl/t3bM/4Myb+Wx5/buTvB4MY="; + hash = "sha256-LOwLCA1j3lxj+jiphNlJxSnnN70w7NKhVKm6LdXFI5s="; fetchSubmodules = true; }; - cargoHash = "sha256-QSQ+SsvLa7f9EVGi6i/SlpL8yWXVP47zkw4beDy5UIQ="; + cargoHash = "sha256-QnLpJK5ORrRySYEVQ+asRB2fXoPISMZ93pkN8NiZAfY="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix index a26aaffdc0da..535d1c41f859 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-screen/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lxgw-wenkai-screen"; - version = "1.522"; + version = "1.530"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; - hash = "sha256-zRpvo5xOpC/Y9OKJlFeJsOUQz3AWQ1ZA+Ik82tmyIPM="; + hash = "sha256-q9EzZBY+PNhDcrMz8v3O6e+4SGNGaPHAzleI3NBZ7mE="; }; dontUnpack = true; diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index 45b22e7ea2bd..ace9aef5c6cc 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -7,10 +7,10 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; - version = "1.522"; + version = "1.530"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz"; - hash = "sha256-E2Z13IOaWwdsAPnHFsYQ2B/d3dhXP4duvdaYO/4PCfg="; + hash = "sha256-omCpK9EfTQZvrNpPlGVPWbgCeHTPEKLRaMd5XW00u5k="; }; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index a7840ef67d0a..decd37aa9dc1 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "maa-cli"; - version = "0.5.9"; + version = "0.7.7"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-TLm8B1cQ00l9aRADYU3Qv7nA04kDaxsXX86qvsTRWwk="; + hash = "sha256-mV9RBqNyM8VD2b8k31d+Rydl8RxixM8DPhLUu61Tqx4="; }; nativeBuildInputs = [ @@ -31,11 +31,13 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; + nativeCheckInputs = [ git ]; + # https://github.com/MaaAssistantArknights/maa-cli/pull/126 buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; - cargoHash = "sha256-pJlTcxF6nzV4HfMTs/gAzSUubDy2UlhzEIVeSWs6uX0="; + cargoHash = "sha256-8jURI0gZej9uemgRiNALlOSV2dwc71LT8S+0lQNTmV8="; # maa-cli would only search libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 @@ -70,7 +72,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/MaaAssistantArknights/maa-cli"; license = lib.licenses.agpl3Only; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ Cryolitia ]; + maintainers = with lib.maintainers; [ + Cryolitia + wangl-cc + ]; mainProgram = "maa"; }; }) diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index 75c399acd796..25712d8b068b 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -7,17 +7,28 @@ pkg-config, scdoc, systemdMinimal, + basu, + elogind, pango, cairo, gdk-pixbuf, - jq, - bash, wayland, wayland-scanner, wayland-protocols, - wrapGAppsHook3, + + busProvider ? "libsystemd", + withManPages ? true, + withBashCompletions ? true, + withFishCompletions ? true, + withZshCompletions ? true, }: +assert lib.assertOneOf "busProvider" busProvider [ + "libsystemd" + "libelogind" + "basu" +]; + stdenv.mkDerivation (finalAttrs: { pname = "mako"; version = "1.11.0"; @@ -35,37 +46,29 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - scdoc wayland-protocols - wrapGAppsHook3 wayland-scanner - ]; + ] + ++ lib.optional withManPages scdoc; buildInputs = [ - systemdMinimal pango cairo gdk-pixbuf wayland - ]; + ] + ++ lib.optional (busProvider == "libsystemd") systemdMinimal + ++ lib.optional (busProvider == "libelogind") elogind + ++ lib.optional (busProvider == "basu") basu; mesonFlags = [ - "-Dzsh-completions=true" - "-Dsd-bus-provider=libsystemd" + (lib.mesonBool "bash-completions" withBashCompletions) + (lib.mesonBool "fish-completions" withFishCompletions) + (lib.mesonBool "zsh-completions" withZshCompletions) + (lib.mesonEnable "man-pages" withManPages) + (lib.mesonOption "sd-bus-provider" busProvider) ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${ - lib.makeBinPath [ - systemdMinimal # for busctl - jq - bash - ] - }" - ) - ''; - - postInstall = '' + postInstall = lib.optionalString (busProvider == "libsystemd") '' mkdir -p $out/lib/systemd/user substitute $src/contrib/systemd/mako.service $out/lib/systemd/user/mako.service \ --replace-fail '/usr/bin' "$out/bin" diff --git a/pkgs/by-name/ma/mango/package.nix b/pkgs/by-name/ma/mango/package.nix index b779402d85c9..49ba351f9781 100644 --- a/pkgs/by-name/ma/mango/package.nix +++ b/pkgs/by-name/ma/mango/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; strictDeps = true; pname = "mango"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "mangowm"; repo = "mango"; tag = finalAttrs.version; - hash = "sha256-gRe1QxNkNZ0mriIuQqS5RDCnuXNroHcNY0fJiLwGVmc="; + hash = "sha256-n/VaBi0yVOggB+ERQFCRNzYEfYpDSqbYkG066WCendQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/maubot/package.nix b/pkgs/by-name/ma/maubot/package.nix index acaf6827f826..ab3988ccc9f7 100644 --- a/pkgs/by-name/ma/maubot/package.nix +++ b/pkgs/by-name/ma/maubot/package.nix @@ -1,6 +1,11 @@ { lib, - fetchPypi, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, fetchpatch, callPackage, runCommand, @@ -11,14 +16,42 @@ let python = python3; + frontend = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "maubot-frontend"; + inherit (maubot) version src; + + sourceRoot = "${finalAttrs.src.name}/maubot/management/frontend"; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/maubot/management/frontend/yarn.lock"; + hash = "sha256-VBPZbtqF9u63yRgk0PObhUMvV8s7UXSs6nr87cPeLz4="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; + + installPhase = '' + runHook preInstall + + mv build $out + + runHook postInstall + ''; + }); + maubot = python.pkgs.buildPythonApplication (finalAttrs: { pname = "maubot"; version = "0.6.0"; pyproject = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - hash = "sha256-ZXwyctTjKg1ssYE6Ehc1s1DPhWyc08dIQ4MQz6EQXGg="; + src = fetchFromGitHub { + owner = "maubot"; + repo = "maubot"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kLToWYqnIw+lkmOrWAHOetoFF2usumg4Vf8F2tIlj+s="; }; patches = [ @@ -66,6 +99,8 @@ let ]; postInstall = '' + mkdir -p $out/${python.sitePackages}/maubot/management/frontend + ln -s ${frontend} $out/${python.sitePackages}/maubot/management/frontend/build rm $out/example-config.yaml ''; @@ -92,7 +127,7 @@ let ''; }; - inherit python; + inherit python frontend; plugins = callPackage ./plugins { maubot = maubot; diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 32c43304178b..975e53c78b33 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,8 +15,8 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "26.09"; - tag = "v0.2609.0"; + version = "26.10"; + tag = "v0.2610.0"; subPackages = [ "cmd/mautrix-meta" @@ -27,13 +27,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; inherit tag; - hash = "sha256-HTvdg1Bhwvo3Pm7jpugf8x//6OrPaDUa39mdN2Ct1vM="; + hash = "sha256-wqNOd+Y9pJ3sTKT4HIFlBj6m3uXyA0hdyzGUe3Mnq/g="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-Eh+2TLSnOmhteWPzzUQIgOI380UNNV38fvTjb+qYDDM="; + vendorHash = "sha256-laFTKwhHShyItSbcLJLIgZI7t0T9oX9hWtpcbWTSB40="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index bd6f333e59f9..398425a4197b 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -20,14 +20,14 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "26.09"; - tag = "v0.2609.0"; + version = "26.10"; + tag = "v0.2610.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; inherit tag; - hash = "sha256-xHxY+cx/6uKt37MV6dqmtXQF5oqiRxag6ZxuCSWyUsM="; + hash = "sha256-Acq/T7UP6N2BvKeaTEJMSLTBtTMUQKFrPBU7lmoU758="; }; buildInputs = @@ -46,7 +46,7 @@ buildGoModule rec { CGO_LDFLAGS = toString [ cppStdLib ]; }; - vendorHash = "sha256-/dHtn1QTQb2kf/scULECU6NquyNdMwgmF4gyeuMiHgg="; + vendorHash = "sha256-fNAwTk1O/GsSXo5XR/nt7Wn67JN4MNSNApI90FW0NzA="; ldflags = [ "-X" diff --git a/pkgs/by-name/mc/mcp-proxy/package.nix b/pkgs/by-name/mc/mcp-proxy/package.nix index 525ab84eeaf0..94f800f2c931 100644 --- a/pkgs/by-name/mc/mcp-proxy/package.nix +++ b/pkgs/by-name/mc/mcp-proxy/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-proxy"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sparfenyuk"; repo = "mcp-proxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-rurNHP5TprhFUrg+0E6FnNxhCqQv2xtkfhUrGUdGod0="; + hash = "sha256-o2qQX1GnU6sxYCxhb0absGrgTq4fYRV4rFZExm/BwvU="; }; pyproject = true; diff --git a/pkgs/by-name/mc/mcp-searxng/package.nix b/pkgs/by-name/mc/mcp-searxng/package.nix index 0adcde5be984..c722714cfa9c 100644 --- a/pkgs/by-name/mc/mcp-searxng/package.nix +++ b/pkgs/by-name/mc/mcp-searxng/package.nix @@ -6,7 +6,7 @@ buildNpmPackage (finalAttrs: { pname = "mcp-searxng"; - version = "2.6.0"; + version = "2.7.0"; __structuredAttrs = true; strictDeps = true; @@ -15,10 +15,10 @@ buildNpmPackage (finalAttrs: { owner = "ihor-sokoliuk"; repo = "mcp-searxng"; tag = "v${finalAttrs.version}"; - hash = "sha256-dbxJSSzwuJtwTSQN9JmGayISi4KKFly70rXk/U9/Fts="; + hash = "sha256-H9AXMSGOGEcSyVTe7SoWwGNEKJzI+iDkslQwKSIk+oI="; }; - npmDepsHash = "sha256-+df6oLBlw8fE6baGs2G5Vmn2lQvyfLhg/2s9axuVNwo="; + npmDepsHash = "sha256-IEeOBd32jlcb7mEveRNKuMKEqZs3eDpdxN4N567TmvU="; meta = { description = "Private web search for AI assistants via SearXNG — supports Claude, Cursor, and any MCP client"; diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix index 7d12e7811838..a5e69ea3bb4b 100644 --- a/pkgs/by-name/md/mdbook-plugins/package.nix +++ b/pkgs/by-name/md/mdbook-plugins/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-plugins"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "RustForWeb"; repo = "mdbook-plugins"; rev = "v${finalAttrs.version}"; - hash = "sha256-Dv2HL8dLV8wOZp+Lhy5qgsZO9sZWOVVIhQZe6JE+F40="; + hash = "sha256-5JhiW2RnDcbMUkN/NJvGCA5zp3EfX8H/WxSNYuJcaQk="; }; - cargoHash = "sha256-5vyOxKhTbUFi1kUhm3OlhnEXoSYLdRMIWTTPSVXAvsA="; + cargoHash = "sha256-PzgS70DOkQAynfR/7dykcXrIQ+OQpP0CUQAGvDe0kEU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index a3033ded9533..f36dc3d903d1 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdfried"; - version = "0.22.6"; + version = "0.22.8"; src = fetchFromGitHub { owner = "benjajaja"; repo = "mdfried"; tag = "v${finalAttrs.version}"; - hash = "sha256-xdCO8BjwIN840zn4i2bO4CNGt3QZzULywtzYa/DNot4="; + hash = "sha256-TccCxFXvX62di+8oJTMil+bAVajPpAXjajTFZmnWSDA="; }; - cargoHash = "sha256-7eIatSt4uSNefjWGBmcbjiA+mvvvai3X2NBvkMAcNUc="; + cargoHash = "sha256-vW7QwUYd2C5QR0ZVJilTqXA3/3WCV2rompiPADOchiM="; buildFeatures = [ "pdf" ]; diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index 97832e5a0d30..f73c4cda5dc5 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-128GL2+nqIVR/LjIZoNeXy29fbYcZA4GkTmlx7xVPIE="; + hash = "sha256-khChL3VNFzbcl7Lw6PJnMESYAL2JWO6AAvq7t5SVDlg="; }; - cargoHash = "sha256-+h4U+qVgfQQvYsynPTfcSTlmP/YJWvYJnRoHOKXh2bs="; + cargoHash = "sha256-OBknkfnzewil/jKZJEZKAar+QD8h3whw1E4ncAtR99U="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/melonloader-installer/deps.json b/pkgs/by-name/me/melonloader-installer/deps.json index 7a3870ef4aa5..cc485fdd3f5a 100644 --- a/pkgs/by-name/me/melonloader-installer/deps.json +++ b/pkgs/by-name/me/melonloader-installer/deps.json @@ -1,13 +1,13 @@ [ { "pname": "Avalonia", - "version": "11.3.13", - "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww=" + "version": "12.1.2", + "hash": "sha256-mZh0FMY6w5kzRqhKhSAG35Y/+Dn5bRQFV+4x+IUNsI8=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.25547.20250602", - "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" + "version": "2.1.27548.20260419", + "hash": "sha256-dtZ5AQl+kXPRVe/EwrfSyOMSLywuBBUCjrDIhHijhvk=" }, { "pname": "Avalonia.BuildServices", @@ -16,63 +16,83 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.13", - "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg=" + "version": "11.3.22", + "hash": "sha256-YNd6nxOCo+DkKXiZ179lyj3+UaxegsGljEOqmTjImHw=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.13", - "hash": "sha256-NTwCJzVSyUXbobwgsHI3jOwc27eFAIYzQnXXueS86LI=" + "version": "12.1.2", + "hash": "sha256-wsNZFYW6jH9D8fx54xwAEsbpjqGsxzwbGlj+MVf2ZHo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.13", - "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg=" + "version": "11.3.22", + "hash": "sha256-ItdTNiAbNHihGwbs3Njba3U9dcqoXrxMiZjyvURLMWI=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.3.13", - "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4=" + "version": "12.1.2", + "hash": "sha256-Arv2YbLBb7mDoeiTPk5KukrmThsTj/KvxfEcfH0D0Kg=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.13", - "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw=" + "version": "12.1.2", + "hash": "sha256-Esxo2rYv/MSVmdWqY5nu1Vd4YcAr87mg4o56maQaaSs=" + }, + { + "pname": "Avalonia.FreeDesktop.AtSpi", + "version": "12.1.2", + "hash": "sha256-XMWyVgn3S5x9Z0fzffD2lSQvhJKMCjLDUlFizUqp4aQ=" + }, + { + "pname": "Avalonia.HarfBuzz", + "version": "12.1.2", + "hash": "sha256-M2+qSEJk3MncUvFQmA5I5S+Vjf7o5aHnpgXqbbrVT2s=" }, { "pname": "Avalonia.Native", - "version": "11.3.13", - "hash": "sha256-vRrv5uLH3XLGo8FelJz8kYxcp5sdMakkK02k+xjDsaE=" + "version": "12.1.2", + "hash": "sha256-46paePGddiQlQqvy6fg/QLmlKaV6B1tDbckd/pRYWMk=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.13", - "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc=" + "version": "11.3.22", + "hash": "sha256-UZHrMfKqWvisq3TzmoiC6Ly80m/uBSwFqZrpJzjULzw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "12.1.2", + "hash": "sha256-IPuepoUzVR+llgU9CInvkrTYW00CVHdzewzE6QYcZV0=" }, { "pname": "Avalonia.Skia", - "version": "11.3.13", - "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU=" + "version": "12.1.2", + "hash": "sha256-K4vnkvwFFGdbPKzpfD+MCKbY3fmmCMroSzJanPVlI0A=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.13", - "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM=" + "version": "12.1.2", + "hash": "sha256-wBngLXs5jn3Pk+UWz+uz9ftGPOStpt++NQTHswsvPr8=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.13", - "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE=" + "version": "11.3.22", + "hash": "sha256-zlNolCy8YBIQSiJD1DWX39aSwHutqa7taDUURC/UDG0=" + }, + { + "pname": "Avalonia.Wayland", + "version": "12.1.2", + "hash": "sha256-C7Ra0Dsz8F6d7ap2b0mqvj8vf+JZzbvWjnOAcLPgbic=" }, { "pname": "Avalonia.Win32", - "version": "11.3.13", - "hash": "sha256-JNQ2kmrjAvwN8pboT66HVi1r28Cc9WG+8cnxL/AYCWs=" + "version": "12.1.2", + "hash": "sha256-vcVvzUkvG7ByiuTKuN0ZhrRZYyW8ynNIdVkHkLUZYII=" }, { "pname": "Avalonia.X11", - "version": "11.3.13", - "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg=" + "version": "12.1.2", + "hash": "sha256-lu2v/wUT7MGeCood/qfjizTrf8Bq1Nd/wpjcrrdMWOw=" }, { "pname": "CommunityToolkit.Mvvm", @@ -91,33 +111,33 @@ }, { "pname": "HarfBuzzSharp", - "version": "8.3.1.1", - "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" + "version": "8.3.1.3", + "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "8.3.1.1", - "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" + "version": "8.3.1.3", + "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "8.3.1.1", - "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" + "version": "8.3.1.3", + "hash": "sha256-6WKsJ/jF9pHnaWcQvaezc5AV6flu3XsOxQs7i4BGYJs=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "8.3.1.1", - "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" + "version": "8.3.1.3", + "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "8.3.1.1", - "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" + "version": "8.3.1.3", + "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM=" }, { "pname": "MicroCom.Runtime", - "version": "0.11.0", - "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + "version": "0.11.6", + "hash": "sha256-RTr200R3sZuyxi0XQ25ox2p1kVt5R1CbH/YBs21+eNg=" }, { "pname": "Microsoft.CSharp", @@ -164,6 +184,11 @@ "version": "1.6.1", "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, + { + "pname": "NWayland", + "version": "0.11.0", + "hash": "sha256-6I5F9aYQCP7JWsNMCkvUCYvsp20Gn+eYNO2ySuKUuhY=" + }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", @@ -386,28 +411,28 @@ }, { "pname": "SkiaSharp", - "version": "2.88.9", - "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + "version": "3.119.4", + "hash": "sha256-4ypEnTGUXAudFp61vGduHj9YmqtpiI5J1wP9wcOEwXY=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.9", - "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + "version": "3.119.4", + "hash": "sha256-+uBVQFmxEH73iI5GwgvftUhAHvenpvc5GtT63HQy1Qo=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.9", - "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + "version": "3.119.4", + "hash": "sha256-9/L1Oc5bujN6pKjW6sJcr1jL3RLt8/Mt3MmClOcwzyw=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.9", - "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + "version": "3.119.4", + "hash": "sha256-xLfsWBsFFpv5Qg79GIMi+5CM6YDfcg//oywNlB5Y3J0=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.9", - "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + "version": "3.119.4", + "hash": "sha256-WlaYsbTh/cn/6YaN9odNtfpp8hpN52unGgGlQum0M5E=" }, { "pname": "System.AppContext", @@ -746,7 +771,7 @@ }, { "pname": "Tmds.DBus.Protocol", - "version": "0.21.2", - "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + "version": "0.94.1", + "hash": "sha256-T3HQasQOcl/7zxt5hT3ZMhhpWoTyPTb6/IX0d6TJWA8=" } ] diff --git a/pkgs/by-name/me/melonloader-installer/package.nix b/pkgs/by-name/me/melonloader-installer/package.nix index 418d5437e79b..d7c4dc071e22 100644 --- a/pkgs/by-name/me/melonloader-installer/package.nix +++ b/pkgs/by-name/me/melonloader-installer/package.nix @@ -4,17 +4,18 @@ buildDotnetModule, makeDesktopItem, copyDesktopItems, + nix-update-script, lib, }: buildDotnetModule rec { pname = "melonloader-installer"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "LavaGang"; repo = "MelonLoader.Installer"; tag = version; - hash = "sha256-6tSbLgr44xBoJsNOGUq62KBirIU6sNCy24fwKROZRPE="; + hash = "sha256-6nyrHSD3x5Oh50ckDkWq6Fr3x4BFHsT4mn+N5QGJud4="; }; patches = [ @@ -50,7 +51,7 @@ buildDotnetModule rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://melonwiki.xyz"; diff --git a/pkgs/by-name/me/melonloader-installer/update.sh b/pkgs/by-name/me/melonloader-installer/update.sh deleted file mode 100644 index 90d36c637dc2..000000000000 --- a/pkgs/by-name/me/melonloader-installer/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -#shellcheck shell=bash - -# Implementation lovingly referenced and adapted from cavalier package's update.sh - -set -eu -o pipefail - -version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - https://api.github.com/repos/LavaGang/MelonLoader.Installer/releases/latest | jq -e -r .tag_name) -old_version=$(nix-instantiate --eval --raw -A melonloader-installer.version) - -if [[ $version == "$old_version" ]]; then - echo "New version same as old version, nothing to do." >&2 - exit 0 -fi - -update-source-version melonloader-installer "$version" - -$(nix-build -A melonloader-installer.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.json" diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix index 9dc9c1f8e5e1..7d81423e29f8 100644 --- a/pkgs/by-name/me/memogram/package.nix +++ b/pkgs/by-name/me/memogram/package.nix @@ -1,30 +1,49 @@ { lib, - buildGoModule, + buildGo127Module, fetchFromGitHub, + gitMinimal, nix-update-script, }: -buildGoModule (finalAttrs: { +buildGo127Module (finalAttrs: { pname = "memogram"; - version = "0.5.0"; + version = "26.10.0"; src = fetchFromGitHub { owner = "usememos"; repo = "telegram-integration"; - tag = "v${finalAttrs.version}"; - hash = "sha256-kXn3m7o+WqxONUUiy6PVfdJfKuo9hJfpaAaXQx0LsnU="; + tag = finalAttrs.version; + hash = "sha256-OHJnyQZc9KjDe2Y7ljALDCypbzHcupxT3f3SUajQIYk="; }; - vendorHash = "sha256-aSq+wjWZUK4Rh7bw9NqqxnD9H3X+EgMF6F4w+SUtm70="; + vendorHash = "sha256-eQ2vAUWFPoe6YX+gZ0cs0CJP88b3IQmSZKMZ6A58GWk="; + + nativeBuildInputs = [ gitMinimal ]; subPackages = [ "bin/memogram" ]; + # Mirrors the default checkPhase, but tests every package rather than only + # subPackages: the unit and release-script tests live in the other packages. + checkPhase = '' + runHook preCheck + # As in the default checkPhase, in case tests reference test assets + export GOFLAGS=''${GOFLAGS//-trimpath/} + go test ./... + runHook postCheck + ''; + + # memogram rejects builds whose version does not follow its YY.MM.N scheme, + # and a Go build without VCS metadata cannot derive the version itself. + ldflags = [ "-X github.com/usememos/memogram/internal/version.Version=${finalAttrs.version}" ]; + + __structuredAttrs = true; + passthru.updateScript = nix-update-script { }; meta = { description = "Easy to use integration service for syncing messages and images from a Telegram bot into your Memos"; homepage = "https://github.com/usememos/telegram-integration"; - changelog = "https://github.com/usememos/telegram-integration/releases/v${finalAttrs.version}"; + changelog = "https://github.com/usememos/telegram-integration/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ merrkry ]; mainProgram = "memogram"; diff --git a/pkgs/by-name/me/meslo-lgs-nf/package.nix b/pkgs/by-name/me/meslo-lgs-nf/package.nix index 7fa29d4f4146..717b3c4eac63 100644 --- a/pkgs/by-name/me/meslo-lgs-nf/package.nix +++ b/pkgs/by-name/me/meslo-lgs-nf/package.nix @@ -5,15 +5,18 @@ installFonts, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "meslo-lgs-nf"; - version = "unstable-2023-04-03"; + version = "2.3.3"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k-media"; - rev = "145eb9fbc2f42ee408dacd9b22d8e6e0e553f83d"; - sha256 = "sha256-8xwVOlOP1SresbReNh1ce2Eu12KdIwdJSg6LKM+k2ng="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8xwVOlOP1SresbReNh1ce2Eu12KdIwdJSg6LKM+k2ng="; }; nativeBuildInputs = [ installFonts ]; @@ -25,4 +28,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ bbigras ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/mi/miasma/package.nix b/pkgs/by-name/mi/miasma/package.nix new file mode 100644 index 000000000000..257562658b7c --- /dev/null +++ b/pkgs/by-name/mi/miasma/package.nix @@ -0,0 +1,66 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + rustPlatform, + versionCheckHook, + + cacert, + pkg-config, + sqlite, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "miasma"; + version = "0.4.3"; + __structuredAttrs = true; + __darwinAllowLocalNetworking = true; + + src = fetchFromGitHub { + owner = "austin-weeks"; + repo = "miasma"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Jv0nKOdynhRiWcMX9uh1BZYmRJ1c9PXWxPr+yDq7XvQ="; + }; + + cargoHash = "sha256-PddTPwQNrLn64CJkPxSsk8N/JVA2Kw7VFCzGt36Virk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ sqlite ]; + + nativeCheckInputs = [ cacert ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Trap AI web scrapers in an endless poison pit"; + longDescription = '' + AI companies continually scrape the internet at an enormous + scale, swallowing up all of its contents to use as training data + for their next models. If you have a public website, they are + already stealing your work. + + Miasma is here to help you fight back! Spin up the server and + point any malicious traffic towards it. Miasma will send + poisoned training data from the poison fountain alongside + multiple self-referential links. It's an endless buffet of slop + for the slop machines. + + Miasma is very fast and has a minimal memory footprint - you + should not have to waste compute resources fending off the + internet's leeches. + ''; + homepage = "https://github.com/austin-weeks/miasma"; + changelog = "https://github.com/austin-weeks/miasma/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "miasma"; + maintainers = with lib.maintainers; [ + yiyu + jackr + ]; + }; +}) diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix index b14c3ccd3dd6..448a184ecb7c 100644 --- a/pkgs/by-name/mi/millet/package.nix +++ b/pkgs/by-name/mi/millet/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "millet"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "azdavis"; repo = "millet"; rev = "v${finalAttrs.version}"; - hash = "sha256-MHAvurglG26nRvvAknqZPROSICI/ttQm0MLPsoQyw2Y="; + hash = "sha256-Als+2+E5EyM7g+XYNXMnetC9uR1NXJnUEL4EBTl0qlQ="; }; - cargoHash = "sha256-sJi+R67SfDshs37/uibtRHs8D3NRTUSQKfePgTWo5b4="; + cargoHash = "sha256-M3b43xuUmecuWoQqOHt6TTI7Kj4FOvnOWOu9q41TGRQ="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/by-name/mi/min/lock.json b/pkgs/by-name/mi/min/lock.json deleted file mode 100644 index c207506bc299..000000000000 --- a/pkgs/by-name/mi/min/lock.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "depends": [ - { - "method": "fetchzip", - "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source", - "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0", - "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615", - "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz", - "ref": "v0.2.1", - "packages": [ - "checksums" - ], - "srcDir": "src" - }, - { - "method": "fetchzip", - "path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source", - "rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec", - "sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q", - "url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz", - "ref": "0.5.14", - "packages": [ - "zippy" - ], - "srcDir": "src" - }, - { - "method": "fetchzip", - "path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source", - "rev": "83e2866422788a1db1906734de056b410a49d047", - "sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z", - "url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz", - "ref": "v2.0.1", - "packages": [ - "nimquery" - ], - "srcDir": "" - }, - { - "method": "fetchzip", - "path": "/nix/store/bn7iv51yqbqi0h8z1r9v2vmpqnz46yfr-source", - "rev": "c138b34bf3c5198c26ecfad5e251fa5d56e5ad48", - "sha256": "0wwfhjhwpmanjv4vv9yl0a0mami9x8qzzb5nialcfp9iasbwiqgj", - "url": "https://github.com/h3rald/minline/archive/c138b34bf3c5198c26ecfad5e251fa5d56e5ad48.tar.gz", - "ref": "v0.1.2", - "packages": [ - "minline" - ], - "srcDir": "." - } - ] -} diff --git a/pkgs/by-name/mi/min/package.nix b/pkgs/by-name/mi/min/package.nix deleted file mode 100644 index b5761848813a..000000000000 --- a/pkgs/by-name/mi/min/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - buildNimPackage, - fetchFromGitHub, - openssl, - pcre, -}: - -buildNimPackage (finalAttrs: { - pname = "min"; - version = "0.45.0"; - - src = fetchFromGitHub { - owner = "h3rald"; - repo = "min"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Uw03aSFn3EV3H2SkYoYzM5S/WLhEmLV8s3mRF3oT8ro="; - }; - - lockFile = ./lock.json; - - buildInputs = [ - openssl - pcre - ]; - - prePatch = '' - # remove vendorabilities - find . -name '*.a' -delete - find minpkg/lib -name '*.nim' \ - -exec sed 's|{\.passL:.*\.}|discard|g' -i {} \; - ''; - - env.NIX_LDFLAGS = toString [ "-lpcre" ]; - - meta = { - description = "Functional, concatenative programming language with a minimalist syntax"; - homepage = "https://min-lang.org/"; - changelog = "https://github.com/h3rald/min/releases/tag/${finalAttrs.src.rev}"; - license = lib.licenses.mit; - mainProgram = "min"; - }; - -}) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 56a6202a4feb..f5f9cfeccfaa 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "minijinja"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = finalAttrs.version; - hash = "sha256-LaSKTh7iPCR+ikODRC3mEAn8Zcw/csbmJ+sJRXlX01w="; + hash = "sha256-KjaHYq/FyNQjaU/uH0ouvd62oyvHur+5HADcHSaAf3M="; }; - cargoHash = "sha256-le0ZYhIlKU5EIcAKGLSHJm35OZMu3k/ibeNGdZzOaLk="; + cargoHash = "sha256-IWYunLLnbdffWv595/QbsFhkOPVPK4kv9qOM8YjO3BI="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index e7e48296088c..0b15cbb7e591 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -74,14 +74,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "mistral-rs"; - version = "0.9.4"; + version = "0.9.5"; __structuredAttrs = true; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-/40obacG8jIx6BOQ8uUTiT503jRDnHrlrw5PGoEfbEM="; + hash = "sha256-3NZGfKyznzb80diu3Va2GwvQKQeQxypJ5JoGyzeA9ak="; }; patches = [ @@ -130,7 +130,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "" ''; - cargoHash = "sha256-56Z1ea/5x8fE055lvi7kfFQTyNTH49+bnotn0XCRwpU="; + cargoHash = "sha256-qqFkO5BJ7mhWuLsCDte9BqCVjaqbePp+lY4BqhYYcUQ="; nativeBuildInputs = [ pkg-config @@ -220,10 +220,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # Error: failed to read MTP model config: No such file or directory (os error 2) "--skip=external_mtp_checkpoint_bytes_are_added_to_the_cache_reservation" - # assertion `left == right` failed: docs/openapi.json is stale; - # regenerate with: cargo test -p mistralrs-server-core regenerate_openapi -- --ignored - "--skip=openapi_doc::tests::openapi_matches_committed" - # Max error 0.27852345 is too large "--skip=vector_fp8::ops::tests::test_fp8_vector_quant_cpu" @@ -238,10 +234,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=sandboxed_session_can_execute_python" "--skip=sandboxed_session_default_policy_can_execute_python" - # Upstream's v0.9.2 bump updated the version example in the generated CLI reference page - # but not in the clap doc comment it is generated from, so this golden test fails at the tag. - "--skip=docgen::cli_reference_matches_committed" - # Linux namespace / seccomp tests require capabilities the nix build sandbox blocks "--skip=network_none_blocks_socket" "--skip=rlimit_nproc_caps_processes" @@ -294,18 +286,11 @@ rustPlatform.buildRustPackage (finalAttrs: { [ "x86_64-linux" ] else lib.platforms.unix; - problems = - lib.optionalAttrs mklSupport { - broken-mkl-support = { - kind = "broken"; - message = "mistral-rs' MKL support is currently broken."; - }; - } - // lib.optionalAttrs (cudaSupport && (cudaPackages.cudaAtLeast "13.4")) { - unsupported-cuda-toolkit = { - kind = "broken"; - message = "mistral-rs is not compatible with CUDA ${cudaPackages.cudaMajorMinorVersion}."; - }; + problems = lib.optionalAttrs mklSupport { + broken-mkl-support = { + kind = "broken"; + message = "mistral-rs' MKL support is currently broken."; }; + }; }; }) diff --git a/pkgs/by-name/mk/mkslides/package.nix b/pkgs/by-name/mk/mkslides/package.nix new file mode 100644 index 000000000000..9b989275c9c5 --- /dev/null +++ b/pkgs/by-name/mk/mkslides/package.nix @@ -0,0 +1,53 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "mkslides"; + version = "2.0.23"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "MartenBE"; + repo = "mkslides"; + tag = finalAttrs.version; + hash = "sha256-pmlMZzOhTdgPf/D6NLLg3j/RZP4ldW3sOgafwZJtdtc="; + fetchSubmodules = true; # reveal.js and highlight.js are submodules. + }; + + build-system = [ python3Packages.uv-build ]; + + dependencies = with python3Packages; [ + beautifulsoup4 + click + emoji + jinja2 + jsonschema + livereload + markdown + natsort + omegaconf + python-frontmatter + pyyaml + rich + treelib + types-beautifulsoup4 + types-markdown + ]; + + pythonImportsCheck = [ "mkslides" ]; + + meta = { + description = "Use mkslides to easily turn Markdown files into beautiful slides using the power of Reveal.js!"; + mainProgram = "mkslides"; + homepage = "https://github.com/MartenBE/mkslides"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.MartenBE + ]; + }; +}) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 5805255434a4..c1ce13e158c3 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.50.0"; + version = "1.53.0"; selectSystem = attrs: @@ -66,8 +66,8 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-lZ78YAjY3tZv8fdxlh0uFAEtzcV6u8+Jf6jugobzvLA="; - aarch64-darwin = "sha256-2yih0zGO6XTH6n+bbuYXEuIkQxo4BKJS1Yrk0uwKwc0="; + x86_64-linux = "sha256-w2YMHylbLJS2+Bhr/fy3hoHUibS62zt44YwfI35d6c0="; + aarch64-darwin = "sha256-RydHsh7RDDGc3lU0G2Wgomz/zre4Z2F9bMGsnNEO888="; }; }; diff --git a/pkgs/by-name/mo/moonlight-qt/darwin-no-ffmpeg-vulkan.patch b/pkgs/by-name/mo/moonlight-qt/darwin-no-ffmpeg-vulkan.patch new file mode 100644 index 000000000000..756f61d33b7e --- /dev/null +++ b/pkgs/by-name/mo/moonlight-qt/darwin-no-ffmpeg-vulkan.patch @@ -0,0 +1,29 @@ +--- a/app/streaming/video/ffmpeg-renderers/plvk.cpp ++++ b/app/streaming/video/ffmpeg-renderers/plvk.cpp +@@ -55,7 +55,7 @@ + DrmMasterLocker& operator=(DrmMasterLocker&&) noexcept = delete; + }; + +-#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(60, 26, 100) ++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(60, 26, 100) || defined(Q_OS_DARWIN) + static const char *k_OptionalDeviceExtensions[] = { + /* Misc or required by other extensions */ + //VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME, +@@ -366,7 +366,7 @@ + vkParams.device = device; + + if (m_HwDeviceType == AV_HWDEVICE_TYPE_VULKAN) { +-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(60, 26, 100) ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(60, 26, 100) && !defined(Q_OS_DARWIN) + vkParams.opt_extensions = av_vk_get_optional_device_extensions(&vkParams.num_opt_extensions); + #else + vkParams.opt_extensions = k_OptionalDeviceExtensions; +@@ -382,7 +382,7 @@ + m_Vulkan = pl_vulkan_create(m_Log, &vkParams); + } + +-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(60, 26, 100) ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(60, 26, 100) && !defined(Q_OS_DARWIN) + av_free((void*)vkParams.opt_extensions); + #endif + diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index 1eef83cedaf7..67f4cc684d7d 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -2,13 +2,12 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, qt6, pkg-config, vulkan-headers, SDL2, SDL2_ttf, - ffmpeg_8, + ffmpeg, libopus, libplacebo, openssl, @@ -19,27 +18,46 @@ libxkbcommon, wayland, libdrm, + apple-sdk_15, nix-update-script, }: +let + # Moonlight-qt 6.2.0's MoltenVK renderer requires libplacebo's scRGB support, + # which is not in any release yet. + # Reuse the same libplacebo revision as upstream's macOS builds, see + # https://github.com/moonlight-stream/moonlight-qt-deps + # Remove this override once libplacebo provides PL_COLOR_TRC_SCRGB. + libplacebo' = + if stdenv.hostPlatform.isDarwin then + libplacebo.overrideAttrs (prev: { + version = "7.360.1-unstable-2026-10-01"; + src = prev.src.override { + tag = null; + rev = "92b5ac6db79f4d680eb656692f7bf51e9606f42a"; + hash = "sha256-cYX2Hn7I8zWz7yvHyvmlpC+YmoCMqD7ZJQktYp9MJhM="; + }; + }) + else + libplacebo; +in + stdenv.mkDerivation (finalAttrs: { pname = "moonlight-qt"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-qt"; tag = "v${finalAttrs.version}"; - hash = "sha256-rWVNpfRDLrWsqELPFquA6rW6/AfWV+6DNLUCPqIhle0="; + hash = "sha256-s6b3L51jCNuYJS0dvx2tkNvzNzrsSzzdSfTgM+IR1kg="; fetchSubmodules = true; }; - patches = [ - # Fix build for Xcode < 14 - (fetchpatch { - url = "https://github.com/moonlight-stream/moonlight-qt/commit/76deafbd7bf868562d69061e7d6abf2612a2c7ad.patch"; - hash = "sha256-+rXdexZQpOP6yS+oTmvYVxasWxOX16uU1udN75zNX3w="; - }) + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + # nixpkgs' ffmpeg on darwin is built without Vulkan, so it lacks + # av_vk_get_optional_device_extensions(). Use the static extension list. + ./darwin-no-ffmpeg-vulkan.patch ]; nativeBuildInputs = [ @@ -52,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 SDL2_ttf - ffmpeg_8 + ffmpeg libopus - libplacebo + libplacebo' qt6.qtdeclarative qt6.qtsvg openssl @@ -68,6 +86,10 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtwayland wayland libdrm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # The Metal renderer needs FP16 simd support, which is only in the macOS 15+ SDK. + apple-sdk_15 ]; qmakeFlags = [ "CONFIG+=disable-prebuilts" ]; diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix index 3ec7fa70f816..05cab1afbee1 100644 --- a/pkgs/by-name/mo/mozhi/package.nix +++ b/pkgs/by-name/mo/mozhi/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "mozhi"; - version = "0-unstable-2026-08-30"; + version = "0-unstable-2026-10-15"; src = fetchFromCodeberg { owner = "aryak"; repo = "mozhi"; - rev = "ad53459f38e995eabdb5fd10352b0a2f57c278a2"; - hash = "sha256-Zn+3McD+uGO+Vk88gbq7sqU7OahWZmtwuHxwvMIM/gw="; + rev = "eed4fb99a2d3a2ea54ed5bf8dc718a32d0785898"; + hash = "sha256-rtA0bA26W/XAfRVKW+VVeWcJOcJjJJqOxAu5XzYTv1g="; }; vendorHash = "sha256-ZFbgq/zeBTK6wb5VHHyTNrq8RuNhWTy8PyA1mZcbKYc="; diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index 766bda1ca920..d8b2f48bfc71 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "mtail"; - version = "3.4.15"; + version = "3.4.16"; __structuredAttrs = true; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; tag = "v${finalAttrs.version}"; - hash = "sha256-Wct6MPTCSDt4KnvLk08I4dET1e7bhYJ8GC8EYrwdxXs="; + hash = "sha256-s3w4mNEqwXxXbGPoogXJoVvcfJRVY0hIkaGJP1XiBLU="; }; proxyVendor = true; - vendorHash = "sha256-vCKTQLRAClhpVvcxZtkjTvV/NgOitn96kIKXB4o2yvE="; + vendorHash = "sha256-WRXwRepPUznn3v/Wp/M8nr3OcuqHLsOUy7K7oGceS2c="; nativeBuildInputs = [ gotools # goyacc diff --git a/pkgs/by-name/mu/mupdf/disable-autovenv.patch b/pkgs/by-name/mu/mupdf/disable-autovenv.patch new file mode 100644 index 000000000000..3f8542a94f54 --- /dev/null +++ b/pkgs/by-name/mu/mupdf/disable-autovenv.patch @@ -0,0 +1,28 @@ +--- a/scripts/wrap/__main__.py ++++ b/scripts/wrap/__main__.py +@@ -918,24 +918,7 @@ import sysconfig + import tempfile + import textwrap + +-sys.path.insert(0, os.path.normpath(f'{__file__}/../..')) +-try: +- import autovenv +-finally: +- del sys.path[0] +- +-autovenv.enter() +- +-# Install/import pipcl. We don't pass 'pipcl' to above call to autovenv.enter() +-# because this would do `pip install pipcl`, which seems to fail if we are +-# being run via `pip install`. It looks like `pip install` deliberately does +-# not install pip in a build venv. +-# +-try: +- import pipcl +-except ImportError: +- subprocess.run(f'pip install --upgrade pipcl', shell=1, check=1) +- import pipcl ++import pipcl + + if platform.system() == 'Windows': + ''' diff --git a/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch b/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch index 93c872e56be1..6a2716558392 100644 --- a/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch +++ b/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index a16a69968..aa741b037 100644 --- a/Makefile +++ b/Makefile -@@ -454,8 +454,10 @@ install-libs: libs install-headers +@@ -491,8 +491,10 @@ install-libs: libs install-headers ifeq ($(shared),yes) install -m $(SO_INSTALL_MODE) $(OUT)/libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION) ifneq ($(OS),OpenBSD) @@ -15,11 +13,9 @@ index a16a69968..aa741b037 100644 endif else install -m 644 $(MUPDF_LIB) $(DESTDIR)$(libdir) -diff --git a/Makerules b/Makerules -index ba4df2189..8eb62622a 100644 --- a/Makerules +++ b/Makerules -@@ -212,101 +212,82 @@ ifneq "$(CLUSTER)" "" +@@ -220,105 +220,86 @@ ifneq "$(CLUSTER)" "" CFLAGS += -DCLUSTER endif @@ -93,6 +89,10 @@ index ba4df2189..8eb62622a 100644 - SYS_BROTLI_CFLAGS := $(shell pkg-config --cflags libbrotlidec libbrotlienc) - SYS_BROTLI_LIBS := $(shell pkg-config --libs libbrotlidec libbrotlienc) - endif +- ifeq ($(shell pkg-config --exists libcmark-gfm && echo yes),yes) +- SYS_CMARK_GFM_CFLAGS := $(shell pkg-config --cflags libcmark-gfm) +- SYS_CMARK_GFM_LIBS := $(shell pkg-config --libs libcmark-gfm) +- endif +ifeq ($(shell pkg-config --exists 'freetype2 >= 18.3.12' && echo yes),yes) + SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) + SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) @@ -125,6 +125,10 @@ index ba4df2189..8eb62622a 100644 + SYS_BROTLI_CFLAGS := $(shell pkg-config --cflags libbrotlidec libbrotlienc) + SYS_BROTLI_LIBS := $(shell pkg-config --libs libbrotlidec libbrotlienc) +endif ++ifeq ($(shell pkg-config --exists libcmark-gfm && echo yes),yes) ++ SYS_CMARK_GFM_CFLAGS := $(shell pkg-config --cflags libcmark-gfm) ++ SYS_CMARK_GFM_LIBS := $(shell pkg-config --libs libcmark-gfm) ++endif - HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) - ifeq ($(HAVE_SYS_LEPTONICA),yes) @@ -189,7 +193,7 @@ index ba4df2189..8eb62622a 100644 ifeq ($(HAVE_GLUT),) HAVE_GLUT := $(shell pkg-config --exists gl x11 xrandr && echo yes) endif -@@ -321,29 +302,28 @@ else +@@ -333,29 +314,28 @@ else SYS_GLUT_LIBS := -lglut endif endif diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index b2a097ef2b8f..3fa91223ddb6 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -60,14 +60,21 @@ let --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" ''; }); + + pythonForWrappers = python3.pythonOnBuildForHost.withPackages ( + pkgs: with pkgs; [ + clang + pipcl + ] + ); in stdenv.mkDerivation rec { - version = "1.27.2"; + version = "1.28.5"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-VThnsTUwPcTCWrZ8XyNNjpAKDjbmboSE2ZrcBf4ehzc="; + hash = "sha256-mKXBDNogw5ks33b/ayoRScMr15zHltP3AyMLEYW36TQ="; }; patches = [ @@ -77,6 +84,8 @@ stdenv.mkDerivation rec { # Upstream C++ wrap script only defines fixed-sized integers on macOS but # this is required on aarch64-linux too. ./fix-cpp-build.patch + # 1.28.5 dropped pipcl.py and now tries to install it with pip. + ./disable-autovenv.patch ]; postPatch = '' @@ -116,6 +125,7 @@ stdenv.mkDerivation rec { (python3.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ps.clang + ps.pipcl ])) ] ++ lib.optionals enablePython [ @@ -168,7 +178,7 @@ stdenv.mkDerivation rec { postBuild = lib.optionalString (enableCxx || enablePython) '' for dir in build/*; do - ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString enableCxx "01"}${lib.optionalString enablePython "23"} + ${lib.getExe pythonForWrappers} ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString enableCxx "01"}${lib.optionalString enablePython "23"} done ''; diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index a1ec8ef88c0e..f11621560fce 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -26,6 +26,7 @@ libsndfile, libvorbis, mnxdom, + pipewire, portaudio, portmidi, pugixml, @@ -64,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "MUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT" false) # Don't build unit tests unless we are going to run them. (lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + # Upstream defaults this to OFF outside their CI builds + (lib.cmakeBool "MUSE_MODULE_AUDIO_PIPEWIRE" stdenv.hostPlatform.isLinux) ] # Use our versions of system libraries, see: # https://github.com/musescore/MuseScore/issues/11572 @@ -140,6 +143,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib + pipewire qt6.qtwayland ]; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 5676fd0d6ef8..9a950b16cf70 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "myks"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${finalAttrs.version}"; - hash = "sha256-mUcA6yQIQe9tkJRBcyzkfVpGFGJcZvsmHhVApY4+cKc="; + hash = "sha256-npVJwinhHQiAgFouZRTV84ni9t3QQX07zee6d0D5PIo="; }; - vendorHash = "sha256-2AHOnku2WPvJwotrp1fpA/g/YTH64cgxglsXBGStx28="; + vendorHash = "sha256-swtOCd27dHclIexx/W3mNvqDMUbeEcANIjcBsnpFzBU="; subPackages = "."; diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index 0c2fb1d26a10..f6ec900387a2 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "nest-cli"; - version = "12.0.8"; + version = "12.0.9"; src = fetchFromGitHub { owner = "nestjs"; repo = "nest-cli"; tag = finalAttrs.version; - hash = "sha256-c/fSr3OizSrEuFRXGrbfmrBt4+Cg5kmIZWWOWoOpVKY="; + hash = "sha256-KmB3uZUXaPzQS/u36GR3H8HywND8R1wXefPZ4Z7V/Ck="; }; - npmDepsHash = "sha256-4N0crjsb53XAP1ssmMa2y5x6FdX88fzpB9ZdERZp6dc="; + npmDepsHash = "sha256-K/uyBLiyEnmnn2TlafqIjJaaFNpFyZnMOR5IFIKr8Iw="; npmFlags = [ "--legacy-peer-deps" ]; env = { diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix index 0befac7ca6c2..ed512636724d 100644 --- a/pkgs/by-name/ne/net-cpp/package.nix +++ b/pkgs/by-name/ne/net-cpp/package.nix @@ -74,7 +74,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "ENABLE_WERROR" true) + # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/work_items/7 + (lib.cmakeBool "ENABLE_WERROR" false) ]; env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index ce8abbf97fbe..4843781cbb00 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -221,7 +221,6 @@ buildGoModule (finalAttrs: { description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = component.license; maintainers = with lib.maintainers; [ - nazarewk saturn745 loc ]; diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix index 9ae53f2d7346..6fe54a243187 100644 --- a/pkgs/by-name/ni/nix-fast-build/package.nix +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -25,13 +25,12 @@ python3Packages.buildPythonApplication (finalAttrs: { makeWrapperArgs = [ "--prefix" "PATH" - ": ${ - lib.makeBinPath [ - nix-eval-jobs - nix-eval-jobs.nix - bashInteractive - ] - }" + ":" + (lib.makeBinPath [ + nix-eval-jobs + nix-eval-jobs.nix + bashInteractive + ]) ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index 77e7aecbadb6..7f3622b24099 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -10,23 +10,23 @@ }: python3Packages.buildPythonPackage rec { pname = "nix-heuristic-gc"; - version = "0.7.4"; + version = "0.7.5"; format = "setuptools"; src = fetchFromGitHub { owner = "risicle"; repo = "nix-heuristic-gc"; tag = "v${version}"; - hash = "sha256-T/PKn005gkALJP2FfHfWJj5UIRP9IYkvMOT3+kMY3Wo="; + hash = "sha256-4w3qQIc/sJYAInwisyYVUERJ5o84qPeGQS1XRG6XYhk="; }; # NIX_SYSTEM suggested at # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531 - env.NIX_SYSTEM = nixVersions.nixComponents_2_31.nix-store.stdenv.hostPlatform.system; + env.NIX_SYSTEM = nixVersions.nixComponents_2_35.nix-store.stdenv.hostPlatform.system; buildInputs = [ boost - nixVersions.nixComponents_2_31.nix-store - nixVersions.nixComponents_2_31.nix-main + nixVersions.nixComponents_2_35.nix-store + nixVersions.nixComponents_2_35.nix-main python3Packages.pybind11 python3Packages.setuptools ]; diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix index f1563fca7d59..ddc336cde920 100644 --- a/pkgs/by-name/ni/nix-inspect/package.nix +++ b/pkgs/by-name/ni/nix-inspect/package.nix @@ -9,22 +9,25 @@ meson, ninja, stdenv, - fetchpatch2, }: let - nixComponents = nixVersions.nixComponents_2_31; + nixComponents = nixVersions.nixComponents_2_35; + + # Maintained fork of the original project from bluskript/nix-inspect src = fetchFromGitHub { - owner = "bluskript"; + owner = "rszyma"; repo = "nix-inspect"; - rev = "2938c8e94acca6a7f1569f478cac6ddc4877558e"; - hash = "sha256-ArwdTtlIje7yOTblkZs4aQ1+HBtEwJKkfKOiA9tY8nA="; + rev = "975d2a97ccca17f2890820d47d34b436a723233d"; + hash = "sha256-r8BqSevdYFm5RfbFAaHbXzWaj8YvoLZYmhfbhTDlCdA="; }; + version = "0.1.2-unstable-2026-09-12"; + workerPackage = stdenv.mkDerivation { inherit src; pname = "nix-inspect-worker"; - version = "0.1.2-unstable-2025-08-14"; + inherit version; postPatch = '' cd worker ''; @@ -35,14 +38,6 @@ let pkg-config ]; - patches = [ - # Upgrade to Nix 2.30 - https://github.com/bluskript/nix-inspect/pull/25 - (fetchpatch2 { - url = "https://github.com/bluskript/nix-inspect/commit/af4dd48d69f399c7b7e3f07d5268ade606a91f22.patch"; - hash = "sha256-ipyT/zr+CEZi8EPk6Tw8V58ukUdmrtXRn+H32Y7Csuw="; - }) - ]; - buildInputs = [ boost nlohmann_json @@ -59,7 +54,7 @@ in rustPlatform.buildRustPackage { inherit src; pname = "nix-inspect"; - version = "0.1.2"; + inherit version; cargoHash = "sha256-3FTlbWSA0SKCfunQDdXu9g2aQAdAIfOTq5qJbzrRPjc="; @@ -67,12 +62,12 @@ rustPlatform.buildRustPackage { postPatch = '' substituteInPlace src/workers.rs \ - --replace-fail 'env!("WORKER_BINARY_PATH")' '"${workerPackage}/bin/nix-inspect"' + --replace-fail 'env!("WORKER_BINARY_PATH")' '"${workerPackage}/bin/nix-inspect-worker"' ''; meta = { description = "Interactive TUI for inspecting nix configs and other expressions"; - homepage = "https://github.com/bluskript/nix-inspect"; + homepage = "https://github.com/rszyma/nix-inspect"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ blusk ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index adf934991061..2fc40f61e252 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -2,8 +2,9 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, nixVersions, - nixComponents ? nixVersions.nixComponents_2_31, + nixComponents ? nixVersions.nixComponents_2_34, cmake, pkg-config, boost, @@ -20,6 +21,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1P5oVXSx/hGK5MB2grxWtmqsKGtTEmT1XD5+NSsLFUw="; }; + patches = [ + # nix 2.33 support, https://github.com/shlevy/nix-plugins/pull/25 + (fetchpatch2 { + url = "https://github.com/shlevy/nix-plugins/commit/75b5f1d79923243759ddb8261df7d24df8ad2d5b.patch?full_index=1"; + hash = "sha256-mt7Zy5N7/gPEAsaURUPhhI3vM8ML7wYMa6sGy5wie+o="; + }) + # nix 2.34 support, https://github.com/shlevy/nix-plugins/pull/26 + (fetchpatch2 { + url = "https://github.com/shlevy/nix-plugins/commit/51ab78357ab6eb1f382c3f64bdb8fbaf742d8dec.patch?full_index=1"; + includes = [ "extra-builtins.cc" ]; + hash = "sha256-/+fuq/OEDpOy2x6vMfSXfUqXn66r10CuD6ZOnZyk8Fc="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/no/nordvpn/package.nix b/pkgs/by-name/no/nordvpn/package.nix index da03258138e4..9e350887393d 100644 --- a/pkgs/by-name/no/nordvpn/package.nix +++ b/pkgs/by-name/no/nordvpn/package.nix @@ -7,7 +7,7 @@ _experimental-update-script-combinators, }: let - version = "5.4.0"; + version = "5.4.1"; common = { inherit version; @@ -16,7 +16,7 @@ let owner = "NordSecurity"; repo = "nordvpn-linux"; tag = version; - hash = "sha256-m3evkWYrXtgXJu7dt1mFKPVkcnrn5g3udZWafb4lFcM="; + hash = "sha256-sgitiRSkqS+mWA/qqQxA810pTg8LQl+RhB2go0/HBkg="; }; # rec so that changelog can reference homepage diff --git a/pkgs/by-name/nu/nushell/plugins/hcl/package.nix b/pkgs/by-name/nu/nushell/plugins/hcl/package.nix index 1149c52e681c..ada125020c7d 100644 --- a/pkgs/by-name/nu/nushell/plugins/hcl/package.nix +++ b/pkgs/by-name/nu/nushell/plugins/hcl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_hcl"; - version = "0.116.0"; + version = "0.116.1"; src = fetchFromGitHub { owner = "Yethal"; repo = "nu_plugin_hcl"; tag = finalAttrs.version; - hash = "sha256-z4TzLSIB72iFtjEJXiUtEgwMdpbkrvw13GhS0c8Hp+c="; + hash = "sha256-fnK3PgL7KwPEIV+bmflq79dto9bJR4jcLDTjlnRkIO0="; }; - cargoHash = "sha256-qnrxhDMRKA0UwH48IzndGXBzdHbPRPR3k4UeyFm6J5Q="; + cargoHash = "sha256-FU4dtyiAtqsWj/Kp0OHSrm/ZUk988lkDbx1uYpMIjZE="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index 77f62b14f46b..5ae6aff892ee 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nwg-hello"; - version = "0.4.5"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; tag = "v${finalAttrs.version}"; - hash = "sha256-8SSNW/we3TPVEqiC6ts3MR/rJrv857L+U/IAfkdK2RU="; + hash = "sha256-8NNGfxdFPB/FY0Bq1WtsZXvQAvaqb0dXWgIpUgQoemg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index f1c0f2df5c3f..690719440bf3 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oculante"; - version = "0.9.2.1-unstable-2025-10-08"; + version = "0.9.6"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; - rev = "51b9f70b35e09850baee85971720b8d3ac49c80b"; - hash = "sha256-YTrUucO1Fq2TgnV/HHkx2fcHvBupeoMpiBSwqIvyHaQ="; + tag = finalAttrs.version; + hash = "sha256-gM5wUEhake17TBKl7AEdc67XYTPMm12n2CzDdvr7bXk="; }; - cargoHash = "sha256-Bn2HxmFiqOeb3oUnUL/K0SahcFWRlY9RrbGU4orQz+Y="; + cargoHash = "sha256-0/t4NbRALcQ7Ma05wW5YLliFSBXdPRPkr2AecOOYRdY="; env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/by-name/oh/oh-my-rime/package.nix b/pkgs/by-name/oh/oh-my-rime/package.nix index c0d8fbbe0713..caad31b61757 100644 --- a/pkgs/by-name/oh/oh-my-rime/package.nix +++ b/pkgs/by-name/oh/oh-my-rime/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation { pname = "oh-my-rime"; - version = "0-unstable-2026-09-29"; + version = "0-unstable-2026-10-08"; src = fetchFromGitHub { owner = "Mintimate"; repo = "oh-my-rime"; - rev = "0b1d78474f5c11bdca78593b525bc2186be6c111"; - hash = "sha256-h2sjPV0+x7LtJIEIKXc9pCfpncWcZNOW9J3h/9cCK1g="; + rev = "361b5c0ec2e6fb18e1b34ab32651fdc132e78f10"; + hash = "sha256-ie5ZkjHSZinGs684UahJOXGmVtYh5tzjDKG7NeZT4hQ="; }; installPhase = # bash diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index f84879bc22d3..48ce97ec8b4d 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -111,12 +111,12 @@ let # vendored in-tree. Pre-stage the pin (tracks upstream's # `LLAMA_CPP_VERSION` file) so the FetchContent step uses our copy # instead of trying to clone over the network in the sandbox. - llamaCppVersion = "b11521"; + llamaCppVersion = "b11669"; llamaCppSrc = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = llamaCppVersion; - hash = "sha256-zkHQPGopaW4JXEebCGZjwl3Jqx4yb24Msq+ZvJsyNP8="; + hash = "sha256-pEDYgI3AMTU+cekvRX7NNt5wddznydQSNuerswvEpsA="; }; wrapperOptions = [ @@ -152,13 +152,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.40.4"; + version = "0.40.6"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-pNLexucSeop03cIkhdbkSvwNB3i0XEAlKrO4DaS59Xc="; + hash = "sha256-t3Asu9lIz8RW7xonHTJsTvtm1IEM6Rwfa0K5JN48Nwo="; }; vendorHash = "sha256-QBwZKRnmLUHQNSx5oqE9AbMINE8PP5TVJncG9nzQryI="; diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index ea51bc7170b0..3ec6d8d8878f 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,16 +8,16 @@ buildGo127Module rec { pname = "omnictl"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-Kim1aYzv2DJLlGQJcjhMUHiPskBj767mSzRj1jxAT40="; + hash = "sha256-SwjNnZx+RXRu3nwhg4Tv9yZwDnOrwc8c9bHSbgAGJgg="; }; - vendorHash = "sha256-MLzxZqEf44zreG64NTac/IX1O9sfRurMjn4fluptHGo="; + vendorHash = "sha256-ZbXYuniPvBFnOgPC9LF0/haNdmkSNIZY0L7CxMMXR2s="; ldflags = [ "-s" diff --git a/pkgs/by-name/om/omniwm/package.nix b/pkgs/by-name/om/omniwm/package.nix index a75aeeb22bf9..57a2d273772c 100644 --- a/pkgs/by-name/om/omniwm/package.nix +++ b/pkgs/by-name/om/omniwm/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "omniwm"; - version = "0.7.4"; + version = "0.7.6"; src = fetchurl { url = "https://github.com/OmniNull/OmniWM/releases/download/v${finalAttrs.version}/OmniWM-v${finalAttrs.version}.zip"; - hash = "sha256-HxSF4dFmgxaX6M7bnBF1d/WUn+AN7q6Fcr7W1sWOtOI="; + hash = "sha256-7IxhRqbyGnnhxArHDWESF2K5PPU80wjmPrROis4g/Nw="; }; sourceRoot = "OmniWM.app"; diff --git a/pkgs/by-name/om/omp/package.nix b/pkgs/by-name/om/omp/package.nix index 7a25be04428f..67a081593446 100644 --- a/pkgs/by-name/om/omp/package.nix +++ b/pkgs/by-name/om/omp/package.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "omp"; - version = "18.12.2"; + version = "18.12.3"; strictDeps = true; __structuredAttrs = true; @@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "can1357"; repo = "oh-my-pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-N0Tlzzlw4stc6s0ggFZKMHFhKKP8TQgOM51M3ATj3kc="; + hash = "sha256-S+mv25RJBqaVgm0g+visvnHHTwNqZcCoXryTCstt220="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-b/SEsUm/8hiG2PEGJMgx3Q5XLlWGWQCuHg2y/MCzRvg="; + hash = "sha256-i8Y3odnituHbm24eI5WkmHXXt7fpIM7MI97e4hGH3hg="; }; postPatch = '' diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix index 153a8677a00b..8bb8eea83036 100644 --- a/pkgs/by-name/op/open62541pp/package.nix +++ b/pkgs/by-name/op/open62541pp/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open62541pp"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "open62541pp"; repo = "open62541pp"; tag = "v${finalAttrs.version}"; - hash = "sha256-inweo5RGhNkUIRjQh43l5tRhfXoFRcRTHZFpETdIJgg="; + hash = "sha256-4l5cqugKCi7yeZqY5+gHBk1OLur3JbgaK2cWVLUq8/k="; }; cmakeFlags = [ diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix index 1d528aa553d8..874d79d79cb0 100644 --- a/pkgs/by-name/op/openclaw/package.nix +++ b/pkgs/by-name/op/openclaw/package.nix @@ -11,7 +11,7 @@ versionCheckHook, rolldown, installShellFiles, - version ? "2026.10.3", + version ? "2026.10.5", }: let pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_24; }; @@ -24,10 +24,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "openclaw"; repo = "openclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-eNcTYmHZyPiVKOsqdafGBJ//XFQXfsS+2sRsIJ733/o="; + hash = "sha256-+Bqk2u4hDiyqK1upJ96tc6Zu5dDNjIl/yhKtMB1XUZw="; }; - pnpmDepsHash = "sha256-BeFsc1+hvLA4ic+q4Bv4OZu4Py8efvzcRH8xmjHafUE="; + pnpmDepsHash = "sha256-wOuGt0xrVC5MUJ2xn4erfkkl20TsMqIsjuLAMOSMAes="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 63ab8f80b2c3..6f6fedce4cd1 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -2,7 +2,8 @@ autoPatchelfHook, bun, copyDesktopItems, - electron_42, + darwin, + electron_44, lib, makeBinaryWrapper, makeDesktopItem, @@ -17,7 +18,7 @@ }: let - electron = electron_42; + electron = electron_44; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode-desktop"; @@ -36,18 +37,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { autoPatchelfIgnoreMissingDeps = [ "libc.musl-*.so.*" ]; postPatch = - # The auto-updater would try to download and run an upstream binary that - # isn't patched for Nix. Disable it at source. - '' - substituteInPlace packages/desktop/src/main/constants.ts \ - --replace-fail 'app.isPackaged && CHANNEL !== "dev"' 'false' - '' - + # Relax Bun version check to be a warning instead of an error '' substituteInPlace packages/script/src/index.ts \ --replace-fail 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \ 'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}' + '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + substituteInPlace packages/desktop/scripts/utils.ts \ + --replace-fail 'await $`codesign --force --sign - ''${dest}`' 'true' + '' + + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + substituteInPlace \ + packages/desktop/src/main/windows/appearance.ts \ + packages/desktop/src/main/windows/early.ts \ + packages/desktop/src/main/service/desktop-cli.ts \ + packages/desktop/src/main/service/sidecar-probe.ts \ + --replace-fail "process.resourcesPath" "'$out/opt/opencode-desktop/resources'" ''; nativeBuildInputs = [ @@ -56,6 +62,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeBinaryWrapper writableTmpDirAsHomeHook ] + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook + ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook copyDesktopItems @@ -77,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { configurePhase = '' runHook preConfigure - cp -R ${finalAttrs.node_modules}/. . + cp -R "$node_modules"/. . patchShebangs node_modules patchShebangs packages/*/node_modules @@ -99,29 +108,29 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - # Build the opencode node bundle (needed by the desktop sidecar) - cd packages/opencode - bun --bun ./script/build-node.ts --skip-install - cd ../.. - - # Prepare desktop app cd packages/desktop # Copy prod icons - cp -R icons/prod resources/icons + mkdir -p resources/icons + cp -R icons/prod/* resources/icons/ + + export OPENCODE_CLI_DIST="$TMPDIR/desktop-cli" + cli_package=$(bun -e 'import { getCurrentCli } from "./scripts/utils.ts"; console.log(getCurrentCli().package.replace("@opencode/", ""))') + mkdir -p "$OPENCODE_CLI_DIST/$cli_package/bin" + cp ${lib.getExe opencode} "$OPENCODE_CLI_DIST/$cli_package/bin/opencode" + echo '{"version":"${opencode.version}"}' > "$OPENCODE_CLI_DIST/$cli_package/package.json" # Build with electron-vite - node_modules/.bin/electron-vite build + bun run build # Package with electron-builder (unpacked directory mode) cp -r "${electron.dist}" $HOME/.electron-dist chmod -R u+w $HOME/.electron-dist - node_modules/.bin/electron-builder --dir \ + npx electron-builder --dir \ --config=electron-builder.config.ts \ --config.electronDist="$HOME/.electron-dist" \ --config.electronVersion=${electron.version} \ - --config.asarUnpack='**/*.node' \ ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "--config.mac.identity=null"} cd ../.. @@ -150,7 +159,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { (lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' mkdir -p $out/Applications $out/bin mv packages/desktop/dist/mac-*/OpenCode.app "$out/Applications/OpenCode.app" - ln -s "$out/Applications/OpenCode.app/Contents/MacOS/OpenCode" $out/bin/opencode-desktop + makeWrapper "$out/Applications/OpenCode.app/Contents/MacOS/OpenCode" $out/bin/opencode-desktop '') (lib.optionalString stdenvNoCC.hostPlatform.isLinux '' mkdir -p $out/opt/opencode-desktop @@ -184,9 +193,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "AI coding agent desktop client"; homepage = "https://opencode.ai"; - inherit (opencode.meta) changelog platforms; - license = lib.licenses.mit; + inherit (opencode.meta) + changelog + license + maintainers + platforms + ; mainProgram = "opencode-desktop"; - maintainers = with lib.maintainers; [ xiaoxiangmoe ]; }; }) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index afb82c2215fd..86a7756e7e51 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -4,14 +4,15 @@ bun, darwin, fetchFromGitHub, - makeWrapper, + installShellFiles, + makeBinaryWrapper, models-dev, nodejs, nix-update-script, ripgrep, sysctl, - installShellFiles, versionCheckHook, + wayland, writableTmpDirAsHomeHook, }: let @@ -42,12 +43,11 @@ let export BUN_INSTALL_CACHE_DIR=$(mktemp -d) bun install \ --cpu="*" \ + --filter '!./' \ + --filter './packages/cli' \ + --filter './packages/desktop' \ + --filter './packages/app' \ --frozen-lockfile \ - --filter ./ \ - --filter ./packages/app \ - --filter ./packages/desktop \ - --filter ./packages/opencode \ - --filter ./packages/shared \ --ignore-scripts \ --no-progress \ --os="*" @@ -77,14 +77,14 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-RLHrfyBM6fMglKyEkdkW+Mmfzzr6q/U7R38goaQcIhA="; + outputHash = "sha256-rkmJPgpMiWErrK5GXdAz5OgD7FfkkH/fEyhn2QiPhdE="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; in stdenv.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.19.3"; + version = "2.0.32"; __structuredAttrs = true; strictDeps = true; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-NI994pBur/Lt3wSDamFxE4sb0fKq2+Kue/77i/8BTlo="; + hash = "sha256-KATNzF7z3PoUo30KC13Gm8uC6HA2a9bmJCZRfqY5D44="; }; postPatch = @@ -104,54 +104,50 @@ stdenv.mkDerivation (finalAttrs: { 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \ 'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}' '' - # Skip smoke test + # Avoid requiring prettier just to format the schema JSON + '' - substituteInPlace packages/opencode/script/build.ts \ - --replace-fail \ - 'if (item.os === process.platform && item.arch === process.arch && !item.abi)' \ - 'if (false)' - '' - # Bun 1.4.x regressed compiled executable code splitting. - + '' - substituteInPlace packages/opencode/script/build.ts \ - --replace-fail 'splitting: true,' 'splitting: false,' + substituteInPlace packages/cli/script/schema.ts \ + --replace-fail 'import { format } from "prettier"' 'const format = (s: string) => JSON.stringify(JSON.parse(s), null, 2)' ''; + node_modules = node_modules finalAttrs; + nativeBuildInputs = [ bun - nodejs installShellFiles - makeWrapper + makeBinaryWrapper + nodejs writableTmpDirAsHomeHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.sigtool + darwin.autoSignDarwinBinariesHook ]; + env = { + MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json"; + OPENCODE_DISABLE_MODELS_FETCH = true; + OPENCODE_VERSION = finalAttrs.version; + OPENCODE_CHANNEL = "latest"; + NODE_OPTIONS = "--max-old-space-size=4096"; + }; + configurePhase = '' runHook preConfigure - cp -R ${finalAttrs.passthru.node_modules}/. . + cp -R "$node_modules"/. . patchShebangs node_modules patchShebangs packages/*/node_modules runHook postConfigure ''; - env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json"; - env.OPENCODE_DISABLE_MODELS_FETCH = true; - env.OPENCODE_VERSION = finalAttrs.version; - env.OPENCODE_CHANNEL = "prod"; - buildPhase = '' runHook preBuild - cd ./packages/opencode + cd ./packages/cli bun --bun ./script/build.ts --single --skip-install - bun --bun ./script/schema.ts config.json tui.json - substituteInPlace config.json \ - --replace-fail "https://models.dev/model-schema.json" \ - "file://$out/share/model-schema.json" + bun --bun ./script/schema.ts cli.json + bun --bun ../schema/script/config-schema.ts config.json runHook postBuild ''; @@ -159,61 +155,34 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode - wrapProgram $out/bin/opencode \ - --suffix PATH : ${lib.makeBinPath [ ripgrep ]} \ - ${lib.optionalString stdenv.hostPlatform.isDarwin "--prefix PATH : ${lib.makeBinPath [ sysctl ]}"} \ - --set OPENCODE_DISABLE_AUTOUPDATE true \ - --run ' - # NOTE: Once this workaround is removed we should switch back to using - # makeBinaryWrapper here. + install -Dm755 dist/cli-*/bin/opencode $out/bin/opencode - # nixpkgs previously built OpenCode with OPENCODE_CHANNEL=stable. "stable" - # is no longer an upstream channel, so it caused OpenCode to store its database - # as opencode-stable.db. After switching to the upstream production channel, - # OpenCode would normally use opencode.db instead, making existing sessions - # appear to be lost. Keep using the legacy database until the user migrates - # it, unless they explicitly configured OPENCODE_DB or disabled this workaround. + wrapArgs=( + --set OPENCODE_DISABLE_AUTOUPDATE true + --suffix PATH : ${lib.makeBinPath [ ripgrep ]} + ) + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapArgs+=(--prefix PATH : ${lib.makeBinPath [ sysctl ]}) + ''} + ${lib.optionalString stdenv.hostPlatform.isLinux '' + wrapArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}) + ''} - data_home="''${XDG_DATA_HOME:-$HOME/.local/share}" - legacy="$data_home/opencode/opencode-stable.db" - canonical="$data_home/opencode/opencode.db" + wrapProgram $out/bin/opencode "''${wrapArgs[@]}" - if [ -z "''${OPENCODE_DB:-}" ] \ - && [ -z "''${NIXPKGS_OPENCODE_DISABLE_LEGACY_DB_WORKAROUND:-}" ] \ - && [ -e "$legacy" ] \ - && [ ! -e "$canonical" ]; then - export OPENCODE_DB="opencode-stable.db" - - # Only show migration guidance when stderr is attached to a terminal. - # Non-interactive uses such as `opencode web`, services, or scripts - # should continue starting normally with the legacy database selected. - if [ -t 2 ]; then - echo "Detected legacy nixpkgs OpenCode database at $legacy." >&2 - echo "Continuing to use it for compatibility." >&2 - echo "See https://github.com/NixOS/nixpkgs/pull/558549 for migration instructions." >&2 - echo "Set NIXPKGS_OPENCODE_DISABLE_LEGACY_DB_WORKAROUND=1 to disable this workaround." >&2 - fi - fi - ' - - install -Dm644 ${models-dev.jsonschema} $out/share/model-schema.json + install -Dm644 cli.json $out/share/cli.json install -Dm644 config.json $out/share/config.json - install -Dm644 tui.json $out/share/tui.json install -Dm644 ../web/public/theme.json $out/share/theme.json runHook postInstall ''; - postInstall = - lib.optionalString stdenv.hostPlatform.isDarwin '' - codesign --force --sign - $out/bin/.opencode-wrapped - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd opencode \ - --bash <($out/bin/opencode completion) \ - --zsh <(SHELL=/bin/zsh $out/bin/opencode completion) - ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd opencode \ + --bash <($out/bin/opencode --completions bash) \ + --zsh <($out/bin/opencode --completions zsh) \ + --fish <($out/bin/opencode --completions fish) + ''; dontStrip = true; @@ -230,11 +199,10 @@ stdenv.mkDerivation (finalAttrs: { passthru = { jsonschema = { + cli = "${finalAttrs.finalPackage}/share/cli.json"; config = "${finalAttrs.finalPackage}/share/config.json"; theme = "${finalAttrs.finalPackage}/share/theme.json"; - tui = "${finalAttrs.finalPackage}/share/tui.json"; }; - node_modules = node_modules finalAttrs; updateScript = nix-update-script { extraArgs = [ "--subpackage" @@ -252,6 +220,7 @@ stdenv.mkDerivation (finalAttrs: { delafthi DuskyElf graham33 + xiaoxiangmoe ]; sourceProvenance = with lib.sourceTypes; [ fromSource ]; platforms = [ diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix index 336478c57fc8..00d47b89a529 100644 --- a/pkgs/by-name/op/opencommit/package.nix +++ b/pkgs/by-name/op/opencommit/package.nix @@ -8,13 +8,13 @@ buildNpmPackage rec { pname = "opencommit"; - version = "3.3.10"; + version = "3.3.11"; src = fetchFromGitHub { owner = "di-sukharev"; repo = "opencommit"; rev = "v${version}"; - hash = "sha256-V4xPIQo4XDdrNGBxTwvdT9ZDvWNjSw3Llw4BuE1bxsA="; + hash = "sha256-wYwZlqItbjNjdScvPIx8/8ND3FTRsXwwu6e2WI19HcU="; postFetch = '' cd $out # Fix lockfile issues with bundled dependencies @@ -22,7 +22,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-9oJ4hE633IOVWXNKvRFsXaYh1zNAxbu0la92Gia/MBY="; + npmDepsHash = "sha256-ID7xdL6loDYsCYzQgLp5daTYsIEyJQGK1VoKIZjlxgU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/op/openfpgaloader/package.nix b/pkgs/by-name/op/openfpgaloader/package.nix index f1e576968184..394d89eba401 100644 --- a/pkgs/by-name/op/openfpgaloader/package.nix +++ b/pkgs/by-name/op/openfpgaloader/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openfpgaloader"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${finalAttrs.version}"; - hash = "sha256-VQM3swGAvuLnqKjjUEXJlQp1nGH9M1ydEKQUV/5xiwM="; + hash = "sha256-xz5acJJLRfWsJmcPL3R2PWwZgnBRUHibkGf1sHVUPn4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix index cdf70ae31af8..f1d04fb63daf 100644 --- a/pkgs/by-name/op/opengothic/package.nix +++ b/pkgs/by-name/op/opengothic/package.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: { vulkan-validation-layers ]; + # GCC 16 false positive in std::sort/std::vector::resize (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=124945), + # turned fatal by upstream's -Werror: https://github.com/Try/OpenGothic/issues/1010 + env.NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/op/openrefine/package.nix b/pkgs/by-name/op/openrefine/package.nix index 95aefee4eb93..cb29771172c1 100644 --- a/pkgs/by-name/op/openrefine/package.nix +++ b/pkgs/by-name/op/openrefine/package.nix @@ -4,20 +4,19 @@ fetchFromGitHub, buildNpmPackage, curl, - jdk17, + jdk, jq, makeWrapper, maven, }: let - jdk = jdk17; - version = "3.9.5"; + version = "3.10.1"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-548vOJf0mlk1AuuMjEXpsiVjft6UbJrUxh5mSca8Xbw="; + hash = "sha256-MyJlFTtdab9vpv135px/YskREXzQN5GA2ebAQGLnPu0="; }; npmPkg = buildNpmPackage { @@ -45,7 +44,7 @@ let }; in -maven.buildMavenPackage { +maven.buildMavenPackage rec { inherit src version; pname = "openrefine"; @@ -56,7 +55,15 @@ maven.buildMavenPackage { mvnJdk = jdk; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-95lyc+pimtSM6v8S58bLG16/TotbHGa4EhHDzfxwPAk="; + mvnHash = "sha256-FvHM9pZ50kMv6RlPvpTWqrNM81WBZxArYDqtjHpFQjg="; + mvnFetchExtraArgs.env = { + inherit (env) SOURCE_DATE_EPOCH; + }; + + env = { + # fix for "date 1980-01-01T00:00:00Z is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z" + SOURCE_DATE_EPOCH = "315532802"; # 1980-01-01T00:00:02Z + }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/opn2bankeditor/package.nix b/pkgs/by-name/op/opn2bankeditor/package.nix index a124a4e18867..f46935c8b709 100644 --- a/pkgs/by-name/op/opn2bankeditor/package.nix +++ b/pkgs/by-name/op/opn2bankeditor/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "opn2bankeditor"; - version = "1.3-unstable-2026-09-28"; + version = "1.3-unstable-2026-10-11"; src = fetchFromGitHub { owner = "Wohlstand"; repo = "opn2bankeditor"; - rev = "7775c5ff686d6bbd1e54fbb10c2128aa22404c27"; + rev = "0236eb898830dcbc5bdf375f83e3ec3ba9f1d088"; fetchSubmodules = true; - hash = "sha256-I+WgNvyFLJgHCdTDAzaW/7M6BRb/plhhrlpGA41a06E="; + hash = "sha256-2FuFgmi+zG1Ayu6Z/CuNvdIcU8PQOThN9pRgxRz/egY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix index d7a56e8c5b9a..56891fd1de24 100644 --- a/pkgs/by-name/or/oras/package.nix +++ b/pkgs/by-name/or/oras/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "oras"; - version = "1.3.4"; + version = "1.3.5"; # required for tests __darwinAllowLocalNetworking = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "oras-project"; repo = "oras"; tag = "v${finalAttrs.version}"; - hash = "sha256-/TW1g+4qDq445UPzao/jj4X5Ui9tYESDdICpCpt8RxM="; + hash = "sha256-2aey4mLcR7kqbuuoOWB9iO23BW5+3WcyAcadAR4YdPY="; }; - vendorHash = "sha256-PjKiOi5ZmGb8ZL+IqeUlTIPaJzUSoWugTaUN1aOOi+Q="; + vendorHash = "sha256-/6UP98RQQQbWLT6Q1BKu4QYlfktXbTICV64mBdbpp9k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix index 9c6d8c7600f0..fd3149cd54b0 100644 --- a/pkgs/by-name/or/orbstack/package.nix +++ b/pkgs/by-name/or/orbstack/package.nix @@ -7,7 +7,7 @@ }: let inherit (stdenvNoCC.hostPlatform) system; - version = "2.2.3-20963"; + version = "2.2.4-21120"; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "orbstack"; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${ lib.replaceString "-" "_" version }_arm64.dmg"; - hash = "sha256-fKd4aPOg19n1ez+YYVqtMMxZ0jzIS7/xP3iEbfC0k9Q="; + hash = "sha256-8MaY5wnJn7Puh/ksOgRFxrj1oQ1qDt1PTUYZJdGUuGo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/os/osquery/package.nix b/pkgs/by-name/os/osquery/package.nix index 2fbbcf44b880..80164fc7210c 100644 --- a/pkgs/by-name/os/osquery/package.nix +++ b/pkgs/by-name/os/osquery/package.nix @@ -1,5 +1,6 @@ { lib, + cacert, cmake, fetchFromGitHub, fetchzip, @@ -60,6 +61,8 @@ stdenvNoCC.mkDerivation rec { postPatch = '' substituteInPlace cmake/install_directives.cmake --replace "/control" "control" + substituteInPlace osquery/utils/config/default_paths.h \ + --replace-fail '"/opt/osquery/share/osquery/certs/"' "\"$out/share/osquery/certs/\"" ''; configurePhase = '' @@ -79,6 +82,7 @@ stdenvNoCC.mkDerivation rec { postInstall = '' rm -rf $out/control + ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt $out/share/osquery/certs/certs.pem remove-references-to -t ${toolchain} $out/bin/osqueryd ''; diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix index ca162e5c2aee..61f6a94533a1 100644 --- a/pkgs/by-name/ow/owncast/package.nix +++ b/pkgs/by-name/ow/owncast/package.nix @@ -9,7 +9,7 @@ makeBinaryWrapper, }: let - version = "0.2.5"; + version = "0.3.0"; in buildGoModule { pname = "owncast"; @@ -19,10 +19,10 @@ buildGoModule { owner = "owncast"; repo = "owncast"; tag = "v${version}"; - hash = "sha256-REgo9RC1izb9vJ6ae66Wti9yfP8DrCGetf6O4rX3DPY="; + hash = "sha256-Nfpd45pt4XKG8iAliqLIw3kzGDWs0qNeMTiEkctWoY0="; }; - vendorHash = "sha256-T4nr4lNUEq6grZ21qumaOjIDIDoJK7Ql8j8WbCy2u3g="; + vendorHash = "sha256-yl1jCJmTrW42/BpCsgxO3lTBat9HBMCXf0qnF0npT7Y="; subPackages = [ "." ]; diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 8ea24cf53f78..49af06551aec 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "peergos"; - version = "1.36.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "Peergos"; repo = "web-ui"; rev = "v${version}"; - hash = "sha256-085oEcVp/PF1G7YNZQZf7KXVACW3VngFLVQlkrXYYW4="; + hash = "sha256-F/Wqkna6T/L6PMwYlfGEovWUC35CyGAYK/NgG+8aNdw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pe/perplexity-mcp/package.nix b/pkgs/by-name/pe/perplexity-mcp/package.nix index ab59279fe9b4..79af4d3af9b8 100644 --- a/pkgs/by-name/pe/perplexity-mcp/package.nix +++ b/pkgs/by-name/pe/perplexity-mcp/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "perplexity-mcp"; - version = "0-unstable-2026-09-25"; + version = "0-unstable-2026-10-17"; src = fetchFromGitHub { owner = "perplexityai"; repo = "modelcontextprotocol"; - rev = "c58e4ad254608952606f09a40934ab6cca65bfad"; - hash = "sha256-j0DiITMVEw7e6Cw42kW5iPwIdRt//X2a3Dm2S3IXsbU="; + rev = "6ba09f856ab8da91c171e5d60f0db9803c1753f5"; + hash = "sha256-eb74r282SXlCOQCwF0N2dLaBBrNUaAfYOFH4jKWeL0g="; }; - npmDepsHash = "sha256-wKw19ha7hQrBTM0caEBZazV6qC+VXihV6i0nf8H/u+Q="; + npmDepsHash = "sha256-XHV+F/rQ4fkygfXmRQWPNU6jQ7EFA2lkETMU6GGxujs="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index 5146eb084131..4c0b16df678c 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.60"; + version = "0.1.62"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-agjK3Ng3haFoxcFy+H5v4dqYOQyF+uIm9K+S6wLJLeo="; + hash = "sha256-I8o1WuJzpojfCOPgwP7dHiRDvBJ7XNiGp0yk57po2Pc="; }; - cargoHash = "sha256-clq0rz7yi0XSXPzFjOGDcCwwndRq29KgtvUwpvEZoYA="; + cargoHash = "sha256-PM5E2Dp0N6NbtkQxtcrAR8xkjCcLhXKGrTEbcV2oOSs="; # Hardcoded paths for C compiler and linker postPatch = '' diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index 306d6c237634..057a6e00a2ca 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -18,20 +18,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "picgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "Molunerfinn"; repo = "PicGo"; tag = "v${finalAttrs.version}"; - hash = "sha256-wT9CfPchNbD2CzSVA9kZAYsstpc2mvgqAl305rmrUdo="; + hash = "sha256-jbmhufj7GwwpSrYiO54SSD3gz0sOjiKIMffSlspyyUY="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; inherit pnpm; pname = "picgo"; - hash = "sha256-a08WFoWcjo0mV1eu8oOQgbOiu/xfpoMxx3v17Eltsbk="; + hash = "sha256-x7q1vqWGzSLjy92lCyyGF4AGBlEu3FiINTLvakpVTH0="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 }; diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index f5b2f5acccaa..33810214d7c2 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.11.1"; + version = "3.12.1"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = "pmbootstrap"; tag = version; - hash = "sha256-8i2CUJL/FALS3B/q39OlpQbhrY4ar2qdn0gnbFuJjUk="; + hash = "sha256-1esDcRY9CbdvgvAyy/X4HI2F4GG0P/ddbhuNtC3etcM="; domain = "gitlab.postmarketos.org"; }; diff --git a/pkgs/by-name/pp/pphack/package.nix b/pkgs/by-name/pp/pphack/package.nix index 1ac13a3f44eb..2759153eb6f4 100644 --- a/pkgs/by-name/pp/pphack/package.nix +++ b/pkgs/by-name/pp/pphack/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "pphack"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "edoardottt"; repo = "pphack"; tag = "v${finalAttrs.version}"; - hash = "sha256-nxj9W+J2e9VT6mi1Q970ejYaP75cOx/YsGcqp7ju7QQ="; + hash = "sha256-IiCs8cmaQ9Y/JsDIUUMin6WH9+q7yAWYx0OXVwgh/XE="; }; - vendorHash = "sha256-2PDfq1j3z6fBp4qAHz5wy6qahr3APjto8oqeTXi01xI="; + vendorHash = "sha256-wqRpQxSwJ8a32Q72QxWYVPuPhQZP1upEPCZnbZy6Evo="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix index 6c5a0f00306d..2b51b2e2d64b 100644 --- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finallAttrs: { pname = "prometheus-borgmatic-exporter"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; __structuredAttrs = true; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finallAttrs: { owner = "maxim-mityutko"; repo = "borgmatic-exporter"; tag = "v${finallAttrs.version}"; - hash = "sha256-pa1f31jrfDzUB3+xexJUwG0byiFszj/zEt+dIwlEv0o="; + hash = "sha256-yeP/E3u0LUrqI5DmXbsai/kcrH6DS5A92J4tPNlvtUA="; }; pythonRelaxDeps = [ "prometheus-client" ]; diff --git a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix index 5c6e5b0f0c85..7288e7ed6c04 100644 --- a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix @@ -1,5 +1,7 @@ { lib, + stdenv, + autoAddDriverRunpath, buildGo127Module, fetchFromGitHub, }: @@ -8,7 +10,7 @@ buildGo127Module (finalAttrs: { pname = "prometheus-nvidia-gpu-exporter"; version = "1.15.1"; - env.CGO_ENABLED = 0; + env.CGO_ENABLED = if stdenv.hostPlatform.isLinux then "1" else "0"; src = fetchFromGitHub { owner = "utkuozdemir"; @@ -19,18 +21,23 @@ buildGo127Module (finalAttrs: { vendorHash = "sha256-9CPuhBDi8PnYyFYmW5XbutpRrA7ukPDiXCH4+94b9/o="; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoAddDriverRunpath; + + # go-nvml loads the driver at runtime and guards optional symbols before use. + hardeningDisable = lib.optional stdenv.hostPlatform.isLinux "bindnow"; + ldflags = [ "-s" "-w" "-X=github.com/prometheus/common/version.Version=${finalAttrs.version}" "-X=github.com/prometheus/common/version.Revision=${finalAttrs.src.rev}" "-X=github.com/prometheus/common/version.Branch=${finalAttrs.src.rev}" - "-X=github.com/prometheus/common/version.BuildUser=goreleaser" + "-X=github.com/prometheus/common/version.BuildUser=nixbld@nixpkgs" "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" ]; meta = { - description = "Nvidia GPU exporter for prometheus using nvidia-smi binary"; + description = "Nvidia GPU exporter for prometheus using nvidia-smi binary or NVML"; homepage = "https://github.com/utkuozdemir/nvidia_gpu_exporter"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ck3d ]; diff --git a/pkgs/by-name/pr/prometheus-snowflake-exporter/package.nix b/pkgs/by-name/pr/prometheus-snowflake-exporter/package.nix index de9045d2812e..45d90f5f22fc 100644 --- a/pkgs/by-name/pr/prometheus-snowflake-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-snowflake-exporter/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "prometheus-snowflake-exporter"; # No tagged release upstream (only a moving `latest` tag), so pin the commit and # use nixpkgs' unstable versioning. Bump the date + rev on update. - version = "latest-unstable-2026-10-07"; + version = "0-unstable-2026-10-07"; __structuredAttrs = true; @@ -35,7 +35,10 @@ buildGoModule (finalAttrs: { doInstallCheck = true; passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; + extraArgs = [ + "--version=branch" + "--version-regex=(\\d.*)" + ]; }; meta = { diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 7be273c01230..3bf7b048db12 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proto"; - version = "0.63.0"; + version = "0.63.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${finalAttrs.version}"; - hash = "sha256-abfnhxLvhji0a/PDLelNchCZUWuzEr9niY8Dd9FLgWY="; + hash = "sha256-Ou5v9gyrtUm/Xrt3scm8GC6AxjfZMCJHT0MdP7vL9sM="; }; - cargoHash = "sha256-rL0kTugLF7pefJ92EJlKHtnf8Sr+lNYwccsSiCEOaII="; + cargoHash = "sha256-N1YKoU7A9M4EQB29nccXU4Gbt4c/Cnyjvhj0wFcTnoY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 22fdbb4309fc..942352ebf44d 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { steamDisplayName = "GE-Proton"; pname = "proton-ge-bin"; - version = "GE-Proton11-7"; + version = "GE-Proton11-11"; inherit (finalAttrs.passthru.variants.${stdenvNoCC.hostPlatform.system}) src toolName; @@ -54,14 +54,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { toolName = "${finalAttrs.version}-x86_64"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-ftW0vE45v2JsbaYqo/So0ZFfvdtakHX0XEXEE4TdxLk="; + hash = "sha256-3tVgf83IkteFtVo/bHd4yG1xCtPeuW8FXaTrHOLjvKQ="; }; }; "aarch64-linux" = { toolName = "${finalAttrs.version}-aarch64"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}-aarch64.tar.gz"; - hash = "sha256-tyI95zCUQklRVA9YtarD+gBQouMVcJmv7BafNx5CQu8="; + hash = "sha256-ev2dO+vZAHmobs0OCLOODGerS3AfZIavWDr7Ftt3dUM="; }; }; }; diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 483c09a3210e..263573a4d9b4 100644 --- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -26,12 +26,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Use `gtest` from Nixpkgs to allow an offline build ./use-nix-googletest.patch - # fix: qt6_generate_deploy_app_script deprecated keyword - (fetchpatch2 { - url = "https://github.com/daniel-fahey/proton-bridge/commit/9b282369523ce2aabcf95369a2ed3867efb5a4ac.patch?full_index=1"; - relative = guiSourcePath; - hash = "sha256-CGBelsplAqLI+6GtDR+VELfVsLoHPN0324gfZ3obKpI="; - }) # fix: make libQt6WaylandEglClientHwIntegration conditional for Qt 6.10 (fetchpatch2 { url = "https://github.com/daniel-fahey/proton-bridge/commit/7823fe4904186253798fc633724988d43dd642e0.patch?full_index=1"; diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix index 2b8fc22c03da..ec8b47b6e3e2 100644 --- a/pkgs/by-name/pr/protonmail-bridge/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "protonmail-bridge"; - version = "3.25.0"; + version = "3.27.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${finalAttrs.version}"; - hash = "sha256-kKwsfFns5eKOEyljUB5DRozb0N6sabY4RGYt9MeePOo="; + hash = "sha256-hQuIaL4t/FaihXvKHrRJhZ90va4uOgAC0h9beQQVN4A="; }; - vendorHash = "sha256-Ox/Y6aVkL14YkN2kasT7DtBZkcUA1qcrsb0Yoa4Oizw="; + vendorHash = "sha256-mfDtRWyT5MAK7Z56RuA8BOyTdPv7h8ovkuATrtIl/Gs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/qi/qidi-studio/package.nix b/pkgs/by-name/qi/qidi-studio/package.nix index 161fb9cbeeb7..3eb76a751ffb 100644 --- a/pkgs/by-name/qi/qidi-studio/package.nix +++ b/pkgs/by-name/qi/qidi-studio/package.nix @@ -1,17 +1,18 @@ { appimageTools, fetchurl, + libsoup_3, webkitgtk_4_1, lib, makeWrapper, }: let pname = "qidi-studio"; - version = "2.07.02.60"; + version = "2.07.02.73"; src = fetchurl { url = "https://github.com/QIDITECH/QIDIStudio/releases/download/v${version}/QIDIStudio_v0${version}_Ubuntu24.AppImage"; - hash = "sha256-1H0rLI3V8W1I+KIbolQg/Wat9WsACMy1RIdyU0s8seg="; + hash = "sha256-sPOdXxGjzK4NNTwZzhfkgix+GL60wEMqaZRzfBiidvg="; }; appimageContents = appimageTools.extract { @@ -21,6 +22,7 @@ in appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ + libsoup_3 webkitgtk_4_1 ]; diff --git a/pkgs/by-name/ra/rambox/package.nix b/pkgs/by-name/ra/rambox/package.nix index caebad10f982..be178e008b2b 100644 --- a/pkgs/by-name/ra/rambox/package.nix +++ b/pkgs/by-name/ra/rambox/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "rambox"; - version = "2.6.3"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-YVLT+6o2Py796LBgN7ZgMiigbjBFGyTNaG/bSwJYAXk="; + hash = "sha256-u/g1WDA/Tgfprykh2dcHYB2cvABp6UBJVJKS19rAyF8="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix index 67467b8ede94..1e3f363de497 100644 --- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix +++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix @@ -2,13 +2,15 @@ lib, stdenv, fetchFromGitHub, + SDL2, cmake, directx-shader-compiler, ispc, ncurses, + nix-update-script, openal, rapidjson, - SDL2, + versionCheckHook, vulkan-headers, vulkan-loader, zlib, @@ -18,9 +20,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "rbdoom-3-bfg"; version = "1.6.0"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "RobertBeckebans"; - repo = "rbdoom-3-bfg"; + repo = "RBDOOM-3-BFG"; tag = "v${finalAttrs.version}"; hash = "sha256-9BZEFO+e5IG6hv9+QI9OJecQ84rLTWBDz4k0GU6SeDE="; fetchSubmodules = true; @@ -48,31 +53,41 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeDir = "../neo"; + cmakeFlags = [ - "-DFFMPEG=OFF" - "-DBINKDEC=ON" - "-DUSE_SYSTEM_RAPIDJSON=ON" - "-DUSE_SYSTEM_ZLIB=ON" + (lib.cmakeBool "FFMPEG" false) + (lib.cmakeBool "BINKDEC" true) + (lib.cmakeBool "USE_SYSTEM_RAPIDJSON" true) + (lib.cmakeBool "USE_SYSTEM_ZLIB" true) ]; - # it caused build failure - hardeningDisable = [ "fortify3" ]; + buildFlags = [ "RBDoom3BFG" ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - install RBDoom3BFG $out/bin/RBDoom3BFG + install -Dm755 RBDoom3BFG -t $out/bin runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; + meta = { - homepage = "https://github.com/RobertBeckebans/RBDOOM-3-BFG"; description = "Doom 3 BFG Edition with modern engine features"; - mainProgram = "RBDoom3BFG"; + homepage = "https://github.com/RobertBeckebans/RBDOOM-3-BFG"; + changelog = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/blob/${finalAttrs.src.tag}/RELEASE-NOTES.md"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ Zaechus ]; platforms = lib.platforms.unix; + mainProgram = "RBDoom3BFG"; }; }) diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index d56767ef1d84..0e6e02fb8bd0 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -7,7 +7,7 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "rclip"; - version = "4.0.1"; + version = "4.0.4"; pyproject = true; __structuredAttrs = true; @@ -15,9 +15,13 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "yurijmikhalevich"; repo = "rclip"; tag = "v${finalAttrs.version}"; - hash = "sha256-JP3c/OZWXqOi6Y2shBes7A2kh5jcaRS6YSRVkdzMUYY="; + hash = "sha256-Z/4E9Li41nJnjtLKI3PO8iZj1y+lQ4dtyBuYiQzA/js="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace-fail "uv_build>=0.11.12,<0.12.0" "uv-build" + ''; + build-system = with python3Packages; [ uv-build ]; diff --git a/pkgs/by-name/re/recyclarr/deps.json b/pkgs/by-name/re/recyclarr/deps.json index ecc8afb3859d..83d5aeda6898 100644 --- a/pkgs/by-name/re/recyclarr/deps.json +++ b/pkgs/by-name/re/recyclarr/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Autofac", - "version": "9.3.2", - "hash": "sha256-EvXT6UzoD7s1fFqtfnNJKsqJDZSqR7GWI4n1aveWvCc=" + "version": "9.3.4", + "hash": "sha256-6DG7qogNFqnB9+BN9CgBdyHpV9oQoxpRLHgT2zCAwn8=" }, { "pname": "Autofac.Extensions.DependencyInjection", @@ -36,28 +36,28 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "10.0.11", - "hash": "sha256-hhXsutV4pzMdy8CCG12Pqh4jV/emiQsuWUl1WpClZOs=" + "version": "10.0.12", + "hash": "sha256-0G3p03buPSiw/sZFs5aZOj63sE+8HvcJFlSgjZ4ecss=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "10.0.11", - "hash": "sha256-gx/afsc4v9zRAUPsiySt6BcZVSMc9QJE4vqJMQpiOPk=" + "version": "10.0.12", + "hash": "sha256-9zl98oXLKjTIimkpcQwLjthJEzguKucI9zQGC8CRzlE=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "10.0.11", - "hash": "sha256-qcSKa+uJdahahMucYIIUO1pg/zrlsHlK1kg/lWHP/qo=" + "version": "10.0.12", + "hash": "sha256-/iZ7EyG34YMYPtMEIHG8r1460kSoPh0n+wVQcTZ+ukg=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "10.0.11", - "hash": "sha256-xuwGge8n7OjS+uS85QiR0LdDORIJ1gm6w3hMXtvuWj8=" + "version": "10.0.12", + "hash": "sha256-uXnGMBkfbEi1SMrYZtgiSg7Q5ue+CrqH9FS1dZe2N3k=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.11", - "hash": "sha256-5PZeQgWmVo8K+7GgKEVAd6xcn+3XVNVzT4cg/DBtjqY=" + "version": "10.0.12", + "hash": "sha256-RmT6sKxLVriTUzP1nunngByKuW3nxXyztuuBkqWmHFU=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -66,43 +66,43 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "10.0.11", - "hash": "sha256-cWitHAjZLDzvSzli/C9+BfD7PDSL4c2HzwVdvj/t6PU=" + "version": "10.0.12", + "hash": "sha256-btuSRqd5BqC7kbtjF1xPcM33tJMo086q5ubEx7rPieo=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "10.0.11", - "hash": "sha256-JSjnETAdUU/8ymeWP1OKoXu5sS5COEqwQR4OpiUnavI=" + "version": "10.0.12", + "hash": "sha256-Xs4eZg4/cHyy2L2hkDKUBkNLX6q0XV7m6o5RyTx0TsA=" }, { "pname": "Microsoft.Extensions.Http", - "version": "10.0.11", - "hash": "sha256-eC2HIHZ1JcnO6caUoVENxwjF5eTdk2LhdgCydHSQ0Hs=" + "version": "10.0.12", + "hash": "sha256-eriSK4yWlA8HC0V4J4+qQGwqceeDDR//aaXSt8VtCek=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "10.0.11", - "hash": "sha256-K8MjBeYsxUdOyY5+QryOojGfc4AkE/FHqrx5MxSuZhU=" + "version": "10.0.12", + "hash": "sha256-U5kZ3JCVbSc6xn0k6Zrn2SqJOEi279NowdDmHlvJVak=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "10.0.11", - "hash": "sha256-HdUH2q55lbAwMswMdQjX01DrgaxegtbyMo4VYezhB1o=" + "version": "10.0.12", + "hash": "sha256-NOqqYK+2HtPYbi4maergxpDQ4jfopwZrpb20WjhnCec=" }, { "pname": "Microsoft.Extensions.Options", - "version": "10.0.11", - "hash": "sha256-djBqHYNsYC427UNbkyBo9x9lAtX2Ls460ixdRrSdMa8=" + "version": "10.0.12", + "hash": "sha256-7skJFvEdhOpB6UK1nL+C8eMnJth+mb5+4rJCTjFXD/c=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "10.0.11", - "hash": "sha256-sx6aAZ3i7yZVIzqVcs+W8zT1V/nEua/ZwfnHRJX2Nxo=" + "version": "10.0.12", + "hash": "sha256-ccu5s7F57lHVQWs7hgLXEJvfxhrnQcDDkD/klZ4u1+E=" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "10.0.11", - "hash": "sha256-4z+bHf8r4cFzX2VwW3HdZ44yBjZpfhYzlgzkdpbS7o0=" + "version": "10.0.12", + "hash": "sha256-l+50Kv4MsGNFWCYvklzBErWILQnbjRaVdeVZAx2mOSI=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -116,18 +116,18 @@ }, { "pname": "ReactiveUI.Disposables", - "version": "7.1.1", - "hash": "sha256-B3gsxbOzBMtknxfelPhzJBZegwze8UPAcX9TbnxwcS8=" + "version": "8.2.0", + "hash": "sha256-olmyT323D8ofetv+hEQsbWpZFR9cyYxD4QsCnqNmtmI=" }, { "pname": "ReactiveUI.Primitives", - "version": "7.1.1", - "hash": "sha256-2JHADwbOzCJJTGxm4uCdPxM/Rljy9+rfHyiNB3oVQEE=" + "version": "8.2.0", + "hash": "sha256-pUsxPdceRbO6kme3SUQ+uyIsEsDg+QPFhtJQcU67U+s=" }, { "pname": "ReactiveUI.Primitives.Core", - "version": "7.1.1", - "hash": "sha256-hjqQbFoDWk/2petfTFC5e5CE/eVQh1anQJpaIVypFF0=" + "version": "8.2.0", + "hash": "sha256-rT0VOhio4/as2z0hmbnbdno/oTrPLsyAOaOWxI90eQ0=" }, { "pname": "ReferenceTrimmer", @@ -136,18 +136,18 @@ }, { "pname": "Refit", - "version": "15.2.0", - "hash": "sha256-WqldGF055IRY14g2/PGcpVI+2vvLAVS+lnUdVL/eUrs=" + "version": "16.3.0", + "hash": "sha256-uCSkU7K38PQQxTOEnK6kDj7b8MtC37NKpK2WrNN4zb8=" }, { "pname": "Refit.HttpClientFactory", - "version": "15.2.0", - "hash": "sha256-zRt4RMLkcQ71So2Ty0J+/Fru5owMlaa9mb6axnjyuGk=" + "version": "16.3.0", + "hash": "sha256-2iXEElQsYwTu92dRXUhzYBGbhMg09x/9TC2cuhmHwZ8=" }, { "pname": "Refitter.MSBuild", - "version": "2.1.3", - "hash": "sha256-XSoDP1wR6ZY7KCAA3OAHyQr/ggopJXB2h/HjM/1QrK8=" + "version": "2.3.0", + "hash": "sha256-23meoRvFIDl5C61y+YNjTJVLQ0AbLjrb2YSMEvcH0Tw=" }, { "pname": "Riok.Mapperly", @@ -231,8 +231,8 @@ }, { "pname": "TestableIO.System.IO.Abstractions", - "version": "22.2.0", - "hash": "sha256-kyoEyF+j/vws2STfSMzHKrqzZJu284lszy0PufOdFBY=" + "version": "22.3.0", + "hash": "sha256-BptZ+v7pxFoC7xlStmBwpuF7+mtgX4oNY2tT2jtltOs=" }, { "pname": "TestableIO.System.IO.Abstractions.Extensions", @@ -241,13 +241,13 @@ }, { "pname": "TestableIO.System.IO.Abstractions.Wrappers", - "version": "22.2.0", - "hash": "sha256-YUzACGTLDZ8R5S8JoXFYXRtmytFxXE2jFuDHJw5feXw=" + "version": "22.3.0", + "hash": "sha256-EKzGFK1k1OT6h7RtcIW4kaKC0KbAWSzk0LxzoRoLems=" }, { "pname": "Testably.Abstractions.FileSystem.Interface", - "version": "10.3.0", - "hash": "sha256-uSzMsiXAKZK6NbwXa59zIbCkfI9qwuWsrm5yoLrheKU=" + "version": "10.4.0", + "hash": "sha256-J5HDHSte+wKZIrVFfP71rjLsN8+jWJCmShX/S2kMiPI=" }, { "pname": "YamlDotNet", diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 7f3837f9347e..b5495fdbac88 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -9,13 +9,13 @@ }: buildDotnetModule (finalAttrs: { pname = "recyclarr"; - version = "8.7.2"; + version = "8.7.3"; src = fetchFromGitHub { owner = "recyclarr"; repo = "recyclarr"; tag = "v${finalAttrs.version}"; - hash = "sha256-YjUKxmUNIUbxRZlqC/J0DJ56wPHnvQYwF9EfoYg3rR4="; + hash = "sha256-Rz74HG3ZykYtUoBodxKofpPtGaiKHnO+NoSf+wQmtk8="; }; projectFile = "src/Recyclarr.Cli/Recyclarr.Cli.csproj"; diff --git a/pkgs/by-name/ri/rimsort/package.nix b/pkgs/by-name/ri/rimsort/package.nix index 573e02a9f6c7..fb2bddff62cb 100644 --- a/pkgs/by-name/ri/rimsort/package.nix +++ b/pkgs/by-name/ri/rimsort/package.nix @@ -4,34 +4,27 @@ python3Packages, qt6, fetchFromGitHub, - fetchzip, makeBinaryWrapper, nix-update-script, makeDesktopItem, copyDesktopItems, - replaceVars, todds, steam, }: let pname = "rimsort"; - version = "1.14.1"; + version = "1.17.1"; src = fetchFromGitHub { owner = "RimSort"; repo = "RimSort"; tag = "v${version}"; - hash = "sha256-zS5RbJRk7tk9/3EI+Q2FfAOMOMuL8fYp/IPjTy882Mk="; + hash = "sha256-GtXzpJlA4x4fpEq+Ku6ObmzTUNWk7cVQP93P4NkdknU="; fetchSubmodules = true; }; - steamworksSrc = fetchzip { - url = "https://web.archive.org/web/20250527013243/https://partner.steamgames.com/downloads/steamworks_sdk_162.zip"; # Steam sometimes requires auth to download. - hash = "sha256-yDA92nGj3AKTNI4vnoLaa+7mDqupQv0E4YKRRUWqyZw="; - }; - steamfiles = python3Packages.buildPythonPackage { pname = "steamfiles"; inherit version; @@ -62,18 +55,12 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${finalAttrs.src} source chmod -R 755 source - cp ${steamworksSrc}/redistributable_bin/linux64/libsteam_api.so source/ runHook postUnpack ''; sourceRoot = "source"; - patches = [ - (replaceVars ./todds-path.patch { inherit todds; }) - (replaceVars ./steam-run.patch { inherit steam-run; }) - ]; - nativeBuildInputs = [ makeBinaryWrapper copyDesktopItems @@ -143,13 +130,6 @@ stdenv.mkDerivation (finalAttrs: { "tests/utils/test_privatebin.py" ]; - disabledTests = [ - # Works with hard-coded executable paths. - "test_execute_calls_runner_when_binary_exists" - "test_execute_shows_error_when_binary_missing" - "test_download_mods_sets_console_log_path" - ]; - pytestFlags = [ "--doctest-modules" ]; desktopItems = [ @@ -172,6 +152,14 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin + # AppInfo reads the displayed version from version.xml + # (the release workflow writes it for the other builds) + cat > $out/lib/rimsort/version.xml < + ${version} + + EOF + install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/rimsort.png runHook postInstall @@ -185,6 +173,8 @@ stdenv.mkDerivation (finalAttrs: { --chdir $out/lib/rimsort \ --prefix PYTHONPATH : "$PYTHONPATH" \ --set RIMSORT_DISABLE_UPDATER 1 \ + --set RIMSORT_LAUNCH_PREFIX ${steam-run}/bin/steam-run \ + --set RIMSORT_TODDS_PATH ${todds}/bin/todds \ "''${qtWrapperArgs[@]}" ''; @@ -201,14 +191,14 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/RimSort/RimSort"; license = with lib.licenses; [ gpl3Only - # For libsteam_api.so + # For vendored libs/libsteam_api.so valveSDK ]; maintainers = with lib.maintainers; [ adda + twstagg ]; mainProgram = "rimsort"; - # steamworksSrc is x86_64-linux only platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/ri/rimsort/steam-run.patch b/pkgs/by-name/ri/rimsort/steam-run.patch deleted file mode 100644 index 0aa287d8ac82..000000000000 --- a/pkgs/by-name/ri/rimsort/steam-run.patch +++ /dev/null @@ -1,99 +0,0 @@ -From fa9420a311df176c887c6eb667068c16ffcd1eb7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Chocholat=C3=BD?= -Date: Fri, 5 Jun 2026 10:02:54 +0200 -Subject: [PATCH] fix(steam-run): Run the game and SteamCMD through Nix-resolved steam-run - ---- - app/utils/generic.py | 3 +++ - app/utils/steam/steamcmd/wrapper.py | 4 ++-- - app/windows/runner_panel.py | 20 +++++++++++++++----- - 3 files changed, 20 insertions(+), 7 deletions(-) - -diff --git a/app/utils/generic.py b/app/utils/generic.py -index 379d7da..1bba282 100644 ---- a/app/utils/generic.py -+++ b/app/utils/generic.py -@@ -346,6 +346,9 @@ def launch_game_process(game_install_path: Path, run_args: str = "") -> None: - f"Launching the game with subprocess.Popen(): `{executable_path}` " - f"with env_vars: {list(env_vars.keys())}, wrappers: {wrapper_commands}, args: {game_args}" - ) -+ if sys.platform == "linux": -+ game_args = [executable_path] + game_args -+ executable_path = "@steam-run@/bin/steam-run" - pid, popen_args = launch_process( - executable_path, - game_args, -diff --git a/app/utils/steam/steamcmd/wrapper.py b/app/utils/steam/steamcmd/wrapper.py -index 83d9b26..8039efa 100644 ---- a/app/utils/steam/steamcmd/wrapper.py -+++ b/app/utils/steam/steamcmd/wrapper.py -@@ -404,8 +404,8 @@ class SteamcmdInterface: - runner.message(f"Compiled & using script: {script_path}") - runner._steamcmd_console_log_path = str(self.console_log_path) - runner.execute( -- self.steamcmd, -- [f'+runscript "{script_path}"'], -+ "@steam-run@/bin/steam-run", -+ [self.steamcmd, f'+runscript "{script_path}"'], - total, - environment=runner._steamcmd_environment, - ) -diff --git a/app/windows/runner_panel.py b/app/windows/runner_panel.py -index 6a40435..6cf2ee0 100644 ---- a/app/windows/runner_panel.py -+++ b/app/windows/runner_panel.py -@@ -338,6 +338,10 @@ class RunnerPanel(QWidget): - self.process_last_args = args - self.process_last_environment = dict(environment) if environment else None - -+ # SteamCMD is launched through the Nix steam-run FHS wrapper, so the -+ # SteamCMD executable is the first argument instead of the program. -+ is_steamcmd = "steamcmd" in command or any("steamcmd" in arg for arg in args) -+ - # Show control buttons - self.restart_process_button.show() - self.kill_process_button.show() -@@ -356,7 +360,7 @@ class RunnerPanel(QWidget): - if progress_bar is not None: - self.progress_bar.show() - self.progress_bar.setValue(0) -- if progress_bar > 0 and "steamcmd" in command: -+ if progress_bar > 0 and is_steamcmd: - self.progress_bar.setRange(0, progress_bar) - self.progress_bar.setFormat("%v/%m") - -@@ -364,7 +368,7 @@ class RunnerPanel(QWidget): - if not self.todds_dry_run_support: - self.message(f"\nExecuting command:\n{command} {' '.join(args)}\n\n") - -- if "steamcmd" in command and self._steamcmd_console_log_path: -+ if is_steamcmd and self._steamcmd_console_log_path: - self._start_steamcmd_log_tail() - - # Start the process -@@ -526,7 +530,11 @@ class RunnerPanel(QWidget): - return False - if self.process.state() != QProcess.ProcessState.Running: - return False -- return program_name in self.process.program() -+ if program_name in self.process.program(): -+ return True -+ # The program may be the Nix steam-run FHS wrapper, which receives the -+ # real executable as its first argument. -+ return any(program_name in argument for argument in self.process.arguments()) - - def _handle_steamcmd_output(self, line: str) -> bool: - """ -@@ -682,8 +690,10 @@ class RunnerPanel(QWidget): - - # Re-wire the finished signal before starting the new process. - self.process = QProcess(self) -- self.process.setProgram(self._steamcmd_executable) -- self.process.setArguments([f'+runscript "{script_path}"']) -+ self.process.setProgram("@steam-run@/bin/steam-run") -+ self.process.setArguments( -+ [self._steamcmd_executable, f'+runscript "{script_path}"'] -+ ) - self._apply_process_environment(self.process, self._steamcmd_environment) - self.process.setProcessChannelMode(QProcess.ProcessChannelMode.MergedChannels) - self.process.readyReadStandardError.connect(self.handle_output) diff --git a/pkgs/by-name/ri/rimsort/todds-path.patch b/pkgs/by-name/ri/rimsort/todds-path.patch deleted file mode 100644 index 0174a2954b2e..000000000000 --- a/pkgs/by-name/ri/rimsort/todds-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/app/utils/todds/wrapper.py b/app/utils/todds/wrapper.py -index a239fe0..3375b70 100644 ---- a/app/utils/todds/wrapper.py -+++ b/app/utils/todds/wrapper.py -@@ -66,11 +66,7 @@ class ToddsInterface: - :param todds_arguments: list of todds args to be passed to the todds executable - """ - -- if self.system == "Windows": -- todds_executable = "todds.exe" -- else: -- todds_executable = "todds" -- todds_exe_path = str(AppInfo().application_folder / "todds" / todds_executable) -+ todds_exe_path = "@todds@/bin/todds" - logger.info("Checking for todds...") - if os.path.exists(todds_exe_path): - logger.debug(f"Found todds executable at: {todds_exe_path}") diff --git a/pkgs/by-name/ri/ripser/package.nix b/pkgs/by-name/ri/ripser/package.nix index 0246723e5882..67ebcc82a29f 100644 --- a/pkgs/by-name/ri/ripser/package.nix +++ b/pkgs/by-name/ri/ripser/package.nix @@ -55,7 +55,17 @@ stdenv.mkDerivation { description = "Lean C++ code for the computation of Vietoris–Rips persistence barcodes"; mainProgram = "ripser"; homepage = "https://github.com/Ripser/ripser"; - license = lib.licenses.lgpl3; + license = + with lib.licenses; + AND [ + mit + { + fullName = "Ripser extra clause"; + url = "https://github.com/Ripser/ripser/blob/v${version}/CONTRIBUTING.txt"; + licenseType = "simple"; + free = true; + } + ]; maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index cd7fde4df78b..98cf78e0907c 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rojo"; - version = "7.7.0"; + version = "7.7.1"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; tag = "v${finalAttrs.version}"; - hash = "sha256-2atNAiv51MNpxXdwvKSvtO1CGvQUOdUUOZszjAm3zi8="; + hash = "sha256-wN+pi/My1aEfTKGhEPJljsRC/gzVkUSiA9aLWZslz1Q="; fetchSubmodules = true; }; - cargoHash = "sha256-1xTvW3Ra6erYpjxgfp2m8qVMz6u99WCDv2VE/Xh2mFc="; + cargoHash = "sha256-zp30mMv5n43iPccIx+oSP/T/za3mLP4+Nr4ZyQQnxbk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ro/roxctl/package.nix b/pkgs/by-name/ro/roxctl/package.nix index 50c8052af6b0..c7afdf12b8f0 100644 --- a/pkgs/by-name/ro/roxctl/package.nix +++ b/pkgs/by-name/ro/roxctl/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "roxctl"; - version = "4.11.5"; + version = "4.11.6"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = finalAttrs.version; - sha256 = "sha256-lkZNiYJ5yclUCAubpxCPttwERellRtOJDABupdTGg8g="; + sha256 = "sha256-7umOoZTAA7bRX56WBe4FkB+g4IXYyaqpAo6m+koVnYA="; }; - vendorHash = "sha256-aT/EMCmWB1aInXukLmeLNHBBHUuFEGQ/OYBZhc4g9Js="; + vendorHash = "sha256-hZT4kI6AteiLgEJhPKX93OyaJcS9aBY1hcNsXlHNZwo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix index 05d08dd9b9a8..6658ddb4e0c4 100644 --- a/pkgs/by-name/rs/rssguard/package.nix +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -2,62 +2,131 @@ lib, stdenv, fetchFromGitHub, + buildGoModule, cmake, + go, + icu, + mpv-unwrapped, + nix-update-script, qt6, - kdePackages, + versionCheckHook, wrapGAppsHook4, + writableTmpDirAsHomeHook, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "rssguard"; - version = "4.8.6"; + version = "5.2.5"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "martinrotter"; repo = "rssguard"; tag = finalAttrs.version; - sha256 = "sha256-2gwzk23t9WRHrXlASzba9HQRijHjH0nfWsBjMcqgq68="; + hash = "sha256-Q1TRIBvFWrc2+TdlmsRCWkMM916VGbkXIWnQ6QREn/o="; + fetchSubmodules = true; }; - buildInputs = [ - qt6.qtbase - qt6.qtmultimedia - qt6.qtwebengine - qt6.qttools - qt6.qt5compat - kdePackages.mpvqt - ]; + # Go modules for rssguard-article-extractor, which is built by CMake + postPatch = '' + cp -r ${finalAttrs.passthru.goModules} resources/scripts/standalone/article-extractor/vendor + ''; + nativeBuildInputs = [ cmake - wrapGAppsHook4 + go qt6.wrapQtAppsHook + wrapGAppsHook4 + writableTmpDirAsHomeHook ]; - # This string must have quotes around Release or the package will break! - # See https://github.com/NixOS/nixpkgs/issues/563621 - cmakeBuildType = "\"Release\""; + buildInputs = [ + icu + qt6.qt5compat + qt6.qtbase + qt6.qtimageformats + qt6.qtmultimedia + qt6.qttools + qt6.qtwebengine + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + mpv-unwrapped + ]; + + cmakeFlags = [ + (lib.cmakeBool "IS_DEVBUILD" false) + (lib.cmakeBool "ENABLE_ICU" true) + (lib.cmakeBool "ENABLE_COMPRESSED_SITEMAP" true) + (lib.cmakeBool "ENABLE_MEDIAPLAYER_LIBMPV" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "ENABLE_MEDIAPLAYER_QTMULTIMEDIA" stdenv.hostPlatform.isDarwin) + (lib.cmakeBool "ENABLE_TESTING" true) + ] + ++ + # Plugins are looked up in /../${CMAKE_INSTALL_LIBDIR}/rssguard, so it must be relative + lib.optionals stdenv.hostPlatform.isLinux [ + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + ] + # On macOS, everything is installed into Contents/MacOS relative to the prefix + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/rssguard.app") + (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "${placeholder "out"}/Applications/rssguard.app/Contents/MacOS") + ]; + + env.GOFLAGS = "-mod=vendor -trimpath"; dontWrapGApps = true; + # The hook would also wrap the dylibs installed next to the executable in the bundle + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapQtApp $out/Applications/rssguard.app/Contents/MacOS/rssguard + mkdir -p $out/bin + ln -s $out/Applications/rssguard.app/Contents/MacOS/{rssguard,rssguard-article-extractor} $out/bin/ + ''; + + doCheck = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckKeepEnvironment = "HOME QT_QPA_PLATFORM"; + preVersionCheck = '' + export QT_QPA_PLATFORM=offscreen + ''; + + passthru = { + goModules = + (buildGoModule { + pname = "rssguard-article-extractor"; + inherit (finalAttrs) version src; + modRoot = "resources/scripts/standalone/article-extractor"; + vendorHash = "sha256-SUwNdHh9XAgX/2Jm0LK8kNjNZNu/1kRuk7/ew2WI3rg="; + }).goModules; + updateScript = nix-update-script { }; + }; + meta = { description = "Simple RSS/Atom feed reader with online synchronization"; - mainProgram = "rssguard"; longDescription = '' RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator developed using Qt framework and with online feed synchronization support for ownCloud/Nextcloud. ''; homepage = "https://github.com/martinrotter/rssguard"; - changelog = "https://github.com/martinrotter/rssguard/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/martinrotter/rssguard/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jluttine tebriel ]; + mainProgram = "rssguard"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch b/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch deleted file mode 100644 index 1e2fb6c90605..000000000000 --- a/pkgs/by-name/rs/rsshub/0002-fix-network-call.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: RSSHub Nix packagers -Date: Mon, 10 Mar 2026 00:00:00 +0000 -Subject: [PATCH] support BUILD_ROUTES_MODE for offline builds - -Add BUILD_ROUTES_MODE environment variable support to lib/registry.ts -so that route metadata can be built using directoryImport without -executing module-level code that would trigger network requests. -This is required for building in the Nix sandbox (no network access). - ---- - lib/registry.ts | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/registry.ts b/lib/registry.ts ---- a/lib/registry.ts -+++ b/lib/registry.ts -@@ -56,7 +56,12 @@ - - let namespaces: NamespacesType = {}; - --if (config.isPackage) { -+if (process.env.BUILD_ROUTES_MODE) { -+ modules = directoryImport({ -+ targetDirectoryPath: path.join(__dirname, './routes'), -+ importPattern: /\.tsx?$/, -+ }) as typeof modules; -+} else if (config.isPackage) { - namespaces = (await import('../assets/build/routes.js')).default; - } else { - switch (process.env.NODE_ENV || process.env.VERCEL_ENV) { diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index ff48489500e9..bf69b1c561ea 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -12,26 +12,25 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2026-07-05"; + version = "2026.10.15-8431.b4a7c36"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "719cc1994b10bc96fcd17df6cf2046023d0cd9ba"; - hash = "sha256-Db1nh42S2zrPheUT9nlHMRt7/qmKeMpHZ415rwWnedI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7+OFv2KZKKtnTVkGRc3Oq7F6Lt9iLg4cM2QcTIn4onk="; }; patches = [ (replaceVars ./0001-fix-git-hash.patch { - GIT_HASH = finalAttrs.src.rev; + GIT_HASH = lib.last (lib.splitString "." finalAttrs.version); }) - ./0002-fix-network-call.patch ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-ykKWrU9NCOXBuFb+I3TG5XFO81W4K9Y7fZk/KjB+5JI="; + hash = "sha256-n5ejyhMyJ9814d+bPel4RDZvpbNO8NE2qh3qKEIJCmY="; pnpm = pnpm_10; }; @@ -44,10 +43,6 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - # First build route metadata using directoryImport (avoids executing - # module-level code that would trigger network requests) - BUILD_ROUTES_MODE=1 pnpm run build:routes - # Then build the application pnpm run build runHook postBuild ''; @@ -67,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "$out/lib/rsshub/dist/index.mjs" ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; }; + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; meta = { description = "RSS feed generator"; @@ -81,7 +76,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://docs.rsshub.app"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ xinyangli ]; + maintainers = with lib.maintainers; [ + xinyangli + davinci42 + ]; mainProgram = "rsshub"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index 61f0bdf8a4f4..364bdad1cd81 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "runpodctl"; - version = "2.15.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "runpod"; repo = "runpodctl"; rev = "v${finalAttrs.version}"; - hash = "sha256-Di9jIFc3MMQytGqQdR6tUx5Q9aukSErp5AKK+0mgBoM="; + hash = "sha256-YXtdlX+HbPEp0LuZqYHxns6WpPydrS/Qsf7SjZ9kSqo="; }; - vendorHash = "sha256-9z8VB/vZmJ5IdROwJPQPKzBsi03Va8NC1TNi36FEMsI="; + vendorHash = "sha256-Csrq2LotNk+kdcz3wjWL2aMIY1PRdLUKrtAChHFk09E="; postInstall = '' rm $out/bin/docs # remove the docs binary diff --git a/pkgs/by-name/ru/rustdesk-flutter/git-hashes.json b/pkgs/by-name/ru/rustdesk-flutter/git-hashes.json index 4fcdba63036a..4f4e1f4c7827 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/git-hashes.json +++ b/pkgs/by-name/ru/rustdesk-flutter/git-hashes.json @@ -1,10 +1,11 @@ { "dash_chat_2": "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=", - "desktop_multi_window": "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=", + "desktop_multi_window": "sha256-t+8AqEc8UWgj3i/iwP34yxm3vqg+34/Z0gx94qjqHS8=", "dynamic_layouts": "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=", + "flutter_custom_cursor": "sha256-gCX3LcTo8NgnvpUcxnD/QoLGnK2XLHxl+VzT4t6mGiw=", "flutter_gpu_texture_renderer": "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=", "texture_rgba_renderer": "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=", "uni_links": "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=", - "window_manager": "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=", - "window_size": "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=" + "window_manager": "sha256-IxxijadcRC+uElywhf1sDjqiqWkvWBInhG/8RrkH5m8=", + "window_size": "sha256-RzusJYTgVBEjusiGlCskGjURM/A0UrQB50l4ir9ZDY8=" } diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index aee9238f57ae..4b72996302c1 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -36,7 +36,7 @@ let flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.4/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.5.0/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -66,14 +66,14 @@ let in flutter329.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; tag = version; fetchSubmodules = true; - hash = "sha256-AnwdIO4TveC48uMioBCvH60xun24ckK420ONSEB9lQI="; + hash = "sha256-1xa7X+swBIb8Lz3c6m8SeNZAiJWNCUpw+UbdSsMkeSk="; }; strictDeps = true; @@ -82,7 +82,7 @@ flutter329.buildFlutterApplication rec { # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl -sL https://raw.githubusercontent.com/rustdesk/rustdesk/1.4.9/flutter/pubspec.lock | yq > pubspec.lock.json + # curl -sL https://raw.githubusercontent.com/rustdesk/rustdesk/1.5.0/flutter/pubspec.lock | yq > pubspec.lock.json # Then add flutter_test, fake_async, leak_tracker*, vm_service SDK deps manually pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = lib.importJSON ./git-hashes.json; @@ -96,7 +96,7 @@ flutter329.buildFlutterApplication rec { src patches ; - hash = "sha256-HPvvsTcjSErGfdNwsHgWhs930Fe0hmK1g5J/ngtlkKM="; + hash = "sha256-Ym4USlB1NJO0bm0cr2l/yZhoUBfxtd2uTkkjrR7iD3o="; }; dontCargoBuild = true; @@ -252,6 +252,7 @@ flutter329.buildFlutterApplication rec { maintainers = with lib.maintainers; [ das_j helsinki-Jo + knightfemale ]; mainProgram = "rustdesk"; platforms = lib.platforms.linux; # should work on darwin as well but I have no machine to test with diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index d2c4ad5811b9..6f3b71ea79b0 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -380,7 +380,7 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "HEAD", + "ref": "bd6b5b41254e57c5bcece202ebfb234de63e6487", "resolved-ref": "bd6b5b41254e57c5bcece202ebfb234de63e6487", "url": "https://github.com/rustdesk-org/Dash-Chat-2" }, @@ -421,8 +421,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "HEAD", - "resolved-ref": "b47e8385e5a75d38319ad706a64b0ead3108b093", + "ref": "cddc2e64f8fefce4f80db87b20bcda2dd019bed6", + "resolved-ref": "cddc2e64f8fefce4f80db87b20bcda2dd019bed6", "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" }, "source": "git", @@ -509,16 +509,6 @@ "source": "hosted", "version": "12.0.1" }, - "external_path": { - "dependency": "direct main", - "description": { - "name": "external_path", - "sha256": "2095c626fbbefe70d5a4afc9b1137172a68ee2c276e51c3c1283394485bea8f4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.3" - }, "fake_async": { "dependency": "transitive", "description": { @@ -668,12 +658,13 @@ "flutter_custom_cursor": { "dependency": "direct main", "description": { - "name": "flutter_custom_cursor", - "sha256": "3850a32ac6de351ccc5e4286b6d94ff70c10abecd44479ea6c5aaea17264285d", - "url": "https://pub.dev" + "path": ".", + "ref": "db63b785c38153603e9fb84b50d3ec46f0d7e05e", + "resolved-ref": "db63b785c38153603e9fb84b50d3ec46f0d7e05e", + "url": "https://github.com/rustdesk-org/flutter_custom_cursor" }, - "source": "hosted", - "version": "0.0.4" + "source": "git", + "version": "0.0.3" }, "flutter_gpu_texture_renderer": { "dependency": "direct main", @@ -2046,8 +2037,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "HEAD", - "resolved-ref": "85789bfe6e4cfaf4ecc00c52857467fdb7f26879", + "ref": "cf4aef0512092fad9344a27ffe1c47ad83269dfc", + "resolved-ref": "cf4aef0512092fad9344a27ffe1c47ad83269dfc", "url": "https://github.com/rustdesk-org/window_manager" }, "source": "git", @@ -2057,9 +2048,9 @@ "dependency": "direct main", "description": { "path": "plugins/window_size", - "ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", - "resolved-ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", - "url": "https://github.com/google/flutter-desktop-embedding.git" + "ref": "51e67ce047c72b26810b99e8473ddb44612fe356", + "resolved-ref": "51e67ce047c72b26810b99e8473ddb44612fe356", + "url": "https://github.com/21pages/flutter-desktop-embedding.git" }, "source": "git", "version": "0.1.0" diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 32e53885e41c..6867269bcc53 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -15,18 +15,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "rustls-ffi"; - version = "0.15.5"; + version = "0.15.6"; src = fetchFromGitHub { owner = "rustls"; repo = "rustls-ffi"; tag = "v${finalAttrs.version}"; - hash = "sha256-SJhm/krDU7dMH99ULJ0EOMCxP69/ueQKCWrt00G3m8g="; + hash = "sha256-qVsadtAxS+yTt9FZMszwxql0CBTuz9ofpTto1hw9Kzg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-hiBMosPc77z0Z6xeP9wnh0B9mFDTXQ7nZ3OExO4leTs="; + hash = "sha256-rALR92Ia+I2axVTMVjI9UyNiiS4e6QuN5QU9JfM0UY8="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch b/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch deleted file mode 100644 index ada5974798f7..000000000000 --- a/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/sage/doctest/test.py b/src/sage/doctest/test.py -index 812f8167c12..38e553ad5bd 100644 ---- a/src/sage/doctest/test.py -+++ b/src/sage/doctest/test.py -@@ -468,6 +468,7 @@ Test the ``--debug`` option:: - s...: b = 5 - s...: a + b - 8 -+ ... - sage: - - Returning to doctests... -diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py -index 56fc16a205c..be2ae2a1b3d 100644 ---- a/src/sage/tests/cmdline.py -+++ b/src/sage/tests/cmdline.py -@@ -327,6 +327,7 @@ be ignored. In Pdb, we run the ``help`` command:: - ********************************************************************** - Previously executed commands: - s...: assert True is False -+ ... - sage: - - Returning to doctests... diff --git a/pkgs/by-name/sa/sage/patches/workaround-cython-relpaths.patch b/pkgs/by-name/sa/sage/patches/workaround-cython-relpaths.patch deleted file mode 100644 index b79be489fc68..000000000000 --- a/pkgs/by-name/sa/sage/patches/workaround-cython-relpaths.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/sage/config.py.in b/src/sage/config.py.in -index 3a95538d313..cdd551122fc 100644 ---- a/src/sage/config.py.in -+++ b/src/sage/config.py.in -@@ -4,6 +4,8 @@ import sage - - VERSION = "@PACKAGE_VERSION@" - -+SAGE_BUILD_SRC = "@EDITABLE_SRC@/src" -+ - # The following must not be used during build to determine source or installation - # location of sagelib. See comments in SAGE_ROOT/src/Makefile.in - # These variables come first so that other substituted variable values can refer -diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py -index c237af52c24..7a8e8291406 100644 ---- a/src/sage/misc/sageinspect.py -+++ b/src/sage/misc/sageinspect.py -@@ -270,6 +270,14 @@ def _extract_embedded_position(docstring): - return None - - raw_filename = res.group('FILENAME') -+ -+ # remove SAGE_BUILD_SRC prefix to workaround -+ # https://github.com/cython/cython/pull/6755 -+ from sage.config import SAGE_BUILD_SRC -+ from os.path import commonprefix, relpath -+ if commonprefix([raw_filename, SAGE_BUILD_SRC]) == SAGE_BUILD_SRC: -+ raw_filename = relpath(raw_filename, SAGE_BUILD_SRC) -+ - filename = raw_filename - - if not os.path.isabs(filename): diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index a5d68c8e7974..e017fdc8b73a 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -55,9 +55,6 @@ stdenv.mkDerivation (finalAttrs: { # Silence some warnings during docbuild. Imported from Arch. ./patches/sagedoc-silence-formatting-warnings.patch - # Workaround for https://github.com/cython/cython/pull/6755, adapted from Void. Can be removed after next Cython release. - ./patches/workaround-cython-relpaths.patch - # Revert https://github.com/sagemath/sage/pull/40520. It causes # "undefined symbol: cblas_ctrmv" errors. ./patches/revert-blas-mesonification.patch @@ -167,9 +164,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-msXUEbeO2rbP5m+EV8WmX6i8oQIfRLWEDGbIdz//lek="; }) - # work around https://github.com/ipython/ipython/issues/15207, which - # will likely be properly fixed in IPython 9.16. - ./patches/ipython-9_15-workaround.patch + # https://github.com/sagemath/sage/pull/42742, landed in 10.10.rc0 + (fetchpatch2 { + name = "cython-3.3-update.patch"; + url = "https://github.com/sagemath/sage/commit/0c6f9825c5347cd8b455928950a1336fe7f630f2.patch?full_index=1"; + # only reverts a cython version constraint that 10.9 does not have + excludes = [ "pyproject.toml" ]; + hash = "sha256-br8WpGWNsYTrZ1lSkaKqnDNusBQ1SDCStBNSiXrptME="; + }) # work around https://github.com/scipy/scipy/issues/25471, which is # fixed as part of SciPy 1.18.1. diff --git a/pkgs/by-name/sa/samblaster/package.nix b/pkgs/by-name/sa/samblaster/package.nix index 4032f76d9e5b..0e3c46696b6f 100644 --- a/pkgs/by-name/sa/samblaster/package.nix +++ b/pkgs/by-name/sa/samblaster/package.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ jbedo ]; license = lib.licenses.mit; homepage = "https://github.com/GregoryFaust/samblaster"; - platforms = lib.platforms.x86_64; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix index 0d7e9eadf075..4c1110c30ccb 100644 --- a/pkgs/by-name/sa/sandbox-runtime/package.nix +++ b/pkgs/by-name/sa/sandbox-runtime/package.nix @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: { pname = "sandbox-runtime"; - version = "0.0.80"; + version = "0.0.81"; __structuredAttrs = true; strictDeps = true; @@ -26,10 +26,10 @@ buildNpmPackage (finalAttrs: { owner = "anthropic-experimental"; repo = "sandbox-runtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-/oTzDaOGa77xXnk4M5NIp/EFe0bP9mqHkqzbtO6XTXk="; + hash = "sha256-mnxo49ng4fY0YantniE9xQm2qU37xZLBepNsmKH0wJA="; }; - npmDepsHash = "sha256-0msuDUKUrDXiUvm888wNmzQcEzPpIw46wnB3eSsVG50="; + npmDepsHash = "sha256-kS6eY5171yLv2Rxcy/65Mf3hGE8w/53cFAiISSfWbks="; postFixup = let diff --git a/pkgs/by-name/sb/sbsigntool/package.nix b/pkgs/by-name/sb/sbsigntool/package.nix index 8b546b35fd53..03107b8a27bd 100644 --- a/pkgs/by-name/sb/sbsigntool/package.nix +++ b/pkgs/by-name/sb/sbsigntool/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" + "loongarch64-linux" "riscv64-linux" ]; # Broken on i686 license = lib.licenses.gpl3; diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index 5dbe0043e237..0a8fff32f3ad 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sby"; - version = "0.69"; + version = "0.70"; src = fetchFromGitHub { owner = "YosysHQ"; diff --git a/pkgs/by-name/sc/sca2d/package.nix b/pkgs/by-name/sc/sca2d/package.nix index f18a765769c2..4b532761f407 100644 --- a/pkgs/by-name/sc/sca2d/package.nix +++ b/pkgs/by-name/sc/sca2d/package.nix @@ -1,47 +1,35 @@ { lib, - python3, + python3Packages, fetchFromGitLab, - fetchFromGitHub, }: -let - python = python3.override { - packageOverrides = self: super: { - lark010 = super.lark.overridePythonAttrs (old: rec { - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "lark-parser"; - repo = "lark"; - tag = version; - sha256 = "sha256-ctdPPKPSD4weidyhyj7RCV89baIhmuxucF3/Ojx1Efo="; - }; - - patches = [ ]; - - disabledTestPaths = [ "tests/test_nearley/test_nearley.py" ]; - }); - }; - self = python; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "sca2d"; - version = "0.2.2"; + version = "0.4.0"; pyproject = true; src = fetchFromGitLab { owner = "bath_open_instrumentation_group"; repo = "sca2d"; tag = "v${version}"; - hash = "sha256-p0Bv8jcnjcOLBAXN5A4GspSIEG4G4NPA4o0aEtwe/LU="; + hash = "sha256-fXZndNkG8JtPfK1smNoCjUdxLGYMuNpYUoyQOfLelrs="; }; - build-system = with python.pkgs; [ setuptools ]; + build-system = with python3Packages; [ hatchling ]; - dependencies = with python.pkgs; [ - lark010 + dependencies = with python3Packages; [ + lark colorama + pygments + jinja2 + markdown + ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + disabledTestPaths = [ + # Requires network access to clone the OpenFlexure Microscope repository + "tests/integration_test.py" ]; pythonImportsCheck = [ "sca2d" ]; diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix index f8372ca0abbb..1dd71cc5678b 100644 --- a/pkgs/by-name/sc/scilab-bin/package.nix +++ b/pkgs/by-name/sc/scilab-bin/package.nix @@ -5,31 +5,58 @@ makeWrapper, undmg, autoPatchelfHook, + wrapGAppsHook3, + versionCheckHook, alsa-lib, - ncurses5, - libxxf86vm, - libxtst, - libxrender, - libxrandr, - libxi, - libxft, - libxext, - libxcursor, + libgbm, + zlib, + glib, + nss, + nspr, + dbus, + at-spi2-core, + cups, + expat, + pango, + cairo, + udev, + gdk-pixbuf, + fontconfig, + freetype, + libGL, + gtk3, + + libxkbcommon, + libxfixes, + libxcb, libx11, + libxext, + libxi, + libxrender, + libxtst, + libxxf86vm, + libxrandr, + libxcursor, + libxcomposite, + libxdamage, + + coreutils, + gnugrep, + gnused, }: let pname = "scilab-bin"; - version = "6.1.1"; + version = "2027.0.0"; srcs = { aarch64-darwin = fetchurl { - url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-accelerate-arm64.dmg"; - sha256 = "sha256-L4dxD8R8bY5nd+4oDs5Yk0LlNsFykLnAM+oN/O87SRI="; + url = "https://www.scilab.org/download/${version}/scilab-${version}-arm64.dmg"; + hash = "sha256-82+5EBZEl5rUI+VpSPdd2T4hWiydENJgh/G6Mi4t05E="; }; x86_64-linux = fetchurl { - url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-x86_64.tar.gz"; - sha256 = "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk="; + url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.x86_64-linux-gnu.tar.xz"; + hash = "sha256-AP3DBo/r7p//419UYLSWFd1RH8epANOrfmWr+AIn1YY="; }; }; src = @@ -45,9 +72,10 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Only; mainProgram = "scilab"; + changelog = "https://help.scilab.org/docs/${version}/en_US/CHANGES.html"; }; - darwin = stdenv.mkDerivation { + darwin = stdenv.mkDerivation (finalAttrs: { inherit pname version @@ -55,6 +83,9 @@ let meta ; + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ makeWrapper undmg @@ -71,11 +102,9 @@ let runHook postInstall ''; + }); - dontCheckForBrokenSymlinks = true; - }; - - linux = stdenv.mkDerivation { + linux = stdenv.mkDerivation (finalAttrs: { inherit pname version @@ -83,23 +112,60 @@ let meta ; + __structuredAttrs = true; + strictDeps = true; + # bin/ also contains the real ELF binaries (scilab-bin, scilab-cli-bin, ...), + # so only the launcher scripts are wrapped, manually in postFixup + dontWrapGApps = true; + nativeBuildInputs = [ autoPatchelfHook + makeWrapper + wrapGAppsHook3 ]; buildInputs = [ alsa-lib - ncurses5 stdenv.cc.cc + libgbm + zlib + glib + nss + nspr + dbus + at-spi2-core + cups + expat + pango + cairo + udev + gtk3 + gdk-pixbuf + libGL + fontconfig + freetype + + libxkbcommon + libxfixes + libxcb libx11 - libxcursor libxext - libxft libxi - libxrandr libxrender libxtst libxxf86vm + libxrandr + libxcursor + libxcomposite + libxdamage + ]; + + # Tools the launcher scripts call; needed on PATH at runtime and by + # versionCheckHook, which runs the script in the build sandbox + runtimeDeps = [ + coreutils + gnugrep + gnused ]; installPhase = '' @@ -107,19 +173,36 @@ let mkdir -p $out mv -t $out bin include lib share thirdparty - sed -i \ - -e 's|\$(/bin/|$(|g' \ - -e 's|/usr/bin/||g' \ - $out/bin/{scilab,xcos} - sed -i \ - -e "s|Exec=|Exec=$out/bin/|g" \ - -e "s|Terminal=.*$|Terminal=true|g" \ - $out/share/applications/*.desktop + + # The launcher scripts hardcode /bin/ in their command substitutions + substituteInPlace \ + $out/bin/{scilab,scilab-cli,scilab-adv-cli,scinotes,xcos} \ + --replace-fail '$(/bin/' '$(' + + substituteInPlace $out/share/applications/*.desktop \ + --replace-fail 'Exec=' "Exec=$out/bin/" runHook postInstall ''; - dontCheckForBrokenSymlinks = true; - }; + # libGL, fontconfig, freetype and gtk3 are loaded at runtime by the bundled + # JVM/JCEF, so they must be in RUNPATH even though autoPatchelfHook is + # already satisfied + appendRunpaths = [ + (lib.makeLibraryPath finalAttrs.buildInputs) + ]; + + postFixup = '' + for f in scilab scilab-cli scilab-adv-cli scinotes xcos; do + wrapProgram $out/bin/$f \ + "''${gappsWrapperArgs[@]}" \ + --suffix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} + done + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; + doInstallCheck = true; + }); in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/se/seerr/package.nix b/pkgs/by-name/se/seerr/package.nix index 089867c698c0..f531064e40d5 100644 --- a/pkgs/by-name/se/seerr/package.nix +++ b/pkgs/by-name/se/seerr/package.nix @@ -20,20 +20,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "seerr"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "seerr-team"; repo = "seerr"; tag = "v${finalAttrs.version}"; - hash = "sha256-OF8iX6Q7NK8d3ugGOw7FFcKQul2ERRNqD3SKWtlQuAg="; + hash = "sha256-DBXhU6gzk1wwLT38s9CJsTtwaWE9gLwmSzSIP0p6ZN8="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-qSkPC2d3DfM+g/JLf8Jkv0T9Wxnp4m0Sx+wHTyhch34="; + hash = "sha256-9eO0wAfScNIG673Mh4HR5PY3LS59uX1zgsRKheiuEJM="; }; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 5d0b6ab9060f..ee1e20815e7d 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sendme"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "sendme"; rev = "v${finalAttrs.version}"; - hash = "sha256-VvT6tlgZHof4X8fe3WLVq/9nJDNSkQFF/Chhl/LR4gc="; + hash = "sha256-1YuiTYGdr1G66Id9nvFa7y3nVbYi/dINMCpBCAz80WU="; }; - cargoHash = "sha256-ktV/+lgaPphD5axbP1f19bgQfx/YIhXXpj9yFbW4xzM="; + cargoHash = "sha256-AJsqI4rUeM+Cs6lFmQRcPom5YZZQJ1eVORAkUru+Xrk="; # The tests require contacting external servers. doCheck = false; diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index c5453ea3fad8..6f3956cf283d 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "serpl"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "yassinebridi"; repo = "serpl"; rev = finalAttrs.version; - hash = "sha256-M9hIHQfzrPjSSAPIfHbgaWzSz1yPaMIEabR33HjLHEU="; + hash = "sha256-rYJGbDcl+7oDeVnUJgqpdPCxoSIuYNynJPw2aWbVCPg="; }; buildFeatures = [ "ast_grep" ]; nativeBuildInputs = [ makeWrapper ]; - cargoHash = "sha256-9ZmBDMrChz4ZxthcFY25ldXpTFjnvaTp+taWdnHYNo8="; + cargoHash = "sha256-8A+/ZZVgPUpPbyp4SyOhd5kSDoqFSPQr2ODjVO2xXmk="; postFixup = '' # Serpl needs ripgrep to function properly. diff --git a/pkgs/by-name/sh/shadps4-qtlauncher/package.nix b/pkgs/by-name/sh/shadps4-qtlauncher/package.nix index 1a8fd2221841..a5a99d3379d4 100644 --- a/pkgs/by-name/sh/shadps4-qtlauncher/package.nix +++ b/pkgs/by-name/sh/shadps4-qtlauncher/package.nix @@ -17,13 +17,13 @@ }: clangStdenv.mkDerivation (finalAttrs: { pname = "shadps4-qtlauncher"; - version = "0-unstable-2026-10-05"; + version = "0-unstable-2026-10-14"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadps4-qtlauncher"; - rev = "29de8facf2348a1ffd461aa52b25cc23a488e255"; - hash = "sha256-my3nLALEDIDNVu9qahxI+9E6aVBsAufAp4m+Uv8HNb0="; + rev = "d585d56cdef7e376aa8526d52616398cbdd6f91e"; + hash = "sha256-WXDGUdBtCHKx8mRetpGl3dfqGhoMgsQ41WRgPJ3VzMY="; postCheckout = '' git -C "$out" rev-parse --short=8 HEAD > $out/COMMIT diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index c0e08547aea2..28756f86de11 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -63,13 +63,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "shadps4"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; tag = "v.${finalAttrs.version}"; - hash = "sha256-idlvgqiM+aBtAKRqcmQ1TnhnU2EPJYO9CPvAnKc6pMM="; + hash = "sha256-xf8m8mVP1YyfocLLsH4YhBzVpkOQQQTtq2SDkyuI5EU="; postCheckout = '' git -C "$out" rev-parse --short=8 HEAD > $out/COMMIT diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index 4ef77db00d35..6b74cee23bc1 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-RhRckA81VeTPKTk/SiNMcNaE/QwI+QWmz3dILHIqzRE="; + hash = "sha256-rQMrKzKMO8ak89HTw2bwPPGINAk7/FBtTA55IC1hhng="; }; postPatch = '' diff --git a/pkgs/by-name/si/sif/package.nix b/pkgs/by-name/si/sif/package.nix index 8b4ccddf0612..bf01fe0aca75 100644 --- a/pkgs/by-name/si/sif/package.nix +++ b/pkgs/by-name/si/sif/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "sif"; - version = "0-unstable-2026-10-05"; + version = "0-unstable-2026-10-09"; src = fetchFromGitHub { owner = "vmfunc"; repo = "sif"; - rev = "89665d77a95c7cadb67c9814b05af735ce4d7f4e"; - hash = "sha256-4r9NXeexcTBSuN9xmpHjadzPBuCsUPvMJyjGMxQG3/I="; + rev = "f98638f11dfbb76ea8f98e430c5580142504c0ee"; + hash = "sha256-q1ws79Fe0Vzp/vt7kPE2hrtTKPr8PUDOXUQTm04gsxA="; }; - vendorHash = "sha256-AS+nZSM0Fnv4vs08OMLCM8jZXeE9bH4Vj/V+sfpbqRE="; + vendorHash = "sha256-3TF9LNTDAjm81w7AMo0YZXN3FInFNw5T0ZMXGjk2cTQ="; subPackages = [ "cmd/sif" ]; diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index bca72cdc9a50..954f4a304968 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20261001"; + version = "20261014"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-vMJ+5+sAjQSgmAQxCaiZSNXPrCmlu2lvNRu9m24t5eY="; + hash = "sha256-vj9iop4TOK7uNyILPfM2QjaerXyMAVImOHa96NL/sAM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index f0784fadc7ab..6481ed441105 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -22,6 +22,7 @@ boost, eigen, libvdwxc, + fftwMpi, dftd4, simple-dftd3, mctc-lib, @@ -53,7 +54,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation (finalAttrs: { pname = "SIRIUS"; - version = "7.10.0"; + version = "7.12.0"; strictDeps = true; __structuredAttrs = true; @@ -62,9 +63,25 @@ stdenv.mkDerivation (finalAttrs: { owner = "electronic-structure"; repo = "SIRIUS"; tag = "v${finalAttrs.version}"; - hash = "sha256-cq4ajtAJXfIH1B866FYhgROMSwd7nsbXf/6kbSwJAso="; + hash = "sha256-9PlXyJLfunbinsZM6V3PFklqY/JWJkbVD8/vvkIsywA="; }; + postPatch = '' + # The Python module's CMakeLists.txt forces C++17, but the bundled camp + # library in umpire >= 2026.07 uses C++20 concepts. The main library + # already uses C++20 (set in the root CMakeLists.txt), so align the + # Python module to avoid compilation errors. + substituteInPlace python_module/CMakeLists.txt \ + --replace-fail "set(CMAKE_CXX_STANDARD 17)" "set(CMAKE_CXX_STANDARD 20)" + + # siriusConfig.cmake uses find_library with NO_DEFAULT_PATH to locate + # libsirius_cxx, but with split outputs the library lives in $out/lib + # while the config is in $dev. Remove NO_DEFAULT_PATH so the library + # can be found across outputs. + substituteInPlace cmake/siriusConfig.cmake.in \ + --replace-fail "NO_DEFAULT_PATH" "" + ''; + outputs = [ "out" "dev" @@ -95,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { boost eigen libvdwxc + fftwMpi jonquil simple-dftd3 dftd4 diff --git a/pkgs/by-name/sj/sjasmplus/package.nix b/pkgs/by-name/sj/sjasmplus/package.nix index cea4f14c3694..1024f581d09a 100644 --- a/pkgs/by-name/sj/sjasmplus/package.nix +++ b/pkgs/by-name/sj/sjasmplus/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sjasmplus"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "z00m128"; repo = "sjasmplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-SpaKmedvQlvv/+Sy/J2MXsFclUYAHC3WdioaqS+Neek="; + hash = "sha256-G/njWxZ/W8flkWO9s5mFvob0p8zb5ruzPEThomQInek="; }; buildInputs = [ luabridge ]; diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix index a7821ccae434..4d38ec53b050 100644 --- a/pkgs/by-name/sn/snapraid/package.nix +++ b/pkgs/by-name/sn/snapraid/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapraid"; - version = "14.10"; + version = "15.0"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; tag = "v${finalAttrs.version}"; - hash = "sha256-vM1qPNrMbMaiMTRtpIJr2WdpIDXH5EydmgPeiZ4FrwQ="; + hash = "sha256-ftmmd8cHeggj2PLSqyJvOly/kUBFPXYaqpHwxwE/uDc="; }; env.VERSION = finalAttrs.version; diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix index eed3aa5a0d6a..0070794cdbd5 100644 --- a/pkgs/by-name/sn/snyk/package.nix +++ b/pkgs/by-name/sn/snyk/package.nix @@ -10,13 +10,13 @@ buildNpmPackage (finalAttrs: { pname = "snyk"; - version = "1.1308.0"; + version = "1.1308.1"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-l5mzyxpxbuUIof+hZUcVqpFbHEjj5HqJ+OLoukCkhCs="; + hash = "sha256-r01DanfKKVuzY1Wz9sd44aRimBhSgaoVPCSiwwbvRgw="; # TODO: Remove once https://github.com/snyk/cli/pull/6924 is released. postFetch = '' @@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: { npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-HSNW5mVuU+B3aRWc4KXlhb+PzPyqM76zSsKa79E+Zrs="; + npmDepsHash = "sha256-yS1zSBRMamtFn1yMSIc5nmvIE+03dNc8UvLH7tDZL2Y="; nodejs = nodejs_24; diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 3086b3046e88..aed2e5c82ba8 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -25,14 +25,14 @@ clangStdenv.mkDerivation rec { pname = "sogo"; - version = "5.12.11"; + version = "5.12.12"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = "sogo"; rev = "SOGo-${version}"; - hash = "sha256-zGCQ6uI6TYTZONl3WeCHbE8k57Yn21uz7OFJOHUXDfE="; + hash = "sha256-RsDjHRxfjBP4YCl8sVK/nJlio7N3tY8V9nwTRAFrCg8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/sortmerna/package.nix b/pkgs/by-name/so/sortmerna/package.nix index 9f229cf9958d..2da183b61575 100644 --- a/pkgs/by-name/so/sortmerna/package.nix +++ b/pkgs/by-name/so/sortmerna/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data"; mainProgram = "sortmerna"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with lib.maintainers; [ luispedro ]; diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index e0767cfe90fb..ab6285a08112 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -7,7 +7,6 @@ fetchFromGitHub, iconConvTools, copyDesktopItems, - makeDesktopItem, libx11, libice, libsm, @@ -38,7 +37,7 @@ soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2", }: let - version = "0.40.2"; + version = "0.40.3"; buildType = "Release"; in buildDotnetModule { @@ -50,7 +49,7 @@ buildDotnetModule { owner = "space-wizards"; repo = "SS14.Launcher"; tag = "v${version}"; - hash = "sha256-EjB38B77nrkNkkj2h/wAvLxvozTxLrsL1VB/pXMZwQI="; + hash = "sha256-VFwL4OlEvtWDHvNP8meOlCWheK+J6jKyAwZlryMNRqg="; fetchSubmodules = true; }; @@ -117,17 +116,7 @@ buildDotnetModule { copyDesktopItems ]; - desktopItems = [ - (makeDesktopItem { - name = "SS14.Launcher"; - exec = "SS14.Launcher"; - icon = "SS14"; - desktopName = "Space Station 14 Launcher"; - comment = "A multiplayer disaster simulator"; - categories = [ "Game" ]; - startupWMClass = "SS14.Launcher"; - }) - ]; + desktopItems = [ "PublishFiles/SS14.desktop" ]; postInstall = '' mkdir -p $out/lib/SS14.Launcher/loader @@ -143,5 +132,6 @@ buildDotnetModule { maintainers = [ lib.maintainers.coca ]; platforms = [ "x86_64-linux" ]; mainProgram = "SS14.Launcher"; + teams = [ lib.teams.gaming ]; }; } diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix index 843c6239b535..1d6bf9a55f82 100644 --- a/pkgs/by-name/sp/spicedb/package.nix +++ b/pkgs/by-name/sp/spicedb/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "spicedb"; - version = "1.56.2"; + version = "1.57.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-x+Bs4uVrDImbmHlE0sXP4q5Qz81G3BGTXqyaSeHQ1LM="; + hash = "sha256-ZcqSCAtbtFhojNkCqEWL4NVEHzzRN/k6V/UAS1RYxts="; }; - vendorHash = "sha256-PIzxOgBeCptS9EQBWLfWX3P8WM6Jacvpor8Fx/N2Vso="; + vendorHash = "sha256-iemsayke/kfrspGAlk0FqwBqEVyP/3RVvp08pFDEi/k="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" diff --git a/pkgs/by-name/sp/spiffe-helper/package.nix b/pkgs/by-name/sp/spiffe-helper/package.nix index 6a0cbe84fe57..987a74a4f599 100644 --- a/pkgs/by-name/sp/spiffe-helper/package.nix +++ b/pkgs/by-name/sp/spiffe-helper/package.nix @@ -1,22 +1,22 @@ { lib, stdenv, - buildGoModule, + buildGo127Module, fetchFromGitHub, }: -buildGoModule (finalAttrs: { +buildGo127Module (finalAttrs: { pname = "spiffe-helper"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "spiffe"; repo = "spiffe-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-akuq5qqL+B4kyZ7EuBYOPYQ15/hUsUPTmewgQWYTXos="; + hash = "sha256-MT4VSB9EO8asWvakhGJT5TBQUyn/otVZDQygjFU1bkA="; }; - vendorHash = "sha256-32ArgWgQFHPyA/wqbcuIZ77HCCsh+V3QFw/8YrPJZww="; + vendorHash = "sha256-qmr/Xm720pUiFsNW8AbYOCeaawR+Ghlyhr1isD2lyGg="; ldflags = [ "-s" diff --git a/pkgs/by-name/sp/spinshare/package.nix b/pkgs/by-name/sp/spinshare/package.nix index 434b84c9348a..216b36a31982 100644 --- a/pkgs/by-name/sp/spinshare/package.nix +++ b/pkgs/by-name/sp/spinshare/package.nix @@ -7,11 +7,11 @@ let pname = "spinshare"; - version = "3.32.1"; + version = "3.33.0"; src = fetchurl { url = "https://github.com/SpinShare/client-next/releases/download/v${version}/SpinShare-${version}-x64.AppImage"; - hash = "sha256-LJjMel0CsvBf+IgyH7DArj/1oWk/dKpPa1aIED69yeE="; + hash = "sha256-/hMKO4MjfkivUueJtM+/RydmGfhn3ZGI4meEX2BLiH4="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index 9d0d8129bbd1..f4580b080712 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "spire"; - version = "1.15.3"; + version = "1.15.4"; outputs = [ "out" @@ -21,12 +21,12 @@ buildGoModule (finalAttrs: { owner = "spiffe"; repo = "spire"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-wDnYgaG6FlVetV7X3Js7u60xvV4eC4HQ33puTFaRTcY="; + sha256 = "sha256-6SOcHjcoF4Tl9A9tFs2PRwTHRnnrHU3Cm/M/X3chFrY="; }; # Needed for github.co/google/go-tpm-tools/simulator which contains non-go files that `go mod vendor` strips proxyVendor = true; - vendorHash = "sha256-xMbi50XAT2iAG2heqr6BXjWfqeikGDFdZ4q9bU9j05U="; + vendorHash = "sha256-4DLJ66GyhneMNSLMBb6lUUoYo63zoCDeXWxMv22NRfU="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index 66f07c4cf29c..9eb298f3db82 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -13,13 +13,13 @@ # so let's build using the latest Go available in nixpkgs. buildGoLatestModule (finalAttrs: { pname = "sshwifty"; - version = "0.4.11-beta-release"; + version = "0.4.12-beta-release"; src = fetchFromGitHub { owner = "nirui"; repo = "sshwifty"; tag = finalAttrs.version; - hash = "sha256-Vb2G7zV6RrAgwpxpnbEVwo1TRatlilHgH1g19uVwAKs="; + hash = "sha256-zp/TqvjAb+yDOVkFXjXML/TxomIyPEG8fLq6BeDnSxU="; }; nativeBuildInputs = [ @@ -34,10 +34,10 @@ buildGoLatestModule (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-NnRQStZooSS87GyeRc7gls/9EMPdndr/OkHFFHt46HQ="; + hash = "sha256-t6g83QNq5hCNXPx5dcYYCaBJbjyXAao33qvdbZFCxvo="; }; - vendorHash = "sha256-C60bf9QjY/37zSjSfwhBgtN2lqd4d8TBJqZYtBOCHug="; + vendorHash = "sha256-fXQW97/ztjerM62rw1k1ZKD2LSBV2iKLZkk1hJ7HhXE="; preBuild = '' # Generate static pages diff --git a/pkgs/by-name/ss/ssl-proxy/package.nix b/pkgs/by-name/ss/ssl-proxy/package.nix deleted file mode 100644 index 0177143881ed..000000000000 --- a/pkgs/by-name/ss/ssl-proxy/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule { - pname = "ssl-proxy"; - version = "0.2.7-unstable-2024-02-05"; - - src = fetchFromGitHub { - owner = "suyashkumar"; - repo = "ssl-proxy"; - rev = "6b0f364be9bbf0de46520a6b85d30792fcc3cb80"; - hash = "sha256-tYAsz99YCOOEyxPp8Yp+PTn+q2Edir+xy4Vs0yyHWOQ="; - }; - - vendorHash = "sha256-PQ465+4AcH0wP4z2GsGdf/yABaGezaPq+eM0U2lu13o="; - - checkTarget = "test"; - - meta = { - homepage = "https://github.com/suyashkumar/ssl-proxy"; - description = "Simple single-command SSL reverse proxy with autogenerated certificates (LetsEncrypt, self-signed)"; - longDescription = '' - A handy and simple way to add SSL to your thing running on a VM--be it your personal jupyter - notebook or your team jenkins instance. ssl-proxy autogenerates SSL certs and proxies - HTTPS traffic to an existing HTTP server in a single command. - ''; - license = lib.licenses.mit; - mainProgram = "ssl-proxy"; - maintainers = [ lib.maintainers.konst-aa ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows; - }; -} diff --git a/pkgs/by-name/st/stashcat/package.nix b/pkgs/by-name/st/stashcat/package.nix index b8e05b94f4c7..19c864d37d39 100644 --- a/pkgs/by-name/st/stashcat/package.nix +++ b/pkgs/by-name/st/stashcat/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "stashcat"; - version = "6.55.0"; + version = "6.56.0"; src = fetchurl { url = "http://deb.stashcat.com/repo01/dists/stashcat-dc/main/binary-amd64/stashcat-dc/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb"; - hash = "sha512-acXuy4Qlpda58oyN/W8+AU/CnjFtGmySFwbkftWo4CxgTAZu/tXhgN//4/IvMJ11wvMrlzDKcFwowVCrccxOPQ=="; + hash = "sha512-qWK7XCWuRpW+vE0b5Ljj1lC3ml8Zqj3cvJVry6HoBzhvdkW3iwVtSBNwo+4+Fl+GWrRuJ0MdeU1GtLM5EeYsVQ=="; }; strictDeps = true; diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix index 366922400677..d51343fcb9c2 100644 --- a/pkgs/by-name/st/stasis/package.nix +++ b/pkgs/by-name/st/stasis/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stasis"; - version = "1.6.3"; + version = "1.7.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "saltnpepper97"; repo = "stasis"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZW42vyRKhuNWkBRTsQtEEOFUGaHh5zfEiZOsdVOnJEk="; + hash = "sha256-aMK+XPtcidphRfNms+2vg0AMfx/HaWY1wWIwuOySwvI="; }; - cargoHash = "sha256-aP16q/YEM4VBO+UE4jjd3cHIOTYlafLtKT+PDjV7FgQ="; + cargoHash = "sha256-oNIVqSd43CbvilNzVGNa7HDrUSOc46ppUE4rcXniQRY="; nativeBuildInputs = [ pkg-config @@ -57,7 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/saltnpepper97/stasis"; changelog = "https://github.com/saltnpepper97/stasis/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; + license = with lib.licenses; [ + gpl3Only + agpl3Only + ]; maintainers = with lib.maintainers; [ nartsiss ]; platforms = lib.platforms.linux; mainProgram = "stasis"; diff --git a/pkgs/by-name/st/steelix/package.nix b/pkgs/by-name/st/steelix/package.nix index 024631aab9a8..a2080d4d2b56 100644 --- a/pkgs/by-name/st/steelix/package.nix +++ b/pkgs/by-name/st/steelix/package.nix @@ -35,13 +35,13 @@ let steelix-unwrapped = helix-unwrapped.overrideAttrs ( finalAttrs: _: { pname = "steelix-unwrapped"; - version = "0-unstable-2026-09-30"; + version = "0-unstable-2026-10-18"; src = fetchFromGitHub { owner = "mattwparas"; repo = "helix"; - rev = "ee451df4ff6b0f6416a128f26affc2052b0669c6"; - hash = "sha256-pPQFqMoUvDFsCDBjEWzrxb6x+5YXY/ELD5CTl/Tf5N8="; + rev = "16a26934f39152b5cd81bf2f6944e18e680314d0"; + hash = "sha256-FU4WIMHhIyvEMxHeN8+Qgb3VHsU6DP74ylsyZACLzM8="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index cd0b65bec887..491d25681c7c 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -13,11 +13,10 @@ libunwind, perl, pkg-config, - ripgrep, + runCommand, rustc, rustPlatform, stdenv, - symlinkJoin, }: let @@ -49,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "28.0.1"; + version = "30.0.0"; src = fetchFromGitHub { owner = "stellar"; repo = "stellar-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-yRwUwk0CNIQlPEKitXCjuF47qm8BFt9EYJXUfx28bMs="; + hash = "sha256-yVaZVjCR/jm7dm4ldjicUSq4nOheVY3WepjViAbjPMY="; fetchSubmodules = true; }; @@ -70,10 +69,12 @@ stdenv.mkDerivation (finalAttrs: { p26 = "sha256-OxkiWTzNtmYxB64OtLUwghAkcT//SnMZVfUXynFg2Bg="; p27 = "sha256-KcsyPBJLUOwRAtp95IYFiZZNMi1xWmYW7XXG+bMucmY="; p28 = "sha256-SGA69mE0VZSumZKOBcZqvzYtZRkFVSIMHFI5R9xcTWE="; + p29 = "sha256-O3WVmx0Ty04eOF6txTSYIj3VLxJS7BFDCYH54mAKtVY="; + p30 = "sha256-KoBgiIiZSR3E198ScGG1wekodabNWNKHi/1MgNWdw9w="; }; mainCargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-7gU7vtYMOXX4qf3PkqriAxANhV3vraF71WMj/sS83ak="; + hash = "sha256-B3UhPnfND9b1r6mOy2QydPFUky0l5BSj6v88gx3TNIw="; }; sorobanCargoDeps = lib.mapAttrs ( protocol: hash: @@ -85,13 +86,41 @@ stdenv.mkDerivation (finalAttrs: { } ) sorobanProtocolHashes; in - symlinkJoin { - name = "stellar-core-${finalAttrs.version}-cargo-vendor-dir"; - paths = [ mainCargoDeps ] ++ lib.attrValues sorobanCargoDeps; - passthru = { - inherit sorobanProtocolHashes mainCargoDeps sorobanCargoDeps; - }; - postBuild = '' + # Every lockfile is built from one `.cargo/config.toml` at the source root. + # fetchCargoVendor numbers git sources per lockfile (NixOS/nixpkgs#387337), + # so a `symlinkJoin` of the vendor directories drops all but the first + # config and lets protocols that pin different revisions of one repository + # overwrite each other. Merge the directories by git revision instead. + runCommand "stellar-core-${finalAttrs.version}-cargo-vendor-dir" + { + vendors = [ mainCargoDeps ] ++ lib.attrValues sorobanCargoDeps; + passthru = { + inherit sorobanProtocolHashes mainCargoDeps sorobanCargoDeps; + }; + } + '' + mergeSource() { + if [ ! -d "$out/source-$1" ]; then + mkdir "$out/source-$1" + printf '%s\n' "[source.$1]" "''${@:3}" "replace-with = \"vendored-$1\"" \ + "[source.vendored-$1]" "directory = \"@vendor@/source-$1\"" + fi + ln -sfn -t "$out/source-$1" "$2"/* + } + + mkdir -p "$out"/.cargo + ln -s ${mainCargoDeps}/Cargo.lock "$out"/Cargo.lock + for vendor in $vendors; do + mergeSource crates-io "$vendor/source-registry-0" + while read -r dir url rev; do + mergeSource "git-$rev" "$vendor/$dir" "git = \"$url\"" "rev = \"$rev\"" + done < <(awk -F'"' ' + /^\[source\.original-/ { dir = $0; gsub(/.*original-|\]/, "", dir) } + /^git = / { url = $2 } + /^rev = / { print dir, url, $2 } + ' "$vendor"/.cargo/config.toml) + done > "$out"/.cargo/config.toml + # `soroban-synth-wasm` resolves this path relative to the vendored git # source root, but cargo vendors the workspace crates with versioned # directory names. @@ -104,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: { done done ''; - }; postPatch = '' # Include integer types explicitly instead of relying on transitive standard @@ -122,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { # that version and apply the upstream 1.5.3 source fix in the vendored crate. # https://github.com/nlordell/ethnum-rs/pull/58 shopt -s nullglob - for crate in "$cargoDepsCopy"/source-registry-*/ethnum-1.5.0; do + for crate in "$cargoDepsCopy"/source-crates-io/ethnum-1.5.0; do patch -p1 -d "$crate" < ${ fetchpatch2 { name = "ethnum-1.5.0-rustc-1.97.patch"; @@ -134,14 +162,9 @@ stdenv.mkDerivation (finalAttrs: { # Git dependencies do not include Cargo's published-crate VCS metadata. # Recreate it so crate-git-revision can provide GIT_REVISION. - for crate in "$cargoDepsCopy"/source-git-*/stellar-xdr-*; do - version="$(basename "$crate")" - version="''${version#stellar-xdr-}" - xdrRevision="$(rg -U -o -r '$1' \ - "name = \"stellar-xdr\"\nversion = \"$version\"\nsource = \"git\\+https://github.com/stellar/rs-stellar-xdr[^\"]*#([0-9a-f]{40})\"" \ - Cargo.lock)" - test -n "$xdrRevision" - printf '{"git":{"sha1":"%s"}}\n' "$xdrRevision" > "$crate/.cargo_vcs_info.json" + for crate in "$cargoDepsCopy"/source-git-*/*/; do + rev="$(basename "$(dirname "$crate")")" + printf '{"git":{"sha1":"%s"}}\n' "''${rev#source-git-}" > "$crate/.cargo_vcs_info.json" done ''; @@ -157,7 +180,6 @@ stdenv.mkDerivation (finalAttrs: { libtool perl pkg-config - ripgrep rustc rustPlatform.cargoSetupHook ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 58ae5568be8a..07bdd2a9a58b 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.119"; + version = "3.16.121"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-YqEwyvlwH+si0AnhMuGE8irKUcqotrcxTRh27F0DOc8="; + hash = "sha256-Y02CG5QgSMN8fHLc48LjnsKT1V8c281pEQpNeKd2n70="; }; outputs = [ diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index 23f547d31bb5..f05d3c3fd6fe 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sticky"; - version = "1.32"; + version = "1.33"; src = fetchFromGitHub { owner = "linuxmint"; repo = "sticky"; rev = finalAttrs.version; - hash = "sha256-z37upUUXQTQeMHJ1b3+1TlPuxwXJIvAphBTKqU7wvQs="; + hash = "sha256-shoTQGkxY8++57KVhPBL5QKRpd70sVPxl3pHI4iseIg="; }; postPatch = '' diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 0c95caa82446..b36d8f1dfd5d 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stylua"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = "stylua"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-C0X7IdYqs/hhSX96XWVyk7rfQNd9DjYxYgHL34cI+3g="; + sha256 = "sha256-kaJXpW3dGICg1S180OY9eqHwVZUfvhMdV2yYwEWdSdI="; }; - cargoHash = "sha256-m31oocBkx4i2KxM0YC1omVWtypFi7iEoDVlXgT93iSI="; + cargoHash = "sha256-zHPzpbBKCcZt3M5hdJYurdbmcAs7KMm5k59GNJ6U3cA="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/by-name/su/supervisord/package.nix b/pkgs/by-name/su/supervisord/package.nix new file mode 100644 index 000000000000..28bf79c8ffb6 --- /dev/null +++ b/pkgs/by-name/su/supervisord/package.nix @@ -0,0 +1,41 @@ +{ + buildGo127Module, + fetchFromGitHub, + lib, + versionCheckHook, +}: +buildGo127Module (finalAttrs: { + pname = "supervisord"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "ochinchina"; + repo = "supervisord"; + tag = "v${finalAttrs.version}"; + hash = "sha256-l0cbkrX5Mj92IZCEeirySrvyUOvRWNJaC4W0EYBqWP0="; + }; + + __structuredAttrs = true; + + proxyVendor = true; + vendorHash = "sha256-r1almxcbVR8J49+wtgiT/DE5HUkwUl3PFusAMnjsG3c="; + + preBuild = "go mod tidy"; + subPackages = [ "." ]; + + # Currently broken due to version mismatch + # + doInstallCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + meta = { + homepage = "https://github.com/ochinchina/supervisord"; + description = "Process supervisor tool, rewritten from Python in Golang"; + changelog = "https://github.com/ochinchina/supervisord/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + mainProgram = "supervisord"; + maintainers = with lib.maintainers; [ EpicEric ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/su/surface-control/package.nix b/pkgs/by-name/su/surface-control/package.nix index 3fcfe7e94fe8..3ab0389f49b3 100644 --- a/pkgs/by-name/su/surface-control/package.nix +++ b/pkgs/by-name/su/surface-control/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.5.0-1"; + version = "0.5.1-1"; src = fetchFromGitHub { owner = "linux-surface"; repo = "surface-control"; tag = "v${version}"; - hash = "sha256-XPIHGDpq2x+P8i8b4nLlobR/BysdZX+7N9Pu2l/U4Gs="; + hash = "sha256-wywmxtBxE7NU9ANQ5Z8AaEvdA73kiCuG36GmqNPBcjo="; }; - cargoHash = "sha256-K9nfDIEoI/p8DDKe2sFQjFn12zzb5VhKX4mTc0+Y8dE="; + cargoHash = "sha256-aiPbr4y2Ya4QhQNtiL0KDHo9MIE307ZaRDP2a+5r38U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/su/surge-xt/package.nix b/pkgs/by-name/su/surge-xt/package.nix index f31724aed58d..79f7fe5db87f 100644 --- a/pkgs/by-name/su/surge-xt/package.nix +++ b/pkgs/by-name/su/surge-xt/package.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: { ./clap-option.diff ]; - # fix build w/ glibc-2.44 - env.NIX_CFLAGS_COMPILE = "-Wno-error=discarded-qualifiers"; + # fix build w/ glibc-2.44 and stringop-overflow in embedded sqlite + env.NIX_CFLAGS_COMPILE = "-Wno-error=discarded-qualifiers -Wno-error=stringop-overflow"; postPatch = '' # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333 diff --git a/pkgs/by-name/su/suscan/package.nix b/pkgs/by-name/su/suscan/package.nix index db9348802ec9..f52d068a9872 100644 --- a/pkgs/by-name/su/suscan/package.nix +++ b/pkgs/by-name/su/suscan/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Channel scanner based on sigutils library"; homepage = "https://github.com/BatchDrake/suscan"; - license = lib.licenses.gpl3; + license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ polygon diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 963dd0aeed36..e2ebb0b5d7fa 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -12,14 +12,14 @@ buildGoModule (finalAttrs: { pname = "symfony-cli"; - version = "5.22.0"; + version = "5.22.2"; vendorHash = "sha256-YFcv+lmD8TZUsN2zYK1usfuLVqzGYdsJ+ScDRcpSORs="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-D6hn/S9h7QBCuqJm/Y3aaVE0og/zeRjQNAOM4UsvkwI="; + hash = "sha256-UXYZmm+Sgait6fYS3zthViLq8mXYb9OAbcx41us9LTw="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE diff --git a/pkgs/by-name/sy/syntaqlite/package.nix b/pkgs/by-name/sy/syntaqlite/package.nix index 45b4b32f620c..2c94768508c6 100644 --- a/pkgs/by-name/sy/syntaqlite/package.nix +++ b/pkgs/by-name/sy/syntaqlite/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "syntaqlite"; - version = "0.12.1"; + version = "0.13.0"; __structuredAttrs = true; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "LalitMaganti"; repo = "syntaqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-KdzaKjSvaoLWnxTBmNd8CDvPcCjY50hGWAJ1hkxldFc="; + hash = "sha256-QgLB+mIj7sR1cGUTWC0Ec3EEvPkcn0r9YU/EjaG/ri0="; }; - cargoHash = "sha256-tT6HM4R6P2C2zybkpOhvnHJS3OweI8cEeT7UzR4qlxc="; + cargoHash = "sha256-FUqY5874yq3SJb+gKOhVRqx8MhmLXW7ckUDTPUxFCKc="; # CLI contains MCP and LSP buildAndTestSubdir = "syntaqlite-cli"; diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix index c96b573cadb5..297803420539 100644 --- a/pkgs/by-name/sy/system76-power/package.nix +++ b/pkgs/by-name/sy/system76-power/package.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "i686-linux" "x86_64-linux" "aarch64-linux" + "riscv64-linux" ]; maintainers = with lib.maintainers; [ smonson diff --git a/pkgs/by-name/sy/system76-scheduler/package.nix b/pkgs/by-name/sy/system76-scheduler/package.nix index 791deab16cfd..0a980ec81953 100644 --- a/pkgs/by-name/sy/system76-scheduler/package.nix +++ b/pkgs/by-name/sy/system76-scheduler/package.nix @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage { "x86_64-linux" "x86-linux" "aarch64-linux" + "riscv64-linux" ]; maintainers = [ lib.maintainers.cmm ]; }; diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix index 10a39352f403..02fe4ad9ade4 100644 --- a/pkgs/by-name/ta/tarts/package.nix +++ b/pkgs/by-name/ta/tarts/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "tarts"; - version = "0.1.26"; + version = "0.1.27"; src = fetchFromGitHub { owner = "oiwn"; repo = "tarts"; rev = "v${finalAttrs.version}"; - hash = "sha256-IhK74R43ylJqT7eESY/ko/0+PfvJeJav/lERrVM0ZOA="; + hash = "sha256-usGipUUUIZUxTzNSiq0Dv/g5oFgRJMmLUzbaIAWojws="; }; - cargoHash = "sha256-gMifRr9cTLIOz6jbjYDUS/JQJL/lOfYzt8w0PT9+Q+M="; + cargoHash = "sha256-RR+mjmHotlVrBVUMoGKIrEchWwIDarqhSsjLp8NbOBQ="; meta = { description = "Screen saves and visual effects for your terminal"; diff --git a/pkgs/by-name/ta/tartube/package.nix b/pkgs/by-name/ta/tartube/package.nix index dc03f0e92fe5..e7b9f6b9908f 100644 --- a/pkgs/by-name/ta/tartube/package.nix +++ b/pkgs/by-name/ta/tartube/package.nix @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "GUI front-end for youtube-dl"; - license = lib.licenses.gpl3; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ mkg20001 ]; homepage = "https://tartube.sourceforge.io/"; diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix index 53e4ce97e3a4..4c6e21aa2869 100644 --- a/pkgs/by-name/ta/taskwarrior2/package.nix +++ b/pkgs/by-name/ta/taskwarrior2/package.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ oxalica Necior + me-and ]; mainProgram = "task"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 1e738ab904a9..1349172cdbbd 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { mlaradji doronbehar Necior + me-and ]; mainProgram = "task"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json index ea7b9f769971..72cb14fb6d0b 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json @@ -11,8 +11,8 @@ }, { "pname": "QRCoder", - "version": "1.8.0", - "hash": "sha256-UvOeFFxUZ/bddmDs6IamiYGDIfgxybE/CSpPyy5DMxI=" + "version": "1.8.1", + "hash": "sha256-0/5cgMdCtqLvijFzTAZgDi1nSAapfzb0r5ew0ocd4wk=" }, { "pname": "System.Drawing.Common", diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 32d9e6ef39d0..65a2be50cc06 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -6,7 +6,7 @@ }: buildDotnetModule (finalAttrs: { pname = "technitium-dns-server-library"; - version = "15.6.0"; + version = "15.6.2"; __structuredAttrs = true; @@ -14,7 +14,7 @@ buildDotnetModule (finalAttrs: { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = "dns-server-v${finalAttrs.version}"; - hash = "sha256-LKwUeQDqOzSstSTTPcxIMedH4xVClJ83eF6qz3KUlPI="; + hash = "sha256-fb5o4AlKFU/oPypD7T3sNoUdY7nHS4skGovDSLNzpI0="; }; dotnet-sdk = dotnetCorePackages.sdk_10_0; diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json index bb53096e7d47..dd91452f1de7 100644 --- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json @@ -6,8 +6,8 @@ }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "10.0.12", - "hash": "sha256-W3pYq6kIZR6brxV8cWBsgD+lyzVstN0vQ1579WC6Xd4=" + "version": "10.0.13", + "hash": "sha256-MX4vZb/1twzVhqVItSHEgjiMAtjYXglCYpHM5N1T4nY=" }, { "pname": "Microsoft.Bcl.Cryptography", @@ -61,13 +61,13 @@ }, { "pname": "QRCoder", - "version": "1.8.0", - "hash": "sha256-UvOeFFxUZ/bddmDs6IamiYGDIfgxybE/CSpPyy5DMxI=" + "version": "1.8.1", + "hash": "sha256-0/5cgMdCtqLvijFzTAZgDi1nSAapfzb0r5ew0ocd4wk=" }, { "pname": "System.DirectoryServices.Protocols", - "version": "10.0.12", - "hash": "sha256-tpYNScocWAml3NqO4hHvpJr3ULd2rdHxijTcVDIxiEo=" + "version": "10.0.13", + "hash": "sha256-pHw0BSv7bIy9IS3GHpXdg1pXx1Q6yDDom5TK9QvP/hg=" }, { "pname": "System.Drawing.Common", diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index baaa885684e4..4b7bdadd4756 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -9,7 +9,7 @@ }: buildDotnetModule (finalAttrs: { pname = "technitium-dns-server"; - version = "15.6.0"; + version = "15.6.2"; __structuredAttrs = true; @@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${finalAttrs.version}"; - hash = "sha256-1BihL4y33XdI0TpQck0yriW50o9kclN+vnFLUJN8h4Y="; + hash = "sha256-+GMGwqPWVmMIhpa4ukM8Yh5aYtMOaEiNwRL+2leiJKo="; }; dotnet-sdk = dotnetCorePackages.sdk_10_0; diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix index d5c33ad4e309..b6cdd7115394 100644 --- a/pkgs/by-name/te/temporal-ui-server/package.nix +++ b/pkgs/by-name/te/temporal-ui-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "temporal-ui-server"; - version = "2.55.0"; + version = "2.56.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "ui-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-49CoWlINaiFUSWq1CvF66HTR7V2maT2h1Wam/OpFrn8="; + hash = "sha256-rj9by/QUznZ3vWZM8fVkCrfYXH2YKjwBZmNKZCb+4uU="; }; - vendorHash = "sha256-f66CEJLdehMF5lPt+kRHobtpD7YbpPQAyey57USEGtA="; + vendorHash = "sha256-koUTvqkyUYmiEIBIhSPompMQHi+HI4Zsq0SOJ0wnQFc="; postInstall = '' mv $out/bin/server $out/bin/temporal-ui-server diff --git a/pkgs/by-name/th/thonny/package.nix b/pkgs/by-name/th/thonny/package.nix index 3c18eb9f0847..9206807932ed 100644 --- a/pkgs/by-name/th/thonny/package.nix +++ b/pkgs/by-name/th/thonny/package.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "thonny"; - version = "4.1.7"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "thonny"; repo = "thonny"; tag = "v${finalAttrs.version}"; - hash = "sha256-RnjnXB5jU13uwRpL/Pn14QY7fRbRkq09Vopc3fv+z+Y="; + hash = "sha256-gvYf42QHoMHvowSb1nk2/VQmVWaXK+Cb89zqw0BWljo="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { }) ]; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3.pkgs; [ uv-build ]; dependencies = with python3.pkgs; @@ -54,12 +54,18 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyperclip asttokens send2trash + setuptools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-next ] ); + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '<0.12.0' '<0.13.0' + ''; + preFixup = '' wrapProgram "$out/bin/thonny" \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) @@ -84,6 +90,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ''; homepage = "https://www.thonny.org/"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Holiu618 ]; platforms = lib.platforms.unix; mainProgram = "thonny"; }; diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index 0a90d7f497f5..c4dc99de6938 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -118,6 +118,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = with lib.platforms; linux ++ darwin; mainProgram = "tic80"; - maintainers = with lib.maintainers; [ blinry ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ti/tinyalsa/package.nix b/pkgs/by-name/ti/tinyalsa/package.nix index dd3fde0dd6a7..fc4a2c64aa37 100644 --- a/pkgs/by-name/ti/tinyalsa/package.nix +++ b/pkgs/by-name/ti/tinyalsa/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyalsa"; - version = "2.0.0-unstable-2026-09-29"; + version = "2.0.0-unstable-2026-10-14"; src = fetchFromGitHub { owner = "tinyalsa"; repo = "tinyalsa"; - rev = "961babfe962e71d952ae734074cc89576b28a9e7"; - hash = "sha256-esuw40BFAKjYhLigflTWQoixcZkQ0e/Mc1UO/pNE05E="; + rev = "bbdba1e208f402c5b7d5cb3d42307a3db9f6bb1c"; + hash = "sha256-WREUx5QCNsY0ovuwVDrJzuNWQFYzKP6n7+QTTiGlLLY="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 1b6c83702692..9fae72628858 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.15.8"; + version = "0.15.10"; __structuredAttrs = true; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y9HyVlHXtdVM26YZ3hqRnL0TDtZ0mkBulk5IQrxZig0="; + hash = "sha256-qzAY8bHPkLUbXOsDQQhFbXT1phy0+ENQUpH58BKbz2g="; }; - cargoHash = "sha256-7A8bF9ZH/6fTIwO7PH6wkMCon1CofiyK9rtbj/lcEIg="; + cargoHash = "sha256-5fZFgqcDUz74eJj4w8zoR9WEVTI63dAIbGPoDjNhwl0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tl/tlsrouter/package.nix b/pkgs/by-name/tl/tlsrouter/package.nix new file mode 100644 index 000000000000..72bde606d21b --- /dev/null +++ b/pkgs/by-name/tl/tlsrouter/package.nix @@ -0,0 +1,35 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, +}: + +buildGoModule { + pname = "tlsrouter"; + version = "0-unstable-2026-09-22"; + + src = fetchFromGitHub { + owner = "inetaf"; + repo = "tcpproxy"; + rev = "c159a60511096e475e3489ce13ae57e752c78f99"; + hash = "sha256-414PJnfDIHEJJH0CAiegMrM0ehsLyW3g/4afzsjdJX8="; + }; + + vendorHash = "sha256-AFgBQsufrJhfMnbSAOyfgSK6StMix0zKvsRJJx4jmtY="; + + subPackages = [ "cmd/tlsrouter" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + __structuredAttrs = true; + + meta = { + description = "TLSRouter is a TLS proxy that routes connections to backends based on the TLS SNI (Server Name Indication) of the TLS handshake"; + homepage = "https://github.com/inetaf/tcpproxy"; + mainProgram = "tlsrouter"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.xsteadfastx ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/tm/tmux-cssh/package.nix b/pkgs/by-name/tm/tmux-cssh/package.nix index bf874600c678..73076213a7d6 100644 --- a/pkgs/by-name/tm/tmux-cssh/package.nix +++ b/pkgs/by-name/tm/tmux-cssh/package.nix @@ -8,15 +8,18 @@ stdenv.mkDerivation { pname = "tmux-cssh"; - version = "unstable-2015-10-15"; + version = "0-unstable-2024-07-31"; src = fetchFromGitHub { owner = "zinic"; repo = "tmux-cssh"; - rev = "21750733c5b6fa2fe23b9e50ce69d8564f2f742a"; - hash = "sha256-Rz4n87aYZLkF0TQNl5F80gJwXHYWEes67EwkUh9ptSw="; + rev = "2841d12a20e15a3a7778e3b0d9222889a12173b1"; + hash = "sha256-4w4P4ss6ou6CfHDMsgVRiOF+/xLxINzS0Qu79LXW1X4="; }; + strictDeps = true; + __structuredAttrs = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -26,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/dennishafemann/tmux-cssh"; + homepage = "https://github.com/zinic/tmux-cssh"; description = "SSH to multiple hosts at the same time using tmux"; longDescription = '' diff --git a/pkgs/by-name/to/todoist-cli/package.nix b/pkgs/by-name/to/todoist-cli/package.nix index 079a27df5662..7b746a183aab 100644 --- a/pkgs/by-name/to/todoist-cli/package.nix +++ b/pkgs/by-name/to/todoist-cli/package.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "todoist-cli"; - version = "5.4.8"; + version = "5.5.2"; src = fetchFromGitHub { owner = "Doist"; repo = "todoist-cli"; rev = "v${version}"; - sha256 = "sha256-0Xa3SeVChnvQ8plJbNGJD8BjH2Sk1C+ZoLPyv78D3c4="; + sha256 = "sha256-kVPEL89MeAhGrrYKakFw0Q/XAW3F0FOuYhDoZDjsj0o="; }; - npmDepsHash = "sha256-UTCv5Hzri7or4X9nuzobA+wepQzIVBjeKl7mIeXXA1E="; + npmDepsHash = "sha256-k3S/IyKtzEnlA1rvqX94HvPzB6LPNIBLDZf6yz5yYn4="; doCheck = true; diff --git a/pkgs/by-name/to/toml-sort/package.nix b/pkgs/by-name/to/toml-sort/package.nix index 0ecbb6ddfc94..d7569c0c4536 100644 --- a/pkgs/by-name/to/toml-sort/package.nix +++ b/pkgs/by-name/to/toml-sort/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "0.24.4"; + version = "0.25.0"; in python3Packages.buildPythonApplication { pname = "toml-sort"; @@ -15,12 +15,12 @@ python3Packages.buildPythonApplication { owner = "pappasam"; repo = "toml-sort"; tag = "v${version}"; - hash = "sha256-3xuCnzZ6SKUclvyyWRxHUJy0xF1rnJYwWPZD0OKWFxQ="; + hash = "sha256-uEmIQq0Mc7dpDOzfhSgj6MY2EJMrn6MiT8SL1eYLtzE="; }; build-system = [ python3Packages.poetry-core ]; - dependencies = [ python3Packages.tomlkit ]; + dependencies = [ python3Packages.tomlrt ]; nativeCheckInputs = [ python3Packages.pytestCheckHook ]; diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index b64eea092b25..20e49c85c0e0 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -8,16 +8,16 @@ buildGo126Module (finalAttrs: { pname = "traefik"; - version = "3.7.14"; + version = "3.7.15"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; - hash = "sha256-GxM5HcTER2iBhPCfCgMcAMLTWpwY3NuDbLHWMsG2oJU="; + hash = "sha256-h793d5GKKTBhDbQfSzIOeSyh0c46qypJXv8htfKI9z4="; stripRoot = false; }; - vendorHash = "sha256-pyMQCB2YR7ofWpJeyOmC6OnQIpxpYxCJHZvqv+eLKcc="; + vendorHash = "sha256-3Xt2HSx2XfNSnVMi9sNmcFmTO9hZrSQv6Ilh7eRuaE0="; proxyVendor = true; diff --git a/pkgs/by-name/tr/tranquil-pds-frontend/package.nix b/pkgs/by-name/tr/tranquil-pds-frontend/package.nix index 2fa310e20ffe..b353d6dfb55f 100644 --- a/pkgs/by-name/tr/tranquil-pds-frontend/package.nix +++ b/pkgs/by-name/tr/tranquil-pds-frontend/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromTangled { did = "did:plc:jj6ajj6duxnlthwtnob4qyuv"; tag = "v${finalAttrs.version}"; - hash = "sha256-QbncR2z9GhxKKbbCf6a5Ph4lLi4OYWjRN49s7+5q7Uc="; + hash = "sha256-qsV7AXQHITaWQ3lFGyvdukV8gcVoI4P02QWS4BsZxIQ="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; diff --git a/pkgs/by-name/tr/tranquil-pds/package.nix b/pkgs/by-name/tr/tranquil-pds/package.nix index b1ed824f047d..19715eec70fd 100644 --- a/pkgs/by-name/tr/tranquil-pds/package.nix +++ b/pkgs/by-name/tr/tranquil-pds/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tranquil-pds"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromTangled { did = "did:plc:jj6ajj6duxnlthwtnob4qyuv"; tag = "v${finalAttrs.version}"; - hash = "sha256-QbncR2z9GhxKKbbCf6a5Ph4lLi4OYWjRN49s7+5q7Uc="; + hash = "sha256-qsV7AXQHITaWQ3lFGyvdukV8gcVoI4P02QWS4BsZxIQ="; }; - cargoHash = "sha256-fjT0cAt7lPD0O2PGNT604dRIczerKjExJvU/L3Yul3c="; + cargoHash = "sha256-K4wTFCEozwqAoaFFPhN6ZgonPB1FBuFDT9mjNHumHcs="; __structuredAttrs = true; diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index f4e9e13da4f0..7ef479bba8d7 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -720,9 +720,9 @@ }; erlang = rec { - version = "0.1.0"; + version = "0.21.0"; url = "github:WhatsApp/tree-sitter-erlang?ref=${version}"; - hash = "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog="; + hash = "sha256-K4ytlHKE5YW8gu1YvXVv9bKrpU6o0I7NNP0kXcV4mSk="; meta = { license = lib.licenses.asl20; }; @@ -2738,9 +2738,9 @@ }; scala = { - version = "0.26.2"; + version = "0.26.3"; url = "github:tree-sitter/tree-sitter-scala"; - hash = "sha256-PRyNcsiGeGfKtHvbLaGtiog/P8QEs117rqoBZZOXbeE="; + hash = "sha256-hTcG41bQqTSSsqtvtXW6wJIEFZJE49HYmYNJJw1wrho="; meta = { license = lib.licenses.mit; }; @@ -2923,9 +2923,9 @@ }; sshclientconfig = rec { - version = "2026.10.8"; + version = "2026.10.15"; url = "github:metio/tree-sitter-ssh-client-config?ref=${version}"; - hash = "sha256-PhNHsWjqTmchRH+noVQcwCFNNyA6/RvPiwDDquBuQFo="; + hash = "sha256-UZL/JxyxCLCez8A5PPcbA0wNzRENMR4sB1HIxDeO0FY="; meta = { license = lib.licenses.cc0; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 03655f1458b3..b2985a4e739f 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.99.2"; + version = "3.99.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-1m/wYryGocqVcpbg1Hfw3TV5jaPTA8Pp/mXwWT8eQkM="; + hash = "sha256-iPCdnDHbcU9E+jHhEiab5oEB1QiBV7vnyZPUxuAt4uE="; }; - vendorHash = "sha256-WgeNd4ktPaP6syPYHIqZlisuzEBGBgUijn2a9ZJUhhE="; + vendorHash = "sha256-FofhlVFYy6xqv7cjWGeEGtWeLSe2kHBq4ceBvz6KLMU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index c59e0357fe33..33940a03ecf1 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ttdl"; - version = "6.2.2"; + version = "6.2.3"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tHK8R+FFgQRbwBBWaeNAxCXtzEhrTVIq6vl8j3YvnDk="; + sha256 = "sha256-OA8hmDPTCqUMdAaaQswCv70ZBHd6USe4Cpol4LavBzY="; }; - cargoHash = "sha256-/IE64OeMwmOHGnGJXvDdAUzIVggzNk54Nh4qIuYwOj4="; + cargoHash = "sha256-eWDYx9hEt77zmEWOkmjs9DRvHOV3y+cwNOvrGa5eo60="; meta = { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 533bd02b4ecf..3403b1d0b8bd 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -2,48 +2,70 @@ lib, stdenv, capnproto, + cctools, fetchFromGitHub, - fontconfig, installShellFiles, llvmPackages, - nix-update-script, - openssl, - pkg-config, protobuf, - rust-jemalloc-sys, rustPlatform, - zlib, + xcbuild, + zig_0_15, }: - -rustPlatform.buildRustPackage (finalAttrs: { +let pname = "turbo-unwrapped"; - version = "2.9.18"; + version = "2.11.7"; + + ghostty-src = fetchFromGitHub { + owner = "ghostty-org"; + repo = "ghostty"; + rev = "a887df42c56f6de86c0fe6da9c4eeca37931e083"; + hash = "sha256-1Zz65SCk3rkJ9+Q0MmyNOTNiDSLBRIHRd3IvFM4iNXw="; + }; + ghostty-deps = zig_0_15.fetchDeps { + inherit pname version; + src = ghostty-src; + fetchAll = true; + hash = "sha256-PnM+hZIlLyQwK8vJgd/Bhjt1lNIz06T8FahwliRmMrY="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + inherit pname version; src = fetchFromGitHub { owner = "vercel"; repo = "turborepo"; tag = "v${finalAttrs.version}"; - hash = "sha256-ugPkWeUJqt1KnGYC85hihHXl3JPlfbTvk4RaLIvVq2Y="; + hash = "sha256-kxYQLRgHHmlYkLK5X/ohK1pxevG7nXsgbW7Sz6irQus="; }; - cargoHash = "sha256-LBGaZgW4q//VJfXIqzByQogz0o/fyQcTAAFwlHPuRUc="; + cargoHash = "sha256-kva0HTfCfapLhda1ppMM7e4dT/fgJzvRYw/t26p9e0s="; nativeBuildInputs = [ capnproto installShellFiles - pkg-config protobuf + zig_0_15.hook ] # https://github.com/vercel/turbo/blob/ea740706e0592b3906ab34c7cfa1768daafc2a84/CONTRIBUTING.md#linux-dependencies - ++ lib.optional stdenv.hostPlatform.isLinux llvmPackages.bintools; - - buildInputs = [ - fontconfig - openssl - rust-jemalloc-sys - zlib + ++ lib.optionals stdenv.hostPlatform.isLinux [ llvmPackages.bintools ] + # Tools required for building `libghostty-vt-sys` on darwin. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + xcbuild ]; + dontUseZigBuild = true; + dontUseZigCheck = true; + dontUseZigInstall = true; + + env = { + # Use vendored ghostty source and dependencies. + GHOSTTY_SOURCE_DIR = ghostty-src; + GHOSTTY_ZIG_SYSTEM_DIR = ghostty-deps; + # nightly features are used + RUSTC_BOOTSTRAP = 1; + }; + cargoBuildFlags = [ "--package" "turbo" @@ -59,17 +81,9 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/turbo completion zsh) ''; - env = { - # nightly features are used - RUSTC_BOOTSTRAP = 1; - }; - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--use-github-releases" - ]; - }; + inherit ghostty-src ghostty-deps; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/tu/turbo-unwrapped/update.sh b/pkgs/by-name/tu/turbo-unwrapped/update.sh new file mode 100755 index 000000000000..4b4d1a0aa741 --- /dev/null +++ b/pkgs/by-name/tu/turbo-unwrapped/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update gnugrep gnused + +set -euo pipefail + +nix-update turbo-unwrapped + +src="$(nix-build --no-out-link -A turbo-unwrapped.src)" +rev=$(grep "const GHOSTTY_COMMIT" "$src/crates/libghostty-vt-sys/build.rs" | cut -d '"' -f2) +sed -i -E "s|\brev = \".*\";|rev = \"$rev\";|" "pkgs/by-name/tu/turbo-unwrapped/package.nix" + +nix-update turbo-unwrapped --no-src --custom-dep ghostty-src --custom-dep ghostty-deps diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index f3f094a904db..d0fba1dd0d6a 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -9,16 +9,16 @@ let pname = "tutanota-desktop"; - version = "359.260904.0"; + version = "361.261006.0"; linuxSrc = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-bhgKpOVkx5NdnhbfDawZp3cvE9sjdZYu0TKcUSgi6w4="; + hash = "sha256-QkBFjoX9Dcc1Gr6UAmMX4GmM0HMNwW9kK5y+xyOqFGg="; }; darwinSrc = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-mac.dmg"; - hash = "sha256-l0M1p/9HNOS7Z0+ljnDeX0eHeyLHc6rM4//EjDsWzo4="; + hash = "sha256-Mejw445xMxG+5Y+AFizy2JwGFdkxrKsPCchcB1Rrb74="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix index a367165f4654..2a946111363c 100644 --- a/pkgs/by-name/ub/ubridge/package.nix +++ b/pkgs/by-name/ub/ubridge/package.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ anthonyroussel ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index 862e916fde63..4f12dd9f9fa9 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "umpire"; - version = "2025.12.0"; + version = "2026.07.2"; strictDeps = true; __structuredAttrs = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "LLNL"; repo = "umpire"; tag = "v${finalAttrs.version}"; - hash = "sha256-9lGI5SKpDIIzZvsG/yKopfXS1PuHOQB9bwSuML2Xh/8="; + hash = "sha256-ZYF0/O+TkeqWhxSNvJFSAav778zSLml8rANcgadNNx8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix index b3b88e786c7e..cdf3a1019c7b 100644 --- a/pkgs/by-name/un/unifi/package.nix +++ b/pkgs/by-name/un/unifi/package.nix @@ -1,6 +1,6 @@ { lib, - stdenvNoCC, + stdenv, dpkg, fetchurl, nixosTests, @@ -9,7 +9,7 @@ jdk25_headless, }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "unifi-controller"; version = "10.6.106"; @@ -28,6 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; buildInputs = [ + stdenv.cc.cc.lib systemd ]; diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index b2c30903fb22..cd1179bb9fea 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "unpoller"; - version = "5.5.1"; + version = "5.6.3"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${finalAttrs.version}"; - hash = "sha256-2MYNMSaTuR0PZY8hMB1RLgwTjZHdCbgo/vLSQuN7ehQ="; + hash = "sha256-2/cRA/W+5L2l7IcpjagbxBjx+yNulMk4QhQYV9Pv0mU="; }; - vendorHash = "sha256-Aa5+DwYVFPaYA6CehG2ffy2wCbZCWduLR11joA6d7KE="; + vendorHash = "sha256-9B6Lhi7jWn5u2Iig3c49ky8kYaNlFiefIVwYdnOEsIo="; ldflags = [ "-w" diff --git a/pkgs/by-name/up/upki/package.nix b/pkgs/by-name/up/upki/package.nix index 98d7ef791f5f..1f8a81a24726 100644 --- a/pkgs/by-name/up/upki/package.nix +++ b/pkgs/by-name/up/upki/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "upki"; - version = "1.0.0-beta.3"; + version = "1.0.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rustls"; repo = "upki"; - tag = "upki-${finalAttrs.version}"; - hash = "sha256-GZkXxidIjG76yIzAcMRsRorMVYpImFN5Q2pe2YgiEUs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rEGFhMWnFOBSaWpEY9/HJGxJK7OSAb+yPNWuNgTJ768="; }; - cargoHash = "sha256-/z11KuGP3A3fh/Jk2Kx26x7okh6brHs+t/XC7BuPgcA="; + cargoHash = "sha256-5eecMFTVq1scGAw9DEXEYz/89Qe9dVBymyJmKgYfoqg="; cargoBuildFlags = [ "--package=upki-cli" @@ -57,6 +57,12 @@ rustPlatform.buildRustPackage (finalAttrs: { --target=${stdenv.hostPlatform.rust.rustcTarget} ''; + preCheck = '' + # fetch_with_stale_local_manifest sets its local cache mtime to 1970-01-02. + # Make the server fixture newer than that cache. + touch -d @172800 upki-cli/tests/data/typical/revocation/manifest.json + ''; + postInstall = '' ${buildPackages.rust.envVars.setEnv} cargo cinstall --release --frozen \ --package=upki \ @@ -91,7 +97,10 @@ rustPlatform.buildRustPackage (finalAttrs: { lib.licenses.mit lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.skyesoss ]; + maintainers = [ + lib.maintainers.skyesoss + lib.maintainers.cpu + ]; mainProgram = "upki"; pkgConfigModules = [ "upki" diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix index 54a44d3d1cd6..62a5d2d229fc 100644 --- a/pkgs/by-name/up/upower/package.nix +++ b/pkgs/by-name/up/upower/package.nix @@ -35,7 +35,7 @@ assert withDocs -> withIntrospection; stdenv.mkDerivation (finalAttrs: { pname = "upower"; - version = "1.91.4"; + version = "1.91.5"; outputs = [ "out" @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upower"; repo = "upower"; rev = "v${finalAttrs.version}"; - hash = "sha256-B/gfrXPLYwOGyheTLP/sEH5RakLUm4OiRAV+U2wL9V0="; + hash = "sha256-1ccMs+iA3H0xt9pYKsXV/0zBYjWsvmfqMoJ+/ZJvwDI="; }; patches = diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index e7459715ff52..0cd21eaac0ba 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.13.0", + "version": "5.14.0", "darwin-amd64": { - "hash": "sha256-gfdAbE63g1MjbzQNrV9Fl9+g5vEM2p0PfeX22Eh4l4k=", - "url": "https://github.com/upsun/cli/releases/download/v5.13.0/upsun_5.13.0_darwin_all.tar.gz" + "hash": "sha256-zVhaeCq1xLkAz1QHbyByfgLwB5PxJlKhAzv93O5R+F8=", + "url": "https://github.com/upsun/cli/releases/download/v5.14.0/upsun_5.14.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-gfdAbE63g1MjbzQNrV9Fl9+g5vEM2p0PfeX22Eh4l4k=", - "url": "https://github.com/upsun/cli/releases/download/v5.13.0/upsun_5.13.0_darwin_all.tar.gz" + "hash": "sha256-zVhaeCq1xLkAz1QHbyByfgLwB5PxJlKhAzv93O5R+F8=", + "url": "https://github.com/upsun/cli/releases/download/v5.14.0/upsun_5.14.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-cc/U8fKT3+MfCYi4kvHekA4JPqDjPPz/nBx4/xdYO0g=", - "url": "https://github.com/upsun/cli/releases/download/v5.13.0/upsun_5.13.0_linux_amd64.tar.gz" + "hash": "sha256-7GcvBn4hudiMdnjytIZQUKvtlYCtNmyNlofMAHWoqsM=", + "url": "https://github.com/upsun/cli/releases/download/v5.14.0/upsun_5.14.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-gN4CRm1Uni55xAl/wMPC88svabsPDeQXt+lhYCTlamo=", - "url": "https://github.com/upsun/cli/releases/download/v5.13.0/upsun_5.13.0_linux_arm64.tar.gz" + "hash": "sha256-dFz8h0BRfhLfuf06W5NEbGon66DOn+LyLPULRyff1uE=", + "url": "https://github.com/upsun/cli/releases/download/v5.14.0/upsun_5.14.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index abc0dee1dd72..704235028535 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.13.1"; + version = "0.13.4"; __structuredAttrs = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-+yl2XsAViHL1y91cI2z6VXbwf1Tt0uQ5sE3O2g2f1mw="; + hash = "sha256-US3SjwhWE3v4/i46YuBon2GA6PupC4Z0NRUqcV9CPLM="; }; - cargoHash = "sha256-jbMVOFrG9HDtBXCAFYvI8zXujeM5Z6Cr1/qfKfrRyxU="; + cargoHash = "sha256-9L47CTlkOVYfGuzE4e7e2FYAI192pAsipzzScF7B1j4="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/uv/uvtools/deps.json b/pkgs/by-name/uv/uvtools/deps.json new file mode 100644 index 000000000000..8348d31fe512 --- /dev/null +++ b/pkgs/by-name/uv/uvtools/deps.json @@ -0,0 +1,727 @@ +[ + { + "pname": "Avalonia", + "version": "12.1.3", + "hash": "sha256-3/tmBbAuFEhmyyN2XrWvclU3nrt+3nXPEQZvMkjYNzQ=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.27548.20260419", + "hash": "sha256-dtZ5AQl+kXPRVe/EwrfSyOMSLywuBBUCjrDIhHijhvk=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "12.1.3", + "hash": "sha256-gNusbpdl2w1h4ENp+K8r+CZ0jNLLrTLlNgpw6lhRnhk=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "12.1.2", + "hash": "sha256-EKv+UnSScgONwbIY9NLTRHyGlK9QTCvXIT/bFP+13Go=" + }, + { + "pname": "Avalonia.Desktop", + "version": "12.1.3", + "hash": "sha256-y3ZqNYglcHlE0Z8iC9DKkiySEZ3a1wG42M2aJXjMnDs=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "12.1.3", + "hash": "sha256-9rSwNg8uc1w/5Pzuw2fxC6I7U1271HrChMUkUeg5Lko=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "12.1.3", + "hash": "sha256-KUgO49V84mV4sgmKNNFPevnbjmyCndIrpSfmLTh8FHU=" + }, + { + "pname": "Avalonia.FreeDesktop.AtSpi", + "version": "12.1.3", + "hash": "sha256-AZSQga8H29EFuPgJKcEFYcolLv87p04d8m0LCvboXcw=" + }, + { + "pname": "Avalonia.HarfBuzz", + "version": "12.1.3", + "hash": "sha256-a8iP29LyZLjHsy4cjHcVMpCYlfE4P6qDJZQPDRqqtzQ=" + }, + { + "pname": "Avalonia.Native", + "version": "12.1.3", + "hash": "sha256-Zh+hlPbeeFZHoZ7KaTSVhJb60tDypN2i55H1Zc0siO4=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "12.1.3", + "hash": "sha256-+JL6fQxCz44Bc5jGoeM1DlMqRt+TsCw4T7oL4/auFpY=" + }, + { + "pname": "Avalonia.Skia", + "version": "12.1.1", + "hash": "sha256-9oPb5fXc395iy4vuDMdeO5vsldn5JHlso2J72ov6TyU=" + }, + { + "pname": "Avalonia.Skia", + "version": "12.1.3", + "hash": "sha256-4pykG9/rHJQTYWA+LGna9H6pBoFBajEp/QVVlWeIHio=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "12.1.3", + "hash": "sha256-ZuMdfXYWi9DNBQ0zJKVJeR3kauCD0TPQzuVfP2UbwbE=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "12.1.1", + "hash": "sha256-08yqLPYRleCNOh1A1GsVmHGjn8QB3F06AM27J+ZD5Gk=" + }, + { + "pname": "Avalonia.Win32", + "version": "12.1.3", + "hash": "sha256-2I8/64NBvcOiwmIqj66rhdOpSTSgL4JZLmMb5qqUtyk=" + }, + { + "pname": "Avalonia.X11", + "version": "12.1.3", + "hash": "sha256-pjrYlZ9nVRNpp5A3UVDZOfcqGx60AOFlj+VUbg94hC4=" + }, + { + "pname": "AvaloniaUI.DiagnosticsSupport", + "version": "2.2.3", + "hash": "sha256-JIFcmHnxVAreGaFJ7nK1RESg0zYINL6Zyc79k2QwFUk=" + }, + { + "pname": "BinarySerializer", + "version": "10.1.0", + "hash": "sha256-GcjXcJmagQ03taOTzoiNTzltZ69nr6XwBU1/l3GPj1k=" + }, + { + "pname": "CommunityToolkit.Diagnostics", + "version": "8.4.2", + "hash": "sha256-oF/W/1B0cvKwKJDelTCp48+SnLP4GMVNZUIBugNLck0=" + }, + { + "pname": "CommunityToolkit.HighPerformance", + "version": "8.4.2", + "hash": "sha256-IgDfOixA81NSrmXaFwx9jAb4jCOQ3s+hsC8qulV/AB0=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.4.2", + "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU=" + }, + { + "pname": "DotNext", + "version": "6.8.0", + "hash": "sha256-VwAd2tSxnh8vsTiEdusAEUiEq+F5uERYE2Avvoz+fNY=" + }, + { + "pname": "DotNext.IO", + "version": "6.8.0", + "hash": "sha256-w1R3X4YOR+qTCGaWY2n4nnzZqQubvocviroSexarBQg=" + }, + { + "pname": "Emgu.CV", + "version": "4.13.0.5924", + "hash": "sha256-eqQOx679igyQHBhnJ0J7YnxosaPu7XHod/EQL5xCDfM=" + }, + { + "pname": "EmguExtensions", + "version": "0.2.1", + "hash": "sha256-qVeC8iUWOpLpbLaSdLT2pOubuKDF+ykyEbm+Dd/2YQs=" + }, + { + "pname": "EmguExtensions.Avalonia", + "version": "0.2.1", + "hash": "sha256-Xy4LUjv3STGYKwOWzt3Y2YyBXEHPO/GpjB1dbP3vZUU=" + }, + { + "pname": "ExCSS", + "version": "4.3.1", + "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o=" + }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.1.3", + "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "8.3.1.3", + "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "8.3.1.3", + "hash": "sha256-6WKsJ/jF9pHnaWcQvaezc5AV6flu3XsOxQs7i4BGYJs=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "8.3.1.3", + "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "8.3.1.3", + "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM=" + }, + { + "pname": "KdTree", + "version": "1.4.1", + "hash": "sha256-R4+L26pJoliLiwMuxmJDoa3Vf16gBq417fN+iNCy7Yc=" + }, + { + "pname": "Markdig", + "version": "1.4.0", + "hash": "sha256-vdhDU6P0mfmJ8xEbM6zuvZQ0+KBpyos9oqBl8iMOe68=" + }, + { + "pname": "MarkView.Avalonia", + "version": "12.3.0", + "hash": "sha256-djroD4U5MNOnxZIYFPAed5Wq9YvH713QH0aMZ3Eiq/Q=" + }, + { + "pname": "Material.Icons", + "version": "3.0.2", + "hash": "sha256-BP1fQLsidpNpiyG87V6oNnuO8CKo8hcf6405AScb2Cs=" + }, + { + "pname": "Material.Icons.Avalonia", + "version": "3.0.2", + "hash": "sha256-1FHaifgw3P/holj2QcXH+1U4Mrga5qKsUrYgkYNuXXU=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.6", + "hash": "sha256-RTr200R3sZuyxi0XQ25ox2p1kVt5R1CbH/YBs21+eNg=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.31", + "hash": "sha256-vMnNfXlEkZq5fpys8z5SnCn9q/BYXLw+CXcEdGeD6hg=" + }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "9.0.20", + "hash": "sha256-ZMaHC0MFs2YvW/fHGsxuXZnS74rcS9GJ1LGaMuscdMo=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "8.0.31", + "hash": "sha256-gPPxKQRPdKXBKlGyLe4jg/gNZ4vYa3iCwshiRPmkH4s=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "9.0.20", + "hash": "sha256-fAcTgHdWUgQ1Q6gO1WfHzrcmdxyCNxosYyRgP0nnlt0=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.31", + "hash": "sha256-0sAwUHBaAhI2vIRlSD/HtNBrJHa132JTzfnWIDaPJXY=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "9.0.20", + "hash": "sha256-ll6isPNcUHbChwtBEh+vIi6AI1DMf+cRaxk/q+d5Iyg=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "10.0.401", + "hash": "sha256-nGvkY1TljHYGP8Bsx2s1RCti0S1DMSZZcIi9eq6cp9o=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "5.9.0-1.26328.17", + "hash": "sha256-p+9Mmyz0A79U5LUuuPuJ6UaiholPFI7L51Fdgcew9hI=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "5.9.0", + "hash": "sha256-d+/UcVwkyM1rNvm5KYCi9ahuSntTZI1PHKO3mjkzpCk=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "5.9.0", + "hash": "sha256-dgLD26oSImjzsmxswN0C65Ik3qlELtJ69cP+VtZDmT8=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", + "version": "5.9.0", + "hash": "sha256-Yf+EY8Hev0S/xMpLwxpqdNu8tExhY/3hsF3bhREUqnk=" + }, + { + "pname": "Microsoft.CodeAnalysis.Scripting.Common", + "version": "5.9.0", + "hash": "sha256-BYd3o3nivWsATri8jYGq6yXwlEPYCXnyukZ5T0NLU0U=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "18.10.1", + "hash": "sha256-j6kLSrn2sJA6sUf+tcDAfwI9maDTjU5+xZl7qd+5pEA=" + }, + { + "pname": "Microsoft.DotNet.PlatformAbstractions", + "version": "3.1.6", + "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "10.0.12", + "hash": "sha256-RmT6sKxLVriTUzP1nunngByKuW3nxXyztuuBkqWmHFU=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.0", + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.9", + "hash": "sha256-0ygY8JLOIKuYFwwdVCtDl8/8fV5IC9JgivfzXsjXXsI=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "10.0.12", + "hash": "sha256-NOqqYK+2HtPYbi4maergxpDQ4jfopwZrpb20WjhnCec=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.0", + "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" + }, + { + "pname": "Microsoft.IO.RecyclableMemoryStream", + "version": "3.0.1", + "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "18.10.1", + "hash": "sha256-12rO5bWnSE7xdrZg4zgRxu8/M4vUdR46ov0xiz2y/P4=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "8.0.31", + "hash": "sha256-2FWhduT40HVnt18J46uxhF5RxK9kdUojw8w24s+77zU=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "9.0.20", + "hash": "sha256-LQDhn3AD6gIiBSf8Je+rdwLjtssNx8NR7Zt3u9G1+GM=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.31", + "hash": "sha256-MGH8ZnjM4fZFp63mbLNpkojI2T7TvpvNgvpjOGfrTIE=" + }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "9.0.20", + "hash": "sha256-lsqBpxZyE13FPNsQrSEXDyjTpXnF6PX/hnUx4a+IikM=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.31", + "hash": "sha256-oChiwq8Hnb0R+Fx61PlO1VMFUw4M8Gcd4nnxoSlPIMY=" + }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "9.0.20", + "hash": "sha256-6FQ6u7gCcf0IabmnZZ2jUU2TpYNQHzcPtqT1BaoaMkI=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "8.0.31", + "hash": "sha256-yIr6s/EZUrzm1k3H0CImh1vtcomBgECs37q4B3hnQwI=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "9.0.20", + "hash": "sha256-QO3vk6l6ONBC4MfeppSIKbFJWXhxcl18jKePoBWHT6w=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.31", + "hash": "sha256-J6iRM18YDWcyxaU7SEd5B1O276obx8P4FAE6qWjWqjY=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "9.0.20", + "hash": "sha256-hCPvae3q8+fSnPqVWWXkziZsrkATUy2bcLEGjUKC5ik=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "10.0.401", + "hash": "sha256-pMxNSTNnCuTGDP9BW1hz9Z/9iStpGEqu7+T4SX/tpJo=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "10.0.401", + "hash": "sha256-uKCLYg1Nh6g4AkwCkrN8PS6dmKxvzXDsGKQN1KXp7QM=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "18.10.1", + "hash": "sha256-rtEsNPmOjjL1VCi6CRCLROMsbIia6sv6rGYciKUkbW8=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "18.10.1", + "hash": "sha256-1lLjkHDqSCMGjopGg0KwaNnztQrh/aP7V7E+ydtkgiw=" + }, + { + "pname": "NativeCompressions", + "version": "1.0.1", + "hash": "sha256-h3516RMy+TiG03vHvuCb1I5o6CFEp7v7LxyzmhgKGxY=" + }, + { + "pname": "NativeCompressions.LZ4", + "version": "1.0.1", + "hash": "sha256-ugD5M4rp2nVbQhCt83SzQHyHw34FxeLKrKZX3tIFc+E=" + }, + { + "pname": "NativeCompressions.LZ4.Core", + "version": "1.0.1", + "hash": "sha256-frzycQX1Y/xtiA9obwgHqtEvl2FB53SZdG4sy8Sy6pw=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime", + "version": "1.0.1", + "hash": "sha256-05TPLEaG8STqzzKBrJCQDWLmFLBgln+LYXcC6mWKYJI=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.android-arm", + "version": "1.0.1", + "hash": "sha256-Lq85qQzgOOyaMzIQvbwQECU6bCoHLfR8HBMn/kE4TEI=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.android-arm64", + "version": "1.0.1", + "hash": "sha256-91xJ8bqT6UE398E7ShwLVdSxx2NtoAwc4tMUc+GZPOM=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.android-x64", + "version": "1.0.1", + "hash": "sha256-oeoeNcD/bzJxE3Sl5j5oeiR9meZcPA5ih2p3gcRAhuU=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.ios-arm64", + "version": "1.0.1", + "hash": "sha256-JN1rnIzUPkI0xyyTNJ/MtuggQbuWJ9IMWtJ6+1NVX8s=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.ios-x64", + "version": "1.0.1", + "hash": "sha256-zq4rvRDFyTXUJ9zHseQdNi6StGs6JwHL5zhaIBnIezY=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.linux-arm64", + "version": "1.0.1", + "hash": "sha256-oMySWDaOe2VLk8C8icFz44UIVx12Nf3aWx0nbyuiok8=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.linux-x64", + "version": "1.0.1", + "hash": "sha256-uUqH0000dQHKtKVF5/xa71LTiDwQ3+yrc8c1aa2tXdc=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.maccatalyst-arm64", + "version": "1.0.1", + "hash": "sha256-AF4QnDbt0WFqFiKaFhGTjONZPRkJC6K2uR4HuisAiJ4=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.maccatalyst-x64", + "version": "1.0.1", + "hash": "sha256-xvA25D+AZKAgayCS7JxyKsgj1jDIYlbSBygoBDLYX7E=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.osx-arm64", + "version": "1.0.1", + "hash": "sha256-LN20o7PtzSlMLm7ROCCMxXo8KQX2RcZ7td3JrnQn7fg=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.osx-x64", + "version": "1.0.1", + "hash": "sha256-iHpqeJcPMzMHPgyyRlQoeReeNUns6heViPOW9Pm0mtI=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.win-arm64", + "version": "1.0.1", + "hash": "sha256-26cuWHvUKW5fLyEx9lVSr8UrRvdsyt2L3wy3QB7XX38=" + }, + { + "pname": "NativeCompressions.LZ4.Runtime.win-x64", + "version": "1.0.1", + "hash": "sha256-YLvSMTpV89Z8CFxO8cfVCgtXM9wcv/8UFWXIC/ZhVVQ=" + }, + { + "pname": "NativeCompressions.Zstandard", + "version": "1.0.1", + "hash": "sha256-Qh+DHZkWXu3WRwofOhU4MGNTzSRZrc5IzsIfLq4+2bk=" + }, + { + "pname": "NativeCompressions.Zstandard.Core", + "version": "1.0.1", + "hash": "sha256-rr7QciyyI8A2qAL2xzd6BOb5DnB4rG/IeaEEXXbzZeM=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime", + "version": "1.0.1", + "hash": "sha256-IqvFqNn43C/DGQNFr/qDDq0f8imyH5Nc1+9CNwaJ8sU=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.android-arm", + "version": "1.0.1", + "hash": "sha256-Jq9zjLgADx9G07KXQV+JDsB/RpqF+MgIaH4hgT68yNo=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.android-arm64", + "version": "1.0.1", + "hash": "sha256-Ly/2ZbZZIdXmf9F+wwV+pB57s7wP11L+qmKTmpogr6E=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.android-x64", + "version": "1.0.1", + "hash": "sha256-z6d8ud+KT8Kba+NnFSb6Pu4IjuGOMQ6RRaGT8L4DfCg=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.ios-arm64", + "version": "1.0.1", + "hash": "sha256-cbb0A6GI6iwXdr8tMF8fPsrM5/IESdJw6sq58aeh2Y8=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.ios-x64", + "version": "1.0.1", + "hash": "sha256-mRmgadnHcSgubS4M+g5UVQZrpRqPcPcXX/NiC63BwkE=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.linux-arm64", + "version": "1.0.1", + "hash": "sha256-QFwYSnk3SshCtem7gfrS669oxy4j9Cjr4Ls4VXDof+k=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.linux-x64", + "version": "1.0.1", + "hash": "sha256-bj/LranyzemQE8IBCn8cYGQL65vU5ywtW5+4o33iXOo=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.maccatalyst-arm64", + "version": "1.0.1", + "hash": "sha256-yBgp77+TxXz+Zl9FlgXcL1SOBZUVf1hLLlUMut1ys88=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.maccatalyst-x64", + "version": "1.0.1", + "hash": "sha256-5WyMjUS19C/ePFtS972a5A6+F3Mpi+84xofMSq8Nvj0=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.osx-arm64", + "version": "1.0.1", + "hash": "sha256-ZSlln6PWjeieC3yI+uYS0r8KwljTBcDJ6Y8TPk/Rsc8=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.osx-x64", + "version": "1.0.1", + "hash": "sha256-7j5E10aZrn63b1Azv1QT98JgUxvND77gv260fHxpf1I=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.win-arm64", + "version": "1.0.1", + "hash": "sha256-e5nB0dd6KXbrnfv0PKOr3y/kIuiXTPDw6GIxaUD9uao=" + }, + { + "pname": "NativeCompressions.Zstandard.Runtime.win-x64", + "version": "1.0.1", + "hash": "sha256-TgKqeZdUF+MuDv6YsFnBzk2S5WlwJBpWy3Tkj2vuEQQ=" + }, + { + "pname": "ObservableCollections", + "version": "3.3.4", + "hash": "sha256-/4SPmTazrQcF5IW/kT0ZYyDwOCWAPGmFUVywCrvDgxs=" + }, + { + "pname": "Octokit", + "version": "14.0.0", + "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI=" + }, + { + "pname": "Portable.BouncyCastle", + "version": "1.9.0", + "hash": "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4=" + }, + { + "pname": "ShimSkiaSharp", + "version": "5.2.3", + "hash": "sha256-ByxOSD1i8uqeHu/yBl9g12Hx2HBeDVm3Yrce96b5+lg=" + }, + { + "pname": "Silk.NET.Core", + "version": "2.23.0", + "hash": "sha256-LgrnZcux09Vx7JUlfH4+ycJZO5Iv6PSy+5kV+I6owwE=" + }, + { + "pname": "Silk.NET.Maths", + "version": "2.23.0", + "hash": "sha256-bEcetJ2bWXsQ4VvgsktjurRFI975SA4zGOCPvAFxz0o=" + }, + { + "pname": "Silk.NET.OpenGL", + "version": "2.23.0", + "hash": "sha256-zK9TzX0EP2awNepYSc8xskel/M7YKiFGlQAxTij/Wkw=" + }, + { + "pname": "SixLabors.ImageSharp", + "version": "4.1.2", + "hash": "sha256-vAvrIqy5gwkhrjHb75PjHg+P7iYbcLqv8AuW5p7JKKM=" + }, + { + "pname": "SkiaSharp", + "version": "3.119.4", + "hash": "sha256-4ypEnTGUXAudFp61vGduHj9YmqtpiI5J1wP9wcOEwXY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "3.119.4", + "hash": "sha256-+uBVQFmxEH73iI5GwgvftUhAHvenpvc5GtT63HQy1Qo=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "3.119.4", + "hash": "sha256-9/L1Oc5bujN6pKjW6sJcr1jL3RLt8/Mt3MmClOcwzyw=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "3.119.4", + "hash": "sha256-xLfsWBsFFpv5Qg79GIMi+5CM6YDfcg//oywNlB5Y3J0=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "3.119.4", + "hash": "sha256-WlaYsbTh/cn/6YaN9odNtfpp8hpN52unGgGlQum0M5E=" + }, + { + "pname": "StageKit", + "version": "0.4.1", + "hash": "sha256-DpQVwzVoxSRgtQF7DYICmlxWwStduZRC/ZC31qMekHw=" + }, + { + "pname": "StageKit.Primitives", + "version": "0.4.1", + "hash": "sha256-treNF8PPMYGa2EH2tc2U3mP3ikwwuoExqF0FmR49zso=" + }, + { + "pname": "StageKit.Runtime", + "version": "0.4.1", + "hash": "sha256-ggX9Xojd5+V8y+2/O/cPXuuMgedhC9XJK8phDTYWXj8=" + }, + { + "pname": "StageKit.Updatum", + "version": "0.4.1", + "hash": "sha256-+waSFjua1T9q4e6mqx/Btey348OSnFupkCt4wRJ42Ak=" + }, + { + "pname": "SukiUI", + "version": "7.0.2-nightly20260902.445", + "hash": "sha256-cSIdNGBgh+x77wHI+A5pNOYmz4OW/Dqis0bZjM5NBBo=" + }, + { + "pname": "Svg.Controls.Avalonia", + "version": "12.0.0.17", + "hash": "sha256-6X3UYHJa7Sl4QR581JvsuVGmNf51O33uJ9e2KF3BhJQ=" + }, + { + "pname": "Svg.Custom", + "version": "5.2.3", + "hash": "sha256-fbcYHwIGagcAkrf2c2l1YX+Q0Un/lOSg9S3yoegQowc=" + }, + { + "pname": "Svg.Model", + "version": "5.2.3", + "hash": "sha256-YSZVS1/IO+ek/VKuIZ39DqEZsJMHZEDWN4WbuC+VfKU=" + }, + { + "pname": "Svg.SceneGraph", + "version": "5.2.3", + "hash": "sha256-0g3/jeSZpN1JQapVCQuCmwQVBk5oB/zvqFG5GQkZpu4=" + }, + { + "pname": "System.CommandLine", + "version": "2.0.12", + "hash": "sha256-SUCaKOYrCvfw3JjQcJhyXryXaa8ao7BmctGfYoR7zuk=" + }, + { + "pname": "System.IO.Hashing", + "version": "10.0.12", + "hash": "sha256-2RjeBEFopI4UinPoTG22+P6lcJY4SNxMA2MarZeVjdE=" + }, + { + "pname": "System.IO.Hashing", + "version": "8.0.0", + "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + }, + { + "pname": "System.Linq.Dynamic.Core", + "version": "1.7.3", + "hash": "sha256-wLyfZQJPwnUiSFrztXxBrEgvHlrQs4FUgXOeFWsWWZI=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.7.0", + "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.94.1", + "hash": "sha256-T3HQasQOcl/7zxt5hT3ZMhhpWoTyPTb6/IX0d6TJWA8=" + }, + { + "pname": "xunit", + "version": "2.9.3", + "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c=" + }, + { + "pname": "xunit.abstractions", + "version": "2.0.3", + "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=" + }, + { + "pname": "xunit.analyzers", + "version": "1.18.0", + "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0=" + }, + { + "pname": "xunit.assert", + "version": "2.9.3", + "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA=" + }, + { + "pname": "xunit.core", + "version": "2.9.3", + "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw=" + }, + { + "pname": "xunit.extensibility.core", + "version": "2.9.3", + "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g=" + }, + { + "pname": "xunit.extensibility.execution", + "version": "2.9.3", + "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw=" + }, + { + "pname": "xunit.runner.visualstudio", + "version": "4.0.0", + "hash": "sha256-1CY2ZY7UEnMdeTFXW4dX4xHD1mB4VWuU1Rsa8ROHcQE=" + }, + { + "pname": "ZLinq", + "version": "1.5.6", + "hash": "sha256-Bn1Ua50XlAxyrgbkfUghlFAcpvnTsxeJRGRv+tLJ4so=" + } +] diff --git a/pkgs/by-name/uv/uvtools/package.nix b/pkgs/by-name/uv/uvtools/package.nix new file mode 100644 index 000000000000..927be9e78301 --- /dev/null +++ b/pkgs/by-name/uv/uvtools/package.nix @@ -0,0 +1,152 @@ +{ + lib, + stdenv, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + nix-update-script, + versionCheckHook, + autoPatchelfHook, + copyDesktopItems, + makeDesktopItem, + emgucv, + fontconfig, + freetype, + icu, + krb5, + openssl, + zlib, + lttng-ust_2_12, + dbus, + libGL, + libx11, + libice, + libsm, + libxcursor, + libxext, + libxi, + libxrandr, +}: + +buildDotnetModule (finalAttrs: { + pname = "uvtools"; + version = "7.0.3"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "sn4k3"; + repo = "UVtools"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ViCOAgKHOCWSBhknXgPnJnL6rxqS7bM+7NB1Hshp9UQ="; + }; + + # UVtools.Core reaches OpenCV through Emgu.CV, whose native half upstream + # vendors in build/platforms and also pulls in as Emgu.CV.runtime.mini.* + # NuGet packages. Drop both and use the libcvextern.so built from source + postPatch = '' + # libcvextern.so and the managed Emgu.CV assembly have to come from the + # same Emgu CV release to be compatible + if ! grep -q 'Include="Emgu.CV" Version="${emgucv.version}\.' UVtools.Core/UVtools.Core.csproj; then + echo "Emgu.CV does not match emgucv ${emgucv.version}; the emgucv package needs updating alongside this one." >&2 + exit 1 + fi + + find build/platforms '(' -name 'libcvextern.*' -o -name 'cvextern.dll' ')' -delete + install -Dm444 ${lib.getLib emgucv}/lib/libcvextern.so \ + build/platforms/${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}/libcvextern.so + + sed -i '/Emgu\.CV\.runtime\.mini/d' UVtools.Core/UVtools.Core.csproj + ''; + + projectFile = [ + "UVtools.UI/UVtools.UI.csproj" + "UVtools.Cmd/UVtools.Cmd.csproj" + ]; + nugetDeps = ./deps.json; + + doCheck = true; + testProjectFile = "tests/UVtools.Tests/UVtools.Tests.csproj"; + + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; + + executables = [ + "UVtools" + "UVtoolsCmd" + ]; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + ]; + + buildInputs = [ + fontconfig + freetype + icu + krb5 + openssl + zlib + lttng-ust_2_12 + (lib.getLib stdenv.cc.cc) + ]; + + runtimeDeps = [ + # Avalonia X11 backend + fontconfig + libice + libsm + libx11 + libxcursor + libxext + libxi + libxrandr + # GPU-accelerated 3D viewer; dlopens libGL.so.1 and libEGL.so.1 + libGL + # FreeDesktop integration: portals, file dialogs, theme detection + dbus + ]; + + postInstall = '' + install -Dm444 UVtools.CAD/UVtools.svg \ + $out/share/icons/hicolor/scalable/apps/uvtools.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "uvtools"; + desktopName = "UVtools"; + comment = "MSLA/DLP file analysis, calibration, repair and conversion"; + exec = "UVtools %f"; + icon = "uvtools"; + categories = [ + "Graphics" + "3DGraphics" + "Engineering" + ]; + }) + ]; + + # meta.mainProgram is the GUI, which needs a display; check the CLI instead. + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/UVtoolsCmd"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "MSLA/DLP file analysis, calibration, repair and conversion tool"; + homepage = "https://github.com/sn4k3/UVtools"; + changelog = "https://github.com/sn4k3/UVtools/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Plus; + mainProgram = "UVtools"; + maintainers = with lib.maintainers; [ kanagawamarcos ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +}) diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index 1b2df5bbb131..f5a6cd5fc0ec 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.28"; + version = "3.7.29"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-K2gsrmbLoRXrm1QqJNFim3sbqJ5YIS6qeohW+g7eZfc="; + sha256 = "sha256-czHBCNnm2o4PjZJKU4tht45x/10QhPadBH9Inoh2M9M="; }; buildInputs = [ diff --git a/pkgs/by-name/vb/vboot-utils/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix index d04f8a109aaf..72fd67f7e4f1 100644 --- a/pkgs/by-name/vb/vboot-utils/package.nix +++ b/pkgs/by-name/vb/vboot-utils/package.nix @@ -9,18 +9,20 @@ libyaml, xz, flashrom, + nss, withFlashrom ? true, + withNss ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "vboot-utils"; - version = "143.16463"; + version = "157.16852"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference"; rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B"; - hash = "sha256-8a49xD+EYXDouFuBmLyAtPxThYET6DtKImBPzXVhpxE="; + hash = "sha256-qifGCywhtwmgSh0d7ZL+xJu8WE1BilWlsCuVhX2luV4="; }; nativeBuildInputs = [ @@ -34,20 +36,14 @@ stdenv.mkDerivation (finalAttrs: { openssl xz ] + ++ lib.optional withNss nss ++ lib.optional withFlashrom finalAttrs.passthru.flashromChromeos; - # Fix build w/ glibc-2.44 - env.NIX_CFLAGS_COMPILE = "-Wno-error=discarded-qualifiers"; - enableParallelBuilding = true; postPatch = '' - substituteInPlace Makefile \ - --replace-fail "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' - # Drop flag unrecognized by GCC 9 (for e.g. aarch64-linux) - substituteInPlace Makefile \ - --replace-fail "-Wno-unknown-warning" "" - + substituteInPlace {firmware,host,tests}/Makefile.inc \ + --replace-fail "ar qcT" '${stdenv.cc.targetPrefix}ar qcT' patchShebangs scripts ''; @@ -74,15 +70,17 @@ stdenv.mkDerivation (finalAttrs: { passthru = { versionFormatted = lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version); - flashromChromeos = flashrom.overrideAttrs (_prev: { + flashromChromeos = flashrom.overrideAttrs (prev: { src = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/third_party/flashrom"; rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B-master"; - hash = "sha256-zOoWpuS/vDLvnRPdA9FNGhNbcwh3PMQwbdfqsyqj858="; + hash = "sha256-V4I9NGarq1vUwjeXTbjd8KPqsP0Pp/UnwfFHryHnFA4="; }; + outputs = lib.filter (output: output != "doc") prev.outputs; + # requires git - mesonFlags = _prev.mesonFlags ++ [ (lib.mesonEnable "documentation" false) ]; + mesonFlags = prev.mesonFlags ++ [ (lib.mesonEnable "documentation" false) ]; # requires specific hardware doCheck = false; diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 44d824522e15..8fa2bb990c9e 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "vector"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "vectordotdev"; repo = "vector"; tag = "v${finalAttrs.version}"; - hash = "sha256-lnNlywrGMWaaLw+03m9qVGZoctcSdyw2zWl+5RaUBGg="; + hash = "sha256-cV1BXvdMiHvm7igf0qSvECPtPvOzTQNadOGMkpcHYS8="; }; - cargoHash = "sha256-C8Lqi3QSooXdDmSYYER9SgGkkcmgynRoy9LffmSJZns="; + cargoHash = "sha256-uF2HQAj6NHnL3ZqLUgl1u9Xjc8/scz78CDgWgVMvp2w="; nativeBuildInputs = [ pkg-config @@ -89,62 +89,13 @@ rustPlatform.buildRustPackage (finalAttrs: { CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; }; - # Fix rust 1.98 compatibility + # upstream does not keep up to date with rust. let's not fail on every warning postPatch = '' - substituteInPlace src/trace.rs --replace-fail 'use futures::StreamExt as _;' "" + sed -i 's/#!\[deny(warnings)]/#!\[warn(warnings)]/' lib/*/src/lib.rs src/lib.rs src/main.rs vdev/src/main.rs ''; - doCheck = true; - checkType = "debug"; - - checkFlags = [ - # Tries to make a network access - "--skip=dns::tests::resolve_example" - "--skip=sinks::loki::tests::healthcheck_grafana_cloud" - - # Requires secret server - "--skip=secrets::exec::tests::test_exec_backend::case_1" - "--skip=secrets::exec::tests::test_exec_backend::case_2" - "--skip=secrets::exec::tests::test_exec_backend_missing_secrets" - - # Flakey - "--skip=sources::exec::tests::test_graceful_shutdown" - "--skip=sources::exec::tests::test_run_command_linux" - "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics" - "--skip=sources::host_metrics::cpu::tests::generates_cpu_metrics" - "--skip=sources::internal_logs::tests::repeated_logs_are_not_rate_limited" - "--skip=topology::test::backpressure::buffer_drop_fan_out" - "--skip=topology::test::backpressure::default_fan_out" - "--skip=topology::test::backpressure::serial_backpressure" - "--skip=topology::test::reload::topology_disk_buffer_config_change_chained_does_not_stall" - "--skip=topology::test::reload::topology_reload_preserves_enrichment_table_state" - - # Requires access to journalctl - "--skip=sources::journald::tests::emits_cursor" - "--skip=sources::journald::tests::excludes_matches" - "--skip=sources::journald::tests::excludes_units" - "--skip=sources::journald::tests::handles_acknowledgements" - "--skip=sources::journald::tests::handles_checkpoint" - "--skip=sources::journald::tests::handles_missing_timestamp" - "--skip=sources::journald::tests::includes_kernel" - "--skip=sources::journald::tests::includes_matches" - "--skip=sources::journald::tests::includes_units" - "--skip=sources::journald::tests::parses_array_fields" - "--skip=sources::journald::tests::parses_array_messages" - "--skip=sources::journald::tests::parses_string_sequences" - "--skip=sources::journald::tests::reads_journal" - - # No multicast access available in sandbox - "--skip=sources::socket::test::multicast_and_unicast_udp_message" - "--skip=sources::socket::test::multicast_udp_message" - "--skip=sources::socket::test::multiple_multicast_addresses_udp_message" - "--skip=sources::syslog::test::test_udp_syslog" - - ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ - # Fails on aarch64-darwin (https://github.com/vectordotdev/vector/issues/23813) - "--skip=sources::file::tests::file_start_position_server_restart_unfinalized" - ]; + # tests have proven too flaky and required too many exclusions + doCheck = false; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 72262bd49747..f34100205caf 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -8,19 +8,20 @@ util-linux, python3, boost, + simde, sqlite, enableShared ? !stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation (finalAttrs: { pname = "vectorscan"; - version = "5.4.12"; + version = "5.4.13"; src = fetchFromGitHub { owner = "VectorCamp"; repo = "vectorscan"; rev = "vectorscan/${finalAttrs.version}"; - hash = "sha256-P/3qmgVZ9OLfJGfxsKJ6CIuaKuuhs1nJt4Vjf1joQDc="; + hash = "sha256-dUrtyMXBhsgJj8w7qXLZK8BYjlRUL1JWyUz7yVREcew="; }; postPatch = '' @@ -30,9 +31,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" substituteInPlace cmake/cflags-generic.cmake \ --replace-fail "-Werror" "" - substituteInPlace cmake/build_wrapper.sh \ - --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \ - --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy' ''; nativeBuildInputs = [ @@ -46,7 +44,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost sqlite - ]; + ] + ++ + # FAT binaries on x86 linux can use SIMDe as fallback. + lib.optional (lib.elem stdenv.hostPlatform.system [ + "x86_64-linux" + "i686-linux" + ]) simde; # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to # transparently select the fastest for the current hardware. diff --git a/pkgs/by-name/ve/vendir/package.nix b/pkgs/by-name/ve/vendir/package.nix index 0703af6c1dbd..cfe45e599591 100644 --- a/pkgs/by-name/ve/vendir/package.nix +++ b/pkgs/by-name/ve/vendir/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "vendir"; - version = "0.46.2"; + version = "0.46.3"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "vendir"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-1S6rxh0YD0Iui++CqiB0yQWDmU8l3p70B/h+6bjgSQ0="; + sha256 = "sha256-Hv6ZQxOPMh8O3YFJRdwqsZRjJN8wbq8dCtSU0pqLZ9s="; }; vendorHash = null; diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix index c65e640237a5..e917841e265d 100644 --- a/pkgs/by-name/vf/vfox/package.nix +++ b/pkgs/by-name/vf/vfox/package.nix @@ -4,24 +4,30 @@ fetchFromGitHub, writableTmpDirAsHomeHook, nix-update-script, + bashInteractive, + zsh, }: buildGoModule (finalAttrs: { pname = "vfox"; - version = "1.0.11"; + version = "1.0.13"; src = fetchFromGitHub { owner = "version-fox"; repo = "vfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-dTs+GY3R01pUWINLnZqGg3HBWVsLvSlhxrnecznXeZk="; + hash = "sha256-l/haSdbM2uQ+wYrnkvVNxiqMVBg1ZF9mKX80I40acAY="; }; vendorHash = "sha256-494nqL6KiUk4VeKlG9YHFpgACgaYC3SR1I1EViD71Jw="; __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + nativeCheckInputs = [ + bashInteractive + writableTmpDirAsHomeHook + zsh + ]; checkFlags = let diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix index 769c815f2e2e..289c993c9f5a 100644 --- a/pkgs/by-name/vg/vgmtools/package.nix +++ b/pkgs/by-name/vg/vgmtools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "vgmtools"; - version = "0.1-unstable-2026-08-16"; + version = "0.1-unstable-2026-10-10"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "f60cdc3da1828a11debb289def9a7001fa32a8c6"; - hash = "sha256-PDksslME/hkeMDZBnW9kNi0uDAQaPntjNu39pNVHOe4="; + rev = "107f65c97d6aad1f5a839d40b094ea261d7a1b26"; + hash = "sha256-XkliIz+kosPvx/djZxvSxGudT8wid3WkvX7t6iy6G90="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix index 814f77e343c0..33f334c66849 100644 --- a/pkgs/by-name/vi/viceroy/package.nix +++ b/pkgs/by-name/vi/viceroy/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + zstd, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -19,6 +21,17 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-dkoKFEeM6DI6Iaypgexa18YjoLySnIX1YfUItySx1Q0="; + postPatch = '' + substituteInPlace src/lib.rs \ + --replace-fail '#![cfg_attr(not(debug_assertions), deny(warnings))]' "" + ''; + + env.ZSTD_SYS_USE_PKG_CONFIG = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ zstd ]; + cargoTestFlags = [ "--package" "viceroy-lib" diff --git a/pkgs/by-name/vk/vkquake/package.nix b/pkgs/by-name/vk/vkquake/package.nix index 32bd16a4de3c..0196ff05493d 100644 --- a/pkgs/by-name/vk/vkquake/package.nix +++ b/pkgs/by-name/vk/vkquake/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vkquake"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; tag = finalAttrs.version; - hash = "sha256-fdethtp6esp+44KBS9oeZ1To+B/WFVd/+bUUJGYPQ5E="; + hash = "sha256-tE8iQYbUe0FAQAXHgcBi+SWgyvHQM3pghQ2D7VkQNXE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix index 7f9aa888b195..d0df79fed324 100644 --- a/pkgs/by-name/vo/voicevox-engine/package.nix +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -78,7 +78,8 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; makeWrapperArgs = [ - ''--add-flags "--voicelib_dir=${voicevox-core.wrapped}/lib"'' + "--add-flag" + "--voicelib_dir=${voicevox-core.wrapped}/lib" ]; preCheck = '' diff --git a/pkgs/by-name/vp/vpcs/package.nix b/pkgs/by-name/vp/vpcs/package.nix index 258e79efc224..0ac95f329d07 100644 --- a/pkgs/by-name/vp/vpcs/package.nix +++ b/pkgs/by-name/vp/vpcs/package.nix @@ -2,42 +2,39 @@ lib, stdenv, fetchFromGitHub, - testers, - vpcs, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "vpcs"; - version = "0.8.4"; + version = "0.8.5"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "GNS3"; repo = "vpcs"; tag = "v${finalAttrs.version}"; - hash = "sha256-sWqQDf3xqrr6k7MFXV/9K9KdsEAvftsDkGlSUhA5CmY="; + hash = "sha256-8urJy4eKHF3CSQtZ4bksNHnRx9KNVb1OYYjDNMTf0ZI="; }; - sourceRoot = "${finalAttrs.src.name}/src"; - - buildPhase = '' - runHook preBuild - - MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch} - - runHook postBuild - ''; - - postInstall = '' - install -D -m555 vpcs $out/bin/vpcs - install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 - ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc $(CCOPT)" ]; enableParallelBuilding = true; - passthru.tests.version = testers.testVersion { - package = vpcs; - command = "vpcs -v"; - }; + installPhase = '' + runHook preInstall + + install -Dm755 src/vpcs -t $out/bin + install -Dm644 man/vpcs.1 -t $out/share/man/man1 + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-v"; + doInstallCheck = true; meta = { description = "Simple virtual PC simulator"; @@ -46,7 +43,8 @@ stdenv.mkDerivation (finalAttrs: { ping/traceroute them, or ping/traceroute the other hosts/routers from the VPCS when you study the Cisco routers in the dynamips. ''; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/GNS3/vpcs"; + changelog = "https://github.com/GNS3/vpcs/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "vpcs"; diff --git a/pkgs/by-name/vp/vpxtool/package.nix b/pkgs/by-name/vp/vpxtool/package.nix index 55038b5d0d23..b543763b245e 100644 --- a/pkgs/by-name/vp/vpxtool/package.nix +++ b/pkgs/by-name/vp/vpxtool/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "vpxtool"; - version = "0.37.1"; + version = "0.38.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "francisdb"; repo = "vpxtool"; tag = "v${finalAttrs.version}"; - hash = "sha256-Iil/sOXlPl3zMEYXOqBxA19iqgQvRVb4nMBhTGyDgZk="; + hash = "sha256-1R+8U41qYKQMdwT022GEB3qUwKaJ1IXyavBIjfNRDT8="; }; - cargoHash = "sha256-E/bfPZzdRzhOA0QApp445YFtovTC71httYSo6VIZORs="; + cargoHash = "sha256-hTJpVyzK+//AB950LmMXqR6Kq32Mg83Vr7WSTGwYwds="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/wa/wappalyzergo/package.nix b/pkgs/by-name/wa/wappalyzergo/package.nix index a4b976258ce6..5d7304301941 100644 --- a/pkgs/by-name/wa/wappalyzergo/package.nix +++ b/pkgs/by-name/wa/wappalyzergo/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "wappalyzergo"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "wappalyzergo"; tag = "v${finalAttrs.version}"; - hash = "sha256-D8Xm65xpXEDD6L8Ts9c/WeKSEKkbslGRFlXwumAAJhA="; + hash = "sha256-4C4+T6nA+tJQxvrBbSl74CmMkFMomhUu2i6Ft7WdQ7E="; }; - vendorHash = "sha256-KLU2L8aVcEge/LPcAKlAMQJ8cS7GRZ68s/s8zdYWT4M="; + vendorHash = "sha256-3jxyX1L/9ub31jbaXcaJopn8oj2SyAh7+Nnbpm23z58="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 9e85ec111071..3da670df08ec 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "3.2.3"; + version = "3.2.4"; __structuredAttrs = true; strictDeps = true; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-ccpUHvoXYBqLvWh6seq7d6uwrKBzIJlzPN055+CBRJY="; + hash = "sha256-Sb2drrEJikpGRvfSCLf2dCUPdkNMep8pASZKoayCAwk="; }; installPhase = '' diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix index 8190b409174c..39b5672edb11 100644 --- a/pkgs/by-name/wa/waybar-lyric/package.nix +++ b/pkgs/by-name/wa/waybar-lyric/package.nix @@ -12,13 +12,13 @@ }: buildGoModule (finalAttrs: { pname = "waybar-lyric"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "Nadim147c"; repo = "waybar-lyric"; tag = "v${finalAttrs.version}"; - hash = "sha256-RSSqVfq4XIwNjLuVSx76qtjpEXzQWfDH5BLxzUiCh3s="; + hash = "sha256-1AGa+/asfGwAzcqHD6LvbvM6JDma5aNuuXnL6vYOxsE="; }; vendorHash = "sha256-9hXIWrqYExXHfIntXCUbrSkhjmLjM163UOHRq/odaAA="; diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix index 8b036c09e9be..9c07a76e9cff 100644 --- a/pkgs/by-name/wa/wayland-bongocat/package.nix +++ b/pkgs/by-name/wa/wayland-bongocat/package.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wayland-bongocat"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "saatvik333"; repo = "wayland-bongocat"; tag = "v${finalAttrs.version}"; - hash = "sha256-JP7Rcwf+3n6IouuGw3VwhUGLpmEo6ou04nLVWZW5TLo="; + hash = "sha256-aSjHqbIRoA/woFPy1u2td4uXF5Sw/wZ9bqp1pfpnb4c="; }; # Package dependencies diff --git a/pkgs/by-name/wa/waytator/package.nix b/pkgs/by-name/wa/waytator/package.nix index c394d80da3e0..b38c6a8dba0d 100644 --- a/pkgs/by-name/wa/waytator/package.nix +++ b/pkgs/by-name/wa/waytator/package.nix @@ -10,10 +10,13 @@ makeWrapper, wl-clipboard, fetchFromGitHub, + gtk4-layer-shell, + wayland-protocols, + wayland-scanner, }: stdenv.mkDerivation (finalAttrs: { pname = "waytator"; - version = "1.2.5"; + version = "1.4.0"; strictDeps = true; __structuredAttrs = true; @@ -22,19 +25,24 @@ stdenv.mkDerivation (finalAttrs: { owner = "faetalize"; repo = "waytator"; tag = "v${finalAttrs.version}"; - hash = "sha256-sv7UwNsW+UTIGLDIz4JwRpPU6t5bolsz/n4bO68dDi0="; + hash = "sha256-OnEUDSxKJCZsN0v2BV/QQ8ceI4BSaY9LH+QucziY1EA="; }; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper + wayland-scanner ]; buildInputs = [ gtk4 libadwaita + gtk4-layer-shell + wayland-protocols ]; postFixup = '' diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix index 30d33a89d483..38a066611797 100644 --- a/pkgs/by-name/wd/wdt/package.nix +++ b/pkgs/by-name/wd/wdt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2026-09-15"; + version = "1.27.1612021-unstable-2026-10-07"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "15ff798e01fb192fbdbf093d26d10933ffe46df5"; - hash = "sha256-aSOyGxqIV7J0dO5lK9xgJyOLXB1NwNDo84RR3Nq1oyU="; + rev = "fa978c431afec70234c4cfafad4f0bc6627549d1"; + hash = "sha256-H+s0FfLYSRx7WTRR10K4TA6XXQrtXihfT7dMlbdAKjE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix index 9442c26b82df..19d517c838aa 100644 --- a/pkgs/by-name/wg/wgpu-native/package.nix +++ b/pkgs/by-name/wg/wgpu-native/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wgpu-native"; - version = "27.0.4.0"; + version = "29.0.1.1"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu-native"; tag = "v${finalAttrs.version}"; - hash = "sha256-XOT6Wx5TfbFzwcSjoyqUwv7mbN0RShaMf99qADmCKxg="; + hash = "sha256-N8mt9gYeMDXKqrKVqAog3L9PUvRwdYwOmlQMvzHDezE="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "dev" ]; - cargoHash = "sha256-PZHS2lUX6PbIG1xF6jhreGjdtCbS/GWeY1pHhRPo2aU="; + cargoHash = "sha256-b8De5RTpGAIN8Zt7ipUNSSl+vGg10DGKN2qQW4c1HWk="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/wh/wheelwizard/deps.json b/pkgs/by-name/wh/wheelwizard/deps.json index 9f99498444b5..3db8c11a5bba 100644 --- a/pkgs/by-name/wh/wheelwizard/deps.json +++ b/pkgs/by-name/wh/wheelwizard/deps.json @@ -104,6 +104,11 @@ "version": "0.30.6", "hash": "sha256-FhXf9ggWmWzGp6vz6vJP+ly4SOeyluP6Ic3MfCz1uUA=" }, + { + "pname": "ExCSS", + "version": "4.3.1", + "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o=" + }, { "pname": "HarfBuzzSharp", "version": "8.3.1.3", @@ -144,6 +149,11 @@ "version": "3.11.0", "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=" }, + { + "pname": "Microsoft.DotNet.PlatformAbstractions", + "version": "3.1.6", + "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0=" + }, { "pname": "Microsoft.Extensions.AmbientMetadata.Application", "version": "10.0.0", @@ -204,6 +214,11 @@ "version": "10.0.0", "hash": "sha256-cVRZwchZofxVsHEH4VIssGFGJ6pPjzmjW2afbNtr9/Q=" }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "8.0.0", + "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" + }, { "pname": "Microsoft.Extensions.Diagnostics", "version": "10.0.0", @@ -394,6 +409,31 @@ "version": "0.48.1", "hash": "sha256-Y1lH1TrxBua3Ux6trRUQGeSfYjE3qld6TQDz/ABy6Ws=" }, + { + "pname": "ShimSkiaSharp", + "version": "5.1.1", + "hash": "sha256-dusvqnuofmzxcALMFAAsJK2a08H4WNjwXwWk368xau0=" + }, + { + "pname": "Silk.NET.Core", + "version": "2.22.0", + "hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc=" + }, + { + "pname": "Silk.NET.Maths", + "version": "2.22.0", + "hash": "sha256-wBydHf4R69A3dm8SnD82zjBd5QgwXbmipRqXtk+AjpE=" + }, + { + "pname": "Silk.NET.OpenGL", + "version": "2.22.0", + "hash": "sha256-1XWABfBzsSg1nJzbDJ/FH140WLzjpuNTxDHNZfV85xo=" + }, + { + "pname": "SkiaSharp", + "version": "3.119.2", + "hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo=" + }, { "pname": "SkiaSharp", "version": "3.119.4", @@ -404,6 +444,11 @@ "version": "3.119.4", "hash": "sha256-+uBVQFmxEH73iI5GwgvftUhAHvenpvc5GtT63HQy1Qo=" }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "3.119.2", + "hash": "sha256-KEeGqSiyAiMbzLgH/0JkwUz/pWcL49gYB1T1YLkMPaI=" + }, { "pname": "SkiaSharp.NativeAssets.macOS", "version": "3.119.4", @@ -414,11 +459,46 @@ "version": "3.119.4", "hash": "sha256-xLfsWBsFFpv5Qg79GIMi+5CM6YDfcg//oywNlB5Y3J0=" }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "3.119.2", + "hash": "sha256-CI6dg+MlxX8t+vbnkxtd5QE3xalMKkA8LUSudxg7TNU=" + }, { "pname": "SkiaSharp.NativeAssets.Win32", "version": "3.119.4", "hash": "sha256-WlaYsbTh/cn/6YaN9odNtfpp8hpN52unGgGlQum0M5E=" }, + { + "pname": "Svg.Animation", + "version": "5.1.1", + "hash": "sha256-mXcfShsZh2D9r79feD8Btv2y7kBDjsqca+0sB0/bToc=" + }, + { + "pname": "Svg.Custom", + "version": "5.1.1", + "hash": "sha256-0wxNoAJHEXM7aH3N6hqxlIiG2sGuMKiLWuSyE80zBgY=" + }, + { + "pname": "Svg.Model", + "version": "5.1.1", + "hash": "sha256-JnOJYoRZxnRKRdgiUbfwvz4PHDat2TyngCM7O/jN2YY=" + }, + { + "pname": "Svg.SceneGraph", + "version": "5.1.1", + "hash": "sha256-Uag4IC+BwBgw5Dawozpl4/km9cwuL8vLDTsVJtw9098=" + }, + { + "pname": "Svg.Skia", + "version": "5.1.1", + "hash": "sha256-P8TI6uzXppCtCBj0ctD9/T0AvDBj7O1NTXc2KGWNewk=" + }, + { + "pname": "System.IO.Hashing", + "version": "10.0.0", + "hash": "sha256-zq3baIIsQ1kaY4CVl0vpkDcZb2ZNwT7wC0wDqzEN5oI=" + }, { "pname": "System.Threading.RateLimiting", "version": "8.0.0", diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix index 16aa9becbea3..9344d2d4d7fa 100644 --- a/pkgs/by-name/wh/wheelwizard/package.nix +++ b/pkgs/by-name/wh/wheelwizard/package.nix @@ -14,13 +14,13 @@ }: buildDotnetModule (finalAttrs: { pname = "wheelwizard"; - version = "2.5.7"; + version = "2.6.2"; src = fetchFromGitHub { owner = "TeamWheelWizard"; repo = "WheelWizard"; tag = "v${finalAttrs.version}"; - hash = "sha256-bN0GtoPrMK5+cd7pTf+uRpVab8opTkCm22m4n4Uss8o="; + hash = "sha256-zFIboYTsK/dLf7zOL8mqOMWgQiuf5dwTZVtX/TYfcnM="; }; postPatch = '' rm .config/dotnet-tools.json diff --git a/pkgs/by-name/wh/whisp/package.nix b/pkgs/by-name/wh/whisp/package.nix new file mode 100644 index 000000000000..e9caf97dba9e --- /dev/null +++ b/pkgs/by-name/wh/whisp/package.nix @@ -0,0 +1,81 @@ +{ + lib, + fetchFromGitHub, + meson, + ninja, + wrapGAppsHook4, + gobject-introspection, + gettext, + python3Packages, + glib, + gtk4, + libadwaita, + tesseract, + withTesseractOCR ? true, +}: +python3Packages.buildPythonApplication (finalAttrs: { + pname = "whisp"; + version = "1.6.1"; + + pyproject = false; + + src = fetchFromGitHub { + owner = "tanaybhomia"; + repo = "whisp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-z9RAS+KlvCrDIQhbjmHSKDI0LRmkuMMsky3w3Jdozrs="; + }; + + nativeBuildInputs = [ + meson + ninja + wrapGAppsHook4 + gobject-introspection + gettext + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + dependencies = + with python3Packages; + ( + [ pygobject3 ] + ++ lib.optionals withTesseractOCR [ + pytesseract + pillow + ] + ) + ++ lib.optional withTesseractOCR tesseract; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + ${lib.optionalString withTesseractOCR ''--prefix PATH : "${lib.makeBinPath [ tesseract ]}"''} + ) + ''; + + __structuredAttrs = true; + + meta = { + description = "Scratchpad inspired by the 'anti-note' philosophy"; + longDescription = '' + The Anti-Note for GNOME. + A fluid, gesture-driven scratchpad designed for absolute speed. + ''; + homepage = "https://tanaybhomia.github.io/Whisp/"; + changelog = "https://github.com/tanaybhomia/Whisp/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; + mainProgram = "whisp"; + maintainers = [ + lib.maintainers.luminarleaf + lib.maintainers.theCapypara + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/wi/wipeout-rewrite/package.nix b/pkgs/by-name/wi/wipeout-rewrite/package.nix index 47dc3cbb9a92..0c6f26500d72 100644 --- a/pkgs/by-name/wi/wipeout-rewrite/package.nix +++ b/pkgs/by-name/wi/wipeout-rewrite/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wipeout-rewrite"; - version = "0-unstable-2026-08-09"; + version = "0-unstable-2026-09-27"; src = fetchFromGitHub { owner = "phoboslab"; repo = "wipeout-rewrite"; - rev = "d48f01c8f00e7f4820a9c2ead0dedd4fb33427d3"; - hash = "sha256-X14rixCUJCQYxeLRpnSb3xWslwcwxoyLtYu1YH3O7WY="; + rev = "b425ecb3b3250e4fdcb4462b72c3fb9679a1eb59"; + hash = "sha256-blgb50CwrYh7Dcc3THv0lNvsr+LYH38cOVJS/ZjhHRM="; }; postPatch = diff --git a/pkgs/by-name/wl/wl-proxy/package.nix b/pkgs/by-name/wl/wl-proxy/package.nix index 0a388d53506e..9df2c83fd00d 100644 --- a/pkgs/by-name/wl/wl-proxy/package.nix +++ b/pkgs/by-name/wl/wl-proxy/package.nix @@ -24,16 +24,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "wl-proxy"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "mahkoh"; repo = "wl-proxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-WcJDOXpBPU8EIPMca96Yl9CUmMh7juRfkEjftVpQdRo="; + hash = "sha256-FZTPoYKvTq1Yz/HE6TGUFDnqXLX2px/fyY28QHUOPqA="; }; - cargoHash = "sha256-nGzobdVDz+bhev1PrvopMIDTdHuHu1RAVegc/xglnGU="; + cargoHash = "sha256-mdJmlbtWwnf1OETZi9XqPfdYmMg2bjFC7MVK1A6/FQ4="; cargoBuildFlags = cargoFlags; diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix index 049a5ae31fa9..209a5ff8a55c 100644 --- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix +++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "woodpecker-plugin-git"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; tag = finalAttrs.version; - hash = "sha256-9ALys0+JVBUo+jMjSg6FtLclzH2VOGUYnr8/3rpi+Vw="; + hash = "sha256-5LcIs+EFKfS5vutRsT+X34XawX+AHdkEych6Sn4hJaM="; }; - vendorHash = "sha256-Wl1E5PHSQglSyLk+bLAyLn3hHsAEKaafeBRPVcauIwE="; + vendorHash = "sha256-d9FbboPtqh856zcsDOvm3uzLUsU7PuvaUiO1/U1kooM="; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 53028580fd59..de2a4bd4a589 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.148.0"; + version = "4.151.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-Wo8D86TSrG8yL8TrGmeZHzwhr6YoYHD2haDiRIUYEIY="; + hash = "sha256-anGuHPoI0jM0SoG2r19Y6ig4+Xc10xQa6aax1zW6cKo="; }; pnpmDeps = fetchPnpmDeps { @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-PkC5nBbUNqMVbpKPjBnpBtoZ4IV7aWJxV5MUgvFhoV4="; + hash = "sha256-gMosURkv+K3PSbwyhBhzB2k4pP+Gt3Qke2zD7dR7KEM="; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' diff --git a/pkgs/by-name/xc/xcodes-app/package.nix b/pkgs/by-name/xc/xcodes-app/package.nix new file mode 100644 index 000000000000..8754e94fd843 --- /dev/null +++ b/pkgs/by-name/xc/xcodes-app/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchzip, + stdenvNoCC, + unzip, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + strictDeps = true; + __structuredAttrs = true; + + pname = "xcodes-app"; + version = "4.1.1b41"; + + src = fetchzip { + url = "https://github.com/XcodesOrg/XcodesApp/releases/download/v${finalAttrs.version}/Xcodes.zip"; + hash = "sha256-Ncm9aeRCMwEfJQuLHQaoo9UVhGQopbDAPK6d5ZjBDYs= "; + stripRoot = false; + }; + + nativeBuildInputs = [ unzip ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -R Xcodes.app $out/Applications/Xcodes.app + + runHook postInstall + ''; + + meta = { + description = "The easiest way to install and switch between multiple versions of Xcode"; + downloadPage = "https://github.com/XcodesOrg/XcodesApp/releases"; + homepage = "https://github.com/XcodesOrg/XcodesApp"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ paige ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix index 6c178eefbd3d..eed0ee87a88c 100644 --- a/pkgs/by-name/xe/xeve/package.nix +++ b/pkgs/by-name/xe/xeve/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xeve"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "mpeg5"; repo = "xeve"; rev = "v${finalAttrs.version}"; - hash = "sha256-QA9+0PsPyg3gQYR2TpIO1nwL5H/BFpOtCX8xBQ4Qjmg="; + hash = "sha256-dEgrluaJk9yeWlgcSGIrqyACE+BTX64evkaUy8rzcSs="; }; postPatch = '' diff --git a/pkgs/by-name/xh/xhosts/package.nix b/pkgs/by-name/xh/xhosts/package.nix index ad4999bf8ec3..3a2ddd582d37 100644 --- a/pkgs/by-name/xh/xhosts/package.nix +++ b/pkgs/by-name/xh/xhosts/package.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthewcroughan ]; mainProgram = "nss-xhosts"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/xp/xprin/package.nix b/pkgs/by-name/xp/xprin/package.nix index e02dd30701da..bb790735f484 100644 --- a/pkgs/by-name/xp/xprin/package.nix +++ b/pkgs/by-name/xp/xprin/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "xprin"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "crossplane-contrib"; repo = "xprin"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ncqmrp2jF4fUjE9bEOgfq6XuAghvK4y3j2KOqXxLzrU="; + hash = "sha256-JAsiOCQo8RnNTUmnLGJn+Ro3AE5P5/IT3p/yrbV+5tI="; }; vendorHash = "sha256-8trj5T6ShvHXFB3W8F++ton71F8XDn2kyoZPIdPmEyo="; diff --git a/pkgs/by-name/xr/xrpc/package.nix b/pkgs/by-name/xr/xrpc/package.nix new file mode 100644 index 000000000000..da9000a6b74b --- /dev/null +++ b/pkgs/by-name/xr/xrpc/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchzip, + unzip, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + strictDeps = true; + __structuredAttrs = true; + + pname = "xrpc"; + version = "1.0.6"; + + src = fetchzip { + url = "https://github.com/llsc12/XRPC/releases/download/v${finalAttrs.version}/XRPC.zip"; + hash = "sha256-S1MDVYP6sNRRZf5qrx+BK6OWCu13w15syfbD8duPkNE="; + }; + + nativeBuildInputs = [ unzip ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/XRPC.app + cp -R . $out/Applications/XRPC.app/ + + runHook postInstall + ''; + + meta = { + description = "Xcode Discord Rich Presence utility"; + downloadPage = "https://github.com/llsc12/XRPC/releases/"; + homepage = "https://github.com/llsc12/XRPC"; + donationPage = "https://github.com/sponsors/llsc12"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ paige ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ya/yaak/package-lock.patch b/pkgs/by-name/ya/yaak/package-lock.patch new file mode 100644 index 000000000000..5c6929303a26 --- /dev/null +++ b/pkgs/by-name/ya/yaak/package-lock.patch @@ -0,0 +1,47 @@ +--- a/package-lock.json ++++ b/package-lock.json +@@ -200,6 +200,8 @@ + }, + "apps/yaak-client/node_modules/@types/node": { + "version": "24.12.0", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.0.tgz", ++ "integrity": "sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -226,6 +228,8 @@ + }, + "apps/yaak-client/node_modules/undici-types": { + "version": "7.16.0", ++ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", ++ "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "dev": true, + "license": "MIT" + }, +@@ -14944,6 +14948,8 @@ + }, + "packages/plugin-runtime/node_modules/@types/node": { + "version": "24.13.2", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.2.tgz", ++ "integrity": "sha512-fRa09kZTgu8o71KFcDjUFuc7F+dEbZYZmkI0mg5YBTRs0yMKjYHsq/c0urDKeDb+D5qVgXOdFcuu+DZPKOITwA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -14952,6 +14958,8 @@ + }, + "packages/plugin-runtime/node_modules/undici-types": { + "version": "7.18.2", ++ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", ++ "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", + "dev": true, + "license": "MIT" + }, +@@ -14999,6 +15007,8 @@ + }, + "plugins-external/httpsnippet/node_modules/@types/node": { + "version": "22.19.15", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz", ++ "integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==", + "dev": true, + "license": "MIT", + "dependencies": { diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix index f5bab9ed69dc..3906f5f7c2f2 100644 --- a/pkgs/by-name/ya/yaak/package.nix +++ b/pkgs/by-name/ya/yaak/package.nix @@ -20,34 +20,41 @@ adwaita-icon-theme, protobuf, perl, + cacert, makeWrapper, nix-update-script, stdenv, lld, + llvmPackages, wasm-pack, - wasm-bindgen-cli_0_2_100, + wasm-bindgen-cli_0_2_121, + autoPatchelfHook, wrapGAppsHook3, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "yaak"; - version = "2025.6.1"; + version = "2026.8.1"; src = fetchFromGitHub { owner = "mountain-loop"; repo = "yaak"; tag = "v${finalAttrs.version}"; - hash = "sha256-3sEq7VpzaIMbkvHQTQLf3NRbAJjtpOJpirdcA7y2FIE="; + hash = "sha256-zVpgXGn3isKgma+H0bBkcKoShSCpYkp1mYiJxK32LC8="; }; npmDeps = fetchNpmDeps { - inherit (finalAttrs) src; - hash = "sha256-zz9wlJ3yQ3oTyCFrAV7vD1xENLW+vmf2Pzly4yYas/g="; + inherit (finalAttrs) src patches; + hash = "sha256-90qikEM4spYEfRC2aE00rSH0roYb4O58862VtlN7gzY="; + fetcherVersion = 2; }; - cargoHash = "sha256-CMx7vTSGeQMXpXeH4LIOKEb29CfKXQV+r8tSYdmW5U4="; + cargoHash = "sha256-IWoO1jjPN6rUIj2duGhcfPvzhnzso6NKKXZO+W5bN9s="; - cargoRoot = "src-tauri"; + cargoRoot = "."; + buildAndTestSubdir = "crates-tauri/yaak-app-client"; + + patches = [ ./package-lock.patch ]; nativeBuildInputs = [ cargo-tauri.hook @@ -60,8 +67,11 @@ rustPlatform.buildRustPackage (finalAttrs: { makeWrapper lld wasm-pack - wasm-bindgen-cli_0_2_100 + wasm-bindgen-cli_0_2_121 wrapGAppsHook3 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook ]; buildInputs = [ @@ -80,62 +90,67 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # This must be set so that `npm rebuild` doesn't download wasm-pack - env.NPM_CONFIG_IGNORE_SCRIPTS = "true"; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + env.YAAK_CLI_NO_UPDATE_CHECK = "1"; + # sqlite-wasm-rs compiles sqlite3.c to wasm at build time and requires a + # Clang with WebAssembly support. Use the unwrapped compiler to avoid Nix's + # hardening flags, which are not supported by the wasm32 target + env.CC_wasm32_unknown_unknown = "${llvmPackages.clang.cc}/bin/clang"; + + # Only auto-patchelf the prebuilt CLI used during the build. + dontAutoPatchelf = true; postPatch = '' substituteInPlace package.json \ --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"' - substituteInPlace src-tauri/tauri.conf.json \ + substituteInPlace crates-tauri/yaak-app-client/tauri.conf.json \ --replace-fail '"0.0.0"' '"${finalAttrs.version}"' - substituteInPlace src-tauri/tauri.commercial.conf.json \ - --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' \ + substituteInPlace crates-tauri/yaak-app-client/tauri.release.conf.json \ + --replace-fail '"createUpdaterArtifacts": true' '"createUpdaterArtifacts": false' \ --replace-fail '"https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"' '"https://non.existent.domain"' substituteInPlace package.json \ - --replace-fail '"bootstrap:vendor-node": "node scripts/vendor-node.cjs",' "" \ - --replace-fail '"bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",' "" + --replace-fail '"vendor:vendor-node": "node scripts/vendor-node.cjs",' "" \ + --replace-fail '"vendor:vendor-protoc": "node scripts/vendor-protoc.cjs",' "" ''; preBuild = let - archPlatforms = + npmCliPlatforms = { - "aarch64-darwin" = "aarch64-apple-darwin"; - "aarch64-linux" = "aarch64-unknown-linux-gnu"; - "x86_64-linux" = "x86_64-unknown-linux-gnu"; + "aarch64-darwin" = "darwin-arm64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-linux" = "linux-x64"; } .${stdenv.hostPlatform.system}; in '' - mkdir -p src-tauri/vendored/node - ln -s ${nodejs}/bin/node src-tauri/vendored/node/yaaknode-${archPlatforms} - mkdir -p src-tauri/vendored/protoc - ln -s ${protobuf}/bin/protoc src-tauri/vendored/protoc/yaakprotoc-${archPlatforms} - ln -s ${protobuf}/include src-tauri/vendored/protoc/include + ${lib.optionalString stdenv.hostPlatform.isLinux '' + autoPatchelf node_modules/@yaakapp/cli-${npmCliPlatforms}/bin/yaak + ''} + + mkdir -p crates-tauri/yaak-app-client/vendored/node + ln -s ${nodejs}/bin/node crates-tauri/yaak-app-client/vendored/node/yaaknode + mkdir -p crates-tauri/yaak-app-client/vendored/protoc + ln -s ${protobuf}/bin/protoc crates-tauri/yaak-app-client/vendored/protoc/yaakprotoc + ln -s ${protobuf}/include crates-tauri/yaak-app-client/vendored/protoc/include ''; tauriBuildFlags = [ "--config" - "./src-tauri/tauri.commercial.conf.json" + "./tauri.release.conf.json" ]; # Permission denied (os error 13) - # write to src-tauri/vendored/protoc/include + # write to crates-tauri/yaak-app-client/vendored/protoc/include doCheck = false; - preInstall = "pushd src-tauri"; - - postInstall = - lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/bin - makeWrapper $out/Applications/Yaak.app/Contents/MacOS/yaak-app $out/bin/yaak-app - '' - + '' - popd - ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/bin + makeWrapper $out/Applications/Yaak.app/Contents/MacOS/yaak-app-client $out/bin/yaak-app-client + ''; passthru.updateScript = nix-update-script { }; @@ -145,7 +160,7 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/mountain-loop/yaak/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ redyf ]; - mainProgram = "yaak-app"; + mainProgram = "yaak-app-client"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/ya/yarn-zpm/package.nix b/pkgs/by-name/ya/yarn-zpm/package.nix index 55c0a1257dbe..0b5de2a5eec3 100644 --- a/pkgs/by-name/ya/yarn-zpm/package.nix +++ b/pkgs/by-name/ya/yarn-zpm/package.nix @@ -8,24 +8,29 @@ rustPlatform, versionCheckHook, stdenv, + cacert, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "yarn-zpm"; - version = "6.0.0-rc.22"; + version = "6.0.0-rc.23"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "zpm"; tag = "v${finalAttrs.version}"; - hash = "sha256-hUofl9mo/lBHasVR/7/2l8fek0dHr2E0aiSq28R+uVk="; + hash = "sha256-db6uqSBfzr55eLYYf95krHjA47MycnjZVJ2a82Q/Dbw="; }; - cargoHash = "sha256-OhlTQ/NMXwUnvyEJv20hPN7g1eaZWIQdJcWWDeKOK+s="; + cargoHash = "sha256-f/GSG4cqwT8z6Uj7XCl2rN1ZI7Q9DGTDUQ8/pMG+suI="; cargoBuildFlags = [ "--package=zpm" ]; cargoTestFlags = [ "--package=zpm" ]; + env = { + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=http::tests::network_concurrency_permit_is_released_after_failure" "--skip=http::tests::network_concurrency_limits_in_flight_response_bodies" @@ -46,6 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { simple-test = runCommand "yarn-zpm-simple-test" { + env = finalAttrs.env; nativeBuildInputs = [ jq gitMinimal @@ -67,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { jq -n '{name: "workspace-test"}' > workspace-test/package.json yarn install jq -e '.name == "workspace-test"' node_modules/workspace-test/package.json - jq -e '.project.workspaces | has("workspace-test")' yarn.lock + jq -e '.entries | has("workspace-test@workspace:^")' yarn.lock touch $out ''; }; diff --git a/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix b/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix index bb97c06b595e..85a230e6dc0b 100644 --- a/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, mkYaziPlugin, }: mkYaziPlugin { @@ -14,6 +15,13 @@ mkYaziPlugin { hash = "sha256-GQFBRB2aQqmmuKZ0BpcCAC4r0JFKqIANZNhUC98SlwY="; }; + patches = [ + (fetchpatch { + url = "https://github.com/sidhantunnithan/bookmarks.yazi/commit/f60eec36bdf2327efbcdd0db3405ad4e5359e774.patch"; + hash = "sha256-XNPPH7ajl3V6eZkbpRWsMXihbJt8LbrY5eNwnOsAcUo="; + }) + ]; + meta = { description = "Yazi plugin that adds the basic functionality of vi-like marks"; homepage = "https://github.com/dedukun/bookmarks.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix b/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix index ab79131a3c09..78ac11a868b6 100644 --- a/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/time-travel/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "time-travel.yazi"; - version = "0-unstable-2026-01-16"; + version = "0-unstable-2026-10-15"; src = fetchFromGitHub { owner = "iynaix"; repo = "time-travel.yazi"; - rev = "aaec6e26e525bd146354a5137ec40f1f23257a4e"; - hash = "sha256-/+KiuGUox763dMQvHl1l3+Ci3vL8NwRuKNu9pi3gjyE="; + rev = "1cd63a06831b73098fb74e271700f00b6bb439da"; + hash = "sha256-l5P1A4agmhQGX0Qdni2pL0FQNwFHe5OJgELnKADrqls="; }; meta = { diff --git a/pkgs/by-name/yt/ytt/package.nix b/pkgs/by-name/yt/ytt/package.nix index 0d89e3cf92b5..554fe205e82b 100644 --- a/pkgs/by-name/yt/ytt/package.nix +++ b/pkgs/by-name/yt/ytt/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "ytt"; - version = "0.55.3"; + version = "0.55.4"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "ytt"; tag = "v${finalAttrs.version}"; - hash = "sha256-gpp0TH89jN7UZ75nL2qUaeJL0twR+GsUWS1cilyvX88="; + hash = "sha256-3s0Y/1q4n1wBJPAvxXa9KE9gL6lBeSgVhOQpPLEKIj0="; }; vendorHash = null; diff --git a/pkgs/by-name/yy/yyjson/package.nix b/pkgs/by-name/yy/yyjson/package.nix index 7e53479d06c2..34b347e585d7 100644 --- a/pkgs/by-name/yy/yyjson/package.nix +++ b/pkgs/by-name/yy/yyjson/package.nix @@ -2,32 +2,31 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, + testers, }: stdenv.mkDerivation (finalAttrs: { pname = "yyjson"; - version = "0.12.0"; + version = "0.13.0"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; tag = finalAttrs.version; - hash = "sha256-1CYnEgUMUc7eqdkv6M/KyL/MdVQBMov9HgLCycF6++w="; + hash = "sha256-N/lVqkgko/4PRs596NtF/MyqAdO/I+QJvkVnCJWEE3I="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; - patches = [ - # https://github.com/ibireme/yyjson/pull/295 - (fetchpatch { - url = "https://github.com/ibireme/yyjson/commit/bef00cb5fe1929944cc13dec13f0f23fa4ad568b.patch"; - hash = "sha256-oRFN95sgLqiwCzxvC3G4CFsD6sJtI5NeBWp4/WeaKCc="; - }) - ]; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; meta = { description = "Fastest JSON library in C"; @@ -35,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; + pkgConfigModules = [ "yyjson" ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix index e7e98f8631f3..ff199d44b320 100644 --- a/pkgs/by-name/za/zapret2/package.nix +++ b/pkgs/by-name/za/zapret2/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$ZAPRET_BASE" - for spec in "blockcheck2.sh" "blockcheck2.d" "common" "ipset" "lua"; do + for spec in "blockcheck2.sh" "blockcheck2.d" "common" "ipset" "lua" "files"; do cp -R "$spec" "$ZAPRET_BASE/" done diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index bcb209bf851f..bd4fe3848320 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -25,14 +25,14 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "zapzap"; - version = "7.4.5"; + version = "7.5.1"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = finalAttrs.version; - hash = "sha256-cJUNOUaS39WKJrlM+jYezTGHw5obGsn6bmpyyqWg5tc="; + hash = "sha256-11XHhb7uwygcCIPV1mQydMtj4mXnjtzxxd+JNftHx7w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zee/package.nix b/pkgs/by-name/ze/zee/package.nix index 903e82a6fad9..61a6883a9d42 100644 --- a/pkgs/by-name/ze/zee/package.nix +++ b/pkgs/by-name/ze/zee/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, openssl, + libgit2, stdenv, # for meta.broken }: @@ -27,12 +28,19 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + libgit2 + ]; - # disable downloading and building the tree-sitter grammars at build time - # grammars can be configured in a config file and installed with `zee --build` - # see https://github.com/zee-editor/zee#syntax-highlighting - env.ZEE_DISABLE_GRAMMAR_BUILD = 1; + env = { + # disable downloading and building the tree-sitter grammars at build time + # grammars can be configured in a config file and installed with `zee --build` + # see https://github.com/zee-editor/zee#syntax-highlighting + ZEE_DISABLE_GRAMMAR_BUILD = 1; + + LIBGIT2_NO_VENDOR = 1; + }; meta = { # last successful hydra build on darwin was in 2024 diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix index 32b629ebfa41..079e57c0e96d 100644 --- a/pkgs/by-name/ze/zeno/package.nix +++ b/pkgs/by-name/ze/zeno/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "zeno"; - version = "2.0.27"; + version = "2.0.28"; src = fetchFromGitHub { owner = "internetarchive"; repo = "Zeno"; tag = "v${finalAttrs.version}"; - hash = "sha256-TxizytoXeZmgKUkLOqWUHSA7rNCAW43FQlC5KpbLe50="; + hash = "sha256-/9s6ZkQdLLNVeKteVR0D5FnEXZNv9uepOPA8CJ0aVQg="; }; - vendorHash = "sha256-SgC8wZr2BHGXT2Oul3/YqX0H9XMpFBaA6GCQPfRkxY4="; + vendorHash = "sha256-p4E1ZLj1AwBFS0ZlHaPdomuMXWxVV+IT+rRuYWnY1+A="; env.CGO_ENABLED = true; ldFlags = [ diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index bdd346dfa68c..e29ca4aa482e 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "zk"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-owHbrQwoQS+SbfZ6EQO/ii10zX73MmUpohuIIltlnw8="; + sha256 = "sha256-Nik9qJ3Pe1h99zSSBbv6Va7Rg99CeX3fZSU8UVl4YKo="; }; vendorHash = "sha256-Y5KI3o4HYWyqQl/RnOetyIKOI+CbYWSgrbkGkpAKsX4="; diff --git a/pkgs/development/compilers/arocc/default.nix b/pkgs/development/compilers/arocc/default.nix index a017b60b9a4e..814fcb11522a 100644 --- a/pkgs/development/compilers/arocc/default.nix +++ b/pkgs/development/compilers/arocc/default.nix @@ -2,12 +2,12 @@ lib, fetchFromGitHub, callPackage, - zig, + zig_0_16, }: let versions = [ { - inherit zig; + zig = zig_0_16; version = "0-unstable-2026-04-02"; src = fetchFromGitHub { owner = "Vexu"; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index bdc45a50ea34..841b4ae598c6 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "binaryen"; - version = "132"; + version = "133"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-di/M4QidDwa1doomy79yfN7chCng9VcDB2KgmaEunDc="; + hash = "sha256-ip10rXDnBfgSLrc4q8TXGckGnyq4SSoXQKoCU/KQIE8="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ]; checkInputs = [ gtest ]; checkPhase = '' - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py --binaryen-bin=$PWD/bin $tests ''; # bin/binaryen-unittests is absent on cross builds which don't have doCheck, diff --git a/pkgs/development/compilers/elm/packages/elm-watch/default.nix b/pkgs/development/compilers/elm/packages/elm-watch/default.nix index 7ed7f0d6d4ae..059edd367b24 100644 --- a/pkgs/development/compilers/elm/packages/elm-watch/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-watch/default.nix @@ -8,7 +8,7 @@ }: buildNpmPackage (finalAttrs: { pname = "elm-watch"; - version = "1.2.8"; + version = "1.2.9"; inherit nodejs; @@ -16,7 +16,7 @@ buildNpmPackage (finalAttrs: { owner = "lydell"; repo = "elm-watch"; tag = "v${finalAttrs.version}"; - hash = "sha256-AosI/d9sFHI/vRXNE0xNwsewYeSntfgpgAEwyu0isns="; + hash = "sha256-XLnqXEXhikUPn/1OFNLW526QFIGT4rgbfl/2csl0pPs="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/go/1.26.nix b/pkgs/development/compilers/go/1.26.nix index 46a433cbe573..83f5010b9204 100644 --- a/pkgs/development/compilers/go/1.26.nix +++ b/pkgs/development/compilers/go/1.26.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.26.9"; + version = "1.26.10"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-lzXX3Ntls10/pXfwQGRzfAO4nPGitx5uaf4vPG+f1Mo="; + hash = "sha256-/WPog7ovK/ypPBZGsx6+9j4rHk0rMXyXidl2po2B828="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.27.nix b/pkgs/development/compilers/go/1.27.nix index ed2d68a3c6a9..0bdabbc7b0bb 100644 --- a/pkgs/development/compilers/go/1.27.nix +++ b/pkgs/development/compilers/go/1.27.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.27.2"; + version = "1.27.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-A0ldorpkiU1A9cSZLklFT6eLUGkGBP+Stq//UIG3bmI="; + hash = "sha256-bndJA1zzYPBrJXXRYup535/ajvZxiJ5cN1+OUHd/Jrs="; }; strictDeps = true; diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_11.3.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_11.3.0.json deleted file mode 100644 index cc7b020dfc67..000000000000 --- a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_11.3.0.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "release_date": "2026-09-22", - "release_label": "11.3.0", - "release_product": "tensorrt", - "tensorrt": { - "name": "NVIDIA TensorRT", - "license": "TensorRT", - "version": "11.3.0.99", - "cuda_variant": [ - "12", - "13" - ], - "linux-sbsa": { - "cuda13": { - "md5": "a523847064f8fa43e08cc94341d38b83", - "relative_path": "tensorrt/11.3.0/tars/TensorRT-Enterprise-11.3.0.99-Linux-aarch64-cuda-13.4-Release-external.tar.zst", - "sha256": "27a2f2f81b0ee637be5a3e4eb0895a16a286afcd691da15d001a2da41495028a", - "size": "2541388642" - } - }, - "linux-x86_64": { - "cuda12": { - "md5": "340512337b405a794065311df3a71879", - "relative_path": "tensorrt/11.3.0/tars/TensorRT-Enterprise-11.3.0.99-Linux-x86_64-cuda-12.9-Release-external.tar.zst", - "sha256": "69df36d25030bc59793fb0994b749fa01cdc3179471cccaf9f9791b276a22b67", - "size": "3526438942" - }, - "cuda13": { - "md5": "cf1e93ccaa7a9b6cb79e2f5e4456b31a", - "relative_path": "tensorrt/11.3.0/tars/TensorRT-Enterprise-11.3.0.99-Linux-x86_64-cuda-13.4-Release-external.tar.zst", - "sha256": "c383126a0e51e5962afac9caf97149a3c1908bf6b4e0ccc781a6eb6d984bf0c6", - "size": "3721239763" - } - } - } -} diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_11.4.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_11.4.0.json new file mode 100644 index 000000000000..ee7069dcde7a --- /dev/null +++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_11.4.0.json @@ -0,0 +1,36 @@ +{ + "release_date": "2026-10-09", + "release_label": "11.4.0", + "release_product": "tensorrt", + "tensorrt": { + "name": "NVIDIA TensorRT", + "license": "TensorRT", + "version": "11.4.0.106", + "cuda_variant": [ + "12", + "13" + ], + "linux-sbsa": { + "cuda13": { + "md5": "3efe9e2b481ec80f4fb88843d712ba9b", + "relative_path": "tensorrt/11.4.0/tars/TensorRT-Enterprise-11.4.0.106-Linux-aarch64-cuda-13.4-Release-external.tar.zst", + "sha256": "00c1b478555df9830bdc72a950b4d8b482715e691ac3627e66b66f7b6a712077", + "size": "2548754965" + } + }, + "linux-x86_64": { + "cuda12": { + "md5": "f89f3e6f61b5bee4add9db00dc65a774", + "relative_path": "tensorrt/11.4.0/tars/TensorRT-Enterprise-11.4.0.106-Linux-x86_64-cuda-12.9-Release-external.tar.zst", + "sha256": "6588d211dec2f254b1fc78cce581aadcf4ff29ecbbee770e16085ace93b57a60", + "size": "3527796143" + }, + "cuda13": { + "md5": "eadb6e821c3c1cdf8b29258419be8376", + "relative_path": "tensorrt/11.4.0/tars/TensorRT-Enterprise-11.4.0.106-Linux-x86_64-cuda-13.4-Release-external.tar.zst", + "sha256": "c67c87674cbe7b2337d1c30cb16d48686ab79ecb11bf08cb764b71f4f2bb711b", + "size": "3725547403" + } + } + } +} diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix index bdf8a75494a1..0e2fd8cb5c29 100644 --- a/pkgs/development/cuda-modules/buildRedist/default.nix +++ b/pkgs/development/cuda-modules/buildRedist/default.nix @@ -14,6 +14,7 @@ lib, manifests, markForCudatoolkitRootHook, + patchelf, removeStubsFromRunpathHook, srcOnly, stdenv, @@ -277,6 +278,17 @@ extendMkDerivation { nativeBuildInputs = [ ./buildRedistHook.bash + # patchelf 0.19.2 aborts in shiftFile when addDriverRunpath re-patches binaries (e.g. libcufile, cuda_nvcc). + # FIXME: drop once https://github.com/NixOS/patchelf/pull/672 is in the default patchelf + (patchelf.overrideAttrs ( + finalAttrs: _: { + version = "0.15.2"; + src = fetchurl { + url = "https://github.com/NixOS/patchelf/releases/download/${finalAttrs.version}/patchelf-${finalAttrs.version}.tar.bz2"; + hash = "sha256-F3RfVkFZyOIo/EEtplogSLhGxLa0Igt3y/IkFuAvLXw="; + }; + } + )) autoPatchelfHook # This hook will make sure libcuda can be found # in typically /lib/opengl-driver by adding that diff --git a/pkgs/development/cuda-modules/default.nix b/pkgs/development/cuda-modules/default.nix index e8ab8e91c28f..f69e4f37df68 100644 --- a/pkgs/development/cuda-modules/default.nix +++ b/pkgs/development/cuda-modules/default.nix @@ -139,6 +139,7 @@ let autoAddDriverRunpath autoPatchelfHook fetchurl + patchelf srcOnly stdenv stdenvNoCC diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix index 869aff1a07a2..87576cc890fe 100644 --- a/pkgs/development/cuda-modules/packages/nccl.nix +++ b/pkgs/development/cuda-modules/packages/nccl.nix @@ -69,11 +69,21 @@ backendStdenv.mkDerivation (finalAttrs: { repo = "nccl"; tag = "v${finalAttrs.version}"; hash = getAttr finalAttrs.version { - "2.32.3-1" = "sha256-xUllfdWAL0Ee9P9T9CZC2ddkPRnSXZXgwApgO398i6g="; + "2.32.3-1" = "sha256-3OYSPfhYABe8Aj0Or58Vzg9CmY4aRCaqLlEIYWm6RqU="; "2.28.7-1" = "sha256-NM19OiBBGmv3cGoVoRLKSh9Y59hiDoei9NIrRnTqWeA="; "2.26.6-1" = "sha256-vkWMGXCy+dIpYCecdafmOAGlnfRxIQ5Y2ZQuMjinraI="; "2.25.1-1" = "sha256-3snh0xdL9I5BYqdbqdl+noizJoI38mZRVOJChgEE1I8="; }; + # .git_archival.txt is marked with `export-subst` attribute since + # https://github.com/NVIDIA/nccl/commit/76c747405b7846240eaaf4e50f8ee238a5c07ba6 + # %(describe...) expression generates string like `nccl4py-v0.6.0-3-g12df1a11af`, + # but leaves the length of the commit hash prefix up to GitHub's whim that changes + # trim everything after `-g` to keep only more stable and predictable parts of this value + postFetch = '' + if [ -f "$out/bindings/nccl4py/.git_archival.txt" ]; then + sed -E -i 's/^(describe-name: .*)-g[0-9a-h]+/\1/' "$out/bindings/nccl4py/.git_archival.txt" + fi + ''; }; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix index 247492ece54c..8acf63f40acf 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix @@ -135,6 +135,10 @@ backendStdenv.mkDerivation (finalAttrs: { tag = "v11.3"; hash = "sha256-U52/Pyd+94taV+yhfxseUdyY5lLwOcxBPIwDatjr6gs="; }; + "11.4.0" = { + tag = "v11.4"; + hash = "sha256-zSV5taL+LmPWNkY4ZKX2wQvJi+Ogo0lrElLTN48BDxc="; + }; } ); diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix index 878f1f9713eb..73fda1a7a9b7 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix @@ -37,7 +37,8 @@ in "10.16.1" = sample-data_10_14_1; # Release 10.16 is missing sample data "11.0.0" = sample-data_11_0_0; "11.1.0" = sample-data_11_0_0; - "11.3.0" = sample-data_11_0_0; # Releases 11.1 through 11.3 are missing sample data + "11.3.0" = sample-data_11_0_0; + "11.4.0" = sample-data_11_0_0; # Releases 11.1 through 11.4 are missing sample data } ); diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix index 560a2ca68d4b..0ffb50e6aeaa 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt.nix @@ -105,12 +105,6 @@ buildRedist ( ] ++ optionals (tensorrtAtLeast "10.13.3") [ "libcuda.so.1" - ] - # Some linux-sbsa releases of TensorRT 11 (e.g., 11.3.0, but not 11.1.0) ship libnvdla_compiler.so, which links - # against the L4T driver library libnvos.so. No other library in the release has a DT_NEEDED on it, and TensorRT - # 10.7 was the last release to support DLA. - ++ optionals (hostRedistSystem == "linux-sbsa" && tensorrtAtLeast "11.0.0") [ - "libnvos.so" ]; # Create a symlink for the Onnx header files in include/onnx @@ -191,8 +185,8 @@ buildRedist ( ''; # NOTE: Like cuDNN, NVIDIA offers forward compatibility within a major releases of CUDA. - # NOTE: The support matrix lists only CUDA 13.4 for the linux-sbsa release of 11.3.0 (built with CUDA 13.4), while - # stating that it is compatible with CUDA 13.x; we have tested it with CUDA 13.0 and 13.4. + # NOTE: The support matrix lists only CUDA 13.4 Update 1 for the linux-sbsa release of 11.4.0 (built with CUDA 13.4 + # Update 1), while stating that its packages require CUDA 13.x; we have tested it with CUDA 13.0 and 13.4. # NOTE: The support matrix lists only CUDA 13.2 Update 1 for the linux-sbsa and JetPack release of 10.16.1, which # supports Jetson Orin (8.7) and Thor (11.0). # NOTE: The support matrix lists CUDA 13.3 for the linux-sbsa release of 11.1.0 (built with CUDA 13.3) and CUDA 13.2 diff --git a/pkgs/development/interpreters/python/hooks/stestr-check-hook.sh b/pkgs/development/interpreters/python/hooks/stestr-check-hook.sh index f6db613b89d8..06ecd734ced5 100644 --- a/pkgs/development/interpreters/python/hooks/stestr-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/stestr-check-hook.sh @@ -10,7 +10,7 @@ function stestrCheckPhase() { local -a patterns=() # Append regex pattern - read -ra patterns <<< "$disabledTestsRegex" + concatTo patterns disabledTestsRegex # Sanitize disabledTests options if [[ -n "${disabledTests[*]-}" ]] || [[ -n "${disabledTestsRegex[*]-}" ]]; then @@ -26,6 +26,7 @@ function stestrCheckPhase() { flagsArray+=(--exclude-regex "($(concatStringsSep "|" patterns))") fi + concatTo flagsArray stestrFlags echoCmd 'stestr flags' "${flagsArray[@]}" @pythonCheckInterpreter@ -m stestr run "${flagsArray[@]}" diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index a0abba268f88..ad335a1c0ac8 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -223,7 +223,13 @@ in inherit toPythonModule toPythonApplication; inherit mkPythonMetaPackage mkPythonEditablePackage; - python = toPythonModule python; + python = toPythonModule python // { + pkgs = self; + withPackages = import ./with-packages.nix { + inherit (python) buildEnv; + pythonPackages = self; + }; + }; # Don't take pythonPackages from "global" pkgs scope to avoid mixing python versions. pythonPackages = self; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 30920e4b8154..7d28ccc1a6eb 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -210,11 +210,23 @@ let self; in assert myPython.pkgs.foobar == myPython.pkgs.numpy; + assert myPython.pkgs.python.pkgs.foobar == myPython.pkgs.numpy; + assert + myPython.pkgs.python.withPackages (ps: with ps; [ foobar ]) + == myPython.withPackages (ps: with ps; [ numpy ]); myPython.withPackages (ps: with ps; [ foobar ]); - # overrideScope is broken currently - # test-overrideScope = let - # myPackages = python.pkgs.overrideScope extension; - # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); + test-overrideScope = + let + myPackages = python.pkgs.overrideScope extension; + in + assert myPackages.foobar == myPackages.numpy; + assert myPackages.python.pkgs.foobar == myPackages.numpy; + myPackages.python.withPackages ( + ps: with ps; [ + foobar + ps.python.pkgs.foobar + ] + ); # # Have to skip prebuilt python as it's not present in top-level # `pkgs` as an attribute. diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index a29061bee218..4060a4381fef 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -114,7 +114,12 @@ stdenv.mkDerivation (finalAttrs: { ); } // - lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") + lib.optionalAttrs + ( + stdenv.cc.bintools.isLLVM + && lib.versionAtLeast stdenv.cc.bintools.version "17" + && !stdenv.hostPlatform.isMinGW + ) { # https://reviews.llvm.org/D135402 # Without this flag configure decides that it cannot build shared libraries and does not make a libz.so diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e7d8b6b32d6d..7c2cf00534f6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1140,15 +1140,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.2711-1"; + version = "0.0.2719-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.2711-1.rockspec"; - sha256 = "0wvhwis8i5a0jx3y3icjzfgha22yvwvggas8mkdhv9q74gd2pip7"; + url = "mirror://luarocks/fzf-lua-0.0.2719-1.rockspec"; + sha256 = "0xnkw1ng8z8y6hizv1p8sgb4mrs5yi6i5shmhxh893danbraj556"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/ed0e0ead1789ee349cbf025900931fb402b1e05e.zip"; - sha256 = "13c4csfvkpicyjr69cbh46klz8bf6bjsk5ad4ljh2ic86m0y475n"; + url = "https://github.com/ibhagwan/fzf-lua/archive/3868dcc78d2c2766c9510ab18b6d3815071b389e.zip"; + sha256 = "0ps9snlkxl26s1a3ig6qycfr10n4gc4yb8h5na1qnxr7skh9gjv4"; }; disabled = luaOlder "5.1"; @@ -2505,17 +2505,17 @@ final: prev: { }: buildLuarocksPackage { pname = "lua-resty-jwt"; - version = "0.3.2-1"; + version = "0.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-jwt-0.3.2-1.rockspec"; - sha256 = "0r870630jzpdr41gyc1myn6zn1qpid4whx2abn0v8qaqyg0j825y"; + url = "mirror://luarocks/lua-resty-jwt-0.4.0-1.rockspec"; + sha256 = "05bd2phh37y0a67v8lv9c9z0wif5qfa6b5kb3a4924vxkn4zd1dx"; }).outPath; src = fetchFromGitHub { owner = "cdbattags"; repo = "lua-resty-jwt"; - rev = "3973e402d835631de292c6e4cca52e728f02c24a"; - hash = "sha256-KJvHwN8R2t8aJS/wMdVDJh5Mld1fF3FhYAOPk2njTu8="; + tag = "v0.4.0"; + hash = "sha256-f0Ma6svW3bsi7S87GW+VDJlxjnBRCcEUGqL0ArlyI2c="; }; disabled = luaOlder "5.1"; @@ -2526,10 +2526,9 @@ final: prev: { license = lib.licenses.asl20; description = "JWT for ngx_lua and LuaJIT."; longDescription = '' - This library requires an nginx build - with OpenSSL, the ngx_lua module, - the LuaJIT 2.0, the lua-resty-hmac, - and the lua-resty-string, + JWS and JWE (JWT) signing, verification, encryption and decryption + for OpenResty. Requires OpenResty (ngx_lua and LuaJIT) built with + OpenSSL, and lua-resty-openssl. ''; }; } @@ -2548,17 +2547,17 @@ final: prev: { }: buildLuarocksPackage { pname = "lua-resty-openidc"; - version = "1.9.1-1"; + version = "1.9.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openidc-1.9.1-1.rockspec"; - sha256 = "1irh9c1v10yx0zdxplbypy2zv2717mh5j2qxsdv5hvwvrp3h2rf4"; + url = "mirror://luarocks/lua-resty-openidc-1.9.2-1.rockspec"; + sha256 = "09dx5p00s9snin4w5q9zz1bp0ixn8pig4f45mr8s98jlgi6i2xvj"; }).outPath; src = fetchFromGitHub { owner = "zmartzone"; repo = "lua-resty-openidc"; - tag = "v1.9.1"; - hash = "sha256-98b+FmBq+yMnTpnimkLSUEkA0WWO0Ob1h25xwRjBvJY="; + tag = "v1.9.2"; + hash = "sha256-Cjo/CuAk1/moMspwY81kzWh8dnYMGG1nqqtZPTWYjXo="; }; disabled = luaOlder "5.1"; @@ -3427,17 +3426,17 @@ final: prev: { }: buildLuarocksPackage { pname = "luaffi-tkl"; - version = "1.0.5-2"; + version = "1.0.5-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luaffi-tkl-1.0.5-2.rockspec"; - sha256 = "1b87mqkvw36bxmdj79mqpna8ydwif23cryr574q2c6f07jaqi6jc"; + url = "mirror://luarocks/luaffi-tkl-1.0.5-3.rockspec"; + sha256 = "12cvf4dzklh0v3j5a480kzqdlbn6i0nv42b6dkz27xxhy8mdk6fz"; }).outPath; src = fetchFromGitHub { owner = "Tekenlight"; repo = "luaffifb"; - tag = "v1.0.5-2"; - hash = "sha256-6XBWjm7sNoN96uv9lC64dlF43QuF9NE2ky0bycxBkHY="; + tag = "v1.0.5-3"; + hash = "sha256-o183qSWCabF0Z5uUwUK6v4hGah7KcNCkBOTN16H2fSI="; }; disabled = luaOlder "5.1"; @@ -5851,15 +5850,15 @@ final: prev: { }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.49.0-1"; + version = "2.49.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.49.0-1.rockspec"; - sha256 = "1krbnmx90avna2bzxvdv5zs7iakgkcm9w0dniingbhifkrkmiazr"; + url = "mirror://luarocks/rocks.nvim-2.49.1-1.rockspec"; + sha256 = "06vg9ginivdiryk79xn9n2d5b13dlral9snqf4hhn3jk4yvgw2j9"; }).outPath; src = fetchzip { - url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.49.0.zip"; - sha256 = "13sr1alra4dlh22p6b53y6695zdv4vih3gdkvjfd7q3057ni7l20"; + url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.49.1.zip"; + sha256 = "1d7v32jvmn5jrf63m9wlcy2qwvd0yykllr0yiw5j75srr7ij40wl"; }; disabled = lua.luaversion != "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 4dfa4df1dadd..1276a5320c58 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -542,15 +542,12 @@ in ''; }; - lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs { - src = fetchFromGitHub { - owner = "cdbattags"; - repo = "lua-resty-jwt"; - rev = "v0.3.2"; - hash = "sha256-VCi5ge2jAldJQgecFeMZJkq5PqRQdUs+K8NsXWmK7IQ="; + lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs (old: { + src = old.src.override { fetchSubmodules = true; + hash = "sha256-71Y88ZvmvysgTmY19eogLO1xNaY0WMjhZ//r18dFPdw="; }; - }; + }); lua-rtoml = prev.lua-rtoml.overrideAttrs (old: { strictDeps = false; @@ -1143,6 +1140,11 @@ in }; rocks-nvim = prev.rocks-nvim.overrideAttrs (oa: { + # Inserting keys during pairs() traversal can omit the WARN log level. + postPatch = (oa.postPatch or "") + '' + substituteInPlace lua/rocks/log.lua \ + --replace-fail 'pairs(log_levels)' 'pairs(vim.log.levels)' + ''; nativeCheckInputs = [ final.nlua diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix deleted file mode 100644 index df87457f4951..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildDunePackage, - defaultVersion ? "0.12.0", -}: - -{ - pname, - version ? defaultVersion, - duneVersion ? "3", - hash, - ... -}@args: - -buildDunePackage ( - args - // { - inherit version duneVersion; - - minimalOCamlVersion = "4.07"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = pname; - rev = "v${version}"; - sha256 = hash; - }; - - meta = { - license = lib.licenses.mit; - homepage = "https://github.com/janestreet/${pname}"; - } - // args.meta; - } -) diff --git a/pkgs/development/ocaml-modules/opam-core/default.nix b/pkgs/development/ocaml-modules/opam-core/default.nix index dc907ac3b435..02a2864b6c37 100644 --- a/pkgs/development/ocaml-modules/opam-core/default.nix +++ b/pkgs/development/ocaml-modules/opam-core/default.nix @@ -14,6 +14,8 @@ buildDunePackage { pname = "opam-core"; + minimalOCamlVersion = "4.11"; + inherit (opam) src version; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix index 529b7c184939..ac6a63869093 100644 --- a/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -2,8 +2,10 @@ lib, buildDunePackage, opam-format, - curl, patch, + tar, + checkseum, + decompress, }: buildDunePackage { @@ -14,6 +16,9 @@ buildDunePackage { propagatedBuildInputs = [ opam-format patch + tar + checkseum + decompress ]; configureFlags = [ "--disable-checks" ]; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 03dae50f7e99..54d30ebbc446 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -47,6 +47,10 @@ lib.throwIf (attrs ? name) defaultMeta = { homepage = "https://metacpan.org/dist/${attrs.pname}"; inherit (perl.meta) platforms; + identifiers.purlParts = { + type = "cpan"; + spec = "${attrs.pname}@${attrs.version}"; + }; }; package = stdenv.mkDerivation ( diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/advent-of-code-data/default.nix similarity index 91% rename from pkgs/development/python-modules/aocd/default.nix rename to pkgs/development/python-modules/advent-of-code-data/default.nix index bb1b1a0c4281..2d65bc488d2b 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/advent-of-code-data/default.nix @@ -23,15 +23,15 @@ tzlocal, }: -buildPythonPackage rec { - pname = "aocd"; +buildPythonPackage (finalAttrs: { + pname = "advent-of-code-data"; version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "wimglenn"; repo = "advent-of-code-data"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Oe+9Ur5O2GSRY7qB8oja7quJqEX/0yXKh4R5+N4kv7Q="; }; @@ -74,9 +74,9 @@ buildPythonPackage rec { meta = { description = "Get your Advent of Code data with a single import statement"; homepage = "https://github.com/wimglenn/advent-of-code-data"; - changelog = "https://github.com/wimglenn/advent-of-code-data/releases/tag/${src.tag}"; + changelog = "https://github.com/wimglenn/advent-of-code-data/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aadibajpai ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/aioipp/default.nix b/pkgs/development/python-modules/aioipp/default.nix new file mode 100644 index 000000000000..69a6d1f5a70b --- /dev/null +++ b/pkgs/development/python-modules/aioipp/default.nix @@ -0,0 +1,63 @@ +{ + lib, + aiohttp, + aresponses, + awesomeversion, + buildPythonPackage, + deepmerge, + fetchFromGitHub, + poetry-core, + pyprojectVersionPatchHook, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + syrupy, + yarl, +}: + +buildPythonPackage (finalAttrs: { + pname = "aioipp"; + version = "0.20.0"; + pyproject = true; + + disabled = pythonOlder "3.14"; + + src = fetchFromGitHub { + owner = "brianegge"; + repo = "aioipp"; + tag = finalAttrs.version; + hash = "sha256-ircGvIr4GXGdCc1EL5EZQde+/MGf+8gggEm4lmuyfOo="; + }; + + nativeBuildInputs = [ pyprojectVersionPatchHook ]; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + awesomeversion + deepmerge + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + __darwinAllowLocalNetworking = true; + + pythonImportsCheck = [ "pyipp" ]; + + meta = { + description = "Asynchronous Python client for Internet Printing Protocol (IPP)"; + homepage = "https://github.com/brianegge/aioipp"; + changelog = "https://github.com/brianegge/aioipp/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 9bbf5e6064e6..3bfba90be62f 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "aioshelly"; - version = "13.34.1"; + version = "13.35.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; tag = finalAttrs.version; - hash = "sha256-YG/DQma5bTJGKpx3eHvc0Nfb8iHs/gqRuhzv/LnffHs="; + hash = "sha256-MBoRglq1Osz9you7pfeHNbYP1MLO6D2luiShc5dQhsI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix index 1fe421fb65bc..9e5526aaa875 100644 --- a/pkgs/development/python-modules/aiosonos/default.nix +++ b/pkgs/development/python-modules/aiosonos/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "aiosonos"; - version = "0.1.14"; + version = "0.1.15"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "aiosonos"; tag = finalAttrs.version; - hash = "sha256-fOXeiP5sp9oOZYXAZJJ4JJWD3JQEFKi8pEejrCNrep8="; + hash = "sha256-AKTXock2tjNR/LnNN0p5oD8ogwEnqr64jAcEC6JZYeg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/altcha/default.nix b/pkgs/development/python-modules/altcha/default.nix index 4d8fe5ad3dd3..1c6dd8b7fb2c 100644 --- a/pkgs/development/python-modules/altcha/default.nix +++ b/pkgs/development/python-modules/altcha/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "altcha"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "altcha-org"; repo = "altcha-lib-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lg28eGXVTwt8L/3fUZw/9Gn5BObM30YtJdLEaDt56Gc="; + hash = "sha256-vqGmTNPuJyh+7XB0JvWc6zD6OtfIAYxdeEdCf6s0/00="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 6e06d9347f26..65f599cb2316 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "26.9.0"; + version = "26.10.0"; pyproject = true; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { # export-subst prevents reproducibility rm $out/.git_archival.txt ''; - hash = "sha256-+UHBJV8gTY/Id3wKtBWF7zZsclWhIdnFnjud/AScF8s="; + hash = "sha256-xc4sOijhbd4TJcDIRHAIAxCW2QK+RUOhYDDZ4YdHvVk="; }; build-system = [ diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 7675694f7d25..6ad5f4f07e41 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -66,7 +66,7 @@ buildPythonPackage (finalAttrs: { pname = "apache-beam"; - version = "2.75.0"; + version = "2.77.0"; pyproject = true; __structuredAttrs = true; @@ -74,7 +74,7 @@ buildPythonPackage (finalAttrs: { owner = "apache"; repo = "beam"; tag = "v${finalAttrs.version}"; - hash = "sha256-jlY46uVYECZGrT4hCd2eo6QoM4zUm+veGcgcPsHdD5A="; + hash = "sha256-JaIMkMLXfkst8HZs4fFUgRBDZ2YzyyfZd/wrgDkjp3A="; }; sourceRoot = "${finalAttrs.src.name}/sdks/python"; @@ -89,8 +89,8 @@ buildPythonPackage (finalAttrs: { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "distlib==0.4.2" "distlib" \ - --replace-fail "cython>=3.2.5,<4" "cython" \ + --replace-fail "distlib==0.4.3" "distlib" \ + --replace-fail "cython>=3.2.6,<4" "cython" \ --replace-fail "numpy>=1.14.3,<2.5.0" "numpy" \ --replace-fail "==" ">=" @@ -100,14 +100,9 @@ buildPythonPackage (finalAttrs: { ''; pythonRelaxDeps = [ - "cryptography" - "envoy-data-plane" - "httplib2" - "jsonpickle" "numpy" "objsize" "protobuf" - "pyarrow" ]; build-system = [ @@ -235,6 +230,7 @@ buildPythonPackage (finalAttrs: { # FIXME AttributeError: 'Namespace' object has no attribute 'test_pipeline_options' # Upstream issue https://github.com/apache/beam/issues/33853 + "apache_beam/runners/portability/kafka_streams_runner_test.py" "apache_beam/runners/portability/prism_runner_test.py" # FIXME ValueError: Unable to run pipeline with requirement: unsupported_requirement @@ -245,11 +241,6 @@ buildPythonPackage (finalAttrs: { "apache_beam/yaml/yaml_udf_test.py" "apache_beam/dataframe/frames_test.py" - # FIXME Those tests do not terminate due to a grpc error (threading issue) - # grpc_status:14, grpc_message:"Cancelling all calls"}" - # Upstream issue https://github.com/apache/beam/issues/33851 - "apache_beam/runners/portability/portable_runner_test.py" - # Pandas 3 behavioral changes in Beam's dataframe module (upstream caps pandas < 2.4): # the doctests compare against pandas-version-specific output and the taxiride example # relies on DataFrame APIs removed in pandas 3. diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix index 3df76ff2c706..566998d06d79 100644 --- a/pkgs/development/python-modules/awsiotsdk/default.nix +++ b/pkgs/development/python-modules/awsiotsdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "awsiotsdk"; - version = "1.30.0"; + version = "1.31.1"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-iot-device-sdk-python-v2"; tag = "v${finalAttrs.version}"; - hash = "sha256-e6bQso8+zIQzw9YSjWPR7Ij6q4nXm/jl6ruHtjA9Mr8="; + hash = "sha256-WqNqCpZQMyQoFPPojUAL0Vt5Miij06RmJhsi1Jq37xQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix index 4096dbcadf3e..bddbd0037b75 100644 --- a/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix +++ b/pkgs/development/python-modules/bgutil-ytdlp-pot-provider/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "bgutil-ytdlp-pot-provider"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "Brainicism"; repo = "bgutil-ytdlp-pot-provider"; tag = version; - hash = "sha256-mmcRzTLzdjI/zHArUMPkhQ4uKmYhabiG7RpvH4IBxjc="; + hash = "sha256-rV85jle5R8je7iR8uZaXEdDuQEh2lf/Eoht+9k6bpC4="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { name = "${pname}-${version}-npm-deps"; src = src + "/server"; npmDepsFetcherVersion = 3; - hash = "sha256-1yrRJQ53v4LxzEsc6VODrKgzCdELyMCVfwyCLZSzWek="; + hash = "sha256-Ffse1RelOmLpfYM50zZ/xqkfy9l2TGYE8CumK0b9cQg="; }; npmRoot = "server"; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 0bd3b0323607..c1471ae4e335 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Loads cookies from your browser into a cookiejar object"; homepage = "https://github.com/borisbabic/browser_cookie3"; changelog = "https://github.com/borisbabic/browser_cookie3/blob/master/CHANGELOG.md"; - license = lib.licenses.gpl3Only; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ borisbabic ]; }; } diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 9f8ecd304356..1098e0b8b48d 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,40 +1,57 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies aiohttp, blinker, - buildPythonPackage, cloudpickle, dill, - fetchPypi, h5py, matplotlib, msgpack, numpy, plotly, python-socketio, - python, scipy, - setuptools, - versioningit, + uncertainties, + + # testing + pytestCheckHook, + pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bumps"; version = "1.0.5"; pyproject = true; + __structuredAttrs = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-mpfKnzG8TV364kE7VmWa2Rzc0/6mZOmMvczPEHEDqjo="; + src = fetchFromGitHub { + owner = "bumps"; + repo = "bumps"; + tag = "v${finalAttrs.version}"; + hash = "sha256-s+SZRH53R5itCUww+lCxk7iEm4tgZcGkvIDyI12fKcY="; }; + postPatch = '' + # Upstream uses versioningit to set the version + substituteInPlace pyproject.toml \ + --replace-fail 'requires = ["setuptools", "versioningit"]' 'requires = ["setuptools"]' + sed -i '/^name =.*/a version = "${finalAttrs.version}"' pyproject.toml + sed -i "/dynamic =/d" pyproject.toml + ''; + pythonRemoveDeps = [ "mpld3" # not packaged ]; build-system = [ setuptools - versioningit ]; dependencies = [ @@ -47,14 +64,16 @@ buildPythonPackage rec { msgpack numpy plotly - python python-socketio scipy + uncertainties # mpld3 # not packaged ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "bumps" ]; @@ -62,8 +81,8 @@ buildPythonPackage rec { description = "Data fitting with bayesian uncertainty analysis"; mainProgram = "bumps"; homepage = "https://bumps.readthedocs.io/"; - changelog = "https://github.com/bumps/bumps/releases/tag/v${version}"; + changelog = "https://github.com/bumps/bumps/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ rprospero ]; }; -} +}) diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix index a32b2f8159d4..aae184f437b6 100644 --- a/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "character-encoding-utils"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; src = fetchFromGitHub { owner = "TakWolf"; repo = "character-encoding-utils"; tag = version; - hash = "sha256-4WaVvr6/d/oePtmwpGJ/D6tv10V/ok9iN4BrqGk97f0="; + hash = "sha256-JGgjOFzPA7IseeGyDNUX1QEtV5OT+ptwZDy/XkNN3rY="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/cuda-bindings/13_4.nix b/pkgs/development/python-modules/cuda-bindings/13_4.nix index 3d09aaddf831..8218a7919dd9 100644 --- a/pkgs/development/python-modules/cuda-bindings/13_4.nix +++ b/pkgs/development/python-modules/cuda-bindings/13_4.nix @@ -3,8 +3,8 @@ cudaLibPaths, }: { - version = "13.4.3"; - sourceHash = "sha256-QwOwUxMArtOKtHluh3pCTK8Hu46zM+A3FfPWOLNDcfg="; + version = "13.4.4"; + sourceHash = "sha256-XO9yKpae5HfgaEQneSQNgf5Pm8WpS0YNRIi6IZDpiZI="; nvidiaLibsPatch = replaceVars ./patch-nvidia-libs-paths_13_4.patch { inherit (cudaLibPaths) @@ -20,13 +20,21 @@ ; }; - # Remove cuda-pathfinder from build-system requirements - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail \ - '"cuda-pathfinder>=1.5",' \ - "" - ''; + postPatch = + # Remove cuda-pathfinder from build-system requirements + '' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"cuda-pathfinder>=1.5",' \ + "" + '' + # Relax cython constraint: https://github.com/NVIDIA/cuda-python/pull/2771 + + '' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"cython>=3.2.5,<3.3",' \ + '"cython>=3.2.5",' + ''; pythonImportsCheck = [ "cuda.bindings.cudla" @@ -35,6 +43,11 @@ ]; disabledTests = [ + # Cython 3.3 no longer implicitly converts int to CUarray/cudaArray_t, fixed in the tests by + # https://github.com/NVIDIA/cuda-python/pull/2771 + "test_cudart_eglFrame" + "test_eglFrame" + # Requires GPU discovery support not available in the test environment "test_discover_gpus" diff --git a/pkgs/development/python-modules/cuda-core/default.nix b/pkgs/development/python-modules/cuda-core/default.nix index 563d84c3bfaf..04a80360db5d 100644 --- a/pkgs/development/python-modules/cuda-core/default.nix +++ b/pkgs/development/python-modules/cuda-core/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, fetchpatch, replaceVars, + pythonOlder, # build-system cuda-bindings, @@ -20,7 +21,10 @@ # tests cffi, cloudpickle, + docutils, + packaging, psutil, + pyglet, pytestCheckHook, # passthru @@ -32,7 +36,7 @@ }: buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs: { pname = "cuda-core"; - version = "1.0.1"; + version = "1.2.2"; pyproject = true; __structuredAttrs = true; @@ -47,7 +51,7 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs sed -i 's/^ref-names: .*$/ref-names: tag: cuda-core-v${finalAttrs.version}/' "$out/.git_archival.txt" grep -qx 'ref-names: tag: cuda-core-v${finalAttrs.version}' "$out/.git_archival.txt" ''; - hash = "sha256-SRy/hnOzzb4wUCLOre4k326RNhYI0650XzC8Dc9kf/M="; + hash = "sha256-UH5fw08Y6a8uUtAuxxoahyVH6W58xdlWfrSsB4mMvPc="; }; sourceRoot = "${finalAttrs.src.name}/cuda_core"; @@ -78,6 +82,24 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs }) ]; + postPatch = + # Relax cython constraint: https://github.com/NVIDIA/cuda-python/pull/2771 + '' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"Cython>=3.2.5,<3.3",' \ + '"Cython>=3.2.5",' + '' + # Cython 3.3 warns that some attribute accesses are not usefully protected by critical_section + # (only relevant for free-threaded builds), which fails the build with python 3.13. + # Fixed by the same upstream PR. + + lib.optionalString (pythonOlder "3.14") '' + substituteInPlace build_hooks.py \ + --replace-fail \ + "_CythonOptions.warning_errors = True" \ + "_CythonOptions.warning_errors = False" + ''; + build-system = [ cuda-bindings cuda-pathfinder @@ -93,6 +115,10 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs buildInputs = [ cudaPackages.cuda_nvrtc # nvrtc.h cudaPackages.cuda_profiler_api # cudaProfiler.h + ] + # The RDC test fixtures compile tests/test_binaries/saxpy.cu with nvcc + ++ lib.optionals finalAttrs.doInstallCheck [ + cudaPackages.cuda_cudart # cuda_runtime.h ]; preBuild = '' @@ -112,27 +138,6 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs '' rm -rf cuda/core '' - # The tests import cuda.bindings._test_helpers, which cuda-bindings releases newer than the one packaged here ship. - # Import the copy in this source tree instead. - + '' - mkdir -p "$TMPDIR/test-helpers" - cp -r ../cuda_bindings/cuda/bindings/_test_helpers "$TMPDIR/test-helpers/cuda_bindings_test_helpers" - export PYTHONPATH="$TMPDIR/test-helpers''${PYTHONPATH:+:$PYTHONPATH}" - substituteInPlace \ - tests/conftest.py \ - tests/test_device.py \ - tests/system/conftest.py \ - tests/example_tests/test_basic_examples.py \ - --replace-fail \ - "cuda.bindings._test_helpers" \ - "cuda_bindings_test_helpers" - '' - # A trailing comma in the argument names makes pytest 9 unpack a bare NumPy array sample into several values - + '' - substituteInPlace tests/test_utils.py \ - --replace-fail '@pytest.mark.parametrize("in_arr,", _cpu_array_samples())' \ - '@pytest.mark.parametrize("in_arr", _cpu_array_samples())' - '' # The checkpoint scenarios run in a child interpreter started with -I, which ignores PYTHONPATH and so can't import # pytest + '' @@ -145,8 +150,12 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs nativeCheckInputs = [ cffi cloudpickle + docutils + packaging psutil + pyglet pytestCheckHook + setuptools ]; disabledTests = [ @@ -157,9 +166,13 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs "test_device_cpu_affinity" "test_device_pci_bus_id" "test_device_pci_info" + "test_system_event_device_resolves_pci_bus_id" "test_to_cuda_device" "test_to_system_device" + # cuda.core._utils.cuda_utils.CUDAError: CUDA_ERROR_INVALID_VALUE + "test_host_numa_current_location_hint" + # cuda-bindings 13.4 has enum members this release of cuda.core doesn't map yet (BRAND_NVIDIA_NPU, # NvlinkVersion.VERSION_6_0, EVENT_REASON_BOARD_LIMIT, ...), and recent drivers report them: # ValueError: Unknown clock event reason bit: 1024 @@ -203,6 +216,7 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs description = "Pythonic interface to the CUDA runtime"; homepage = "https://nvidia.github.io/cuda-python/cuda-core/latest"; downloadPage = "https://github.com/NVIDIA/cuda-python/tree/main/cuda_core"; + changelog = "https://nvidia.github.io/cuda-python/cuda-core/latest/release/${finalAttrs.version}-notes.html"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index cd14c844dd99..4f69dcf291f3 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -38,8 +38,15 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs ]; postPatch = - # Inject absolute path to nvcc instead of relying on runtime discovery heuristics + # Relax cython constraint '' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"Cython>=3.2,<3.3",' \ + '"Cython>=3.2",' + '' + # Inject absolute path to nvcc instead of relying on runtime discovery heuristics + + '' substituteInPlace cupy/_environment.py \ --replace-fail \ "nvcc_path = os.environ.get('NVCC', None)" \ diff --git a/pkgs/development/python-modules/debtcollector/tests.nix b/pkgs/development/python-modules/debtcollector/tests.nix index a2013d7e8336..141bdbfba3cc 100644 --- a/pkgs/development/python-modules/debtcollector/tests.nix +++ b/pkgs/development/python-modules/debtcollector/tests.nix @@ -1,7 +1,7 @@ { buildPythonPackage, debtcollector, - stestr, + stestrCheckHook, }: buildPythonPackage { @@ -20,10 +20,6 @@ buildPythonPackage { nativeCheckInputs = [ debtcollector - stestr + stestrCheckHook ]; - - checkPhase = '' - stestr run - ''; } diff --git a/pkgs/development/python-modules/flask-ldap3-login/default.nix b/pkgs/development/python-modules/flask-ldap3-login/default.nix index ebbf0ed81167..8562a54af000 100644 --- a/pkgs/development/python-modules/flask-ldap3-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap3-login/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "flask-ldap3-login"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; __structuredAttrs = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nickw444"; repo = "flask-ldap3-login"; tag = version; - hash = "sha256-bWu+hCVnNRSWvXgB2pAcCdhXJQEg3mZeAfZgxUqVOkY="; + hash = "sha256-NqMZC9JAUH6uheLEkcH+ZX3IV6gUEygrUdTIFVy+JUE="; }; nativeBuildInputs = [ pyprojectVersionPatchHook ]; diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix index 7c9c87febb76..fe1d493927e9 100644 --- a/pkgs/development/python-modules/floret/default.nix +++ b/pkgs/development/python-modules/floret/default.nix @@ -2,46 +2,57 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system pybind11, setuptools, - wheel, + + # dependencies numpy, + + # tests pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "floret"; version = "0.10.5"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "explosion"; repo = "floret"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; patches = [ ./cstdint.patch ]; - nativeBuildInputs = [ + build-system = [ pybind11 setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy - pybind11 ]; pythonImportsCheck = [ "floret" ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # Compares trained vectors against hardcoded values (toolchain-dependent) + # AssertionError: Arrays are not almost equal to 7 decimals + "test_train_unsupervised_fasttext" + ]; + meta = { description = "FastText + Bloom embeddings for compact, full-coverage vectors with spaCy"; homepage = "https://github.com/explosion/floret"; + changelog = "https://github.com/explosion/floret/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 3f5ef978a494..d6c73370e69b 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "garminconnect"; - version = "0.3.18"; + version = "0.3.19"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; tag = finalAttrs.version; - hash = "sha256-YT6keE60qlsP3Z58UqBhjgBSUCld5KEDNtK/4MS/qY4="; + hash = "sha256-Fn0rqxvl34QowjTOPcppLK98FvchJQ+hfsDscw82mmQ="; }; pythonRelaxDeps = [ "garth" ]; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index b9595f4a236e..7322ef8bb777 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -44,12 +44,13 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = [ - # Network access - "test_validate_ping" - "test_logging" - # Fails since yamllint 1.27.x - "test_yaml_lint" + disabledTestPaths = [ + # https://github.com/mozilla/glean_parser/pull/863 + "tests/test_metrics.py::test_expires" + # https://github.com/mozilla/glean_parser/pull/872 + "tests/test_parser.py::test_expire_epoch_can_be_overriden" + # https://github.com/mozilla/glean_parser/pull/873 + "tests/test_python_server.py::test_logging" ]; pythonImportsCheck = [ "glean_parser" ]; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index abbd1caba53d..3175106c63b0 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "glyphslib"; - version = "6.15.0"; + version = "6.16.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { owner = "googlefonts"; repo = "glyphsLib"; tag = "v${finalAttrs.version}"; - hash = "sha256-R1A3Uw7uozFbJ/PVRR1L8DU9bugzhkuW2rxohdN/G5w="; + hash = "sha256-RKIybZCF+Ft6zQ85Gh5L5n1/LtSmiBZAGfN/nDAZKEs="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index a9f262db6adc..03d8270b2e37 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,13 +13,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-securitycenter"; - version = "1.47.0"; + version = "1.48.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_securitycenter"; inherit (finalAttrs) version; - hash = "sha256-TeYcQ7MXsnDfAIP5yWuJ3ODpSYUdva/H4IBiEs7h5Bk="; + hash = "sha256-q0W0nlPsDpIpYYup7hkUOEhT3b1GQs8mEzhjO6PrXLU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 1982c68d6739..3770ac500b43 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -13,6 +13,7 @@ pyparsing, python-memcached, pytz, + setuptools, six, txamqp, urllib3, @@ -31,16 +32,20 @@ buildPythonPackage { pname = "graphite-web"; - version = "1.1.10-unstable-2025-02-24"; + version = "1.1.10-unstable-2026-07-19"; pyproject = true; src = fetchFromGitHub { owner = "graphite-project"; repo = "graphite-web"; - rev = "49c28e2015d605ad9ec93524f7076dd924a4731a"; - hash = "sha256-TxsQPhnI5WhQvKKkDEYZ8xnyg/qf+N9Icej6d6A0jC0="; + rev = "b23b548b24a2300f55d2fb676e37ed9f4bff9c31"; + hash = "sha256-u73HCerkH3CayaxLZFkHWforQ3XjonGMzHsgzhhMqLw="; }; + build-system = [ + setuptools + ]; + postPatch = '' substituteInPlace webapp/graphite/settings.py \ --replace-fail \ @@ -127,7 +132,5 @@ buildPythonPackage { maintainers = with lib.maintainers; [ basvandijk ]; - # last successful hydra build on darwin was in 2025 - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix index af5b9e92dbba..878b6529c79c 100644 --- a/pkgs/development/python-modules/gto/default.nix +++ b/pkgs/development/python-modules/gto/default.nix @@ -1,26 +1,33 @@ { lib, buildPythonPackage, - cacert, - entrypoints, fetchFromGitHub, - freezegun, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + click, + entrypoints, funcy, - gitSetupHook, pydantic, pydantic-settings, - pytest-cov-stub, - pytest-mock, - pytest-test-utils, - pytestCheckHook, rich, ruamel-yaml, scmrepo, semver, - setuptools-scm, - setuptools, tabulate, typer, + + # tests + cacert, + freezegun, + gitSetupHook, + pytest-cov-stub, + pytest-mock, + pytest-test-utils, + pytestCheckHook, writableTmpDirAsHomeHook, }: @@ -42,6 +49,7 @@ buildPythonPackage (finalAttrs: { ]; dependencies = [ + click entrypoints funcy pydantic diff --git a/pkgs/development/python-modules/ha-garmin/default.nix b/pkgs/development/python-modules/ha-garmin/default.nix index c51c5794e0c7..c615771f3b9c 100644 --- a/pkgs/development/python-modules/ha-garmin/default.nix +++ b/pkgs/development/python-modules/ha-garmin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "ha-garmin"; - version = "0.1.49"; + version = "0.1.52"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "ha-garmin"; tag = "v${finalAttrs.version}"; - hash = "sha256-6qYFeyLlW5udr0paOz1tVLm0TsaLwEvkaFVILan4oNQ="; + hash = "sha256-EyVuv6V9uIifn0tLf12kcutEUvlFN4GZ7B3p6Lp31nI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 260ceea913ad..ccd7c68cec25 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -6,7 +6,7 @@ flake8, pbr, setuptools, - stestr, + stestrCheckHook, testscenarios, }: @@ -33,16 +33,10 @@ buildPythonPackage rec { nativeCheckInputs = [ ddt - stestr + stestrCheckHook testscenarios ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "hacking" ]; meta = { diff --git a/pkgs/development/python-modules/highctidh/default.nix b/pkgs/development/python-modules/highctidh/default.nix index 219ccd5951d4..07d056c5b917 100644 --- a/pkgs/development/python-modules/highctidh/default.nix +++ b/pkgs/development/python-modules/highctidh/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "highctidh"; - version = "1.0.2025051200"; + version = "1.0.2026101300"; pyproject = true; src = fetchFromCodeberg { owner = "vula"; repo = "highctidh"; tag = "v${version}"; - hash = "sha256-wGJv9UHAFfCOpTrr8THVk0DC+JUtj3gYYOf6o3EaSqg="; + hash = "sha256-NgPVC/Oa0P/ijYHDMuxdsYdj4EGYnD/R/ItvhY4Q+c8="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index ab6819053a5b..c4a0c2f13b2f 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202610171"; + version = "0.1.202610201"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-X/mLB9vRvAKyN8v1jndR8qflEjiSoEP+k1/JXTAD5/0="; + hash = "sha256-etsFfSug4jt4axYdBKK8/ruqJKvksF/W5h75xcJbviM="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/iplotx/default.nix b/pkgs/development/python-modules/iplotx/default.nix index 8f0ca468ca46..1c5b1dceeac8 100644 --- a/pkgs/development/python-modules/iplotx/default.nix +++ b/pkgs/development/python-modules/iplotx/default.nix @@ -55,6 +55,16 @@ buildPythonPackage (finalAttrs: { "test_labels" "test_labels_and_colors" "test_vertex_labels" + # AttributeError: 'Vertex3DCollection' object has no attribute... + "test_undirected" + "test_directed" + # eError: module 'matplotlib.cm' has no attribute '_ensure_cmap' + "test_build_cmap_fun" + "test_edges_cmap" + "test_leafedges_cmap" + "test_init_cmap" + # matplotlib.testing.exceptions.ImageComparisonFailure: images not close (RMS... + "test_simple_graph" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 5203b98d5c2c..06849434a3d7 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "jellyfin-apiclient-python"; - version = "1.20.1"; + version = "1.20.2"; pyproject = true; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-apiclient-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-eP5GTiR/3eK+KTQdUDo5kgHWf2G/emsFnATXQHsPNks="; + hash = "sha256-xYhnvPNh7wF0D9sEwhZ/pTP6TdHWd85Od5nKhp5Q008="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/kopf/default.nix b/pkgs/development/python-modules/kopf/default.nix index a1140bd74c07..270e2b001c10 100644 --- a/pkgs/development/python-modules/kopf/default.nix +++ b/pkgs/development/python-modules/kopf/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, fetchFromGitHub, buildPythonPackage, @@ -24,15 +25,15 @@ looptime, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kopf"; - version = "1.44.6"; + version = "1.45.1"; pyproject = true; src = fetchFromGitHub { owner = "nolar"; repo = "kopf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ffBdauplO1WkrXcsJuCKBhlkXpoinFqRU24uSoDQIm0="; }; @@ -73,14 +74,18 @@ buildPythonPackage rec { "tests/admission/test_webhook_ngrok.py" "tests/admission/test_webhook_server.py" "tests/authentication/test_credentials.py" - ]; + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "tests/posting/test_threadsafety.py"; disabledTests = [ # assert [] to due missing certificate "test_connection_info_as_ssl_context_when_insecure" ]; - pytestFlags = [ "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; + pytestFlags = [ + "-Wignore::pytest.PytestUnraisableExceptionWarning" + "-Wignore::DeprecationWarning" + ]; __darwinAllowLocalNetworking = true; @@ -91,8 +96,8 @@ buildPythonPackage rec { meta = { description = "Python framework to write Kubernetes operators"; homepage = "https://kopf.readthedocs.io/"; - changelog = "https://github.com/nolar/kopf/releases/tag/${src.tag}"; + changelog = "https://github.com/nolar/kopf/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ genga898 ]; }; -} +}) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 47204c09a675..3b1e15353ede 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { pname = "langgraph-cli"; - version = "0.4.33"; + version = "0.4.35"; pyproject = true; __structuredAttrs = true; @@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${finalAttrs.version}"; - hash = "sha256-eYkUJSZ5191Qe+7bKIotSas0PVmzXwGEgw44i/HfI1g="; + hash = "sha256-fO//2RJPSMLdicBwFyX6EFOavGChJnCj0OZlzKHm1v4="; }; sourceRoot = "${finalAttrs.src.name}/libs/cli"; diff --git a/pkgs/development/python-modules/lookyloo-models/default.nix b/pkgs/development/python-modules/lookyloo-models/default.nix index 244637a05feb..cb5e97f0d59e 100644 --- a/pkgs/development/python-modules/lookyloo-models/default.nix +++ b/pkgs/development/python-modules/lookyloo-models/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "lookyloo-models"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "Lookyloo"; repo = "lookyloo-models"; tag = "v${finalAttrs.version}"; - hash = "sha256-G1XwOj/+9Nirv+UhcmEH2jkttaXV9hyC1756eoD6dGw="; + hash = "sha256-bFF3AX/WyCceiezIl0YNHaNdtlOKhN7aTbrJO0pCvYs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lzfse/default.nix b/pkgs/development/python-modules/lzfse/default.nix index 005f21d591e3..b75b63a57535 100644 --- a/pkgs/development/python-modules/lzfse/default.nix +++ b/pkgs/development/python-modules/lzfse/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lzfse"; - version = "0.4.2"; + version = "0.4.2.post1"; pyproject = true; src = fetchFromGitHub { @@ -15,7 +15,7 @@ buildPythonPackage rec { repo = "lzfse"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-ER+Hr/WrGCB0uYwsSgB4U8sCPeZ4JlOHoeb5YEGUFFM="; + hash = "sha256-gJKO7Qtt/PhaIaSgrGYwXrOd4AjR89gi3cIV/95a4D8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 872db56142d5..b7d28c3d2d18 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "m2crypto"; - version = "0.50.0"; + version = "0.51.0"; pyproject = true; src = fetchFromGitLab { owner = "m2crypto"; repo = "m2crypto"; tag = finalAttrs.version; - hash = "sha256-FH5orOTHAoVQCPD1Gc31GWkVCSq6s/uMmKVx0UYy88E="; + hash = "sha256-p2bP6jkrXbqX489E1nedtRWw+uTLzx1skrtbC9+uAIk="; }; # https://lists.sr.ht/~mcepl/m2crypto/%3CCAPhw1+Hg6+OJZoqt1O6aezxnTUFmfFTMzDwkD2bJ74jnmygqrg@mail.gmail.com%3E diff --git a/pkgs/development/python-modules/meshcore-cli/default.nix b/pkgs/development/python-modules/meshcore-cli/default.nix index 186dda86192b..fe5873da29d8 100644 --- a/pkgs/development/python-modules/meshcore-cli/default.nix +++ b/pkgs/development/python-modules/meshcore-cli/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "meshcore-cli"; - version = "1.5.0"; + version = "1.6.6"; pyproject = true; src = fetchFromGitHub { owner = "meshcore-dev"; repo = "meshcore-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-wby97e9Xulk2pwNJ9mnvKxWlTsWmH4n3zlTtYi7WS6I="; + hash = "sha256-fyk1YAHRLGzxBHVmsqlX6KkW0RIfUtzSspTeHETTPlQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index 0335c940147d..28cc968b0eb0 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { pname = "mhcflurry"; - version = "2.3.14"; + version = "2.3.16"; pyproject = true; __structuredAttrs = true; @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { owner = "openvax"; repo = "mhcflurry"; tag = finalAttrs.version; - hash = "sha256-ltlxN0pt12DyEnXAimRiKx1qRLPZYPwosOB5tvq5Qew="; + hash = "sha256-VPVNynEc4/moNf9WXP2LS7RIIEGfjYynxXgpzJ+R/4s="; }; build-system = [ diff --git a/pkgs/development/python-modules/modal/default.nix b/pkgs/development/python-modules/modal/default.nix index e2d7fe04538a..a8ca65bf6c8b 100644 --- a/pkgs/development/python-modules/modal/default.nix +++ b/pkgs/development/python-modules/modal/default.nix @@ -1,33 +1,26 @@ { lib, - aiohttp, buildPythonPackage, - cbor2, - certifi, - click, - fastapi, - fetchFromGitHub, - flaky, + + # build-system + setuptools, + + # nativeBuildInputs grpcio-tools, grpclib, - httpx, installAgentSkills, invoke, ipython, - mypy, mypy-protobuf, - protobuf, - pyjwt, - pytest-asyncio, - pytest-env, - pytest-markdown-docs, - pytest-timeout, - pytestCheckHook, - python-dotenv, - rich, ruff, - setuptools, - six, + + # dependencies + aiohttp, + cbor2, + certifi, + click, + protobuf, + rich, synchronicity, toml, typer, @@ -35,51 +28,75 @@ types-toml, typing-extensions, watchfiles, + + # tests + fastapi, + fetchFromGitHub, + flaky, + httpx, + mypy, + pyjwt, + pytest-asyncio, + pytest-env, + pytest-markdown-docs, + pytest-timeout, + pytestCheckHook, + python-dotenv, + six, versionCheckHook, }: buildPythonPackage (finalAttrs: { pname = "modal"; - version = "1.5.5"; + version = "1.6.2"; pyproject = true; - __structuredAttrs = true; src = fetchFromGitHub { owner = "modal-labs"; repo = "modal-client"; tag = "py/v${finalAttrs.version}"; - hash = "sha256-KHk7NWfcp+xN2VHU/k6YLxJRKGUeJR5erXC7DBDgSYo="; + hash = "sha256-Tg1VvCKuDWuF67bfUtKadat2eVZAXru5g17aXLnwR8U="; }; sourceRoot = "${finalAttrs.src.name}/py"; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail 'setuptools~=77.0.3' setuptools - patchShebangs protoc_plugin/plugin.py - inv protoc - inv type-stubs - ''; + postPatch = + # On Python 3.14 (deferred annotations), `list` resolves to the classes' own `list` methods, + # which breaks `inv type-stubs` + '' + substituteInPlace modal/sandbox/_sandbox.py \ + --replace-fail \ + "import asyncio" \ + "import asyncio, builtins" \ + --replace-fail \ + "-> list[tuple[str, str]]:" \ + "-> builtins.list[tuple[str, str]]:" + substituteInPlace modal/_workspace.py \ + --replace-fail \ + "-> list[ServiceUserInfo]:" \ + "-> builtins.list[ServiceUserInfo]:" + '' + + '' + patchShebangs protoc_plugin/plugin.py + inv protoc + inv type-stubs + ''; build-system = [ setuptools ]; nativeBuildInputs = [ + grpcio-tools + grpclib installAgentSkills invoke ipython - grpcio-tools - grpclib - synchronicity mypy-protobuf ruff ] ++ synchronicity.optional-dependencies.compile; - pythonRelaxDeps = [ - "protobuf" - ]; - dependencies = [ aiohttp cbor2 @@ -155,7 +172,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python client library for Modal (serverless compute provider)"; homepage = "https://github.com/modal-labs/modal-client"; - changelog = "https://github.com/modal-labs/modal-client/blob/${finalAttrs.src.tag}/py/CHANGELOG.md"; + changelog = "https://github.com/modal-labs/modal-client/blob/${finalAttrs.src.rev}/py/CHANGELOG.md"; mainProgram = "modal"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ Kharacternyk ]; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 541553419422..bf3dc98f4c57 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -6,6 +6,7 @@ # build-system poetry-core, + pyprojectVersionPatchHook, # dependencies niapy, @@ -19,26 +20,31 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "niaarm"; # nixpkgs-update: no auto update version = "0.13.4"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "NiaARM"; - tag = version; + tag = finalAttrs.version; hash = "sha256-524rJ5b9e0U1rqu1iCGMA3Tgnn9bO4biCC1FMoGNqms="; }; pythonRelaxDeps = [ "numpy" + "pandas" "plotly" "scikit-learn" ]; - build-system = [ poetry-core ]; + build-system = [ + poetry-core + pyprojectVersionPatchHook + ]; dependencies = [ niapy @@ -57,6 +63,8 @@ buildPythonPackage rec { disabledTests = [ # Test requires extra nltk data dependency "test_text_mining" + # AttributeError: 'Poly3DCollection' object has no attribute '_vec' + "test_hill_slopes" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -67,8 +75,8 @@ buildPythonPackage rec { description = "Minimalistic framework for Numerical Association Rule Mining"; mainProgram = "niaarm"; homepage = "https://github.com/firefly-cpp/NiaARM"; - changelog = "https://github.com/firefly-cpp/NiaARM/releases/tag/${src.tag}"; + changelog = "https://github.com/firefly-cpp/NiaARM/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ firefly-cpp ]; }; -} +}) diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 460d9fa17734..aa561d438e9f 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -15,19 +15,19 @@ buildPythonPackage (finalAttrs: { pname = "odp-amsterdam"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; tag = "v${finalAttrs.version}"; - hash = "sha256-aK6BGOkkHdKkiojg56qxkyZklpdstQWNzaTLM1s8//s="; + hash = "sha256-ZhmfmdH4orby2QH1HQoEKZk6ocTPnBDbDV6vChHa0q8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build>=0.12.13,<0.13" "uv_build" + --replace-fail "uv_build>=0.13,<0.14" "uv_build" ''; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix b/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix index 9f1425c52a24..e3218d69bdb5 100644 --- a/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-resourcedetector-gcp/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - setuptools, + hatchling, opentelemetry-api, opentelemetry-sdk, requests, @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { hash = "sha256-ELQYAqz4FYOKhcn+Ha4C9dJ+vBdSe3dEERHAEL6tlbw="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ opentelemetry-api diff --git a/pkgs/development/python-modules/ormsgpack/default.nix b/pkgs/development/python-modules/ormsgpack/default.nix index 4c2d8701a56f..6c2d074e0f5e 100644 --- a/pkgs/development/python-modules/ormsgpack/default.nix +++ b/pkgs/development/python-modules/ormsgpack/default.nix @@ -18,19 +18,19 @@ buildPythonPackage rec { pname = "ormsgpack"; - version = "1.12.2"; + version = "1.13.0"; pyproject = true; src = fetchFromGitHub { owner = "aviramha"; repo = "ormsgpack"; tag = version; - hash = "sha256-a2PgCCIPPJt6YNW7UFl9urYZkAoVj5Np0lbv4QfzMAs="; + hash = "sha256-O4497RObrvDViQVKbpsG2XCG4L570pDGpZEfIGDxEmM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-PLLSVoQLsbTOIMqOsaaei/dm8SybfyqP0WLJW8hTOoo="; + hash = "sha256-6Xmu5GgcC6DuxBk4d/M3p8lboEhG5+8HwW2LnivpHHE="; }; build-system = [ diff --git a/pkgs/development/python-modules/os-client-config/default.nix b/pkgs/development/python-modules/os-client-config/default.nix index 21ac2f3c9fa7..5b6b590564fa 100644 --- a/pkgs/development/python-modules/os-client-config/default.nix +++ b/pkgs/development/python-modules/os-client-config/default.nix @@ -10,7 +10,7 @@ pbr, python-glanceclient, setuptools, - stestr, + stestrCheckHook, python-subunit, testscenarios, testtools, @@ -51,19 +51,11 @@ buildPythonPackage rec { jsonschema python-subunit oslotest - stestr + stestrCheckHook testscenarios testtools ]; - checkPhase = '' - runHook preCheck - - stestr run - - runHook postCheck - ''; - pythonImportsCheck = [ "os_client_config" ]; meta = { diff --git a/pkgs/development/python-modules/os-service-types/tests.nix b/pkgs/development/python-modules/os-service-types/tests.nix index b03317472dac..ce692aa65958 100644 --- a/pkgs/development/python-modules/os-service-types/tests.nix +++ b/pkgs/development/python-modules/os-service-types/tests.nix @@ -4,7 +4,7 @@ os-service-types, oslotest, requests-mock, - stestr, + stestrCheckHook, testscenarios, }: @@ -27,11 +27,7 @@ buildPythonPackage { keystoneauth1 oslotest requests-mock - stestr + stestrCheckHook testscenarios ]; - - checkPhase = '' - stestr run - ''; } diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix index ae479cbf1b3f..c7431d28a481 100644 --- a/pkgs/development/python-modules/osc-placement/default.nix +++ b/pkgs/development/python-modules/osc-placement/default.nix @@ -11,7 +11,7 @@ pbr, setuptools, sphinxHook, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -50,15 +50,9 @@ buildPythonPackage rec { nativeCheckInputs = [ oslo-serialization oslotest - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "osc_placement" ]; meta = { diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 423311203092..494fb5c16140 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,8 +18,7 @@ pythonAtLeast, setuptools, stdenv, - stestr, - writeText, + stestrCheckHook, }: buildPythonPackage rec { @@ -63,39 +62,31 @@ buildPythonPackage rec { fixtures libredirect.hook oslotest - stestr + stestrCheckHook ]; - checkPhase = - let - disabledTests = [ - "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn" - "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n" - "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn" - "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock" - "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally" - "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist" - "oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size" - ] - ++ lib.optionals (pythonAtLeast "3.14") [ - # Disable test incompatible with Python 3.14+ - # See proposed change upstream: https://review.opendev.org/c/openstack/oslo.concurrency/+/971765 - "oslo_concurrency.tests.unit.test_lockutils" - ]; - in - '' - runHook preCheck + preCheck = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + ''; - echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) - - stestr run -e <(echo "${lib.concatStringsSep "\n" disabledTests}") - - runHook postCheck - ''; + disabledTestsRegex = [ + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock" + "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally" + "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist" + "oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # Disable test incompatible with Python 3.14+ + # See proposed change upstream: https://review.opendev.org/c/openstack/oslo.concurrency/+/971765 + "oslo_concurrency.tests.unit.test_lockutils" + ]; pythonImportsCheck = [ "oslo_concurrency" ]; diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix index e955a714cecb..300dcfc6221e 100644 --- a/pkgs/development/python-modules/oslo-config/tests.nix +++ b/pkgs/development/python-modules/oslo-config/tests.nix @@ -6,7 +6,7 @@ oslotest, requests-mock, sphinx, - stestr, + stestrCheckHook, testscenarios, }: @@ -31,11 +31,7 @@ buildPythonPackage { oslotest requests-mock sphinx - stestr + stestrCheckHook testscenarios ]; - - checkPhase = '' - stestr run - ''; } diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index 1ac3689b2f6a..69a17c1388c7 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchPypi, oslotest, - stestr, pbr, setuptools, + stestrCheckHook, typing-extensions, }: @@ -35,15 +35,9 @@ buildPythonPackage rec { nativeCheckInputs = [ oslotest - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "oslo_context" ]; meta = { diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 076232d045ad..e5819a12714b 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -15,7 +15,7 @@ setuptools, sqlalchemy, stevedore, - stestr, + stestrCheckHook, testresources, testscenarios, }: @@ -51,18 +51,12 @@ buildPythonPackage rec { aiosqlite oslo-context oslotest - stestr + stestrCheckHook psycopg2 testresources testscenarios ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "oslo_db" ]; meta = { diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index 4f65f6174cdc..15c4d07ab887 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -5,8 +5,8 @@ oslotest, pbr, setuptools, + stestrCheckHook, testscenarios, - stestr, }: buildPythonPackage rec { @@ -33,18 +33,10 @@ buildPythonPackage rec { nativeCheckInputs = [ oslotest - stestr + stestrCheckHook testscenarios ]; - checkPhase = '' - runHook preCheck - - stestr run - - runHook postCheck - ''; - pythonImportsCheck = [ "oslo_i18n" ]; meta = { diff --git a/pkgs/development/python-modules/oslo-metrics/default.nix b/pkgs/development/python-modules/oslo-metrics/default.nix index a4f266cac69f..54080539e049 100644 --- a/pkgs/development/python-modules/oslo-metrics/default.nix +++ b/pkgs/development/python-modules/oslo-metrics/default.nix @@ -14,7 +14,7 @@ # tests oslotest, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -44,15 +44,9 @@ buildPythonPackage rec { nativeCheckInputs = [ oslotest - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "oslo_metrics" ]; meta = { diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index 13e881408051..16972f780318 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -7,7 +7,7 @@ oslotest, pbr, setuptools, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -33,15 +33,9 @@ buildPythonPackage rec { nativeCheckInputs = [ oslotest - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "oslo_serialization" ]; meta = { diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 394e09dfd316..69a859300793 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -29,7 +29,7 @@ pyyaml, qemu-utils, stdenv, - stestr, + stestrCheckHook, testscenarios, tzdata, }: @@ -83,25 +83,24 @@ buildPythonPackage (finalAttrs: { oslotest pyyaml qemu-utils - stestr + stestrCheckHook testscenarios tzdata ]; - # disabled tests: - # https://bugs.launchpad.net/oslo.utils/+bug/2054134 - # netaddr default behaviour changed to be stricter - checkPhase = '' + preCheck = '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) - - stestr run -e <(echo " - oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ip - oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ipv4 - oslo_utils.tests.test_eventletutils.EventletUtilsTest.test_event_set_clear_timeout - ") ''; + disabledTests = [ + # https://bugs.launchpad.net/oslo.utils/+bug/2054134 + # netaddr default behaviour changed to be stricter + "oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ip" + "oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ipv4" + "oslo_utils.tests.test_eventletutils.EventletUtilsTest.test_event_set_clear_timeout" + ]; + pythonImportsCheck = [ "oslo_utils" ]; meta = { diff --git a/pkgs/development/python-modules/oslotest/tests.nix b/pkgs/development/python-modules/oslotest/tests.nix index 03d8dbf73eb8..5ff7fd6ebdb4 100644 --- a/pkgs/development/python-modules/oslotest/tests.nix +++ b/pkgs/development/python-modules/oslotest/tests.nix @@ -2,7 +2,7 @@ buildPythonPackage, oslo-config, oslotest, - stestr, + stestrCheckHook, }: buildPythonPackage { @@ -22,10 +22,6 @@ buildPythonPackage { nativeCheckInputs = [ oslotest oslo-config - stestr + stestrCheckHook ]; - - checkPhase = '' - stestr run - ''; } diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index 9f46dfe83b18..7bdbd43bade6 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -5,7 +5,7 @@ gnupg, pbr, sphinx, - stestr, + stestrCheckHook, testresources, testscenarios, virtualenv, @@ -35,22 +35,20 @@ buildPythonPackage { git gnupg sphinx - stestr + stestrCheckHook testresources testscenarios virtualenv wheel ]; - checkPhase = '' - stestr run -e <(echo " - pbr.tests.test_core.TestCore.test_console_script_develop - pbr.tests.functional.test_console_scripts.TestConsoleScripts.test_console_script_install - pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_with_argument - pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_wsgi_script_run + disabledTests = [ + "pbr.tests.functional.test_console_scripts.TestConsoleScripts.test_console_script_install" + "pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_with_argument" + "pbr.tests.functional.test_wsgi_scripts.TestWsgiScripts.test_wsgi_script_run" + "pbr.tests.test_core.TestCore.test_console_script_develop" # Tests are failing because of fixture timeouts - pbr.tests.functional.test_pep517.TestPEP517Support.test_pep_517_support - pbr.tests.functional.test_requirements.TestRequirementParsing.test_requirement_parsing - ") - ''; + "pbr.tests.functional.test_pep517.TestPEP517Support.test_pep_517_support" + "pbr.tests.functional.test_requirements.TestRequirementParsing.test_requirement_parsing" + ]; } diff --git a/pkgs/development/python-modules/pick/default.nix b/pkgs/development/python-modules/pick/default.nix index e33be6a35e8b..9f215b1d8ee9 100644 --- a/pkgs/development/python-modules/pick/default.nix +++ b/pkgs/development/python-modules/pick/default.nix @@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "wong2"; + owner = "aisk"; repo = "pick"; tag = "v${finalAttrs.version}"; hash = "sha256-/cvnDTRS3V9mk1T0zHAqdrDeRuOrnco9UF7luy687BM="; @@ -26,9 +26,12 @@ buildPythonPackage (finalAttrs: { meta = { description = "Module to create curses-based interactive selection list in the terminal"; - homepage = "https://github.com/wong2/pick"; - changelog = "https://github.com/wong2/pick/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/aisk/pick"; + changelog = "https://github.com/aisk/pick/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ + fab + aisk + ]; }; }) diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index a6e324357a7e..2cf196456dcd 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "pins"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "rstudio"; repo = "pins-python"; tag = "v${version}"; - hash = "sha256-fDbgas4RG4cJRqrISWmrMUQUycQindlqF9/jA5R1TF8="; + hash = "sha256-0P13Fy+9WvG/rwkT04wpU7P7ahzve4JkutK0y2O6Oak="; }; build-system = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 356d8ad969e5..ec3a35d9a2ae 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -10,13 +10,13 @@ buildPythonPackage (finalAttrs: { pname = "plaid-python"; - version = "45.0.0"; + version = "46.0.0"; pyproject = true; src = fetchPypi { pname = "plaid_python"; inherit (finalAttrs) version; - hash = "sha256-6ISqP1TIbIQzwH3/LeFM9cNlqWGMApp33VxcphkohC4="; + hash = "sha256-8bBsGmU/A3jK9QpAd9Yd42B0slYNRzqMfMFpelgJEOc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pocket-tts/default.nix b/pkgs/development/python-modules/pocket-tts/default.nix index 4ed6ba1b572f..3286b3762c2e 100644 --- a/pkgs/development/python-modules/pocket-tts/default.nix +++ b/pkgs/development/python-modules/pocket-tts/default.nix @@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: { pname = "pocket-tts"; - version = "3.3.0"; + version = "4.0.0"; pyproject = true; __structuredAttrs = true; @@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: { owner = "kyutai-labs"; repo = "pocket-tts"; tag = "v${finalAttrs.version}"; - hash = "sha256-5ymwdjYUcRbC8Qfscvg/8ebg3zyRrEbgiCLO0KyYBl4="; + hash = "sha256-Qob5nhbwvepGijEJeS5k2z8t4sMFNz4qufyMhNkii1Q="; }; build-system = [ diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 7384d25273a0..0aad95a8fa67 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -2,11 +2,14 @@ lib, fetchPypi, buildPythonPackage, + python, + pkg-config, gmp, mpfr, libmpc, ppl, cython, + meson-python, cysignals, gmpy2, sphinx, @@ -18,13 +21,20 @@ buildPythonPackage rec { pname = "pplpy"; version = "0.9.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-gonFDWgM4/nqysZmy0zbvYpxGVnnzHzwb3/bQDXQzF0="; }; + postPatch = '' + # gmpy2 < 2.3 truncates instead of rounding when converting mpq to float. + # Remove once gmpy2 >= 2.3. + substituteInPlace ppl/mip_problem.pyx \ + --replace-fail "3.3333333333333335" "3.33333333333333..." + ''; + buildInputs = [ gmp mpfr @@ -32,12 +42,18 @@ buildPythonPackage rec { ppl ]; + build-system = [ + cython + meson-python + ]; + nativeBuildInputs = [ + pkg-config + ppl # ppl-config, used by meson to locate ppl sphinx # docbuild, called by make ]; - propagatedBuildInputs = [ - cython + dependencies = [ cysignals gmpy2 ]; @@ -47,20 +63,25 @@ buildPythonPackage rec { "doc" ]; - postBuild = '' - # Find the build result in order to put it into PYTHONPATH. The doc - # build needs to import pplpy. - build_result="$PWD/$( find build/ -type d -name 'lib.*' | head -n1 )" - - echo "Building documentation" - PYTHONPATH="$build_result:$PYTHONPATH" make -C docs html - ''; - postInstall = '' + # The doc build needs to import pplpy. + echo "Building documentation" + PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" make -C docs html + mkdir -p "$doc/share/doc" mv docs/build/html "$doc/share/doc/pplpy" ''; + pythonImportsCheck = [ "ppl" ]; + + checkPhase = '' + runHook preCheck + + PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" ${python.interpreter} tests/runtests.py + + runHook postCheck + ''; + passthru.tests = { inherit sage; }; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 7e1063408826..72dcff8796f9 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "pubnub"; - version = "10.7.2"; + version = "10.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pubnub"; repo = "python"; tag = finalAttrs.version; - hash = "sha256-qHLkRWq30o6F1P5z+hxUkGLOh15ReOVtto0ttKCiPqg="; + hash = "sha256-MK9xEccaWWssn9OU9mS28gQM9adjqyjNepUbOomW0Fw="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/py-netgear-plus/default.nix b/pkgs/development/python-modules/py-netgear-plus/default.nix index 262d3aa39409..27b297b19737 100644 --- a/pkgs/development/python-modules/py-netgear-plus/default.nix +++ b/pkgs/development/python-modules/py-netgear-plus/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "py-netgear-plus"; - version = "0.6.4"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "foxey"; repo = "py-netgear-plus"; tag = "v${finalAttrs.version}"; - hash = "sha256-UDy5kMfSrKXLsGTRLcYWqi7Mv1dtYSaIx+sy8PHipKE="; + hash = "sha256-7kDX1YaHYb/JAzIAhGzziFyDfcbUwp3j86iiJSxq3oM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pycec/default.nix b/pkgs/development/python-modules/pycec/default.nix index d2702b1628c1..c00ec1cffe74 100644 --- a/pkgs/development/python-modules/pycec/default.nix +++ b/pkgs/development/python-modules/pycec/default.nix @@ -5,9 +5,11 @@ libcec, pytestCheckHook, setuptools, + runCommand, + writers, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycec"; version = "0.6.0"; pyproject = true; @@ -15,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "konikvranik"; repo = "pycec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5KQyHjAvHWeHFqcFHFJxDOPwWuVcFAN2wVdz9a77dzU="; }; @@ -35,6 +37,22 @@ buildPythonPackage rec { "pycec" ]; + # Ideally, failures to propagate cec as an implicit dependency of + # pycec would be caught by pythonImportsCheckPhase, but the way it's + # currently designed to read the ambient $PYTHONPATH instead of + # deriving $PYTHONPATH from $out/nix-support/propagated-build-inputs + # may lead to false positives. + # + # See https://github.com/NixOS/nixpkgs/pull/573303 + passthru.tests.propagate-cec = runCommand "test-propagate-cec" { } '' + ${writers.writePython3 "test-propagate-cec.py" { + libraries = [ finalAttrs.finalPackage ]; + doCheck = false; + } "import cec"} + + touch "$out" + ''; + meta = { description = "Python modules to access HDMI CEC devices"; mainProgram = "pycec"; @@ -42,4 +60,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix index 58be7d820755..7fc0815952d1 100644 --- a/pkgs/development/python-modules/pydelijn/default.nix +++ b/pkgs/development/python-modules/pydelijn/default.nix @@ -1,46 +1,45 @@ { lib, aiohttp, - async-timeout, + aioresponses, buildPythonPackage, - fetchPypi, - pytz, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydelijn"; - version = "1.1.0"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; + src = fetchFromGitHub { + owner = "bollewolle"; + repo = "pydelijn"; + tag = "v${finalAttrs.version}"; + hash = "sha256-13BMHMdjnTrGGdVrrKT3zlDgiC1V7qXiD2XCX4PT+WY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp - async-timeout - pytz ]; - postPatch = '' - # Remove with next release - substituteInPlace setup.py \ - --replace "async_timeout>=3.0.1,<4.0" "async_timeout>=3.0.1" - # https://github.com/bollewolle/pydelijn/pull/11 - substituteInPlace pydelijn/common.py \ - --replace ", loop=self.loop" "" - ''; - - # Project has no tests - doCheck = false; + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "pydelijn" ]; meta = { + changelog = "https://github.com/bollewolle/pydelijn/releases/tag/${finalAttrs.src.tag}"; description = "Python package to retrieve realtime data of passages at stops of De Lijn"; homepage = "https://github.com/bollewolle/pydelijn"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index fd15a6d1cfa8..c826b94fd9f5 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.48"; + version = "0.3.49"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-kfq8io7EQAcTm6Z5sVr7Y2MHxcDYWK7TWDtERaeP1GA="; + hash = "sha256-DiTMTuvYilbQaaPXlw1bTwWKh89GNWbecxcG/e1dgtk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfaup-rs/default.nix b/pkgs/development/python-modules/pyfaup-rs/default.nix index 7673decb43f3..75d8e05c426e 100644 --- a/pkgs/development/python-modules/pyfaup-rs/default.nix +++ b/pkgs/development/python-modules/pyfaup-rs/default.nix @@ -8,19 +8,19 @@ buildPythonPackage (finalAttrs: { pname = "pyfaup-rs"; - version = "0.4.24"; + version = "0.4.25"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "faup-rs"; tag = "pyfaup-rs-v${finalAttrs.version}"; - hash = "sha256-V1ye7Pupos5LFgeik6Dkaznijr01zA01FvcH8MYHQmo="; + hash = "sha256-s1XeDs1GID/Ka9y9VoX4v0QLhzFb/Y0FqlPKpupu+eM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-yFE1BAFUVq9QuiJdBIJo+9JePCuqM0/3aq4Yv4+67IM="; + hash = "sha256-6d0kvBubMr/c0NG0FY7OBzuGfefCBJahGAyb0XR4dK4="; }; buildAndTestSubdir = "python"; diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index 92b5d440fd3e..0ab7066e2f74 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -8,7 +8,7 @@ pbr, coverage, oslotest, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -26,24 +26,18 @@ buildPythonPackage rec { setuptools ]; - nativeCheckInputs = [ - coverage - oslotest - stestr - ]; - dependencies = [ cryptography python-dateutil ]; - pythonImportsCheck = [ "pyghmi" ]; + nativeCheckInputs = [ + coverage + oslotest + stestrCheckHook + ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; + pythonImportsCheck = [ "pyghmi" ]; meta = { description = "Pure Python (mostly IPMI) server management library"; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 5cbdd5b0391e..7461cad2c9f6 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { pname = "pylitterbot"; - version = "2025.6.6"; + version = "2025.7.0"; pyproject = true; __darwinAllowLocalNetworking = true; @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { owner = "natekspencer"; repo = "pylitterbot"; tag = finalAttrs.version; - hash = "sha256-JcxqhMuSolYBXD55mYOUv49wh32GON3oM8GVzmNdrUk="; + hash = "sha256-2TuN3pAIJDh6H++iWGcoJOjT0lHVlia74dOGiRIva40="; }; build-system = [ diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix index 2b6304cb86af..ec547f591080 100644 --- a/pkgs/development/python-modules/pylsl/default.nix +++ b/pkgs/development/python-modules/pylsl/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pylsl"; - version = "1.18.5"; + version = "1.18.6"; pyproject = true; src = fetchFromGitHub { owner = "labstreaminglayer"; repo = "pylsl"; tag = "v${version}"; - hash = "sha256-Mul6t1Bz3F1Efsu3wSXOQvFz9hPYQcXI3i9xd7GOGJk="; + hash = "sha256-GTuEVjegimwbKAgoVgC44NhvUjQcjVmPTNBh13i1ejE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 1127bc026765..8ec087572cd5 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "pymodbus"; - version = "3.15.0"; + version = "3.16.1"; pyproject = true; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "pymodbus"; tag = "v${finalAttrs.version}"; - hash = "sha256-8zBbGvqni5/P1UP+ByPGTZJ5SyydrisuJcg1BntucWE="; + hash = "sha256-Mo3DvhDm+gvtylB1073PqxD8Trfb7AeHR0lXz8ap2FE="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 4fb535176598..d4deed43c2f8 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, python, toPythonModule, @@ -48,19 +49,26 @@ let in buildPythonPackage (finalAttrs: { pname = "pymupdf"; - version = "1.27.2.3"; + version = "1.28.2"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "pymupdf"; repo = "PyMuPDF"; tag = finalAttrs.version; - hash = "sha256-KeddkzRkJ/tcINftYrx/BY0Z3WUaTU9iBqL5UorvclU="; + hash = "sha256-POrmdYO9SCVHc473aUY12MvwS/iYC/oPwBGBVSjZ78Q="; }; patches = [ # `conftest.py` tries to run `pip install` to install test dependencies. ./conftest-dont-pip-install.patch + # CVE-2026-82035 + (fetchpatch { + name = "extract_objects(): avoid path escape from directory"; + url = "https://github.com/pymupdf/PyMuPDF/commit/b2c8f3a859fed35c379a44df566f770dc3e18605.patch"; + hash = "sha256-YW1UtGhDJh69YKPCtZS7MqsisbltEKZeGMFU3RUQVHw="; + }) ]; # swig is not wrapped as Python package @@ -143,6 +151,13 @@ buildPythonPackage (finalAttrs: { "test_open2" # Segfaults in test_general.py::test_4907 with system MuPDF "test_4907" + # Text comparison errors, likely due to version differences + "test_3569" + "test_5054" + # assert 0.5341277982276387 == 0 (rounding difference) + "test_5001" + # Warnings text not empty + "test_5049" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix index c4f9a66ecbfa..c725c22ad7f6 100644 --- a/pkgs/development/python-modules/pyperscan/default.nix +++ b/pkgs/development/python-modules/pyperscan/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "pyperscan"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "vlaci"; repo = "pyperscan"; rev = "v${version}"; - hash = "sha256-uGZ0XFxnZHSLEWcwoHVd+xMulDRqEIrQ5Lf7886GdlM="; + hash = "sha256-8a7x6eF91grUNyZWBWsz/WL5WVrynElE5zLPHCaTp08="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-9kKHLYD0tXMGJFhsCBgO/NpWB4J5QZh0qKIuI3PFn2c="; + hash = "sha256-37EMRHp6X3CqZ/nIewUxWyJCSWXkT1lCyopzCn6M38w="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 54c442cc7a9a..f9362f5d7f82 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "pyrainbird"; - version = "6.6.0"; + version = "6.8.0"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "pyrainbird"; tag = finalAttrs.version; - hash = "sha256-f3mIM4kEJiR12jvi65P/Mx0yKV1GJ9GxWNWXFNK9IuY="; + hash = "sha256-yJ1Sg3gTu/0ACBLd0sAYVfbMR8vNv1a5QzWiSGFoS6c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-docker/default.nix b/pkgs/development/python-modules/pytest-docker/default.nix index 2d286cddaa5a..21b8a26613ce 100644 --- a/pkgs/development/python-modules/pytest-docker/default.nix +++ b/pkgs/development/python-modules/pytest-docker/default.nix @@ -16,16 +16,16 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-docker"; - version = "3.2.5"; + version = "3.2.6"; pyproject = true; src = fetchFromGitHub { owner = "avast"; repo = "pytest-docker"; - tag = "v${version}"; - hash = "sha256-AkVLfCt2aQZrvSfa/5oXr95XUIR5mRqcMRz67kmuKKw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-0yLXdyuN9jJdFh97S8giPTsZMBYaAcyc0slJ2cEXXRU="; }; build-system = [ setuptools ]; @@ -57,8 +57,8 @@ buildPythonPackage rec { meta = { description = "Docker-based integration tests"; homepage = "https://github.com/avast/pytest-docker"; - changelog = "https://github.com/avast/pytest-docker/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/avast/pytest-docker/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix index ec3787d24efd..902f040134d8 100644 --- a/pkgs/development/python-modules/python-barbicanclient/default.nix +++ b/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -14,7 +14,7 @@ setuptools, sphinxcontrib-apidoc, sphinxHook, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -58,15 +58,9 @@ buildPythonPackage rec { nativeCheckInputs = [ requests-mock - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "barbicanclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index cd5699634a98..cfc62b45a390 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -27,14 +27,14 @@ buildPythonPackage (finalAttrs: { pname = "python-benedict"; - version = "0.39.0"; + version = "0.40.0"; pyproject = true; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-benedict"; tag = finalAttrs.version; - hash = "sha256-xU4BuratvIJOFljozi1j1nvsBnKDZpeF9BPeRAWGbWk="; + hash = "sha256-O0pfDytFNv1C9Km7vqNEgIHML3/s1GC7YnwjgCl5VG8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index 12f52a4c55db..1fc425720875 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -16,7 +16,7 @@ setuptools, simplejson, sphinxHook, - stestr, + stestrCheckHook, stevedore, }: @@ -56,17 +56,9 @@ buildPythonPackage rec { ddt oslo-serialization requests-mock - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - - stestr run - - runHook postCheck - ''; - pythonImportsCheck = [ "cinderclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix index 645a33731c75..c54f8df9985a 100644 --- a/pkgs/development/python-modules/python-designateclient/default.nix +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -16,7 +16,7 @@ setuptools, sphinxHook, sphinxcontrib-apidoc, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -59,15 +59,9 @@ buildPythonPackage rec { nativeCheckInputs = [ oslotest requests-mock - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "designateclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 5a176edaddca..1e5aee98bd56 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; src = fetchFromGitHub { owner = "nkgilley"; repo = "python-ecobee-api"; tag = version; - hash = "sha256-kvTbeXpjeD2T+dFVGldNH7H/3usTFQXD7tINp9UkftE="; + hash = "sha256-cV8Na06iB2fRcAbtCyE+qc293nkKxAbO0G2NV+60UUo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 274dbf67dc17..527f2233a51c 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -14,23 +14,14 @@ oslo-utils, wrapt, pyopenssl, - stestr, + stestrCheckHook, testscenarios, ddt, requests-mock, - writeText, }: let pname = "python-glanceclient"; version = "4.13.0"; - - disabledTests = [ - # Skip tests which require networking. - "glanceclient.tests.unit.test_http.TestClient.test_http_chunked_response" - "glanceclient.tests.unit.test_http.TestClient.test_log_request_id_once" - "glanceclient.tests.unit.test_http.TestClient.test_log_request_id_once" - ''glanceclient\.tests\.unit\.test_ssl\.TestHTTPSVerifyCert\..*'' - ]; in buildPythonPackage { inherit pname version; @@ -65,15 +56,19 @@ buildPythonPackage { ddt openstacksdk requests-mock - stestr + stestrCheckHook testscenarios ]; - checkPhase = '' - runHook preCheck - stestr run -e ${writeText "disabled-tests" (lib.concatStringsSep "\n" disabledTests)} - runHook postCheck - ''; + # Skip tests which require networking. + disabledTests = [ + "glanceclient.tests.unit.test_http.TestClient.test_http_chunked_response" + "glanceclient.tests.unit.test_http.TestClient.test_log_request_id_once" + ]; + + disabledTestsRegex = [ + ''glanceclient\.tests\.unit\.test_ssl\.TestHTTPSVerifyCert\..*'' + ]; pythonImportsCheck = [ "glanceclient" ]; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index cf6e4579b01f..6bab870ced73 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -19,7 +19,7 @@ setuptools, sphinxcontrib-apidoc, sphinxHook, - stestr, + stestrCheckHook, stevedore, }: @@ -60,19 +60,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - stestr + stestrCheckHook requests-mock oslotest ]; env.PBR_VERSION = version; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "ironicclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 98ab8be23a52..b56825148003 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -11,7 +11,7 @@ testscenarios, requests, requests-mock, - stestr, + stestrCheckHook, multiprocess, }: @@ -47,14 +47,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - stestr + stestrCheckHook testscenarios requests-mock multiprocess ]; - checkPhase = '' - stestr run - ''; meta = { description = "Python bindings for the remote Jenkins API"; diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 8e48f0248aff..4e1b51c8e00a 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -9,7 +9,7 @@ pbr, requests-mock, setuptools, - stestr, + stestrCheckHook, testresources, testscenarios, }: @@ -37,17 +37,11 @@ buildPythonPackage rec { nativeCheckInputs = [ openssl requests-mock - stestr + stestrCheckHook testresources testscenarios ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "keystoneclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-magnumclient/default.nix b/pkgs/development/python-modules/python-magnumclient/default.nix index 1e28715cd7d0..dfbfbb4e89b2 100644 --- a/pkgs/development/python-modules/python-magnumclient/default.nix +++ b/pkgs/development/python-modules/python-magnumclient/default.nix @@ -22,7 +22,7 @@ requests, setuptools, sphinxHook, - stestr, + stestrCheckHook, stevedore, testtools, }: @@ -74,16 +74,10 @@ buildPythonPackage rec { osprofiler oslotest requests-mock - stestr + stestrCheckHook testtools ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "magnumclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-mistralclient/default.nix b/pkgs/development/python-modules/python-mistralclient/default.nix index 4ec57797a9bf..a93521ae1a34 100644 --- a/pkgs/development/python-modules/python-mistralclient/default.nix +++ b/pkgs/development/python-modules/python-mistralclient/default.nix @@ -20,7 +20,7 @@ setuptools, sphinxcontrib-apidoc, sphinxHook, - stestr, + stestrCheckHook, stevedore, tempest, }: @@ -78,16 +78,10 @@ buildPythonPackage rec { oslotest osprofiler requests-mock - stestr + stestrCheckHook tempest ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "mistralclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix index 80fec3f47fd8..76bdb5b8c4c3 100644 --- a/pkgs/development/python-modules/python-neutronclient/default.nix +++ b/pkgs/development/python-modules/python-neutronclient/default.nix @@ -24,7 +24,7 @@ osprofiler, python-openstackclient, requests-mock, - stestr, + stestrCheckHook, testtools, testscenarios, tempest, @@ -71,20 +71,12 @@ buildPythonPackage rec { osprofiler python-openstackclient requests-mock - stestr + stestrCheckHook testtools testscenarios tempest ]; - checkPhase = '' - runHook preCheck - - stestr run - - runHook postCheck - ''; - pythonImportsCheck = [ "neutronclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-octaviaclient/tests.nix b/pkgs/development/python-modules/python-octaviaclient/tests.nix index 10499d53e417..d055a6fd70e2 100644 --- a/pkgs/development/python-modules/python-octaviaclient/tests.nix +++ b/pkgs/development/python-modules/python-octaviaclient/tests.nix @@ -9,7 +9,7 @@ pygments, python-subunit, oslotest, - stestr, + stestrCheckHook, testscenarios, }: @@ -31,15 +31,7 @@ buildPythonPackage { pygments python-subunit oslotest - stestr + stestrCheckHook testscenarios ]; - - checkPhase = '' - runHook preCheck - - stestr run - - runHook postCheck - ''; } diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index e8add4244595..fc74b64ba091 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -3,9 +3,7 @@ anyio, async-timeout, buildPythonPackage, - curio, fetchFromGitHub, - flask, pytest-asyncio, pytest-trio, pytestCheckHook, @@ -20,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "python-socks"; - version = "3.0.0"; + version = "3.1.1"; pyproject = true; __darwinAllowLocalNetworking = true; @@ -29,26 +27,19 @@ buildPythonPackage (finalAttrs: { owner = "romis2012"; repo = "python-socks"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pp5059O2k4Bd/+s5ZrOUR6d/+t5T5xeMTqTQ2f4N3RM="; + hash = "sha256-4+3z/n8DTVRK0/f/MNy8gvnRwA69WwPvLSCFEN/dOvk="; }; build-system = [ setuptools ]; - dependencies = [ - trio - curio - async-timeout - ]; - optional-dependencies = { + asyncio = [ ]; trio = [ trio ]; - curio = [ curio ]; anyio = [ anyio ]; }; nativeCheckInputs = [ anyio - flask pytest-asyncio pytest-trio pytestCheckHook diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix index e45f4ca649b2..1361304d68f2 100644 --- a/pkgs/development/python-modules/python-troveclient/default.nix +++ b/pkgs/development/python-modules/python-troveclient/default.nix @@ -18,7 +18,7 @@ setuptools, sphinxcontrib-apidoc, sphinxHook, - stestr, + stestrCheckHook, stevedore, }: @@ -65,17 +65,13 @@ buildPythonPackage rec { nativeCheckInputs = [ httplib2 requests-mock - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run -e <(echo " - troveclient.tests.test_shell.ShellTest.test_help - troveclient.tests.test_shell.ShellTestKeystoneV3.test_help - ") - runHook postCheck - ''; + disabledTests = [ + "troveclient.tests.test_shell.ShellTest.test_help" + "troveclient.tests.test_shell.ShellTestKeystoneV3.test_help" + ]; pythonImportsCheck = [ "troveclient" ]; diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix index e83e3940b97f..94b17a06017f 100644 --- a/pkgs/development/python-modules/python-watcherclient/default.nix +++ b/pkgs/development/python-modules/python-watcherclient/default.nix @@ -13,7 +13,7 @@ setuptools, sphinxcontrib-apidoc, sphinxHook, - stestr, + stestrCheckHook, }: buildPythonPackage rec { @@ -52,13 +52,7 @@ buildPythonPackage rec { oslo-utils ]; - nativeCheckInputs = [ stestr ]; - - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; + nativeCheckInputs = [ stestrCheckHook ]; pythonImportsCheck = [ "watcherclient" ]; diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix index b7bfecfcb94f..063a2a5bcebb 100644 --- a/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -15,7 +15,7 @@ requests, setuptools, sphinxHook, - stestr, + stestrCheckHook, stevedore, }: @@ -59,15 +59,9 @@ buildPythonPackage rec { nativeCheckInputs = [ ddt requests-mock - stestr + stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run - runHook postCheck - ''; - pythonImportsCheck = [ "zaqarclient" ]; meta = { diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix index 25b6b3c4f6e5..6776cd6344a8 100644 --- a/pkgs/development/python-modules/python-zunclient/default.nix +++ b/pkgs/development/python-modules/python-zunclient/default.nix @@ -13,7 +13,7 @@ prettytable, setuptools, sphinxHook, - stestr, + stestrCheckHook, websocket-client, }: @@ -58,24 +58,20 @@ buildPythonPackage rec { websocket-client ]; - nativeCheckInputs = [ stestr ]; + nativeCheckInputs = [ stestrCheckHook ]; - checkPhase = '' - runHook preCheck - stestr run -e <(echo " - zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_internal - zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_public - zunclient.tests.unit.test_shell.ShellTest.test_main_env_region - zunclient.tests.unit.test_shell.ShellTest.test_main_no_region - zunclient.tests.unit.test_shell.ShellTest.test_main_option_region - zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_internal - zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_public - zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_env_region - zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_no_region - zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_option_region - ") - runHook postCheck - ''; + disabledTests = [ + "zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_internal" + "zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_public" + "zunclient.tests.unit.test_shell.ShellTest.test_main_env_region" + "zunclient.tests.unit.test_shell.ShellTest.test_main_no_region" + "zunclient.tests.unit.test_shell.ShellTest.test_main_option_region" + "zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_internal" + "zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_public" + "zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_env_region" + "zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_no_region" + "zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_option_region" + ]; pythonImportsCheck = [ "zunclient" ]; diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 6b7240111ec9..323c112e0073 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -10,6 +10,7 @@ requests-mock, setuptools, setuptools-scm, + writableTmpDirAsHomeHook, }: buildPythonPackage (finalAttrs: { @@ -37,6 +38,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook pytest-astropy requests-mock + writableTmpDirAsHomeHook ]; pytestFlags = [ diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix index 589f8ce0b760..8402e50342f2 100644 --- a/pkgs/development/python-modules/pywikibot/default.nix +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -10,12 +10,12 @@ buildPythonPackage (finalAttrs: { pname = "pywikibot"; - version = "11.7.0"; + version = "11.8.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-vX9MW1miCEPkbNVUCgPZKSL120bJ1hXOAJztVqHvaDs="; + hash = "sha256-+Rkw0Vke/qR19I8pTzKH2C9+5iQLPTikDl0xtSy4zME="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/raygeo/default.nix b/pkgs/development/python-modules/raygeo/default.nix index 934b54d47c28..6e184814d74c 100644 --- a/pkgs/development/python-modules/raygeo/default.nix +++ b/pkgs/development/python-modules/raygeo/default.nix @@ -15,17 +15,17 @@ buildPythonPackage rec { pname = "raygeo"; - version = "1.61.0"; + version = "1.67.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4oy/gCMPGAAcuJVSQBduagw6AHCRXP/WpuL5UJ0sxpQ="; + hash = "sha256-+86l3GLmbHAp0THhkce33+kTUdso6xp8FqTDZ3vxqBU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-OxnLS0MbhfpNNJ6l0XNCdcBLU8S9JmpgYTr9sdzlkHQ="; + hash = "sha256-21lko71TEJSXXoDKkq5jzW2TqXrWXkHaGf45FgRJPhc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reactivex/default.nix b/pkgs/development/python-modules/reactivex/default.nix index 429715e5d38a..85f8c37182bc 100644 --- a/pkgs/development/python-modules/reactivex/default.nix +++ b/pkgs/development/python-modules/reactivex/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "reactivex"; - version = "5.1.0"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ReactiveX"; repo = "RxPY"; tag = "v${finalAttrs.version}"; - hash = "sha256-wgUbZsHIqBSXVnFjYFosoj1FptAwHz3Lqz+rlAG/Zw4="; + hash = "sha256-AkzaDNLjiYYp/SRQseilfVuDU6+TWZBSIhkqk8j5ZOo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/reno/default.nix b/pkgs/development/python-modules/reno/default.nix index d48bc50bce67..c0b9a1315577 100644 --- a/pkgs/development/python-modules/reno/default.nix +++ b/pkgs/development/python-modules/reno/default.nix @@ -10,9 +10,10 @@ pyyaml, setuptools_80, sphinx, - stestr, + stestrCheckHook, testtools, testscenarios, + writableTmpDirAsHomeHook, }: buildPythonPackage (finalAttrs: { @@ -42,35 +43,31 @@ buildPythonPackage (finalAttrs: { # Python packages docutils sphinx - stestr + stestrCheckHook testtools testscenarios + writableTmpDirAsHomeHook # Required programs to run all tests git gnupg ]; - checkPhase = '' - runHook preCheck - export HOME=$(mktemp -d) - stestr run -e <(echo " - # Expects to be run from a git repository - reno.tests.test_cache.TestCache.test_build_cache_db - reno.tests.test_semver.TestSemVer.test_major_post_release - reno.tests.test_semver.TestSemVer.test_major_working_and_post_release - reno.tests.test_semver.TestSemVer.test_major_working_copy - reno.tests.test_semver.TestSemVer.test_minor_post_release - reno.tests.test_semver.TestSemVer.test_minor_working_and_post_release - reno.tests.test_semver.TestSemVer.test_minor_working_copy - reno.tests.test_semver.TestSemVer.test_patch_post_release - reno.tests.test_semver.TestSemVer.test_patch_working_and_post_release - reno.tests.test_semver.TestSemVer.test_patch_working_copy - reno.tests.test_semver.TestSemVer.test_same - reno.tests.test_semver.TestSemVer.test_same_with_note - ") - runHook postCheck - ''; + disabledTests = [ + # Expects to be run from a git repository + "reno.tests.test_cache.TestCache.test_build_cache_db" + "reno.tests.test_semver.TestSemVer.test_major_post_release" + "reno.tests.test_semver.TestSemVer.test_major_working_and_post_release" + "reno.tests.test_semver.TestSemVer.test_major_working_copy" + "reno.tests.test_semver.TestSemVer.test_minor_post_release" + "reno.tests.test_semver.TestSemVer.test_minor_working_and_post_release" + "reno.tests.test_semver.TestSemVer.test_minor_working_copy" + "reno.tests.test_semver.TestSemVer.test_patch_post_release" + "reno.tests.test_semver.TestSemVer.test_patch_working_and_post_release" + "reno.tests.test_semver.TestSemVer.test_patch_working_copy" + "reno.tests.test_semver.TestSemVer.test_same" + "reno.tests.test_semver.TestSemVer.test_same_with_note" + ]; pythonImportsCheck = [ "reno" ]; diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 51daf3441e33..c625e85b47c7 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.18.0"; + version = "3.19.0"; pyproject = true; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; tag = "v${version}"; - hash = "sha256-ZxO449dJPWozEMEM1BhHJGIAg0Mtr3bfg+3WvAgdoCE="; + hash = "sha256-LH4h9c9rF8zShgOJYnWJu4n8Uj70oUDHHtFv9FzV82o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index 4408cafa3ef0..c89aada3b8c7 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -39,13 +39,13 @@ }: let - version = "41.4.0"; + version = "41.5.0"; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-C1COIE3q9Fozw8pFikhzS/tR1huLJcZtwd/DOYvz6+o="; + hash = "sha256-kSOKCgAf+QMUuOFsU9qrG8DhozpcUkccdKHxLhrEbe8="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/saiph/default.nix b/pkgs/development/python-modules/saiph/default.nix index 14983c27c9ca..cc5ea94069f1 100644 --- a/pkgs/development/python-modules/saiph/default.nix +++ b/pkgs/development/python-modules/saiph/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "saiph"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { owner = "octopize"; repo = "saiph"; tag = "saiph-v${finalAttrs.version}"; - hash = "sha256-e41fa0C3ZT8mg+oHLU6VsQKgnCh59uO3bksO46A4t1M="; + hash = "sha256-x1S9QLPm0/+oWeYxt4RO9gZzh0qMfzRczTotCd6+07s="; }; build-system = [ diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 6d3174d43c98..48a8101a71cd 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.6.8"; + version = "0.6.9"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "scikit-hep-testdata"; tag = "v${version}"; - hash = "sha256-wbhZyAXtTQAhJbQa7pgzAHqsZ1mr2kp2x/j5Si1mQgU="; + hash = "sha256-HaHMpbWiiTnhg8ghxszjGzSMiv9F0y0d7Cu7xNAKg+A="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix index f285ae3a5d4f..fa58c706cf59 100644 --- a/pkgs/development/python-modules/scipp/default.nix +++ b/pkgs/development/python-modules/scipp/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -37,15 +36,25 @@ hypothesis, }: -buildPythonPackage rec { +let + # https://github.com/scipp/scipp/blob/v26.9.0/pyproject.toml#L7-L10 + pybind11' = pybind11.overridePythonAttrs (old: { + version = "3.0.4"; + src = old.src.override { + hash = "sha256-QZKnIOopEDsiRFkc1qQ+DaDHoTNuEEgQVeiAL0sQqak="; + }; + }); +in +buildPythonPackage (finalAttrs: { pname = "scipp"; version = "26.9.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "scipp"; repo = "Scipp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-1u9KT6o83hn9x/WGXj26OsGJOQpMBu1G4FiDIVaGXoM="; }; @@ -73,7 +82,7 @@ buildPythonPackage rec { boost eigen gtest - pybind11 + pybind11' units-llnl.passthru.top-level onetbb ]; @@ -102,7 +111,8 @@ buildPythonPackage rec { meta = { description = "Multi-dimensional data arrays with labeled dimensions"; homepage = "https://scipp.github.io"; + changelog = "https://github.com/scipp/scipp/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/sparsediffpy/default.nix b/pkgs/development/python-modules/sparsediffpy/default.nix index 666042fe9794..54612427246a 100644 --- a/pkgs/development/python-modules/sparsediffpy/default.nix +++ b/pkgs/development/python-modules/sparsediffpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { pname = "sparsediffpy"; - version = "0.6.1"; + version = "0.8.0"; pyproject = true; __structuredAttrs = true; @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { # SparseDiffEngine is built from source and their cmake does not support finding it on the # system. We fallback to using the git submodule approach for now. fetchSubmodules = true; - hash = "sha256-W0S7VpPrthj5IuXkqPgb9YwuebcjF1e4rAKcStRowII="; + hash = "sha256-KEYhEdWQp3Ze9e51gqE4IpHeXk0M8unlnDbc/9y45r0="; }; build-system = [ diff --git a/pkgs/development/python-modules/sqlcipher3/default.nix b/pkgs/development/python-modules/sqlcipher3/default.nix index aa7089459180..fba9fc3711f1 100644 --- a/pkgs/development/python-modules/sqlcipher3/default.nix +++ b/pkgs/development/python-modules/sqlcipher3/default.nix @@ -8,7 +8,7 @@ }: let pname = "sqlcipher3"; - version = "0.6.3"; + version = "0.6.4"; in buildPythonPackage { inherit pname version; @@ -16,7 +16,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-/Lt4RmPSEhNWPz+9o5L/tfnXuE3/A9PRFL5rtUM4oa4="; + hash = "sha256-sCo+38VUyRl9Y6tMOKMPdoLuxlsQ5b4skoWg1v+3opo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/starlink-grpc-core/default.nix b/pkgs/development/python-modules/starlink-grpc-core/default.nix index 7e536a673151..8c46f202c844 100644 --- a/pkgs/development/python-modules/starlink-grpc-core/default.nix +++ b/pkgs/development/python-modules/starlink-grpc-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "starlink-grpc-core"; - version = "1.2.5"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "sparky8512"; repo = "starlink-grpc-tools"; tag = "v${version}"; - hash = "sha256-+KQ0zzgbqnzeQZXBTxnclJQbRioirK8Ym4EjJSQA3ZE="; + hash = "sha256-dAm243jg+FViW/ai4MP+afQulLOy1kVFcn4YksRWZ20="; }; pypaBuildFlags = [ "packaging" ]; diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix index 6ea09baeadd9..5760fce30d09 100644 --- a/pkgs/development/python-modules/stestr/tests.nix +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -1,4 +1,10 @@ -{ buildPythonPackage, stestr }: +{ + buildPythonPackage, + stestr, + stestrCheckHook, + writableTmpDirAsHomeHook, + ddt, +}: buildPythonPackage { pname = "stestr-tests"; @@ -11,10 +17,14 @@ buildPythonPackage { pythonOutputDistPhase() { touch $dist; } ''; - nativeCheckInputs = [ stestr ]; + nativeCheckInputs = [ + stestrCheckHook + writableTmpDirAsHomeHook + ddt + ]; - checkPhase = '' - export PATH=$out/bin:$PATH - export HOME=$TMPDIR - ''; + stestrFlags = [ + "--test-path" + "stestr/tests" + ]; } diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 5badb14be18a..6a2eed0e42ae 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.7.8"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "pyapp-kit"; repo = "superqt"; tag = "v${version}"; - hash = "sha256-ipDtwymKocCRwcW/eYpM6jrmrjkYQJlaEyaSV4SinMM="; + hash = "sha256-URvP2cCnfLN/ncBC3sP3Dbmir84PfZw1DTjRZxF0sv0="; }; build-system = [ diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index 6a3ad1b1a835..878d86342bfd 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -17,7 +17,7 @@ requests, setuptools, six, - stestr, + stestrCheckHook, swiftclient, xattr, }: @@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: { boto3 libredirect.hook mock - stestr + stestrCheckHook swiftclient ]; @@ -66,13 +66,11 @@ buildPythonPackage (finalAttrs: { # a lot of tests currently fail while establishing a connection doCheck = false; - checkPhase = '' + preCheck = '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) export SWIFT_TEST_CONFIG_FILE=test/sample.conf - - stestr run ''; pythonImportsCheck = [ "swift" ]; diff --git a/pkgs/development/python-modules/switchbot-api/default.nix b/pkgs/development/python-modules/switchbot-api/default.nix index d3a94c648460..1e1d66b3caaf 100644 --- a/pkgs/development/python-modules/switchbot-api/default.nix +++ b/pkgs/development/python-modules/switchbot-api/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "switchbot-api"; - version = "2.13.0"; + version = "2.13.1"; pyproject = true; src = fetchFromGitHub { owner = "SeraphicCorp"; repo = "py-switchbot-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-30HJKoTcWY3W/eLp0A5+Gx4JJMHuURKcXfSYNFPRsu4="; + hash = "sha256-45sWBVzHXDxyAGCLesh34wBEbwUri6J57UKiMWx/67M="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/synchronicity/default.nix b/pkgs/development/python-modules/synchronicity/default.nix index 6159c5869090..27988b856dc9 100644 --- a/pkgs/development/python-modules/synchronicity/default.nix +++ b/pkgs/development/python-modules/synchronicity/default.nix @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { pname = "synchronicity"; - version = "0.12.5"; + version = "0.12.6"; pyproject = true; __structuredAttrs = true; @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { owner = "modal-labs"; repo = "synchronicity"; tag = "v${finalAttrs.version}"; - hash = "sha256-npn6SX3NV0Vcq305zyi0jEFGpdyoTESpnDTyuf+WKsQ="; + hash = "sha256-dMRGjO1KiZJX5+UmIbP1kBMp/ZpiVxk1dIGaWc7YoWg="; }; build-system = [ diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index b7931ebbd62d..adf7c7e4c891 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tank-utility"; - version = "1.5.1"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "krismolendyke"; repo = "tank-utility"; tag = version; - hash = "sha256-koLdumixS11J1Ia9aCihQU7XXu0dziNzMkqEQ2LH9o4="; + hash = "sha256-W30gkik7eigHM5hB3wIr4pSZEkmjbKbuVq2yMW8Xkfg="; }; build-system = [ setuptools_80 ]; diff --git a/pkgs/development/python-modules/teltasync/default.nix b/pkgs/development/python-modules/teltasync/default.nix index e5c8bae9dc26..efcf114ff819 100644 --- a/pkgs/development/python-modules/teltasync/default.nix +++ b/pkgs/development/python-modules/teltasync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "teltasync"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromCodeberg { owner = "dmho"; repo = "teltasync"; tag = "v${finalAttrs.version}"; - hash = "sha256-xR4Rh2TnnsXAqicRDBQyhwpUh5zl5cWS6BuyxY/RFsE="; + hash = "sha256-T364eXkmvNQSNVVh3qKyK9QSkvI1SNMSGD5b2WzHHZ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 7a258ce52e73..f5be47d2f668 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -23,6 +23,7 @@ pyyaml, setuptools, stestr, + stestrCheckHook, stevedore, python-subunit, testscenarios, @@ -76,28 +77,33 @@ buildPythonPackage rec { nativeCheckInputs = [ hacking oslotest - stestr + stestrCheckHook ]; - checkPhase = '' + preCheck = '' # Tests expect these applications available as such. mkdir -p bin export PATH="$PWD/bin:$PATH" printf '#!${bash}/bin/bash\nexec ${python.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest printf '#!${bash}/bin/bash\nexec ${python.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls chmod +x bin/* - - stestr --test-path tempest/tests run -e <(echo " - tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_dict_return_values - tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_multiple_workers - tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_single_process - tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_success - tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_with_exception - tempest.tests.lib.cli.test_execute.TestExecute.test_execute_with_prefix - tempest.tests.lib.common.test_rest_client.TestRestClientServiceToken.test_log_request_full_omits_service_token - ") ''; + stestrFlags = [ + "--test-path" + "tempest/tests" + ]; + + disabledTests = [ + "tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_dict_return_values" + "tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_multiple_workers" + "tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_single_process" + "tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_success" + "tempest.tests.common.test_concurrency.TestConcurrency.test_run_concurrent_tasks_with_exception" + "tempest.tests.lib.cli.test_execute.TestExecute.test_execute_with_prefix" + "tempest.tests.lib.common.test_rest_client.TestRestClientServiceToken.test_log_request_full_omits_service_token" + ]; + pythonImportsCheck = [ "tempest" ]; meta = { diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index e1aec20bf0f4..d618a41e6718 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, # build-system - pybind11, setuptools, setuptools-scm, @@ -15,10 +14,7 @@ # dependencies cloudpickle, - importlib-metadata, numpy, - orjson, - packaging, pyvers, torch, @@ -29,7 +25,7 @@ buildPythonPackage (finalAttrs: { pname = "tensordict"; - version = "0.14.3"; + version = "0.15.2"; pyproject = true; __structuredAttrs = true; @@ -37,16 +33,10 @@ buildPythonPackage (finalAttrs: { owner = "pytorch"; repo = "tensordict"; tag = "v${finalAttrs.version}"; - hash = "sha256-j+A4bFjFRFD7QetyCdmrvQA36oVJ3MuaftbTaBFlxSU="; + hash = "sha256-zDWQKVhA2xxTmq5gSRLpG+LG4xqYKDF5gMDrwUWybOA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "pybind11[global]" "pybind11" - ''; - build-system = [ - pybind11 setuptools setuptools-scm ]; @@ -59,19 +49,16 @@ buildPythonPackage (finalAttrs: { dependencies = [ cloudpickle - importlib-metadata numpy - orjson - packaging pyvers torch ]; pythonImportsCheck = [ "tensordict" ]; - # We have to delete the source because otherwise it is used instead of the installed package. + # Prevent the source files from being imported at test time preCheck = '' - rm -rf tensordict + rm -f tensordict/__init__.py ''; nativeCheckInputs = [ @@ -88,10 +75,6 @@ buildPythonPackage (finalAttrs: { # TypeError: not all arguments converted during string formatting "test_dtensor" - # FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tensordict/tensorclass.pyi - "test_tensorclass_instance_methods" - "test_tensorclass_stub_methods" - # hangs forever on some CPUs "test_map_iter_interrupt_early" @@ -100,9 +83,13 @@ buildPythonPackage (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # RuntimeError: Failed to initialize cpuinfo! + "test_cast_filter_class_default" + "test_cast_filter_inheritance" "test_cast_to" "test_casts" + "test_dtype_shorthand_cast_filter" "test_td_params_cast" + "test_to_dtype_cast_filter" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hangs due to the use of a pool diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index df926cc31b41..9be14bc5c434 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,16 +15,16 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "teslajsonpy"; - version = "3.13.2"; + version = "3.14.1"; pyproject = true; src = fetchFromGitHub { owner = "zabuldon"; repo = "teslajsonpy"; - tag = "v${version}"; - hash = "sha256-tlw5m8RsBGwVx3h+JlY9rwINMDR6csAt2XefK6AaQWE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-EyyDyRoenKY1ZaPGyQz9WwRYWKRbthrNCdq+ms9LNNU="; }; build-system = [ poetry-core ]; @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Python library to work with Tesla API"; homepage = "https://github.com/zabuldon/teslajsonpy"; - changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/${src.tag}"; + changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 651bee904baa..ee0648459a09 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -2,23 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + + # dependencies cachetools, cytoolz, - fetchPypi, floret, jellyfish, joblib, - matplotlib, networkx, numpy, pyphen, - pytestCheckHook, requests, scikit-learn, scipy, spacy, tqdm, + + # optional-dependencies + matplotlib, + + # tests + pytestCheckHook, }: buildPythonPackage (finalAttrs: { @@ -56,19 +63,19 @@ buildPythonPackage (finalAttrs: { vis = [ matplotlib ]; }; + pythonImportsCheck = [ "textacy" ]; + nativeCheckInputs = [ pytestCheckHook ]; enabledTestPaths = [ # Almost all tests have to deal with downloading a dataset, only test pure tests - "tests/test_constants.py" "tests/preprocessing/test_normalize.py" - "tests/similarity/test_edits.py" - "tests/preprocessing/test_resources.py" "tests/preprocessing/test_replace.py" + "tests/preprocessing/test_resources.py" + "tests/similarity/test_edits.py" + "tests/test_constants.py" ]; - pythonImportsCheck = [ "textacy" ]; - meta = { description = "Higher-level text processing, built on spaCy"; homepage = "https://textacy.readthedocs.io/"; diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index 65e5d7e3dea4..8cb3723d372f 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -27,18 +27,33 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textnets"; version = "0.10.5"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "jboynyc"; repo = "textnets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0KBKpA4nnHxem65tZTtZcXl/EVS1ifWOXGT7a/750Gk="; }; + # tqdm 4.70.0 regression: thread_map fails on iterables without a length hint + # https://github.com/tqdm/tqdm/issues/1828 (fixed in tqdm 4.70.1) + postPatch = '' + substituteInPlace textnets/corpus.py \ + --replace-fail \ + "thread_map(nlp_ufunc, doc_chunks," \ + "thread_map(nlp_ufunc, list(doc_chunks)," + + substituteInPlace textnets/network.py \ + --replace-fail \ + "thread_map(sig_ufunc, edge_chunks," \ + "thread_map(sig_ufunc, list(edge_chunks)," + ''; + build-system = [ cython pdm-backend @@ -46,10 +61,9 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "toolz" "pandas" + "toolz" ]; - dependencies = [ igraph leidenalg @@ -64,30 +78,28 @@ buildPythonPackage rec { wasabi ]; + pythonImportsCheck = [ "textnets" ]; + nativeCheckInputs = [ en_core_web_sm pytestCheckHook ]; - disabledTests = [ - # https://github.com/jboynyc/textnets/issues/66 - "test_textnet_save_and_load" - ]; - - pythonImportsCheck = [ "textnets" ]; - - # Enable the package to find the cythonized .so files during testing. See #255262 - # Set MPLBACKEND=agg for headless matplotlib on darwin. See #350784 - preCheck = '' - rm -r textnets - export MPLBACKEND=agg - ''; + preCheck = + # Enable the package to find the cythonized .so files during testing. See #255262 + '' + rm -r textnets + '' + # Set MPLBACKEND=agg for headless matplotlib on darwin. See #350784 + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND=agg + ''; meta = { description = "Text analysis with networks"; homepage = "https://textnets.readthedocs.io"; - changelog = "https://github.com/jboynyc/textnets/blob/v${version}/HISTORY.rst"; + changelog = "https://github.com/jboynyc/textnets/blob/${finalAttrs.src.tag}/HISTORY.rst"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ jboy ]; }; -} +}) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 6e215163b6e7..8e3b55cbae07 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -105,6 +105,9 @@ buildPythonPackage (finalAttrs: { ]; dontUseCmakeConfigure = true; + pythonRelaxDeps = [ + "tensordict" + ]; dependencies = [ cloudpickle hoptorch @@ -336,6 +339,9 @@ buildPythonPackage (finalAttrs: { # AssertionError: Tensor-likes are not equal! "test/modules/test_dreamer_components.py::TestDreamerV3Components::test_discrete_actor[cpu-autocast]" + # AssertionError: Scalars are not close! (regression with tensordict 0.15) + "test/objectives/test_dreamer_v3.py::TestDreamerV3::test_dreamer_v3_reinforce_return_normalization" + # OSError: We couldn't connect to 'https://huggingface.co' to load the files,... "test/transforms/test_key_transforms.py::TestTokenizer::test_single_string_attention_mask_padding" "test/transforms/test_key_transforms.py::TestTokenizer::test_single_string_without_attention_mask" diff --git a/pkgs/development/python-modules/uploadserver/default.nix b/pkgs/development/python-modules/uploadserver/default.nix index 5c3fa9759fd6..c74917220245 100644 --- a/pkgs/development/python-modules/uploadserver/default.nix +++ b/pkgs/development/python-modules/uploadserver/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage (finalAttrs: { pname = "uploadserver"; - version = "6.0.3"; + version = "6.0.5"; pyproject = true; src = fetchFromGitHub { owner = "Densaugeo"; repo = "uploadserver"; tag = finalAttrs.version; - hash = "sha256-aG/s7C55QaAvOMFWrYKlDdjQFWljKBjal2Qe6j1/B/o="; + hash = "sha256-ZsjSjB/o2BEoTtmbNb79k5Ed4MFcvvG+SNgvJbDQudg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/validate-pyproject-schema-store/default.nix b/pkgs/development/python-modules/validate-pyproject-schema-store/default.nix index 204d01a0279d..fa0872d2b600 100644 --- a/pkgs/development/python-modules/validate-pyproject-schema-store/default.nix +++ b/pkgs/development/python-modules/validate-pyproject-schema-store/default.nix @@ -10,7 +10,7 @@ buildPythonPackage (finalAttrs: { pname = "validate-pyproject-schema-store"; - version = "2026.10.06"; + version = "2026.10.17"; pyproject = true; __structuredAttrs = true; @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { owner = "henryiii"; repo = "validate-pyproject-schema-store"; tag = finalAttrs.version; - hash = "sha256-7TvNldvCFHSz7GRh/j43Wl6WuGFi7ckouQH0wIJY32Q="; + hash = "sha256-KI3SqIVOqBfsDjR/AMNyfvhkI3HivA15LK/K1Ot1ias="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wiim/default.nix b/pkgs/development/python-modules/wiim/default.nix index dff0348279b5..2ea48e00326a 100644 --- a/pkgs/development/python-modules/wiim/default.nix +++ b/pkgs/development/python-modules/wiim/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "wiim"; - version = "0.2.0"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "Linkplay2020"; repo = "wiim"; tag = "v${finalAttrs.version}"; - hash = "sha256-/2PfVWxnTmBQ8fsLBZU00N0uqkrpiBU8/lyz36OSisw="; + hash = "sha256-jKj3676Zdx23plrjxqbACE+pIwiHlzJdLJk47EeybG8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wslink/default.nix b/pkgs/development/python-modules/wslink/default.nix index 5245d30efdda..5b9b64065d85 100644 --- a/pkgs/development/python-modules/wslink/default.nix +++ b/pkgs/development/python-modules/wslink/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "wslink"; - version = "2.5.7"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "kitware"; repo = "wslink"; tag = "v${finalAttrs.version}"; - hash = "sha256-47vHc+b5Z3ipkLZ5k0yEasNaKz0Seu2jiGBVmAI5u6U="; + hash = "sha256-4MKBnMnG8DwEaxc2KXmvZVNjYnT0JkLr1brYJLBvik4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wxpython/4.3.nix b/pkgs/development/python-modules/wxpython/4.3.nix new file mode 100644 index 000000000000..89215dd3fb92 --- /dev/null +++ b/pkgs/development/python-modules/wxpython/4.3.nix @@ -0,0 +1,123 @@ +{ + lib, + stdenv, + buildPythonPackage, + setuptools, + fetchPypi, + replaceVars, + + # build + autoPatchelfHook, + cython, + pkg-config, + python, + which, + + # runtime + cairo, + gst_all_1, + gtk3, + libGL, + libGLU, + libsm, + libxinerama, + libxtst, + libxxf86vm, + libglvnd, + libgbm, + pango, + webkitgtk_4_1, + wxwidgets_3_3, + xorgproto, + + # propagates + numpy, + pillow, + six, +}: + +buildPythonPackage (finalAttrs: { + pname = "wxpython"; + version = "4.3.2"; + pyproject = false; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-VTG6qTREiKFQgaay6utnrwR9EqgUz2V8CCNgzMNyBPs="; + }; + + patches = [ + (replaceVars ./4.2-ctypes.patch { + libgdk = "${lib.getLib gtk3}/lib/libgdk-3${stdenv.hostPlatform.extensions.sharedLibrary}"; + libpangocairo = "${lib.getLib pango}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + libcairo = "${lib.getLib cairo}/lib/libcairo${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + nativeBuildInputs = [ + cython + pkg-config + setuptools + which + wxwidgets_3_3 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = [ + wxwidgets_3_3 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + libGL + libGLU + libsm + libxinerama + libxtst + libxxf86vm + libglvnd + libgbm + webkitgtk_4_1 + xorgproto + ]; + + propagatedBuildInputs = [ + numpy + pillow + six + ]; + + buildPhase = '' + runHook preBuild + + export PATH="${wxwidgets_3_3}/bin:$PATH" + + ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx build_py + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${python.pythonOnBuildForHost.interpreter} setup.py install --skip-build --prefix=$out + wrapPythonPrograms + + runHook postInstall + ''; + + # The majority of the tests require a graphical environment. + doCheck = false; + + pythonImportsCheck = [ "wx" ]; + + meta = { + changelog = "https://github.com/wxWidgets/Phoenix/blob/wxPython-${finalAttrs.version}/CHANGES.rst"; + description = "Cross platform GUI toolkit for Python, Phoenix version"; + homepage = "http://wxpython.org/"; + license = with lib.licenses; [ + lgpl2Plus + wxWindowsException31 + ]; + }; +}) diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index f36f84862809..98bd1dcf00d8 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "xsdata"; - version = "26.2"; + version = "26.10"; pyproject = true; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; tag = "v${version}"; - hash = "sha256-h5VGXGXQSG4o8H+Q+Z0SN9rw4mFI8EORNtB+4VAKg/k="; + hash = "sha256-FsmE7Jru4iCQjEREFK9N7+0Q6UkiEg9EwN2whbBsIAA="; }; patches = [ diff --git a/pkgs/development/rocq-modules/jasmin/default.nix b/pkgs/development/rocq-modules/jasmin/default.nix index 9f60d3b5a444..e0675683dbc0 100644 --- a/pkgs/development/rocq-modules/jasmin/default.nix +++ b/pkgs/development/rocq-modules/jasmin/default.nix @@ -20,14 +20,16 @@ in with lib.versions; lib.switch coq.coq-version [ - (case (range "8.20" "9.1") "2026.03.3") + (case (range "9.0" "9.1") "2026.09.0") + (case (range "8.20" "9.1") "2026.03.4") (case (isEq "8.19") "2025.02.2") (case (isEq "8.18") "2024.07.4") ] null; releaseRev = v: "v${v}"; - release."2026.03.3".hash = "sha256-C41usqCbj/sKhWCIOdF4oVPRoqnWfIC58gyrDRnxPEw="; - release."2026.03.3".rev = "aad63329716bfc0489c2dd0cb5aaf0497ec2d324"; + release."2026.09.0".hash = "sha256-PPhfiNIp2S8kTFL/xJHOZfNrCkG6FcrYSRmcglluQtw="; + release."2026.03.4".hash = "sha256-fR3FRl2+N2XEnhplk9GnSP4LfTHZKk22O9w9slS3xe4="; + release."2026.03.3".hash = "sha256-LY3683WHT0A3pXpszGAl8tkc7fCy5RufuPBVedBk298="; release."2026.03.1".hash = "sha256-CE+WbcG0lgKvaV/OSMlTp3fG+v82X41z/w7ynsM/LLg="; release."2026.03.0".hash = "sha256-MzdVbZhXlb9JFLsf+23yJNFiGJDBJZGbX6Ox3/U1EzA="; release."2025.06.1".hash = "sha256-wEL1tN0HUa1Eb7FiQOBA6sAkuonrAMdkqq8gu9/CED0="; diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index a60cf349167c..8a81129d13ed 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -31,31 +31,31 @@ }, "42": { "hashes": { - "aarch64-darwin": "15856346793e4e7f3f2200a898473379b51eda1a7aea55c6b1a326d58750bad4", - "aarch64-linux": "94988ccf40f739495ceb010b73b69018aeac79ba24c14fd0cd40a5ba27ff8221", - "armv7l-linux": "c984aefaa4ca5b07051dd45321b03fa35b5ee530e5655143f00820894b323e10", - "headers": "01yk8qsddgpx89lggmsn0735kjkci4fqkfv300p39qm7pd4lwgs5", - "x86_64-linux": "0c8d31b8c2f2d30ffbb78cd4837e145e158971285777d67588ee2c166ecd7ed1" + "aarch64-darwin": "cfb98a981155de5673dc0fa77f12497fc12b37873b68b708f347942bc8542339", + "aarch64-linux": "d560ea831806c3bb9b10d6dfe9c0f359b1b0ca25049560ee56ed7d098b3acf2d", + "armv7l-linux": "039f4137ad1638d55d593b6dd8b7958ee728d07a4f757c9793f01bd7caae71df", + "headers": "14vvshfrkfw57xh0nlw3q0m2571ckcmzvnz9k88hd881fzqhydra", + "x86_64-linux": "e27e9ec78d12edc83c817a1454b706530c000eedd217f65aed2a5d9657ec1be0" }, - "version": "42.11.14" + "version": "42.11.16" }, "43": { "hashes": { - "aarch64-darwin": "e60ad7fb9c030ddfb5005a6bc54712bc78c2d3e760f7f010fa5b997e956aaefa", - "aarch64-linux": "79e05a363b236acc16d2fe304c0a21ea3ac48885d96b6bd572446820abe06a51", - "armv7l-linux": "6bd149bd01cd1b0274d16dd012b7e1c323d7108a1073c1ca12474b54bd1358c4", - "headers": "1dfdkm72jbxylql74i8z5lznw3zlhq2kc1qizlwvjhx16l9v46kk", - "x86_64-linux": "37342601dc246db0269487b786856044b2476e58cdd07d00a57ac155329c5130" + "aarch64-darwin": "01bb5d8756d220002ed5f8dccfb5a01391c4b919667af7156257cf5252e3e8ae", + "aarch64-linux": "9b26d2a0a526ba136d5d6a3b3fa6365c00c982480afff0aac291e2adf1641369", + "armv7l-linux": "b16f1c282118e84a09ae11f920c5635650e79d5952ac7ae7e4fa066b569ac6e7", + "headers": "1ccbjqf42rlicz3r706mwrkpjcrzcsdzn1xyd81n80fg7khsah4f", + "x86_64-linux": "7e11ff34c837de9ffcdfad2a73be1905704a6c17eb6baf5763428f20e4975a79" }, - "version": "43.7.11" + "version": "43.8.1" }, "44": { "hashes": { - "aarch64-darwin": "07d73d3d6dd0b8679c2f1849e30df179ea50c1d6b17630fcc398ae05221f0bd2", - "aarch64-linux": "f8ecb0702b6a0b10274d2c3043dddaa22da77addcab98e7e0b1e0d4f6c2d93e9", - "headers": "1qjfzgx602dpidlw8bwasi83nhq95dbyh664l5xrzikhvibc9jxx", - "x86_64-linux": "777b26a64aee3d185acb9f93c04782bb51eae7c2c61c793963ef24374e5a1539" + "aarch64-darwin": "ff597552c9c7b0b16c39a7fb93a346ee7148afbd372ebcf0c18415482c49fbea", + "aarch64-linux": "16e1f8f7993ca45bc3c2594d75da9d0f3bbd66d691f8cc408747e135c49cb1ad", + "headers": "0q32b3nnz6m4a58fbgrqb5riqz9kg1d58hkhfhq5nfs2fs2y9x13", + "x86_64-linux": "994bc3664cc3ac55b50c21a58d345cf8322003d37f5439a81801e3267e6145e2" }, - "version": "44.7.2" + "version": "44.9.1" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index edaf50e65691..68fb63250a5f 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -31,31 +31,31 @@ }, "42": { "hashes": { - "aarch64-darwin": "df600a318802e81d7072f83406d73f2962d16f1d9731f55f44c070c30c18cd18", - "aarch64-linux": "e4eb2787cc32649808173daa521bf4acc2ee3cf5d8fc55ad3f8c7f88833b0db3", - "armv7l-linux": "31ea3acd1c7074b208c624f3cf2dade480e371140747c595631216331306a046", - "headers": "01yk8qsddgpx89lggmsn0735kjkci4fqkfv300p39qm7pd4lwgs5", - "x86_64-linux": "7098681887e4641a8f04011a36c4d8e7e11792f42f3bc66979feb7e657c341e5" + "aarch64-darwin": "89de4381fc62676f31c2b2e0eec7fbb060430b232305e8dfce42f7f4c63da176", + "aarch64-linux": "1f46fc8fe5a6e17320068678c7bd27bbcaa66d747228147e85c9464d7bb1f6b4", + "armv7l-linux": "4ad2e1f1bbb5b27236c5ebd6c5af432655e54fef5befcd288f81ab719cdbb5d1", + "headers": "14vvshfrkfw57xh0nlw3q0m2571ckcmzvnz9k88hd881fzqhydra", + "x86_64-linux": "f799ea1905b3605455a5536461ca7b0f031226f07a19d2c353cab6c826b645aa" }, - "version": "42.11.14" + "version": "42.11.16" }, "43": { "hashes": { - "aarch64-darwin": "0f4e43230f281c9518938f884dca652dfcd850b5c0950faccba83df46ec5c7bf", - "aarch64-linux": "c69df6e8fbb8fd545d96a33d47aec4087c01b57553cf9b08f42deac2abbd12e6", - "armv7l-linux": "6f05b0693ba85ecd7910bbdc9e912dbdb6c4b4b060cf0ad0ecd8b7abd560f168", - "headers": "1dfdkm72jbxylql74i8z5lznw3zlhq2kc1qizlwvjhx16l9v46kk", - "x86_64-linux": "2155508082d3749e924d83b649f46630c26268da0a87ed24996728d63c6646f5" + "aarch64-darwin": "dea2daea9e514a0680698d5288d7daac0e4764b2c65c87ea6a9722aedb9732b7", + "aarch64-linux": "c8cdc3586c831bc8f5aeefae3090038081612d4e70fd726f4af8c56d850cf3c8", + "armv7l-linux": "85a5fe769f08264a83d07165b169752b20194028a73706da78988713b563b0d7", + "headers": "1ccbjqf42rlicz3r706mwrkpjcrzcsdzn1xyd81n80fg7khsah4f", + "x86_64-linux": "db0e18ecf429a7098ef294031062b8449889811f52cf6fcfc1aed87c41ac7326" }, - "version": "43.7.11" + "version": "43.8.1" }, "44": { "hashes": { - "aarch64-darwin": "0b72483b23183ac8dd9193125d06044e999f3923f8143ff7683323cea1997040", - "aarch64-linux": "62127c18c542649d9052ff3205968cb0621c2da253715138737edcfcbf5c31d9", - "headers": "1qjfzgx602dpidlw8bwasi83nhq95dbyh664l5xrzikhvibc9jxx", - "x86_64-linux": "92e9fa4f3baf56373a2e6406113f5b478cd4c384c2c6c38d62bd5cf39d4c7e17" + "aarch64-darwin": "3b928b2851ad1ee21bf72401b3a161e826389408985c7256324781dad33b54cf", + "aarch64-linux": "e4ea521e6bce3ad75b19a34410be77ef6cca64238e95cc33569140f479f19610", + "headers": "0q32b3nnz6m4a58fbgrqb5riqz9kg1d58hkhfhq5nfs2fs2y9x13", + "x86_64-linux": "7c5c922b537706112fc12c89eba41212ca59a7b44660102f2819139ed09f1c6e" }, - "version": "44.7.2" + "version": "44.9.1" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 7e9c808241e7..f45762d33d38 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-P/zoInRtKQXlzPkyu+f4LW5rgIp/5VTY7yaQB5Jo8Ag=", + "hash": "sha256-icL2WMnoN+UKhm8Z5jS7YbmHIgybszNx9EhvPd4GUTE=", "owner": "electron", "repo": "electron", - "tag": "v42.11.14" + "tag": "v42.11.16" }, "fetcher": "fetchFromGitHub" }, @@ -1367,7 +1367,7 @@ } }, "electron_yarn_data": { - "hash": "sha256-EIdGb0MAZeYelJujwLvjFIRjvuayq5qBu8eAfCQSG0Q=", + "hash": "sha256-i4bos0RAZ67kAnmqBahpZX9FmLADVnuz3p/+EFo2CVk=", "missing_hashes": { "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", @@ -1437,7 +1437,7 @@ }, "modules": "146", "node": "24.19.0", - "version": "42.11.14" + "version": "42.11.16" }, "43": { "chrome": "150.0.7871.250", @@ -1504,10 +1504,10 @@ }, "src/electron": { "args": { - "hash": "sha256-tB4xqttVDCRSxP1jnAXCWKWtVSrVXc+ml2FvzdJns0o=", + "hash": "sha256-+DQQS9WzQ6U/4XVslYfaYLP13d/ouHF6pVPLzeKcUfg=", "owner": "electron", "repo": "electron", - "tag": "v43.7.11" + "tag": "v43.8.1" }, "fetcher": "fetchFromGitHub" }, @@ -1849,10 +1849,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-D0Emw+F+8fz41onhxfiCQuxEQx+4jjsT7Ym2mqrKkRI=", + "hash": "sha256-055FP6A2CjODxhrh2R4csRsiTNOIsxnuC9zWjTP9U34=", "owner": "nodejs", "repo": "node", - "tag": "v24.21.0" + "tag": "v24.22.0" }, "fetcher": "fetchFromGitHub" }, @@ -1864,15 +1864,6 @@ }, "fetcher": "fetchFromGitiles" }, - "src/third_party/engflow-reclient-configs": { - "args": { - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "fetcher": "fetchFromGitHub" - }, "src/third_party/expat/src": { "args": { "hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU=", @@ -2823,7 +2814,7 @@ } }, "electron_yarn_data": { - "hash": "sha256-8r0r7WXrM4HlS2qKMHbyxS+4zet646JKjTEtSyCTqqs=", + "hash": "sha256-s6iBBgvQvvPN97/pSoHrZZcAyE4dWOmYtAT5Z5cQ9d8=", "missing_hashes": { "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", @@ -2892,11 +2883,11 @@ } }, "modules": "148", - "node": "24.21.0", - "version": "43.7.11" + "node": "24.22.0", + "version": "43.8.1" }, "44": { - "chrome": "152.0.7977.149", + "chrome": "152.0.7977.167", "chromium": { "deps": { "gn": { @@ -2905,15 +2896,15 @@ "version": "0-unstable-2026-07-23" } }, - "version": "152.0.7977.149" + "version": "152.0.7977.167" }, "chromium_npm_hash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=", "deps": { "src": { "args": { - "hash": "sha256-hGjd8i2ESBREWG5lekdtEK5CVFjxT3Po7NRG1PvD3xM=", + "hash": "sha256-DzIhUc7a9USmm8MCUgkDcLtb5GRs7eKzT4FlsZADmJU=", "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "152.0.7977.149", + "tag": "152.0.7977.167", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2960,10 +2951,10 @@ }, "src/electron": { "args": { - "hash": "sha256-HkV7zfjl6BbMVowgNBtHl8DZVVSgSMjQFOn37qPxA60=", + "hash": "sha256-fBhtdMzhspUyXDxIU9ylkand7skyqi49DgMSLDnxtG4=", "owner": "electron", "repo": "electron", - "tag": "v44.7.2" + "tag": "v44.9.1" }, "fetcher": "fetchFromGitHub" }, @@ -2993,8 +2984,8 @@ }, "src/third_party/angle": { "args": { - "hash": "sha256-YRPVefAR1xcqWJApIYb9ynGfwTtoRhhj6a6GpSIVykM=", - "rev": "6c47c4b6dae794245a23a16b3826efc09ebdefd0", + "hash": "sha256-RGAZFJh5IM1NYRqOPAvEX9MnA9lTTXS2ZEDPcvc7DNw=", + "rev": "4f2e7d39252ed0e8387ebee1b222d4715f2dea7d", "url": "https://chromium.googlesource.com/angle/angle.git" }, "fetcher": "fetchFromGitiles" @@ -3137,8 +3128,8 @@ }, "src/third_party/crabbyavif/src": { "args": { - "hash": "sha256-N9YwO68d3CXPje43fWs9CoO5Sc3wIULta7n8cp+2Efs=", - "rev": "61f5abadda7b179f90e557fed6ae7a3d78bd8231", + "hash": "sha256-D5cYECQYGfDn4ubl9yhpK3XGq1vjzOZI5tOV8s67SuQ=", + "rev": "05103ee49f6dc58dfbbaf24286dcedacffb26d6d", "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" }, "fetcher": "fetchFromGitiles" @@ -3313,10 +3304,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-D0Emw+F+8fz41onhxfiCQuxEQx+4jjsT7Ym2mqrKkRI=", + "hash": "sha256-055FP6A2CjODxhrh2R4csRsiTNOIsxnuC9zWjTP9U34=", "owner": "nodejs", "repo": "node", - "tag": "v24.21.0" + "tag": "v24.22.0" }, "fetcher": "fetchFromGitHub" }, @@ -3328,15 +3319,6 @@ }, "fetcher": "fetchFromGitiles" }, - "src/third_party/engflow-reclient-configs": { - "args": { - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "fetcher": "fetchFromGitHub" - }, "src/third_party/expat/src": { "args": { "hash": "sha256-WAxyD34gYgQzu+t4BFaG9cktulKFsM6V+XYi8x+h9ls=", @@ -3860,8 +3842,8 @@ }, "src/third_party/pdfium": { "args": { - "hash": "sha256-4OhJcWZJ3UC/Mf4DJNzLLYQtrw0y0suO/wy0d1GYP4w=", - "rev": "8f3e90282ef137adf7d380079c3178b24407104a", + "hash": "sha256-X30F4eqkkY5mttzA0yKwMX/rpbrFiZDc5iigg82PrTM=", + "rev": "23f70fdae651eff9740ef8c0eb31158029314f84", "url": "https://pdfium.googlesource.com/pdfium.git" }, "fetcher": "fetchFromGitiles" @@ -3972,8 +3954,8 @@ }, "src/third_party/skia": { "args": { - "hash": "sha256-eXQ9FXOKVzVpXjDUFdkO4e3YRcgSHDszbM2nsZDHTXw=", - "rev": "f593e0fb883333745ab2c8568c1449a60904b244", + "hash": "sha256-GH1yObHvyEH2rgVMRJKEG00NON1WLX8dW2w5TPf05M4=", + "rev": "747cf654ed6f864f4402e7d6eb54a6ede60141e5", "url": "https://skia.googlesource.com/skia.git" }, "fetcher": "fetchFromGitiles" @@ -4264,8 +4246,8 @@ }, "src/third_party/webrtc": { "args": { - "hash": "sha256-c0h6bD8zNZbacnOgRei+yVB+5+AvfglW+eQDNZU945M=", - "rev": "6f37672d358475cd17544121a12494da454d85fb", + "hash": "sha256-SNuTzeMeu5hF6SQWDI4Y9tgbDifiPpcAlmycLko3P00=", + "rev": "e1991d7f7bd00eaa701dcdd8d6786b746c623c30", "url": "https://webrtc.googlesource.com/src.git" }, "fetcher": "fetchFromGitiles" @@ -4304,15 +4286,15 @@ }, "src/v8": { "args": { - "hash": "sha256-Oohc8euPVyridd0SMjRd8vdsIJgrzfSYfN9LM/dtT3Y=", - "rev": "55f2189ccf587e664e289e900d8ed99dfff2acfa", + "hash": "sha256-cv8pAZxlSuLLCQEfVc7+/mkco8PZQqS/smSpa8VAsMo=", + "rev": "a11d960c1c22c067ff898ceb4a8e4e0687014d41", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" } }, "electron_yarn_data": { - "hash": "sha256-o40KUJ1YYQ9ImompIMsovGQT3kuXDKJyfZHW/k7+8mE=", + "hash": "sha256-uPMmYNUPFw7LC/MUr6duZYjVgcaJ2Q5DN6qO+iCqXao=", "missing_hashes": { "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "42c08d87ce491086843070241f8777fa2cb968f4a08f67b3f6c33a8f67e0b3eac50eae146daede743e90e3bc32326951c5188814eea02e9c3e4a9764a4b492ba", "@oxfmt/binding-android-arm64@npm:0.42.0": "73e6609498d05c655c6a435af9f3e4f341137c260c7ae27fbb0377573574ca5200bd9f187aa90d442879733bbd0c4e91ae023c3b4579c9a57413a0b2922c023a", @@ -4381,7 +4363,7 @@ } }, "modules": "149", - "node": "24.21.0", - "version": "44.7.2" + "node": "24.22.0", + "version": "44.9.1" } } diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index 30416a828ad9..21203d65725a 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -101,6 +101,7 @@ let harfbuzz-raster = harfbuzz.override { withRaster = lib.versionAtLeast version "4.7"; + withVector = lib.versionAtLeast version "4.7"; withCairo = lib.versionAtLeast version "4.7"; }; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index f7bba392c411..283d94fe9f8d 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation ( in { - version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.05.02" else "7.14"; + version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.05.03" else "7.14"; pname = "ocaml${ocaml.version}-camlp5"; @@ -36,7 +36,7 @@ stdenv.mkDerivation ( "rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; hash = { - "8.05.02" = "sha256-OnTc4Vpr2I3sFwm5JYxud9z1hbzDvQw3LNsO/EHa3k8="; + "8.05.03" = "sha256-NzlNX5AYP/BgDowQj65aZUlGrJACrV05GUUIblxRdu0="; "8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o="; "7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU="; } diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 7b91e0517790..f054352b1a60 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -48,6 +48,9 @@ buildDunePackage (finalAttrs: { hash = "sha256-A0es0mk6aEMdKvweVfffkaezfgIi1DWAr3dLmNwGOTo="; }; + # Compatibility with opam-format 2.6 + patches = [ ./opam-2_6.patch ]; + nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; buildInputs = [ curly diff --git a/pkgs/development/tools/ocaml/dune-release/opam-2_6.patch b/pkgs/development/tools/ocaml/dune-release/opam-2_6.patch new file mode 100644 index 000000000000..c21b43d277bd --- /dev/null +++ b/pkgs/development/tools/ocaml/dune-release/opam-2_6.patch @@ -0,0 +1,14 @@ +diff --git a/bin/opam.ml b/bin/opam.ml +index 8ddcfed..d39912d 100644 +--- a/bin/opam.ml ++++ b/bin/opam.ml +@@ -49,7 +49,8 @@ let write_opam_file ~dry_run ~id ~url ~opam_f pkg dest_opam_file = + opam_f v); + Pkg.opam_descr pkg >>= fun descr -> + let descr = +- OpamFile.Descr.read_from_string (Opam.Descr.to_string descr) ++ OpamFile.Descr_legacy.read_from_string (Opam.Descr.to_string descr) ++ |> OpamFile.Descr.of_legacy + in + let opam = + Opam_file.upgrade ~filename ~url ~id opam_t ~version:(`V1 descr) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b0e3a16411f8..7d7c2ec1170a 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -11,15 +11,13 @@ bubblewrap, }: -assert lib.versionAtLeast ocaml.version "4.08.0"; - stdenv.mkDerivation (finalAttrs: { pname = "opam"; - version = "2.5.2"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/ocaml/opam/releases/download/${finalAttrs.version}/opam-full-${finalAttrs.version}.tar.gz"; - hash = "sha256-s2I4CVZ/Ge1rXWebjHu8C97JQYv/Sodf8HmdRG2FVcM="; + hash = "sha256-67r/pBkuadYS0sGl/FoVsycwMi1+NLxEVq1AdruYcAc="; }; strictDeps = true; diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 17ef99ff0ea5..714ee5eafdf4 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -4,6 +4,7 @@ zig_0_14, zig_0_15, zig_0_16, + zig_0_17, fetchFromGitHub, callPackage, }: @@ -84,4 +85,20 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) nativeBuildInputs = [ zig_0_16 ]; }; + + zls_0_17 = finalAttrs: { + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "zigtools"; + repo = "zls"; + tag = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-T9M+HveJagHY6EMvwpwlF9TrxmliefkuZ0NZ5Z1Ar90="; + }; + + deps = callPackage ./deps_0_17.nix { }; + + nativeBuildInputs = [ zig_0_17 ]; + }; } diff --git a/pkgs/development/tools/zls/deps_0_17.nix b/pkgs/development/tools/zls/deps_0_17.nix new file mode 100644 index 000000000000..c2466dacdf6d --- /dev/null +++ b/pkgs/development/tools/zls/deps_0_17.nix @@ -0,0 +1,25 @@ +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "known_folders-0.0.0-Fy-PJiDLAAB98m3uYUzatrTb2mO2fpvwx2zpSroEtfbO"; + path = fetchzip { + url = "https://github.com/ziglibs/known-folders/archive/6da0d0c41b78b9ed2d34fa364fcb81b5ebece6c4.tar.gz"; + hash = "sha256-F17Ivvsyyla2CBIh+kImc1O3AtD2yTDAGamzMVbVzuw="; + }; + } + { + name = "diffz-0.0.1-G2tlISvOAQDORzPTSxDgiKwlHuADKeJMdJrw4kRfLufj"; + path = fetchzip { + url = "https://github.com/ziglibs/diffz/archive/aac8aa99c436ab8277b0711922aad062c0167b12.tar.gz"; + hash = "sha256-GQ4iCZSSpVvdDQteoi02keLSqSoDOSQPH8eihum++Z0="; + }; + } + { + name = "lsp_kit-0.1.0-bi_PL9o2DADHS1PDra3MGz1MXnsboN_ewNvrc419z7Fb"; + path = fetchzip { + url = "https://github.com/zigtools/lsp-kit/archive/3e1058db66079911fdde82f833fdce6856e0a706.tar.gz"; + hash = "sha256-vsTBPP9Rf7xoVyGyi3+j9a03mLqU/gwrdDKIpFTH2v0="; + }; + } +] diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index acfed3b8beb2..8249be21aa1d 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,367 +1,367 @@ { "aurorae": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/aurorae-6.8.0.tar.xz", - "hash": "sha256-sBLjiU6xz+jLC/IOy0iqwYzWVTWZQaU4f1IeO7naK5E=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/aurorae-6.8.1.tar.xz", + "hash": "sha256-P/1jge9fLrtAAZcLoK56Nllt2uc4P6PMGZ+UMOcu8oE=" }, "bluedevil": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/bluedevil-6.8.0.tar.xz", - "hash": "sha256-Is+AubHrbhA5xkad2j9pMoM/GS9ATUt+ffR/GFQgCi8=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/bluedevil-6.8.1.tar.xz", + "hash": "sha256-bB8kI5Px2y5H/xKoWyBws+iikrVNMHG23yDajzmr0Gg=" }, "breeze": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/breeze-6.8.0.tar.xz", - "hash": "sha256-a9sFRxJsoln4i7KIaEIjZMbgrj57EDR5+sDfg1/94oc=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/breeze-6.8.1.tar.xz", + "hash": "sha256-tApjyyl/qm0PsuXxJ11m8Q+GivkyfvT+xpN++X9MGSQ=" }, "breeze-grub": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/breeze-grub-6.8.0.tar.xz", - "hash": "sha256-7BI4I9DcU6cWenEPJyLP2isdvE+bYH2V1tTYEM0qrLw=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/breeze-grub-6.8.1.tar.xz", + "hash": "sha256-9Nd4poxQl2z9nhiL7Gq9BFSXeLvzAtKZkcjpZnhkhNo=" }, "breeze-gtk": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/breeze-gtk-6.8.0.tar.xz", - "hash": "sha256-YgRrlTjlQqNoLhlaw0CWBcuqFvA//HjRt3Fd4qHiQJw=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/breeze-gtk-6.8.1.tar.xz", + "hash": "sha256-VSzQ7MNX6kfRkO1pEJO/MpYnlf66mkyOmT+vDdHIBVc=" }, "breeze-plymouth": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/breeze-plymouth-6.8.0.tar.xz", - "hash": "sha256-BlT1UPrVZX1PzP+c/Y10qQjfl8WUw+FmCmK6INE/c0w=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/breeze-plymouth-6.8.1.tar.xz", + "hash": "sha256-PEHlimBJrlVH6DhiDMonnr4Kcnc+7npIJ+JlDY9R3+U=" }, "discover": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/discover-6.8.0.tar.xz", - "hash": "sha256-239FU4Uub7vK9Un8d/wsCFbl5yF3Rczxq4tHPh1a1uQ=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/discover-6.8.1.tar.xz", + "hash": "sha256-jiySAE3uaWoI2q+yY2LIRGj6LlqB/N86YsiKwqonqKc=" }, "drkonqi": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/drkonqi-6.8.0.tar.xz", - "hash": "sha256-J6QdxBgd86CvUyKWFUFpLYAgurgpRidtq1f5JGY8768=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/drkonqi-6.8.1.tar.xz", + "hash": "sha256-1/Sp0RbV9kkDUqmcebXVcAMIQvS4fjmu6zDmljSQVOM=" }, "flatpak-kcm": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/flatpak-kcm-6.8.0.tar.xz", - "hash": "sha256-yc1Kw12j/LMdMhDMO2QcqqjMMkq7nZVxQ3rsrWrJJXU=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/flatpak-kcm-6.8.1.tar.xz", + "hash": "sha256-CF9UW0dXG00L1vbxW3hACqzpLU6HEYZGgQt0zAQwLRM=" }, "kactivitymanagerd": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kactivitymanagerd-6.8.0.tar.xz", - "hash": "sha256-PqFfPOY8vnSyBvW17JY7CIpkB8eYjiL1VElMj41Yc/A=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kactivitymanagerd-6.8.1.tar.xz", + "hash": "sha256-SccHQ7KTduppgYBI0syPiujLLeqq3b0AP783xydeCtI=" }, "kde-cli-tools": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kde-cli-tools-6.8.0.tar.xz", - "hash": "sha256-CxlIRs1zh4IEiupoNA15Ee46Gyumj2yFOtfApJAIieY=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kde-cli-tools-6.8.1.tar.xz", + "hash": "sha256-5IB5SFXEy/xik1Lc+E4VVhAEzHOsW5YkZyVpUgn36Cg=" }, "kde-gtk-config": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kde-gtk-config-6.8.0.tar.xz", - "hash": "sha256-tJVlgV74hyiIFpF54RDuzcUtip1cn0eFuAtRwMDFB3w=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kde-gtk-config-6.8.1.tar.xz", + "hash": "sha256-ByxeheJs6lexNoPnJBM7aIb0lH/OKfZd7Ez1a71Z9Nc=" }, "kdecoration": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kdecoration-6.8.0.tar.xz", - "hash": "sha256-OdRsSV4JTvcMvNL1H62vXZb658NfPaY/McY4pDkSz3g=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kdecoration-6.8.1.tar.xz", + "hash": "sha256-LsIIX0pGxtsZ/x860bq3uVRTeK86G+mmghaBAaHwTiU=" }, "kdeplasma-addons": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kdeplasma-addons-6.8.0.tar.xz", - "hash": "sha256-+NYAD7TLDOfxcr2b/k29R2MgC3HzbIfDkAUYkHWvdIY=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kdeplasma-addons-6.8.1.tar.xz", + "hash": "sha256-uFD5o9Bx5OSgKBT/cx2WgYWAEIraNvBcBTMYW9DPb/U=" }, "kglobalacceld": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kglobalacceld-6.8.0.tar.xz", - "hash": "sha256-Ama756LODH+Fml59FR3xjtzVu2v7EWgfMr+C5YOyCc0=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kglobalacceld-6.8.1.tar.xz", + "hash": "sha256-M8oGrvsX7mYygv5gptLXIR1YMlFdHwpDh6d4WL2t8hk=" }, "kinfocenter": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kinfocenter-6.8.0.tar.xz", - "hash": "sha256-VsozQooUx5Y+db4cOQJeYrcCU7Dg/cUAByo435QRp2E=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kinfocenter-6.8.1.tar.xz", + "hash": "sha256-wcX6jdmgPyr3dJNQdq8jAYSfMVrIQwkBbUec9qZU8Ds=" }, "kmenuedit": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kmenuedit-6.8.0.tar.xz", - "hash": "sha256-EVjips/dgUXpk+YF2Si+rlbXrDbo257DkPNTw2Mcd34=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kmenuedit-6.8.1.tar.xz", + "hash": "sha256-0XuxakbcZuapmOdKzTi028PRMXs9/cShyqFITzUg9Vw=" }, "knighttime": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/knighttime-6.8.0.tar.xz", - "hash": "sha256-66E0N9XMdp5di39Paap9C67gFu6cosjVOfwGOt+ZByo=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/knighttime-6.8.1.tar.xz", + "hash": "sha256-1sXU2sTHyb94Edrnm3tq2Za3vsm2iMS/zwHx/+XGBHo=" }, "kpipewire": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kpipewire-6.8.0.tar.xz", - "hash": "sha256-ydqPxSFuvUX4YDNb/PnaNrtguj7JQW6/kyIXXbMKJWA=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kpipewire-6.8.1.tar.xz", + "hash": "sha256-5RUzlJH5VRp9i94RndVDRbZIRF2XQNJPNxq+X31Bl90=" }, "krdp": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/krdp-6.8.0.tar.xz", - "hash": "sha256-oID3lvTpGWPpE3CO4U9D1t6xWP6cy4ZHaZSgxlMsz7Q=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/krdp-6.8.1.tar.xz", + "hash": "sha256-MsM1HKOWqhWAGWGk22KitFLzW6uKkfsMhizpnU0dSiM=" }, "kscreen": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kscreen-6.8.0.tar.xz", - "hash": "sha256-LAocguWwUN4cyp7B4CTdCdjrN9wbGKbUtZEk4uTKK8g=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kscreen-6.8.1.tar.xz", + "hash": "sha256-NAK3kWhTuxlM/q/yiGISbfBjDbVlEUPht8d/OGHTECw=" }, "kscreenlocker": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kscreenlocker-6.8.0.tar.xz", - "hash": "sha256-rsK050HYtqaYU/scsO/WoOn00qDrFPI3EpGAlqBt708=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kscreenlocker-6.8.1.tar.xz", + "hash": "sha256-ZmI3AJGlx4QntiB8q35Hdi08rnW3ZGrWjQbzBcEwCkU=" }, "ksshaskpass": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/ksshaskpass-6.8.0.tar.xz", - "hash": "sha256-PTglTk6YLqkS4tzVmeGfIH6uD400v9sbdwmAsBaObx8=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/ksshaskpass-6.8.1.tar.xz", + "hash": "sha256-q7w60QzRzevv0gva2HIkt9wwXAm4hjtukMbIOL88MSI=" }, "ksystemstats": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/ksystemstats-6.8.0.tar.xz", - "hash": "sha256-dZ5gRhjmDXRgjSZ/hlzORGfbQdbVjLDIImBgBmoV0N4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/ksystemstats-6.8.1.tar.xz", + "hash": "sha256-1QnnlyPAUM/cxw1015e1AZuNYykEXIMv/HQJQH/wTgM=" }, "kup": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kup-6.8.0.tar.xz", - "hash": "sha256-CHmo7bO+ytNGE9uNdcuFTK9EpgUaU7z6TR+1nQ9RDVw=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kup-6.8.1.tar.xz", + "hash": "sha256-hnSDNhcgs4n6nUIZ53/VFIYVfh/UEFh6hqtYsYBgenc=" }, "kwallet-pam": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kwallet-pam-6.8.0.tar.xz", - "hash": "sha256-nPgw6e5mL41QD18xT4tjlBXZF8HPvrfBUhrAkykuQQ4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kwallet-pam-6.8.1.tar.xz", + "hash": "sha256-ifgjPJ0tl5PBRsrCtex944q14zdrkI+cDdcMvnCsIhc=" }, "kwayland": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kwayland-6.8.0.tar.xz", - "hash": "sha256-QOQKHiMjnsjC1m3yhqa+c67Tbr95eiszgS47oH3kGrU=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kwayland-6.8.1.tar.xz", + "hash": "sha256-ymX95EpIHqPhRV6xTF9N1mUmepJWcxlJiKs5/PSumPk=" }, "kwayland-integration": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kwayland-integration-6.8.0.tar.xz", - "hash": "sha256-N3aaqbzUeqBKUQy88NUXAQ/bsXweH3B925Aoc6F/iQM=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kwayland-integration-6.8.1.tar.xz", + "hash": "sha256-8FDYDvzdvAOs9h3/BOcfGgaL3fqt9tgoli/Fo9zFzqo=" }, "kwin": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kwin-6.8.0.tar.xz", - "hash": "sha256-S/rzHimo+f3yMdw7u5sJsM4Hyun+56Ac/IZCXs55Ylg=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kwin-6.8.1.tar.xz", + "hash": "sha256-89cl+BBhwbqX/e+K6yEBpcXgPHfxHpoquqHf7USJ07Y=" }, "kwrited": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/kwrited-6.8.0.tar.xz", - "hash": "sha256-1IdwulO0Fxw6ZUfv5ubkpPXE7C2IfIQ2lTKr6JMZufI=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/kwrited-6.8.1.tar.xz", + "hash": "sha256-mz6MUrM8Wbzq8RxhZGYnVyvUr3YBmH7UHwc5UnZPAnA=" }, "layer-shell-qt": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/layer-shell-qt-6.8.0.tar.xz", - "hash": "sha256-kc7VYYYvDYSDatSuXDSRS7UyV2yIYHuvTsLJV7iVtB0=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/layer-shell-qt-6.8.1.tar.xz", + "hash": "sha256-yBQaxkb7iuDzTknEwdAFG5qQrlvXrx70WFOU2J9StQ4=" }, "libkscreen": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/libkscreen-6.8.0.tar.xz", - "hash": "sha256-CaMCQq0CeXgzP0dzrmQB+aZmxtv4D6JfdMi+LersuUk=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/libkscreen-6.8.1.tar.xz", + "hash": "sha256-CB45vH+3sLiUpx3BWJeiAirQ+LeKjhvsFjzVZvpnEvs=" }, "libksysguard": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/libksysguard-6.8.0.tar.xz", - "hash": "sha256-dC+g8Kk0ROYvpPshkG0jcWuGPx1GCwpKgu8fWAJdBbo=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/libksysguard-6.8.1.tar.xz", + "hash": "sha256-3dFEMIaXHiiY76il8c37BsZ7Q/lU7F1BrhfJpy/qcbM=" }, "libplasma": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/libplasma-6.8.0.tar.xz", - "hash": "sha256-tUffEU6llSYLPGyLBZNco4nwgoQmddksOFnyVR8U3Hc=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/libplasma-6.8.1.tar.xz", + "hash": "sha256-xP6tFpYfjwHr/Uk5ThqZpyG2NPa+9dA3WphXKJBs3cM=" }, "milou": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/milou-6.8.0.tar.xz", - "hash": "sha256-BzjISMpI2Q9S1Byeg3FoZBXm9H/4z5X7TBTepJlly0A=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/milou-6.8.1.tar.xz", + "hash": "sha256-UC1r1uS8qlhrZi7PYTVaweoD9kPHcrzLz+gcjhRXdx8=" }, "ocean-sound-theme": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/ocean-sound-theme-6.8.0.tar.xz", - "hash": "sha256-3V5dJU+qkAVOLMPpMl24ICqWXCRZKSHVL2jNX8o3Gk4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/ocean-sound-theme-6.8.1.tar.xz", + "hash": "sha256-pRV81DFAZyhrVNZKDrJgsISwffWNzU3tmJPOPAWq/DQ=" }, "oxygen": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/oxygen-6.8.0.tar.xz", - "hash": "sha256-43MCpyGc+t/bRir1mSrrB/0wrjlqXMbpqPGg4K4mgTY=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/oxygen-6.8.1.tar.xz", + "hash": "sha256-ieMC+hdO2v/j9AEuE9mfzw7Kq6B2ASm4fXRyFLSfysE=" }, "oxygen-sounds": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/oxygen-sounds-6.8.0.tar.xz", - "hash": "sha256-dhYKOmPPYVuE6as1S9F1KovaLwC0A8WLDlHeZcus7kY=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/oxygen-sounds-6.8.1.tar.xz", + "hash": "sha256-7vTOvd3FB1Pg6qfkCbBR2nDYgEdEuX4bEt3Oj9q3leU=" }, "plasma-activities": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-activities-6.8.0.tar.xz", - "hash": "sha256-MrRulOMDf0JgYYfUKWT7hBABQQigHSna6/FKGqY3UEM=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-activities-6.8.1.tar.xz", + "hash": "sha256-aUGe3dtvDt9HY8otzkpfyqlu22FivK/yVTcpmN1ZHCg=" }, "plasma-activities-stats": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-activities-stats-6.8.0.tar.xz", - "hash": "sha256-arGJBG2bvkTEyKS7fq8vlZPAxpKqF9Dj6CB6f2WM7Ww=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-activities-stats-6.8.1.tar.xz", + "hash": "sha256-VhwNKPTtPVNM+U+tDGIVnVVr86TtI5YoS+BvE9yAKQc=" }, "plasma-bigscreen": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-bigscreen-6.8.0.tar.xz", - "hash": "sha256-uThWEPkPGboJhvxQFl0ESdyAK8A2qVfY3VA6bf4eRm4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-bigscreen-6.8.1.tar.xz", + "hash": "sha256-pGTuq36ex9RxuvNwUoBrGFWt+qoxhZ3UfKBIZBIFvIo=" }, "plasma-browser-integration": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-browser-integration-6.8.0.tar.xz", - "hash": "sha256-rFRrnMyQiUv3CbqjC3Oi4QygVoEcVdiuiBucWZoi23E=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-browser-integration-6.8.1.tar.xz", + "hash": "sha256-L7Rf4uhMLuEsgbE/2d9JEUxWWmI1nDXjNgu9OiEqQ+o=" }, "plasma-desktop": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-desktop-6.8.0.tar.xz", - "hash": "sha256-YnLsOdn0Zhyo0EOjPC+3HMB5acmikFWRJrK+0QcTQ6o=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-desktop-6.8.1.tar.xz", + "hash": "sha256-EtK45EYm9ZuWAu4Vsr2EcDOGbkpBS59NiBmZSzXY9m8=" }, "plasma-dialer": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-dialer-6.8.0.tar.xz", - "hash": "sha256-zeOR4ml6HYGswzidyh4JNzGUdrxZ4Me24XnkC9S6bi4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-dialer-6.8.1.tar.xz", + "hash": "sha256-nImbBGZc4GkmO86GBZbHua3bhfRq3dW5CoWkEtP9iLE=" }, "plasma-disks": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-disks-6.8.0.tar.xz", - "hash": "sha256-A/bgLdwwSwrudMpCrmA5qA+6USEQOaVcg5YyBByYzNM=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-disks-6.8.1.tar.xz", + "hash": "sha256-tKrwxKeo4jAFi4cGUrc8AWRR9skC/xnRfvXW5WrAhoc=" }, "plasma-firewall": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-firewall-6.8.0.tar.xz", - "hash": "sha256-c0xOAIwCBAX8iJ0+TdBWyjftWnu+5TxiZUTH9OkIkDA=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-firewall-6.8.1.tar.xz", + "hash": "sha256-6953CaXfbNHbIMV6UDIDtw053LC9v14qn7Rt89SuPF8=" }, "plasma-integration": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-integration-6.8.0.tar.xz", - "hash": "sha256-EhsLyIBZ9hxFQV2rEu/70kWltbub6IVmA/NSw/k6mts=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-integration-6.8.1.tar.xz", + "hash": "sha256-zXPp6KmXEB2p5XIFmkMPyylroO9q2+8rK9hjzxJjmwE=" }, "plasma-keyboard": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-keyboard-6.8.0.tar.xz", - "hash": "sha256-e9FP5byTC4nKBhw0+rRM4VY4p8h0ZqpFsbq54NUEPGo=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-keyboard-6.8.1.tar.xz", + "hash": "sha256-Wh7NPpc3svXS7M1tQOa5DYSZBblxlawRtyyWHI+CRwA=" }, "plasma-login-manager": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-login-manager-6.8.0.tar.xz", - "hash": "sha256-aegp9J/fQKagIMfV2GA+tQoc12/riMdwzwYR94ydmBg=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-login-manager-6.8.1.tar.xz", + "hash": "sha256-ySKBRtJoeKLSNq5vw0YOByLPTWK/ht33rh1QEcjX19c=" }, "plasma-mobile": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-mobile-6.8.0.tar.xz", - "hash": "sha256-gyNSWkDI56P7+fsAK8llViftU80wI5H77l1UPbTzkK8=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-mobile-6.8.1.tar.xz", + "hash": "sha256-mz+vVrnBw/GgP0qBcoVcMw8UdIWNmU9FbaY17bEdXus=" }, "plasma-nano": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-nano-6.8.0.tar.xz", - "hash": "sha256-i0qOPQcYS/I5mRJ0oBnI5PA+79s3RoTTnwQ4J+vMrlg=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-nano-6.8.1.tar.xz", + "hash": "sha256-3IYNfgcEBQHqx+GTZb4WzsnwVjCLFEBAUhO7wUwyuuI=" }, "plasma-nm": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-nm-6.8.0.tar.xz", - "hash": "sha256-Wn+a6UkgV55eruYBMjulcj98xjheGJrlcdxsklIRcow=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-nm-6.8.1.tar.xz", + "hash": "sha256-HMal/7NdjxG+L/To9MVY3gdBAIif7LAEwH7reMoWmkw=" }, "plasma-pa": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-pa-6.8.0.tar.xz", - "hash": "sha256-7xWm0LL/l7E72C82ll6NJlpEOOm2hVR2dP+nLiFgzKQ=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-pa-6.8.1.tar.xz", + "hash": "sha256-9IC+/tPz0RwTJnOgI3k9nkP6z+AMJkTJ9jjFj+qPfWY=" }, "plasma-sdk": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-sdk-6.8.0.tar.xz", - "hash": "sha256-3IqgmXqhjU18inFKM6bkzPqEHGYiwFEUoH4/nZTOzvU=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-sdk-6.8.1.tar.xz", + "hash": "sha256-UvCq/0s2x4ADAvxY6MFnHIhFa8yUSzq2VwBOLKMEuJU=" }, "plasma-setup": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-setup-6.8.0.tar.xz", - "hash": "sha256-5NAGFJefWt0NTCHc9HwWGW+ueDX7aAf9Vi6W7c1Aq+k=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-setup-6.8.1.tar.xz", + "hash": "sha256-WAh87PZR36TLtD+W36CGbN828j/CXIirlFdKV3+Q0ow=" }, "plasma-systemmonitor": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-systemmonitor-6.8.0.tar.xz", - "hash": "sha256-Pk1OkTZ7zmUdPmDOotnb0lrcRlOUWzK/zawJT/Ax0sc=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-systemmonitor-6.8.1.tar.xz", + "hash": "sha256-P2cY/i7HqHO+4EWil1aCz0iLgUhApVHjH3H57fVEhqA=" }, "plasma-thunderbolt": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-thunderbolt-6.8.0.tar.xz", - "hash": "sha256-0NLJqwZlC073XcqVJRc0jru1emzA7tMmSO2wpn4J9Aw=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-thunderbolt-6.8.1.tar.xz", + "hash": "sha256-R/o9IljPKVJ8yjymeueW2yXhGhd0EHVSb0F4LMvAkuA=" }, "plasma-vault": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-vault-6.8.0.tar.xz", - "hash": "sha256-/OJohKV6suD2pt9KcNWnZCu0ejeH6mrJ1mFDyfuFE2I=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-vault-6.8.1.tar.xz", + "hash": "sha256-DaehXOIi01KzT5AcYzF3GlS+DS7PPBpTKkNzshLSb3Q=" }, "plasma-welcome": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-welcome-6.8.0.tar.xz", - "hash": "sha256-YAh6r1YCopcnfrihnB+pSdBERW3vGiAS0XJo3QTa9Do=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-welcome-6.8.1.tar.xz", + "hash": "sha256-STxNjIgQfePWS0LrPGsfeXhoIa4DbEU2U5jOTwkq5nE=" }, "plasma-workspace": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-workspace-6.8.0.tar.xz", - "hash": "sha256-AWd87eipRoGpa9DuGyEazdqkZ4z3uJqmcLlJvfaMGXM=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-workspace-6.8.1.tar.xz", + "hash": "sha256-4qu35bX8jVn+Np06tOp3bhBoSvD7GooydenfZO/5fSA=" }, "plasma-workspace-wallpapers": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma-workspace-wallpapers-6.8.0.tar.xz", - "hash": "sha256-HAkCUE0cJ6uGysWqNU6+PCeX5EMCAFEdg/8e0xEc5mM=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma-workspace-wallpapers-6.8.1.tar.xz", + "hash": "sha256-qa44mxLFuctE/bQFsTw6KstFiHnCM0PmyvUKIt7wK7A=" }, "plasma5support": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plasma5support-6.8.0.tar.xz", - "hash": "sha256-CUo5WWIsy0raLNV32dbx8ybyw6OmYwZ12SGKowB3JCQ=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plasma5support-6.8.1.tar.xz", + "hash": "sha256-uDR2C/UytfR5k4xVAJPSfvK3d4yrpuXj4IF5I0GtfFo=" }, "plymouth-kcm": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/plymouth-kcm-6.8.0.tar.xz", - "hash": "sha256-v2sgbTQIDLwfDOnffHmIQTT31+WodQRzTTl+uYIHJ/s=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/plymouth-kcm-6.8.1.tar.xz", + "hash": "sha256-WJu6OiJwB/7+TcEgqaiBVg+ur9or9myz4QtzSC4OZoY=" }, "polkit-kde-agent-1": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/polkit-kde-agent-1-6.8.0.tar.xz", - "hash": "sha256-giurGe+sJJ1xa23kQJdg/PvFzQbgYqMcI8kuQ9n8kFo=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/polkit-kde-agent-1-6.8.1.tar.xz", + "hash": "sha256-zkoxIotktLjnNf6R4TAKICxxLhMAr6hhGyAz6IC+iVo=" }, "powerdevil": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/powerdevil-6.8.0.tar.xz", - "hash": "sha256-ICe0Mzn67t0pyJUg77pU4cP0aQDSdbLUj8nGlXWx1X4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/powerdevil-6.8.1.tar.xz", + "hash": "sha256-r8x4XryQZsspiOqeK9zTj6yZQ4Pkm1yy5k2z+qNgN0Q=" }, "print-manager": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/print-manager-6.8.0.tar.xz", - "hash": "sha256-Ax86w/o/1PQ4m7g5xQEoHOz2r8oJDXP7wykYkd8C9N0=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/print-manager-6.8.1.tar.xz", + "hash": "sha256-9CIb5CokDuwjxKZTpDPZfZvMqQnrZW6Q2/DHT6hsyls=" }, "qqc2-breeze-style": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/qqc2-breeze-style-6.8.0.tar.xz", - "hash": "sha256-6ShDFHNpg28+NI4m3VuTBzmhwTu2f5MOCjQ8ve0RhwU=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/qqc2-breeze-style-6.8.1.tar.xz", + "hash": "sha256-KEWvcyIzd7ORI/M3S81WrFO1Q4WzzAMutsctlsiorIA=" }, "sddm-kcm": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/sddm-kcm-6.8.0.tar.xz", - "hash": "sha256-NILpUJmJ8Nu4KK5NJ2H9JiKlm9K5jQpMqEKHvLhR0Zc=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/sddm-kcm-6.8.1.tar.xz", + "hash": "sha256-9n6SoAFDHU9NMacva85sIRaAT2FfsdeSfKW1HuqHL88=" }, "spacebar": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/spacebar-6.8.0.tar.xz", - "hash": "sha256-cYdLSPn8g45Pl87L56WwF6o+1g2bvkPzlY3M8wgd6X4=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/spacebar-6.8.1.tar.xz", + "hash": "sha256-sDGd5WPJnTFKkbXRjvQcuzORGjaJQkUJzBGt6JKhIPg=" }, "spectacle": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/spectacle-6.8.0.tar.xz", - "hash": "sha256-WPSyFBcCGwGfWnAbpoHj5R3R2XHHpo8Aa/suJN6MnpU=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/spectacle-6.8.1.tar.xz", + "hash": "sha256-Q3UazBY9OIeZoKCdv4Rt72Rw/RxoRt0oYxkrbhbqPBs=" }, "systemsettings": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/systemsettings-6.8.0.tar.xz", - "hash": "sha256-V7cvrNOiz1C9S6CqPnWfkeoY0d/AWeiszEQCP1S+uJ8=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/systemsettings-6.8.1.tar.xz", + "hash": "sha256-RsikJGM0tL04KgiscMpndPtyMPnmSoCFhbeVHqVeMIQ=" }, "union": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/union-6.8.0.tar.xz", - "hash": "sha256-1zQP/k4mnG7mdqzGyTuSiTKwbuJlSuPnuQS2mftGpGw=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/union-6.8.1.tar.xz", + "hash": "sha256-q+pBPHn+mlIzepuKUO6Pspvn7Ti9dk63VV1yTpmznwA=" }, "xdg-desktop-portal-kde": { - "version": "6.8.0", - "url": "mirror://kde/stable/plasma/6.8.0/xdg-desktop-portal-kde-6.8.0.tar.xz", - "hash": "sha256-uhiyhViLQn3Bbeoq7l4s0EBzSLggFZdRlxgh3WAE4DY=" + "version": "6.8.1", + "url": "mirror://kde/stable/plasma/6.8.1/xdg-desktop-portal-kde-6.8.1.tar.xz", + "hash": "sha256-HrjWQZXzwHpa/sBQ1R4DG4BUJaVgwGFVLBE47igdvQU=" } } \ No newline at end of file diff --git a/pkgs/os-specific/linux/acer-wmi-battery/default.nix b/pkgs/os-specific/linux/acer-wmi-battery/default.nix index 471a9c3f0b4d..ec989097968e 100644 --- a/pkgs/os-specific/linux/acer-wmi-battery/default.nix +++ b/pkgs/os-specific/linux/acer-wmi-battery/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, kernel, kernelModuleMakeFlags, + pahole, }: let @@ -21,6 +22,8 @@ stdenv.mkDerivation { hash = "sha256-mI6Ob9BmNfwqT3nndWf3jkz8f7tV10odkTnfApsNo+A="; }; + nativeBuildInputs = [ pahole ]; + makeFlags = kernelModuleMakeFlags; postPatch = '' @@ -33,8 +36,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - find . -name '*.ko' -exec xz -f {} \; - install -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/platform/x86 *.ko.xz + install -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/platform/x86 *.ko runHook postInstall ''; @@ -43,7 +45,10 @@ stdenv.mkDerivation { description = "Driver for the Acer WMI battery health control interface"; homepage = "https://github.com/frederik-h/acer-wmi-battery"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index ebe9a880f0ca..61b2649cd718 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "sha256-hjWmjMOxq1wX9/7RB+pUSPq/CxBzNOwV7VsYfbdrww4="; + sha256 = "sha256-HTST8M2o60mY8Yr4YewQ3wPYD+AWJYivyZFT7mUFpsw="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix index e7580c388fec..531b85a1e88d 100644 --- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -22,13 +22,12 @@ stdenv.mkDerivation { makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + "INSTALL_MOD_DIR=extra" + "DEPMOD=true" ]; - installPhase = '' - runHook preInstall - install -D framework_laptop.ko -t $out/lib/modules/${kernel.modDirVersion}/extra - runHook postInstall - ''; + installTargets = [ "modules_install" ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 0800a22c7dbe..f0fe4fe13261 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/MCMrARM/mbp2018-bridge-drv"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; maintainers = [ lib.maintainers.hlolli ]; broken = kernel.kernelOlder "5.4"; }; diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix index ca412da26ca4..a2f7b226389b 100644 --- a/pkgs/os-specific/linux/msi-ec/default.nix +++ b/pkgs/os-specific/linux/msi-ec/default.nix @@ -43,7 +43,10 @@ stdenv.mkDerivation { homepage = "https://github.com/BeardOverflow/msi-ec"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.m1dugh ]; - platforms = lib.platforms.linux; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; broken = kernel.kernelOlder "6.5"; }; } diff --git a/pkgs/os-specific/linux/netatop/fix-makefile-install.patch b/pkgs/os-specific/linux/netatop/fix-makefile-install.patch index ee998b977ee5..90f23daf2954 100644 --- a/pkgs/os-specific/linux/netatop/fix-makefile-install.patch +++ b/pkgs/os-specific/linux/netatop/fix-makefile-install.patch @@ -8,7 +8,7 @@ diff --color -ruN netatop-3.2.2.orig/Makefile netatop-3.2.2/Makefile - cd /usr/src; dkms add -m netatop -v $(CURVERS) - dkms build -m netatop -v $(CURVERS) - dkms install -m netatop -v $(CURVERS) -+ install -m 0644 netatop.ko -Dt $(out)/lib/modules/$(KMODDIRVERSION)/extra ++ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules_install INSTALL_MOD_PATH=$(out) INSTALL_MOD_DIR=extra DEPMOD=true # - install netatopd -t /usr/sbin - install -m 0644 netatop.service -t /lib/systemd/system diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 18fbc5f9ba95..2eb6ec19b70b 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -24,16 +24,23 @@ stdenv.mkDerivation ( makeFlags = kernelModuleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + "INSTALL_MOD_DIR=kernel/drivers/hid" + "INSTALL_MOD_STRIP=1" + "DEPMOD=true" ]; doInstallCheck = true; - installPhase = '' - runHook preInstall + installTargets = [ "modules_install" ]; - binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid" - mkdir -p "$binDir" - cp -v driver/*.ko "$binDir" + installFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(PWD)/driver" + ]; + + postInstall = '' RAZER_MOUNT_OUT="$out/bin/razer_mount" RAZER_RULES_OUT="$out/etc/udev/rules.d/99-razer.rules" install -m 644 -v -D install_files/udev/99-razer.rules $RAZER_RULES_OUT @@ -46,8 +53,6 @@ stdenv.mkDerivation ( --replace chgrp ${coreutils}/bin/chgrp \ --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" \ --replace plugdev openrazer - - runHook postInstall ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/tsme-test/default.nix b/pkgs/os-specific/linux/tsme-test/default.nix index 6602e2ea0cae..e0ad7f4bc61e 100644 --- a/pkgs/os-specific/linux/tsme-test/default.nix +++ b/pkgs/os-specific/linux/tsme-test/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { description = "Kernel driver to test the status of AMD TSME (Transparent Secure Memory Encryption)"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ lyn ]; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; homepage = "https://github.com/AMDESE/mem-encryption-tests"; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5729ec104a3b..f3d175ec7965 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3387,7 +3387,8 @@ ]; "ipp" = ps: with ps; [ - ]; # missing inputs: aioipp + aioipp + ]; "iqvia" = ps: with ps; [ numpy @@ -8908,6 +8909,7 @@ "iotawatt" "iotty" "ipma" + "ipp" "iqvia" "irm_kmi" "iron_os" diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index 563063c4fcfd..1153b8a7262e 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -8,37 +8,37 @@ # tests aioresponses, + gitMinimal, gitpython, - home-assistant, jsonschema, pytest-freezegun, pytest-homeassistant-custom-component, pytestCheckHook, }: -buildHomeAssistantComponent rec { +buildHomeAssistantComponent (finalAttrs: { owner = "bramstroker"; domain = "powercalc"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { - inherit owner; + owner = "bramstroker"; repo = "homeassistant-powercalc"; - tag = "v${version}"; - hash = "sha256-XUHQYHZ4PMkxobENb3xo2W7MGju/vN+iJfI6NVaP+RM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oeOQ4h+sCSqHn+li9R5q26LGE+FOFzoD4iKQ+ZGIKjw="; }; dependencies = [ numpy ]; nativeCheckInputs = [ aioresponses + gitMinimal gitpython jsonschema pytest-freezegun pytest-homeassistant-custom-component pytestCheckHook - ] - ++ home-assistant.getPackages "camera" home-assistant.python3Packages; + ]; preCheck = '' patchShebangs --build tests/setup.sh @@ -46,10 +46,10 @@ buildHomeAssistantComponent rec { ''; meta = { - changelog = "https://github.com/bramstroker/homeassistant-powercalc/releases/tag/${src.tag}"; + changelog = "https://github.com/bramstroker/homeassistant-powercalc/releases/tag/${finalAttrs.src.tag}"; description = "Custom Home Assistant component for virtual power sensors"; homepage = "https://github.com/bramstroker/homeassistant-powercalc"; maintainers = with lib.maintainers; [ CodedNil ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index d2f6a7ae3bb5..1a49261eab92 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/FastCGI-Archives/mod_fastcgi"; description = "Provide support for the FastCGI protocol"; + license = lib.licenses.unfreeRedistributable; longDescription = '' mod_fastcgi is a module for the Apache web server that enables diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 94ac67648bb9..c3b32c2137bd 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Apache module that embeds the Python interpreter within the server"; mainProgram = "mod_python"; platforms = lib.platforms.unix; + license = lib.licenses.asl20; maintainers = [ ]; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 58f4cdf528a4..6d8d60873326 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,9 +5,9 @@ let in { mir = common { - version = "2.29.0"; - hash = "sha256-jh8Qgr/5Ht0eioLH9ES4M+jZr3RLKHg2YJXX5XzzwEA="; - cargoHash = "sha256-VQpLjoKlaoYaSfVVNjxDGJXSlIri4RwETaQJf8faqHQ="; + version = "2.30.0"; + hash = "sha256-CnOvTmQQlICd6Jn+NfXCjuYS0CouXuJggDnSt0by6kI="; + cargoHash = "sha256-w4KLBUJBfdNn0zN9bPBM/rCIsK+ofzlCR/C/uYfZU3E="; }; mir_2_15 = common { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 08692eaffd73..7b3aa41da02c 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "2.6.0"; - zipHash = "sha256-G05EoSVBC/w3c6q3CKT23y3I3bQuogTHbAtgCBGcr8M="; + version = "3.0.0"; + zipHash = "sha256-2LuIUaJqjAdwgx6RCxtRfUyq0kjhpPgQ7he3bpQ3+cU="; meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix index 07313bae509d..80ef98e53ff6 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "marcusolsson-json-datasource"; - version = "1.4.2"; - zipHash = "sha256-cYFMHE9d8MCbxmCaVu0HZvLbCgOpK/6PLvbzynt+/QQ="; + version = "1.4.3"; + zipHash = "sha256-zBDgv3oQg66yMBOgibUIBxwSaIyiqH1K4uBO4fPyAaw="; meta = { description = "Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix index 6dc34ca0872f..b4cf6989971f 100644 --- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.103.3"; + version = "2.103.4"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; tag = "v${version}"; - hash = "sha256-Im1B85TSj2q0pFsBUsEahxMxWJR0De8AZYz/oG0RzB0="; + hash = "sha256-mIMv0Wyx65GoDXE5yJiVfqwqxcu/wM3bGYLFQetDmtY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json index adff55e01ad1..c93971ea85b7 100644 --- a/pkgs/servers/nosql/cassandra/4.json +++ b/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.1.8", - "sha256": "sha256-jsMCNuHxTzPki3lYQ5QiRw+Y8JtVJ+8FyAfeQpf4lyE=" + "version": "4.1.12", + "sha256": "sha256-hymngdKieg0nGLxUreU2UmbEM0wJJG41XuUQalR0oWY=" } diff --git a/pkgs/servers/nosql/cassandra/update-script.nix b/pkgs/servers/nosql/cassandra/update-script.nix index 4cbcbe12861e..7c7dae68b101 100644 --- a/pkgs/servers/nosql/cassandra/update-script.nix +++ b/pkgs/servers/nosql/cassandra/update-script.nix @@ -45,13 +45,18 @@ writeScript "update-cassandra_${generation}" '' # See https://downloads.apache.org/cassandra/KEYS # Make sure that any new key corresponds to someone on the project - for key in A4C465FEA0C552561A392A61E91335D77E3E87CB; do + # Michael Semb Wever (mck), Stefan Miklosovic (smiklosovic) + for key in \ + A4C465FEA0C552561A392A61E91335D77E3E87CB \ + 7464AAD9068241C50BA6A26232F35CB2F546D93E \ + ; do gpg --trustdb-name "$tmp/trust.db" --batch --recv-keys "$key" echo "$key:5:" | gpg --trustdb-name "$tmp/trust.db" --batch --import-ownertrust done gpg --trustdb-name "$tmp/trust.db" --batch --verify --trust-model direct $tmp/src.tar.gz.asc $tmp/src.tar.gz hash="$(nix-prefetch-url "file://$tmp/src.tar.gz")" + hash="$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash")" cat >${filename} < { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/87c888eedeced2c577b21a86b5bce79b3067ab20/bootstrap-tools.tar.xz"; - hash = "sha256-J+0DbtPnxYzwY3+PCdGr6YYlCzw3Ov5EMoxI02rs+9U="; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/24bede38e8a9ced32c9bd52de1bcb214113c6b3d/bootstrap-tools.tar.xz"; + hash = "sha256-i5g+N5GuWsCt0q5A0gA2m4bFPjfxZo1FVbQ/Rw7Et7M="; }; unpack = import { - url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/87c888eedeced2c577b21a86b5bce79b3067ab20/unpack.nar.xz"; - hash = "sha256-zlE/VteBYhAIt7vnKuwgitnezcH3KpN2myUyJnR0Wh4="; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/24bede38e8a9ced32c9bd52de1bcb214113c6b3d/unpack.nar.xz"; + hash = "sha256-1YnlBU/6PEfhxiBA7+yT1NEdk8S64ajBKbKoc1oaWEo="; name = "unpack"; unpack = true; }; diff --git a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix index 4a75d2d26084..0cd6c19e79ab 100644 --- a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix +++ b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix @@ -62,60 +62,68 @@ rec { '' rm -rf include lib/*.a lib/bash share ''; - bootstrap-tools = tar-all "bootstrap-tools.tar.xz" ( - with pkgs; - # SYNCME: this version number must be synced with the one in default.nix - let - llvmPackages = llvmPackages_21; - in - [ - (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp") - coreutils - gnutar - findutils - gnumake - gnused - patchelf - gnugrep - gawk - diffutils - patch - bash - xz - xz.dev - gzip - bzip2 - bzip2.dev - # We don't use wcurl, and it uses shebangs for the build system when cross-compiling. - # That pollutes the bootstrap tarballs and prevents it from working. - (curl.overrideAttrs (old: { - postFixup = "rm $bin/bin/wcurl"; - })) - expand-response-params - binutils-unwrapped - freebsd.libc - stdenv.cc.libcxx - stdenv.cc.libcxx.dev - llvmPackages.clang-unwrapped - (freebsd.locales.override { locales = [ "C.UTF-8" ]; }) - ] - # INSTRUCTIONS FOR GENERATING THE SPURIOUS LIST - # - empty this list - # - rebuild bootstrap files and update their urls and hashes - # - turn on atime on your FreeBSD nix store filesystem - # - run nix-collect-garbage on FreeBSD to make it so we rebuild FODs - # - build the nixpkgs __bootstrapArchive attribute on FreeBSD - # - reboot your FreeBSD system. Otherwise the atimes will simply be wrong because of kernel caching - # - run a full build of stdenv on FreeBSD. with -j3, this takes 1h40 on my 20 cpu VM (AMD host) - # - use the following to generate a list with access times and filenames - # find /nix/store/###-bootstrap-archive -type f | xargs stat | grep -E 'Access: 2|File:' | paste -d ' ' - - | awk '{ print $4 " " $5 " " $6 " " $2 }' | sort -n > atimes - # - manually identify the point where files have no longer been accessed after the patching phase - # - use your favorite text editor to snip out the time column, the /nix/store/###-bootstrap-archive/ prefix, and the files that have not been used during bootstrap - # - turn off atime if it was off before since it will degrade performance - # - manually remove bin/strings from the list, since it will be used only during bootstrap - # - manually remove all files under include and lib/clang/*/include from the list in order to improve forward compatibility (and since they are very small) - # - plop it here - ) "xargs rm -f <${./bootstrap-tools-spurious.txt}"; + bootstrap-tools = + tar-all "bootstrap-tools.tar.xz" + ( + with pkgs; + # SYNCME: this version number must be synced with the one in default.nix + let + llvmPackages = llvmPackages_21; + in + [ + (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp") + coreutils + gnutar + findutils + gnumake + gnused + patchelf + gnugrep + gawk + diffutils + patch + bash + xz + xz.dev + gzip + bzip2 + bzip2.dev + # We don't use wcurl, and it uses shebangs for the build system when cross-compiling. + # That pollutes the bootstrap tarballs and prevents it from working. + (curl.overrideAttrs (old: { + postFixup = "rm $bin/bin/wcurl"; + })) + expand-response-params + binutils-unwrapped + freebsd.libc + stdenv.cc.libcxx + stdenv.cc.libcxx.dev + llvmPackages.clang-unwrapped + (freebsd.locales.override { locales = [ "C.UTF-8" ]; }) + ] + # INSTRUCTIONS FOR GENERATING THE SPURIOUS LIST + # - empty this list + # - rebuild bootstrap files and update their urls and hashes + # - turn on atime on your FreeBSD nix store filesystem + # - run nix-collect-garbage on FreeBSD to make it so we rebuild FODs + # - build the nixpkgs __bootstrapArchive attribute on FreeBSD + # - reboot your FreeBSD system. Otherwise the atimes will simply be wrong because of kernel caching + # - run a full build of stdenv on FreeBSD. with -j3, this takes 1h40 on my 20 cpu VM (AMD host) + # - use the following to generate a list with access times and filenames + # find /nix/store/###-bootstrap-archive -type f | xargs stat | grep -E 'Access: 2|File:' | paste -d ' ' - - | awk '{ print $4 " " $5 " " $6 " " $2 }' | sort -n > atimes + # - manually identify the point where files have no longer been accessed after the patching phase + # - use your favorite text editor to snip out the time column, the /nix/store/###-bootstrap-archive/ prefix, and the files that have not been used during bootstrap + # - turn off atime if it was off before since it will degrade performance + # - manually remove bin/strings from the list, since it will be used only during bootstrap + # - manually remove all files under include and lib/clang/*/include from the list in order to improve forward compatibility (and since they are very small) + # - plop it here + # + # libintl.h is not in the spurious list, it must not be there otherwise an early python build breaks + ) + '' + rm include/libintl.h + xargs rm -f <${./bootstrap-tools-spurious.txt} + ''; build = runCommand "build" { } '' mkdir -p $out/on-server ln -s ${unpack} $out/on-server/unpack.nar.xz diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 052bfa5e6636..3b65bdb6ba20 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -421,6 +421,26 @@ rec { l3build install --full --texmfhome "$out" ''; + # verify that minted can highlight code via latexminted + minted = mkTeXTest { + name = "minted"; + format = "pdflatex"; + texLive = texliveSmall.withPackages (ps: [ ps.minted ]); + text = '' + \documentclass{article} + \usepackage{minted} + \begin{document} + \begin{minted}{python} + def fib(n): + a, b = 0, 1 + for _ in range(n): + a, b = b, a + b + return a + \end{minted} + \end{document} + ''; + }; + # verify that the restricted mode gets enabled when # needed (detected by checking if it disallows --gscmd) repstopdf = diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index abd2596ab0e1..132bf33c4d00 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -160,7 +160,6 @@ let # but not yet released. Drop this from each version once its next release, # which will include the backport, is packaged: # - # - 2.31: https://github.com/NixOS/nix/pull/16604 # - 2.34: https://github.com/NixOS/nix/pull/16607 # - 2.35: https://github.com/NixOS/nix/pull/16608 windowsPatches = lib.optionals stdenv.hostPlatform.isWindows [ @@ -175,22 +174,6 @@ lib.makeExtensible ( self: ( { - nixComponents_2_31 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.31.6"; - inherit teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-yAvNBedw4FB+Z5myhfGsnRT8F1QqeEoXGbm7EmTW/Og="; - }; - }).appendPatches - windowsPatches; - - nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; - nixComponents_2_34 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.34.9"; @@ -228,12 +211,12 @@ lib.makeExtensible ( src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a9f38ea0ee89f550616f342386f45e896f4abd18"; - hash = "sha256-jUzXXzi1x8Ub4kdBCMcrz1LoCuElBq4mFjOw59rFPCE="; + rev = "f3f184834895f45030d69f20a311b2eac99ebf1d"; + hash = "sha256-TyuLrhxjzHjIYWtpBgSHi8wdKw7ciLiyfrdfJe33uEc="; }; in (nixDependencies.callPackage ./modular/packages.nix { - version = "2.36pre20261013_${lib.substring 0 8 src.rev}"; + version = "2.36pre20261020_${lib.substring 0 8 src.rev}"; inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = removeFunctionalTests commonDisabledTests src; @@ -258,18 +241,20 @@ lib.makeExtensible ( ) (lib.range 4 23) ) // { - nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_31."; - nixComponents_2_29 = throw "nixComponents_2_29 has been removed. use nixComponents_2_31."; - nixComponents_2_30 = throw "nixComponents_2_30 has been removed. use nixComponents_2_31."; + nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_34."; + nixComponents_2_29 = throw "nixComponents_2_29 has been removed. use nixComponents_2_34."; + nixComponents_2_30 = throw "nixComponents_2_30 has been removed. use nixComponents_2_34."; + nixComponents_2_31 = throw "nixComponents_2_31 has been removed. use nixComponents_2_34."; nixComponents_2_32 = throw "nixComponents_2_32 has been removed. use nixComponents_2_34."; nixComponents_2_33 = throw "nixComponents_2_33 has been removed. use nixComponents_2_34."; - nix_2_24 = throw "nix_2_24 has been removed. use nix_2_31."; - nix_2_26 = throw "nix_2_26 has been removed. use nix_2_31."; - nix_2_27 = throw "nix_2_27 has been removed. use nix_2_31."; - nix_2_25 = throw "nix_2_25 has been removed. use nix_2_31."; - nix_2_28 = throw "nix_2_28 has been removed. use nix_2_31."; - nix_2_29 = throw "nix_2_29 has been removed. use nix_2_31."; - nix_2_30 = throw "nix_2_30 has been removed. use nix_2_31."; + nix_2_24 = throw "nix_2_24 has been removed. use nix_2_34."; + nix_2_26 = throw "nix_2_26 has been removed. use nix_2_34."; + nix_2_27 = throw "nix_2_27 has been removed. use nix_2_34."; + nix_2_25 = throw "nix_2_25 has been removed. use nix_2_34."; + nix_2_28 = throw "nix_2_28 has been removed. use nix_2_34."; + nix_2_29 = throw "nix_2_29 has been removed. use nix_2_34."; + nix_2_30 = throw "nix_2_30 has been removed. use nix_2_34."; + nix_2_31 = throw "nix_2_31 has been removed. use nix_2_34."; nix_2_32 = throw "nix_2_32 has been removed. use nix_2_34."; nix_2_33 = throw "nix_2_33 has been removed. use nix_2_34."; diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix index 72a26aa27242..4bd41e3618c2 100644 --- a/pkgs/tools/package-management/nix/dependencies.nix +++ b/pkgs/tools/package-management/nix/dependencies.nix @@ -1,7 +1,6 @@ regular@{ lib, boehmgc, - aws-sdk-cpp, fetchFromGitHub, pkgs, }: @@ -20,21 +19,6 @@ regular@{ initialMarkStackSize = 1048576; }; - aws-sdk-cpp = regular.aws-sdk-cpp.override { - # Nix only needs these AWS APIs. - apis = [ - "identity-management" - "s3" - "transfer" - ]; - - # Don't use AWS' custom memory management. - customMemoryManagement = false; - - # only a stripped down version is built which takes a lot less resources to build - requiredSystemFeatures = [ ]; - }; - # https://github.com/NixOS/nix/issues/16180 boost = pkgs.boost189; }; diff --git a/pkgs/tools/package-management/nix/detect-rosetta-via-runtime-file.patch b/pkgs/tools/package-management/nix/detect-rosetta-via-runtime-file.patch deleted file mode 100644 index e8cf7fc8d88d..000000000000 --- a/pkgs/tools/package-management/nix/detect-rosetta-via-runtime-file.patch +++ /dev/null @@ -1,36 +0,0 @@ -Backport of https://github.com/NixOS/nix/pull/16067 to Nix 2.31. -Upstream commit: 53f62712aa8d66bf7198c78962cd7574e0667a92 - -Detect Rosetta without spawning arch during static initialization of libnixstore. -When DYLD_INSERT_LIBRARIES preloads libnixstore, a GNU arch found through PATH -loads the same library and recursively starts another probe. - -The include context is adjusted for Nix 2.31's archive.hh include. - -diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc ---- a/src/libstore/globals.cc -+++ b/src/libstore/globals.cc -@@ -2,6 +2,7 @@ - #include "nix/util/config-global.hh" - #include "nix/util/current-process.hh" - #include "nix/util/archive.hh" -+#include "nix/util/file-system.hh" - #include "nix/util/args.hh" - #include "nix/util/abstract-setting-to-json.hh" - #include "nix/util/compute-levels.hh" -@@ -225,11 +226,11 @@ StringSet Settings::getDefaultExtraPlatforms() - // machines. Note that we can’t force processes from executing - // x86_64 in aarch64 environments or vice versa since they can - // always exec with their own binary preferences. -+ // -+ // The runtime file exists iff Rosetta 2 is installed; checking it avoids -+ // spawning a subprocess during static initialization of `settings`. - if (std::string{NIX_LOCAL_SYSTEM} == "aarch64-darwin" -- && runProgram( -- RunOptions{.program = "arch", .args = {"-arch", "x86_64", "/usr/bin/true"}, .mergeStderrToStdout = true}) -- .first -- == 0) -+ && pathExists("/Library/Apple/usr/libexec/oah/libRosettaRuntime")) - extraPlatforms.insert("x86_64-darwin"); - #endif - diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix index 886911137bc8..85582ae771f8 100644 --- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix +++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix @@ -37,11 +37,7 @@ mkMesonDerivation (finalAttrs: { jq python3 rsync - ] - ++ lib.optionals (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [ json-schema-for-humans - ] - ++ [ nix-cli ]; diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index bb49ce97dd57..d0187d321c42 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -150,10 +150,7 @@ let }; mesonLibraryLayer = finalAttrs: prevAttrs: { - # See https://github.com/NixOS/nix/pull/14105 -- enabling this only for Nix 2.32+ as there are - # reports of undefined behavior on previous versions. Note that this does //not// use - # `finalAttrs.version` in order to avoid infinite recursion. - ${if lib.versionOlder version "2.32" then null else "preConfigure"} = + preConfigure = let interpositionFlags = [ "-fno-semantic-interposition" @@ -230,8 +227,6 @@ let } ); - whenAtLeast = v: thing: if lib.versionAtLeast version v then thing else null; - in # This becomes the pkgs.nixComponents attribute set @@ -377,7 +372,7 @@ in nix-store-tests = callPackage ../src/libstore-tests/package.nix { }; nix-fetchers = callPackage ../src/libfetchers/package.nix { }; - ${whenAtLeast "2.29pre" "nix-fetchers-c"} = callPackage ../src/libfetchers-c/package.nix { }; + nix-fetchers-c = callPackage ../src/libfetchers-c/package.nix { }; nix-fetchers-tests = callPackage ../src/libfetchers-tests/package.nix { }; nix-expr = callPackage ../src/libexpr/package.nix { }; @@ -397,7 +392,7 @@ in nix-cmd-c = callPackage ../src/libcmd-c/package.nix { }; nix-cli = callPackage ../src/nix/package.nix { }; - ${whenAtLeast "2.34pre" "nix-nswrapper"} = callPackage ../src/nswrapper/package.nix { }; + nix-nswrapper = callPackage ../src/nswrapper/package.nix { }; nix-functional-tests = callPackage ../tests/functional/package.nix { }; diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index a552130d3501..f62f7e860822 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -58,6 +58,7 @@ let nix-store nix-store-c nix-fetchers + nix-fetchers-c nix-expr nix-expr-c nix-flake @@ -67,11 +68,6 @@ let nix-cmd ; } - // lib.optionalAttrs (lib.versionAtLeast version "2.29pre") { - inherit - nix-fetchers-c - ; - } // lib.optionalAttrs ( @@ -189,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { ln -sT ${nix-manual} $doc ln -sT ${nix-manual.man} $man '' - + lib.optionalString (stdenv.hostPlatform.isLinux && lib.versionAtLeast version "2.34pre") '' + + lib.optionalString stdenv.hostPlatform.isLinux '' lndir ${nix-nswrapper} $out ''; @@ -258,11 +254,7 @@ stdenv.mkDerivation (finalAttrs: { "nix-expr" "nix-expr-c" "nix-fetchers" - ] - ++ lib.optionals (lib.versionAtLeast version "2.29pre") [ "nix-fetchers-c" - ] - ++ [ "nix-flake" "nix-flake-c" "nix-main" diff --git a/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix index 87407e9579d0..fee7cabf0c5a 100644 --- a/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix @@ -29,13 +29,9 @@ mkMesonExecutable (finalAttrs: { buildInputs = [ nix-fetchers nix-store-test-support + nix-fetchers-c rapidcheck gtest - ] - ++ lib.optionals (lib.versionAtLeast version "2.29pre") [ - nix-fetchers-c - ] - ++ lib.optionals (lib.versionAtLeast version "2.27") [ libgit2 ]; diff --git a/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix b/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix index b2249d30b4b1..a61e83cf63bc 100644 --- a/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libflake-c/package.nix @@ -22,11 +22,7 @@ mkMesonLibrary (finalAttrs: { propagatedBuildInputs = [ nix-expr-c nix-store-c - ] - ++ lib.optionals (lib.versionAtLeast version "2.29pre") [ nix-fetchers-c - ] - ++ [ nix-flake ]; diff --git a/pkgs/tools/package-management/nix/modular/src/libmain/package.nix b/pkgs/tools/package-management/nix/modular/src/libmain/package.nix index 08b6d4e1e400..47a3eb7d15f8 100644 --- a/pkgs/tools/package-management/nix/modular/src/libmain/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libmain/package.nix @@ -19,15 +19,12 @@ mkMesonLibrary (finalAttrs: { workDir = ./.; - propagatedBuildInputs = - lib.optionals (lib.versionAtLeast version "2.28") [ - nix-expr - ] - ++ [ - nix-util - nix-store - openssl - ]; + propagatedBuildInputs = [ + nix-expr + nix-util + nix-store + openssl + ]; meta = { platforms = lib.platforms.unix ++ lib.platforms.windows; diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix index ba6498582e73..35f36ad4c2c3 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-test-support/package.nix @@ -26,8 +26,8 @@ mkMesonLibrary (finalAttrs: { nix-store nix-store-c rapidcheck - ] - ++ lib.optional (lib.versionAtLeast version "2.34pre") gtest; + gtest + ]; mesonFlags = [ ]; diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix index b7eebc6f53ca..b98e257f4e0a 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix @@ -41,10 +41,6 @@ mkMesonExecutable (finalAttrs: { mesonFlags = [ ]; - excludedTestPatterns = lib.optionals (lib.versionOlder finalAttrs.version "2.31") [ - "nix_api_util_context.nix_store_real_path_binary_cache" - ]; - passthru = { tests = { run = @@ -64,14 +60,13 @@ mkMesonExecutable (finalAttrs: { meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; nativeBuildInputs = [ writableTmpDirAsHomeHook - ] - ++ lib.optional (lib.versionAtLeast version "2.34pre") (lib.getBin openssl); + (lib.getBin openssl) + ]; } '' export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"} export NIX_REMOTE=$HOME/store - ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} \ - --gtest_filter=-${lib.concatStringsSep ":" finalAttrs.excludedTestPatterns} + ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} touch $out ''; }; diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index e506383c2a09..91ca3a7510d7 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -11,7 +11,6 @@ curl, cmake, aws-c-common, - aws-sdk-cpp, aws-crt-cpp, libseccomp, nlohmann_json, @@ -50,23 +49,27 @@ mkMesonLibrary (finalAttrs: { workDir = ./.; nativeBuildInputs = - lib.optional embeddedSandboxShell unixtools.hexdump - ++ lib.optional (withAWS && lib.versionAtLeast version "2.34pre") cmake; + lib.optionals embeddedSandboxShell [ + unixtools.hexdump + ] + ++ lib.optionals withAWS [ + cmake + ]; buildInputs = [ boost curl sqlite ] - ++ lib.optional ( - lib.versionAtLeast version "2.35pre" && stdenv.hostPlatform.isFreeBSD - ) freebsd.libjail - ++ lib.optional stdenv.hostPlatform.isLinux libseccomp - # There have been issues building these dependencies - ++ - lib.optional withAWS - # Nix >=2.33 doesn't depend on aws-sdk-cpp and only requires aws-crt-cpp for authenticated s3:// requests. - (if lib.versionAtLeast (lib.versions.majorMinor version) "2.33" then aws-crt-cpp else aws-sdk-cpp); + ++ lib.optionals (lib.versionAtLeast version "2.35pre" && stdenv.hostPlatform.isFreeBSD) [ + freebsd.libjail + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libseccomp + ] + ++ lib.optionals withAWS [ + aws-crt-cpp + ]; propagatedBuildInputs = [ nix-util @@ -79,10 +82,8 @@ mkMesonLibrary (finalAttrs: { mesonFlags = [ (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) + (lib.mesonEnable "s3-aws-auth" withAWS) ] - ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") ( - lib.mesonEnable "s3-aws-auth" withAWS - ) ++ lib.optionals withSandboxShell [ (lib.mesonOption "sandbox-shell" sandboxShell) ]; diff --git a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix index 45f38c758bb0..92a8ec9c8bf4 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix @@ -37,9 +37,13 @@ mkMesonExecutable (finalAttrs: { mesonFlags = [ ]; - excludedTestPatterns = lib.optionals (lib.versions.majorMinor version == "2.34") [ - "fchmodatTryNoFollow.fallbackWithoutProc" - ]; + excludedTestPatterns = + lib.optionals (lib.versions.majorMinor version == "2.34") [ + "fchmodatTryNoFollow.fallbackWithoutProc" + ] + ++ lib.optionals (lib.versionAtLeast version "2.36pre") [ + "Root*" + ]; passthru = { tests = { diff --git a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix index 3eda8ac3011d..ca72fbb4f231 100644 --- a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix @@ -26,8 +26,8 @@ mkMesonLibrary (finalAttrs: { buildInputs = [ brotli + libblake3 ] - ++ lib.optional (lib.versionAtLeast version "2.27") libblake3 ++ lib.optional (lib.versionAtLeast version "2.35pre") zstd ++ [ libsodium diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 5042bf84cfe4..f0b54c61d162 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -6,7 +6,7 @@ { lib, stdenv, - fetchpatch, + fetchpatch2, fetchurl, runCommand, writeShellScript, @@ -48,6 +48,7 @@ texinfo, texlive, # for bin.nix + fetchpatch, gnum4, jdk_headless, perlPackages, @@ -106,7 +107,7 @@ let inherit stdenv lib - fetchpatch + fetchpatch2 bin tlpdb tlpdbxz @@ -131,6 +132,7 @@ let zip luajit texinfo + unzip ; }; in diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 6019d0b87e98..5f50f7d3e8e6 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -1,6 +1,6 @@ { stdenv, - fetchpatch, + fetchpatch2, lib, tlpdb, bin, @@ -27,6 +27,7 @@ zip, luajit, texinfo, + unzip, }: oldTlpdb: let @@ -478,9 +479,31 @@ lib.recursiveUpdate orig rec { ''; # find files in script directory, not in binary directory - minted.postFixup = '' - substituteInPlace "$out"/bin/latexminted --replace-fail "__file__" "\"$scriptsFolder/latexminted.py\"" - ''; + # fix compatibility with Python 3.14 by loading a patched copy of the latexminted package + # (the patch is applied here rather than in postUnpack, since repacking the wheel inside the + # fixed-output tex container would make its hash depend on the zip/zlib implementation) + minted.extraNativeBuildInputs = [ unzip ]; + minted.postFixup = + let + patch = fetchpatch2 { + name = "minted-python314-compat.patch"; + url = "https://github.com/gpoore/minted/commit/2a7b3a48e47b834bbc4a616679a0ef9710896a16.diff"; + hash = "sha256-JcaQjSDqBQFsWLNRaOSNxCvPNa2HktfuzjsMKAWUPl8="; + includes = [ "python/latexminted/cmdline.py" ]; + }; + in + '' + substituteInPlace "$out"/bin/latexminted --replace-fail "__file__" "\"$scriptsFolder/latexminted.py\"" + + latexmintedLib="$out"/share/minted/python + mkdir -p "$latexmintedLib" + unzip -q "$scriptsFolder"/latexminted-0.6.0-py3-none-any.whl 'latexminted/*' -d "$latexmintedLib" + sed -i 's/\r$//' "$latexmintedLib"/latexminted/cmdline.py + patch -p2 -d "$latexmintedLib" -i "${patch}" + substituteInPlace "$out"/bin/latexminted \ + --replace-fail "from latexminted.cmdline import main" \ + "sys.path.insert(0, '$latexmintedLib')"$'\n'"from latexminted.cmdline import main" + ''; # find files in source container, fix incompatibilities with snobol4 texaccents.postFixup = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b823e8238ce..fcf98252f1f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -326,6 +326,7 @@ mapAliases { antigravity-fhsWithPackages = warnAlias "'antigravity-fhsWithPackages' has been renamed to 'antigravity-ide-fhsWithPackages'" antigravity-ide-fhsWithPackages; # Added 2026-05-20 antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20 ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27 + aocd = throw "'aocd' has been renamed to 'advent-of-code-data'"; # Added 2026-10-10 apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27 apacheKafka_3_7 = throw "apacheKafka_2_8 through _4_0 have been removed from nixpkgs as outdated"; # Added 2025-09-27 apacheKafka_3_8 = throw "apacheKafka_2_8 through _4_0 have been removed from nixpkgs as outdated"; # Added 2025-09-27 @@ -1199,6 +1200,7 @@ mapAliases { hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10 hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # Added 2025-08-20 hifiscan = throw "'hifiscan' has been removed due to being archived upstream."; # Added 2026-08-22 + highlight-assertions = throw "'highlight-assertions' has been removed due to lack of upstream maintenance."; # Added 2026-10-15 himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 hiPrio = warnAlias "'hiPrio' has been removed from pkgs, use `lib.hiPrio` instead" lib.hiPrio; # Added 2025-10-30 hiraeth = throw "hiraeth has been removed due to being unmaintained upstream"; @@ -1770,6 +1772,7 @@ mapAliases { migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11 mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20 mime-types = throw "'mime-types' has been renamed to/replaced by 'mailcap'"; # Converted to throw 2025-10-27 + min = throw "'min' has been removed as it depends on pcre, which is deprecated"; # Added 2026-10-19 mindforger = throw "'mindforger' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-15 minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06 minetest = throw "'minetest' has been renamed to/replaced by 'luanti'"; # Converted to throw 2025-10-27 @@ -2059,6 +2062,7 @@ mapAliases { pcmciaUtils = warnAlias "'pcmciaUtils' has been renamed to 'pcmciautils'" pcmciautils; # Added 2026-02-12 pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 + pcre-cpp = throw "'pcre-cpp' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2026-10-20 pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27 pcsx2-bin = throw "pcsx2-bin has been removed as it only supported x86_64-darwin"; # Added 2026-06-26 pdf2djvu = throw "pdf2djvu has been removed because it was broken and archived upstream"; # added 2025-12-06 @@ -2491,6 +2495,7 @@ mapAliases { squirreldisk = throw "'squirreldisk' has been removed as it depended on webkitgtk 4.0"; # Added 2026-06-07 src = throw "The \"src\" package has been renamed to \"simple-revision-control\". If you encounter this error and did not intend to use that package you may have a falsely constructed overlay."; # Added 2025-11-19 ssh-ashkpass-fullscreen = throw "'ssh-askpass-fullscreen' has been removed as it depended on the deprecated GTK2 engine."; # Added 2026-08-03 + ssl-proxy = throw "'ssl-proxy' has been removed as it was unmaintained both upstream and in nixpkgs, pinned to dangerously old version of go crypto."; # Added 2026-10-17 ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27 stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08 stalwart = warnAlias "`stalwart` is currently pinned to `0.15.5`. If `0.16.x` is needed, it is available as `stalwart_0_16`. Note: `stalwart_0_16` is not compatible with `services.stalwart` at this time." stalwart_0_15; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88cbe2c8ba3b..5c9156c2b423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,10 +290,6 @@ with pkgs; alacritty-graphics = callPackage ../by-name/al/alacritty/package.nix { withGraphics = true; }; - # addDriverRunpath is the preferred package name, as this enables - # many more scenarios than just opengl now. - aocd = with python3Packages; toPythonApplication aocd; - cve = with python3Packages; toPythonApplication cvelib; bloodhound-py = with python3Packages; toPythonApplication bloodhound; @@ -6300,9 +6296,6 @@ with pkgs; openssl_4_0 ; - # pcre32 seems unused - pcre-cpp = pcre.override { variant = "cpp"; }; - inherit (callPackage ../development/libraries/physfs { }) @@ -6703,7 +6696,7 @@ with pkgs; ; # If this is updated, the default zls version should also be updated to match the default zig version. - zig = zig_0_16; + zig = zig_0_17; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; @@ -6711,10 +6704,11 @@ with pkgs; zls_0_14 zls_0_15 zls_0_16 + zls_0_17 ; # This should be kept updated to ensure the default zls version matches the default zig version. - zls = zls_0_16; + zls = zls_0_17; libzint = zint-qt.override { withGUI = false; }; @@ -9093,9 +9087,7 @@ with pkgs; telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop - { - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; - }; + { }; terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 59c688291c0b..83b4a63c1236 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -64,7 +64,7 @@ let else if hostPlatform.isAarch64 then "10.13.0" else - "11.3.0"; + "11.4.0"; }; cudaPackages_12_8 = mkCudaPackages { @@ -88,7 +88,7 @@ let else if hostPlatform.isAarch64 then "10.13.0" else - "11.3.0"; + "11.4.0"; }; cudaPackages_12_9 = mkCudaPackages { @@ -112,7 +112,7 @@ let else if hostPlatform.isAarch64 then "10.13.0" else - "11.3.0"; + "11.4.0"; }; cudaPackages_13_0 = mkCudaPackages { @@ -130,7 +130,7 @@ let nvjpeg2000 = "0.11.0"; nvpl = "26.5"; nvtiff = "0.8.0"; - tensorrt = if hasJetsonCudaCapability then "10.16.1" else "11.3.0"; + tensorrt = if hasJetsonCudaCapability then "10.16.1" else "11.4.0"; }; cudaPackages_13_1 = mkCudaPackages { @@ -148,7 +148,7 @@ let nvjpeg2000 = "0.11.0"; nvpl = "26.5"; nvtiff = "0.8.0"; - tensorrt = if hasJetsonCudaCapability then "10.16.1" else "11.3.0"; + tensorrt = if hasJetsonCudaCapability then "10.16.1" else "11.4.0"; }; cudaPackages_13_2 = mkCudaPackages { @@ -166,7 +166,7 @@ let nvjpeg2000 = "0.11.0"; nvpl = "26.5"; nvtiff = "0.8.0"; - tensorrt = if hasJetsonCudaCapability then "11.1.0" else "11.3.0"; + tensorrt = if hasJetsonCudaCapability then "11.1.0" else "11.4.0"; }; cudaPackages_13_3 = mkCudaPackages { @@ -184,7 +184,7 @@ let nvjpeg2000 = "0.11.0"; nvpl = "26.5"; nvtiff = "0.8.0"; - tensorrt = if hasJetsonCudaCapability then "11.1.0" else "11.3.0"; + tensorrt = if hasJetsonCudaCapability then "11.1.0" else "11.4.0"; }; cudaPackages_13_4 = mkCudaPackages { @@ -202,7 +202,7 @@ let nvjpeg2000 = "0.11.0"; nvpl = "26.5"; nvtiff = "0.8.0"; - tensorrt = if hasJetsonCudaCapability then "11.1.0" else "11.3.0"; + tensorrt = if hasJetsonCudaCapability then "11.1.0" else "11.4.0"; }; in { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7f445818146a..4ef3f4317f05 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6771,10 +6771,10 @@ with self; CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.42"; + version = "4.80"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.42.tar.gz"; - hash = "sha256-4awvqx46bS2ZjTRAxgAGc2W9x9vwyPKyBZy85LTIMXM="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.80.tar.gz"; + hash = "sha256-CAwSU3epKmCESuydRTKDbKFEcDmG4xmMyjgjrXkJqiU="; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b5b75aed9ef5..d47070fb7594 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -95,6 +95,7 @@ mapAliases { ansible-vault-rw = ansible-vault; # Added 2026-07-10 ansiconv = throw "ansiconv has been removed because it was archived upstream"; # Added 2026-01-14 ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 + aocd = throw "'aocd' has been renamed to 'advent-of-code-data'"; # Added 2026-10-10 apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13 APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29 argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9caef2cbfdbd..94b80a969905 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -120,6 +120,8 @@ self: super: with self; { advantage-air = callPackage ../development/python-modules/advantage-air { }; + advent-of-code-data = callPackage ../development/python-modules/advent-of-code-data { }; + aeidon = callPackage ../development/python-modules/aeidon { }; aemet-opendata = callPackage ../development/python-modules/aemet-opendata { }; @@ -392,6 +394,8 @@ self: super: with self; { aiointercept = callPackage ../development/python-modules/aiointercept { }; + aioipp = callPackage ../development/python-modules/aioipp { }; + aioitertools = callPackage ../development/python-modules/aioitertools { }; aiojellyfin = callPackage ../development/python-modules/aiojellyfin { }; @@ -1193,8 +1197,6 @@ self: super: with self; { anywidget = callPackage ../development/python-modules/anywidget { }; - aocd = callPackage ../development/python-modules/aocd { }; - aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { }; aodhclient = callPackage ../development/python-modules/aodhclient { }; @@ -9640,12 +9642,13 @@ self: super: with self; { ) ) { }; - libcec = toPythonModule ( - pkgs.libcec.override { - python3 = python; - pythonSupport = true; - } - ); + libcec = + (toPythonModule ( + pkgs.libcec.override { + python3 = python; + pythonSupport = true; + } + )).python; libcloud = callPackage ../development/python-modules/libcloud { }; @@ -22819,6 +22822,8 @@ self: super: with self; { wxGTK = pkgs.wxwidgets_3_2.override { withWebKit = true; }; }; + wxpython_4_3 = callPackage ../development/python-modules/wxpython/4.3.nix { }; + wyoming = callPackage ../development/python-modules/wyoming { }; x-transformers = callPackage ../development/python-modules/x-transformers { }; diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index 5652c62986a9..f8ec6b34991b 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -145,7 +145,6 @@ self: super: { // lib.optionalAttrs (with super'.stdenv.hostPlatform; isx86_64 && isLinux) { # causes shadowstack disablement pcre = super'.pcre.override { enableJit = false; }; - pcre-cpp = super'.pcre-cpp.override { enableJit = false; }; } ) ]