diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 0594d13e8b7a..a471aa769ff2 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -96,6 +96,8 @@ let (lib.filter (path: lib.length path > 3)) (map (path: lib.elemAt path 3)) (map lib.singleton) + # Filter out new packages + (lib.filter (attrPath: lib.hasAttrByPath attrPath pkgs)) ]; # An attribute can appear in affected *and* touched diff --git a/ci/eval/compare/test.nix b/ci/eval/compare/test.nix index 409f58296530..aaaff6ec9581 100644 --- a/ci/eval/compare/test.nix +++ b/ci/eval/compare/test.nix @@ -138,6 +138,21 @@ let ]; }; }; + testByNameNonExistentChanged = { + expr = fun { + pkgs = mockPkgs { + packages = [ ]; + }; + # Happens when a new package was added to pkgs/by-name + changedFiles = [ "pkgs/by-name/he/hello/sources.json" ]; + affectedAttrPaths = [ ]; + }; + expected = { + packages = [ ]; + teams = { }; + users = { }; + }; + }; testByNameReadmeChanged = { expr = fun { pkgs = mockPkgs { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ecf78d6549b..bb37e0498980 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2021,6 +2021,12 @@ name = "Austin Lund"; keys = [ { fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE"; } ]; }; + aporro = { + email = "git@aporro.dev"; + github = "aporro1"; + githubId = 124402746; + name = "Apollon Tsikas"; + }; appleboblin = { email = "github@appleboblin.com"; github = "appleboblin"; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 996fc3297f6d..be546b0ce617 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -718,12 +718,6 @@ "module-services-suwayomi-server-extra-config": [ "index.html#module-services-suwayomi-server-extra-config" ], - "module-services-immich": [ - "index.html#module-services-immich" - ], - "module-services-immich-vectorchord-migration": [ - "index.html#module-services-immich-vectorchord-migration" - ], "module-services-paisa": [ "index.html#module-services-paisa" ], diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index dcf99a83b7b4..862b3e88ae86 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -382,7 +382,7 @@ - `linux_libre` & `linux_latest_libre` have been removed due to a lack of maintenance. -- Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](#module-services-immich-vectorchord-migration). +- Immich now has support for [VectorChord](https://github.com/tensorchord/VectorChord) when using the PostgreSQL configuration provided by `services.immich.database.enable`, which replaces `pgvecto-rs`. VectorChord support can be toggled with the option `services.immich.database.enableVectorChord`. Additionally, `pgvecto-rs` support is now disabled from NixOS 25.11 onwards using the option `services.immich.database.enableVectors`. This option will be removed fully in the future once Immich drops support for `pgvecto-rs` fully. See [Immich migration instructions](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/web-apps/immich.md#migrating-from-pgvecto-rs-to-vectorchord-pre-2511-installations-module-services-immich-vectorchord-migration). - It is now possible to configure the default source address using the new options [networking.defaultGateway.source](#opt-networking.defaultGateway.source), [networking.defaultGateway6.source](#opt-networking.defaultGateway6.source). diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 7606edda21c1..8c27e3256ad3 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -78,6 +78,8 @@ - [Drasl](https://github.com/unmojang/drasl), an alternative authentication server for Minecraft. Available as [services.drasl](#opt-services.drasl.enable). +- [tabbyAPI](https://github.com/theroyallab/tabbyAPI), the official OpenAI compatible API server for Exllama. Available as [services.tabbyapi](#opt-services.tabbyapi.enable). + ## Backward Incompatibilities {#sec-release-26.05-incompatibilities} @@ -136,6 +138,10 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now. +- `services.immich` no longer supports pgvecto.rs since the package has been removed from nixpkgs. + As a result, options `services.immich.database.enableVectors` and `services.immich.database.enableVectorchord` have been removed, and VectorChord is now always used. + If you have not completed the migration yet, ensure you completely remove the extension from your database before upgrading by following the [migration guide](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/web-apps/immich.md#migrating-from-pgvecto-rs-to-vectorchord-pre-2511-installations-module-services-immich-vectorchord-migration). + - `services.cgit` before always had the git-http-backend and its "export all" setting enabled, which sidestepped any access control configured in cgit's settings. Now you have to make a decision and either enable or disable `services.cgit.gitHttpBackend.checkExportOkFiles` (or disable the git-http-backend). - `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 54ebc0b65767..fb2e7e186093 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -365,6 +365,8 @@ ./programs/xfs_quota.nix ./programs/xonsh.nix ./programs/xppen.nix + ./programs/xscreensaver/sonar.nix + ./programs/xscreensaver/xscreensaver.nix ./programs/xss-lock.nix ./programs/xwayland.nix ./programs/yazi.nix @@ -1771,6 +1773,7 @@ ./services/web-apps/strfry.nix ./services/web-apps/suwayomi-server.nix ./services/web-apps/szurubooru.nix + ./services/web-apps/tabbyapi.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix ./services/web-apps/tuliprox.nix diff --git a/nixos/modules/programs/foot/default.nix b/nixos/modules/programs/foot/default.nix index e80195cf9622..b9a0da3113d0 100644 --- a/nixos/modules/programs/foot/default.nix +++ b/nixos/modules/programs/foot/default.nix @@ -75,13 +75,16 @@ in }; config = lib.mkIf cfg.enable { - environment = { - systemPackages = [ cfg.package ]; - etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings; - - etc."xdg/autostart/foot-server.desktop".source = - lib.mkIf cfg.xdg.serverAutostart "${cfg.package}/share/applications/foot-server.desktop"; - }; + environment = lib.mkMerge [ + { + systemPackages = [ cfg.package ]; + etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings; + } + (lib.mkIf cfg.xdg.serverAutostart { + etc."xdg/autostart/foot-server.desktop".source = + "${cfg.package}/share/applications/foot-server.desktop"; + }) + ]; programs = { foot.settings.main.include = lib.optionals (cfg.theme != null) [ diff --git a/nixos/modules/programs/xscreensaver/sonar.nix b/nixos/modules/programs/xscreensaver/sonar.nix new file mode 100644 index 000000000000..3b3fea0bd71c --- /dev/null +++ b/nixos/modules/programs/xscreensaver/sonar.nix @@ -0,0 +1,26 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.programs.xscreensaver.sonar; + globalCfg = config.programs.xscreensaver; +in +{ + options.programs.xscreensaver.sonar = { + enable = lib.mkEnableOption "xscreensaver"; + }; + config = lib.mkIf cfg.enable { + security.wrappers.sonar = { + capabilities = "cap_net_raw+ep"; + owner = "root"; + group = "root"; + source = pkgs.writeShellScript "sonar-fakeroot" '' + exec ${lib.getExe pkgs.fakeroot} ${globalCfg.package}/libexec/xscreensaver/sonar "$@" + ''; + }; + }; +} diff --git a/nixos/modules/programs/xscreensaver/xscreensaver.nix b/nixos/modules/programs/xscreensaver/xscreensaver.nix new file mode 100644 index 000000000000..b0437c141a47 --- /dev/null +++ b/nixos/modules/programs/xscreensaver/xscreensaver.nix @@ -0,0 +1,20 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.programs.xscreensaver; +in +{ + options.programs.xscreensaver = { + enable = lib.mkEnableOption "all of the xscreensaver programs"; + package = lib.mkPackageOption pkgs "xscreensaver" { }; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + programs.xscreensaver.sonar.enable = true; + }; +} diff --git a/nixos/modules/services/web-apps/immich.md b/nixos/modules/services/web-apps/immich.md deleted file mode 100644 index 2987d584e646..000000000000 --- a/nixos/modules/services/web-apps/immich.md +++ /dev/null @@ -1,32 +0,0 @@ -# Immich {#module-services-immich} - -[Immich](https://immich.app/) is a self-hosted photo and video management -solution, similar to SaaS offerings like Google Photos. - -## Migrating from `pgvecto-rs` to VectorChord (pre-25.11 installations) {#module-services-immich-vectorchord-migration} - -Immich instances that were setup before 25.11 (as in -`system.stateVersion = 25.11;`) will be automatically migrated to VectorChord. -Note that this migration is not reversible, so database dumps should be created -if desired. - -See [Immich documentation][vectorchord-migration-docs] for more details about -the automatic migration. - -After a successful migration, `pgvecto-rs` should be removed from the database -installation, unless other applications depend on it. - -1. Make sure VectorChord is enabled ([](#opt-services.immich.database.enableVectorChord)) and Immich has completed the migration. Refer to the [Immich documentation][vectorchord-migration-docs] for details. -2. Run the following two statements in the PostgreSQL database using a superuser role in Immich's database. - - ```sql - DROP EXTENSION vectors; - DROP SCHEMA vectors; - ``` - - - You may use the following command to run these statements against the database: `sudo -u postgres psql immich` (Replace `immich` with the value of [](#opt-services.immich.database.name)) - -3. Disable `pgvecto-rs` by setting [](#opt-services.immich.database.enableVectors) to `false`. -4. Rebuild and switch. - -[vectorchord-migration-docs]: https://immich.app/docs/administration/postgres-standalone/#migrating-to-vectorchord diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 8ee0102a6ba4..a45a4d5492cc 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -69,6 +69,30 @@ in `services.immich.settings.oauth.clientSecret._secret = "/path/to/secret/file";` '' ) + (lib.mkRemovedOptionModule + [ + "services" + "immich" + "database" + "enableVectorChord" + ] + '' + `database.enableVectorChord` has been deprecated as the pgvecto.rs alternative + is no longer available. From now on, vectorchord is always enabled. + '' + ) + (lib.mkRemovedOptionModule + [ + "services" + "immich" + "database" + "enableVectors" + ] + '' + `database.enableVectors` has been deprecated as pgvecto.rs is no longer available. + From now on, vectorchord is used instead. + '' + ) ]; options.services.immich = { @@ -203,17 +227,6 @@ in // { default = true; }; - enableVectorChord = - mkEnableOption "the new VectorChord extension for full-text search in Postgres" - // { - default = true; - }; - enableVectors = - mkEnableOption "pgvecto.rs in the database. You may disable this, if you have migrated to VectorChord and deleted the `vectors` schema." - // { - default = lib.versionOlder config.system.stateVersion "25.11"; - defaultText = lib.literalExpression "lib.versionOlder config.system.stateVersion \"25.11\""; - }; createDB = mkEnableOption "the automatic creation of the database for immich." // { default = true; }; @@ -263,17 +276,6 @@ in assertion = !isPostgresUnixSocket -> cfg.secretsFile != null; message = "A secrets file containing at least the database password must be provided when unix sockets are not used."; } - { - # When removing this assertion, please adjust the nixosTests accordingly. - assertion = - (cfg.database.enable && cfg.database.enableVectors) - -> lib.versionOlder config.services.postgresql.package.version "17"; - message = "Immich doesn't support PostgreSQL 17+ when using pgvecto.rs. Consider disabling it using services.immich.database.enableVectors if it is not needed anymore."; - } - { - assertion = cfg.database.enable -> (cfg.database.enableVectorChord || cfg.database.enableVectors); - message = "At least one of services.immich.database.enableVectorChord and services.immich.database.enableVectors has to be enabled."; - } ]; services.postgresql = mkIf cfg.database.enable { @@ -286,19 +288,12 @@ in ensureClauses.login = true; } ]; - extensions = - ps: - lib.optionals cfg.database.enableVectors [ ps.pgvecto-rs ] - ++ lib.optionals cfg.database.enableVectorChord [ - ps.pgvector - ps.vectorchord - ]; + extensions = ps: [ + ps.pgvector + ps.vectorchord + ]; settings = { - shared_preload_libraries = - lib.optionals cfg.database.enableVectors [ - "vectors.so" - ] - ++ lib.optionals cfg.database.enableVectorChord [ "vchord.so" ]; + shared_preload_libraries = [ "vchord.so" ]; search_path = "\"$user\", public, vectors"; }; }; @@ -310,40 +305,27 @@ in "cube" "earthdistance" "pg_trgm" - ] - ++ lib.optionals cfg.database.enableVectors [ - "vectors" - ] - ++ lib.optionals cfg.database.enableVectorChord [ "vector" "vchord" ]; - sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ( - # save previous version of vectorchord to trigger reindex on update - lib.optionalString cfg.database.enableVectorChord '' - SELECT COALESCE(installed_version, ''') AS vchord_version_before FROM pg_available_extensions WHERE name = 'vchord' \gset - '' - + '' - ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions} - ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions} - ALTER SCHEMA public OWNER TO ${cfg.database.user}; - '' - + lib.optionalString cfg.database.enableVectors '' - ALTER SCHEMA vectors OWNER TO ${cfg.database.user}; - GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user}; - '' - # trigger reindex if vectorchord updates - # https://docs.immich.app/administration/postgres-standalone/#updating-vectorchord - + lib.optionalString cfg.database.enableVectorChord '' - SELECT COALESCE(installed_version, ''') AS vchord_version_after FROM pg_available_extensions WHERE name = 'vchord' \gset + sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" '' + -- save previous version of vectorchord to trigger reindex on update + SELECT COALESCE(installed_version, ''') AS vchord_version_before FROM pg_available_extensions WHERE name = 'vchord' \gset - SELECT (:'vchord_version_before' != ''' AND :'vchord_version_before' != :'vchord_version_after') AS has_vchord_updated \gset - \if :has_vchord_updated - REINDEX INDEX face_index; - REINDEX INDEX clip_index; - \endif - '' - ); + ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions} + ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions} + ALTER SCHEMA public OWNER TO ${cfg.database.user}; + + -- trigger reindex if vectorchord updates + -- https://docs.immich.app/administration/postgres-standalone/#updating-vectorchord + SELECT COALESCE(installed_version, ''') AS vchord_version_after FROM pg_available_extensions WHERE name = 'vchord' \gset + + SELECT (:'vchord_version_before' != ''' AND :'vchord_version_before' != :'vchord_version_after') AS has_vchord_updated \gset + \if :has_vchord_updated + REINDEX INDEX face_index; + REINDEX INDEX clip_index; + \endif + ''; in [ '' @@ -480,6 +462,5 @@ in }; meta = { maintainers = with lib.maintainers; [ jvanbruegge ]; - doc = ./immich.md; }; } diff --git a/nixos/modules/services/web-apps/tabbyapi.nix b/nixos/modules/services/web-apps/tabbyapi.nix new file mode 100644 index 000000000000..0340e69775a7 --- /dev/null +++ b/nixos/modules/services/web-apps/tabbyapi.nix @@ -0,0 +1,199 @@ +{ + pkgs, + config, + lib, + ... +}: + +let + cfg = config.services.tabbyapi; + yamlFormat = pkgs.formats.yaml { }; + configFile = yamlFormat.generate "config.yml" cfg.settings; +in +{ + options.services.tabbyapi = { + enable = lib.mkEnableOption "tabbyapi"; + + package = lib.mkPackageOption pkgs "tabbyapi" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to open the firewall for the TabbyAPI port."; + }; + + settings = lib.mkOption { + description = '' + Configuration for TabbyAPI. https://github.com/theroyallab/tabbyAPI/wiki/02.-Server-options + ''; + type = lib.types.submodule { + freeformType = yamlFormat.type; + + options = { + network = { + host = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "The IP to host on. Use 0.0.0.0 to expose on all adapters."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 5000; + description = "The port to host on."; + }; + + disable_auth = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Disable HTTP token authentication. WARNING: Vulnerable if exposed."; + }; + + api_servers = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "OAI" ]; + description = "Select API servers to enable. Options: OAI, Kobold."; + }; + }; + + logging = { + log_prompt = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable prompt logging."; + }; + + log_requests = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable request logging. Only use for debug."; + }; + }; + + model = { + model_dir = lib.mkOption { + type = lib.types.str; + default = "models"; + description = "Directory to look for models. Relative to the state directory."; + example = lib.literalExpression '' + (pkgs.linkFarm "models" { + qwen-8b = pkgs.fetchgit { + url = "https://huggingface.co/turboderp/Qwen3-VL-8B-Instruct-exl3"; + rev = "652ab6be95b3e2880e78d87269013d98ca9c392d"; # 4bpw + fetchLFS = true; + hash = "sha256-n+9Mt7EZ3XHM0w8oGUZr4EBz91EFyp1VBpvl9Php/QM="; + }; + + # Example for patching Qwen 3.5's template to work with OpenWebUI's thinking feature + Qwen3_5-9B = pkgs.applyPatches { + src = pkgs.fetchgit { + url = "https://huggingface.co/turboderp/Qwen3.5-9B-exl3"; + rev = "6f8763307a3130ae989269fbc79a8c8e9db5ee42"; # 5.0bpw + fetchLFS = true; + hash = "sha256-Y7Uw/MChXU0Iu9hb3dv+cTtNBwhPbd/I/gYDUjM1j8g="; + }; + patches = [ ./qwen-thinking.patch ]; + }; + # diff --git a/chat_template.jinja b/chat_template.jinja + # index a585dec..68f1b6f 100644 + # --- a/chat_template.jinja + # +++ b/chat_template.jinja + # @@ -148,7 +148,5 @@ + # {{- '<|im_start|>assistant\n' }} + # {%- if enable_thinking is defined and enable_thinking is false %} + # {{- '\n\n\n\n' }} + # - {%- else %} + # - {{- '\n' }} + # {%- endif %} + # {%- endif %} + # \ No newline at end of file + }).outPath; + ''; + }; + + model_name = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "The initial model to load on startup. Must exist in model_dir."; + example = "Qwen3_5-9B"; + }; + + max_seq_len = lib.mkOption { + type = lib.types.nullOr lib.types.int; + default = null; + description = "Max sequence length. Set null to use model defaults."; + }; + + cache_mode = lib.mkOption { + type = lib.types.str; + default = "FP16"; + description = "Cache mode for VRAM savings. ExLlamaV2: FP16, Q8, Q6, Q4. ExLlamaV3: specific pair string (e.g., '8,8')."; + }; + + gpu_split_auto = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Automatically allocate resources to GPUs."; + }; + + dummy_model_names = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "gpt-3.5-turbo" ]; + description = "List of fake model names sent via the /v1/models endpoint."; + }; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.package.passthru.cudaSupport; + message = '' + TabbyAPI requires CUDA support to function. The configured package does not have CUDA enabled. + Consider setting: + services.tabbyapi.package = pkgs.pkgsCuda.tabbyapi; + ''; + } + ]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.network.port + ]; + + systemd.services.tabbyapi = { + enable = true; + wantedBy = [ "multi-user.target" ]; + description = "TabbyAPI - OAI compatible server for Exllama"; + + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} --config=${configFile}"; + Restart = "on-failure"; + StateDirectory = "tabbyapi"; + WorkingDirectory = "/var/lib/tabbyapi"; + User = "tabbyapi"; + Group = "tabbyapi"; + DynamicUser = true; + + # Hardening + ProtectSystem = "strict"; + ProtectHome = "yes"; + LockPersonality = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ BatteredBunny ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a797d5466611..d7863112185c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -584,6 +584,7 @@ in _module.args.firefoxPackage = pkgs.firefox-esr-140; }; firefox-syncserver = runTest ./firefox-syncserver.nix; + firefox_decrypt = runTest ./firefox_decrypt.nix; firefoxpwa = runTest ./firefoxpwa.nix; firejail = runTest ./firejail.nix; firewall = runTest { @@ -771,7 +772,6 @@ in immich = runTest ./web-apps/immich.nix; immich-kiosk = runTest ./web-apps/immich-kiosk.nix; immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix; - immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix; immichframe = runTest ./web-apps/immichframe.nix; incron = runTest ./incron.nix; diff --git a/nixos/tests/firefox_decrypt.nix b/nixos/tests/firefox_decrypt.nix new file mode 100644 index 000000000000..afc3bfaf485c --- /dev/null +++ b/nixos/tests/firefox_decrypt.nix @@ -0,0 +1,73 @@ +{ lib, ... }: +{ + name = "firefox_decrypt"; + + meta = { + maintainers = with lib.maintainers; [ schnusch ]; + }; + + nodes.machine = + { pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + programs.firefox.enable = true; + environment.systemPackages = [ pkgs.firefox_decrypt ]; + }; + + enableOCR = true; + + testScript = '' + import csv + import io + import random + import string + + machine.wait_for_x() + + expected: dict[str, str] = { + "url": "http://localhost", + "user": "user", + "password": "".join(random.choices(string.ascii_letters + string.digits, k=32)), + } + + machine.execute("firefox about:logins >&2 &") + + # press "Add password" button + # "Search Passwords" is not found by OCR, probably due to too low contrast. + machine.wait_for_text("No passwords saved") + for c in ("tab", "\n"): + machine.send_key(c) + + # add a new password entry + machine.wait_for_text("Add password") + for text, control in [ + (expected["url"], "tab"), + (expected["user"], "tab"), + (expected["password"], "\n"), + ]: + with machine.nested(f"typing {repr(text)}"): + for c in text: + machine.send_key(c, log=False) + machine.send_key(control) + + # "Remove" button for our new entry appeared + machine.wait_for_text("Remove") + + # close Firefox + machine.send_key("ctrl-q") + machine.wait_for_text(r"Quit Firefox or close current tab\?") + machine.send_key("\n") + + # extract Firefox logins + credentials = list( + csv.DictReader( + io.StringIO( + machine.succeed("firefox-decrypt -f csv ~/.config/mozilla/firefox"), + newline="", + ), + delimiter=";", + ) + ) + assert expected in credentials, f"expected {expected!r} in {credentials!r}" + ''; +} diff --git a/nixos/tests/web-apps/immich-vectorchord-migration.nix b/nixos/tests/web-apps/immich-vectorchord-migration.nix deleted file mode 100644 index 786a624c4ec3..000000000000 --- a/nixos/tests/web-apps/immich-vectorchord-migration.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ ... }: -{ - name = "immich-vectorchord-migration"; - - nodes.machine = - { lib, pkgs, ... }: - { - # These tests need a little more juice - virtualisation = { - cores = 2; - memorySize = 2048; - diskSize = 4096; - }; - - environment.systemPackages = with pkgs; [ immich-cli ]; - - services.immich = { - enable = true; - environment.IMMICH_LOG_LEVEL = "verbose"; - # Simulate an existing setup - database.enableVectorChord = lib.mkDefault false; - database.enableVectors = lib.mkDefault true; - }; - - # TODO: Remove when PostgreSQL 17 is supported. - services.postgresql.package = pkgs.postgresql_16; - - specialisation."immich-vectorchord-enabled".configuration = { - services.immich.database.enableVectorChord = true; - }; - - specialisation."immich-vectorchord-only".configuration = { - services.immich.database = { - enableVectorChord = true; - enableVectors = false; - }; - }; - }; - - testScript = - { nodes, ... }: - let - specBase = "${nodes.machine.system.build.toplevel}/specialisation"; - vectorchordEnabled = "${specBase}/immich-vectorchord-enabled"; - vectorchordOnly = "${specBase}/immich-vectorchord-only"; - in - '' - def psql(command: str): - machine.succeed(f"sudo -u postgres psql -d ${nodes.machine.services.immich.database.name} -c '{command}'") - - def immich_works(): - machine.wait_for_unit("immich-server.service") - - machine.wait_for_open_port(2283) # Server - machine.wait_for_open_port(3003) # Machine learning - machine.succeed("curl --fail http://localhost:2283/") - - immich_works() - - machine.succeed("${vectorchordEnabled}/bin/switch-to-configuration test") - - immich_works() - - psql("DROP EXTENSION vectors;") - psql("DROP SCHEMA vectors;") - - machine.succeed("${vectorchordOnly}/bin/switch-to-configuration test") - - immich_works() - ''; -} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 3266974b71dd..14eff28bd760 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2026-03-04"; + version = "0.0.27-unstable-2026-03-11"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "865cee5f80db8b7959592f23f174acac36f8be8d"; - hash = "sha256-5Od/GWzqKpxqprAtmCGSRpJ0E9v6lbVUFK1TzN7G8wo="; + rev = "9a7793461549939f1d52b2b309a1aa44680170c8"; + hash = "sha256-EEkAoufj29P46RIUrRNG0xJL9Wu4X7LZCS1fer4/nZQ="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index feb7ae57ee6d..ee5195fe46d2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -262,8 +262,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "20.3.0"; - hash = "sha256-o3e2qVKw/sfnFHbHHdRlB9UjEx1KLD1KVoaAsnlYjmY="; + version = "21.2.2"; + hash = "sha256-rpll3EsTGEuynrw7EsP3GeltG/vtYqgO8mvTCVyU1ao="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 991511adc86d..5fd51dc435ba 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2026-01-16"; + version = "0-unstable-2026-03-13"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "9fe223d9c4b615c55840170c6e85e6e9fa4bd1d2"; - hash = "sha256-BBFT8+TLf5qbwo36BudPjeMRPLdSj2+0m4RnfeFrlOc="; + rev = "d3c39fa18476ddce05027db3d29abba813fa74e2"; + hash = "sha256-FkvO03x6oRqdeaot8vq5C15VjQXJ7tUoJtal7/z09rU="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index be33f5b49855..de3c2cde38eb 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-01-23"; + version = "0-unstable-2026-03-06"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "c858c9c5eebef46ea1a69427091853f9f1edbd23"; - hash = "sha256-3Rzoy2G517Pc3mAQY+b2dvAMDxUoUmyR8FCyg4BR5bc="; + rev = "d446078a385a5acae701f4b3b6b3fd58476d73d3"; + hash = "sha256-jw8vj3fTHwBH6h+OelVJHNqy86DKFlohhIeQ9TLkGjc="; }; meta = { diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index b3e4a42167df..227cd0cafc08 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "146.0.7680.75", + "version": "146.0.7680.80", "chromedriver": { - "version": "146.0.7680.76", - "hash_darwin": "sha256-zCICFkv0dXZYIIp8xnqEbxBR4Q9+GlCEY6yoJHsqcVg=", - "hash_darwin_aarch64": "sha256-UzawlFfX/lIATPL8j6XMkurE1SzhNwyB/jn4v6tWY/g=" + "version": "146.0.7680.80", + "hash_darwin": "sha256-sjCEvFWV07GNhXJ9CfGVtZ6nCeqsqtNtY4sPj/gq13w=", + "hash_darwin_aarch64": "sha256-kTxZJiF7mJlVbkDDFP4ZUB2htBn45se1Wuz28RP8pr8=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "d865c3fe495882da3a7c6575337a02867c4536b1", - "hash": "sha256-/hjpcI4GTw0bGqZ5/9gzM4Pc6/5fhk5dmdtw5EfidiY=", + "rev": "f08938029c887ea624da7a1717059788ed95034d", + "hash": "sha256-PCQeTdc6Fl74TLyvxjli4scIUIm0GgZ3e9wbC18Tclw=", "recompress": true }, "src/third_party/clang-format/script": { @@ -652,8 +652,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "50841da4a7b7064b3cea8a851e60ef921c87a103", - "hash": "sha256-RoLgaE5mj9UqePhnfH+BOTit04TyiAvgF7/2PLuBG4Y=" + "rev": "248acd90d9a35ac46b2ec30201ae50f301b8a173", + "hash": "sha256-zOL5j9X72ZvYmS8MzQ+pqSkT8AWBz2IwmaH7I3LN1IE=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f700d3619bed..c1f36256aaa7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1400,13 +1400,13 @@ "vendorHash": null }, "ubiquiti-community_unifi": { - "hash": "sha256-2IYiy/DLCj+bcEkU+nwLg7Wt2j7bh29cScPcSTGsU5A=", + "hash": "sha256-Y3MgMRhWmXYp0aYLIkV2Ug5bZb8LsPYr3oJkXhPtQoo=", "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi", "owner": "ubiquiti-community", "repo": "terraform-provider-unifi", - "rev": "v0.41.17", + "rev": "v0.41.25", "spdx": "MPL-2.0", - "vendorHash": "sha256-rixXMK+M6/8g4cw/f+zNzY9x3GkA3nqmkQTPrONoueY=" + "vendorHash": "sha256-OVdhM8Zqnm1J8KducnkNkroBoSLER3fHfZBjyp7kBu8=" }, "ucloud_ucloud": { "hash": "sha256-UOVnfWYhntmRHMApQgemjUBsyUIz0bexsc1gwDGGee4=", diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index d1960a01ab34..3d29c6123180 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -65,8 +65,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "148.0"; - sha512 = "ec5e586206ef217f37eb6985356994e7e7c9db6090f57d5b4c43a3a5dc0e1f5a56c0e7080d86fb895446845f9c9b948284f7417afebcf6e6120eca0e1ed238f3"; + version = "148.0.1"; + sha512 = "4f6e721b0858bece740f04744d10d8bb0b0673d2ebfe5624d3797e28e394510a8518dc31fc6a121ba7ed8a5a44953efefe3a74071e9f967c22be17cee45b3faf"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix index 9637eb2c403b..3203dc26ff78 100644 --- a/pkgs/by-name/an/angular-language-server/package.nix +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -15,11 +15,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "angular-language-server"; - version = "21.2.0"; + version = "21.2.2"; src = fetchurl { name = "angular-language-server-${finalAttrs.version}.zip"; url = "https://github.com/angular/angular/releases/download/vsix-${finalAttrs.version}/ng-template-${finalAttrs.version}.vsix"; - hash = "sha256-q9ywNxdKLz431nCEzPs2sB8IDPveoUWAthmDKkBAkHI="; + hash = "sha256-rpll3EsTGEuynrw7EsP3GeltG/vtYqgO8mvTCVyU1ao="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix index 5c172f33eead..e9a0752bff1b 100644 --- a/pkgs/by-name/ap/apidog/package.nix +++ b/pkgs/by-name/ap/apidog/package.nix @@ -7,11 +7,11 @@ let pname = "apidog"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage"; - hash = "sha256-+nilQYbkfS8z3J4CbD9jC1nm/zY3fX+bl8eNsaLOHVA="; + hash = "sha256-bCh3GW+K++3eI3SdcD5t7Vk1jYPl4KFWr1dwqXL7fOQ="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index ad816e4ff8cc..cf84aeb3e3ff 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -155,6 +155,10 @@ stdenv.mkDerivation (finalAttrs: { "TestS3FS.*" "TestS3FSGeneric.*" "TestS3FSHTTPS.*" # Needs Minio + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # https://github.com/apache/arrow/issues/41505 + "TestAzuriteGeneric.Empty" ]; in "-${lib.concatStringsSep ":" filteredTests}"; @@ -307,10 +311,6 @@ stdenv.mkDerivation (finalAttrs: { # Failing with "run-test.sh: line 88: 63682 Abort trap: 6" "arrow-flight-internals-test" "arrow-flight-sql-test" - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - # https://github.com/apache/arrow/issues/41505 - "TestAzuriteGeneric.Empty" ]; in '' diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix index 097285e161b2..b2cdf8e9111f 100644 --- a/pkgs/by-name/at/atproto-goat/package.nix +++ b/pkgs/by-name/at/atproto-goat/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "atproto-goat"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "goat"; tag = "v${finalAttrs.version}"; - hash = "sha256-jSwlKKMrUsb0stcPvC9i7dgH4DrlnUTwp+HYTwendB0="; + hash = "sha256-mI7GC0ElE+FxT7v29V/a+UZBI1d6os+HpEO5WYWxm6A="; }; postPatch = '' @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { --replace-fail '"github.com/earthboundkid/versioninfo/v2"' "" ''; - vendorHash = "sha256-rqnCFBSmHaZWWc1MrK8udQLkK5MP4Yv2TTlozQqW0fc="; + vendorHash = "sha256-QVnpISwYri8aL4umZWi2LJ0X13CXXK7JygaBh1Sq5PA="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index b81165b46371..1190635b4ed7 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-xwnNTefv3E6Y27G8cSRNs9adXwzP2w3XK6xX1QEs60g="; + hash = "sha256-Ca1a8Q6YJpGUMZ3cbQkIndmeE10V7myB/3EQ4r3fa1o="; }; - cargoHash = "sha256-Uf+W+f17DMKOYR/KYiyEd+RU/bPMq+itbpHfCAq+7R4="; + cargoHash = "sha256-z2JtrZkvlvfQGhhY3T3PIiXUq53bSb7Z8rgvGZPzPag="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bq/bqn/package.nix b/pkgs/by-name/bq/bqn/package.nix index 28dac55e2b6c..6e8bb264e364 100644 --- a/pkgs/by-name/bq/bqn/package.nix +++ b/pkgs/by-name/bq/bqn/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bqn"; - version = "0-unstable-2024-05-13"; + version = "0-unstable-2026-03-01"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "c971a177421d532a13c4b7515535552df19681e1"; - hash = "sha256-Fru1IIb4IxBQxrEEBoRYStxBqYJJqd+Q+Hwyk++QA68="; + rev = "df1d848328194249e68635f8b8c04641d9fa6bdc"; + hash = "sha256-2S675ru67bcSSXGLEWfPkyW+U+cHzKs/HbM8ZSWMcEs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 26f2378f9f30..6a6c527683d9 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.26.33"; + version = "0.26.37"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-e016wNfAVhDFwCYvBb/I+nci1FVSG/knsPZFhsR4074="; + hash = "sha256-bxiYY55r1Vg8ljoGlUBi5WgAU8GtcEsX030uzfMsals="; }; - cargoHash = "sha256-KCL3GhNb1ilKXXjj6DSnLTbSNfevAYDUuJt01y4bDVE="; + cargoHash = "sha256-AJr4auizFqumMaQzFd5G1keSIRJ3fWX7ftGHDTkPmX0="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/carapace/package.nix b/pkgs/by-name/ca/carapace/package.nix index 9af3a34b46b4..244dc57c2c56 100644 --- a/pkgs/by-name/ca/carapace/package.nix +++ b/pkgs/by-name/ca/carapace/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.6.0"; + version = "1.6.3"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-btExAFj3nnq5vv3LJgUA7pdmQhd6ANUexC/AQcIg0Ms="; + hash = "sha256-k6fWtwDTNc2qcr9ryL7wMVy744fiP8NrLqm4crVr+EI="; }; - vendorHash = "sha256-7Gmt4ZHmYK5IukQYuY0felhW+ul23wSDX9PJyI6rDWQ="; + vendorHash = "sha256-5AqoM16M5pPfRYxqa72LrHJRRatK2qnZK3pQIoFXG9g="; proxyVendor = true; diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index d064e1616fd9..12530d15ba90 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.12.3"; + version = "4.13.1"; src = fetchFromGitHub { owner = "ccache"; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-oX7qG3jjrLm4gKZd8w7Bc7uE5U5sIa35//PDRJ/XHcM="; + hash = "sha256-8Qw5nkY86wGJ7B2hrNk9jIoz18nJ2FK+EbPH5fS5aEc="; }; outputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + patchShebangs --build doc/scripts patchShebangs --build test/fake-compilers ''; @@ -98,8 +99,9 @@ stdenv.mkDerivation (finalAttrs: { ]; disabledTests = [ - "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) + "test.direct" # https://github.com/ccache/ccache/issues/1699 "test.fileclone" # flaky on hydra, also seems to fail on zfs + "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test.basedir" diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index 0601561c037d..0b37a517de43 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cfripper"; - version = "1.19.1"; + version = "1.20.0"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; tag = "v${finalAttrs.version}"; - hash = "sha256-7lFHtdicpoZ3ZhwKeRhjex3tK+0aOzKD44Q7njOR2l4="; + hash = "sha256-uJy1n+bZgmKZpyu1MmbHgKeEOl5onUuQI3ZAlLgY+v4="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/co/coeurl/package.nix b/pkgs/by-name/co/coeurl/package.nix index 4de231022ed6..7737091eb20c 100644 --- a/pkgs/by-name/co/coeurl/package.nix +++ b/pkgs/by-name/co/coeurl/package.nix @@ -12,18 +12,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "coeurl"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = "coeurl"; tag = "v${finalAttrs.version}"; - hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE="; + hash = "sha256-8BwyPfLgkJG1CHnRAKxgn8ObEGSK+lKKUhQibs1dCg4="; }; - postPatch = '' - substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' - ''; nativeBuildInputs = [ ninja diff --git a/pkgs/by-name/co/collision/package.nix b/pkgs/by-name/co/collision/package.nix index 25e3cd365bf4..6db7a98073ce 100644 --- a/pkgs/by-name/co/collision/package.nix +++ b/pkgs/by-name/co/collision/package.nix @@ -21,13 +21,13 @@ crystal.buildCrystalPackage rec { pname = "Collision"; - version = "3.11.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Collision"; - rev = "v${version}"; - hash = "sha256-OCFy7DFSRsqiw+b6zlJy9Us44zQXf150zVDu3GmclOk="; + tag = "v${version}"; + hash = "sha256-GcCqItSHUhhS0yrOM8bMzkVsVHyC97c+yccw5ZP61IU="; }; postPatch = '' @@ -100,9 +100,6 @@ crystal.buildCrystalPackage rec { supportedFeatures = [ "silent" ]; } ]; - shardLock = runCommand "shard.lock" { inherit src; } '' - cp $src/shard.lock $out - ''; }; meta = { diff --git a/pkgs/by-name/co/collision/shards.nix b/pkgs/by-name/co/collision/shards.nix index 531500258461..1ea26ad4ac42 100644 --- a/pkgs/by-name/co/collision/shards.nix +++ b/pkgs/by-name/co/collision/shards.nix @@ -11,13 +11,13 @@ }; "gi-crystal" = { url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.25.0"; - sha256 = "0lgs85khg6yzmw7vnkjxygrga1618440hayjc51jmjcfh2lff1k2"; + rev = "v0.25.1"; + sha256 = "0283isgrann4r3ily8c7fip0x6h947g9s3hgmrja0m6si3lkgizs"; }; "gtk4" = { url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.17.0"; - sha256 = "0lv3nvsanxi4g2322zvkf1jxx5zgzaapk228vcw2cl0ja1drm06d"; + rev = "v0.18.0"; + sha256 = "03kab6nbkgxnnrp7g0gr4cv7rjsp7y8m7kz2rzb1ci63qzkzqlqi"; }; "harfbuzz" = { url = "https://github.com/hugopl/harfbuzz.cr.git"; diff --git a/pkgs/by-name/cu/curtail/package.nix b/pkgs/by-name/cu/curtail/package.nix index 64ef81b5a80b..2e021ff32fef 100644 --- a/pkgs/by-name/cu/curtail/package.nix +++ b/pkgs/by-name/cu/curtail/package.nix @@ -22,14 +22,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "curtail"; - version = "1.14.0"; + version = "1.15.0"; pyproject = false; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; tag = finalAttrs.version; - sha256 = "sha256-AxQe7abHZp4SRp90fkFbmXf3ZQH3VmxQVkpxRcit+54="; + hash = "sha256-1X3isnhl5Lw+iVLM2WdZEaKphLiikBtg5QlSxgQHqy8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index 5f05845c1d71..da91ae2759e2 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2512"; + version = "2603"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; - hash = "sha256-VmDhYZfYyzf08FXZTeBYmdEp9P8AugUpiOxNj8aEJqw="; + hash = "sha256-9kB5hFAJwLkFi2y5c5ZavwcnXRDE5bxerg5E1hPAutY="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index f73b573ae401..c70f6985c9a6 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Tz14pjI5pNJOQH0KFaf9mJkFdup1GVxlkMnzVQusx/M="; }; - patches = [ ./qmlmodule-fix.patch ]; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch b/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch deleted file mode 100644 index 5ef0be2365fa..000000000000 --- a/pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2736ac18b..85be09a90 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ find_package(KF${QT_MAJOR_VERSION} REQUIRED COMPONENTS - QQC2DesktopStyle - ) - --ecm_find_qmlmodule(org.kde.kirigami REQUIRED) -+ecm_find_qmlmodule(org.kde.kirigami) - - qt_policy(SET QTP0001 NEW) diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index 37c545306432..034c341f9f6b 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -18,20 +18,22 @@ stdenv.mkDerivation rec { pname = "emblem"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; group = "World"; owner = "design"; repo = "emblem"; - rev = version; - sha256 = "sha256-knq8OKoc8Xv7lOr0ub9+2JfeQE84UlTHR1q4SFFF8Ug="; + tag = version; + hash = "sha256-OqP6KLaDix4hR/AA+lfaMu4nZPqpAKfYzZu7tr+RUJI="; + # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/485701 + forceFetchGit = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-CsISaVlRGtVVEna1jyGZo/IdWcJdwHJv6LXcXYha2UE="; + hash = "sha256-J00zw8jOeMLjGyn2Gj4TA5vHjIWOw+x/XEIXMyBFMdw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 8528540a2873..b6ae60777831 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "6170"; + version = "6194"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6170.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6194.0/main.zip"; extension = "zip"; - hash = "sha256-tMovLxTHbBvqQ+e8GLaLIel2hSchuFXnOfnytgSKfsY="; + hash = "sha256-Ja/b/5kKekBZZbqp0o2I8dvtiQ/rRa2kS6Q+08yBX7I="; }; buildInputs = [ icu diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index dc288f7f9da1..a2608874d785 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,8 +11,8 @@ let pname = "everest"; - version = "6170"; - rev = "62ef4d0c36f433fa3a26502eabe6cda5ff205fbc"; + version = "6194"; + rev = "5adc0e7ae6087ba90f9dd1cad487cf4dde1d493b"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -25,7 +25,7 @@ buildDotnetModule { fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-OumeSvcWX3/zot7akcQea7jUQH0rL5/E0HzhITGPedA="; + hash = "sha256-GG3cxrMZRSHoUzewHEQvljXSgHWcF9GNunlyWbiKrQo="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/by-name/fi/firefox_decrypt/package.nix b/pkgs/by-name/fi/firefox_decrypt/package.nix index 0dba1e092146..12c46382888d 100644 --- a/pkgs/by-name/fi/firefox_decrypt/package.nix +++ b/pkgs/by-name/fi/firefox_decrypt/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, nss, + nixosTests, nix-update-script, stdenv, python3Packages, @@ -9,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "firefox_decrypt"; - version = "1.1.1"; + version = "1.1.3"; pyproject = true; src = fetchFromGitHub { owner = "unode"; repo = "firefox_decrypt"; tag = finalAttrs.version; - hash = "sha256-HPjOUWusPXoSwwDvW32Uad4gFERvn79ee/WxeX6h3jY="; + hash = "sha256-Y958qXGpkNgMBYiM80OKQYkO7EdqH7T5FfINELAB9CY="; }; build-system = with python3Packages; [ @@ -32,12 +33,28 @@ python3Packages.buildPythonApplication (finalAttrs: { (lib.makeLibraryPath [ nss ]) ]; - passthru.updateScript = nix-update-script { }; + checkPhase = '' + runHook preCheck + + patchShebangs tests + (cd tests && ${ + if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH" + }=${lib.makeLibraryPath [ nss ]} ./run_all) + + runHook postCheck + ''; + + passthru = { + tests = { + inherit (nixosTests) firefox_decrypt; + }; + updateScript = nix-update-script { }; + }; meta = { homepage = "https://github.com/unode/firefox_decrypt"; description = "Tool to extract passwords from profiles of Mozilla Firefox and derivates"; - mainProgram = "firefox_decrypt"; + mainProgram = "firefox-decrypt"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ schnusch diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index bb12d69db7af..8947f5a0a755 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.67.2"; + version = "0.69.1"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-MWK6Az135IHIzXMUQeHyeb2PROXyeLKyFjIUnDD47T8="; + sha256 = "sha256-UgYMaZ/v99dmfSUekU2xSOoJecrmvUoVfO5eYm9prZw="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/fluvio/package.nix b/pkgs/by-name/fl/fluvio/package.nix new file mode 100644 index 000000000000..8b532086e941 --- /dev/null +++ b/pkgs/by-name/fl/fluvio/package.nix @@ -0,0 +1,72 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + perl, + kubernetes-helm, + gitMinimal, + installShellFiles, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "fluvio-cli"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "fluvio-community"; + repo = "fluvio"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7kGMOAzBGrMOMj4Fyvy9xVwTGEkee5W7JAldbyTV298="; + }; + + cargoHash = "sha256-OAw/nftF63WyE3E+zaVCYYXh37p6HB0ib7WModfXKBA="; + + nativeBuildInputs = [ + # Necessary because of a hard dependency to the openssl-src rust crate + perl + kubernetes-helm + installShellFiles + # Needed by build.rs scripts + gitMinimal + ]; + + cargoBuildFlags = [ + "-p" + "fluvio-cli" + "-p" + "fluvio-run" + ]; + cargoTestFlags = [ + "-p" + "fluvio-cli" + "-p" + "fluvio-run" + ]; + + # Patch to make cargoAuditable work + postPatch = '' + substituteInPlace crates/fluvio-cli-common/Cargo.toml \ + --replace-fail '"dep:fluvio-sc-schema"' '"fluvio-sc-schema"' + ''; + + # asset generation + preBuild = '' + make -C k8-util/helm package + ''; + + postInstall = '' + installShellCompletion --cmd fluvio \ + --bash <($out/bin/fluvio completions bash) \ + --fish <($out/bin/fluvio completions fish) \ + --zsh <($out/bin/fluvio completions zsh) + ''; + + meta = { + description = "Event stream processing for developers"; + homepage = "https://fluvio.io/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aporro ]; + mainProgram = "fluvio"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 11774e1446f6..01d9ab59d16f 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.26.0"; + version = "1.26.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -103,7 +103,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; tag = version; - hash = "sha256-XnGNrQVdSyg5CVBZBwrqDPbf4/+9yyerGBrZArbh6xI="; + hash = "sha256-N9/lxbz9nLIGC7VyuRbNbuX0K0XAxhytLzsU16BMCWY="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/fs/fsnav/package.nix b/pkgs/by-name/fs/fsnav/package.nix new file mode 100644 index 000000000000..feef5f9b4a6e --- /dev/null +++ b/pkgs/by-name/fs/fsnav/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + freetype, + libpng, + libjpeg, + libGL, + libGLU, + freeglut, +}: + +stdenv.mkDerivation rec { + pname = "fsnav"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "jtsiomb"; + repo = "fsnav"; + tag = "v${version}"; + hash = "sha256-Bt1QRqtJkVFR1uMzmB3OUyqyzUyJdQyQdbMOfMyWJOc="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + freetype + libpng + libjpeg + libGL + libGLU + freeglut + ]; + + preBuild = '' + makeFlagsArray+=( + "PREFIX=$out" + "CC=$CC" + "CXX=$CXX" + ) + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/fsnav + ''; + + meta = { + description = "3D filesystem navigator inspired by SGI FSN"; + homepage = "https://github.com/jtsiomb/fsnav"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aaravrav ]; + mainProgram = "fsnav"; + platforms = with lib.platforms; linux; + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + }; + +} diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 42692f98b900..83c82a18aa61 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -26,8 +26,8 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-0p7P68BvO3hv0utUbnPpHSpGLlV7F9HHmOITvJAb/ww="; + fetcherVersion = 3; + hash = "sha256-Atb6m5ZD9NKjYezFnYLnQqnlr72g5dz7ROfOF9fsqto="; }; nativeBuildInputs = [ @@ -48,18 +48,18 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.25.4"; + version = "1.25.5"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-sVpCdDJWzHtRKiqTeRuvrHf/cmeLbLs4THAqkH8hqMY="; + hash = "sha256-EDj/n4dOZsdJx4zdP8GwUavZNK145Q8ENXmIL+81MY4="; }; proxyVendor = true; - vendorHash = "sha256-y7HurJg+/V1cn8iKDXepk/ie/iNgiJXsQbDi1dhgark="; + vendorHash = "sha256-o7OIVo0/gunGMIDd0r6c9KDtku6pWwzmgm1X9qVbx4w="; outputs = [ "out" diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 2903bb36fec0..84626a929f00 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "goperf"; - version = "0-unstable-2026-02-09"; + version = "0-unstable-2026-03-11"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "b57e4e371b65454dd44026af9d45c69605bc0c3c"; - hash = "sha256-Sz7Fq0H+ikccAfaJirKHLIA+P4ZqMPS3S/Vj7WrGFy4="; + rev = "16a31bc5fbd0f58f2e8e2a496d8e035bdc4a2e06"; + hash = "sha256-be0vWFJUXTPWKapd+rX3Stnzra9LUGNEw+4P+fWzjyk="; }; - vendorHash = "sha256-kGF184E+rOWncQsvjk1iCpF26/3Ll/IY9CPEh6vhRBQ="; + vendorHash = "sha256-oBSd0D66BGfanCADtrpyIoUit8c+yHk8Nm6o2GmKoZg="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 8b09e3fbd46f..9a2bd95358fe 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.121"; + version = "0.123"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-1A6+69IkCAzalhEVcuhj6KO/IjXIqVOifiRRGomIIJo="; + hash = "sha256-U655XwPi7k9Glr+FdoqafWSkc/IGIvzIUI+iRswohSY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index 7bd633ce3bbf..11e9767d6932 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -6,19 +6,19 @@ buildGoModule (finalAttrs: { pname = "grafana-image-renderer"; - version = "5.6.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; tag = "v${finalAttrs.version}"; - hash = "sha256-rbR+TGkTWIpHeGxOQtVQFIeTv1/p8rGfbFp6hSSXQco="; + hash = "sha256-0n9esm8j3zRMUzFPrXrcllEen+F6XpL3yPY5KBY8H9g="; }; vendorHash = "sha256-nRwd1luj8AFjDM67KtinVxRd31lUO+Vv3PDnsv2BMZU="; postPatch = '' - substituteInPlace go.mod --replace-fail 'go 1.25.6' 'go 1.25.5' + substituteInPlace go.mod --replace-fail 'go 1.26.1' 'go 1.25.7' ''; subPackages = [ "." ]; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index d2c492b23028..071c97ad080e 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -49,11 +49,11 @@ assert googleSupport -> gnomeSupport; stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.58.2"; + version = "1.58.4"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-rZ1b8LRcryMlIN8K3uUetlAgCwNwaA+Ao1Dq2dHWHd8="; + hash = "sha256-5xJL7HJOJlrQ7gC6on2NUVzx3dzxAmOL5nueJZybBA0="; }; patches = [ diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 358e27218788..756d1297b2ef 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.runtimeLibs} substituteInPlace $out/lib/systemd/system/hardinfo2.service \ - --replace-fail "ExecStart=/usr/bin/hwinfo2_fetch_sysdata" "ExecStart=$out/hwinfo2_fetch_sysdata" + --replace-fail "ExecStart=/usr/bin/hwinfo2_fetch_sysdata" "ExecStart=$out/bin/hwinfo2_fetch_sysdata" ''; # account for tags having a release- prefix diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index eb27978ad443..11104ca81bb2 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit (nixosTests) immich immich-vectorchord-migration immich-vectorchord-reindex; + inherit (nixosTests) immich immich-vectorchord-reindex; }; machine-learning = immich-machine-learning.override { diff --git a/pkgs/by-name/je/jemalloc/package.nix b/pkgs/by-name/je/jemalloc/package.nix index 202195c152db..0871ff1d4d61 100644 --- a/pkgs/by-name/je/jemalloc/package.nix +++ b/pkgs/by-name/je/jemalloc/package.nix @@ -13,8 +13,31 @@ # compatibility. stripPrefix ? stdenv.hostPlatform.isDarwin, disableInitExecTls ? false, + # Page size in KiB to configure jemalloc for. + # Defaults to 64 on architectures where 64KB pages are common, 4 otherwise. + # Note that a higher value is compatible with lower page sizes but may waste memory. + pageSizeKiB ? + if + ( + stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isPower64 + ) + then + 64 + else + 4, }: +let + pageSizeMap = { + "4" = 12; + "16" = 14; + "64" = 16; + }; +in +assert lib.asserts.assertOneOf "pageSizeKiB" (toString pageSizeKiB) ( + builtins.attrNames pageSizeMap +); + stdenv.mkDerivation (finalAttrs: { pname = "jemalloc"; version = "5.3.0-unstable-2025-09-12"; @@ -54,12 +77,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/jemalloc/jemalloc/issues/467 # https://sources.debian.org/src/jemalloc/5.3.0-3/debian/rules/ ++ [ - ( - if (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64) then - "--with-lg-page=16" - else - "--with-lg-page=12" - ) + "--with-lg-page=${toString pageSizeMap."${toString pageSizeKiB}"}" ] # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index a5cb9c4bfd0a..df52f9b58383 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "kargo"; - version = "1.8.6"; + version = "1.9.5"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${finalAttrs.version}"; - hash = "sha256-sBUgoR3Eqv2OQRnXR9IaB4QcZ+awJb3ah7ySZ0XsaYA="; + hash = "sha256-jdRba3n9jGpZIp8E7Fz4DC3eDV4GK+MpuxBpYhpR60o="; }; - vendorHash = "sha256-ZB1Eq8xQ/oF5sm750K9yJyBpwCIcCqmFL8FWpNsiXfo="; + vendorHash = "sha256-ir73yLXLOs6/6YX72EeyMcGLsImRkGmH4vppwKeOD+A="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/ko/kontainer/package.nix b/pkgs/by-name/ko/kontainer/package.nix index d6cabdaf68f9..4ee9ae7f474c 100644 --- a/pkgs/by-name/ko/kontainer/package.nix +++ b/pkgs/by-name/ko/kontainer/package.nix @@ -22,11 +22,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-15H4fTZ4Tja+nt0iKtFuULj/4g/0UK+W79R4kH7BFcs="; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "ecm_find_qmlmodule(org.kde.kirigami REQUIRED)" "ecm_find_qmlmodule(org.kde.kirigami)" - ''; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/la/ladybugdb/package.nix b/pkgs/by-name/la/ladybugdb/package.nix index a36568f8cd00..161550cd1f1a 100644 --- a/pkgs/by-name/la/ladybugdb/package.nix +++ b/pkgs/by-name/la/ladybugdb/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ladybugdb"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "LadybugDB"; repo = "ladybug"; tag = "v${finalAttrs.version}"; - hash = "sha256-hc0SltZYreENpa3PyCSgj72tSVVIiIJRQSN0f33iPr8="; + hash = "sha256-wqvX6yPhh1CbviPgcRW4XOmNjLe5s9FaqHYDFs7GQOg="; }; outputs = [ diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix index 5f1d7fe41822..3f9dec94ecbb 100644 --- a/pkgs/by-name/li/lighthouse/package.nix +++ b/pkgs/by-name/li/lighthouse/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "8.1.0"; + version = "8.1.2"; # lighthouse/common/deposit_contract/build.rs, `TAG` depositContractSpecVersion = "0.12.1"; @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; tag = "v${version}"; - hash = "sha256-+MF3KbyKbaEBsrNHQOOolfhl4uJ1laOL1eGtcWEoaLE="; + hash = "sha256-Gtx5wowQM9jycy2Bl0FFGkgOZtyRvK3lMuc3K9v9sW4="; }; patches = [ ./use-system-sqlite.patch ]; - cargoHash = "sha256-6C0rDVsF0wIcApc2YL3qC/Xa9qby9GDbQYGiaaJuH0k="; + cargoHash = "sha256-tmOEcxcMbGtOypNcxIbqfdlvFmNix21iIsRWVcFxJC4="; buildFeatures = [ "gnosis" diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 2ef353ecb731..db51f9f5c950 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-FpmsrH4Xphf4QKtAJEaoVdE9S7hWlCayDbEnYZ9o4iI="; + hash = "sha256-5vbCic+kAa1c5Io92LyJ20y+/v3M3fKh+AHKaf7kP14="; }; patches = [ diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index ddfcec821369..ca235f62ac82 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.8.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-8vJK9uvmm3GtQcJ/6L0R8Y9gAv1W07asfKmDYZyeEOQ="; + hash = "sha256-UXTkrH+b4HIi+QC85gjASAFHgf0BQEZ6RkC99FksqsU="; }; strictDeps = true; diff --git a/pkgs/by-name/ma/mate-terminal/package.nix b/pkgs/by-name/ma/mate-terminal/package.nix index 050cefb0b611..e8fa693c58d5 100644 --- a/pkgs/by-name/ma/mate-terminal/package.nix +++ b/pkgs/by-name/ma/mate-terminal/package.nix @@ -1,7 +1,10 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, + mate-common, pkg-config, gettext, itstool, @@ -11,27 +14,35 @@ vte, pcre2, wrapGAppsHook3, + yelp-tools, gitUpdater, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "mate-terminal"; - version = "1.28.1"; + version = "1.28.2"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-terminal-${finalAttrs.version}.tar.xz"; - sha256 = "8TXrGp4q4ieY7LLcGRT9tM/XdOa7ZcAVK+N8xslGnpI="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "mate-terminal"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-tyYHMn+qwytpSNUZg4xfwnuVClxj2IcyB4C4Dsn+1Nc="; }; strictDeps = true; nativeBuildInputs = [ + autoconf-archive + autoreconfHook gettext itstool + mate-common # mate-common.m4 macros pkg-config libxml2 # xmllint wrapGAppsHook3 + yelp-tools ]; buildInputs = [ @@ -44,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - url = "https://git.mate-desktop.org/mate-terminal"; odd-unstable = true; rev-prefix = "v"; }; diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix index c90fe4294efc..3a74f532df49 100644 --- a/pkgs/by-name/me/metabase/package.nix +++ b/pkgs/by-name/me/metabase/package.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metabase"; - version = "0.59.1"; + version = "0.59.2"; src = fetchurl { url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar"; - hash = "sha256-pPJdFljzzNuhRvH6ofPkNGq0Ly/RpHcqeQQh3JTG08I="; + hash = "sha256-k1UfpSHOBsFZF85q0LhuiC9L5R8fbSnZBRB5MjBUh+M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index ae40f553b4a7..7ee7194ee642 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "mpls"; - version = "0.17.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${finalAttrs.version}"; - hash = "sha256-RJadJEIwBdDtZZxPSm12WYVKrIAOc1EvSxLrkhs4sx4="; + hash = "sha256-a33XbUw6H2EKfGZnpV6L00iab6AoXqPiNTMw/OaouHs="; }; - vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark="; + vendorHash = "sha256-pi7KBA/313cG0AYWM/mUDng2M9L2tMLkonY4LI5XiW0="; ldflags = [ "-s" diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index 55173202f9cb..b196057e652e 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-EZQQLXN9eixL3BUSn6VAaKPe9uA3uW1l6zfzq3bG+vk="; + hash = "sha256-X39P/4OrRDwZieCDVaMj0YJhotZ0PHMGVgN5ky5+pDk="; }; - vendorHash = "sha256-h3pxl84P7dUmXJJ9t/Rnzx0oJcGnA+7ytGWhk401ecY="; + vendorHash = "sha256-c8dkMsuzBuHBPBTHAhwMgpGLUVLkzBmItnp1QAUBQSI="; ldflags = [ "-s" diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 59513fe1f31c..e88c1160a096 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGo126Module (finalAttrs: { pname = "nezha"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-JzdjIAeWswW/6ZnwfRZAexzl/ehvzKmyiNyzCHBDqgA="; + hash = "sha256-g5mXt0NfRFezLmQ27FAE+wU+a+sSHlCzx2oh/z1Xz+I="; }; proxyVendor = true; diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index e35cc1e55cd9..bafe2e815e90 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "nfpm"; - version = "2.45.0"; + version = "2.45.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${finalAttrs.version}"; - hash = "sha256-sz6+oUvEi3iYKLRxHaeP2T+9m5CavgIzZIz8wuSfM+M="; + hash = "sha256-ThoCDsuz52odVLVJuT4F96sjtqOOzjqq7JIE5Idzl1k="; }; - vendorHash = "sha256-tEuNOBBUnJNjk1Mao8A7KtuPIdkxsmj+yp8fuovOK0s="; + vendorHash = "sha256-cq0pcbC0T3klh3D9l0e0u5JPYv1kWYlpeNYyGczGX+A="; ldflags = [ "-s" diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 084cd0dc4f10..025815fd7d37 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -137,13 +137,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.17.7"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-cAqc38NHvUo5gphq1csTyosTcpUjFcs0dzB0wreEGjs="; + hash = "sha256-nnVuWjx3ZmAjHRPmsh+ut4UzzZxq6b7kXf0jq2ZsbXU="; }; vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos="; diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 61c330f71359..6b1635ad994a 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxker"; - version = "0.12.0"; + version = "0.13.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-cTusvvxr2ec2Qy6iWwGRmPcvGpRMOKxzrAx/qRvj+BE="; + hash = "sha256-4rIqZOWYqd7zUrDmEIZTH7iDRzed8on6UeP871M/KAI="; }; - cargoHash = "sha256-X5iNAwp0DcXoT82ZLq37geifztvJ/zZgOgM3SycAazA="; + cargoHash = "sha256-/Uw8IDVHmWpClAwWol2t10biDD3AGkZQDz5fmRSLlRI="; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_one_definition" diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 2cebcb6ea41f..21bccb1bdd51 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxlint"; - version = "1.51.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-J5EChGADug+SEvhjStyS1s5kek5QNc2VrjEa5MEWTpA="; + hash = "sha256-A2cq1WgZg8csNGB3yFNo21450f46n4ZVblke1yqlBCc="; }; - cargoHash = "sha256-chNxYraN9upILXCqDQ/TrN3xiKhxKhZlN2HGrPF4qT8="; + cargoHash = "sha256-Oz9u2+5lq+z9A81BEn2T4jvVMqf1uNXip+OH4AxiTG0="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index 6071a6345225..773264d13e62 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -6,7 +6,7 @@ pnpm, fetchPnpmDeps, pnpmConfigHook, - electron_38, + electron_40, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -16,19 +16,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "picgo"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Molunerfinn"; repo = "PicGo"; tag = "v${finalAttrs.version}"; - hash = "sha256-fEj5ymnDBxeJ33GeIrcciQW3Wg7jMQaitwhUHne9a14="; + hash = "sha256-4Ih7PPBo6scJoUS8yTAR0iyG5vxNc/c0CCw5FGaIbHM="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; pname = "picgo"; - hash = "sha256-hYQM1KiKfsQL0AbYpHtmpDHbG3HsdXFbpgGzcZVW7R0="; + hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 }; @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { # Create startup script mkdir -p $out/bin - makeWrapper ${lib.getExe electron_38} $out/bin/picgo \ + makeWrapper ${lib.getExe electron_40} $out/bin/picgo \ --add-flags "$out/lib/picgo/.launcher.cjs" \ --add-flags "--name picgo" \ --set NODE_ENV production \ diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 340cf9d2e62e..fd01abdc59c8 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -8,7 +8,7 @@ let pname = "postman"; - version = "11.82.1"; + version = "11.87.4"; src = let @@ -27,10 +27,10 @@ let name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}"; url = "https://dl.pstmn.io/download/version/${version}/${system}"; hash = selectSystem { - aarch64-darwin = "sha256-7n/9ezPgpon3AEQXmoK/iazOPvRh/pDVy/YBVUwjbkI="; - aarch64-linux = "sha256-nn6Krn3/z7FkPRJDO7wNhny50YvuWwWWQ9lf9mk8ZGo="; - x86_64-darwin = "sha256-jN6TbPRkEFH9KyU3owcsrWbJvyIqMT0f8zV9OymiNzY="; - x86_64-linux = "sha256-PEPMrWrm57SAdaHL6ZWES0Ao7J7vn0TAX9WZ/WCFq6U="; + aarch64-darwin = "sha256-1ilYfvduHTh5tvIrIXmrwQgfiWnYhdXhNv/o19wUNrE="; + aarch64-linux = "sha256-JdO/gBT7B+FQ8mguyw7oD2hfQACfyDVxF714iVkTW2I="; + x86_64-darwin = "sha256-Sb66zJQJzixk032fsdAfU88Yw9t7xeFoPBlQ+pRcdmU="; + x86_64-linux = "sha256-a8jsIFlJD12tydTZM9Mibv+m7bcSqAN4JVQgQxB4WJo="; }; }; diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 57ed53114e6c..d0c0a283578a 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quill-log"; - version = "11.0.2"; + version = "11.1.0"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; tag = "v${finalAttrs.version}"; - hash = "sha256-b5kHxvjmTea5HU9gTvizFwhG2zwOJSPlf30XKEhxe8w="; + hash = "sha256-OBvKOJt/GPwrFk9JHaJ658CWAkhyVQNprbwsKJb8aHs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix index 3784eaf68e9e..6d9a3c66bed6 100644 --- a/pkgs/by-name/re/remmina/package.nix +++ b/pkgs/by-name/re/remmina/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.41"; + version = "1.4.43"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${finalAttrs.version}"; - hash = "sha256-0KUwZ81CyuLa05Cwe7wJrTbM1Dp9mAzNBI5pR7FKTOU="; + hash = "sha256-7nY2NhlWp+4FTTmeam1B+sotqis0lSwhozSC8I14aMI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix index 499a6280a8dd..eddf685f8d99 100644 --- a/pkgs/by-name/ru/rusty-path-of-building/package.nix +++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix @@ -19,16 +19,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rusty-path-of-building"; - version = "0.2.13"; + version = "0.2.14"; src = fetchFromGitHub { owner = "meehl"; repo = "rusty-path-of-building"; tag = "v${finalAttrs.version}"; - hash = "sha256-4lxMQfENucDaDZov82iZD5DMgksLuJ/2nXUKYYf/m/w="; + hash = "sha256-rgXxy1r4ZyFFG5BiodogeHnCcppw79xzb0MsQDZxL4E="; }; - cargoHash = "sha256-PeVVDOWFYoDKkCy+UV5ikFwrHTK93zt2WZ3Oxp0ez1Y="; + cargoHash = "sha256-IZ5+Dvr1u/X278U6WCD6CNu4HBh5uLRWFbPeZ6EXryo="; nativeBuildInputs = [ pkg-config @@ -121,7 +121,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/meehl/rusty-path-of-building"; changelog = "https://github.com/meehl/rusty-path-of-building/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ k900 ]; + maintainers = with lib.maintainers; [ + k900 + cholli + ]; mainProgram = "rusty-path-of-building"; }; }) diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index bf803a14c4e9..1cdd937b0d8b 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -2,24 +2,24 @@ stdenv, lib, fetchFromGitHub, - buildGoModule, + buildGo126Module, installShellFiles, versionCheckHook, writableTmpDirAsHomeHook, }: -buildGoModule (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "scaleway-cli"; - version = "2.52.0"; + version = "2.53.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-92OSk0oJQrLAllbfsJB9FUC8C+0jLQLjw9wYHG+Lc98="; + hash = "sha256-IxnDmmvWH17xd2djroikwrQq0bLexWeN8VHMPiNEBhU="; }; - vendorHash = "sha256-1pi9WQZ6dwCVsJbpA+seIzRn5lFFOjYUvt8MKUHKcVg="; + vendorHash = "sha256-/UEE3XSbpwlywF8TMmp90bS537RRZG0yN0oq1sbrcPQ="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/se/search-vulns/package.nix b/pkgs/by-name/se/search-vulns/package.nix index 29f15ffb29e4..774db2c8a271 100644 --- a/pkgs/by-name/se/search-vulns/package.nix +++ b/pkgs/by-name/se/search-vulns/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "search-vulns"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "search_vulns"; tag = "v${finalAttrs.version}"; - hash = "sha256-Or0B6ENoSpaoYwUsd2jrDKr5gHjORMxvTQzlkoNkPdw="; + hash = "sha256-0aqAjDJy+ShybYawUFyqKzz3yDut5n3t47lCEksykEU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index 6527f487b69a..e4aac4235040 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.16"; + version = "4.17"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; tag = finalAttrs.version; - hash = "sha256-BRdI/50YxwdCdBj91w6OPgTcOb7JkshkVSD8b8bHcYA="; + hash = "sha256-xy3gXw3cbFO3OkzgEmIecvxPJT15tn58FI4ppibckzE="; }; vendorHash = "sha256-XbfKYftKfbJDkbp9DwVAs56w5lMvqdlW5cwhhivniBM="; diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index a030634214b3..6975adb229ba 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2026-02-21"; + version = "2.0.0-unstable-2026-03-13"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "b526a54a98e16275b118dfba73171177008d6970"; - hash = "sha256-/ZYSiSuEGrbaWU7ZYXQl5ztL5AMGhOkDFyR2ftfEuVw="; + rev = "13a37e0e0ab77a76f8dbe3adf599ee916615b3db"; + hash = "sha256-3bMVoF4f1+pZV3tdti8KNS17wWK1tmIgjKQUQS+Rzt8="; }; buildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index cd4544ae741c..a557adb1d2a9 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.5.9"; + version = "3.5.10"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-lQtgVYYinkgxgwnxyhsebt8CpdCDClcS+qo0tQaTD94="; + hash = "sha256-IJKWrveUn7kvJjSu0YYGargGFY8T8gxAAh2fr0BnbUE="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-Qz2LAtznJ8MxPQ6bSuMuvCDWt+8JSe0MawNWH70X/5k="; + vendorHash = "sha256-JwtXllLj6+ALrDZMjFoX5TDwE3yMaij2a9t+T1F1hG0="; patches = [ (replaceVars ./set-pandoc-path.patch { diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 366487a973b8..ca18da3b62f3 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.65"; + version = "3.16.67"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-tbPVxjpuNYftAM7vIPfDpTV1la9XX8GkQTuPVgvwOtE="; + hash = "sha256-oNmcZEOUg1AuCZ3jFtrfO+dOJ6DhwMMg/rgJ8fn7+bg="; }; outputs = [ diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index 4e542ddbdf3b..3724ca671753 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -14,13 +14,13 @@ let iconame = "STM32CubeMX"; package = stdenvNoCC.mkDerivation rec { pname = "stm32cubemx"; - version = "6.15.0"; + version = "6.17.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${ builtins.replaceStrings [ "." ] [ "" ] version }-lin.zip"; - hash = "sha256-50P+/uvNH3NN1UN+T3RxGgR8QYBIgBDA56mAEU4BipI="; + hash = "sha256-OroIcdvNzCm7lyL62zNm4sbDgUb+GgJW50mqE1M1KT4="; stripRoot = false; }; diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix index d5cee32c9227..a37b4ba47b91 100644 --- a/pkgs/by-name/su/supercronic/package.nix +++ b/pkgs/by-name/su/supercronic/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "supercronic"; - version = "0.2.41"; + version = "0.2.43"; src = fetchFromGitHub { owner = "aptible"; repo = "supercronic"; rev = "v${finalAttrs.version}"; - hash = "sha256-i7Y4g9f5vEGTETNaLXdQb/JG/NpBIgWWg+kGtX/LQOc="; + hash = "sha256-X6Q/TiABNVVgsKZOzWhiaKhhHFindWgrX721mfO5b3Q="; }; - vendorHash = "sha256-a1W/Ah3zPMLvYfQj6uWsHvwjxpLs2vb8E2YYH/RRQvs="; + vendorHash = "sha256-w7BL/OgNbm4mMZ6x4zZhN7kYFmUOEX7ixYzocAFzAcU="; excludedPackages = [ "cronexpr/cronexpr" ]; diff --git a/pkgs/by-name/ta/tabbyapi/package.nix b/pkgs/by-name/ta/tabbyapi/package.nix index 8c3a41d32181..50b0a10ed69d 100644 --- a/pkgs/by-name/ta/tabbyapi/package.nix +++ b/pkgs/by-name/ta/tabbyapi/package.nix @@ -99,7 +99,10 @@ python3Packages.buildPythonApplication { --add-flags "$out/${python3Packages.python.sitePackages}/main.py" ''; - passthru.updateScript = nix-update-script { }; + passthru = { + cudaSupport = python3Packages.torch.cudaSupport; + updateScript = nix-update-script { }; + }; meta = { description = "Official API server for Exllama"; diff --git a/pkgs/by-name/te/tellico/package.nix b/pkgs/by-name/te/tellico/package.nix index 8e8c05991055..65e9d50eb909 100644 --- a/pkgs/by-name/te/tellico/package.nix +++ b/pkgs/by-name/te/tellico/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "tellico"; - version = "4.1.4"; + version = "4.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = "tellico"; tag = "v${finalAttrs.version}"; - hash = "sha256-eScAOd1da05fqXtbcz8oEJiObB7CUxiYReSrr3R7ybM="; + hash = "sha256-4bwx5zWJT8jD+kRshHKROx8hc+zuysGTd0HOwU7Ena0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 313edcbbb305..f9228af431ae 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ultrastardx"; - version = "2026.2.0"; + version = "2026.3.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${finalAttrs.version}"; - hash = "sha256-vcVHwdCNuwqn9wurLWU0Jv+A9aXIqmVNtSSDSRTbCxw="; + hash = "sha256-xVlg24EaHyfrpdfnCk4Wupi33BVKwisvg0hN5Q/dNC4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 00c00908f43d..746015692610 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-IAbewFab4X21SYqhjfxfWI9LsNSNVMIChbNc3j3EJQA="; + hash = "sha256-axDmf81Hiv/Pw5tHXh0X+mA8b9zp2YUFdJBgOADxJms="; }; - cargoHash = "sha256-LqrHze1MVaWq31Td/EGDeJCG+hRmPOSV1t7+ayQorlA="; + cargoHash = "sha256-ZhRZIpsz/7monrs80Y/WHiErulT0sQut0RIAnqBWcmk="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 7e331efd225c..4aaabf78ae42 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "versatiles"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-+NMS4sHT47E8SuFcCHnUDBBpsA+6X4zLXvzVWc7yWGI="; + hash = "sha256-P1r+UzqMiu1BqXv+ORhUojKzjcl0kb9gBTBi6PseP0s="; }; - cargoHash = "sha256-jzbaQw+Ez2PiLAYxqadvdWEGvsMlSkjECk0k3zPUni8="; + cargoHash = "sha256-fju6aWh6HfVnVN60M0+LmGDBxdgDSaLl+iQ358vmYm8="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index a333943060ac..03fed25c866e 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -23,23 +23,23 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.20.3"; + version = "0.20.5"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-9xE2izQakApB+cgibErwyY3KAlc6F26UhgCw/Tak43c="; + hash = "sha256-k3rmWZlUYLMOT33AvwZ56eZfjNc6KXH2AN5Fe8LDKFM="; }; apiDeps = fetchNpmDeps { src = "${finalAttrs.src}/src/typescript/api"; - hash = "sha256-UsTpMR23UQBRseRo33nbT6z/UCjZByryWfn2AQSgm6U="; + hash = "sha256-Tr+m8MLaWR8wq+cYpQwZTIzRt2tgDIyc8vVda2x+k4k="; }; extensionManagerDeps = fetchNpmDeps { src = "${finalAttrs.src}/src/typescript/extension-manager"; - hash = "sha256-wl8FDFB6Vl1zD0/s2EbU6l1KX4rwUW6dOZof4ebMMO8="; + hash = "sha256-8ONawCmKxHwWS0Tx04MCpQmtWfIpJYU8RcqMtQiT/Sw="; }; cmakeFlags = lib.mapAttrsToList lib.cmakeFeature { diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 9c4f91ca2874..edf3356c920e 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "webdav"; - version = "5.11.1"; + version = "5.11.2"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${finalAttrs.version}"; - hash = "sha256-YkVw5hlN6Sl7gUzJdmELRkabFUwS+9ILaOUUBbdO0tY="; + hash = "sha256-OVR+64g02bT7K1LDKCW7O7kGjhkjovIDIrDUXNK189k="; }; - vendorHash = "sha256-pI4VJQeYz5/6N7wLpwxKw5754DQyINFlu3WGR2aCdAQ="; + vendorHash = "sha256-OmYXNpzx3GWw0hxMdMyQARE89JXeiamwOS4KclLjRwU="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/wh/whatsapp-for-mac/package.nix b/pkgs/by-name/wh/whatsapp-for-mac/package.nix index 505ccdc3d044..51035aa11c27 100644 --- a/pkgs/by-name/wh/whatsapp-for-mac/package.nix +++ b/pkgs/by-name/wh/whatsapp-for-mac/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "whatsapp-for-mac"; - version = "2.25.22.79"; + version = "2.26.9.17"; src = fetchzip { extension = "zip"; name = "WhatsApp.app"; - url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=relbranch"; - hash = "sha256-LYjPMiXLD1U5ZNt/acBagrV2RS7U/OGMJ06mUFBluSQ="; + url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=master"; + hash = "sha256-bba22HBnIeio4M92mckiOa1IQpRUfx/I7OkfA4hO6rU="; }; dontConfigure = true; @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { common-updater-scripts ]; text = '' - url=$(curl --silent "https://web.whatsapp.com/desktop/mac_native/updates/?branch=relbranch&configuration=Release") + url=$(curl --silent "https://web.whatsapp.com/desktop/mac_native/updates/?branch=master&configuration=Release") version=$(echo "$url" | xmlstarlet sel -t -v "substring-before(substring-after(//enclosure/@url, 'version='), '&')") update-source-version whatsapp-for-mac "$version" --file=./pkgs/by-name/wh/whatsapp-for-mac/package.nix ''; diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 706d78dc7134..39f845789fcd 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "72.10"; + version = "72.12"; src = fetchFromGitHub { owner = "bol-van"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-m9MKyOwAUeH8LZ1GgbuYdHdNTrI3mJ7+Q9R9JT5y2gY="; + hash = "sha256-UWkLi/wWihtdLyk77cQ90xZ31vho1PjPfFQ6bQWrIUs="; }; buildInputs = [ diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix index 2c2097366078..e9af8b1cdf60 100644 --- a/pkgs/by-name/zl/zlsplitter/package.nix +++ b/pkgs/by-name/zl/zlsplitter/package.nix @@ -29,13 +29,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "zlsplitter"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLSplitter"; tag = finalAttrs.version; - hash = "sha256-6ICXL1jX6MMYf5VasTW9osJ2BNb6jqWfeAtmmEp6L/4="; + hash = "sha256-QNTSxvp4trbdm6wbl0u187LTjRMIp1tvoo06+m2z+8Y="; fetchSubmodules = true; }; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f16ce6e63aeb..d35f75b82dd5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1325,18 +1325,6 @@ with haskellLib; # https://github.com/emilypi/Base32/issues/24 base32 = doJailbreak super.base32; - # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal - # https://github.com/augustss/djinn/pull/8 - djinn = overrideSrc { - version = "unstable-2023-11-20"; - src = pkgs.fetchFromGitHub { - owner = "augustss"; - repo = "djinn"; - rev = "69b3fbad9f42f0b1b2c49977976b8588c967d76e"; - hash = "sha256-ibxn6DXk4pqsOsWhi8KcrlH/THnuMWvIu5ENOn3H3So="; - }; - } super.djinn; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal (drv: { diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 91bc41382bbe..9c59d282ab3c 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation { "o3" "notui=1" # display build progress in a plain-text format "REPLXX=${if enableReplxx then "1" else "0"}" + "version=${sources.cbqn.version}" ] ++ lib.optionals stdenv.hostPlatform.avx2Support [ "has=avx2" diff --git a/pkgs/development/interpreters/bqn/cbqn/sources.nix b/pkgs/development/interpreters/bqn/cbqn/sources.nix index 1e49a859e4b2..605837c4d735 100644 --- a/pkgs/development/interpreters/bqn/cbqn/sources.nix +++ b/pkgs/development/interpreters/bqn/cbqn/sources.nix @@ -11,13 +11,13 @@ let self = { pname = "cbqn"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; rev = "v${self.version}"; - hash = "sha256-RZIxIRlx1SSYP+WrMRvg6nUqqs4zqEaGPvFyY3WFgbU="; + hash = "sha256-ZXhCFLLUVJTgpJqMd97EMSoE4fwuqBJ742kzV662bnY="; }; }; in @@ -25,25 +25,25 @@ cbqn-bytecode = { pname = "cbqn-bytecode"; - version = "0-unstable-2025-11-24"; + version = "0-unstable-2026-01-24"; src = fetchFromGitHub { owner = "dzaima"; repo = "cbqnBytecode"; - rev = "cca48b93b2e3260d2fa371c578d94cf044e39042"; - hash = "sha256-xBjXlzWhbsKjiknnncVRkh9VlUNzaxYVNB7BhZTI/r4="; + rev = "156b47caf895f6706811c5c34bbbbaf192b8018b"; + hash = "sha256-xz4gs1b1yNbnR3v4Kw1xLCAb1I1uoBMdYJRQH9JVD/k="; }; }; replxx = { pname = "replxx"; - version = "0-unstable-2025-05-20"; + version = "0-unstable-2026-02-02"; src = fetchFromGitHub { owner = "dzaima"; repo = "replxx"; - rev = "c1ce5b0bcabd96ec93ebf630a85619295ec7c2f3"; - hash = "sha256-4TEjJdF0FAIT69uVMp0y4bFFrRda1CXC/bLX6mrUTA0="; + rev = "5e3bd870699007b9536d29f60e3a2b0a68ce0a7a"; + hash = "sha256-B1N1d5K4E20OlbX4wTclEiXULM2FT3oT0btyrYCNQ20="; }; }; diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index f3919b0272a4..a0499aba6250 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -18,7 +18,7 @@ buildPecl { src = fetchFromGitHub { owner = "openswoole"; repo = "swoole-src"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-fTr7CuWZt902YnTtEriWL8wjHni71N/u5upJqY+UvYs="; }; diff --git a/pkgs/development/python-modules/django-flags/default.nix b/pkgs/development/python-modules/django-flags/default.nix index 32213502950e..a239a4aa7988 100644 --- a/pkgs/development/python-modules/django-flags/default.nix +++ b/pkgs/development/python-modules/django-flags/default.nix @@ -10,26 +10,23 @@ pytestCheckHook, setuptools-scm, setuptools, - pythonOlder, }: buildPythonPackage rec { pname = "django-flags"; - version = "5.0.14"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "cfpb"; repo = "django-flags"; tag = version; - hash = "sha256-0IOcpl8OamNlalqNqMvmx/bkuIkaNnLwCD7nFclR8S4="; + hash = "sha256-4UOueNXfDouTqpLpG391zcGHTTJ8GfznYmEl33YKdv8="; }; dependencies = [ django ]; - disabled = pythonOlder "3.8"; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/django-markdownify/default.nix b/pkgs/development/python-modules/django-markdownify/default.nix index 65846fc6a3a6..5adb99e29c1f 100644 --- a/pkgs/development/python-modules/django-markdownify/default.nix +++ b/pkgs/development/python-modules/django-markdownify/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "django-markdownify"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; src = fetchFromGitHub { owner = "erwinmatijsen"; repo = "django-markdownify"; tag = version; - hash = "sha256-KYU8p8NRD4EIS/KhOk9nvmXCf0RWEc+IFZ57YtsDSWE="; + hash = "sha256-L/N0jjxBz7aQletOg+qairgq4utifPz4oqjT9AcljLI="; }; dependencies = [ diff --git a/pkgs/development/python-modules/django-money/default.nix b/pkgs/development/python-modules/django-money/default.nix index 0d7492045142..698cab66fe54 100644 --- a/pkgs/development/python-modules/django-money/default.nix +++ b/pkgs/development/python-modules/django-money/default.nix @@ -9,22 +9,19 @@ pytestCheckHook, pytest-django, pytest-cov, - pythonOlder, }: buildPythonPackage rec { pname = "django-money"; - version = "3.5.4"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "django-money"; repo = "django-money"; tag = version; - hash = "sha256-JqAZaiJ2zCb7Jwvumqi16IrQ6clmcw71WpPzbhE2Fms="; + hash = "sha256-VxAKTtrbDMRhiLxqjVYt7pLGl0sy9F1iwswP/hxQ01k="; }; - disabled = pythonOlder "3.7"; - dependencies = [ django certifi diff --git a/pkgs/development/python-modules/django-structlog/default.nix b/pkgs/development/python-modules/django-structlog/default.nix index fb06e13cf991..55f207871db1 100644 --- a/pkgs/development/python-modules/django-structlog/default.nix +++ b/pkgs/development/python-modules/django-structlog/default.nix @@ -5,22 +5,19 @@ setuptools, python, pkgs, - pythonOlder, }: buildPythonPackage rec { pname = "django-structlog"; - version = "9.1.1"; + version = "10.0.0"; pyproject = true; src = fetchFromGitHub { owner = "jrobichaud"; repo = "django-structlog"; tag = version; - hash = "sha256-SEigOdlXZtfLAgRgGkv/eDNDAiiHd7YthRJ/H6e1v5U="; + hash = "sha256-BNZ+nk2NK5x2YsTDZjH5BVizXAyLZhKp8zRvkWi068k="; }; - disabled = pythonOlder "3.9"; - dependencies = with python.pkgs; [ colorama django @@ -72,6 +69,8 @@ buildPythonPackage rec { pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Structured Logging for Django"; homepage = "https://github.com/jrobichaud/django-structlog"; diff --git a/pkgs/development/python-modules/django-user-sessions/default.nix b/pkgs/development/python-modules/django-user-sessions/default.nix index 3f48bb38865c..3c679e54c725 100644 --- a/pkgs/development/python-modules/django-user-sessions/default.nix +++ b/pkgs/development/python-modules/django-user-sessions/default.nix @@ -4,22 +4,19 @@ setuptools-scm, lib, django, - pythonOlder, }: buildPythonPackage rec { pname = "django-user-sessions"; - version = "2.0.0"; + version = "3.0.3"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-user-sessions"; tag = version; - hash = "sha256-Wexy6G2pZ8LTnqtJkBZIePV7qhQW8gu/mKiQfZtgf/o="; + hash = "sha256-vHLeEmlVil1iJi+YkxL5c04Vq/b5b43tjC2ZcjH4/Ys="; }; - disabled = pythonOlder "3.7"; - dependencies = [ django ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index fb6c29e0604d..4b2861ab1052 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202603131"; + version = "0.1.202603141"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-apPuPiQr3sP2KJNEW6j7a3W6yXJTxi2+bEvz/3NzmfU="; + hash = "sha256-9c6vpdxMEPFuv/wMzxsY/DunzgXTgCV7Q0ktEXLEY4I="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index 04cde3216496..f091c1301ba2 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -3,17 +3,19 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system setuptools, # dependencies + aiohttp, cloudevents, + cryptography, fastapi, grpc-interceptor, grpcio, grpcio-tools, + h11, httpx, kubernetes, numpy, @@ -24,10 +26,13 @@ psutil, pydantic, python-dateutil, + python-multipart, pyyaml, six, + starlette, tabulate, timing-asgi, + urllib3, uvicorn, # optional-dependencies @@ -54,37 +59,29 @@ buildPythonPackage (finalAttrs: { pname = "kserve"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "kserve"; repo = "kserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms="; + hash = "sha256-gLYYuIy43cuXrCvjjXLHMim0m/EAwaivLdFhKuUdeX0="; }; - patches = [ - # Fix vllm imports in python/kserve/kserve/protocol/rest/openai/types/__init__.py - # Submitted upstream: https://github.com/kserve/kserve/pull/4882 - (fetchpatch2 { - name = "update-vllm-imports-to-fix-compat"; - url = "https://github.com/kserve/kserve/commit/dd1575501e56f588103f448efca684bc54569b81.patch"; - stripLen = 2; - hash = "sha256-K0ImsDADhH6G3R+27nRX/sD7UdRXptYIkLaoxuwB8+M="; - }) - ]; - sourceRoot = "${finalAttrs.src.name}/python/kserve"; pythonRelaxDeps = [ + "cryptography" "fastapi" "httpx" "numpy" "prometheus-client" "protobuf" - "uvicorn" "psutil" + "python-multipart" + "starlette" + "uvicorn" ]; build-system = [ @@ -92,11 +89,14 @@ buildPythonPackage (finalAttrs: { ]; dependencies = [ + aiohttp cloudevents + cryptography fastapi grpc-interceptor grpcio grpcio-tools + h11 httpx kubernetes numpy @@ -107,10 +107,13 @@ buildPythonPackage (finalAttrs: { psutil pydantic python-dateutil + python-multipart pyyaml six + starlette tabulate timing-asgi + urllib3 uvicorn ] ++ uvicorn.optional-dependencies.standard; diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index b7137d912311..1c8c5ae392d7 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.8.6"; + version = "0.9.0"; pyproject = true; src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-szwgaHLLM9vdu63lPSeKbXcSUUMAbds3K/PtY8MEuXU="; + hash = "sha256-GdLSoOPwk0SA6uMSQ6xfHOFxMZV4ucCtrSXPG2w1ZZ4="; }; pythonRelaxDeps = [ "ollama" ]; diff --git a/pkgs/development/python-modules/memray/default.nix b/pkgs/development/python-modules/memray/default.nix index ea641b8e3c48..80cf7a4be605 100644 --- a/pkgs/development/python-modules/memray/default.nix +++ b/pkgs/development/python-modules/memray/default.nix @@ -21,14 +21,14 @@ buildPythonPackage (finalAttrs: { pname = "memray"; - version = "1.19.1"; + version = "1.19.2"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${finalAttrs.version}"; - hash = "sha256-RdOtgNSkFIVl8Uve2iaJ7G0X1IHJ/Yo4h8hWP3pTV8g="; + hash = "sha256-z9/6BKVhaaZwu/MvIXI4LsgVO73zVaiCYGJekzWW1mk="; }; build-system = [ diff --git a/pkgs/development/python-modules/oldmemo/default.nix b/pkgs/development/python-modules/oldmemo/default.nix index 4152ab68500a..d20ec85e9543 100644 --- a/pkgs/development/python-modules/oldmemo/default.nix +++ b/pkgs/development/python-modules/oldmemo/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "oldmemo"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Syndace"; repo = "python-oldmemo"; tag = "v${version}"; - hash = "sha256-upgpyNoyBUg4IskF2DeQGOwm2h+hydO9lBoIHgwho28="; + hash = "sha256-p2VgSNarmVSAj8cuvTKzlIQE0SRJ1BkV91DOv+2B7ek="; }; build-system = [ diff --git a/pkgs/development/python-modules/ome-zarr-models/default.nix b/pkgs/development/python-modules/ome-zarr-models/default.nix index 85adf56190ba..b2845786c753 100644 --- a/pkgs/development/python-modules/ome-zarr-models/default.nix +++ b/pkgs/development/python-modules/ome-zarr-models/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "ome-zarr-models"; - version = "1.5"; + version = "1.6"; pyproject = true; src = fetchFromGitHub { owner = "ome-zarr-models"; repo = "ome-zarr-models-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-lEzYP4AcEV6EtE+E8yqNHJPIPJ0RwWtzm77fcdxYGYk="; + hash = "sha256-z2qBQhgijJB8O5smlJ4Y0FMS6UoMZcHVIJn5JuYq/IU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 73b0112c8355..671f410e3599 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pontos"; - version = "25.8.1"; + version = "26.2.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "pontos"; tag = "v${version}"; - hash = "sha256-uQe21Yp1PYeU/NgbQMbC2yBqEA1yUUaCiKc7k/oeS7g="; + hash = "sha256-tmu4BGjQlYehOg6lucKaeDnWK8v2VMviFwnmKd6IKWE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 0e328c697bc4..db55e8c8ce24 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "pymc"; - version = "5.28.1"; + version = "5.28.2"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${finalAttrs.version}"; - hash = "sha256-6P171KjWvSgtiYxsGNvVxs4Pfqs3S7gxg6aGRbQ/Zcw="; + hash = "sha256-D2s7gMyJcOYZAYjRsnqcPeSJ8i5TQBVL+SF9PCvnMO0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index fb364148bcf5..3c17f5034951 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "6.7.0"; + version = "6.8.0"; pyproject = true; src = fetchFromGitHub { @@ -32,7 +32,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-Kd5jBsq6sE5qWdIieVWdAKFA3QiDRsTBwoFerNY9ZRU="; + hash = "sha256-W2bm271tEXcbL3Zgc3sKlA2jZp5L6JxgEWLGO3ahYDU="; }; outputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index b9b7d6f2ffd1..4053ad783d6b 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -27,14 +27,14 @@ buildPythonPackage (finalAttrs: { pname = "uproot"; - version = "5.7.1"; + version = "5.7.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; tag = "v${finalAttrs.version}"; - hash = "sha256-06pMcL2o5hHZLEbi8vdYhAAs5BBkHAskNHUB1o48KDU="; + hash = "sha256-5FTGUYn+wveNA10ccIVmDuAmAuCZ5DdMAhRXRIgExg8="; }; build-system = [ diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index fd4c8a87ca07..09fdbd2c079a 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "waterfurnace"; - version = "1.5.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "sdague"; repo = "waterfurnace"; tag = "v${finalAttrs.version}"; - hash = "sha256-xXtAC099RideDuTvdUUn5wtuagpBMDMvrOMx9+alWhg="; + hash = "sha256-E5GHO4kRfAg+A3FW674i6ekCrpjwYx5rx7xbTZXuT80="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix index f2954f52b431..d8c9b18a3576 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix @@ -1,11 +1,5 @@ # nixpkgs-update: no auto update { - cargo-pgrx_0_12_0_alpha_1 = { - version = "0.12.0-alpha.1"; - hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; - cargoHash = "sha256-zYjqE7LZLnTaVxWAPWC1ncEjCMlrhy4THtgecB7wBYY="; - }; - cargo-pgrx_0_12_6 = { version = "0.12.6"; hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index d0b5c09a101d..573c3be94233 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { outputs = [ "out" ]; + patches = [ + ./search-qml.patch + ]; + # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57 propagatedNativeBuildInputs = [ diff --git a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh index 51152abbc3a9..2bd98567724d 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh +++ b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh @@ -5,6 +5,9 @@ ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" + if [ -n "${qtQmlPrefix-}" ]; then + addToSearchPath NIXPKGS_QML_SEARCH_PATHS "$1/$qtQmlPrefix" + fi } addEnvHooks "$hostOffset" ecmEnvHook diff --git a/pkgs/kde/frameworks/extra-cmake-modules/search-qml.patch b/pkgs/kde/frameworks/extra-cmake-modules/search-qml.patch new file mode 100644 index 000000000000..11e5a55f8825 --- /dev/null +++ b/pkgs/kde/frameworks/extra-cmake-modules/search-qml.patch @@ -0,0 +1,15 @@ +diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in +index 7db160c1..03fa6916 100644 +--- a/modules/ECMFindQmlModule.cmake.in ++++ b/modules/ECMFindQmlModule.cmake.in +@@ -15,8 +15,8 @@ if (QT_MAJOR_VERSION EQUAL "6") + include(${ECM_MODULE_DIR}/ECMQmlModule.cmake) + # Get the qmldir file + _ecm_qmlmodule_uri_to_path(MODULEDIR "@MODULE_NAME@" "@VERSION@") +- set(KDE_QMLDIR "${KDE_INSTALL_FULL_QMLDIR}/${MODULEDIR}") +- find_file(QMLDIR_FILE qmldir ${KDE_QMLDIR} NO_CACHE) ++ find_file(QMLDIR_FILE qmldir PATHS ENV NIXPKGS_QML_SEARCH_PATHS PATH_SUFFIXES ${MODULEDIR} NO_CACHE NO_DEFAULT_PATHS) ++ cmake_path(GET QMLDIR_FILE PARENT_PATH KDE_QMLDIR) + if (NOT QMLDIR_FILE) # Check the install destination, the QT_PLUGIN_PATH might not be set up correctly at this point + # Check the Qt installation + ecm_query_qt(qt_qml_dir QT_INSTALL_QML) diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix index 966ca350c6fd..08764c003336 100644 --- a/pkgs/kde/frameworks/kholidays/default.nix +++ b/pkgs/kde/frameworks/kholidays/default.nix @@ -2,10 +2,17 @@ mkKdeDerivation, qttools, qtdeclarative, + bison, + flex, }: mkKdeDerivation { pname = "kholidays"; - extraNativeBuildInputs = [ qttools ]; + extraNativeBuildInputs = [ + qttools + + bison + flex + ]; extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/purpose/default.nix b/pkgs/kde/frameworks/purpose/default.nix index a515728a3af4..5b6b25d99c2f 100644 --- a/pkgs/kde/frameworks/purpose/default.nix +++ b/pkgs/kde/frameworks/purpose/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, qtdeclarative, - kaccounts-integration, + kcmutils, kdeclarative, prison, }: @@ -10,7 +10,7 @@ mkKdeDerivation { extraBuildInputs = [ qtdeclarative ]; extraPropagatedBuildInputs = [ - kaccounts-integration + kcmutils kdeclarative prison ]; diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix index 0b2292a2ada3..2451fc34ce93 100644 --- a/pkgs/kde/gear/itinerary/default.nix +++ b/pkgs/kde/gear/itinerary/default.nix @@ -9,9 +9,6 @@ mkKdeDerivation { pname = "itinerary"; - # FIXME: this should really be fixed at ECM level somehow - patches = [ ./optional-runtime-dependencies.patch ]; - extraNativeBuildInputs = [ pkg-config shared-mime-info diff --git a/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch b/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch deleted file mode 100644 index c82a3bf1ffe3..000000000000 --- a/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,8 +80,8 @@ ecm_find_qmlmodule(QtPositioning 6.0) - ecm_find_qmlmodule(org.kde.kitemmodels ${KF_MIN_VERSION}) - ecm_find_qmlmodule(org.kde.prison ${KF_MIN_VERSION}) - ecm_find_qmlmodule(org.kde.prison.scanner ${KF_MIN_VERSION}) --ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION} REQUIRED) --ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION} REQUIRED) -+ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION}) -+ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION}) - - # runtime dependencies are build-time dependencies on Android - if (ANDROID) diff --git a/pkgs/kde/gear/keysmith/default.nix b/pkgs/kde/gear/keysmith/default.nix index d73c66fdd6f3..e01b7a61e266 100644 --- a/pkgs/kde/gear/keysmith/default.nix +++ b/pkgs/kde/gear/keysmith/default.nix @@ -7,10 +7,6 @@ mkKdeDerivation { pname = "keysmith"; - patches = [ - ./optional-runtime-dependencies.patch - ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg diff --git a/pkgs/kde/gear/keysmith/optional-runtime-dependencies.patch b/pkgs/kde/gear/keysmith/optional-runtime-dependencies.patch deleted file mode 100644 index 45f16de0b02c..000000000000 --- a/pkgs/kde/gear/keysmith/optional-runtime-dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55ce9e0..86af3e0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,7 +47,7 @@ find_package(KF6CoreAddons ${KF_MIN_VERSION} REQUIRED) - find_package(KF6I18n ${KF_MIN_VERSION} REQUIRED) - find_package(KF6Config ${KF_MIN_VERSION} REQUIRED) - --ecm_find_qmlmodule(org.kde.prison.scanner REQUIRED) -+ecm_find_qmlmodule(org.kde.prison.scanner) - - ecm_set_disabled_deprecation_versions(QT 6.0.0 - KF 6.12.0 diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index 613f2981fe52..37fccb93ece2 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/pkgs/kde/gear/koko/default.nix @@ -33,10 +33,6 @@ mkKdeDerivation { ln -s ${cities1000} src/cities1000.zip ''; - patches = [ - ./optional-runtime-dependencies.patch - ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtmultimedia diff --git a/pkgs/kde/gear/koko/optional-runtime-dependencies.patch b/pkgs/kde/gear/koko/optional-runtime-dependencies.patch deleted file mode 100644 index 9bd628145acf..000000000000 --- a/pkgs/kde/gear/koko/optional-runtime-dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,8 +76,8 @@ set_package_properties(KF6Kirigami PROPERTIES - TYPE RUNTIME - ) - --ecm_find_qmlmodule(org.kde.kirigamiaddons.formcard REQUIRED) --ecm_find_qmlmodule(org.kde.kirigamiaddons.delegates REQUIRED) -+ecm_find_qmlmodule(org.kde.kirigamiaddons.formcard) -+ecm_find_qmlmodule(org.kde.kirigamiaddons.delegates) - - find_package(KF6KirigamiAddons) - set_package_properties(KF6KirigamiAddons PROPERTIES diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index b9b2b1d48f9c..c83c705f5c3c 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/attica-6.23.0.tar.xz", - "hash": "sha256-1vhe3iP9n8qmgkRKKKhboRfN7puBcGta1q1kSvio81c=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/attica-6.24.0.tar.xz", + "hash": "sha256-Z+p3FI+6CTv9vZEE4/CbmVrvw0sLbDS8MaluY7EQq8s=" }, "baloo": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/baloo-6.23.0.tar.xz", - "hash": "sha256-Yc7D6nctCDQhqdlNrC1LnXvRvXSr897Ol98uxkbSARM=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/baloo-6.24.0.tar.xz", + "hash": "sha256-H3JnaBe5Y2uAyXGTT7fyxdOW2kdYwzmYq8S5roIZXOQ=" }, "bluez-qt": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/bluez-qt-6.23.0.tar.xz", - "hash": "sha256-N/TA2K6Ak/i0TWy1BQDHupzlmimAGBzIPoj6fAMGK+8=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/bluez-qt-6.24.0.tar.xz", + "hash": "sha256-kHz3fKK/BBfa1JrD6/5RMAECApuTUg3OXPpcNeJeWrM=" }, "breeze-icons": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/breeze-icons-6.23.0.tar.xz", - "hash": "sha256-8SWR9XFOBT2M7yMu9Bw23EYVFuS4nured8wZR6M93TM=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/breeze-icons-6.24.0.tar.xz", + "hash": "sha256-Y9Z9g0so+V9F1T7kWUsbOd5IAkKVcPDjteY6tQmr3os=" }, "extra-cmake-modules": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/extra-cmake-modules-6.23.0.tar.xz", - "hash": "sha256-26LTR2XQmjpdPpWmS5sYrieLHf7lB8vQqHOpEKEIQZQ=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/extra-cmake-modules-6.24.0.tar.xz", + "hash": "sha256-jvP34XZYjgmcAlWdIN30/tBZD5LBaPC8xgp+Y4uh5qM=" }, "frameworkintegration": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/frameworkintegration-6.23.0.tar.xz", - "hash": "sha256-c0VuEDy46dwohrN24+Z2U7G/Ofi0yxIX17lNaDZPZs0=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/frameworkintegration-6.24.0.tar.xz", + "hash": "sha256-qvRz6AAhxj4G327iAKYecSlmZcdwpQRu8pfSCC+nfWU=" }, "kapidox": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kapidox-6.23.0.tar.xz", - "hash": "sha256-pIRbJGut/YrTA5iiG6WYM8Pls6ruLkMtgZnWZ4Bz49g=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kapidox-6.24.0.tar.xz", + "hash": "sha256-qxCpeoHrMKQOWvJPLGg+GjR7OsIqDSN5MGjrQZD7Hm4=" }, "karchive": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/karchive-6.23.0.tar.xz", - "hash": "sha256-gPfzwyqewHKmUJhfymayDrjxmnsQ/KRKnXrY2KhkW1A=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/karchive-6.24.0.tar.xz", + "hash": "sha256-to+qHJAS5Au+1RbYu2viHnQ69ar7AkmoTCmn2f8VDQ0=" }, "kauth": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kauth-6.23.0.tar.xz", - "hash": "sha256-ZgBpnL/sWibDRqJlBNUFp1gMSqSm4luNR5u7+L/rXpo=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kauth-6.24.0.tar.xz", + "hash": "sha256-9ZZmficlJLM2+G3YG5vkh+PXXL7csgeCk/Ubsu5vOEw=" }, "kbookmarks": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kbookmarks-6.23.0.tar.xz", - "hash": "sha256-GFCGHv1ppRs/QrmBrRex1BQOMqyUGHUBwdtQ9oo+i+I=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kbookmarks-6.24.0.tar.xz", + "hash": "sha256-4q2gV8d/WTnnFy0MOs2MhSc7CCOyhpfInLwsziPWjV0=" }, "kcalendarcore": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcalendarcore-6.23.0.tar.xz", - "hash": "sha256-TgxhDKsx3pN10fPNhvjSJfn3ENfi5xIZIO89o2nEBks=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcalendarcore-6.24.0.tar.xz", + "hash": "sha256-VxAkY8k6TH2QM/zJn2VYMlZGHZoXRcvrZa+24qT8JFo=" }, "kcmutils": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcmutils-6.23.0.tar.xz", - "hash": "sha256-VOz+3AvJHOlfqYuLU+QdKZNVfpmhm5UzlcKl5dxCEPg=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcmutils-6.24.0.tar.xz", + "hash": "sha256-iTNGACtToRvJ3UBTrT2YfSVF+slP44dw9dRAND7o5Yo=" }, "kcodecs": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcodecs-6.23.0.tar.xz", - "hash": "sha256-fjOTTmiTXWq+jwypm7QalmIdaL4ia3IadbODNNNVt+8=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcodecs-6.24.0.tar.xz", + "hash": "sha256-UBCjcZROBS9l2U7WlMUrYY1MRohVscd/B4qPYUrv1vc=" }, "kcolorscheme": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcolorscheme-6.23.0.tar.xz", - "hash": "sha256-vEtKkoruq0yN9IHn9HVO4kkfM/fXVJ0z+kUrri0sbBw=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcolorscheme-6.24.0.tar.xz", + "hash": "sha256-6cngFV6bgEmthYgElkXJmElLkRRWSEZ93L7xeOMehMU=" }, "kcompletion": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcompletion-6.23.0.tar.xz", - "hash": "sha256-rVyDC/W2Pl97eSV2qtcmyCeq0+9uKg01cnvl/qxE4XY=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcompletion-6.24.0.tar.xz", + "hash": "sha256-G9+48ty42lWNchDX8h8FTE8Nk01p6GrtNmdXVd7TcNU=" }, "kconfig": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kconfig-6.23.0.tar.xz", - "hash": "sha256-bZbWprnmbgJ6FyhMSCYbqB4SYvvTgvzd3CSBB6nKle4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kconfig-6.24.0.tar.xz", + "hash": "sha256-Rc+92EGb0a3lSm9UBQ8kZd52pPkbenArgGkw5vuzZR8=" }, "kconfigwidgets": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kconfigwidgets-6.23.0.tar.xz", - "hash": "sha256-wSC9n+18skSpCVmFpj+epYsH5qsyKKKxIHauRtR9Jfc=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kconfigwidgets-6.24.0.tar.xz", + "hash": "sha256-uvQxSKW9bjDSXA8dpmu6/Uxt9wz4pV31aZ/WdzUnrvA=" }, "kcontacts": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcontacts-6.23.0.tar.xz", - "hash": "sha256-nLZu8z0T/B3chQm+SKtWndyySUVJIoXLZ0nvj1bIPOk=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcontacts-6.24.0.tar.xz", + "hash": "sha256-f/xcDmx5ZtR8mW3XeKR9LNG7cRuqS2O+RByUGjNKtIs=" }, "kcoreaddons": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcoreaddons-6.23.0.tar.xz", - "hash": "sha256-LQSpLfckVxc11q/LO72QvzECoHHBLjAqmKzj2cScMj0=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcoreaddons-6.24.0.tar.xz", + "hash": "sha256-vC+w2U3oWfbmvHQTYgWE8HKs4Uh+MCxlszmNfGsO/3w=" }, "kcrash": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kcrash-6.23.0.tar.xz", - "hash": "sha256-jD84/kBmUYx4lJt3kUfoRaBu7cfeqHMNWzpbBRjm3pA=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kcrash-6.24.0.tar.xz", + "hash": "sha256-RURCjDyWWH5GNC2vWx8IPdeVDHvJQNe8eSEwBgDvgHQ=" }, "kdav": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kdav-6.23.0.tar.xz", - "hash": "sha256-l2gcA60ZnxyR/5U11GCvuLkwTLd590JRxgNUS4DDaSY=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kdav-6.24.0.tar.xz", + "hash": "sha256-rMVphlVAOg0vvq3yQFIYZipC0iAcQe2zNlEINhVkKRM=" }, "kdbusaddons": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kdbusaddons-6.23.0.tar.xz", - "hash": "sha256-3FKOuLYgoEf+x2WJhtKZtZHapTr2tGeaCXOj/GldX9I=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kdbusaddons-6.24.0.tar.xz", + "hash": "sha256-dpgUMal9/nBr4J+uuPh9sxpMpqIvorvhsVrPIfForRE=" }, "kdeclarative": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kdeclarative-6.23.0.tar.xz", - "hash": "sha256-BYy9lba44WNQXpI7WGb4e61QhH6gyIbqdgHWy9ACW6I=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kdeclarative-6.24.0.tar.xz", + "hash": "sha256-0A1peqjOeloWhk6SvHT1KtsrMAiIHW4StmFVqAsTaRU=" }, "kded": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kded-6.23.0.tar.xz", - "hash": "sha256-qI+XOD86Ca3visDtj0KCX+SEaz1/gfu5gOaIBGyHT00=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kded-6.24.0.tar.xz", + "hash": "sha256-9gmB1AAJYUJcvqvpDw936XksvVQh5VtMIk/bFKqWsqU=" }, "kdesu": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kdesu-6.23.0.tar.xz", - "hash": "sha256-aZ+9FvorW7mkDVa6Agxx4pJwHGoJMU4BI8BKhuLFyLI=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kdesu-6.24.0.tar.xz", + "hash": "sha256-vlrdACxPPZbCYy7Ou/VjPZeS+dE9Yakaaiw0lUCoB9M=" }, "kdnssd": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kdnssd-6.23.0.tar.xz", - "hash": "sha256-VEA6hEaznR5efTTl/ZMgzm9nEoiDCgAwoMPX7Wv8HXg=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kdnssd-6.24.0.tar.xz", + "hash": "sha256-LPv20xYRKhFDa063El91z0zHfJ8XrGNl9f4orI0cyaA=" }, "kdoctools": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kdoctools-6.23.0.tar.xz", - "hash": "sha256-nnFb1W7zABx+alFIlCd+W8YeJXaWi+E/izwKP6tTb8k=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kdoctools-6.24.0.tar.xz", + "hash": "sha256-ruNRxS94OBPGwRSt5SDIV4xXDubcJey9ZMg+PS2WYNQ=" }, "kfilemetadata": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kfilemetadata-6.23.0.tar.xz", - "hash": "sha256-TpnNjcH9eEWJxbFz8Ha9VlXsopCPthoxy1QE4cf2Sog=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kfilemetadata-6.24.0.tar.xz", + "hash": "sha256-Lv3C66z5rx9m9hH+ldd2AjWQ6dz5dSWqk+qtfxqiziM=" }, "kglobalaccel": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kglobalaccel-6.23.0.tar.xz", - "hash": "sha256-V2AzDorrgVQsRMlMJsEJ90t4V8fGuVPWjTTnB5tt9ww=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kglobalaccel-6.24.0.tar.xz", + "hash": "sha256-ncXR9JXpUbVAJxPMYbAWF/WG/cOdvaPvfhLmYam1rwo=" }, "kguiaddons": { - "version": "6.23.1", - "url": "mirror://kde/stable/frameworks/6.23/kguiaddons-6.23.1.tar.xz", - "hash": "sha256-ZSnIiUWrIWNU2pdepluYbakm3cgtaJVw3D7eA87a+/o=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kguiaddons-6.24.0.tar.xz", + "hash": "sha256-xeRLVnOcvGfhtpVe3JU09YKIygnQL4Xqrlbbg0c5Xq8=" }, "kholidays": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kholidays-6.23.0.tar.xz", - "hash": "sha256-VMmaymUFxH7tE5fqJZMSpbADylpiK/tOz+AcptdkTnE=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kholidays-6.24.0.tar.xz", + "hash": "sha256-lKPE6gA7guAwf/gaZl+Ve7WrmmBD5g+vGirucnUZt74=" }, "ki18n": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/ki18n-6.23.0.tar.xz", - "hash": "sha256-xJKsXJJY2ExzKt3LOlPb2zuoaRJ3Px1vQZMhhlfjGC8=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/ki18n-6.24.0.tar.xz", + "hash": "sha256-dCS2HBUnZMhNTbulGtlgqdeJTmkJ7PqqE+exKVhcC1c=" }, "kiconthemes": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kiconthemes-6.23.0.tar.xz", - "hash": "sha256-du/8uvhf7zBkvB5RWJNrkBTaqAYEfAo67dx9USypAX4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kiconthemes-6.24.0.tar.xz", + "hash": "sha256-X+4RQayUaTuUtvgOUusm7ZnIGBbGTrUgq/+g4eftWVY=" }, "kidletime": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kidletime-6.23.0.tar.xz", - "hash": "sha256-TV6QhtJgyVUPHXMtL2SB00UXup9XHy59du2Yh62yyXs=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kidletime-6.24.0.tar.xz", + "hash": "sha256-vozgx5GQCh9V6Zc79frvvhcnQEJKyfJUulQVUro8ywY=" }, "kimageformats": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kimageformats-6.23.0.tar.xz", - "hash": "sha256-ZZA3ng/79NTHVi4MPYH5sEJTO0cBurnA1EMSwprnW14=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kimageformats-6.24.0.tar.xz", + "hash": "sha256-fp01hj4iJ+N2I/OQ8OU6IWkxzReSBYLPyCgqQuBPFuI=" }, "kio": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kio-6.23.0.tar.xz", - "hash": "sha256-Yp5Z8PAHuKGfxtr045pQQ7MPVl7rUBBIEmQiUG0065c=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kio-6.24.0.tar.xz", + "hash": "sha256-n74mrjeST5L1WMzcCbVz2zjY8HgoiUBC6j+N3UVo88Q=" }, "kirigami": { - "version": "6.23.1", - "url": "mirror://kde/stable/frameworks/6.23/kirigami-6.23.1.tar.xz", - "hash": "sha256-X2E0q0wA50WtWifK7l+5pBedOv8Du5cqzAZ8WX9Z95Y=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kirigami-6.24.0.tar.xz", + "hash": "sha256-ezJH3+NJhn1EJEM1vrjVSa1Kj2sxedFzbSMVEt6lsM4=" }, "kitemmodels": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kitemmodels-6.23.0.tar.xz", - "hash": "sha256-72LfdveYRcIxbmlnQcJykJt6I9gDArznDUAR1scnPsI=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kitemmodels-6.24.0.tar.xz", + "hash": "sha256-Zja/R94N8kZKlGkaEJI0Dvuiq8kfswUlO7uQWK+Vlyc=" }, "kitemviews": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kitemviews-6.23.0.tar.xz", - "hash": "sha256-bGsDr9TX9Fvq4wo3n61GNuEzGO7s7RYfwRCcs6xre14=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kitemviews-6.24.0.tar.xz", + "hash": "sha256-x/OLAXcngueJPnMRWjVkCDzp+pFV5nm1vgZH5kghgvo=" }, "kjobwidgets": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kjobwidgets-6.23.0.tar.xz", - "hash": "sha256-uxlwsHKNyv1jCTX1tlB23VH1yU8htNXbJULKSGlBaww=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kjobwidgets-6.24.0.tar.xz", + "hash": "sha256-s8X0Sb8puYOUFXZWYA6HuR92mvxfVHzvUm+t20VPm2E=" }, "knewstuff": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/knewstuff-6.23.0.tar.xz", - "hash": "sha256-wvS9tx3x9JSs6qztbDTtRburXmlij4KmORm85nXOJZU=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/knewstuff-6.24.0.tar.xz", + "hash": "sha256-l1n04VjR9GYDATFEMgFEGy98/xJjiiT2GEva5LCOKgU=" }, "knotifications": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/knotifications-6.23.0.tar.xz", - "hash": "sha256-IQVcyeOD7Ln4O0bb5kC7OrNNjg6N9xQoqHjHjDnrfW4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/knotifications-6.24.0.tar.xz", + "hash": "sha256-ErsLNKya45uW0YnMCyn1Jq4SqQFNCq03IcrMkUjkKUA=" }, "knotifyconfig": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/knotifyconfig-6.23.0.tar.xz", - "hash": "sha256-nRmdTkOXl85XNAOTed1rNAWDNi1G4ka3ZiA2S5d6q54=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/knotifyconfig-6.24.0.tar.xz", + "hash": "sha256-RuqQfrxqU4iI+zJDS6jN4+irRCPfEd7Wk7y+C24dg7Y=" }, "kpackage": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kpackage-6.23.0.tar.xz", - "hash": "sha256-zU2knn1zw4Lc8dUYc2fHtiu80EVxLV9Ox2WDYP/Bf7Y=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kpackage-6.24.0.tar.xz", + "hash": "sha256-UODDX2GnZPhWh2CUj0AnxRxHZwHj3cUpNgq9eP48wHQ=" }, "kparts": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kparts-6.23.0.tar.xz", - "hash": "sha256-eZ4UwrQvn3P237NdH6rtYy8UQXHwkKui900EYFubzBI=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kparts-6.24.0.tar.xz", + "hash": "sha256-tKC3IWfg93l0qv6TMFwY3MmcDmbB8v1Wo+RNeOcvVOc=" }, "kpeople": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kpeople-6.23.0.tar.xz", - "hash": "sha256-mGH3WJ7y2+RodZ2btdtS5ZuvYQif97x+yEfTYp0Erjg=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kpeople-6.24.0.tar.xz", + "hash": "sha256-0+JndT62TDu7qOSvSkUDaV7mLQFbMMLa0aHxNDiQ/qQ=" }, "kplotting": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kplotting-6.23.0.tar.xz", - "hash": "sha256-G3fxWwjo6XQalqS9ktZZWt6Jk2NUhReRn4CrwdIFJyo=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kplotting-6.24.0.tar.xz", + "hash": "sha256-OYzqXaX7W1Bes0WC7Fwxir7HW4xAr5i1D3z5ttig/s8=" }, "kpty": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kpty-6.23.0.tar.xz", - "hash": "sha256-oSGOtrnMUvJtHkeSP4RY18ZxLc7XWYYDca0zAoWluVE=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kpty-6.24.0.tar.xz", + "hash": "sha256-J6/xT4IRqIcwCP1SiZhydSPZi7XVAY9IoFCe9Xkrgxk=" }, "kquickcharts": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kquickcharts-6.23.0.tar.xz", - "hash": "sha256-90SCk/BWWU8evjI6ejrQ6GEDrlJgl+FY2rY/uTL9rj4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kquickcharts-6.24.0.tar.xz", + "hash": "sha256-O0oUqBl+LCJdxHF5ccxibJ+bBgbGEry3QPgO+ba9Gqs=" }, "krunner": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/krunner-6.23.0.tar.xz", - "hash": "sha256-oC2zDvjJh7rmf0Uo78iRdHPgtSFrkVQaK3QYao/mdE8=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/krunner-6.24.0.tar.xz", + "hash": "sha256-V3XXKSoxwMozmzhcGPNxb9pUhjF0I8U4CaENgAj/jk0=" }, "kservice": { - "version": "6.23.1", - "url": "mirror://kde/stable/frameworks/6.23/kservice-6.23.1.tar.xz", - "hash": "sha256-BRraRQrjNIQPbjb9gXKVk95qnXFSNy+sd7LXwCtYPc0=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kservice-6.24.0.tar.xz", + "hash": "sha256-97Pl+rUpSdFsD86Wr8Wq6xzJS0dTbgJNWAdQ/7FzlyM=" }, "kstatusnotifieritem": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kstatusnotifieritem-6.23.0.tar.xz", - "hash": "sha256-pyJUSN2WV4o0P8nDq1QJ08fAvOBGZYJcyxAnPv9Bmt4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kstatusnotifieritem-6.24.0.tar.xz", + "hash": "sha256-92x33MJ6YABzMDKabWxgKYwR3d26gvcQqQcV7IH4hv8=" }, "ksvg": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/ksvg-6.23.0.tar.xz", - "hash": "sha256-ROMC/Ynuu2GFOITZANQ2vE4JMih6EX5p07zgqpdjIy4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/ksvg-6.24.0.tar.xz", + "hash": "sha256-xNYfa7TGFFLoPeBCf0RM3sKW2HMz9sdnb7fa4JSA9NI=" }, "ktexteditor": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/ktexteditor-6.23.0.tar.xz", - "hash": "sha256-aZkF5conoQ4+rU0Vga07NipyfD+rcVWipvj07qLWekE=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/ktexteditor-6.24.0.tar.xz", + "hash": "sha256-/XA8d3cSrQ4gqEn4N8OteIDrgsG+tQGWYIyzJjc/eOM=" }, "ktexttemplate": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/ktexttemplate-6.23.0.tar.xz", - "hash": "sha256-BiOtf797OqIuD3ZhHC6cj6J2HMKf3LFUi852DNMo1JA=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/ktexttemplate-6.24.0.tar.xz", + "hash": "sha256-hQIfafYdCf5bGwEHXf9PyQtNNZj36DvdT+4x1KAUiOA=" }, "ktextwidgets": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/ktextwidgets-6.23.0.tar.xz", - "hash": "sha256-3PFtXCfTbOEaBbnUO2vh50uAagqd3SYQJkY6CqfifSI=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/ktextwidgets-6.24.0.tar.xz", + "hash": "sha256-uo99IQFKq836E+DMH/Wh22wEdh4IBnDKp2t+QWMIbRU=" }, "kunitconversion": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kunitconversion-6.23.0.tar.xz", - "hash": "sha256-LRIS74P+wp86uSRX0jIjCknE9mfFu3nja4o35ZJ7lkk=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kunitconversion-6.24.0.tar.xz", + "hash": "sha256-oM1YLkjDAtVrXrzqVgtVkPlLhhXb1UvGe80WVxSXn6Y=" }, "kuserfeedback": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kuserfeedback-6.23.0.tar.xz", - "hash": "sha256-yWkY0hrf7fXCM3pGkuwkbmKQ66lOXf3kyFfyT9cYdNg=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kuserfeedback-6.24.0.tar.xz", + "hash": "sha256-MAS+VBrPA7biIDter+3n+dmo/kHXfN0q7jXgPxOSmjA=" }, "kwallet": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kwallet-6.23.0.tar.xz", - "hash": "sha256-DPi9F8MwDHEkXCXU4P7lE7cwXM2X8o2aTI4yUoMzeic=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kwallet-6.24.0.tar.xz", + "hash": "sha256-CUom7CSi/JrnMJbEfaLZY3mWaO+eDkAEFioAguVPlSA=" }, "kwidgetsaddons": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kwidgetsaddons-6.23.0.tar.xz", - "hash": "sha256-uyXkBPcq4diXAprXUf6S9O4wMru2y0aTZB4SGP2yXq4=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kwidgetsaddons-6.24.0.tar.xz", + "hash": "sha256-3+Vj5YsNjHLoodpPN58DYQVS2GY+rGE+R6Kmo4TCAQc=" }, "kwindowsystem": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kwindowsystem-6.23.0.tar.xz", - "hash": "sha256-T3eUBdYWk9BVmmihgPTOq0CnT5L1CGY9aA1reaFt1ic=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kwindowsystem-6.24.0.tar.xz", + "hash": "sha256-IpHZWDbouBJjzuoMH/p8/ZJ3MTDW7dEwtDmHQWnxPlg=" }, "kxmlgui": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/kxmlgui-6.23.0.tar.xz", - "hash": "sha256-2RaDmJ/7dcXJay/0l4sp9JdnwfZIIrBNC/peKVMdsMM=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/kxmlgui-6.24.0.tar.xz", + "hash": "sha256-+H+IcyNnXYs2rp0VfOKYSKwOsXMf/QwK7J15QF55NhY=" }, "modemmanager-qt": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/modemmanager-qt-6.23.0.tar.xz", - "hash": "sha256-Ksm1LvvOB64FXiW3+5lslOUhIY2DNRwz8AYAkKuYtjw=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/modemmanager-qt-6.24.0.tar.xz", + "hash": "sha256-xlj/jhnifJ15gFUtQJQjP74K0ob1ppJ/poclXoToDtI=" }, "networkmanager-qt": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/networkmanager-qt-6.23.0.tar.xz", - "hash": "sha256-SOfl1arMtAlqHRpGtXCohc77SPpGMeidg7fvAOCoytI=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/networkmanager-qt-6.24.0.tar.xz", + "hash": "sha256-udRPgOBUNT+HtCdEgbMgZ22VvTg1/7v98Z708qLvD/8=" }, "prison": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/prison-6.23.0.tar.xz", - "hash": "sha256-nQyRdknzm2hf0bkphnRoCGnuAT+7gqLP1uczUAsIAjY=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/prison-6.24.0.tar.xz", + "hash": "sha256-OeorUf0OQFuWTB8i1krQERx5iViUWQ1ospcS193kzTQ=" }, "purpose": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/purpose-6.23.0.tar.xz", - "hash": "sha256-0VVFdNbdOUeU2vAAab3T+D1+MDoC0sRqGXMIHF3inV0=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/purpose-6.24.0.tar.xz", + "hash": "sha256-6V26I295vxZVoFgenxw85k00J1ATX95wDUY90gW+vEc=" }, "qqc2-desktop-style": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/qqc2-desktop-style-6.23.0.tar.xz", - "hash": "sha256-p6p+CyDVH/uR8ERmQKXgUjacQz70jjUmtPUHOEznmA0=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/qqc2-desktop-style-6.24.0.tar.xz", + "hash": "sha256-RZZ6G1lvHf0hNxlIJ1ozCrPt5v2U/f0i9q5esLEi3mQ=" }, "solid": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/solid-6.23.0.tar.xz", - "hash": "sha256-RIUC6jLI4Enr08rzTFx2j85/h58l+LXnAP0zANMXoMw=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/solid-6.24.0.tar.xz", + "hash": "sha256-L1BpCP8y/83ZkYh5BwtmbJOEsHlJPCX4BzVVPjMqU/0=" }, "sonnet": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/sonnet-6.23.0.tar.xz", - "hash": "sha256-+ujsA8p653bq7gQTGuoSgIInUqQ+3gPm+HFCWYBS9Mw=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/sonnet-6.24.0.tar.xz", + "hash": "sha256-9fEHvU0VTJO7rMcX7DQRvOvONRPfEDlF4gL/ofDumuc=" }, "syndication": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/syndication-6.23.0.tar.xz", - "hash": "sha256-znejmMmiFqlbocVYse6vaLhfzROGWdJB0JMS+RLLmBQ=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/syndication-6.24.0.tar.xz", + "hash": "sha256-meKCvyOgOY3ZoizpQWioIou/G3Kqr5xSFUtwuKdooFw=" }, "syntax-highlighting": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/syntax-highlighting-6.23.0.tar.xz", - "hash": "sha256-yV6sK6u+pAvhSeVZOf/kehT/sLw9CBA9PzLLMQNkw44=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/syntax-highlighting-6.24.0.tar.xz", + "hash": "sha256-BhxZRtxhcOz6kbnH1Pql7IHrU7tfhu2oYcLOdIplSG0=" }, "threadweaver": { - "version": "6.23.0", - "url": "mirror://kde/stable/frameworks/6.23/threadweaver-6.23.0.tar.xz", - "hash": "sha256-1IJuDY+vE1ZV0Vlpsn0P5vx0am0wjqNPBL7T3mBRiws=" + "version": "6.24.0", + "url": "mirror://kde/stable/frameworks/6.24/threadweaver-6.24.0.tar.xz", + "hash": "sha256-qnYIlhOX5829yDYq6dHqumxbqdrjqEwRgw/OFV5e1G8=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix index 6bac06517954..eb35f1140951 100644 --- a/pkgs/kde/plasma/discover/default.nix +++ b/pkgs/kde/plasma/discover/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, qtwebview, pkg-config, + qcoro, discount, flatpak, fwupd, @@ -9,15 +10,12 @@ mkKdeDerivation { pname = "discover"; - patches = [ - # remove forced QML dependency check - # FIXME: fix the check in ECM instead - ./qml-deps.patch - ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebview + + qcoro + discount flatpak fwupd diff --git a/pkgs/kde/plasma/discover/qml-deps.patch b/pkgs/kde/plasma/discover/qml-deps.patch deleted file mode 100644 index 3b5527a2cb61..000000000000 --- a/pkgs/kde/plasma/discover/qml-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04523c97d..945ba6a41 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ find_package(QCoro6 REQUIRED COMPONENTS Core) - - qcoro_enable_coroutines() - --ecm_find_qmlmodule(org.kde.kitemmodels 1.0 REQUIRED) -+ecm_find_qmlmodule(org.kde.kitemmodels 1.0) - - list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "DISCOVER_BACKEND_PLUGIN") - diff --git a/pkgs/kde/plasma/plasma-setup/default.nix b/pkgs/kde/plasma/plasma-setup/default.nix index 0fcf89369f2d..61efd2268e13 100644 --- a/pkgs/kde/plasma/plasma-setup/default.nix +++ b/pkgs/kde/plasma/plasma-setup/default.nix @@ -7,8 +7,6 @@ mkKdeDerivation { pname = "plasma-setup"; - patches = [ ./optional-dependencies.patch ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtlocation diff --git a/pkgs/kde/plasma/plasma-setup/optional-dependencies.patch b/pkgs/kde/plasma/plasma-setup/optional-dependencies.patch deleted file mode 100644 index 923072ceae8c..000000000000 --- a/pkgs/kde/plasma/plasma-setup/optional-dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/keyboard/CMakeLists.txt b/modules/keyboard/CMakeLists.txt -index ddd52df8bc1cc1c6c3bc6b90d9b7f913092995a2..4a108baf60dcf0a87ad9e512f63884dba4442c10 100644 ---- a/modules/keyboard/CMakeLists.txt -+++ b/modules/keyboard/CMakeLists.txt -@@ -9,7 +9,7 @@ ecm_qt_declare_logging_category(logging_SRCS - EXPORT PLASMASETUP - ) - --ecm_find_qmlmodule(org.kde.plasma.private.kcm_keyboard REQUIRED) -+ecm_find_qmlmodule(org.kde.plasma.private.kcm_keyboard) - - ecm_add_qml_module(plasmasetup_keyboard - URI "org.kde.plasmasetup.keyboard" diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 2636b917585b..0ad2f8c3acb7 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -63,9 +63,10 @@ let openssl # For fiptool ]; - # Make the new toolchain guessing (from 2.11+) happy - # https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22 - rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy"; + # Make the new toolchain guessing (from 2.14+) happy + # https://github.com/ARM-software/arm-trusted-firmware/blob/1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc/make_helpers/toolchain.mk#L370 + # https://github.com/ARM-software/arm-trusted-firmware/blob/1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc/make_helpers/toolchains/rk3399-m0.mk#L22 + rk3399-m0-oc-parameter = "rk3399-m0-oc-default"; buildInputs = [ openssl ]; diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix index 4593540d2e71..43fee0a937f3 100644 --- a/pkgs/servers/sql/postgresql/ext.nix +++ b/pkgs/servers/sql/postgresql/ext.nix @@ -23,4 +23,5 @@ in // lib.optionalAttrs config.allowAliases { cstore_fdw = throw "PostgreSQL extension `cstore_fdw` has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)"; + pgvecto-rs = throw "PostgreSQL extension `pgvecto-rs` has been removed since the project has been abandoned. Upstream's recommendation is to use vectorchord instead (https://docs.vectorchord.ai/vectorchord/admin/migration.html#from-pgvecto-rs) "; # Added 2026-03-13 } diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff deleted file mode 100644 index d05a5cd34e16..000000000000 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0001-read-clang-flags-from-environment.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/crates/c/build.rs b/crates/c/build.rs -index 8d822e5..8b7e371 100644 ---- a/crates/c/build.rs -+++ b/crates/c/build.rs -@@ -1,9 +1,13 @@ - fn main() { - println!("cargo:rerun-if-changed=src/f16.h"); - println!("cargo:rerun-if-changed=src/f16.c"); -+ println!("cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS"); - cc::Build::new() -- .compiler("clang-16") -+ .compiler("@clang@") - .file("./src/f16.c") -+ // read env var set by rustPlatform.bindgenHook -+ .try_flags_from_environment("BINDGEN_EXTRA_CLANG_ARGS") -+ .expect("the BINDGEN_EXTRA_CLANG_ARGS environment variable must be specified and UTF-8") - .opt_level(3) - .debug(true) - .compile("vectorsc"); diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff deleted file mode 100644 index 34230c372de0..000000000000 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-allow-dangerous-implicit-autorefs.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs -index 18172b9..6fc7e82 100644 ---- a/crates/common/src/lib.rs -+++ b/crates/common/src/lib.rs -@@ -1,3 +1,4 @@ -+#![warn(dangerous_implicit_autorefs)] - pub mod clean; - pub mod dir_ops; - pub mod file_atomic; -diff --git a/src/lib.rs b/src/lib.rs -index 068c65d..82609e9 100644 ---- a/src/lib.rs -+++ b/src/lib.rs -@@ -6,6 +6,7 @@ - #![allow(clippy::needless_range_loop)] - #![allow(clippy::single_match)] - #![allow(clippy::too_many_arguments)] -+#![warn(dangerous_implicit_autorefs)] - - mod bgworker; - mod datatype; diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix deleted file mode 100644 index 412e46646247..000000000000 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - buildPgrxExtension, - cargo-pgrx_0_12_0_alpha_1, - clang, - fetchFromGitHub, - lib, - nix-update-script, - openssl, - pkg-config, - postgresql, - postgresqlTestExtension, - replaceVars, -}: - -buildPgrxExtension (finalAttrs: { - inherit postgresql; - cargo-pgrx = cargo-pgrx_0_12_0_alpha_1; - - pname = "pgvecto-rs"; - version = "0.3.0"; - - buildInputs = [ openssl ]; - nativeBuildInputs = [ pkg-config ]; - - patches = [ - # Tell the `c` crate to use the flags from the rust bindgen hook - (replaceVars ./0001-read-clang-flags-from-environment.diff { - clang = lib.getExe clang; - }) - # Rust 1.89 denies implicit autorefs by default, making the compilation fail. - # This restores the behaviour of previous rust versions by making the lint throw a warning instead. - ./0002-allow-dangerous-implicit-autorefs.diff - ]; - - src = fetchFromGitHub { - owner = "tensorchord"; - repo = "pgvecto.rs"; - tag = "v${finalAttrs.version}"; - hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE="; - }; - - cargoHash = "sha256-8otJ1uqGrCmlxAqvfAL3OjhBI4I6dAu6EoajstO46Sw="; - - # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL - postPatch = '' - substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${finalAttrs.version} - ''; - - # Include upgrade scripts in the final package - # https://github.com/tensorchord/pgvecto.rs/blob/v0.2.0/scripts/ci_package.sh#L6-L8 - postInstall = '' - cp sql/upgrade/* $out/share/postgresql/extension/ - ''; - - env = { - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - - # Bypass rust nightly features not being available on rust stable - RUSTC_BOOTSTRAP = 1; - }; - - # This crate does not have the "pg_test" feature - usePgTestCheckFeature = false; - - passthru = { - updateScript = nix-update-script { }; - tests.extension = postgresqlTestExtension { - inherit (finalAttrs) finalPackage; - postgresqlExtraSettings = '' - shared_preload_libraries='vectors' - ''; - sql = '' - CREATE EXTENSION vectors; - - CREATE TABLE items ( - id bigserial PRIMARY KEY, - content text NOT NULL, - embedding vectors.vector(3) NOT NULL -- 3 dimensions - ); - - INSERT INTO items (content, embedding) VALUES - ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'), - ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'), - ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'), - ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]'); - ''; - asserts = [ - { - query = "SELECT default_version FROM pg_available_extensions WHERE name = 'vectors'"; - expected = "'${finalAttrs.version}'"; - description = "Extension vectors has correct version."; - } - { - query = "SELECT COUNT(embedding) FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery"; - expected = "2"; - description = "Stores and returns vectors."; - } - ]; - }; - }; - - meta = { - # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343 - broken = - (lib.versionOlder postgresql.version "14") - || - # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607 - # Check after next package update. - lib.versionAtLeast postgresql.version "17" && finalAttrs.version == "0.3.0"; - description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres"; - homepage = "https://github.com/tensorchord/pgvecto.rs"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - diogotcorreia - esclear - ]; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ee66c0cb83d..60c94f4c7944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4678,7 +4678,6 @@ with pkgs; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) - cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_6 cargo-pgrx_0_16_0 cargo-pgrx_0_16_1 @@ -6323,6 +6322,8 @@ with pkgs; fmt_12 ; + firefox_decrypt = callPackage ../by-name/fi/firefox_decrypt/package.nix { nss = nss_latest; }; + fmt = fmt_12; fontconfig = callPackage ../development/libraries/fontconfig { };