diff --git a/doc/languages-frameworks/factor.section.md b/doc/languages-frameworks/factor.section.md index 2ffb5468da59..9e081934c90f 100644 --- a/doc/languages-frameworks/factor.section.md +++ b/doc/languages-frameworks/factor.section.md @@ -22,6 +22,8 @@ The package is defined in `pkgs/development/compilers/factor-lang/wrapper.nix` a The package also passes through several attributes listing the wrapped libraries and binaries, namely, `extraLibs` and `binPackages` as well as `defaultLibs` and `defaultBins`. Additionally, all `runtimeLibs` is the concatenation of all the above for the purpose of providing all necessary dynamic libraries as "`propagatedBuildInputs`". +Lastly, `extraVocabs` is passed through as is for stacked composition, and the fully composed `vocabTree` is passed through as a store path. +This makes it easier for external plugins (e.g. for editors and IDEs) to refer to the Factor vocabulary roots. `factorPackages` provides pre-configured Factor packages: - `factorPackages.factor-lang` is the default package with GUI support and several default library bindings (e.g. openssl, openal etc.). diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 8b63b0a172e3..9ec7e2f0870d 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -9,6 +9,17 @@ - Node.js default version has been updated from 22 LTS to 24 LTS. This introduces some breaking changes; Refer to the [upstream migration article](https://nodejs.org/en/blog/migrations/v22-to-v24) for details. +- The Factor programming language has been updated to Version 0.101 bringing various improvements to UI rendering and HiDPI support as well as support for Unicode 17.0.0. + Starting from Version 0.100, the Factor VM is compiled with Clang. + + This brings along some backwards compatibility issues in the language further detailed [here](https://re.factorcode.org/2025/12/factor-0-101-now-available.html). + Additionally, the FUEL Emacs module is no longer part of the `factor-lang` package. + It is part of the MELPA package set for a while already and must be taken from there. + This *does not affect* `factor-lang` packages Version 0.99 and 0.100. + Using the official MELPA package now puts the burden of providing the path to `/lib/factor` in `factor-root-dir` on the user. + Make sure to use the `extraVocabs` package attribute to compose a special vocabulary tree if necessary. + You can refer to the generated tree of vocabulary roots via the newly exposed `vocabTree` attribute, as described in the [documentation](#ssec-factor-dev-env). + - Nixpkgs configuration, specified for NixOS using `nixpkgs.config`, or using the `config` argument when importing nixpkgs, has learned to accept a `lib` argument as well as `pkgs`, which allows the configuration to be computed without depending on the `pkgs` fixed point. If you are referencing licenses in `lib.licenses` by having this configuration be a function taking a `pkgs` arg, you may wish to change to using `lib` for faster computation and to avoid infinite recursion errors if pkgs depends on parts of the computed configuration in future. For example, if you currently have configuration that looks like this: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29df4d5cdc6d..a658758084db 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10514,6 +10514,14 @@ githubId = 47456195; name = "hexclover"; }; + hey2022 = { + name = "Yiheng He"; + email = "yiheng.he@proton.me"; + matrix = "@hey2022:matrix.org"; + github = "hey2022"; + githubId = 48553457; + keys = [ { fingerprint = "128E 09C0 6F73 D678 6BB5 E551 5EA5 3C75 F7BE 3EDE"; } ]; + }; heyimnova = { email = "git@heyimnova.dev"; github = "heyimnova"; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 5d6ad24461d4..d35b554cbff8 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -62,6 +62,9 @@ "module-boot-plymouth-tpm2-totp-quick-start-enable": [ "index.html#module-boot-plymouth-tpm2-totp-quick-start-enable" ], + "module-services-keycloak-unix-socket": [ + "index.html#module-services-keycloak-unix-socket" + ], "module-services-tandoor-recipes-migrating-media-option-1": [ "index.html#module-services-tandoor-recipes-migrating-media-option-1" ], diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b3cf6a063356..ecc3b3c355dc 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -84,7 +84,7 @@ in tor = 35; cups = 36; foldingathome = 37; - sabnzbd = 38; + #sabnzbd = 38; # dropped in 25.11 #kdm = 39; # dropped in 17.03 #ghostone = 40; # dropped in 18.03 git = 41; @@ -570,7 +570,7 @@ in lambdabot = 191; asterisk = 192; plex = 193; - sabnzbd = 194; + #sabnzbd = 194; # dropped in 25.11 #grafana = 196; #unused #skydns = 197; #unused # ripple-rest = 198; # unused, removed 2017-08-12 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ad943c98fc9b..af7ea9aa5a6d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1351,7 +1351,7 @@ ./services/networking/routinator.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix - ./services/networking/sabnzbd.nix + ./services/networking/sabnzbd ./services/networking/scion/scion-control.nix ./services/networking/scion/scion-daemon.nix ./services/networking/scion/scion-dispatcher.nix diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix deleted file mode 100644 index 346dc95bc254..000000000000 --- a/nixos/modules/services/networking/sabnzbd.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - cfg = config.services.sabnzbd; - inherit (pkgs) sabnzbd; - -in - -{ - - ###### interface - - options = { - services.sabnzbd = { - enable = mkEnableOption "the sabnzbd server"; - - package = mkPackageOption pkgs "sabnzbd" { }; - - configFile = mkOption { - type = types.path; - default = "/var/lib/sabnzbd/sabnzbd.ini"; - description = "Path to config file."; - }; - - user = mkOption { - default = "sabnzbd"; - type = types.str; - description = "User to run the service as"; - }; - - group = mkOption { - type = types.str; - default = "sabnzbd"; - description = "Group to run the service as"; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open ports in the firewall for the sabnzbd web interface - ''; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - users.users = mkIf (cfg.user == "sabnzbd") { - sabnzbd = { - uid = config.ids.uids.sabnzbd; - group = cfg.group; - description = "sabnzbd user"; - }; - }; - - users.groups = mkIf (cfg.group == "sabnzbd") { - sabnzbd.gid = config.ids.gids.sabnzbd; - }; - - systemd.services.sabnzbd = { - description = "sabnzbd server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - Type = "forking"; - GuessMainPID = "no"; - User = cfg.user; - Group = cfg.group; - StateDirectory = "sabnzbd"; - ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}"; - }; - }; - - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ 8080 ]; - }; - }; -} diff --git a/nixos/modules/services/networking/sabnzbd/config_merge.py b/nixos/modules/services/networking/sabnzbd/config_merge.py new file mode 100644 index 000000000000..25bd9cd000cc --- /dev/null +++ b/nixos/modules/services/networking/sabnzbd/config_merge.py @@ -0,0 +1,19 @@ +import sys +import os.path +from configobj import ConfigObj, ParseError + +base = ConfigObj() + +for path in sys.argv[1:]: + if os.path.isfile(path): + with open(path) as f: + try: + update = ConfigObj(f) + base.merge(update) + except ParseError as e: + raise Exception(f"Failed to merge {path}") from e + else: + raise Exception(f"Instructed to merge {path} but not found or not a file") + +for line in base.write(): + print(line) diff --git a/nixos/modules/services/networking/sabnzbd/default.nix b/nixos/modules/services/networking/sabnzbd/default.nix new file mode 100644 index 000000000000..e44053344ac3 --- /dev/null +++ b/nixos/modules/services/networking/sabnzbd/default.nix @@ -0,0 +1,546 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkOption + mkPackageOption + mkEnableOption + mkOptionDefault + mkIf + literalExpression + optionalString + types + ; + inherit (lib.generators) + mkKeyValueDefault + mkValueStringDefault + toKeyValue + ; + + enumFromAttrs = + enum_values: + types.coercedTo (types.enum (lib.attrNames enum_values)) (name: enum_values.${name}) ( + types.enum (lib.attrValues enum_values) + ); + + cfg = config.services.sabnzbd; + + mandatoryGlobalSettings = { + "__version__" = 19; + "__encoding__" = "utf-8"; + }; + allSettings = cfg.settings // mandatoryGlobalSettings; + + # sabnzbd uses configobj type inis, which support + # nested sections specified by increasing numbers + # of square brackets (but not toml style dotted paths) + configObjAtom = types.oneOf [ + types.str + types.int + types.bool + ]; + + configObjValue = + let + valueType = + types.oneOf [ + types.str + types.int + types.bool + (types.listOf configObjAtom) + (types.attrsOf valueType) + ] + // { + description = "ConfigObj type"; + }; + in + valueType; + + configObjIni = + { }: + let + extractAtoms = lib.filterAttrs (k: v: v != null && !lib.isAttrs v); + extractSections = lib.filterAttrs (k: v: lib.isAttrs v); + mkValueString = ( + v: + if true == v then + "1" + else if false == v then + "0" + else + mkValueStringDefault { } v + ); + mkKeyValue = mkKeyValueDefault { inherit mkValueString; } "="; + mkSection = ( + depth: attrs: + let + atoms = extractAtoms attrs; + sections = extractSections attrs; + sectionHeadingLeft = lib.concatStrings (lib.replicate (depth + 1) "["); + sectionHeadingRight = lib.concatStrings (lib.replicate (depth + 1) "]"); + mkSectionHeading = + name: "${sectionHeadingLeft}${lib.escape [ "[" "]" ] name}${sectionHeadingRight}"; + mkSubsection = name: attrs: (mkSectionHeading name) + "\n" + (mkSection (depth + 1) attrs) + "\n"; + in + toKeyValue { inherit mkKeyValue; } (extractAtoms attrs) + + "\n" + + lib.concatStrings (lib.mapAttrsToList mkSubsection sections) + ); + in + { + type = types.attrsOf configObjValue; + generate = name: attrs: pkgs.writeText name (mkSection 0 attrs); + }; + + publicSettingsIni = + if cfg.configFile != null then + cfg.configFile + else + (configObjIni { }).generate "public-settings.ini" allSettings; + + sabnzbdIniPath = "/var/lib/${cfg.stateDir}/sabnzbd.ini"; +in + +{ + options = { + services.sabnzbd = { + enable = mkEnableOption "the sabnzbd server"; + + package = mkPackageOption pkgs "sabnzbd" { }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to config file (deprecated, use `settings` instead)"; + }; + + stateDir = mkOption { + type = types.str; + default = "sabnzbd"; + description = "State directory of the service under /var/lib/"; + }; + + user = mkOption { + default = "sabnzbd"; + type = types.str; + description = "User to run the service as"; + }; + + group = mkOption { + type = types.str; + default = "sabnzbd"; + description = "Group to run the service as"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the sabnzbd web interface + ''; + }; + + secretFiles = mkOption { + type = with types; listOf path; + description = '' + Path to a list of ini file containing confidential settings such as credentials. + Settings here will be merged with the rest of the configuration (with + the secret settings taking precedence in case of conflicts, and files + that occur later in this list taking precedence over those that + occur earlier). + Recommended settings: + - misc.api_key, misc.nzb_key, misc.username, misc.password + - misc.email_account, misc.email_pwd if email alerts are enabled + - servers..username, servers..password + ''; + default = [ ]; + }; + + allowConfigWrite = mkOption { + type = types.bool; + description = '' + By default we create the sabnzbd configuration read-only, + which keeps the nixos configuration as the single source + of truth. If you want to enable configuration of + sabnzbd via the web interface or use options that require + a writeable configuration, such as quota tracking, enable + this option. + ''; + default = lib.versionOlder config.system.stateVersion "25.11"; + }; + + settings = mkOption { + description = '' + The sabnzbd configuration (see also + [sabnzbd's wiki](https://sabnzbd.org/wiki/configuration/4.5/configure) + for extra documentation) + ''; + default = { }; + type = types.submodule { + freeformType = (configObjIni { }).type; + config = { + misc = { + config_conversion_version = mkOptionDefault 4; + # config_lock = 1 turns the alert that the config is read-only from an error + # into a warning. But the warnings still come, and additionally read access + # to the config from the web ui is blocked as well, so better keep it at 0 + # and live with the error + # optionally, misc.helpful_warnings = 0 will silence the warnings (but not the error) + # at the cost of also silencing other, potentially useful warnings + # config_lock = mkOptionDefault (if !cfg.allowConfigWrite then 1 else 0); + config_lock = mkOptionDefault false; + notified_new_skin = mkOptionDefault true; + # don't open the browser on a daemonized service + auto_browser = mkOptionDefault false; + # don't check for new updates since we're using the distro version + check_new_rel = mkOptionDefault false; + }; + }; + options = { + misc = { + bandwidth_max = mkOption { + type = types.str; + description = '' + Maximum bandwidth in bytes(!)/sec (supports prefixes). Use + in conjunction with `bandwidth_perc` to set a bandwidth + limit. Empty string disables limit. + ''; + default = ""; + example = "50MB/s"; + }; + bandwidth_perc = mkOption { + type = types.int; + description = '' + Percentage of `bandwidth_max` that sabnzbd is allowed to use. + 0 means no limit. + ''; + default = 0; + example = 50; + }; + host = mkOption { + type = types.str; + description = '' + Address for the Web UI to listen on for incoming connections. + ''; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + port = mkOption { + type = types.port; + description = '' + Port for the Web UI to listen on for incoming connections. + ''; + default = 8080; + example = 12345; + }; + https_cert = mkOption { + type = types.nullOr types.path; + description = '' + Path to the TLS certificate for the web UI. If not set + and https is enabled, a self-signed certificate will + be generated. + ''; + default = null; + example = literalExpression "\${config.acme.certs.\${domain}.directory}/fullchain.pem"; + }; + https_key = mkOption { + type = types.nullOr types.path; + description = '' + Path to the TLS key for the web UI. If not set and + https is enabled, a self-signed certificate will be + generated + ''; + default = null; + example = literalExpression "\${config.acme.certs.\${domain}.directory}/key.pem"; + }; + enable_https = mkOption { + type = types.bool; + description = "Whether to enable HTTPS for the web UI"; + default = cfg.settings.misc.https_cert != null; + defaultText = "cfg.settings.misc.https_cert != null"; + example = true; + }; + cache_limit = mkOption { + type = types.str; + description = '' + Size of the RAM cache, in bytes (prefixes supported). + Sabnzbd recommends 25% of available RAM. Empty means + no cache. + ''; + default = ""; + example = "500M"; + }; + html_login = mkOption { + type = types.bool; + description = '' + Prompt for login with an html login mask if enabled, + otherwise prompt for basic auth (useful for SSO) + ''; + default = true; + }; + inet_exposure = mkOption { + type = enumFromAttrs { + "none" = 0; + "api (add nzbs)" = 1; + "api (no config)" = 2; + "api (full)" = 3; + "api+web (auth needed)" = 4; + "api+web (locally no auth)" = 5; + }; + description = '' + Restrictions for access from non-local IP addresses. + Values are: + 0, 'none' -- no access + 1, 'api (add nzbs)' -- api access only, only add nzb files + 2, 'api (no config)' -- api access only, config changes not allowed + 3, 'api (full)' -- api access only, full api access + 4, 'api+web (auth needed)' -- api and web ui, login required always + 5, 'api+web (locally no auth)' -- api and web ui, login required from non-local IPs only + ''; + default = "none"; + }; + email_endjob = mkOption { + type = enumFromAttrs { + "never" = 0; + "always" = 1; + "on error" = 2; + }; + description = '' + Whether to send emails on job completion. Values are: + 0, 'never' -- Never + 1, 'always' -- Always + 2, 'on error' -- On error + ''; + default = if cfg.settings.misc.email_server != "" then "on error" else "never"; + defaultText = ''if cfg.settings.misc.email_server != "" then "on error" else "never"''; + }; + email_full = mkOption { + type = types.bool; + description = "Whether to send alerts for full disks"; + default = cfg.settings.misc.email_server != ""; + defaultText = ''cfg.settings.misc.email_server != ""''; + }; + email_rss = mkOption { + type = types.bool; + description = "Whether to send alerts for jobs added by RSS feeds"; + default = false; + }; + email_server = mkOption { + type = types.str; + description = "SMTP server for email alerts (server:host)"; + default = ""; + }; + email_to = mkOption { + type = types.str; + description = "Receiving address for email alerts"; + default = ""; + }; + email_from = mkOption { + type = types.str; + description = "'From:' field for emails (needs to be an address)"; + default = ""; + }; + }; + ntfosd = mkOption { + default = { }; + description = "NotifyOSD settings"; + type = types.submodule { + freeformType = (configObjIni { }).type; + options = { + ntfosd_enable = mkOption { + type = types.bool; + description = '' + Whether to enable NotifyOSD alerts. Does not really make sense + in a server environment, hence we default to false despite + upstream's default true. + ''; + default = false; + }; + }; + }; + }; + servers = mkOption { + default = { }; + description = "Usenet provider specification"; + type = types.attrsOf ( + types.submodule { + freeformType = (configObjIni { }).type; + options = { + enable = mkOption { + type = types.bool; + description = "Enable this server by default"; + default = true; + example = false; + }; + required = mkOption { + type = types.bool; + description = '' + In case of connection failures, wait for the + server to come back online instead of skipping + it. + ''; + default = false; + example = true; + }; + optional = mkOption { + type = types.bool; + description = '' + In case of connection failures, temporarily + disable this server. (See sabnzbd's documentation + for usage guides). + ''; + default = false; + example = true; + }; + priority = mkOption { + type = types.int; + description = '' + Priority of this servers. Servers are queried in + order of priority, from highest (0) to lowest (100). + ''; + default = 0; + }; + name = mkOption { + type = types.str; + description = '' + The name of the server + ''; + example = "Example News Provider"; + }; + displayname = mkOption { + type = types.str; + description = '' + Human-friendly description of the server + ''; + example = "Example News Provider"; + }; + host = mkOption { + type = types.str; + description = '' + Hostname of the server + ''; + example = "news.example.com"; + }; + port = mkOption { + type = types.port; + description = "Port of the server"; + example = 443; + default = 563; + }; + connections = mkOption { + type = types.int; + description = '' + Number of parallel connections permitted by + the server. + ''; + example = 50; + default = 8; + }; + timeout = mkOption { + type = types.int; + description = '' + Time, in seconds, to wait for a response before + attempting error recovery. + ''; + default = 60; + }; + ssl = mkOption { + type = types.bool; + description = '' + Whether the server supports TLS + ''; + default = true; + }; + ssl_verify = mkOption { + type = enumFromAttrs { + "strict" = 3; + "allow injection" = 2; + "none" = 0; + }; + description = '' + Level of TLS verification. Supported values: + 3, 'strict' -- strict (normal) verification + 2, 'allow injection' -- allow locally injected certificates + 0, 'none' -- no verification + ''; + default = "strict"; + }; + expire_date = mkOption { + type = types.nullOr types.str; + description = '' + If Notifications are enabled and an expiry date is + set, warn 5 days before expiry. This setting + does not automatically disable the server. + Expected format: yyyy-mm-dd + ''; + default = null; + }; + }; + } + ); + }; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + warnings = lib.optional (cfg.configFile != null) '' + `sabnzbd.configFile` is deprecated, consider using `sabnzbd.settings` instead. + If you have values set in `sabnzbd.settings` set, they will be ignored. + ''; + + users.users = mkIf (cfg.user == "sabnzbd") { + sabnzbd = { + isSystemUser = true; + group = cfg.group; + description = "sabnzbd user"; + }; + }; + + users.groups = mkIf (cfg.group == "sabnzbd") { + sabnzbd = { }; + }; + + systemd.services.sabnzbd = + let + files = + (lib.optional cfg.allowConfigWrite sabnzbdIniPath) ++ [ publicSettingsIni ] ++ cfg.secretFiles; + iniPathQuoted = lib.escapeShellArg sabnzbdIniPath; + in + { + description = "sabnzbd server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Type = "forking"; + GuessMainPID = "no"; + User = cfg.user; + Group = cfg.group; + StateDirectory = cfg.stateDir; + ExecStart = "${lib.getExe cfg.package} -d -f ${iniPathQuoted}"; + }; + preStart = '' + set -euo pipefail + + ${lib.toShellVar "files" files} + + ${lib.getExe (pkgs.python3.withPackages (py: [ py.configobj ]))} \ + ${./config_merge.py} \ + "''${files[@]}" | \ + install -D -m ${if cfg.allowConfigWrite then "600" else "400"} \ + -o '${cfg.user}' -g '${cfg.group}' /dev/stdin ${iniPathQuoted} + ''; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.misc.port ]; + }; + }; +} diff --git a/nixos/modules/services/web-apps/keycloak.md b/nixos/modules/services/web-apps/keycloak.md index 4bf8c9fcad71..b22b5a8cd282 100644 --- a/nixos/modules/services/web-apps/keycloak.md +++ b/nixos/modules/services/web-apps/keycloak.md @@ -54,6 +54,30 @@ The path should be provided as a string, not a Nix path, since Nix paths are copied into the world readable Nix store. ::: +## Unix socket authentication {#module-services-keycloak-unix-socket} + +For PostgreSQL, Keycloak can connect via Unix socket using peer +authentication, avoiding the need for a database password. + +To use Unix sockets, set [](#opt-services.keycloak.database.host) +to the PostgreSQL socket directory (e.g., `/run/postgresql`) and +add the required junixsocket plugins: +```nix +{ + services.keycloak = { + database.host = "/run/postgresql"; + plugins = with pkgs.keycloak.plugins; [ + junixsocket-common + junixsocket-native-common + ]; + }; +} +``` + +::: {.note} +Unix socket authentication is only supported for PostgreSQL. +::: + ## Hostname {#module-services-keycloak-hostname} The hostname is used to build the public URL used as base for diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 8501c2e874ef..66a501c5c267 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -167,6 +167,11 @@ in default = "localhost"; description = '' Hostname of the database to connect to. + + For PostgreSQL, this can also be a path to a Unix socket + directory (e.g., `/run/postgresql`) to use peer authentication. + This requires adding `junixsocket-common` and `junixsocket-native-common` + to [](#opt-services.keycloak.plugins). ''; }; @@ -189,11 +194,12 @@ in useSSL = mkOption { type = bool; - default = cfg.database.host != "localhost"; - defaultText = literalExpression ''config.${opt.database.host} != "localhost"''; + default = cfg.database.host != "localhost" && !hasPrefix "/" cfg.database.host; + defaultText = literalExpression ''config.${opt.database.host} != "localhost" && !lib.hasPrefix "/" config.${opt.database.host}''; description = '' - Whether the database connection should be secured by SSL / - TLS. + Whether the database connection should be secured by SSL / TLS. + + Defaults to `false` for localhost and Unix socket connections. ''; }; @@ -252,11 +258,15 @@ in }; passwordFile = mkOption { - type = path; + type = nullOr path; + default = null; example = "/run/keys/db_password"; apply = assertStringPath "passwordFile"; description = '' The path to a file containing the database password. + + Not required when using Unix socket authentication (peer auth) + by setting `host` to a socket path like `/run/postgresql`. ''; }; }; @@ -553,6 +563,13 @@ in for more information. ''; } + { + assertion = cfg.database.passwordFile != null || hasPrefix "/" cfg.database.host; + message = '' + services.keycloak.database.passwordFile must be set unless using + Unix socket authentication (host starting with /). + ''; + } ]; environment.systemPackages = [ keycloakBuild ]; @@ -582,19 +599,32 @@ in "trustCertificateKeyStorePassword=notsosecretpassword" ] ); + + dbName = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name; dbProps = if cfg.database.type == "postgresql" then postgresParams else mariadbParams; + + # Unix socket connection requires junixsocket library and special JDBC URL + isUnixSocket = hasPrefix "/" cfg.database.host; + unixSocketUrl = "jdbc:postgresql://localhost/${dbName}?socketFactory=org.newsclub.net.unix.AFUNIXSocketFactory$FactoryArg&socketFactoryArg=${cfg.database.host}/.s.PGSQL.${toString cfg.database.port}&sslMode=disable"; in mkMerge [ { db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type; db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username; - db-password._secret = cfg.database.passwordFile; + db-password = mkIf (cfg.database.passwordFile != null) { + _secret = cfg.database.passwordFile; + }; + } + (mkIf isUnixSocket { + db-url = unixSocketUrl; + }) + (mkIf (!isUnixSocket) { db-url-host = cfg.database.host; db-url-port = toString cfg.database.port; - db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name; + db-url-database = dbName; db-url-properties = prefixUnlessEmpty "?" dbProps; db-url = null; - } + }) (mkIf (cfg.sslCertificate != null && cfg.sslCertificateKey != null) { https-certificate-file = "/run/keycloak/ssl/ssl_cert"; https-certificate-key-file = "/run/keycloak/ssl/ssl_key"; @@ -778,5 +808,8 @@ in }; meta.doc = ./keycloak.md; - meta.maintainers = [ maintainers.talyz ]; + meta.maintainers = with maintainers; [ + talyz + anish + ]; } diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix index c601943479cf..e02e4106a5ad 100644 --- a/nixos/modules/services/web-apps/misskey.nix +++ b/nixos/modules/services/web-apps/misskey.nix @@ -328,6 +328,9 @@ in }; preStart = '' install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml + install -m 700 ${ + (pkgs.formats.json { }).generate "misskey-config.json" cfg.settings + } /run/misskey/default.json '' + (lib.optionalString (cfg.database.passwordFile != null) '' ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c1f95c651af9..de8d859f876c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1391,6 +1391,7 @@ in rustls-libssl = runTest ./rustls-libssl.nix; rxe = runTest ./rxe.nix; sabnzbd = runTest ./sabnzbd.nix; + sabnzbd-module = runTest ./sabnzbd-module.nix; samba = runTest ./samba.nix; samba-wsdd = runTest ./samba-wsdd.nix; sane = runTest ./sane.nix; diff --git a/nixos/tests/sabnzbd-module.nix b/nixos/tests/sabnzbd-module.nix new file mode 100644 index 000000000000..6b04049e9131 --- /dev/null +++ b/nixos/tests/sabnzbd-module.nix @@ -0,0 +1,75 @@ +{ lib, ... }: +{ + name = "sabnzbd"; + meta.maintainers = with lib.maintainers; [ jojosch ]; + + node.pkgsReadOnly = false; + + nodes.machine = + { pkgs, lib, ... }: + { + services.sabnzbd = { + enable = true; + secretFiles = [ + (pkgs.writeText "secret-a.toml" '' + [servers] + [[example.com]] + required=1 + priority=2 + '') + (pkgs.writeText "secret-b.toml" '' + [servers] + [[example.com]] + enable=1 + priority=5 + '') + ]; + settings = { + misc = { + html_login = false; + inet_exposure = "api (full)"; + api_key = "123456"; + }; + servers."example.com" = { + enable = false; + required = false; + optional = true; + displayname = "example.com"; + host = "example.com"; + name = "example.com"; + }; + }; + }; + + environment.systemPackages = [ + pkgs.jq + (pkgs.writeScriptBin "do_test" '' + set -euxo pipefail + + misc_url="http://127.0.0.1:8080/api?mode=get_config§ion=misc&output=json&apikey=123456" + servers_url="http://127.0.0.1:8080/api?mode=get_config§ion=servers&output=json&apikey=123456" + + [[ $(curl $misc_url | jq .config.misc.inet_exposure) == 3 ]] + [[ $(curl $misc_url | jq .config.misc.html_login) == "false" ]] + + [[ $(curl $servers_url | jq .config.servers[0].enable) == 1 ]] + [[ $(curl $servers_url | jq .config.servers[0].required) == 1 ]] + [[ $(curl $servers_url | jq .config.servers[0].optional) == 1 ]] + [[ $(curl $servers_url | jq .config.servers[0].priority) == 5 ]] + '') + ]; + + # unrar is unfree + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "unrar" ]; + }; + + testScript = '' + + machine.wait_for_unit("sabnzbd.service") + machine.wait_until_succeeds( + "curl --fail -L http://localhost:8080/" + ) + + machine.succeed("do_test") + ''; +} diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index f702f1397bfe..0d3f853b7398 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.tar.gz"; - hash = "sha256-CKhR0ha3QcSeu2hG4Xj7gj0yn+e5gkohNLaMj9Jboq4="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1.tar.gz"; + hash = "sha256-1VFBGjpKgpseFMh06RdpYbYLNehM1sLJlnarhZShmVM="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.tar.gz"; - hash = "sha256-/Yuz7nDFSRZdkQJDe8oD6Ff8FHKBwdc4IknUaQwx3Yc="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1-aarch64.tar.gz"; + hash = "sha256-Pv4nLusRtX0FXo+vWH+rwFFAgQSLvL1GeX/zasC2yQ8="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.dmg"; - hash = "sha256-psuQZWL5WzfpweNMm9lWHeplOnJsldAr+pV6y+kJuI0="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1.dmg"; + hash = "sha256-98Io2xHGc3lVg2DQRh0fBVYyDUoJb/3zPuk2A7nd0xw="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.dmg"; - hash = "sha256-HCGZDO4ru//dj2yQ6AcbwD7H/lo2YuUZMcFSItS3zLI="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.1-aarch64.dmg"; + hash = "sha256-dUi9xEMqK+4ycOPrMQoJMODAyGniT6oIAbdtqCa/XoQ="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "WebStorm"; # update-script-start: version - version = "2025.3.1"; - buildNumber = "253.29346.143"; + version = "2025.3.1.1"; + buildNumber = "253.29346.242"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index e67d760c3efe..5677af1a1084 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -111,6 +111,10 @@ "date": "2020-03-27", "new": "vim-pug" }, + "vscode-diff-nvim": { + "date": "2026-01-10", + "new": "codediff-nvim" + }, "vundle": { "date": "2020-03-27", "new": "Vundle-vim" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 02892eae5b2b..477e90a5e6b7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "4.7.4-unstable-2025-12-31"; + version = "4.7.4-unstable-2026-01-09"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "9db5d3eaafe9fc3c91ce9ecfc416de2798982487"; - hash = "sha256-8wV9S3xNq7kskbV3fF9/EuCNrult7yCFQVvO+cZ7ycI="; + rev = "21bdecb25aa72119d11d7fc08c7e0ce323f1b540"; + hash = "sha256-kXshho0o6h+a0VoKkQ/OScvm0kOPRi0h8SPjzFct9GU="; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -217,12 +217,12 @@ final: prev: { LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "1.25-unstable-2026-01-06"; + version = "1.25-unstable-2026-01-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "9b43248de47e66aea521e0097e20ba25bbe29361"; - hash = "sha256-U3nEYk+3tLj5JkVuXVfiEQ79lj24rIblYGZPl5dIOpM="; + rev = "4bfe890bc319b2bd5be593767e237551858a479e"; + hash = "sha256-Gja9WujBW3rdU0wpiKXt9+BKdKmvkyMHp9NZy94NsgA="; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -412,12 +412,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "1b83928c9ff8ff9d9506acc1aa8e0bdee635c570"; - hash = "sha256-MawBfiQLyvaOsD+bxVZTOfiBHLgbJCA3mPyouUwoRK8="; + rev = "f35b7747d4d536fba96aa098a4144e5c85252828"; + hash = "sha256-Ys2LKIfJcWz99WxD1om+mttshdYQVm691US+/7bvW9U="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -765,12 +765,12 @@ final: prev: { alabaster-nvim = buildVimPlugin { pname = "alabaster.nvim"; - version = "0-unstable-2025-11-21"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "p00f"; repo = "alabaster.nvim"; - rev = "1fc9e29fbbce94f127cc8b21960b7e3c85187960"; - hash = "sha256-Xng+shYT7BtrD6ZSnCGgt01lm9ZALfYwivYRGRjNpUo="; + rev = "76ee17c34f13190d1a3532613c7ca946303f0ffe"; + hash = "sha256-U4MCkhJNKQWPVE5HC0zK6bU3ZMg4DQnheEqjAqxoGcQ="; }; meta.homepage = "https://github.com/p00f/alabaster.nvim/"; meta.hydraPlatforms = [ ]; @@ -960,12 +960,12 @@ final: prev: { artio-nvim = buildVimPlugin { pname = "artio.nvim"; - version = "0-unstable-2026-01-04"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "comfysage"; repo = "artio.nvim"; - rev = "f729822fe0c84aee70f8f21897c2b368277719b5"; - hash = "sha256-xXAY5CliQu+osfpvF7aShX3wcvypCqgpkOKVvc32f1I="; + rev = "cb862c152de92c70144043efce67f023f5f958ed"; + hash = "sha256-8/2FCeKqPjhJH6oYfyeJ5ikRdALdGtegYlxnjVcRvSA="; }; meta.homepage = "https://github.com/comfysage/artio.nvim/"; meta.hydraPlatforms = [ ]; @@ -1064,12 +1064,12 @@ final: prev: { asyncomplete-lsp-vim = buildVimPlugin { pname = "asyncomplete-lsp.vim"; - version = "0-unstable-2025-11-27"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete-lsp.vim"; - rev = "63a9d75101c3133c3ed36a21f9e6b359e4e16150"; - hash = "sha256-YndaBUl1hhkO1/7cN8A7ivrtBDXi8LarO/AsIzYMU8g="; + rev = "da23f4418a6301feac7b99e1728fb79acb243d69"; + hash = "sha256-Q6hmu5VtO0DaFhxt30aQunStaYidEoaKqPSU2SBYqfI="; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; meta.hydraPlatforms = [ ]; @@ -1455,12 +1455,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "0-unstable-2026-01-07"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "e92143368fc563f7201ba924079b5bfae3d35494"; - hash = "sha256-DJ2ond3mn8uZb9dUnq1TpqOAfsI/wJfVp35qugH8dRw="; + rev = "5378f802fc52c56f467560dbc3ea626ad06aaa79"; + hash = "sha256-dbj3IuvuxMkzaxZxXoiWAeHXyBSuSq2pdfACKajcpFo="; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.hydraPlatforms = [ ]; @@ -1819,12 +1819,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2.2.2-unstable-2026-01-07"; + version = "2.2.2-unstable-2026-01-09"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "502749878f4e586ff3c319fd0a958ed2930d7992"; - hash = "sha256-BkyIp4lY5LpEqHpVh9vnSVwhiPC2Jha5xv+nrZgBb+U="; + rev = "77eedf73894688d1cccc13dc12df41afd276ca6b"; + hash = "sha256-484EXIn0az9FoMW2CTtjMK4Sh9iXtLDu+ZGexvfL0Ks="; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -2040,12 +2040,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "1.11.0-unstable-2026-01-03"; + version = "1.11.0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "6efc53e42cfc97700f19043105bf73ba83c4ae7d"; - hash = "sha256-KS2MQpkQcZly3DXcWX3vNoTaUonbdPdV02m8ZO5GPRc="; + rev = "beaf41a30c26fd7d6c386d383155cbd65dd554cd"; + hash = "sha256-cZ6VeF69s0eQ9I7Tz8MoEKuF9w+TbA94vXj2EuDoSgU="; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -3119,12 +3119,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "0.0.82-unstable-2026-01-05"; + version = "0.0.82-unstable-2026-01-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "115be457ce9fb7efbf73db0e4f0e3e7ef16f979a"; - hash = "sha256-EgWa3dE1IE6rj+H9zev++Mkl7vJJgKDxqbDITVY90h0="; + rev = "889f5e287e746973c978b383eea0f286571d8fe0"; + hash = "sha256-c7pNpJ6S6gI94wX5GN6honS9xXmX53F8gsLQMDdzU3E="; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -3197,12 +3197,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "18.3.1-unstable-2026-01-07"; + version = "18.3.2-unstable-2026-01-10"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "3ae0cc78bfc775723306c8a7950a81449fc6018d"; - hash = "sha256-UT25wp7moEXBLbOSXyt6MtLeV1wwhPUSjbOiXDsWldk="; + rev = "85f6b7799f18392fc83ac985ff9c8da42894fd5c"; + hash = "sha256-cZcUGTVZJ+eGBzteP2djKEHTydFdOQ1CcrAUQ7vcz9M="; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3223,12 +3223,12 @@ final: prev: { codesettings-nvim = buildVimPlugin { pname = "codesettings.nvim"; - version = "1.5.4-unstable-2026-01-07"; + version = "1.5.5-unstable-2026-01-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "codesettings.nvim"; - rev = "f2d0613280037e06b65eaabe248ae0fad0459d07"; - hash = "sha256-v/AbmQCcqTBNtjevPclaS/v+/Dyu7aQA8euZxvRIazY="; + rev = "c3d9c0ad1a6a0091c40092fdc96257179587ad4e"; + hash = "sha256-oBkz3XZyGsOaqUGv/pSfObq8qLWiKqZAwUpCQjVliL4="; }; meta.homepage = "https://github.com/mrjones2014/codesettings.nvim/"; meta.hydraPlatforms = [ ]; @@ -3588,12 +3588,12 @@ final: prev: { contextfiles-nvim = buildVimPlugin { pname = "contextfiles.nvim"; - version = "0-unstable-2025-08-24"; + version = "0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "banjo"; repo = "contextfiles.nvim"; - rev = "f4a01aa465f7deeedb257266d47ef1849dd9b08b"; - hash = "sha256-tP28p/z0hzSFkurpdDeNn16rCWbcp82l6UHaD6rAn4M="; + rev = "d5d0525c32777366e5c415fdb682444ce9f753f8"; + hash = "sha256-Esr33dRsKGc7vOQ2jMx8enj4uIicsRNvYbc4GsqlFUk="; }; meta.homepage = "https://github.com/banjo/contextfiles.nvim/"; meta.hydraPlatforms = [ ]; @@ -3627,12 +3627,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "0-unstable-2025-12-20"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64"; - hash = "sha256-879050VUJpWBrHxUA3hRpcYbn3KgBGpVpKLdSVOwbIA="; + rev = "5ace9ecd0db9a7a6c14064e4ce4ede5b800325f3"; + hash = "sha256-Fh2kMKX/E4VZjxLp7im4ZmiuOgFAjqAtrfAmyh5zyfE="; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3653,12 +3653,12 @@ final: prev: { copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "1.58.0-unstable-2025-12-24"; + version = "1.59.0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "206011a8bc5078a02560d5c44177e9849e8f8d6c"; - hash = "sha256-IlAJiq8eflHk3t8wTIfoBs3SddaBtB7J/JpqnvBkP/c="; + rev = "a12fd5672110c8aa7e3c8419e28c96943ca179be"; + hash = "sha256-McrihGscbvt2lqHil3NxHUfgx/IAFDf7tdbBkv4vTK4="; }; meta.homepage = "https://github.com/github/copilot.vim/"; meta.hydraPlatforms = [ ]; @@ -3926,12 +3926,12 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "5.3.0-unstable-2025-12-26"; + version = "5.3.0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "a956559cda735fbc9f0b39541529386322afaedd"; - hash = "sha256-ffJQT5MIJaQqlFp/E0OvB8hvxgl8lDP7T5a3X/+TaEg="; + rev = "7464438b099c0ebcd42c4b6dd9abbd6ed93cb7f8"; + hash = "sha256-iU4HgEzjcZ/UE+aapTGWRcilaLmUy/QQnuIaTFT63Zg="; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; @@ -4825,12 +4825,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "b4bb557bc04cb41bd5a9b8f2442999fbccc3d7d7"; - hash = "sha256-+BaoDNEVxYqGo5Qkjc1kZYArVm2FaXyNJx+COzek5n8="; + rev = "29441d4c4f5e2e8337e8810b09e55763c5aa803d"; + hash = "sha256-5c7jWEQlq6EMM75Sbqt2q7djzZp4H4JZrdSl+oiEP8E="; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -5400,12 +5400,12 @@ final: prev: { flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2.1.0-unstable-2026-01-06"; + version = "2.1.0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "dd767fb94296d4aeb12262f3cdb5aaeb122d685f"; - hash = "sha256-/3UXDG+90RU+C9aTZu/j80Xh0WQOdcoVh9rTT+CDtxg="; + rev = "e45f4ea45ac03f5f85b0205f9183bbd1ef4ddebb"; + hash = "sha256-V8+3eb/F+9UvNK59M+CGKTZKk7aRppuGB4h+5mGelLw="; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -5413,12 +5413,12 @@ final: prev: { focus-nvim = buildVimPlugin { pname = "focus.nvim"; - version = "1.0.2-unstable-2025-11-14"; + version = "1.0.2-unstable-2026-01-09"; src = fetchFromGitHub { owner = "nvim-focus"; repo = "focus.nvim"; - rev = "26a755c363284547196ceb258a83f92608d7979b"; - hash = "sha256-R6RdzvQaCPfp3VYcMx9aim5r4Uif+4XkAF3JQdqmfVU="; + rev = "8732b45ceef77b576e60442e768437bce7915107"; + hash = "sha256-RbP+i4futrZz9VB++0L5E7Fl8kQk8nNUn1gURSBqx2c="; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-focus/focus.nvim/"; @@ -6064,12 +6064,12 @@ final: prev: { gruber-darker-nvim = buildVimPlugin { pname = "gruber-darker.nvim"; - version = "0-unstable-2026-01-03"; + version = "0-unstable-2026-01-07"; src = fetchFromGitHub { owner = "blazkowolf"; repo = "gruber-darker.nvim"; - rev = "6615b4ac1fe77a3f4f8168ba1d4a9f2fff0d8d55"; - hash = "sha256-cBMr6qfwY7yRIdZfMgT82r5RSOB1gIhHNO/f22wAkCM="; + rev = "aba065c3a79b58cc3863d5c9db319255abd1258a"; + hash = "sha256-4xB/MRTDccA5gTKe6DrN+bNfDx6fzjuIGOLdkuxg8c0="; }; meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/"; meta.hydraPlatforms = [ ]; @@ -7120,12 +7120,12 @@ final: prev: { jj-nvim = buildVimPlugin { pname = "jj.nvim"; - version = "0.3.0-unstable-2026-01-07"; + version = "0.3.0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "NicolasGB"; repo = "jj.nvim"; - rev = "a23997d3bc4405f3efc1fdd676318eac7e8c42b5"; - hash = "sha256-iwC2hbgtAuJKdHMw7m4W5QQ9pJoAi0XrQ5uEwsEJcHk="; + rev = "80d3a88f160f36c0cfce7ba6e5ca48f801d89e7d"; + hash = "sha256-nR1WxQ6OhlWQTmzCGtm/d2zzIQMYQaUPcu5mz3y1NTI="; }; meta.homepage = "https://github.com/NicolasGB/jj.nvim/"; meta.hydraPlatforms = [ ]; @@ -7224,12 +7224,12 @@ final: prev: { kanso-nvim = buildVimPlugin { pname = "kanso.nvim"; - version = "0-unstable-2025-12-30"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "webhooked"; repo = "kanso.nvim"; - rev = "927361caec8c32e210acd5c56045e0d7d80143a0"; - hash = "sha256-XwbkZGx0u37Hm2If0cmdknLVEFveEWtViag7OaoplcY="; + rev = "26f5c9686b17a27541c98551cf0cd2587627e387"; + hash = "sha256-PLrCvptPy+FO8Tn5zscqL6PIVZryXxUXPG62uM/6PME="; }; meta.homepage = "https://github.com/webhooked/kanso.nvim/"; meta.hydraPlatforms = [ ]; @@ -7341,12 +7341,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "5.3.3-unstable-2025-12-25"; + version = "5.3.3-unstable-2026-01-10"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "cd3eaa83b8d60533837202dede73238334d71832"; - hash = "sha256-xyhhvWLF+k+QG7GYOHEdmusZWsHlFg5O3np0a8pT2SU="; + rev = "ad51fbcfd674efb95a90d3b5f21271859416ea76"; + hash = "sha256-3L3mF3Py5R2y2u/XMKYy+PjQfPPTJqrAUo7+STV+cZQ="; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; @@ -8370,12 +8370,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2.1.0-unstable-2025-12-27"; + version = "2.1.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "4cfe411526a7a99c18281135e8b4765ae6330d15"; - hash = "sha256-rP6Xysr5r2E0TYa/CuiCt3m8CetpaOGpXYwYQVsRkbs="; + rev = "fe661093f4b05136437b531e7f959af2a2ae66c8"; + hash = "sha256-mS+PMT5l+NfEQOFAOIXYXHO4ZZmVxR6gJIpd3g5l5fI="; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -8630,12 +8630,12 @@ final: prev: { mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "0.17.0-unstable-2025-11-03"; + version = "0.17.0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.basics"; - rev = "862b940b1ea67993893c6fd39ca1000beed1af46"; - hash = "sha256-C01jnCjhiSyQzNv47bBD8Tz99X2I9pk/vE7gY+I81Oc="; + rev = "9f80f04cf4732939514b304e7c9146b9dc8e54c3"; + hash = "sha256-Qtxai0RM+lhIPI0koOCPaScSG7faAQb6wK6JDoZSD6g="; }; meta.homepage = "https://github.com/nvim-mini/mini.basics/"; meta.hydraPlatforms = [ ]; @@ -8786,12 +8786,12 @@ final: prev: { mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "0.17.0-unstable-2025-12-23"; + version = "0.17.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.extra"; - rev = "673633b97b64292c82d473ea2bd31b767dbe3907"; - hash = "sha256-NkZ45OXrvBojCq4ax0hj2v5cLPivf7h1CFmnIKFW6Wk="; + rev = "8bb48fadc6e31d8b3550f587661ded15d4396451"; + hash = "sha256-g/zJTuYoWCGfymfXVtMAiXnAbDogX3VnVjeToX8DYHM="; }; meta.homepage = "https://github.com/nvim-mini/mini.extra/"; meta.hydraPlatforms = [ ]; @@ -8981,12 +8981,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "0.17.0-unstable-2026-01-06"; + version = "0.17.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "fb4ccfed03c1f0d9db702f93a65cb4c0c6c2832b"; - hash = "sha256-JDMQNDLC8ueP6UB3UrC1vLZ5B0IAExua3L6IYnASg6E="; + rev = "8dccba88fc4dce006ca0ad668067c9e0d5ce7702"; + hash = "sha256-5TtVFnngyu0oVsmSDz5ywov1rJdwh1oDodqr1zg2NXM="; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -9657,12 +9657,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "3.38.0-unstable-2026-01-05"; + version = "3.38.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "6ba0ef540a8dc92f9533433a3f10d414014676aa"; - hash = "sha256-RX4eQ6j2CzWxU1112tFXF1UgtMK2nykcjeNeHLGolnE="; + rev = "8967c38933b8db71e8210185fc08fdab92fa5e6e"; + hash = "sha256-aog8FBJmdpx+QoSjimwYEGhP8LxTti8qvcVghbTdbHs="; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -9683,12 +9683,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-01-04"; + version = "1.4.0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f2fd6a4f009d378b419cb5fd46377a2284b65aa7"; - hash = "sha256-sjZnRh9qUruo07GuliosvyHIbV8qYKJwPl1jKabFrhA="; + rev = "f063e7357b74162f0299e3a731fbb2e66fd79f6b"; + hash = "sha256-g/3aveyBphhfH9zrThMj+06aDdcuuYH4k8myJRGGuJw="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -9748,12 +9748,12 @@ final: prev: { neogen = buildVimPlugin { pname = "neogen"; - version = "2.20.0-unstable-2025-05-03"; + version = "2.20.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "d7f9461727751fb07f82011051338a9aba07581d"; - hash = "sha256-uXV8YZLO44lFys1RfIqsvonC2YEYwb1iiaiLfsON3hE="; + rev = "23e7e9f883d01289ebd90e98025acc860ea26366"; + hash = "sha256-4KVPEpu3xsO4htGxudmgr8zMMOzn+eJSb9kl3Ww0zTk="; }; meta.homepage = "https://github.com/danymat/neogen/"; meta.hydraPlatforms = [ ]; @@ -10089,12 +10089,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "0.22.22-unstable-2025-12-22"; + version = "0.30.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "d3cd312ffa8ba204c7f9be6ee4a05adee0ff3b3c"; - hash = "sha256-rUv8UQ4ue1BBAQYKOC4d6ItLbEckXQy9whSq92jykiY="; + rev = "d50b0538f1c3e52f1af47473a3e25e6abe52fe55"; + hash = "sha256-ZvxQhWXGa8bdpbUb8DdoWKDJz+7ECrzgX69+B0C5Nc4="; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.hydraPlatforms = [ ]; @@ -10284,12 +10284,12 @@ final: prev: { neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "0-unstable-2025-10-21"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "38caa8b5b969010b1dcae8ab1a569d7669a643d5"; - hash = "sha256-2Gt//JJZEMwsI/R9OR1orLYg4Eur6gvDWhAqQ498R6E="; + rev = "e5a9f0fa2918d6b5f57c21b3ac014314ee5e41c8"; + hash = "sha256-L53zl5XYPvT8gPpPC4IyYpK1CZk7Iv6au3xYu6OD/uY="; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; meta.hydraPlatforms = [ ]; @@ -10505,12 +10505,12 @@ final: prev: { nightfly = buildVimPlugin { pname = "nightfly"; - version = "0-unstable-2025-11-30"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "35b7292334eba451f9f94252c7df1509570f864b"; - hash = "sha256-i/ulzT7vWw/S7k30HlR+437+0vC5dkmr64ZV8HX5svc="; + rev = "24f2c71dcdbf1adf4656812a62247d101b7a4974"; + hash = "sha256-Y62WbXATjTXBKDRaMPwldrUojoHo4a27PmznTh65+gE="; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -10830,12 +10830,12 @@ final: prev: { nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "0-unstable-2025-01-20"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "c9cef8ac576800b6b813ad16be692d141262a4c3"; - hash = "sha256-foYDTaEvXxYgclSyXilxRVCTB7j5L7B+5ZRD2+HNoIM="; + rev = "76eea518e3a34274be08938f38919840c3d19dcb"; + hash = "sha256-XjSDOCwszCV7lKySInnqMU1ScCYpOhyQuNRtuRsM5mE="; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; meta.hydraPlatforms = [ ]; @@ -11103,12 +11103,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "0-unstable-2026-01-07"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "3d4db4b741e4fdb236e705d2b92bde13c9c4aba6"; - hash = "sha256-/3j9CRa691i5obGPkthoIwEmMiWHJzIZgrBrQdHmzhA="; + rev = "526e597a67e959c9064bf29d5810a490e7cd5c18"; + hash = "sha256-WXe0pMhUvGcPhsVKjXDpHiysdIp5RzELlMaTpAooI0E="; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -11519,12 +11519,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2.5.0-unstable-2026-01-04"; + version = "2.5.0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0b38bc74487e73489624d61396af7805af9cc75f"; - hash = "sha256-mSZYePlc8UES6VnhKv329DTJB34E1bGJDSdrn/2dUjs="; + rev = "92ee7d42320edfbb81f3cad851314ab197fa324a"; + hash = "sha256-AOn+afoh9yJUEcF8kJR3Nm1D6cT6fDCQ+wTFwPXwFRA="; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -11818,12 +11818,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "81110457ce4e2834aa54c5086667baaedd3ace86"; - hash = "sha256-c2kc9CWVS38g6Y5hh7ansn436Ko+lPvQi3IzHLM+f9E="; + rev = "af69702b1e6881b0330d22d3a62989e320d4d6d1"; + hash = "sha256-ey5+s8GbvYUCWXiXXGzM/yL2NmLKY957sxuLBfDGALc="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.hydraPlatforms = [ ]; @@ -11831,12 +11831,12 @@ final: prev: { nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "a315cdf12d322607ff4ecf50a3d28c4478c5fd32"; - hash = "sha256-At7F3kK/dgkiC6qPilYBPdkJxm+/c5vtyjTyiAUP9ic="; + rev = "5e8cd238a6b988da4a328b3bbb1ca5f30648c5fd"; + hash = "sha256-23/e9l0KSi0aWcZCm+TVbBAsMEPH4iremoB4gLqFda4="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.hydraPlatforms = [ ]; @@ -12026,12 +12026,12 @@ final: prev: { nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "0.10.0-unstable-2026-01-07"; + version = "0.10.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "de878155ca66c49b027b1380e4e60a6c665b2630"; - hash = "sha256-aFDqXN4oyeHWG68mqjT86R3GO7uiT/k4Ddg5b4lNnkE="; + rev = "5a7e5638e7d220575b1c22c8a2e099b52231886e"; + hash = "sha256-1EPAkKmGorpSkg++9zGEqvBsxDRSOi0B5DQVvv2NW0w="; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.hydraPlatforms = [ ]; @@ -12390,12 +12390,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "3.15.3-unstable-2026-01-06"; + version = "3.15.4-unstable-2026-01-10"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "70853874db35495530563326d6b7f66170553beb"; - hash = "sha256-GyBQrHsc5CYn02ownPimbDLCMOu0bX8BPkvsI2yKWF8="; + rev = "f6b241fa08d157701b9b0850b1251d98f86b122e"; + hash = "sha256-Ai7asxMrLulmw3CJXpQAYJWcHICjWDmTgALTFg1qyEU="; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -12676,12 +12676,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "NickvanDyke"; repo = "opencode.nvim"; - rev = "93567824fb171d0740d0f7f1e85118bb061f1811"; - hash = "sha256-L92X+hchWT7OiSE3cFxm6q+8JfE8lyfVjiDtemmossY="; + rev = "e83a9eb1e24aad925769cc7451ba6c2fbe54b400"; + hash = "sha256-VsNrXbVFYpuSsnxpC61VL3zbwhlRcwhmJbkGlLR0Ryc="; }; meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/"; meta.hydraPlatforms = [ ]; @@ -13263,12 +13263,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "0.3.0-1-unstable-2026-01-05"; + version = "0.3.0-1-unstable-2026-01-08"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "5e878c8755f8414f879024999315bfb3530ec9aa"; - hash = "sha256-7IE3uzs/q6l+xPzz28/BILTsU7+c0cfaVAQNG2Nd6ao="; + rev = "0406938a2b874ab42e9711107e176be04dd80828"; + hash = "sha256-gyRfjUKIqMR+RpuO+V51Ut7p/2l9hIQyrNXaWrOf5As="; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -13680,12 +13680,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "8.10.0-unstable-2026-01-03"; + version = "8.11.0-unstable-2026-01-07"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "da6a7b25471ab23824f3429225973186eb0b62d2"; - hash = "sha256-IqH0GWDy08aWMAxaqSwL1yf/DxDgVUyhlEXGR/+UjOw="; + rev = "73a6ebc842cf81926eb1d424820b800f6f6a1227"; + hash = "sha256-pM4UaBU2Y5PrnJaAi5l1L4ZOFiKzcgWTeA6NIOzDQ9U="; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -14215,12 +14215,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.0.5-unstable-2026-01-02"; + version = "2.0.5-unstable-2026-01-09"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "d2629b2451649946c95bcc11ea5eaf15c96b23ef"; - hash = "sha256-zPoCDyeU2SkfXrKyOC26i6KChEyF6S+5oy4TEM3F7/s="; + rev = "fdd63c566e760f14d9390d43d5dc6bf6eea5a07b"; + hash = "sha256-selhYzllVRSB3lLQ+R11BauFA574UMSqWCwL0QQm8UU="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -14345,12 +14345,12 @@ final: prev: { solarized-osaka-nvim = buildVimPlugin { pname = "solarized-osaka.nvim"; - version = "0-unstable-2025-04-19"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "craftzdog"; repo = "solarized-osaka.nvim"; - rev = "f796014c14b1910e08d42cc2077fef34f08e0295"; - hash = "sha256-JuIeLpkF7jBCI/wrO3RQPtKbso57eTBglCAI5siEwks="; + rev = "5dd1969a7492f3a2c0fde5d9d2472aa751c44d3b"; + hash = "sha256-bEHBXw7ufHOrqw/frbBSaLv7Kr8F6BK2B7E83dKAsHk="; }; meta.homepage = "https://github.com/craftzdog/solarized-osaka.nvim/"; meta.hydraPlatforms = [ ]; @@ -14371,12 +14371,12 @@ final: prev: { sort-nvim = buildVimPlugin { pname = "sort.nvim"; - version = "2.2.0-unstable-2025-08-25"; + version = "2.2.1-unstable-2026-01-08"; src = fetchFromGitHub { owner = "sQVe"; repo = "sort.nvim"; - rev = "bb92140e1b96d62339bd5ab5b6df1eecca0d5da6"; - hash = "sha256-L9FWKvsgRE5MsLmhkXllDFZKlBshFFbyRfjZHWCfquA="; + rev = "a82b2546e1c6ecb4f24e959fdda6c38bc441c4f4"; + hash = "sha256-hbKFEpEL5hh/un37/qW+HGpB4mrji7KiHxDxa41XiJk="; }; meta.homepage = "https://github.com/sQVe/sort.nvim/"; meta.hydraPlatforms = [ ]; @@ -14867,12 +14867,12 @@ final: prev: { tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2.8.0-unstable-2025-05-23"; + version = "2.8.1-unstable-2026-01-07"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "b3affa6db7eab80fca2a2db5b73b473144507039"; - hash = "sha256-26ysSn0klZYMPEaxCe/1zD2qCYwobU5dZSq5P/GtwMU="; + rev = "3c130e1fcb598ce39a9c292847e32d7c3987cf11"; + hash = "sha256-YAnw/FpSLqKjvnug4bdvbGHpYWwtDKuh/DmxhK+PSu0="; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; meta.hydraPlatforms = [ ]; @@ -15338,12 +15338,12 @@ final: prev: { telescope-sg = buildVimPlugin { pname = "telescope-sg"; - version = "0-unstable-2025-06-10"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "Marskey"; repo = "telescope-sg"; - rev = "9eb1c2a35359892c0b02be4bbdd549e06ad097ba"; - hash = "sha256-/y6ou7cyTK+pDSTLbYXG6lCUtOIbhH3l/I8q5o1G7Dc="; + rev = "1992a9d5e51b7b41673754daf1b15654bfd662de"; + hash = "sha256-aDzqVHnHIAiXgVSsgq3WIgzDVYKabUThKuUj3aJ6T3Y="; }; meta.homepage = "https://github.com/Marskey/telescope-sg/"; meta.hydraPlatforms = [ ]; @@ -15729,12 +15729,12 @@ final: prev: { tinted-nvim = buildVimPlugin { pname = "tinted-nvim"; - version = "0-unstable-2026-01-07"; + version = "0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-nvim"; - rev = "7bec955af380882e2798af592ff521e771a2a6d0"; - hash = "sha256-ja8ZZ5gUgHm1M8Aul1eF/B7yr7Vtf8kvjrOvHlF1gM4="; + rev = "0a59c2bd40c3859cc62d7a072a9f0c3622fd2d18"; + hash = "sha256-hbxgR9bw+shSlm+PTJ0Qqt4+i18wV3L26VhZoX0jjhs="; }; meta.homepage = "https://github.com/tinted-theming/tinted-nvim/"; meta.hydraPlatforms = [ ]; @@ -15742,12 +15742,12 @@ final: prev: { tinted-vim = buildVimPlugin { pname = "tinted-vim"; - version = "0-unstable-2026-01-07"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-vim"; - rev = "b4a608eec780b897c1cce89ab72e3046e0e755d0"; - hash = "sha256-UFbLe0bmJ98ArIbiesh6oE88OI2sDTpDkkjsGyOO8LA="; + rev = "4da1e84a56193f7a28173019dfc384b67598e1d0"; + hash = "sha256-K682io0hXBHfgeCK2/cl42eCErK886WodVX2Rc0VLSM="; }; meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; meta.hydraPlatforms = [ ]; @@ -15781,12 +15781,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "0-unstable-2026-01-04"; + version = "0-unstable-2026-01-07"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "f06ffded0b6069a257d6aa8ae7113104b7313fc1"; - hash = "sha256-xBwmd/LwVLQnS5SPtI+LhJWwgMcRdkqyvFjfarLoDf8="; + rev = "c7b1488ad0b389763c34bd17a6264424b3da5a52"; + hash = "sha256-ORa1+76JhUAt1zefqtC+/ZuveScuco9r8fJps50OWYk="; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -16161,12 +16161,12 @@ final: prev: { tv-nvim = buildVimPlugin { pname = "tv.nvim"; - version = "0-unstable-2025-12-25"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "tv.nvim"; - rev = "e22cf23e141b77d0e1719700775d5a85b129c98a"; - hash = "sha256-QBVQWnmaV7wTlz9uNk1gri+kePLjVt4OefAQrpbVqWg="; + rev = "38fb9d794d843c927ae0b1847d4b80c06176ee35"; + hash = "sha256-VDXkd9pWN2QZ1PihXK3hiJ88VJH5EzyqCkwMBnvTfEA="; }; meta.homepage = "https://github.com/alexpasmantier/tv.nvim/"; meta.hydraPlatforms = [ ]; @@ -16369,12 +16369,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "0-unstable-2026-01-05"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "23b831f6e3736d54a0516940dec3f56d143b9015"; - hash = "sha256-b31ZaEk8CAFoR6FjZxa4KGUPfaPpUASIAu3HWprW2Eo="; + rev = "0a7a9b09d13bb9dd91c7f30b658145ac783285c4"; + hash = "sha256-TkVcq+ksgK1q6a4Gi46D1gD7RaB2Ot8STYtAv6WzaBk="; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -19647,12 +19647,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "0.0.1-unstable-2025-12-12"; + version = "0.0.1-unstable-2026-01-09"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "3b95615e4c7c78e739285b49ce89b2d2c4bf3928"; - hash = "sha256-7hHrLgLmrvLFTQJ/1CLxRCHM4twETUakFhUp0KACmGc="; + rev = "3894b738f55c6893d71c2aaf8fc2e8b4c535e0f9"; + hash = "sha256-/cT7J/bbY/+uE1i581sIO03vVw8OU2bNIPx82txOHiU="; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -19907,12 +19907,12 @@ final: prev: { vim-moonfly-colors = buildVimPlugin { pname = "vim-moonfly-colors"; - version = "0-unstable-2025-11-30"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-moonfly-colors"; - rev = "1ad5a8d40176a8749f0c77b8875225d9d299a438"; - hash = "sha256-izM1EFBfnAoDWho8Zfsu8i2bUkWvV6oQzGz/9NFVgnA="; + rev = "72fab23f286d9989a110516058cc2154e90b3ffa"; + hash = "sha256-bM8FIROU6akoo0mLHQfDeQPMyC0XErftMLBeQkraBjM="; }; meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/"; meta.hydraPlatforms = [ ]; @@ -20622,12 +20622,12 @@ final: prev: { vim-prosession = buildVimPlugin { pname = "vim-prosession"; - version = "0.7.5-unstable-2025-08-22"; + version = "0.7.5-unstable-2026-01-07"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "df3677ac974a08b054915db461bf5fd4599da103"; - hash = "sha256-U4dp9X2VS0bZ06RNZ7WEqfoM9gJdO74YywbXneGyb1U="; + rev = "f88c0fa1691e0f88f0ddd50f5028a4b523509b3d"; + hash = "sha256-Zi9HVTYU6vABAqcvIbdcx0YtVHvKtkJupaLK3umO+DY="; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; meta.hydraPlatforms = [ ]; @@ -21324,12 +21324,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "0.5.2-unstable-2025-12-17"; + version = "0.5.2-unstable-2026-01-08"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "38ce902d638e128ba41c8ed37c2c6cf6b20c84fd"; - hash = "sha256-P0s8jwg+7tf3V8hoC8S/4x2mTs/OXgSsWXuSTWXVyVM="; + rev = "fcbdc27e3c351092dfe28252e6b1bf1ec70f892b"; + hash = "sha256-rX0z8l8I/hvshUTqNXOE+omxPklXWXXQ1NiINQvZiZg="; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -22444,12 +22444,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2.17-unstable-2026-01-02"; + version = "2.17-unstable-2026-01-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a50f40783c1cade2e8e2994a9f4a8e038a0a57bc"; - hash = "sha256-jwW4Ljp8wxy/lE7Xh3Fhi8XaVDLtgpD4XyA78Xa+DT4="; + rev = "3abfa1ff75b81c01e4305e8062549ac0ea5cc9b8"; + hash = "sha256-FMh0ftKZ+wQXgNWn1lOwbFW8Adp9sjUbGrw9doHaxrs="; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -22574,14 +22574,14 @@ final: prev: { vscode-diff-nvim = buildVimPlugin { pname = "vscode-diff.nvim"; - version = "1.13.3-unstable-2026-01-05"; + version = "2.8.0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "esmuellert"; - repo = "vscode-diff.nvim"; - rev = "1672c904898845df34fa006c7e7610ac44514cc5"; - hash = "sha256-aI3JowDmk4hjuiOyKEZQPd1OWJbdh2pM7sd9huRt7Zc="; + repo = "codediff.nvim"; + rev = "5c52cdd4d007e72062cb0fd2fb398197b6d51040"; + hash = "sha256-pGDjzwjz3OOpMOAJGR5oHAv/LBlUlbMbYGenvB8SNiU="; }; - meta.homepage = "https://github.com/esmuellert/vscode-diff.nvim/"; + meta.homepage = "https://github.com/esmuellert/codediff.nvim/"; meta.hydraPlatforms = [ ]; }; @@ -22717,12 +22717,12 @@ final: prev: { wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "0.11-unstable-2026-01-02"; + version = "0.11-unstable-2026-01-10"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "473f23dc606524d19fce6fcebc150a45bfc1608a"; - hash = "sha256-gEtehZp3M23ZXEcJ0i+aKSS7wW4Xl6Ao3bCDhlqYdrk="; + rev = "8e4c7dcac1eb8d18bb4be55d1a84676d686a7e57"; + hash = "sha256-/wMBmwwF2hzNp6rIKmPIAtewFsnqtB0fvZid59Blkdw="; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; meta.hydraPlatforms = [ ]; @@ -23017,12 +23017,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "13.1.1-unstable-2026-01-07"; + version = "13.1.3-unstable-2026-01-10"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "27f8cca8f481527b6b894e9e393a30b5944f6850"; - hash = "sha256-CNlVpwqLiLVeVys67D1pqHz5Vaslv5BTvsIvdk75lug="; + rev = "4a8bd3284708e11e48bcd865892902a46abdcce0"; + hash = "sha256-sxCOzQJPSP9Jbs4CUCvDKpmUyYPsVmUdQ7ySqi0wf8c="; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -23160,12 +23160,12 @@ final: prev: { zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "0.4.6-unstable-2026-01-03"; + version = "0.4.6-unstable-2026-01-09"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "d32dde546b88719775a5062d36c4f3129273165e"; - hash = "sha256-L/XbDnj0xFqGxrf0e1oVCXtxVfAnwSjwkTYGGyPoNh8="; + rev = "a0b6c64c91cf3a4de1114f127ccd438b9c03e064"; + hash = "sha256-9pGuuYCEFZZXpMUrGnpOHD7pI+dUlwiJBYys3QPg9A8="; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; meta.hydraPlatforms = [ ]; @@ -23186,12 +23186,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "0-unstable-2025-12-14"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "46920219393cdbb71673396f2bd55e2ff05b1fbe"; - hash = "sha256-z9LLCTr/Kh9oSm1/IKIh/CX0AUHtp1FDUPrdQziYlIY="; + rev = "483e7b9d12449b24d846209dcc648d4de1934a4e"; + hash = "sha256-BxrFTRTFi4cyEFqRO/dN+rE5JuqeXrBDsH9LtcsRVmA="; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index d23da3fe133b..b8c8dccb4960 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -38,6 +38,8 @@ let "plenary-nvim" "rest-nvim" "rocks-config-nvim" + "rocks-dev-nvim" + "rocks-git-nvim" "rocks-nvim" "rtp-nvim" "rustaceanvim" diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 10847d485c3d..86decf313fdb 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -145,12 +145,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=653cce3"; + version = "0.0.0+rev=23b2125"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "653cce316fbff8d212a2488ae13df648efb542a4"; - hash = "sha256-SHEGsVac8HMl/PpdZ4GyRHzEti8HXBJrXnx0hoFd9qU="; + rev = "23b21252da8b8cb0f03d1d1fc4c8f87d407e1cdf"; + hash = "sha256-eJ1XAPrVCoGQtrRJdcB/V4ULUmYXemUAE3FQijpH8q8="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -209,6 +209,17 @@ }; meta.homepage = "https://github.com/ambroisie/tree-sitter-bp"; }; + bpftrace = buildGrammar { + language = "bpftrace"; + version = "0.0.0+rev=dee4269"; + src = fetchFromGitHub { + owner = "sgruszka"; + repo = "tree-sitter-bpftrace"; + rev = "dee4269b564fdf7071ee454e873767fd334f79ae"; + hash = "sha256-fvsJuRwQTQjpaSOE55EbFLazgrAU/xs0YUffO/z5bJc="; + }; + meta.homepage = "https://github.com/sgruszka/tree-sitter-bpftrace"; + }; brightscript = buildGrammar { language = "brightscript"; version = "0.0.0+rev=253fdfa"; @@ -233,12 +244,12 @@ }; c3 = buildGrammar { language = "c3"; - version = "0.0.0+rev=805f776"; + version = "0.0.0+rev=2c04e78"; src = fetchFromGitHub { owner = "c3lang"; repo = "tree-sitter-c3"; - rev = "805f776dcfbfef5c9baf4270ec942b3e8dc7ff16"; - hash = "sha256-XA0jEX4dxA6PmXMoLnaul1DKGn3NoeFm2J3qpkBuCXo="; + rev = "2c04e7858d63497152d42f08d3067972618aeedc"; + hash = "sha256-YqrdnaCh5OnVtQJiBj45n6NYqIthDnNBeYjMCNmFcD0="; }; meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; }; @@ -808,12 +819,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=e013289"; + version = "0.0.0+rev=589151a"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "e0132896b8959c09dc20b56e4a1c5d25bc341697"; - hash = "sha256-pqbU0abjoonI+04Y2OZeGLWeoYt/PspiOC0rAJlu2Qg="; + rev = "589151aab08fdd7404678330e8abacf9b78bb595"; + hash = "sha256-NlGvYCx0y9zPgziEAF6kpUeUcoCwzdn36tXdgtSsP1s="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -952,12 +963,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=0c0c63a"; + version = "0.0.0+rev=dd4e328"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "0c0c63a07998767b22f0d2655f903611eca6acd0"; - hash = "sha256-vL2MyZ3dly5nZqfxlfC9brE8P1tUxdRtJLxlkN7XKi4="; + rev = "dd4e328c5fd5f158d47a22339d8ce0f8be918a0b"; + hash = "sha256-9RoKAtdHmryAiBG6s/Og7qXt2Z0IkrN8cHA+8NZf2FM="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -1393,12 +1404,12 @@ }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=v0.4.0"; + version = "0.0.0+rev=v0.5.1"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - rev = "v0.4.0"; - hash = "sha256-qgB2s/ghmOGjJ+MH7p3ZQKa+RMxx58642Z9lYC1wlq4="; + rev = "v0.5.1"; + hash = "sha256-bt/T6O/7of8r9DrA6DU8pM4vWlBCgWWzw89GZbDyJnw="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; @@ -1604,12 +1615,12 @@ }; kos = buildGrammar { language = "kos"; - version = "0.0.0+rev=5f11d41"; + version = "0.0.0+rev=03b261c"; src = fetchFromGitHub { owner = "kos-lang"; repo = "tree-sitter-kos"; - rev = "5f11d41b3150b0837e8b3964151ebb7fc4f367e9"; - hash = "sha256-tdiNHUUTvUpH2JSPxxgx7aw5XTeUmk0hoM9gI/c/WOk="; + rev = "03b261c1a78b71c38cf4616497f253c4a4ce118b"; + hash = "sha256-38i2AbPZNQb5EOUoyNvk20HfesLmbkvNxn/oyGx/W3k="; }; meta.homepage = "https://github.com/kos-lang/tree-sitter-kos"; }; @@ -1737,12 +1748,12 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=e284fce"; + version = "0.0.0+rev=de08dfd"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-lua"; - rev = "e284fcec45ead0d477e326fccd2cd4a68a89dae4"; - hash = "sha256-GCdVwRvAHANeRFpHK1On3xb8ThYDo1wO1VQDNen+rAM="; + rev = "de08dfd9640604763558530d2ce703cbe6a16bb6"; + hash = "sha256-zJaXgnUAbcMS2BwqK/ipLeXgl66HwxPhAb//JENMHxg="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-lua"; }; @@ -1871,12 +1882,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=c7eec06"; + version = "0.0.0+rev=9edc920"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "c7eec06be8a9ddae688e1b03fca2eed79e9801c4"; - hash = "sha256-5OueN8krwGnMtXF1HCbA4eDINIneLzEA7DkxnMkxUhQ="; + rev = "9edc9201736c5a471314b4e28c20d0f0b4642b6f"; + hash = "sha256-Ptg61FcxAriCFPJlsjCJcYmJFpHv7WPYLCj3AfJN5lQ="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -2862,12 +2873,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=2d5dcd1"; + version = "0.0.0+rev=5129061"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "2d5dcd16f9ee49cb5a6d99eabb00fd4ea298587f"; - hash = "sha256-TaM4JWAEvvAEsH2pI+disiWdrBYaMKzq4JtgsfSZqBE="; + rev = "5129061608da71146c813e13c32a54f4b13645c8"; + hash = "sha256-gsWPwWiSr+oo64xtEXNJ4uica8ooA9g4ExVubEXhEe8="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -3674,6 +3685,9 @@ bp = buildQueries { language = "bp"; }; + bpftrace = buildQueries { + language = "bpftrace"; + }; brightscript = buildQueries { language = "brightscript"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 542962a8f3ff..49e2b0ae9bd8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -161,6 +161,13 @@ assertNoAdditions { vim-rhubarb plenary-nvim ]; + nvimSkipModules = [ + # Address in use error from fzf-lua on darwin + # https://github.com/NixOS/nixpkgs/issues/431458 + "advanced_git_search.fzf.previewers.init" + "advanced_git_search.fzf.pickers.init" + "advanced_git_search.fzf.pickers.utils" + ]; }; aerial-nvim = super.aerial-nvim.overrideAttrs { @@ -170,6 +177,11 @@ assertNoAdditions { telescope-nvim fzf-lua ]; + nvimSkipModules = [ + # Address in use error from fzf-lua on darwin + # https://github.com/NixOS/nixpkgs/issues/431458 + "aerial.fzf-lua" + ]; }; agitator-nvim = super.agitator-nvim.overrideAttrs { @@ -1495,6 +1507,11 @@ assertNoAdditions { fzf-lua telescope-nvim ]; + nvimSkipModules = [ + # Address in use error from fzf-lua on darwin + # https://github.com/NixOS/nixpkgs/issues/431458 + "himalaya.folder.pickers.fzflua" + ]; }; hover-nvim = super.hover-nvim.overrideAttrs { @@ -1613,7 +1630,6 @@ assertNoAdditions { dependencies = [ kulala-http-grammar ]; buildInputs = [ curl ]; - patches = [ ./patches/kulala-nvim/do-not-install-grammar.patch ]; postPatch = '' substituteInPlace lua/kulala/config/defaults.lua \ --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' @@ -2864,6 +2880,9 @@ assertNoAdditions { nvimSkipModules = [ # Issue reproduction file "minimal" + # Address in use error from fzf-lua on darwin + # https://github.com/NixOS/nixpkgs/issues/431458 + "obsidian.picker._fzf" ]; }; @@ -4280,6 +4299,11 @@ assertNoAdditions { snacks-nvim telescope-nvim ]; + nvimSkipModules = [ + # Address in use error from fzf-lua on darwin + # https://github.com/NixOS/nixpkgs/issues/431458 + "zk.pickers.fzf_lua" + ]; }; zotcite = super.zotcite.overrideAttrs { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0aaa9468cb42..769feb0329d1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -246,6 +246,7 @@ https://github.com/ravitemer/codecompanion-history.nvim/,HEAD, https://github.com/franco-ruggeri/codecompanion-lualine.nvim/,HEAD, https://github.com/franco-ruggeri/codecompanion-spinner.nvim/,HEAD, https://github.com/olimorris/codecompanion.nvim/,HEAD, +https://github.com/esmuellert/codediff.nvim/,HEAD, https://github.com/mrjones2014/codesettings.nvim/,HEAD, https://github.com/gorbit99/codewindow.nvim/,HEAD, https://github.com/metakirby5/codi.vim/,, @@ -1733,7 +1734,6 @@ https://github.com/navicore/vissort.vim/,, https://github.com/liuchengxu/vista.vim/,, https://github.com/mcauley-penney/visual-whitespace.nvim/,HEAD, https://github.com/EthanJWright/vs-tasks.nvim/,HEAD, -https://github.com/esmuellert/vscode-diff.nvim/,HEAD, https://github.com/Mofiqul/vscode.nvim/,, https://github.com/dylanaraps/wal.vim/,, https://github.com/mattn/webapi-vim/,, diff --git a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix new file mode 100644 index 000000000000..ae882e7da509 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-37.1.1+up37.1.0.tgz"; + sha256 = "0q568ffjhxmw87fzwafxlxrzx2lgcqlqbwj87pbc2xszh9pyakyd"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-37.1.1+up37.1.0.tgz"; + sha256 = "0gpcr6zfbncvp2sjjwzg732k4xfr5ba0pbc5x08lgwvibqpp4r27"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch b/pkgs/applications/networking/cluster/k3s/1_35/go_runc_require.patch similarity index 100% rename from pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch rename to pkgs/applications/networking/cluster/k3s/1_35/go_runc_require.patch diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json new file mode 100644 index 000000000000..aa290e65619b --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json @@ -0,0 +1,26 @@ +{ + "airgap-images-amd64-tar-gz": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "af7ce67f0a8c457618a492ba995cc645d8ad13512008b88db97719941c39389a" + }, + "airgap-images-amd64-tar-zst": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2e3d6d14bbbeb8c16f1849cca8da48887c5a7ddceb1cc2bf60be63e4fa8c63f3" + }, + "airgap-images-arm-tar-gz": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "82cf1310db1bfac5733c5c16864034c6c7c7affc60c39be610ce7cf169631ef5" + }, + "airgap-images-arm-tar-zst": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "27407fd1553c89b8ccd3b45ad0fbdcd483c1a010e7b28b60b24a8e73b58aa783" + }, + "airgap-images-arm64-tar-gz": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "cb3d24f44c9f29da3421e99db0801f2a30b3e16c7032c423a9b631c0fc66a5fa" + }, + "airgap-images-arm64-tar-zst": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "b6cb3c06f19859d3a5fba54b305097e89d2a86b5bce9e8360a46b9d2e67da565" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix new file mode 100644 index 000000000000..54a6fbdde470 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix @@ -0,0 +1,21 @@ +{ + k3sVersion = "1.35.0+k3s1"; + k3sCommit = "a6c6cd15c0c42ec9fce21f8ad5f42aa74fddb4f2"; + k3sRepoSha256 = "0033m0vbysy2bcjfmam387580j1cmq6cys8diismgf8m5s64nivb"; + k3sVendorHash = "sha256-S9GkT87C8qbuefH93Y6d0Y95NNuT6paNdDkmSDllFIY="; + chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.15.0"; + k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sCNIVersion = "1.8.0-k3s1"; + k3sCNISha256 = "04xig5spp81l81781ixmk99ghiz8lk0p16zhcbja5mslfdjmc7vg"; + containerdVersion = "2.1.5-k3s1"; + containerdSha256 = "0n0g58d352i8wz0bqn87vgrd7z54j268cbmbp19fz68wmifm7fl8"; + containerdPackage = "github.com/k3s-io/containerd/v2"; + criCtlVersion = "1.35.0-k3s2"; + flannelVersion = "v0.27.4"; + flannelPluginVersion = "v1.8.0-flannel1"; + kubeRouterVersion = "v2.6.3-k3s1"; + criDockerdVersion = "v0.3.19-k3s3"; + helmJobVersion = "v0.9.12-build20251215"; +} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 38835677408a..c6c5f758dfc8 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -399,6 +399,13 @@ buildGoModule (finalAttrs: { --replace-fail \ "go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' \$1" \ "go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' \$1" + + # Can't use curl during the build, we use our own go version anyway. + # Fails quiet as this line is only present starting from 1.35 + substituteInPlace scripts/version.sh \ + --replace-quiet \ + 'VERSION_GOLANG="go"$(curl -sL "https://raw.githubusercontent.com''${PKG_KUBERNETES_K3S/github.com/}/refs/tags/''${VERSION_K8S_K3S}/.go-version")' \ + "" ''; # Important utilities used by the kubelet, see diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 7825f8173191..2b9d5dbd54c8 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -43,11 +43,20 @@ in } ) extraArgs).overrideAttrs { - patches = [ - # Adds explicit require of opencontainers/runc to go.mod before version.sh is called and - # removes it afterwards so that later build commands don't complain about inconsistent - # vendoring. - ./1_34/go_runc_require.patch + patches = [ ./go_runc_require.patch ]; + }; + + k3s_1_35 = + (common ( + (import ./1_35/versions.nix) + // { + updateScript = [ + ./update-script.sh + "35" ]; + } + ) extraArgs).overrideAttrs + { + patches = [ ./go_runc_require.patch ]; }; } diff --git a/pkgs/applications/networking/cluster/k3s/go_runc_require.patch b/pkgs/applications/networking/cluster/k3s/go_runc_require.patch new file mode 100644 index 000000000000..8d8d5912afd1 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/go_runc_require.patch @@ -0,0 +1,18 @@ +# Adds explicit require of opencontainers/runc to go.mod before version.sh is called and +# removes it afterwards so that later build commands don't complain about inconsistent +# vendoring. +diff --git a/scripts/package-cli b/scripts/package-cli +index a15d754926..bc450dbe4e 100755 +--- a/scripts/package-cli ++++ b/scripts/package-cli +@@ -3,7 +3,10 @@ set -e -x + + cd $(dirname $0)/.. + ++runc_require=$(grep "github.com/opencontainers/runc" go.mod | awk -F '=> ' '{print $2}' | xargs -0 printf 'require %s') ++echo "$runc_require" >> go.mod + . ./scripts/version.sh ++sed -i '$d' go.mod + + GO=${GO-go} + diff --git a/pkgs/by-name/an/anki/addons/ajt-card-management/default.nix b/pkgs/by-name/an/anki/addons/ajt-card-management/default.nix new file mode 100644 index 000000000000..25a3f9a65c3d --- /dev/null +++ b/pkgs/by-name/an/anki/addons/ajt-card-management/default.nix @@ -0,0 +1,45 @@ +{ + lib, + anki-utils, + fetchFromGitHub, + nix-update-script, +}: + +anki-utils.buildAnkiAddon (finalAttrs: { + pname = "ajt-card-management"; + version = "25.10.14.0"; + src = + (fetchFromGitHub { + owner = "Ajatt-Tools"; + repo = "learn-now-button"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ebGMrEfDV9ZWtrV2AjiaNd7WMeNBHlaOBE2xL1x0nWs="; + fetchSubmodules = true; + }) + # HACK: remove when https://github.com/Ajatt-Tools/learn-now-button/pull/9 is released + .overrideAttrs + (oldAttrs: { + env = oldAttrs.env or { } // { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }; + }); + sourceRoot = "${finalAttrs.src.name}/card_management"; + passthru.updateScript = nix-update-script { }; + meta = { + description = "Reset, Learn, and Grade cards from the card browser"; + longDescription = '' + Reset, Learn, and Grade cards from the card browser + + This addon adds new buttons to the card browser. + - The Learn now button immediately puts selected new cards in the learning queue. + - The Grade now button lets you grade selected cards without opening Reviewer. + - The Reset selected cards button lets you delete scheduling and learning information from selected cards. + ''; + homepage = "https://github.com/Ajatt-Tools/learn-now-button"; + downloadPage = "https://ankiweb.net/shared/info/1021636467"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ hey2022 ]; + }; +}) diff --git a/pkgs/by-name/an/anki/addons/default.nix b/pkgs/by-name/an/anki/addons/default.nix index f278cc2f612d..f00774c2250b 100644 --- a/pkgs/by-name/an/anki/addons/default.nix +++ b/pkgs/by-name/an/anki/addons/default.nix @@ -4,6 +4,8 @@ { adjust-sound-volume = callPackage ./adjust-sound-volume { }; + ajt-card-management = callPackage ./ajt-card-management { }; + anki-connect = callPackage ./anki-connect { }; anki-quizlet-importer-extended = callPackage ./anki-quizlet-importer-extended { }; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 9f696c48b8a6..3d3931516ea1 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2123.3"; + version = "2123.4.1"; src = fetchzip { url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-iFYA4qbeMHIV5nPlRc0OSnb4D5y6WacPIXvt/1ZwnTA="; + hash = "sha256-86i6GMnonQ8SeeDiOH1XSl3rHamnMTgPnkaeJOlAIuI="; }; patches = [ diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix new file mode 100644 index 000000000000..8cefe05b3c67 --- /dev/null +++ b/pkgs/by-name/bi/bilibili-tui/package.nix @@ -0,0 +1,53 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + pkg-config, + makeWrapper, + openssl, + mpv-unwrapped, + yt-dlp-light, + + withMpv ? true, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bilibili-tui"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "MareDevi"; + repo = "bilibili-tui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-nWUFcKQgUNaiVU0zgSB8LTdvUruc8fovCAembQz5w3I="; + }; + + cargoHash = "sha256-KvJpMQuvZM/s3b4/Pzmeucb95KeuuUx4bz3sJsKyLc8="; + + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; + + env.OPENSSL_NO_VENDOR = true; + + # Wrap mpv as fallback; users should prefer their system's mpv in PATH + postInstall = lib.optionalString withMpv '' + wrapProgram $out/bin/bilibili-tui \ + --suffix PATH : ${ + lib.makeBinPath [ + mpv-unwrapped + yt-dlp-light + ] + } + ''; + + meta = { + description = "Terminal user interface (TUI) client for Bilibili"; + homepage = "https://maredevi.moe/projects/bilibili-tui/"; + downloadPage = "https://github.com/MareDevi/bilibili-tui/releases"; + changelog = "https://github.com/MareDevi/bilibili-tui/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ puiyq ]; + mainProgram = "bilibili-tui"; + }; +}) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 4ce5f63e701b..2db9d0fa55ad 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.79.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-fp/R/F0LcFLHfSNUW4pO2EG2ICce5vzxsOBYrm2tyaA="; + hash = "sha256-gb0EG0vSNhC8O1JxjCP9nX74LkR8geGsNe8w6LH85xk="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-qCf8kJ2AuPfpykNiF2KNJqOs+Vq+BQHgMseqPtiGiz0="; + cargoHash = "sha256-ks7sBfYmdFUrjFGB/hXvZzHjkQT5LBh64hiC5SpEhF8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix new file mode 100644 index 000000000000..21d98dcdb240 --- /dev/null +++ b/pkgs/by-name/co/cog/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + cog, + stdenv, +}: + +buildGoModule rec { + pname = "cog"; + version = "0.0.46"; + + src = fetchFromGitHub { + owner = "grafana"; + repo = "cog"; + tag = "v${version}"; + hash = "sha256-sxZdldloFSWSRfilTuqrpMTJ3LvSLHyt5ifyZyG1Pbk="; + }; + + vendorHash = "sha256-GeJPE0UrXWYAG7G6azMYqMdq8b3dDFmJOfEY1JilzcI="; + + subPackages = [ "cmd/cli" ]; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + env.CGO_ENABLED = 0; + + passthru.tests.version = testers.testVersion { package = cog; }; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mv $out/bin/cli $out/bin/cog + ''; + + meta = { + changelog = "https://github.com/grafana/cog/releases/tag/v${version}"; + description = "Grafana's code generation tool"; + license = lib.licenses.asl20; + homepage = "https://github.com/grafana/cog"; + maintainers = [ + lib.maintainers.zebradil + ]; + mainProgram = "cog"; + }; +} diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 2cde646fa2c6..24c631bdc36e 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -23,13 +23,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.97.1"; + version = "1.97.2"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-3Pf4+RSzVH0nRo+rSCJwzEdpZqjzSsvpr1S8qsFuRZ4="; + hash = "sha256-/T3kD2Xu9JESEbbeEhXwZRzN1uo/jgnfjmxjv6hZ/7o="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index d315e1e85126..095bdf9dfaa2 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -204,11 +204,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "file": { "dependency": "transitive", @@ -504,11 +504,11 @@ "dependency": "direct dev", "description": { "name": "protoc_plugin", - "sha256": "c3893590d5b81345dfd4daa25c1890092667983fd4374bb6671b2a9a481d8359", + "sha256": "d43d92eeec74bf1da8e790570c1ef7cf00cdc47566ad62e2455f1deaab03a22b", "url": "https://pub.dev" }, "source": "hosted", - "version": "23.0.0" + "version": "24.0.0" }, "pub_api_client": { "dependency": "direct dev", @@ -674,31 +674,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae", + "sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.28.0" + "version": "1.29.0" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.8" + "version": "0.7.9" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4", + "sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.14" + "version": "0.6.15" }, "test_descriptor": { "dependency": "direct dev", @@ -754,11 +754,11 @@ "dependency": "direct main", "description": { "name": "watcher", - "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.1" }, "web": { "dependency": "transitive", diff --git a/pkgs/by-name/dh/dhex/package.nix b/pkgs/by-name/dh/dhex/package.nix index 80cafbb765a2..845541bafbfe 100644 --- a/pkgs/by-name/dh/dhex/package.nix +++ b/pkgs/by-name/dh/dhex/package.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"; }; + postPatch = '' + # Fix build for gcc>=15 + substituteInPlace ./output.h --replace-fail 'void initcolors();' 'void initcolors(tOutput*);' + ''; + buildInputs = [ ncurses ]; installPhase = '' diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index b46e5b175a38..a05702ce1a97 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.369"; + version = "1.4.375"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-azji8qBX+pxhUo3kH2WdyfMSJSDKEjLSzb5JnweHefU="; + hash = "sha256-Y8lTYzCQ4ZTTuwijdyY8XKk/4yQn67GzMQFyn34NVZo="; }; vendorHash = "sha256-147i0ZnNtph5DhaxK330kyUkDA4MBcpzrtIJGBEJHHQ="; diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index 744f99c255b5..08053805653d 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGo125Module rec { pname = "goreleaser"; - version = "2.13.0"; + version = "2.13.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-Z0DadF4wiDwykr0NIhL/IbwARwTjMXQDYmQevvjN2W8="; + hash = "sha256-yfstmysYhJCA8IyYZqnlLbNRNUyo5yEFAXD/jq5e4wE="; }; - vendorHash = "sha256-pDu3ZYQQEhSugOUGD2Xi5mBJRjOWr3AWKS/PPy1MEvs="; + vendorHash = "sha256-nnUEWY9+u1p4S490yuvupdeFQZB00MD/BNpbbgjdjHc="; ldflags = [ "-s" diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index 3a231dee63bf..a1c8837f3237 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "grafana-image-renderer"; - version = "5.1.0"; + version = "5.2.2"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y6S2noQ5XdDSfPM6to0p1IDM5poBLQVeg/g3sgQjlM8="; + hash = "sha256-kI3U4PrJFZMLbC0Nm4bhQhgUMexekgA3LbNuAaRUX8U="; }; vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs="; diff --git a/pkgs/by-name/hd/hd-idle/package.nix b/pkgs/by-name/hd/hd-idle/package.nix index 6c1b514017d6..7e1194b087a9 100644 --- a/pkgs/by-name/hd/hd-idle/package.nix +++ b/pkgs/by-name/hd/hd-idle/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "hd-idle"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "adelolmo"; repo = "hd-idle"; rev = "v${version}"; - sha256 = "sha256-WHJcysTN9LHI1WnDuFGTyTirxXirpLpJIeNDj4sZGY0="; + sha256 = "sha256-Q9EMRXzJTkPMMvehrIyiowytjKNfovtiSH4sAO6fzIo="; }; vendorHash = null; diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index 58e84ad12ae0..0daaa7a9be1e 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.17.6"; + version = "0.17.7"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-1QnKOxn1m91zu2HOfMyVYFHaHFrw8qn8288tv5HEiiA="; + hash = "sha256-LpBnWzEQK+hr0XTB03rUAQ4YJ1r51nS+lK3/PL7jvNw="; }; - vendorHash = "sha256-iX6vt8e9oPPUqHvX6n3OqiafKlP/SmWkfUJBRev7VZQ="; + vendorHash = "sha256-GUk+nCmrk0vSFf8nt0evWKVRuwWcWmwVcLKCgVHt9GA="; tags = [ "sqlite" ]; diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix index bba56e90c55e..80eb30425f5f 100644 --- a/pkgs/by-name/hy/hyprpanel/package.nix +++ b/pkgs/by-name/hy/hyprpanel/package.nix @@ -37,7 +37,7 @@ }: ags.bundle { pname = "hyprpanel"; - version = "0-unstable-2026-01-03"; + version = "0-unstable-2026-01-07"; __structuredAttrs = true; strictDeps = true; @@ -45,8 +45,8 @@ ags.bundle { src = fetchFromGitHub { owner = "Jas-SinghFSU"; repo = "HyprPanel"; - rev = "b8c255b610f045925e3e41b946a29db99639fcfe"; - hash = "sha256-Sa3EOZHlhD1JwyxbxLzVm3C9d6pe7Iitcad5FofOeaI="; + rev = "0e73df1dfedf0f6fa21ed0ae5e031b0663c8f400"; + hash = "sha256-yBejG3j6OLQYn87UozFAI3q9a1vH00u9xjIf2Q4V5j8="; }; # keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42 diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix index 3ba14493b231..f000a43a06e7 100644 --- a/pkgs/by-name/ke/keycloak/all-plugins.nix +++ b/pkgs/by-name/ke/keycloak/all-plugins.nix @@ -1,4 +1,9 @@ -{ callPackage, fetchMavenArtifact }: +{ + callPackage, + fetchMavenArtifact, + junixsocket-common, + junixsocket-native-common, +}: { scim-for-keycloak = callPackage ./scim-for-keycloak { }; @@ -7,6 +12,12 @@ keycloak-magic-link = callPackage ./keycloak-magic-link { }; keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { }; keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { }; + keycloak-remember-me-authenticator = callPackage ./keycloak-remember-me-authenticator { }; + + # junixsocket provides Unix domain socket support for JDBC connections, + # which is required for connecting to PostgreSQL via Unix socket. + junixsocket-common = junixsocket-common.passthru.jar; + junixsocket-native-common = junixsocket-native-common.passthru.jar; # These could theoretically be used by something other than Keycloak, but # there are no other quarkus apps in nixpkgs (as of 2023-08-21) diff --git a/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix b/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix index 3394d910e605..0e85c71c99a7 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix @@ -1,32 +1,45 @@ { stdenv, + maven, lib, - fetchurl, + fetchFromGitHub, }: - -stdenv.mkDerivation rec { +maven.buildMavenPackage rec { pname = "keycloak-discord"; - version = "0.5.0"; + version = "0.6.1"; - src = fetchurl { - url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-${version}.jar"; - hash = "sha256-radvUu2a6t0lbo5f/ADqy7+I/ONXB7/8pk2d1BtYzQA="; + src = fetchFromGitHub { + owner = "wadahiro"; + repo = "keycloak-discord"; + tag = "v${version}"; + hash = "sha256-BA7x28k/aMI3VPQmEgNhKD9N34DdYqadAD/m4cxLSYg="; }; - dontUnpack = true; - dontBuild = true; + mvnHash = + let + mvnHashes = { + "aarch64-darwin" = "sha256-Or7VOZwz4NfDtb0kmHbbTYE/avAc+H8+Y6JPw+HGjxs="; + "x86_64-darwin" = "sha256-sX10vYlb2hWArTLZsPTcKYHHsPffQKtBxpcI42wcZZA="; + "aarch64-linux" = "sha256-I5qjhfAXPXMb+1SPG29t/IKH/zBQqdnu3U7dYSQhTL8="; + "x86_64-linux" = "sha256-uhm++MGgTN32/xbHNd+Z3Hes9Q5tl8ztIQ92LxMWKjg="; + }; + in + mvnHashes.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); installPhase = '' runHook preInstall - install -Dm444 "$src" "$out/keycloak-discord-$version.jar" + install -Dm444 target/keycloak-discord-${version}.jar "$out/keycloak-discord-${version}.jar" runHook postInstall ''; meta = { homepage = "https://github.com/wadahiro/keycloak-discord"; - description = "Keycloak Social Login extension for Discord"; + description = "Keycloak Identity Provider extension for Discord"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mkg20001 ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with lib.maintainers; [ + mkg20001 + anish + ]; }; } 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 8d0c2999fdd0..5db1733749cb 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 rec { pname = "keycloak-magic-link"; - version = "0.38"; + version = "0.52"; src = fetchFromGitHub { owner = "p2-inc"; repo = "keycloak-magic-link"; tag = "v${version}"; - hash = "sha256-+fhWxAUlt9UVM81Ua2Mwek3D5Kzzk/Tsugbo0fLyxiA="; + hash = "sha256-giKhcK/bRSYUfix0ttuk9gs2q3A+4dDlayN15tuJhcY="; }; - mvnHash = "sha256-edBdooR+KqY0JKwxdwTd5AxJ0qn3MV9xLrqYukIq2oY="; + mvnHash = "sha256-x9o83Azzep27jQXjxJoTga6B+mELSAtho568yHKz42k="; installPhase = '' runHook preInstall @@ -29,6 +29,9 @@ maven.buildMavenPackage rec { homepage = "https://github.com/p2-inc/keycloak-magic-link"; description = "Magic Link Authentication for Keycloak"; license = lib.licenses.elastic20; - maintainers = with lib.maintainers; [ lykos153 ]; + maintainers = with lib.maintainers; [ + lykos153 + anish + ]; }; } diff --git a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix index 49acf107c312..7ae12fc8023a 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix @@ -1,21 +1,31 @@ { maven, lib, + stdenv, fetchFromGitHub, }: - maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "6.0.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = "keycloak-metrics-spi"; - rev = "refs/tags/${version}"; - hash = "sha256-MMonBRau8FpfCqija6NEdvp4zJfEub2Kwk4MA7FYWHI="; + tag = version; + hash = "sha256-C6ueYhSMVMGpjHF5QQj9jfaS9sGTZ3wKZq2xmNgTmAg="; }; - mvnHash = "sha256-u+UAbKDqtlBEwrzh6LRgs8sZfMZ1u2TAluzOxsBrb/k="; + mvnHash = + let + mvnHashes = { + "aarch64-darwin" = "sha256-L+LVJGBVhkaWOdXpHep9f2s7hLr3enf5POm8U+Y7I1w="; + "x86_64-darwin" = "sha256-G/e0mgAGP+6zvX3b0EuI95bdLT7Bzwh1GgcAfxzsIhE="; + "aarch64-linux" = "sha256-Nrs+gqRYPKXWRr0COAsKmOrNaza2fxhEAJ5x896tKvA="; + "x86_64-linux" = "sha256-oHMkzXHR4mETH6VsxhFuap3AcjvTXytNkKlLY/mzT3g="; + }; + in + mvnHashes.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); installPhase = '' runHook preInstall @@ -27,7 +37,9 @@ maven.buildMavenPackage rec { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ benley ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + benley + anish + ]; }; } diff --git a/pkgs/by-name/ke/keycloak/keycloak-remember-me-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-remember-me-authenticator/default.nix new file mode 100644 index 000000000000..bfca258c77d6 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-remember-me-authenticator/default.nix @@ -0,0 +1,31 @@ +{ + maven, + lib, + fetchFromGitHub, +}: +maven.buildMavenPackage rec { + pname = "keycloak-remember-me-authenticator"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Herdo"; + repo = "keycloak-remember-me-authenticator"; + tag = "v${version}"; + hash = "sha256-zIFWbv02wbf3D6Weyc8N4YM+fFFxnve0ti5yS52KN3c="; + }; + + mvnHash = "sha256-9wvBTA9RYPJz9zeimo4tmEjoHfKVGtPPAdNTe5BKdOs="; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" target/keycloak-remember-me-authenticator-${version}.jar + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/Herdo/keycloak-remember-me-authenticator"; + description = "Custom authenticator for remembering the user logging in, even if no \"Remember me\" flag is set"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anish ]; + }; +} diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 9d1552652a8e..e811af61db2e 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { talyz nickcao leona + anish ]; }; }) diff --git a/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix index cb979db32959..63ce83c62778 100644 --- a/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix +++ b/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix @@ -3,19 +3,18 @@ fetchFromGitHub, maven, }: - -maven.buildMavenPackage { +maven.buildMavenPackage rec { pname = "scim-keycloak-user-storage-spi"; - version = "unstable-2024-02-14"; + version = "kc25_0_4"; src = fetchFromGitHub { owner = "justin-stephenson"; repo = "scim-keycloak-user-storage-spi"; - rev = "6c59915836d9a559983326bbb87f895324bb75e4"; - hash = "sha256-BSso9lU542Aroxu0RIX6NARc10lGZ04A/WIWOVtdxHw="; + tag = version; + hash = "sha256-xEnYblL5lxs1pebxGy4pXiZrMJT0KwIZqB4dztRyz/A="; }; - mvnHash = "sha256-xbGlVZl3YtbF372kCDh+UdK5pLe6C6WnGgbEXahlyLw="; + mvnHash = "sha256-UUJXHQRqshaMpr4g8m2hdBy/dpl/IImkY+KGnUF1jAs="; installPhase = '' install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar" @@ -23,11 +22,14 @@ maven.buildMavenPackage { meta = { homepage = "https://github.com/justin-stephenson/scim-keycloak-user-storage-spi"; - description = "Third party module that extends Keycloak, allow for user storage in an external scimv2 server"; + description = "Keycloak module that allows for user storage in an external SCIM 2.0 server"; sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ s1341 ]; + maintainers = with lib.maintainers; [ + s1341 + anish + ]; }; } diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index 9245a65a6f5b..27b811abfe5e 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kine"; - version = "0.14.5"; + version = "0.14.10"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${version}"; - hash = "sha256-2I/igT7AjiPhLpK1pM5V2FvOF4Oc897HbsBMiwCnx/o="; + hash = "sha256-LJOquoWMbvLa1KvPacuQCxraW0waQJ4pA3BSnKJaetw="; }; - vendorHash = "sha256-Qx4yId072JhuXjF0Xd1/DnsnbsMlfuiwFqDKKw4rDLM="; + vendorHash = "sha256-T6/thI+QRu2iWnedVSq870SzWQbBQKNyHRW41gg534w="; ldflags = [ "-s" diff --git a/pkgs/by-name/ki/kitty-themes/package.nix b/pkgs/by-name/ki/kitty-themes/package.nix index 17bf45e1a9c1..88a2695f0ee2 100644 --- a/pkgs/by-name/ki/kitty-themes/package.nix +++ b/pkgs/by-name/ki/kitty-themes/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "0-unstable-2025-10-24"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "6af4bcd7244a20ce4a0244c9128003473b97f319"; - hash = "sha256-oxNdwv5q3aEC6kCEZzZawrIYq0gYSVMjB4xVPb5WiEE="; + rev = "0da136b4d31ab1c0dc49306bbf2ba8b819dafed8"; + hash = "sha256-jefF6MzFbKDz6Grsdh5fyi/hrZI72mNkp5iUvelIhDs="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index a95b8ada1e35..1b5cbb5f71a6 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -20,15 +20,15 @@ let fi ''; in -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20251125-unstable-2025-12-18"; + version = "20260110"; src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; - rev = "881c549a82203abd9a88870ba27f3e8ce754b2c4"; - hash = "sha256-ziKzNbP8pqwFilzQb227FtVMqaUGDcbZ57tc9mAMSxs="; + tag = version; + hash = "sha256-zL2ck91IBjBw/10YirxfoScEjbvEXVBR7bpLzuF3kDc="; }; postUnpack = '' diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 9098b44ded57..73047a04e1a5 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.59.0"; + version = "1.60.0"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-hd1yQ+VJenmBk2WIjO7tFdoyJ8jIq6248ljz9T6c4Vc="; + hash = "sha256-36Nl9robV0RVhEwV3Cu75IDyexnWwf5ZBHOaEx2/kPM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index c6a90bde5c48..d9fa43dc2963 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -3,7 +3,7 @@ lib, nixosTests, fetchFromGitHub, - gitUpdater, + nix-update-script, nodejs, pnpm_9, fetchPnpmDeps, @@ -18,19 +18,29 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "misskey"; - version = "2025.7.0"; + version = "2025.12.2"; src = fetchFromGitHub { owner = "misskey-dev"; repo = "misskey"; tag = finalAttrs.version; - hash = "sha256-LtBggq60buNPnGPSbh+TcFODxCoqX+rFdX0P7dYMYI0="; + hash = "sha256-7S6m97wHFeITABLcnQiPVGLg6d1xcPCHCp7/7d/w48E="; fetchSubmodules = true; }; - patches = [ - ./pnpm-lock.yaml.patch - ]; + # Misskey converts its YAML config to JSON at runtime, which doesn't work + # because it tries to write it to the Nix store. As a workaround, hardcode + # this to a path which the service can write to until a better solution is + # supported, upstream. + # https://github.com/misskey-dev/misskey/issues/17075 + postPatch = '' + substituteInPlace packages/backend/src/config.ts \ + --replace-fail \ + "resolve(_dirname, '../../../built/.config.json')" \ + "resolve('/run/misskey/default.json')" + substituteInPlace {.,packages/backend}/package.json \ + --replace-fail "pnpm compile-config && " "" + ''; nativeBuildInputs = [ nodejs @@ -47,11 +57,10 @@ stdenv.mkDerivation (finalAttrs: { pname version src - patches ; pnpm = pnpm_9; fetcherVersion = 2; - hash = "sha256-5yuM56sLDSo4M5PDl3gUZOdSexW1YjfYBR3BJMqNHzU="; + hash = "sha256-GVzU5YQe7GHn2ddpaGPyLLmhOv5Fy33RL+gBLl3Oyis="; }; buildPhase = '' @@ -88,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { fi ''; in + # bash '' runHook preInstall @@ -125,7 +135,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.misskey = nixosTests.misskey; - updateScript = gitUpdater { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^([0-9.]+)$" + ]; + }; }; meta = { diff --git a/pkgs/by-name/mi/misskey/pnpm-lock.yaml.patch b/pkgs/by-name/mi/misskey/pnpm-lock.yaml.patch deleted file mode 100644 index a3db65c7e052..000000000000 --- a/pkgs/by-name/mi/misskey/pnpm-lock.yaml.patch +++ /dev/null @@ -1,270 +0,0 @@ ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -11,7 +11,7 @@ - - patchedDependencies: - typeorm: -- hash: 2677b97a423e157945c154e64183d3ae2eb44dfa9cb0e5ce731a7612f507bb56 -+ hash: i7ls76affxbomopkwkccq5jvsu - path: patches/typeorm.patch - - importers: -@@ -51,6 +51,10 @@ - typescript: - specifier: 5.8.3 - version: 5.8.3 -+ optionalDependencies: -+ '@tensorflow/tfjs-core': -+ specifier: 4.22.0 -+ version: 4.22.0(encoding@0.1.13) - devDependencies: - '@misskey-dev/eslint-plugin': - specifier: 2.1.0 -@@ -85,10 +89,6 @@ - start-server-and-test: - specifier: 2.0.12 - version: 2.0.12 -- optionalDependencies: -- '@tensorflow/tfjs-core': -- specifier: 4.22.0 -- version: 4.22.0(encoding@0.1.13) - - packages/backend: - dependencies: -@@ -427,7 +427,7 @@ - version: 4.2.0 - typeorm: - specifier: 0.3.24 -- version: 0.3.24(patch_hash=2677b97a423e157945c154e64183d3ae2eb44dfa9cb0e5ce731a7612f507bb56)(ioredis@5.6.1)(pg@8.16.0)(reflect-metadata@0.2.2) -+ version: 0.3.24(patch_hash=i7ls76affxbomopkwkccq5jvsu)(ioredis@5.6.1)(pg@8.16.0)(reflect-metadata@0.2.2) - typescript: - specifier: 5.8.3 - version: 5.8.3 -@@ -446,6 +446,94 @@ - xev: - specifier: 3.0.2 - version: 3.0.2 -+ optionalDependencies: -+ '@swc/core-android-arm64': -+ specifier: 1.3.11 -+ version: 1.3.11 -+ '@swc/core-darwin-arm64': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-darwin-x64': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-freebsd-x64': -+ specifier: 1.3.11 -+ version: 1.3.11 -+ '@swc/core-linux-arm-gnueabihf': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-linux-arm64-gnu': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-linux-arm64-musl': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-linux-x64-gnu': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-linux-x64-musl': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-win32-arm64-msvc': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-win32-ia32-msvc': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@swc/core-win32-x64-msvc': -+ specifier: 1.12.0 -+ version: 1.12.0 -+ '@tensorflow/tfjs': -+ specifier: 4.22.0 -+ version: 4.22.0(encoding@0.1.13)(seedrandom@3.0.5) -+ '@tensorflow/tfjs-node': -+ specifier: 4.22.0 -+ version: 4.22.0(encoding@0.1.13)(seedrandom@3.0.5) -+ bufferutil: -+ specifier: 4.0.9 -+ version: 4.0.9 -+ slacc-android-arm-eabi: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-android-arm64: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-darwin-arm64: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-darwin-universal: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-darwin-x64: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-freebsd-x64: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-linux-arm-gnueabihf: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-linux-arm64-gnu: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-linux-arm64-musl: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-linux-x64-gnu: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-linux-x64-musl: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-win32-arm64-msvc: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ slacc-win32-x64-msvc: -+ specifier: 0.0.10 -+ version: 0.0.10 -+ utf-8-validate: -+ specifier: 6.0.5 -+ version: 6.0.5 - devDependencies: - '@jest/globals': - specifier: 29.7.0 -@@ -612,94 +700,6 @@ - supertest: - specifier: 7.1.1 - version: 7.1.1 -- optionalDependencies: -- '@swc/core-android-arm64': -- specifier: 1.3.11 -- version: 1.3.11 -- '@swc/core-darwin-arm64': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-darwin-x64': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-freebsd-x64': -- specifier: 1.3.11 -- version: 1.3.11 -- '@swc/core-linux-arm-gnueabihf': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-linux-arm64-gnu': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-linux-arm64-musl': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-linux-x64-gnu': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-linux-x64-musl': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-win32-arm64-msvc': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-win32-ia32-msvc': -- specifier: 1.12.0 -- version: 1.12.0 -- '@swc/core-win32-x64-msvc': -- specifier: 1.12.0 -- version: 1.12.0 -- '@tensorflow/tfjs': -- specifier: 4.22.0 -- version: 4.22.0(encoding@0.1.13)(seedrandom@3.0.5) -- '@tensorflow/tfjs-node': -- specifier: 4.22.0 -- version: 4.22.0(encoding@0.1.13)(seedrandom@3.0.5) -- bufferutil: -- specifier: 4.0.9 -- version: 4.0.9 -- slacc-android-arm-eabi: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-android-arm64: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-darwin-arm64: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-darwin-universal: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-darwin-x64: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-freebsd-x64: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-linux-arm-gnueabihf: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-linux-arm64-gnu: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-linux-arm64-musl: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-linux-x64-gnu: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-linux-x64-musl: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-win32-arm64-msvc: -- specifier: 0.0.10 -- version: 0.0.10 -- slacc-win32-x64-msvc: -- specifier: 0.0.10 -- version: 0.0.10 -- utf-8-validate: -- specifier: 6.0.5 -- version: 6.0.5 - - packages/frontend: - dependencies: -@@ -11221,8 +11221,8 @@ - vue-component-type-helpers@2.2.12: - resolution: {integrity: sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==} - -- vue-component-type-helpers@3.0.1: -- resolution: {integrity: sha512-j23mCB5iEbGsyIhnVdXdWUOg+UdwmVxpKnYYf2j+4ppCt5VSFXKjwu9YFt0QYxUaf5G99PuHsVfRScjHCRSsGQ==} -+ vue-component-type-helpers@3.0.3: -+ resolution: {integrity: sha512-koiBu7lO8e6w/UlbZAAIW11qcFQocYIl7Nh/SVwGZ804ej5KrncU32bRxi2zfU2Kyf6HWuk1CeeVP2rhIL+vyQ==} - - vue-demi@0.14.7: - resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} -@@ -14955,7 +14955,7 @@ - ts-dedent: 2.2.0 - type-fest: 2.19.0 - vue: 3.5.17(typescript@5.8.3) -- vue-component-type-helpers: 3.0.1 -+ vue-component-type-helpers: 3.0.3 - - '@stylistic/eslint-plugin@2.13.0(eslint@9.31.0)(typescript@5.8.3)': - dependencies: -@@ -23034,7 +23034,7 @@ - - typedarray@0.0.6: {} - -- typeorm@0.3.24(patch_hash=2677b97a423e157945c154e64183d3ae2eb44dfa9cb0e5ce731a7612f507bb56)(ioredis@5.6.1)(pg@8.16.0)(reflect-metadata@0.2.2): -+ typeorm@0.3.24(patch_hash=i7ls76affxbomopkwkccq5jvsu)(ioredis@5.6.1)(pg@8.16.0)(reflect-metadata@0.2.2): - dependencies: - '@sqltools/formatter': 1.2.5 - ansis: 3.17.0 -@@ -23371,7 +23371,7 @@ - - vue-component-type-helpers@2.2.12: {} - -- vue-component-type-helpers@3.0.1: {} -+ vue-component-type-helpers@3.0.3: {} - - vue-demi@0.14.7(vue@3.5.17(typescript@5.8.3)): - dependencies: diff --git a/pkgs/by-name/mo/mongodb-cli/package.nix b/pkgs/by-name/mo/mongodb-cli/package.nix index 4c9fee7e7ff7..42c753c0f652 100644 --- a/pkgs/by-name/mo/mongodb-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mongodb-cli"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongodb-cli"; tag = "mongocli/v${version}"; - hash = "sha256-ltNYphGNUyg12Xjg3kmmMVdSYyzMUjdVeXjDi6O4T08="; + hash = "sha256-vytc/e+e6JE5bwh5hny9C7LWenGctQLUso8GAXgk4j8="; }; - vendorHash = "sha256-X5qIte7TFn9b54cg0NF4yrFuAjqTdLXPx0qPGK54jnY="; + vendorHash = "sha256-CswQV9uTnL58TzYaVzx6dc1aZDZQ5b2LWLE1bv+P/2c="; subPackages = [ "cmd/mongocli" ]; diff --git a/pkgs/by-name/ne/neomutt/package.nix b/pkgs/by-name/ne/neomutt/package.nix index b70f75ce00c5..3c885bf3511c 100644 --- a/pkgs/by-name/ne/neomutt/package.nix +++ b/pkgs/by-name/ne/neomutt/package.nix @@ -43,13 +43,13 @@ assert lib.warnIf enableMixmaster stdenv.mkDerivation (finalAttrs: { pname = "neomutt"; - version = "20250905"; + version = "20260105"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; tag = finalAttrs.version; - hash = "sha256-RLyszU2u5jV/o6LrmZFkLx/Wu94Yq3JlXNgpe4agOZI="; + hash = "sha256-rdnk1wESnnoaxctkR6WvWpq+DUg86PbH9f1EtpSL5uk="; }; buildInputs = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace auto.def --replace /usr/sbin/sendmail sendmail - substituteInPlace contrib/smime_keys \ + substituteInPlace smime/smime_keys \ --replace /usr/bin/openssl ${openssl}/bin/openssl for f in doc/*.{xml,xsl}* ; do @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" '' + lib.optionalString enableSmimeKeys '' - install -m 755 $src/contrib/smime_keys $out/bin; + install -m 755 $src/smime/smime_keys $out/bin; substituteInPlace $out/bin/smime_keys \ --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl'; '' diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index fb788bf21a68..93e53d3322df 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "28.0.0"; + version = "28.1.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-ka+p789qFCyFDFiNQYtcwhihCB05Bbw6/6dgBrR00xg="; + hash = "sha256-D6TzDyT3HIULeHL/ACkOcVQ/g7pAw8jONnWfwJgWyx4="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-0hxjX5bSqeOU9QNqusUd8L/0hoGsq4LQCr+9+5zrsaA="; + hash = "sha256-eSnrR2Cik24wEbSObabJSzZOGfl6XzQrEyDB7Ea2hg8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/np/nph/lock.json b/pkgs/by-name/np/nph/lock.json index 28a56c2087d8..2b7b9df08bb3 100644 --- a/pkgs/by-name/np/nph/lock.json +++ b/pkgs/by-name/np/nph/lock.json @@ -1,3 +1,148 @@ { - "depends": [] + "depends": [ + { + "method": "fetchzip", + "path": "/nix/store/sh4l0gcn7qgnclafr22ziw0y60ij9mkl-source", + "rev": "38a95ee6bd675b31746fa79d318b546495374ffa", + "sha256": "1sa0y36l4v6m5vhq9kd5slfgq1jdzp93v7f1y5gl5qrz2q1db8my", + "srcDir": "", + "url": "https://github.com/c-blake/adix/archive/38a95ee6bd675b31746fa79d318b546495374ffa.tar.gz", + "subDir": "", + "packages": [ + "adix" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/2cf1bdh31a1zgywgimfym49jsm3pbwak-source", + "rev": "f082560a4bbd4afa1b35e9810b291d17c265b666", + "sha256": "0s6nfvwmc36c9w55k3d0m3gbnm6hiwxnqqz11pjdq41ixnzx4crz", + "srcDir": "", + "url": "https://github.com/c-blake/cligen/archive/f082560a4bbd4afa1b35e9810b291d17c265b666.tar.gz", + "subDir": "", + "packages": [ + "cligen" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/ml9rwmqcvprws7ws5s2cx9dsc1hyizww-source", + "rev": "ce27581a3e881f782f482cb66dc5b07a02bd615e", + "sha256": "0y6bw2scnmr8cxj4fg18w7f34l2bh9qwg5nhlgd84m9fpr5bqarn", + "srcDir": "", + "url": "https://github.com/status-im/nim-faststreams/archive/ce27581a3e881f782f482cb66dc5b07a02bd615e.tar.gz", + "subDir": "", + "packages": [ + "faststreams" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/z4hw73x20ssc6c11jam8kwf8gdc3dnf4-source", + "rev": "dfb567fe1803d08b2e6272c56f30885c8a63f4d1", + "sha256": "14kr0lz23aj80g5r84w1gjjcwnn4jdv7j6jzr8syrjxp6606v289", + "srcDir": "src", + "url": "https://github.com/haltcase/glob/archive/dfb567fe1803d08b2e6272c56f30885c8a63f4d1.tar.gz", + "subDir": "", + "packages": [ + "glob" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/ja2vzw4xamszsl99d2sn487h6iymw2vi-source", + "rev": "cc1fc22a18c57e16d89c580cf78478c38c394c66", + "sha256": "0jns1jq37ansgzmzg3fwc1cb9z2i2wk4217kxdw0m9l5zixlhsy1", + "srcDir": "", + "url": "https://github.com/c-blake/hldiff/archive/cc1fc22a18c57e16d89c580cf78478c38c394c66.tar.gz", + "subDir": "", + "packages": [ + "hldiff" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/0h5clnvkyq5vhjj1xgb1mwavwq5nl718-source", + "rev": "4593305ed1e49731fc75af1dc572dd2559aad19c", + "sha256": "1b666qws5sva3n5allin0ycvnqlzdjd7xzprpdvv632ccqddzcl9", + "srcDir": "src", + "url": "https://github.com/nitely/nim-regex/archive/4593305ed1e49731fc75af1dc572dd2559aad19c.tar.gz", + "subDir": "", + "packages": [ + "regex" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/17gj9sw2hw818cbxvd6i94n734inm1vf-source", + "rev": "df8113dda4c2d74d460a8fa98252b0b771bf1f27", + "sha256": "1h7amas16sbhlr7zb7n3jb5434k98ji375vzw72k1fsc86vnmcr9", + "srcDir": "", + "url": "https://github.com/arnetheduck/nim-results/archive/df8113dda4c2d74d460a8fa98252b0b771bf1f27.tar.gz", + "subDir": "", + "packages": [ + "results" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/glxzb6z0f1vs0x52syjfr36gl3240kb3-source", + "rev": "b0f2fa32960ea532a184394b0f27be37bd80248b", + "sha256": "0wip1fjx7ka39ck1g1xvmyarzq1p5dlngpqil6zff8k8z5skiz27", + "srcDir": "", + "url": "https://github.com/status-im/nim-serialization/archive/b0f2fa32960ea532a184394b0f27be37bd80248b.tar.gz", + "subDir": "", + "packages": [ + "serialization" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/k8h2bcs79f2rzlj0rqq50b8vcvcxfq5y-source", + "rev": "b66168735d6f3841c5239c3169d3fe5fe98b1257", + "sha256": "10n71vfa6klzd9dmal96jy0hiqk04gaj8wc9g91z6fclryf0yq92", + "srcDir": "", + "url": "https://github.com/status-im/nim-stew/archive/b66168735d6f3841c5239c3169d3fe5fe98b1257.tar.gz", + "subDir": "", + "packages": [ + "stew" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/8s4593vfisvlxg3rrg38dkkgmvzbwfz6-source", + "rev": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46", + "sha256": "175swdj01rz57h1hvflkyaz4x76qbfn0174ysrk3qk385i1zlg5z", + "srcDir": "", + "url": "https://github.com/status-im/nim-toml-serialization/archive/b5b387e6fb2a7cc75d54a269b07cc6218361bd46.tar.gz", + "subDir": "", + "packages": [ + "toml_serialization" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/kfq6qp0l8vcr7dlnb4ahjldyp2wmg9d2-source", + "rev": "66f2458710dc641dd4640368f9483c8a0ec70561", + "sha256": "092z3glgdb7rmwajm7dmqzvralkm7ixighixk8ycf8sf17zm72ck", + "srcDir": "src", + "url": "https://github.com/nitely/nim-unicodedb/archive/66f2458710dc641dd4640368f9483c8a0ec70561.tar.gz", + "subDir": "", + "packages": [ + "unicodedb" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/si82f2cs8z17ni755dzi45mwnf41yi90-source", + "rev": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189", + "sha256": "1n8n36kad50m97b64y7bzzknz9n7szffxhp0bqpk3g2v7zpda8sw", + "srcDir": "", + "url": "https://github.com/status-im/nim-unittest2/archive/26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189.tar.gz", + "subDir": "", + "packages": [ + "unittest2" + ] + } + ] } diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix index b5a3a28fd01a..e0b45242c968 100644 --- a/pkgs/by-name/np/nph/package.nix +++ b/pkgs/by-name/np/nph/package.nix @@ -2,17 +2,11 @@ lib, fetchFromGitHub, buildNimPackage, - nim-2_0, }: -let - buildNimPackage' = buildNimPackage.override { - # Do not build with Nim-2.2.x. - nim2 = nim-2_0; - }; -in -buildNimPackage' (finalAttrs: { + +buildNimPackage (finalAttrs: { pname = "nph"; - version = "0.6.1"; + version = "0.6.2"; postPatch = '' substituteInPlace src/nph.nim \ @@ -23,7 +17,7 @@ buildNimPackage' (finalAttrs: { owner = "arnetheduck"; repo = "nph"; tag = "v${finalAttrs.version}"; - hash = "sha256-RIuggg09l7jZDg91FPrjwdoE+gCxgb7c8fEvCiwQk5U="; + hash = "sha256-rO6nEdW36CoQF30VP+zR+Osw2AuBmkXC+ugPrhDvH4o="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 22fe6ebe8f13..3697d51d3be0 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.44.0"; + version = "0.44.1"; buildType = if withDebug then "debug" else "release"; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-hVOoo6YHgGJMksVbn9PqDNQedw7Zxxrmydwxh6qVebo="; + hash = "sha256-pZYlx1OVh0Gwvje8GqNV6U7ATy1/mxx6+8jSLqm5jDE="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix index 0c2505e5dfbe..ff563f2c97bb 100644 --- a/pkgs/by-name/op/opentrack/package.nix +++ b/pkgs/by-name/op/opentrack/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opentrack"; - version = "2024.1.1-unstable-2025-12-16"; + version = "2026.1.0-unstable-2026-01-03"; src = fetchFromGitHub { owner = "opentrack"; repo = "opentrack"; - rev = "32273718b42b80973671ed1883ff74645cf83ca0"; - hash = "sha256-bNhMtxPL0VxpSP7/rYs5dCAAR1EKuBwfDggHo0OZOnA="; + rev = "0779d3ce9da19d46919e909d0a1a252d67122db9"; + hash = "sha256-n7XCNNXgfwU4q27Q7ss9tgc2Z/tmzcRxUP4chwpPN38="; }; aruco = callPackage ./aruco.nix { }; diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index adbc135a0b4e..de0c3ed4eb29 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "6.1.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-s+4TH6xYs53/HVU5UD3YyjYgbc0Ul+RmC1kV7eJHO/o="; + hash = "sha256-ekYNEx6Fa8/groKrQUINoscekxiOK6MCX+gueVoDGiU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qd/qdrant/package.nix b/pkgs/by-name/qd/qdrant/package.nix index c27d11345d05..3ce8c95160d5 100644 --- a/pkgs/by-name/qd/qdrant/package.nix +++ b/pkgs/by-name/qd/qdrant/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qdrant"; - version = "1.15.5"; + version = "1.16.3"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; tag = "v${finalAttrs.version}"; - hash = "sha256-/bwSkXfk/7wyWhAE87SY99EOcHmzBwXzX5PNBdKOJUQ="; + hash = "sha256-p2xQStTwbC6MoEsaM1JXlBHK2CqwIfD7x+WwciuY49s="; }; - cargoHash = "sha256-U5CPqwsYW6QCGg2mFKzX50imnrvfGNSuFtYkwAB1OE4="; + cargoHash = "sha256-DEOMoG13eDDEadScwQOD6jxuJBxaU2+fUNK/QLXLG8M="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index 336be1a9dbb6..78f41a800696 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "qxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-soOu6JyS/SEdwUngOUd0suImr70naZms9Zy2pRwBn5E="; + hash = "sha256-2gZiQmjxvgBp0DqP7apUnbHeVRk0hd5XoCPLgh3zAho="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index c1b6445c2eb8..3ff22223e4d5 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -35,7 +35,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.28.1"; + version = "0.28.2"; outputs = [ "out" @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-ABT7za04QEQABpeRZArEval5aiy/FkNKj8psr6lrFos="; + hash = "sha256-4zijWVLXnNQLqEMWnO1o/fnCoBjESDbn14CQyCP2o2s="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-WQtKSBf8PQ0itbbFWQKvaDvq7BiRV+i6YcKiPpdilBU="; + cargoHash = "sha256-FrOo4+5S8JAlQSmDvH0omhOsG9PjZMvRejk9VHEucVY="; cargoBuildFlags = [ "--package rerun-cli" diff --git a/pkgs/by-name/sg/sgdboop/package.nix b/pkgs/by-name/sg/sgdboop/package.nix index 6ec7d9a1c03c..d967136b8041 100644 --- a/pkgs/by-name/sg/sgdboop/package.nix +++ b/pkgs/by-name/sg/sgdboop/package.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # Hide the app from app launchers, as it is not meant to be run directly # Remove when https://github.com/SteamGridDB/SGDBoop/pull/112 is merged ./hide_desktop_entry.patch + # remove unused arg to fix build + ./remove-unused-arg.patch ]; makeFlags = [ diff --git a/pkgs/by-name/sg/sgdboop/remove-unused-arg.patch b/pkgs/by-name/sg/sgdboop/remove-unused-arg.patch new file mode 100644 index 000000000000..feea11499c22 --- /dev/null +++ b/pkgs/by-name/sg/sgdboop/remove-unused-arg.patch @@ -0,0 +1,31 @@ +From 74bea8b264fa5d7ded02db66e2500ba9d72b58cf Mon Sep 17 00:00:00 2001 +From: Fazzi +Date: Wed, 31 Dec 2025 20:57:45 +0000 +Subject: [PATCH] remove unused arg + +--- + sgdboop.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sgdboop.c b/sgdboop.c +index f0d95c0..7e860f3 100644 +--- a/sgdboop.c ++++ b/sgdboop.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + #include +@@ -1276,7 +1276,7 @@ int main(int argc, char** argv) + struct nonSteamApp* apps = getNonSteamApps(); + struct nonSteamApp* appsMods = NULL; + if (includeMods) { +- appsMods = getMods(includeMods); ++ appsMods = getMods(); + } + + // Exit with an error if nothing found +-- +2.51.2 + diff --git a/pkgs/by-name/si/sit/package.nix b/pkgs/by-name/si/sit/package.nix new file mode 100644 index 000000000000..663d124e49bb --- /dev/null +++ b/pkgs/by-name/si/sit/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "sit"; + version = "0-unstable-2026-01-05"; + + src = fetchFromGitHub { + owner = "thecloudexpanse"; + repo = "sit"; + rev = "8e3d6416c2b61db99c74e8f1224431dc33a50a34"; + hash = "sha256-uaeHntgvuyeRKJR7BmHtXdM+70xfdrd4WPQagXkWV/Q="; + }; + + installPhase = '' + runHook preInstall + install -Dm755 sit $out/bin/sit + install -Dm755 macbinfilt $out/bin/macbinfilt + runHook postInstall + ''; + + meta = { + description = "Create StuffIt archives on Unix systems"; + homepage = "https://github.com/thecloudexpanse/sit"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ matthewcroughan ]; + mainProgram = "sit"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/so/socalabs-rp2a03/package.nix b/pkgs/by-name/so/socalabs-rp2a03/package.nix new file mode 100644 index 000000000000..64b38d9c86f0 --- /dev/null +++ b/pkgs/by-name/so/socalabs-rp2a03/package.nix @@ -0,0 +1,141 @@ +{ + stdenv, + fetchFromGitHub, + lib, + cmake, + pkg-config, + alsa-lib, + copyDesktopItems, + makeDesktopItem, + libX11, + libXcomposite, + libXcursor, + libXinerama, + libXrandr, + libXtst, + libXdmcp, + libXext, + xvfb, + freetype, + fontconfig, + expat, + libGL, + libjack2, + curl, + ninja, + writableTmpDirAsHomeHook, + # Disable VST building by default, since its unfree + enableVST2 ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "socalabs-rp2a03"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "FigBug"; + repo = "RP2A03"; + rev = "dd90863aed05afe110a5302b5eff4b5144f28d4c"; + hash = "sha256-arEM6mq2oJATj87pyPZ+ZNlLd3kL//BNO5y2SFf+nSo="; + fetchSubmodules = true; + }; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "socalabs-rp2a03"; + desktopName = "Socalabs RP2A03"; + comment = "Socalabs NES Ricoh 2A03 Emulation Plugin (Standalone)"; + icon = "RP2A03"; + exec = "RP2A03"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + cmake + pkg-config + copyDesktopItems + ninja + ]; + + buildInputs = [ + alsa-lib + libX11 + libXcomposite + libXcursor + libXinerama + libXrandr + libXtst + libXdmcp + libXext + xvfb + libGL + libjack2 + freetype + fontconfig + expat + curl + ]; + + cmakeFlags = [ + (lib.cmakeBool "JUCE_COPY_PLUGIN_AFTER_BUILD" false) + "--preset ninja-gcc" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'FORMATS Standalone VST VST3 AU LV2' 'FORMATS Standalone ${lib.optionalString enableVST2 "VST"} VST3 LV2' + ''; + + strictDeps = true; + + preBuild = '' + cd ../Builds/ninja-gcc + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/bin + + ${lib.optionalString enableVST2 '' + mkdir -p $out/lib/vst + cp -r RP2A03_artefacts/Release/VST/libRP2A03.so $out/lib/vst + ''} + + cp -r RP2A03_artefacts/Release/LV2/RP2A03.lv2 $out/lib/lv2 + cp -r RP2A03_artefacts/Release/VST3/RP2A03.vst3 $out/lib/vst3 + + install -Dm555 RP2A03_artefacts/Release/Standalone/RP2A03 $out/bin + + install -Dm444 $src/plugin/Resources/logo.png $out/share/pixmaps/RP2A03.png + + runHook postInstall + ''; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXtst" + "-lXdmcp" + ] + ); + + meta = { + description = "Socalabs NES Ricoh 2A03 Emulation Plugin"; + homepage = "https://socalabs.com/synths/rp2a03/"; + mainProgram = "RP2A03"; + platforms = lib.platforms.linux; + license = [ lib.licenses.lgpl21 ] ++ lib.optional enableVST2 lib.licenses.unfree; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +}) diff --git a/pkgs/by-name/so/socalabs-sn76489/package.nix b/pkgs/by-name/so/socalabs-sn76489/package.nix new file mode 100644 index 000000000000..4798aa3e1fc5 --- /dev/null +++ b/pkgs/by-name/so/socalabs-sn76489/package.nix @@ -0,0 +1,153 @@ +{ + stdenv, + fetchFromGitHub, + lib, + cmake, + pkg-config, + alsa-lib, + copyDesktopItems, + makeDesktopItem, + libX11, + libXcomposite, + libXcursor, + libXinerama, + libXrandr, + libXtst, + libXdmcp, + libXext, + xvfb, + freetype, + fontconfig, + expat, + libGL, + libjack2, + curl, + ninja, + writableTmpDirAsHomeHook, + nix-update-script, + # Disable VST building by default, since it is unfree + enableVST2 ? false, +}: +let + version = "1.1.0"; +in +stdenv.mkDerivation { + pname = "socalabs-sn76489"; + inherit version; + + src = fetchFromGitHub { + owner = "FigBug"; + repo = "SN76489"; + tag = "v${version}"; + hash = "sha256-m+bmS2ZTA4yH1+UTow+wMYugx/VloPCHEQJp1P6pxvc="; + fetchSubmodules = true; + preFetch = '' + # can't clone using ssh + export GIT_CONFIG_COUNT=1 + export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf + export GIT_CONFIG_VALUE_0=git@github.com: + ''; + }; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "socalabs-sn76489"; + desktopName = "Socalabs SN76489"; + comment = "Socalabs Texas Instruments SN76489 Emulation Plugin"; + icon = "SN76489"; + exec = "SN76489"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + cmake + pkg-config + copyDesktopItems + ninja + ]; + + buildInputs = [ + alsa-lib + libX11 + libXcomposite + libXcursor + libXinerama + libXrandr + libXtst + libXdmcp + libXext + xvfb + libGL + libjack2 + freetype + fontconfig + expat + curl + ]; + + cmakeFlags = [ + (lib.cmakeBool "JUCE_COPY_PLUGIN_AFTER_BUILD" false) + "--preset ninja-gcc" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'FORMATS Standalone VST VST3 AU LV2' 'FORMATS Standalone ${lib.optionalString enableVST2 "VST"} VST3 LV2' + ''; + + strictDeps = true; + + preBuild = '' + cd ../Builds/ninja-gcc + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/bin + + ${lib.optionalString enableVST2 '' + mkdir -p $out/lib/vst + cp -r SN76489_artefacts/Release/VST/libSN76489.so $out/lib/vst + ''} + + cp -r SN76489_artefacts/Release/LV2/SN76489.lv2 $out/lib/lv2 + cp -r SN76489_artefacts/Release/VST3/SN76489.vst3 $out/lib/vst3 + + install -Dm555 SN76489_artefacts/Release/Standalone/SN76489 $out/bin + + install -Dm444 $src/plugin/Resources/logo.png $out/share/pixmaps/SN76489.png + + runHook postInstall + ''; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXtst" + "-lXdmcp" + ] + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Socalabs Texas Instruments SN76489 Emulation Plugin"; + homepage = "https://socalabs.com/synths/sn76489/"; + mainProgram = "SN76489"; + platforms = lib.platforms.linux; + license = [ lib.licenses.lgpl21 ] ++ lib.optional enableVST2 lib.licenses.unfree; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +} diff --git a/pkgs/by-name/so/socalabs-voc/package.nix b/pkgs/by-name/so/socalabs-voc/package.nix new file mode 100644 index 000000000000..575db6c8b834 --- /dev/null +++ b/pkgs/by-name/so/socalabs-voc/package.nix @@ -0,0 +1,156 @@ +{ + stdenv, + fetchFromGitHub, + lib, + cmake, + pkg-config, + alsa-lib, + copyDesktopItems, + makeDesktopItem, + libX11, + libXcomposite, + libXcursor, + libXinerama, + libXrandr, + libXtst, + libXdmcp, + libXext, + xvfb, + freetype, + fontconfig, + expat, + libGL, + libjack2, + curl, + ninja, + writableTmpDirAsHomeHook, + nix-update-script, + # Disable VST building by default, since its unfree + enableVST2 ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "socalabs-voc"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "FigBug"; + repo = "Voc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aGlazHjZrO5r8OhL7wkMEIDnOW4gXcSZgqzNS+iZ12M="; + fetchSubmodules = true; + preFetch = '' + # can't clone using ssh + export GIT_CONFIG_COUNT=1 + export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf + export GIT_CONFIG_VALUE_0=git@github.com: + ''; + }; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "socalabs-voc"; + desktopName = "Socalabs Voc"; + comment = "Socalabs Wacky Vocal Synth Plugin (Standalone)"; + icon = "Voc"; + exec = "Voc"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + cmake + pkg-config + copyDesktopItems + ninja + ]; + + buildInputs = [ + alsa-lib + libX11 + libXcomposite + libXcursor + libXinerama + libXrandr + libXtst + libXdmcp + libXext + xvfb + libGL + libjack2 + freetype + fontconfig + expat + curl + ]; + + cmakeFlags = [ + (lib.cmakeBool "JUCE_COPY_PLUGIN_AFTER_BUILD" false) + "--preset ninja-gcc" + ]; + + # This is needed because otherwise g++ will complain about + # "FORTIFY_SOURCE" needing to be ran with optimizations + env.NIX_CFLAGS_COMPILE = toString [ + "-O2" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'FORMATS Standalone VST VST3 AU LV2' 'FORMATS Standalone ${lib.optionalString enableVST2 "VST"} VST3 LV2' + ''; + + strictDeps = true; + + preBuild = '' + cd ../Builds/ninja-gcc + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/bin + + ${lib.optionalString enableVST2 '' + mkdir -p $out/lib/vst + cp -r Voc_artefacts/Release/VST/libVoc.so $out/lib/vst + ''} + + cp -r Voc_artefacts/Release/LV2/Voc.lv2 $out/lib/lv2 + cp -r Voc_artefacts/Release/VST3/Voc.vst3 $out/lib/vst3 + + install -Dm555 Voc_artefacts/Release/Standalone/Voc $out/bin + + install -Dm444 $src/plugin/Resources/logo.png $out/share/pixmaps/Voc.png + + runHook postInstall + ''; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXtst" + "-lXdmcp" + ] + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Socalabs Wacky Vocal Synthesizer Plugin"; + homepage = "https://socalabs.com/synths/voc-vocal-synth/"; + mainProgram = "Voc"; + platforms = lib.platforms.linux; + license = [ lib.licenses.lgpl21 ] ++ lib.optional enableVST2 lib.licenses.unfree; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +}) diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index ba22b1207cfc..b70b4fd5a69a 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.42"; + version = "2.43"; pyproject = true; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-qMeb4mdseR3Zukhnit8HMpRfWbu0HO53FuZh7/c5cTc="; + hash = "sha256-WR8MXfk+jFxGX2GpzuqTwZj053HyQ9N16v7zKU3iCPs="; }; build-system = with python3Packages; [ diff --git a/pkgs/development/compilers/factor-lang/0.100.nix b/pkgs/development/compilers/factor-lang/0.100.nix index 856ce4a4e777..ba99d9958df1 100644 --- a/pkgs/development/compilers/factor-lang/0.100.nix +++ b/pkgs/development/compilers/factor-lang/0.100.nix @@ -1,9 +1,15 @@ -{ callPackage, fetchurl }: +{ callPackage, fetchurl, ... }@args: -callPackage ./unwrapped.nix rec { - version = "0.100"; - src = fetchurl { - url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; - hash = "sha256-ei1x6mgEoDVe1mKfoWSGC9RgZCONovAPYfIdAlOGi+0="; - }; -} +callPackage ./unwrapped.nix ( + rec { + version = "0.100"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + hash = "sha256-ei1x6mgEoDVe1mKfoWSGC9RgZCONovAPYfIdAlOGi+0="; + }; + } + // (builtins.removeAttrs args [ + "callPackage" + "fetchurl" + ]) +) diff --git a/pkgs/development/compilers/factor-lang/0.101.nix b/pkgs/development/compilers/factor-lang/0.101.nix new file mode 100644 index 000000000000..6785080abb78 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/0.101.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, ... }@args: + +callPackage ./unwrapped.nix ( + rec { + version = "0.101"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + hash = "sha256-uIuk309xZt+sV7WUza/tpeJRA6CnXAajL15X6S6vtFY="; + }; + } + // (builtins.removeAttrs args [ + "callPackage" + "fetchurl" + ]) +) diff --git a/pkgs/development/compilers/factor-lang/0.99.nix b/pkgs/development/compilers/factor-lang/0.99.nix index d5c1f3c82ad6..16e849f2a87e 100644 --- a/pkgs/development/compilers/factor-lang/0.99.nix +++ b/pkgs/development/compilers/factor-lang/0.99.nix @@ -1,9 +1,15 @@ -{ callPackage, fetchurl }: +{ callPackage, fetchurl, ... }@args: -callPackage ./unwrapped.nix rec { - version = "0.99"; - src = fetchurl { - url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; - sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; - }; -} +callPackage ./unwrapped.nix ( + rec { + version = "0.99"; + src = fetchurl { + url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; + sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; + }; + } + // (builtins.removeAttrs args [ + "callPackage" + "fetchurl" + ]) +) diff --git a/pkgs/development/compilers/factor-lang/unwrapped.nix b/pkgs/development/compilers/factor-lang/unwrapped.nix index e7bdf2bc94b8..cc52c593f771 100644 --- a/pkgs/development/compilers/factor-lang/unwrapped.nix +++ b/pkgs/development/compilers/factor-lang/unwrapped.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchurl, makeWrapper, curl, git, @@ -14,6 +13,10 @@ src, }: +let + inherit (lib) optionalString versionOlder; + +in stdenv.mkDerivation (finalAttrs: { pname = "factor-lang"; @@ -45,7 +48,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace extra/terminfo/terminfo.factor \ --replace-fail '/usr/share/terminfo' '${ncurses.out}/share/terminfo' - + '' + + optionalString (versionOlder finalAttrs.version "0.101") '' # update default paths in fuel-listener.el for fuel mode substituteInPlace misc/fuel/fuel-listener.el \ --replace-fail '(defcustom fuel-factor-root-dir nil' "(defcustom fuel-factor-root-dir \"$out/lib/factor\"" @@ -74,12 +78,14 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/factor $out/share/emacs/site-lisp + mkdir -p $out/lib/factor cp -r factor factor.image libfactor.a libfactor-ffi-test.so \ - boot.*.image LICENSE.txt README.md basis core extra misc \ + boot.unix-*.image LICENSE.txt README.md basis core extra misc \ $out/lib/factor - + '' + + optionalString (versionOlder finalAttrs.version "0.101") '' # install fuel mode for emacs + mkdir -p $out/share/emacs/site-lisp ln -r -s $out/lib/factor/misc/fuel/*.el $out/share/emacs/site-lisp runHook postInstall ''; diff --git a/pkgs/development/compilers/factor-lang/wrapper.nix b/pkgs/development/compilers/factor-lang/wrapper.nix index 4b6e32fddd9d..5f8e4ff37020 100644 --- a/pkgs/development/compilers/factor-lang/wrapper.nix +++ b/pkgs/development/compilers/factor-lang/wrapper.nix @@ -3,6 +3,8 @@ stdenv, makeWrapper, buildEnv, + copyDesktopItems, + makeDesktopItem, factor-unwrapped, cairo, freealut, @@ -35,7 +37,13 @@ doInstallCheck ? true, }: let - inherit (lib) optional optionals optionalString; + inherit (lib) + optional + optionals + optionalString + versionOlder + versionAtLeast + ; # missing from lib/strings escapeNixString = s: lib.escape [ "$" ] (builtins.toJSON s); toFactorArgs = x: lib.concatStringsSep " " (map escapeNixString x); @@ -82,34 +90,62 @@ stdenv.mkDerivation (finalAttrs: { pname = "${factor-unwrapped.pname}-env"; inherit (factor-unwrapped) version; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; buildInputs = optional guiSupport gdk-pixbuf; dontUnpack = true; + desktopItems = [ + (makeDesktopItem { + name = "Factor"; + desktopName = "Factor"; + comment = "A practical stack language"; + exec = "factor"; + icon = "factor"; + categories = [ + "Development" + "IDE" + ]; + }) + ]; + installPhase = '' runHook preInstall '' - + optionalString guiSupport '' - # Set Gdk pixbuf loaders file to the one from the build dependencies here - unset GDK_PIXBUF_MODULE_FILE - # Defined in gdk-pixbuf setup hook - findGdkPixbufLoaders "${librsvg}" - makeWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") - '' + + optionalString guiSupport ( + '' + # Set Gdk pixbuf loaders file to the one from the build dependencies here + unset GDK_PIXBUF_MODULE_FILE + # Defined in gdk-pixbuf setup hook + findGdkPixbufLoaders "${librsvg}" + makeWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") + '' + + optionalString (versionAtLeast finalAttrs.version "0.101") '' + mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps + cp ${factor-unwrapped}/lib/factor/misc/icons/icon.svg $out/share/icons/hicolor/scalable/apps/factor.svg + cp ${factor-unwrapped}/lib/factor/misc/icons/icon.ico $out/share/icons/hicolor/scalable/apps/factor.ico + for i in 16 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + cp ${factor-unwrapped}/lib/factor/misc/icons/icon_''${i}x''${i}.png $out/share/icons/hicolor/''${i}x''${i}/apps/factor.png + done + '' + ) + '' makeWrapperArgs+=( --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs} --prefix PATH : ${lib.makeBinPath bins}) - mkdir -p "$out/bin" "$out/share" + mkdir -p "$out/bin" cp -r "${factor-unwrapped}/lib" "$out/" - cp -r "${factor-unwrapped}/share/emacs" "$out/share/" - chmod -R u+w "$out/lib" "$out/share" + chmod -R u+w "$out/lib" + rm -rf "$out/lib/factor/misc" ( cd ${vocabTree} for f in "lib/factor/"* ; do rm -r "$out/$f" - ln -s "${vocabTree}/$f" "$out/$f" + cp -rL "${vocabTree}/$f" "$out/$f" done ) @@ -136,9 +172,16 @@ stdenv.mkDerivation (finalAttrs: { # Emacs fuel expects the image being named `factor.image` in the factor base dir ln -rs $out/lib/factor/.factor-wrapped.image $out/lib/factor/factor.image + '' + + optionalString (versionOlder finalAttrs.version "0.101") '' + mkdir -p "$out/share/emacs/site-lisp" + cp -r "${factor-unwrapped}/lib/factor/misc/fuel/"*.el "$out/share/emacs/site-lisp" + chmod -R u+wr "$out/share/emacs" # Update default paths in fuel-listener.el to new output sed -E -i -e 's#(\(defcustom fuel-factor-root-dir ").*(")#'"\1$out/lib/factor\2#" \ "$out/share/emacs/site-lisp/fuel-listener.el" + '' + + '' runHook postInstall ''; @@ -175,6 +218,7 @@ stdenv.mkDerivation (finalAttrs: { runtimeLibs binPackages extraVocabs + vocabTree ; }; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 3ebd4398c87a..eb1d3d5410ee 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -172,7 +172,8 @@ let mkdir -p $out/share # move files in $out like LICENSE.txt - find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # NOTE: The `release` file must be located at $JAVA_HOME/release + find $out/ -maxdepth 1 -type f ! -name release -exec mv {} $out/share \; # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt rm -f $out/LICENSE_NATIVEIMAGE.txt diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a89af1637c0d..545fd65e31be 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1022,6 +1022,7 @@ with haskellLib; lvmrun = disableHardening [ "format" ] (dontCheck super.lvmrun); matplotlib = dontCheck super.matplotlib; milena = dontCheck super.milena; + MIP = dontCheck super.MIP; # https://github.com/msakai/haskell-MIP/issues/87 modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; network-dbus = dontCheck super.network-dbus; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a883fc4a30b1..b93ad1ddc0ac 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4055,7 +4055,7 @@ broken-packages: - minizinc-process # failure in job https://hydra.nixos.org/build/233211497 at 2023-09-02 - minst-idx # failure in job https://hydra.nixos.org/build/233259901 at 2023-09-02 - mios # failure in job https://hydra.nixos.org/build/233251863 at 2023-09-02 - - MIP # failure in job https://hydra.nixos.org/build/233199688 at 2023-09-02 + - MIP-glpk # incompatible with extended-reals >=0.2.7.0, https://github.com/msakai/haskell-MIP/commit/60a5ee234fc6667d2c34152761fa5a54a6f6e533 - mirror-tweet # failure in job https://hydra.nixos.org/build/233216951 at 2023-09-02 - mismi-p # failure in job https://hydra.nixos.org/build/233257227 at 2023-09-02 - mit-3qvpPyAi6mH # failure in job https://hydra.nixos.org/build/233229967 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 0c8beced37e2..d9637d9d853b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2256,7 +2256,6 @@ dont-distribute-packages: - minimung - minioperational - minirotate - - MIP-glpk - mismi-kernel - mismi-s3-core - miss diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 52de0dbc6ebf..b6a4818367ba 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -29380,8 +29380,6 @@ self: { ]; description = "Library for using Mixed Integer Programming (MIP)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -29442,6 +29440,7 @@ self: { description = "A GLPK backend to the MIP library"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) glpk; }; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index bc86a2f5255d..c5f26a64d1d4 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -2,23 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, + + # build-system hatchling, - anywidget, - ipython, - ipywidgets, + + # dependencies jinja2, jsonschema, - mistune, narwhals, numpy, packaging, pandas, + toolz, + typing-extensions, + + # tests + anywidget, + ipython, + ipywidgets, + mistune, polars, pytest-xdist, pytestCheckHook, - pythonOlder, - toolz, - typing-extensions, + vega-datasets, vl-convert-python, writableTmpDirAsHomeHook, }: @@ -46,7 +53,9 @@ buildPythonPackage (finalAttrs: { pandas toolz ] - ++ lib.optional (pythonOlder "3.14") typing-extensions; + ++ lib.optionals (pythonOlder "3.14") [ + typing-extensions + ]; nativeCheckInputs = [ anywidget @@ -56,6 +65,7 @@ buildPythonPackage (finalAttrs: { polars pytest-xdist pytestCheckHook + vega-datasets vl-convert-python writableTmpDirAsHomeHook ]; @@ -69,26 +79,36 @@ buildPythonPackage (finalAttrs: { disabledTests = [ # ValueError: Saving charts in 'svg' format requires the vl-convert-python or altair_saver package: see http://github.com/altair-viz/altair_saver/ "test_renderer_with_none_embed_options" + # Sometimes conflict due to parallelism "test_dataframe_to_csv[polars]" "test_dataframe_to_csv[pandas]" + # Network access - "test_theme_remote_lambda" "test_chart_validation_errors" + "test_data_consistency" + "test_load_call" + "test_loader_call" "test_multiple_field_strings_in_condition" + "test_no_remote_connection" + "test_pandas_date_parse" + "test_pandas_date_parse" + "test_polars_date_read_json_roundtrip" + "test_polars_date_read_json_roundtrip" + "test_polars_date_read_json_roundtrip" + "test_polars_date_read_json_roundtrip" + "test_reader_cache" + "test_theme_remote_lambda" + "test_tsv" ]; disabledTestPaths = [ - # Disabled because it requires internet connectivity - "tests/test_examples.py" - "tests/test_datasets.py" + # Network access "altair/datasets/_data.py" - # TODO: Disabled because of missing altair_viewer package - "tests/vegalite/v6/test_api.py" + "tests/test_examples.py" + # avoid updating files and dependency on black "tests/test_toplevel.py" - # require vl-convert package - "tests/utils/test_compiler.py" ]; meta = { diff --git a/pkgs/development/python-modules/hyper-connections/default.nix b/pkgs/development/python-modules/hyper-connections/default.nix index fd6724635ac5..d355145b81e7 100644 --- a/pkgs/development/python-modules/hyper-connections/default.nix +++ b/pkgs/development/python-modules/hyper-connections/default.nix @@ -8,16 +8,16 @@ torch, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hyper-connections"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "hyper-connections"; - tag = version; - hash = "sha256-GRP4ODCs/MMx9S/6LYFMpIoZNJinkcMeY73x4aFacsg="; + tag = finalAttrs.version; + hash = "sha256-nMNAuHOLOgrWNrMFko5ARBOyp9TyUhJfldPihV012K4="; }; build-system = [ hatchling ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Module to make multiple residual streams"; homepage = "https://github.com/lucidrains/hyper-connections"; - changelog = "https://github.com/lucidrains/hyper-connections/releases/tag/${src.tag}"; + changelog = "https://github.com/lucidrains/hyper-connections/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 94a79f5ed2a6..af4307afed9d 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.21.0"; + version = "1.21.1"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-q/JVvhI1NZTuX8vRWi/Q9ANE8ZTaTFNfb94n0NpH+/0="; + hash = "sha256-I6Qh7AzcTYDxNmvgTNVVPSenLfAbdLawdiN8JrrF25s="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix index b152b46a0ad6..df70b4cf0c20 100644 --- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix +++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "langgraph-runtime-inmem"; - version = "0.20.1"; + version = "0.22.0"; pyproject = true; # Not available in any repository src = fetchPypi { pname = "langgraph_runtime_inmem"; inherit version; - hash = "sha256-bukY8Kg58wRMvtaVgLROucrfMaR3H8Lm1mhCx7dyL7A="; + hash = "sha256-jFDM3+JlSoUkw3KdJPg3BTYMA7fWocNiWE4FRquusys="; }; build-system = [ diff --git a/pkgs/development/python-modules/liberty-parser/default.nix b/pkgs/development/python-modules/liberty-parser/default.nix index 32659ccad678..fc66f6ebbae0 100644 --- a/pkgs/development/python-modules/liberty-parser/default.nix +++ b/pkgs/development/python-modules/liberty-parser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "liberty-parser"; - version = "0.0.27"; + version = "0.0.28"; pyproject = true; src = fetchFromGitea { @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tok"; repo = "liberty-parser"; tag = version; - hash = "sha256-WT27nOcl+a86ZgBo/hZItPu/IOrK+t3bUFV2TXy8GnU="; + hash = "sha256-CdsT0R2KVvN0+TfTuauaNpYTKhxx1gAOJJdWNfQb2Dk="; }; # Tests try to write to /tmp directly. use $TMPDIR instead. diff --git a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix index b534afc3d8be..4fc4c386d5f5 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-milvus"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_milvus"; inherit version; - hash = "sha256-Zf+/xk3bqN/ARvwzDiN4/g7Neo6l9x5wTcTSvzto//A="; + hash = "sha256-c44M+k0OL2cKAlI4OZI5f/sf/kF0Cg8o2CxoBUbZMdg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 91aaed14cd47..e93d2d9a02bf 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -6,16 +6,16 @@ oelint-parser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.3.0"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; - tag = version; - hash = "sha256-+QavuUIj6aKaxIp0NPj0doKV/+SL7bh5LaH1TLe/LZ4="; + tag = finalAttrs.version; + hash = "sha256-5eEhr2Jt6Ucco1/3zMGSq5SNcco8FMdJn583qBJmxk0="; }; build-system = [ @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Data for oelint-adv"; homepage = "https://github.com/priv-kweihmann/oelint-data"; - changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${src.tag}"; + changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyecharts/default.nix b/pkgs/development/python-modules/pyecharts/default.nix index d2b09be15f82..38c61fe32499 100644 --- a/pkgs/development/python-modules/pyecharts/default.nix +++ b/pkgs/development/python-modules/pyecharts/default.nix @@ -2,18 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, + + # build-system + setuptools, + + # dependencies jinja2, + prettytable, + simplejson, + + # optional-dependencies + pillow, + + # tests numpy, pandas, - pillow, - prettytable, pytestCheckHook, requests, - setuptools, - simplejson, }: -buildPythonPackage rec { +let + optional-dependencies = { + images = [ pillow ]; + }; +in +buildPythonPackage (finalAttrs: { pname = "pyecharts"; version = "2.0.9"; pyproject = true; @@ -21,7 +35,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyecharts"; repo = "pyecharts"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AMdPsTQsndc0fr4NF2AnJy98k4I2832/GNWeY4IWSRA="; }; @@ -33,9 +47,7 @@ buildPythonPackage rec { simplejson ]; - optional-dependencies = { - images = [ pillow ]; - }; + inherit optional-dependencies; nativeCheckInputs = [ numpy @@ -52,13 +64,17 @@ buildPythonPackage rec { "test_render_embed_js" "test_display_javascript_v2" "test_lines3d_base" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # pyecharts.exceptions.WordCloudMaskImageException + "test_wordcloud_encode_image_to_base64_os_error" ]; meta = { description = "Python Echarts Plotting Library"; homepage = "https://github.com/pyecharts/pyecharts"; - changelog = "https://github.com/pyecharts/pyecharts/releases/tag/${src.tag}"; + changelog = "https://github.com/pyecharts/pyecharts/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index e3035c067b84..f5480eac868e 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,16 +10,16 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysigma-backend-elasticsearch"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; - tag = "v${version}"; - hash = "sha256-2gWYGu+Xr4R7QKEBiL5rXd/2HNinazyrF1OKzte0B3g="; + tag = "v${finalAttrs.version}"; + hash = "sha256-EzqzCCgHnEnBCcoYflBYN5Lb6yHvR7s5B0EtqtvVxtk="; }; build-system = [ poetry-core ]; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "Library to support Elasticsearch for pySigma"; homepage = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch"; - changelog = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch/releases/tag/${src.tag}"; + changelog = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix index 9ab86a0f91f3..b7a46f5c0a59 100644 --- a/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-zaqarclient"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-zaqarclient"; tag = version; - hash = "sha256-RjR1qriPp0zLzT+51y2KV/q+/zAF7/HRExuC81enF7A="; + hash = "sha256-AmwICYc7l1LicP47BLS/Eib0NktX0MI24OLnUGtyn20="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index 0b2d7211c178..d429aaa7e6bb 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -104,6 +104,9 @@ buildPythonPackage { # ConnectionError: Connection: connecting to server: transport error "rerun_py/tests/api_sandbox/" + + # RuntimeError: Failed to load URDF file: No elements found + "rerun_py/tests/unit/test_urdf_tree.py" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index 174d4313b5be..94e6031b2fc5 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, @@ -50,29 +51,7 @@ wikipedia-api, }: -buildPythonPackage rec { - pname = "smolagents"; - version = "1.21.3"; - pyproject = true; - - src = fetchFromGitHub { - owner = "huggingface"; - repo = "smolagents"; - tag = "v${version}"; - hash = "sha256-X9tJfNxF2icULyma0dWIQEllY9oKaCB+MQ4JJTdzhz4="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - huggingface-hub - jinja2 - pillow - python-dotenv - requests - rich - ]; - +let optional-dependencies = lib.fix (self: { audio = [ soundfile ] ++ self.torch; bedrock = [ boto3 ]; @@ -122,6 +101,32 @@ buildPythonPackage rec { # ]; }); +in +buildPythonPackage (finalAttrs: { + pname = "smolagents"; + version = "1.21.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "smolagents"; + tag = "v${finalAttrs.version}"; + hash = "sha256-X9tJfNxF2icULyma0dWIQEllY9oKaCB+MQ4JJTdzhz4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + huggingface-hub + jinja2 + pillow + python-dotenv + requests + rich + ]; + + inherit optional-dependencies; + nativeCheckInputs = [ ipython pytest-datadir @@ -157,6 +162,10 @@ buildPythonPackage rec { "test_visit_webpage" "test_wikipedia_search" ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # TypeError: 'function' object is not subscriptable + "test_stream_to_gradio_memory_step" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Missing dependencies "test_get_mlx" @@ -175,8 +184,8 @@ buildPythonPackage rec { meta = { description = "Barebones library for agents"; homepage = "https://github.com/huggingface/smolagents"; - changelog = "https://github.com/huggingface/smolagents/releases/tag/${src.tag}"; + changelog = "https://github.com/huggingface/smolagents/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 18fa3af34695..96f8263ef6c4 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -15,16 +15,16 @@ volatile, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "usort"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "facebook"; repo = "usort"; - tag = "v${version}"; - hash = "sha256-QnhpnuEt6j/QPmX29A0523QDh4o2QfaCoDI0YJpTc8Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sSc6TpsErz+93+dlKk+RZnyZFAp7qjpNYMVCEW9lXds="; }; build-system = [ @@ -52,9 +52,9 @@ buildPythonPackage rec { meta = { description = "Safe, minimal import sorting for Python projects"; homepage = "https://github.com/facebook/usort"; - changelog = "https://github.com/facebook/usort/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/facebook/usort/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "usort"; }; -} +}) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 494100a5e8b9..f9f36fc09082 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CeF3RKmn7CAjPtAP8h6z8YekdyDEd1ybL9VZjObRtak="; + hash = "sha256-uTwyyF0IwGro9eMXf5z9bEleF0XyEgt3eDCt7l2cNkg="; }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index bd682650e751..53ce5d864945 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.18.3"; # zen + version = "6.18.4"; # zen suffix = "zen1"; # zen - sha256 = "02iw0lsgb8b3yiqdcf90fn0dgbrlbalgdbzbgn6mpy44ycynl8jc"; # zen + sha256 = "08zx7zs3vs8y27pg7fqd25gdh30hn79kwwclnpxh0g3nr3hix783"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 165c6fb7e058..cff3a1f469bf 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { # in nixpkgs! # For that, check the `` section of `appinfo/info.xml` # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml) - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nextcloud"; repo = "notify_push"; tag = "v${version}"; - hash = "sha256-yEls1s7tD/fcqul/BmEsRf2g5mqD74M8TKG+Na3jlcM="; + hash = "sha256-RdrwHlp3VlQkhyYr9XDWzqhNnNmUnd8hVAei8IkkNR8="; }; cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw="; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { app = fetchNextcloudApp { appName = "notify_push"; appVersion = version; - hash = "sha256-Yad1+kc0uCHRV4q7IDbQT8Ea2423YWGy9k42DHB0R1Q="; + hash = "sha256-Z9vTAln//DYsx5VLWeJP1KBRF0to79F9aBLnpp+PdwA="; license = "agpl3Plus"; homepage = "https://github.com/nextcloud/notify_push"; url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz"; diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index d4137aa14d23..93a5db0a52cd 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -2,7 +2,7 @@ stdenv, fetchurl, lib, - nodejs, + nodejs_22, node-pre-gyp, node-gyp, python3, @@ -15,16 +15,17 @@ ncVersion, }: let + nodejs = nodejs_22; latestVersionForNc = { "31" = { - version = "9.0.7"; - appHash = "sha256-7EK4QIM9/Qbku2cTOmMcz6ywqKT9l2Ot1DYsdAXOo2E="; - modelHash = "sha256-h3tYtnQUcuFbWAuiKsN2wiFSbbRy/7eNO992MtGrzkc="; + version = "9.0.9"; + appHash = "sha256-JyxECdAjg+f62hccPUuQ7dFknzETs/JvTB6y5hkbH1M="; + modelHash = "sha256-xqCYMJYCk1fZ9ZnIW+hmB0AWrn9APNdu1hk6id6MQQY="; }; "32" = { - version = "10.0.4"; - appHash = "sha256-/RHnnvGJMcxe4EuceYc20xh3qkYy1ZzGsyvp0h03eLk="; - modelHash = "sha256-AJzVVdZrQs1US1JokW5VokL/uTsK7WiKmuZhw7WeRnU="; + version = "10.0.7"; + appHash = "sha256-quuH9ZNQhvlJ6SsFeboVIrMtF9K6ckpQkXb9OXDvFm8="; + modelHash = "sha256-Q862f4mNWE6V4ZUpfNFZrs4kwRF/29uETCroyie0+zA="; }; }; currentVersionInfo = diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d733e3bb3603..917ff954da4e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -469,7 +469,6 @@ mapAliases { code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22 code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22 code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22 - cog = throw "'cog' has been removed as it depends on unmaintained libraries"; # Added 2025-10-08 CoinMP = throw "'CoinMP' has been renamed to/replaced by 'coinmp'"; # Converted to throw 2025-10-27 collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08 colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb6bdeda8427..6ba9ab58ed2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6752,13 +6752,21 @@ with pkgs; factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { }; }; factorPackages-0_100 = callPackage ./factor-packages.nix { - factor-unwrapped = callPackage ../development/compilers/factor-lang/0.100.nix { }; + factor-unwrapped = callPackage ../development/compilers/factor-lang/0.100.nix { + stdenv = clangStdenv; + }; + }; + factorPackages-0_101 = callPackage ./factor-packages.nix { + factor-unwrapped = callPackage ../development/compilers/factor-lang/0.101.nix { + stdenv = clangStdenv; + }; }; factorPackages = factorPackages-0_100; factor-lang-0_99 = factorPackages-0_99.factor-lang; factor-lang-0_100 = factorPackages-0_100.factor-lang; - factor-lang = factor-lang-0_100; + factor-lang-0_101 = factorPackages-0_101.factor-lang; + factor-lang = factor-lang-0_101; farstream = callPackage ../development/libraries/farstream { inherit (gst_all_1) @@ -11042,6 +11050,7 @@ with pkgs; k3s_1_32 k3s_1_33 k3s_1_34 + k3s_1_35 ; k3s = k3s_1_34;